diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index 6300904c61c8..f523a8c88461 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -27,7 +27,7 @@ package set to make it the default. This guarantees you get a consistent package set. ```nix mypkg = let - cudaPackages = cudaPackages_11_5.overrideScope' (final: prev { + cudaPackages = cudaPackages_11_5.overrideScope' (final: prev: { cudnn = prev.cudnn_8_3_2; }}); in callPackage { inherit cudaPackages; }; diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 91d3a091c0ae..c188e228112c 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -118,7 +118,7 @@ ImageExifTool = buildPerlPackage { hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; }; - buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c666365beca0..9ac5164d4f86 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3766,13 +3766,6 @@ githubId = 62989; name = "Demyan Rogozhin"; }; - dennajort = { - email = "gosselinjb@gmail.com"; - matrix = "@dennajort:matrix.org"; - github = "dennajort"; - githubId = 1536838; - name = "Jean-Baptiste Gosselin"; - }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; @@ -6222,6 +6215,12 @@ githubId = 982322; name = "Henrik Olsson"; }; + henrirosten = { + email = "henri.rosten@unikie.com"; + github = "henrirosten"; + githubId = 49935860; + name = "Henri Rosten"; + }; henrytill = { email = "henrytill@gmail.com"; github = "henrytill"; @@ -7102,6 +7101,13 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jbgosselin = { + email = "gosselinjb@gmail.com"; + matrix = "@dennajort:matrix.org"; + github = "jbgosselin"; + githubId = 1536838; + name = "Jean-Baptiste Gosselin"; + }; jboy = { email = "jboy+nixos@bius.moe"; githubId = 2187261; @@ -8100,6 +8106,13 @@ githubId = 524492; name = "Sergey Kazenyuk"; }; + kbdharun = { + email = "kbdharunkrishna@gmail.com"; + matrix = "@kbdk:matrix.org"; + github = "kbdharun"; + githubId = 26346867; + name = "K.B.Dharun Krishna"; + }; kcalvinalvin = { email = "calvin@kcalvinalvin.info"; github = "kcalvinalvin"; @@ -10217,6 +10230,15 @@ github = "michaelgrahamevans"; githubId = 5932424; }; + michaelpachec0 = { + email = "michaelpacheco@protonmail.com"; + name = "Michael Pacheco"; + github = "MichaelPachec0"; + githubId = 48970112; + keys = [ { + fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; + }]; + }; michaelpj = { email = "michaelpj@gmail.com"; github = "michaelpj"; @@ -12977,6 +12999,12 @@ githubId = 903072; name = "Raghav Sood"; }; + ragingpastry = { + email = "senior.crepe@gmail.com"; + github = "ragingpastry"; + githubId = 6778250; + name = "Nick Wilburn"; + }; raitobezarius = { email = "ryan@lahfa.xyz"; matrix = "@raitobezarius:matrix.org"; @@ -14334,6 +14362,12 @@ githubId = 487050; name = "Shea Levy"; }; + shlok = { + email = "sd-nix-maintainer@quant.is"; + github = "shlok"; + githubId = 3000933; + name = "Shlok Datye"; + }; shmish111 = { email = "shmish111@gmail.com"; github = "shmish111"; diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 044151305e35..8b292ca50c8c 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -85,7 +85,8 @@ echo "Updating Stackage..." echo "Updating Hackage hashes..." ./maintainers/scripts/haskell/update-hackage.sh --do-commit echo "Regenerating Hackage packages..." -./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit +# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check. +./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit # Push these new commits to the haskell-updates branch echo "Pushing commits just created to the remote haskell-updates branch..." diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 5a17b0518357..a317dba4d4e7 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,9 +1,18 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils jq nix -I nixpkgs=. +set -euo pipefail + +TMP_TEMPLATE=transitive-broken.XXXXXXX +readonly TMP_TEMPLATE + +tmpfile=$(mktemp "$TMP_TEMPLATE") + +trap 'rm -f "${tmpfile}"' 0 + config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml -cat > $config_file << EOF +cat > $tmpfile << EOF # This file is automatically generated by # maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh # It is supposed to list all haskellPackages that cannot evaluate because they @@ -11,4 +20,6 @@ cat > $config_file << EOF dont-distribute-packages: EOF -nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file +nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $tmpfile + +mv $tmpfile $config_file diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9a6e32e8e2f8..58c940af97b2 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -151,6 +151,7 @@ with lib.maintainers; { cuda = { members = [ + connorbaker SomeoneSerge ]; scope = "Maintain CUDA-enabled packages"; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 2c29ae29feb8..2faad4c43d10 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -60,6 +60,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). +- [harmonia](https://github.com/nix-community/harmonia/), Nix binary cache implemented in rust using libnix-store. Available as [services.harmonia](options.html#opt-services.harmonia.enable). + - [hyprland](https://github.com/hyprwm/hyprland), a dynamic tiling Wayland compositor that doesn't sacrifice on its looks. Available as [programs.hyprland](#opt-programs.hyprland.enable). - [minipro](https://gitlab.com/DavidGriffith/minipro/), an open source program for controlling the MiniPRO TL866xx series of chip programmers. Available as [programs.minipro](options.html#opt-programs.minipro.enable). @@ -114,6 +116,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [stargazer](https://sr.ht/~zethra/stargazer/), a fast and easy to use Gemini server. Available as [services.stargazer](#opt-services.stargazer.enable). +- [sniffnet](https://github.com/GyulyVGC/sniffnet), an application to monitor your network traffic. Available as [programs.sniffnet](#opt-programs.sniffnet.enable). + - [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable). - [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](#opt-services.peroxide.enable). diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index d06b479e2af5..a47d299b226b 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -29,7 +29,6 @@ # GNU GRUB, where available. boot.loader.grub.enable = !pkgs.stdenv.isAarch32; - boot.loader.grub.version = 2; # GNU lsh. services.openssh.enable = false; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 3921bb61b91c..e22bb866927b 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -694,8 +694,6 @@ in } ]; - boot.loader.grub.version = 2; - # Don't build the GRUB menu builder script, since we don't need it # here and it causes a cyclic dependency. boot.loader.grub.enable = false; diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c65898b261cb..5d3d0216d20c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -651,7 +651,6 @@ EOF $bootLoaderConfig = <. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.harmonia = { + description = "harmonia binary cache service"; + + requires = [ "nix-daemon.socket" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + CONFIG_FILE = format.generate "harmonia.toml" cfg.settings; + SIGN_KEY_PATH = lib.mkIf (cfg.signKeyPath != null) "%d/sign-key"; + # Note: it's important to set this for nix-store, because it wants to use + # $HOME in order to use a temporary cache dir. bizarre failures will occur + # otherwise + HOME = "/run/harmonia"; + }; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + User = "harmonia"; + Group = "harmonia"; + DynamicUser = true; + PrivateUsers = true; + DeviceAllow = [ "" ]; + UMask = "0066"; + RuntimeDirectory = "harmonia"; + LoadCredential = lib.mkIf (cfg.signKeyPath != null) [ "sign-key:${cfg.signKeyPath}" ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + CapabilityBoundingSet = ""; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + RestrictRealtime = true; + MemoryDenyWriteExecute = true; + ProcSubset = "pid"; + ProtectProc = "invisible"; + RestrictNamespaces = true; + SystemCallArchitectures = "native"; + PrivateNetwork = false; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + LockPersonality = true; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + LimitNOFILE = 65536; + }; + }; + }; +} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 5c0a07fb5127..28254cbf2ca0 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; @@ -12,8 +12,7 @@ let # Package set of targeted architecture if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs; - realGrub = if cfg.version == 1 then grubPkgs.grub - else if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; } + realGrub = if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; } else if cfg.trustedBoot.enable then if cfg.trustedBoot.isHPLaptop then grubPkgs.trustedGrub-for-HP @@ -28,8 +27,7 @@ let else realGrub; grubEfi = - # EFI version of Grub v2 - if cfg.efiSupport && (cfg.version == 2) + if cfg.efiSupport then realGrub.override { efiSupport = cfg.efiSupport; } else null; @@ -52,24 +50,24 @@ let fullName = lib.getName realGrub; fullVersion = lib.getVersion realGrub; grubEfi = f grubEfi; - grubTargetEfi = optionalString (cfg.efiSupport && (cfg.version == 2)) (f (grubEfi.grubTarget or "")); + grubTargetEfi = optionalString cfg.efiSupport (f (grubEfi.grubTarget or "")); bootPath = args.path; storePath = config.boot.loader.grub.storePath; bootloaderId = if args.efiBootloaderId == null then "${config.system.nixos.distroName}${efiSysMountPoint'}" else args.efiBootloaderId; timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout; - users = if cfg.users == {} || cfg.version != 1 then cfg.users else throw "GRUB version 1 does not support user accounts."; theme = f cfg.theme; inherit efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) - version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber + extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber extraGrubInstallArgs extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels - default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios; + default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios + users; path = with pkgs; makeBinPath ( [ coreutils gnused gnugrep findutils diffutils btrfs-progs util-linux mdadm ] - ++ optional (cfg.efiSupport && (cfg.version == 2)) efibootmgr + ++ optional cfg.efiSupport efibootmgr ++ optionals cfg.useOSProber [ busybox os-prober ]); font = if cfg.font == null then "" else (if lib.last (lib.splitString "." cfg.font) == "pf2" @@ -109,14 +107,8 @@ in }; version = mkOption { - default = 2; - example = 1; + visible = false; type = types.int; - description = lib.mdDoc '' - The version of GRUB to use: `1` for GRUB - Legacy (versions 0.9x), or `2` (the - default) for GRUB 2. - ''; }; device = mkOption { @@ -724,14 +716,7 @@ in config = mkMerge [ - { boot.loader.grub.splashImage = mkDefault ( - if cfg.version == 1 then pkgs.fetchurl { - url = "http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz"; - sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; - } - # GRUB 1.97 doesn't support gzipped XPMs. - else defaultSplash); - } + { boot.loader.grub.splashImage = mkDefault defaultSplash; } (mkIf (cfg.splashImage == defaultSplash) { boot.loader.grub.backgroundColor = mkDefault "#2F302F"; @@ -788,10 +773,6 @@ in '') config.boot.loader.grub.extraFiles); assertions = [ - { - assertion = !cfg.zfsSupport || cfg.version == 2; - message = "Only GRUB version 2 provides ZFS support"; - } { assertion = cfg.mirroredBoots != [ ]; message = "You must set the option ‘boot.loader.grub.devices’ or " @@ -801,10 +782,6 @@ in assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters); message = "You cannot have duplicated devices in mirroredBoots"; } - { - assertion = !cfg.trustedBoot.enable || cfg.version == 2; - message = "Trusted GRUB is only available for GRUB 2"; - } { assertion = !cfg.efiSupport || !cfg.trustedBoot.enable; message = "Trusted GRUB does not have EFI support"; @@ -825,6 +802,10 @@ in assertion = cfg.efiInstallAsRemovable -> !config.boot.loader.efi.canTouchEfiVariables; message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn off boot.loader.efi.canTouchEfiVariables"; } + { + assertion = !(options.boot.loader.grub.version.isDefined && cfg.version == 1); + message = "Support for version 0.9x of GRUB was removed after being unsupported upstream for around a decade"; + } ] ++ flip concatMap cfg.mirroredBoots (args: [ { assertion = args.devices != [ ]; @@ -844,6 +825,11 @@ in })); }) + (mkIf options.boot.loader.grub.version.isDefined { + warnings = [ '' + The boot.loader.grub.version option does not have any effect anymore, please remove it from your configuration. + '' ]; + }) ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 2779f26aa1b6..cfccb93264bf 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -61,7 +61,6 @@ sub runCommand { } my $grub = get("grub"); -my $grubVersion = int(get("version")); my $grubTarget = get("grubTarget"); my $extraConfig = get("extraConfig"); my $extraPrepareConfig = get("extraPrepareConfig"); @@ -96,9 +95,7 @@ my $theme = get("theme"); my $saveDefault = $defaultEntry eq "saved"; $ENV{'PATH'} = get("path"); -die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; - -print STDERR "updating GRUB $grubVersion menu...\n"; +print STDERR "updating GRUB 2 menu...\n"; mkpath("$bootPath/grub", 0, 0700); @@ -176,76 +173,74 @@ sub GrubFs { } my $search = ""; - if ($grubVersion > 1) { - # ZFS is completely separate logic as zpools are always identified by a label - # or custom UUID - if ($fs->type eq 'zfs') { - my $sid = index($fs->device, '/'); + # ZFS is completely separate logic as zpools are always identified by a label + # or custom UUID + if ($fs->type eq 'zfs') { + my $sid = index($fs->device, '/'); - if ($sid < 0) { - $search = '--label ' . $fs->device; - $path = '/@' . $path; - } else { - $search = '--label ' . substr($fs->device, 0, $sid); - $path = '/' . substr($fs->device, $sid) . '/@' . $path; + if ($sid < 0) { + $search = '--label ' . $fs->device; + $path = '/@' . $path; + } else { + $search = '--label ' . substr($fs->device, 0, $sid); + $path = '/' . substr($fs->device, $sid) . '/@' . $path; + } + } else { + my %types = ('uuid' => '--fs-uuid', 'label' => '--label'); + + if ($fsIdentifier eq 'provided') { + # If the provided dev is identifying the partition using a label or uuid, + # we should get the label / uuid and do a proper search + my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/; + if ($#matches > 1) { + die "Too many matched devices" + } elsif ($#matches == 1) { + $search = "$types{$matches[0]} $matches[1]" } } else { - my %types = ('uuid' => '--fs-uuid', 'label' => '--label'); + # Determine the identifying type + $search = $types{$fsIdentifier} . ' '; - if ($fsIdentifier eq 'provided') { - # If the provided dev is identifying the partition using a label or uuid, - # we should get the label / uuid and do a proper search - my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/; - if ($#matches > 1) { - die "Too many matched devices" - } elsif ($#matches == 1) { - $search = "$types{$matches[0]} $matches[1]" - } - } else { - # Determine the identifying type - $search = $types{$fsIdentifier} . ' '; - - # Based on the type pull in the identifier from the system - my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid", "-o", "export", @{[$fs->device]}); - if ($status != 0) { - die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; - } - my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; - if ($#matches != 0) { - die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n" - } - $search .= $matches[0]; + # Based on the type pull in the identifier from the system + my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid", "-o", "export", @{[$fs->device]}); + if ($status != 0) { + die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; } + my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; + if ($#matches != 0) { + die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n" + } + $search .= $matches[0]; + } - # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes - if ($fs->type eq 'btrfs') { - my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]}); + # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes + if ($fs->type eq 'btrfs') { + my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]}); + if ($status != 0) { + die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; + } + my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; + if ($#ids > 0) { + die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" + } elsif ($#ids == 0) { + my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]}); if ($status != 0) { - die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; + die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n"; } - my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; - if ($#ids > 0) { - die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" - } elsif ($#ids == 0) { - my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]}); - if ($status != 0) { - die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n"; - } - my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/; - if ($#paths > 0) { - die "Btrfs returned multiple paths for a single subvolume id, mountpoint @{[$fs->mount]}\n"; - } elsif ($#paths != 0) { - die "Btrfs did not return a path for the subvolume at @{[$fs->mount]}\n"; - } - $path = "/$paths[0]$path"; + my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/; + if ($#paths > 0) { + die "Btrfs returned multiple paths for a single subvolume id, mountpoint @{[$fs->mount]}\n"; + } elsif ($#paths != 0) { + die "Btrfs did not return a path for the subvolume at @{[$fs->mount]}\n"; } + $path = "/$paths[0]$path"; } } - if (not $search eq "") { - $search = "search --set=drive$driveid " . $search; - $path = "(\$drive$driveid)$path"; - $driveid += 1; - } + } + if (not $search eq "") { + $search = "search --set=drive$driveid " . $search; + $path = "(\$drive$driveid)$path"; + $driveid += 1; } return Grub->new(path => $path, search => $search); } @@ -258,166 +253,151 @@ if ($copyKernels == 0) { # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; -if ($grubVersion == 1) { - # $defaultEntry might be "saved", indicating that we want to use the last selected configuration as default. - # Incidentally this is already the correct value for the grub 1 config to achieve this behaviour. - $conf .= " - default $defaultEntry - timeout $timeout - "; - if ($splashImage) { - copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n"; - $conf .= "splashimage " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background.xpm.gz\n"; +my @users = (); +foreach my $user ($dom->findnodes('/expr/attrs/attr[@name = "users"]/attrs/attr')) { + my $name = $user->findvalue('@name') or die; + my $hashedPassword = $user->findvalue('./attrs/attr[@name = "hashedPassword"]/string/@value'); + my $hashedPasswordFile = $user->findvalue('./attrs/attr[@name = "hashedPasswordFile"]/string/@value'); + my $password = $user->findvalue('./attrs/attr[@name = "password"]/string/@value'); + my $passwordFile = $user->findvalue('./attrs/attr[@name = "passwordFile"]/string/@value'); + + if ($hashedPasswordFile) { + open(my $f, '<', $hashedPasswordFile) or die "Can't read file '$hashedPasswordFile'!"; + $hashedPassword = <$f>; + chomp $hashedPassword; + } + if ($passwordFile) { + open(my $f, '<', $passwordFile) or die "Can't read file '$passwordFile'!"; + $password = <$f>; + chomp $password; } -} -else { - my @users = (); - foreach my $user ($dom->findnodes('/expr/attrs/attr[@name = "users"]/attrs/attr')) { - my $name = $user->findvalue('@name') or die; - my $hashedPassword = $user->findvalue('./attrs/attr[@name = "hashedPassword"]/string/@value'); - my $hashedPasswordFile = $user->findvalue('./attrs/attr[@name = "hashedPasswordFile"]/string/@value'); - my $password = $user->findvalue('./attrs/attr[@name = "password"]/string/@value'); - my $passwordFile = $user->findvalue('./attrs/attr[@name = "passwordFile"]/string/@value'); - - if ($hashedPasswordFile) { - open(my $f, '<', $hashedPasswordFile) or die "Can't read file '$hashedPasswordFile'!"; - $hashedPassword = <$f>; - chomp $hashedPassword; - } - if ($passwordFile) { - open(my $f, '<', $passwordFile) or die "Can't read file '$passwordFile'!"; - $password = <$f>; - chomp $password; - } - - if ($hashedPassword) { - if (index($hashedPassword, "grub.pbkdf2.") == 0) { - $conf .= "\npassword_pbkdf2 $name $hashedPassword"; - } - else { - die "Password hash for GRUB user '$name' is not valid!"; - } - } - elsif ($password) { - $conf .= "\npassword $name $password"; + if ($hashedPassword) { + if (index($hashedPassword, "grub.pbkdf2.") == 0) { + $conf .= "\npassword_pbkdf2 $name $hashedPassword"; } else { - die "GRUB user '$name' has no password!"; + die "Password hash for GRUB user '$name' is not valid!"; } - push(@users, $name); } - if (@users) { - $conf .= "\nset superusers=\"" . join(' ',@users) . "\"\n"; + elsif ($password) { + $conf .= "\npassword $name $password"; } + else { + die "GRUB user '$name' has no password!"; + } + push(@users, $name); +} +if (@users) { + $conf .= "\nset superusers=\"" . join(' ',@users) . "\"\n"; +} - if ($copyKernels == 0) { - $conf .= " - " . $grubStore->search; - } - # FIXME: should use grub-mkconfig. - my $defaultEntryText = $defaultEntry; - if ($saveDefault) { - $defaultEntryText = "\"\${saved_entry}\""; - } +if ($copyKernels == 0) { $conf .= " - " . $grubBoot->search . " - if [ -s \$prefix/grubenv ]; then - load_env + " . $grubStore->search; +} +# FIXME: should use grub-mkconfig. +my $defaultEntryText = $defaultEntry; +if ($saveDefault) { + $defaultEntryText = "\"\${saved_entry}\""; +} +$conf .= " + " . $grubBoot->search . " + if [ -s \$prefix/grubenv ]; then + load_env + fi + + # ‘grub-reboot’ sets a one-time saved entry, which we process here and + # then delete. + if [ \"\${next_entry}\" ]; then + set default=\"\${next_entry}\" + set next_entry= + save_env next_entry + set timeout=1 + set boot_once=true + else + set default=$defaultEntryText + set timeout=$timeout + fi + + function savedefault { + if [ -z \"\${boot_once}\"]; then + saved_entry=\"\${chosen}\" + save_env saved_entry fi + } - # ‘grub-reboot’ sets a one-time saved entry, which we process here and - # then delete. - if [ \"\${next_entry}\" ]; then - set default=\"\${next_entry}\" - set next_entry= - save_env next_entry - set timeout=1 - set boot_once=true - else - set default=$defaultEntryText - set timeout=$timeout - fi + # Setup the graphics stack for bios and efi systems + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi +"; - function savedefault { - if [ -z \"\${boot_once}\"]; then - saved_entry=\"\${chosen}\" - save_env saved_entry - fi - } - - # Setup the graphics stack for bios and efi systems - if [ \"\${grub_platform}\" = \"efi\" ]; then - insmod efi_gop - insmod efi_uga - else - insmod vbe +if ($font) { + copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; + $conf .= " + insmod font + if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=$gfxpayloadEfi + else + set gfxmode=$gfxmodeBios + set gfxpayload=$gfxpayloadBios + fi + terminal_output gfxterm fi "; - - if ($font) { - copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; +} +if ($splashImage) { + # Keeps the image's extension. + my ($filename, $dirs, $suffix) = fileparse($splashImage, qr"\..[^.]*$"); + # The module for jpg is jpeg. + if ($suffix eq ".jpg") { + $suffix = ".jpeg"; + } + if ($backgroundColor) { $conf .= " - insmod font - if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=$gfxpayloadEfi - else - set gfxmode=$gfxmodeBios - set gfxpayload=$gfxpayloadBios - fi - terminal_output gfxterm - fi + background_color '$backgroundColor' "; } - if ($splashImage) { - # Keeps the image's extension. - my ($filename, $dirs, $suffix) = fileparse($splashImage, qr"\..[^.]*$"); - # The module for jpg is jpeg. - if ($suffix eq ".jpg") { - $suffix = ".jpeg"; - } - if ($backgroundColor) { + copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; + $conf .= " + insmod " . substr($suffix, 1) . " + if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then + set color_normal=white/black + set color_highlight=black/white + else + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi + "; +} + +rmtree("$bootPath/theme") or die "cannot clean up theme folder in $bootPath\n" if -e "$bootPath/theme"; + +if ($theme) { + # Copy theme + rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; + $conf .= " + # Sets theme. + set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt + export theme + # Load theme fonts, if any + "; + + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); $conf .= " - background_color '$backgroundColor' + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font "; } - copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; - $conf .= " - insmod " . substr($suffix, 1) . " - if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi - "; - } - - rmtree("$bootPath/theme") or die "cannot clean up theme folder in $bootPath\n" if -e "$bootPath/theme"; - - if ($theme) { - # Copy theme - rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; - $conf .= " - # Sets theme. - set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt - export theme - # Load theme fonts, if any - "; - - find( { wanted => sub { - if ($_ =~ /\.pf2$/i) { - $font = File::Spec->abs2rel($File::Find::name, $theme); - $conf .= " - loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font - "; - } - }, no_chdir => 1 }, $theme ); - } + }, no_chdir => 1 }, $theme ); } $conf .= "$extraConfig\n"; @@ -494,31 +474,19 @@ sub addEntry { readFile("$path/kernel-params"); my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : ""; - if ($grubVersion == 1) { - $conf .= "title $name\n"; - $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; - $conf .= " kernel $xen $xenParams\n" if $xen; - $conf .= " " . ($xen ? "module" : "kernel") . " $kernel $kernelParams\n"; - $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n"; - if ($saveDefault) { - $conf .= " savedefault\n"; - } - $conf .= "\n"; - } else { - $conf .= "menuentry \"$name\" " . $options . " {\n"; - if ($saveDefault) { - $conf .= " savedefault\n"; - } - $conf .= $grubBoot->search . "\n"; - if ($copyKernels == 0) { - $conf .= $grubStore->search . "\n"; - } - $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; - $conf .= " multiboot $xen $xenParams\n" if $xen; - $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; - $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n"; - $conf .= "}\n\n"; + $conf .= "menuentry \"$name\" " . $options . " {\n"; + if ($saveDefault) { + $conf .= " savedefault\n"; } + $conf .= $grubBoot->search . "\n"; + if ($copyKernels == 0) { + $conf .= $grubStore->search . "\n"; + } + $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; + $conf .= " multiboot $xen $xenParams\n" if $xen; + $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; + $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n"; + $conf .= "}\n\n"; } @@ -562,7 +530,7 @@ sub addProfile { my ($profile, $description) = @_; # Add entries for all generations of this profile. - $conf .= "submenu \"$description\" --class submenu {\n" if $grubVersion == 2; + $conf .= "submenu \"$description\" --class submenu {\n"; sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; } @@ -585,17 +553,15 @@ sub addProfile { addEntry("@distroName@ - Configuration " . nrFromGen($link) . " ($date - $version)", $link, $subEntryOptions, 0); } - $conf .= "}\n" if $grubVersion == 2; + $conf .= "}\n"; } addProfile "/nix/var/nix/profiles/system", "@distroName@ - All configurations"; -if ($grubVersion == 2) { - for my $profile (glob "/nix/var/nix/profiles/system-profiles/*") { - my $name = basename($profile); - next unless $name =~ /^\w+$/; - addProfile $profile, "@distroName@ - Profile '$name'"; - } +for my $profile (glob "/nix/var/nix/profiles/system-profiles/*") { + my $name = basename($profile); + next unless $name =~ /^\w+$/; + addProfile $profile, "@distroName@ - Profile '$name'"; } # extraPrepareConfig could refer to @bootPath@, which we have to substitute @@ -607,16 +573,14 @@ if ($extraPrepareConfig ne "") { } # write the GRUB config. -my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg"; +my $confFile = "$bootPath/grub/grub.cfg"; my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); # check whether to install GRUB EFI or not sub getEfiTarget { - if ($grubVersion == 1) { - return "no" - } elsif (($grub ne "") && ($grubEfi ne "")) { + if (($grub ne "") && ($grubEfi ne "")) { # EFI can only be installed when target is set; # A target is also required then for non-EFI grub if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } @@ -741,7 +705,7 @@ symlink "$bootPath", "$tmpDir/boot" or die "Failed to symlink $tmpDir/boot: $!"; if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { foreach my $dev (@deviceTargets) { next if $dev eq "nodev"; - print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n"; + print STDERR "installing the GRUB 2 boot loader on $dev...\n"; my @command = ("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev), @extraGrubInstallArgs); if ($forceInstall eq "true") { push @command, "--force"; @@ -756,7 +720,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { # install EFI GRUB if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { - print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; + print STDERR "installing the GRUB 2 boot loader into $efiSysMountPoint...\n"; my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", @extraGrubInstallArgs); if ($forceInstall eq "true") { push @command, "--force"; diff --git a/nixos/modules/system/boot/loader/grub/ipxe.nix b/nixos/modules/system/boot/loader/grub/ipxe.nix index adddcbee0164..d926b7ceaa6e 100644 --- a/nixos/modules/system/boot/loader/grub/ipxe.nix +++ b/nixos/modules/system/boot/loader/grub/ipxe.nix @@ -46,11 +46,7 @@ in config = mkIf (builtins.length scripts != 0) { - boot.loader.grub.extraEntries = - if config.boot.loader.grub.version == 2 then - toString (map grubEntry scripts) - else - throw "iPXE is not supported with GRUB 1."; + boot.loader.grub.extraEntries = toString (map grubEntry scripts); boot.loader.grub.extraFiles = { "ipxe.lkrn" = "${pkgs.ipxe}/ipxe.lkrn"; } diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix index ccb6e8cc3caf..ee969e9bff5b 100644 --- a/nixos/modules/system/boot/loader/grub/memtest.nix +++ b/nixos/modules/system/boot/loader/grub/memtest.nix @@ -84,15 +84,11 @@ in }) (mkIf (cfg.enable && !efiSupport) { - boot.loader.grub.extraEntries = - if config.boot.loader.grub.version == 2 then - '' - menuentry "Memtest86+" { - linux16 @bootRoot@/memtest.bin ${toString cfg.params} - } - '' - else - throw "Memtest86+ is not supported with GRUB 1."; + boot.loader.grub.extraEntries = '' + menuentry "Memtest86+" { + linux16 @bootRoot@/memtest.bin ${toString cfg.params} + } + ''; boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin"; }) diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index f29d368137ae..cd1ffdb6cbcc 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -12,7 +12,6 @@ with lib; # Generate a GRUB menu. boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.version = 2; boot.loader.timeout = 0; boot.growPartition = true; diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index c00b984c2ce0..ce5a482b1145 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -3,7 +3,6 @@ { ... }: { - boot.loader.grub.version = 2; boot.loader.grub.device = "nodev"; boot.initrd.kernelModules = diff --git a/nixos/tests/aaaaxy.nix b/nixos/tests/aaaaxy.nix index a1e1d44773c8..90b3c85e0c5f 100644 --- a/nixos/tests/aaaaxy.nix +++ b/nixos/tests/aaaaxy.nix @@ -3,14 +3,16 @@ meta.maintainers = with lib.maintainers; [ Luflosi ]; nodes.machine = { - hardware.opengl.enable = true; + imports = [ + ./common/x11.nix + ]; }; # This starts the game from a known state, feeds it a prerecorded set of button presses # and then checks if the final game state is identical to the expected state. # This is also what AAAAXY's CI system does and serves as a good sanity check. testScript = '' - machine.wait_for_unit("basic.target") + machine.wait_for_x() machine.succeed( # benchmark.dem needs to be in a mutable directory, @@ -18,7 +20,6 @@ "mkdir -p '/tmp/aaaaxy/assets/demos/'", "ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'", """ - '${pkgs.xvfb-run}/bin/xvfb-run' \ '${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \ 'aaaaxy' 'on track for Any%, All Paths and No Teleports' \ '${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3c8b163b1fc1..5459dd161b81 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -297,6 +297,7 @@ in { haste-server = handleTest ./haste-server.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; + harmonia = runTest ./harmonia.nix; headscale = handleTest ./headscale.nix {}; healthchecks = handleTest ./web-apps/healthchecks.nix {}; hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; diff --git a/nixos/tests/harmonia.nix b/nixos/tests/harmonia.nix new file mode 100644 index 000000000000..3057caf70160 --- /dev/null +++ b/nixos/tests/harmonia.nix @@ -0,0 +1,35 @@ +{ pkgs, lib, ... }: + +{ + name = "harmonia"; + + nodes = { + harmonia = { + services.harmonia = { + enable = true; + signKeyPath = pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg=="; + }; + + networking.firewall.allowedTCPPorts = [ 5000 ]; + system.extraDependencies = [ pkgs.emptyFile ]; + }; + + client01 = { + nix.settings = { + substituters = lib.mkForce [ "http://harmonia:5000" ]; + trusted-public-keys = lib.mkForce [ "cache.example.com-1:eIGQXcGQpc00x6/XFcyacLEUmC07u4RAEHt5Y8vdglo=" ]; + }; + }; + }; + + testScript = { nodes, ... }: '' + start_all() + + harmonia.wait_for_unit("harmonia.service") + client01.wait_until_succeeds("curl -f http://harmonia:5000/nix-cache-info") + client01.succeed("curl -f http://harmonia:5000/version | grep '${nodes.harmonia.services.harmonia.package.version}' >&2") + + client01.succeed("cat /etc/nix/nix.conf >&2") + client01.succeed("nix-store --realise ${pkgs.emptyFile} --store /root/other-store") + ''; +} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 51d0d232ebbf..28b93472263f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -10,7 +10,7 @@ with pkgs.lib; let # The configuration to install. - makeConfig = { bootLoader, grubVersion, grubDevice, grubIdentifier, grubUseEfi + makeConfig = { bootLoader, grubDevice, grubIdentifier, grubUseEfi , extraConfig, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' @@ -29,11 +29,6 @@ let ${optionalString systemdStage1 "boot.initrd.systemd.enable = true;"} ${optionalString (bootLoader == "grub") '' - boot.loader.grub.version = ${toString grubVersion}; - ${optionalString (grubVersion == 1) '' - boot.loader.grub.splashImage = null; - ''} - boot.loader.grub.extraConfig = "serial; terminal_output serial"; ${if grubUseEfi then '' boot.loader.grub.device = "nodev"; @@ -70,11 +65,11 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { bootLoader, createPartitions, grubVersion, grubDevice, grubUseEfi + testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi , grubIdentifier, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig }: - let iface = if grubVersion == 1 then "ide" else "virtio"; + let iface = "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd"; in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then '' @@ -122,7 +117,7 @@ let machine.succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2") machine.copy_from_host( "${ makeConfig { - inherit bootLoader grubVersion grubDevice grubIdentifier + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig; } }", @@ -193,7 +188,7 @@ let # doesn't know about the host-guest sharing mechanism. machine.copy_from_host_via_shell( "${ makeConfig { - inherit bootLoader grubVersion grubDevice grubIdentifier + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } @@ -222,7 +217,7 @@ let # doesn't know about the host-guest sharing mechanism. machine.copy_from_host_via_shell( "${ makeConfig { - inherit bootLoader grubVersion grubDevice grubIdentifier + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 2; } @@ -284,7 +279,7 @@ let { createPartitions, preBootCommands ? "", postBootCommands ? "", extraConfig ? "" , extraInstallerConfig ? {} , bootLoader ? "grub" # either "grub" or "systemd-boot" - , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false + , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false , enableOCR ? false, meta ? {} , testSpecialisationConfig ? false }: @@ -316,11 +311,9 @@ let # installer. This ensures the target disk (/dev/vda) is # the same during and after installation. virtualisation.emptyDiskImages = [ 512 ]; - virtualisation.rootDevice = - if grubVersion == 1 then "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive2" else "/dev/vdb"; + virtualisation.rootDevice = "/dev/vdb"; virtualisation.bootLoaderDevice = "/dev/vda"; - virtualisation.qemu.diskInterface = - if grubVersion == 1 then "scsi" else "virtio"; + virtualisation.qemu.diskInterface = "virtio"; # We don't want to have any networking in the guest whatsoever. # Also, if any vlans are enabled, the guest will reboot @@ -372,8 +365,7 @@ let # curl's tarball, we see what it's trying to download curl ] - ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub - ++ optionals (bootLoader == "grub" && grubVersion == 2) (let + ++ optionals (bootLoader == "grub") (let zfsSupport = lib.any (x: x == "zfs") (extraInstallerConfig.boot.supportedFilesystems or []); in [ @@ -392,7 +384,7 @@ let testScript = testScriptFun { inherit bootLoader createPartitions preBootCommands postBootCommands - grubVersion grubDevice grubIdentifier grubUseEfi extraConfig + grubDevice grubIdentifier grubUseEfi extraConfig testSpecialisationConfig; }; }; @@ -875,26 +867,6 @@ in { ''; }; - # Test a basic install using GRUB 1. - grub1 = makeInstallerTest "grub1" rec { - createPartitions = '' - machine.succeed( - "flock ${grubDevice} parted --script ${grubDevice} -- mklabel msdos" - + " mkpart primary linux-swap 1M 1024M" - + " mkpart primary ext2 1024M -1s", - "udevadm settle", - "mkswap ${grubDevice}-part1 -L swap", - "swapon -L swap", - "mkfs.ext3 -L nixos ${grubDevice}-part2", - "mount LABEL=nixos /mnt", - "mkdir -p /mnt/tmp", - ) - ''; - grubVersion = 1; - # /dev/sda is not stable, even when the SCSI disk number is. - grubDevice = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive1"; - }; - # Test using labels to identify volumes in grub simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix index ff83e96068a9..60f3b1a415da 100644 --- a/nixos/tests/sssd-ldap.nix +++ b/nixos/tests/sssd-ldap.nix @@ -6,17 +6,33 @@ let ldapRootPassword = "foobar"; testUser = "alice"; -in import ./make-test-python.nix ({pkgs, ...}: { + testPassword = "foobar"; + testNewPassword = "barfoo"; +in +import ./make-test-python.nix ({ pkgs, ... }: { name = "sssd-ldap"; meta = with pkgs.lib.maintainers; { - maintainers = [ bbigras ]; + maintainers = [ bbigras s1341 ]; }; nodes.machine = { pkgs, ... }: { + security.pam.services.systemd-user.makeHomeDir = true; + environment.etc."cert.pem".text = builtins.readFile ./common/acme/server/acme.test.cert.pem; + environment.etc."key.pem".text = builtins.readFile ./common/acme/server/acme.test.key.pem; services.openldap = { enable = true; + urlList = [ "ldap:///" "ldaps:///" ]; settings = { + attrs = { + olcTLSCACertificateFile = "/etc/cert.pem"; + olcTLSCertificateFile = "/etc/cert.pem"; + olcTLSCertificateKeyFile = "/etc/key.pem"; + olcTLSCipherSuite = "HIGH:MEDIUM:+3DES:+RC4:+aNULL"; + olcTLSCRLCheck = "none"; + olcTLSVerifyClient = "never"; + olcTLSProtocolMin = "3.1"; + }; children = { "cn=schema".includes = [ "${pkgs.openldap}/etc/schema/core.ldif" @@ -32,6 +48,23 @@ in import ./make-test-python.nix ({pkgs, ...}: { olcSuffix = dbSuffix; olcRootDN = "cn=${ldapRootUser},${dbSuffix}"; olcRootPW = ldapRootPassword; + olcAccess = [ + /* + custom access rules for userPassword attributes + */ + '' + {0}to attrs=userPassword + by self write + by anonymous auth + by * none'' + + /* + allow read on anything else + */ + '' + {1}to * + by * read'' + ]; }; }; }; @@ -55,7 +88,7 @@ in import ./make-test-python.nix ({pkgs, ...}: { dn: uid=${testUser},ou=accounts,ou=posix,${dbSuffix} objectClass: person objectClass: posixAccount - # userPassword: somePasswordHash + userPassword: ${testPassword} homeDirectory: /home/${testUser} uidNumber: 1234 gidNumber: 1234 @@ -78,7 +111,9 @@ in import ./make-test-python.nix ({pkgs, ...}: { [domain/${dbDomain}] auth_provider = ldap id_provider = ldap - ldap_uri = ldap://127.0.0.1:389 + ldap_uri = ldaps://127.0.0.1:636 + ldap_tls_reqcert = allow + ldap_tls_cacert = /etc/cert.pem ldap_search_base = ${dbSuffix} ldap_default_bind_dn = cn=${ldapRootUser},${dbSuffix} ldap_default_authtok_type = password @@ -97,5 +132,42 @@ in import ./make-test-python.nix ({pkgs, ...}: { else: machine.wait_for_console_text("Backend is online") machine.succeed("getent passwd ${testUser}") + + with subtest("Log in as ${testUser}"): + machine.wait_until_tty_matches("1", "login: ") + machine.send_chars("${testUser}\n") + machine.wait_until_tty_matches("1", "login: ${testUser}") + machine.wait_until_succeeds("pgrep login") + machine.wait_until_tty_matches("1", "Password: ") + machine.send_chars("${testPassword}\n") + machine.wait_until_succeeds("pgrep -u ${testUser} bash") + machine.send_chars("touch done\n") + machine.wait_for_file("/home/${testUser}/done") + + with subtest("Change ${testUser}'s password"): + machine.send_chars("passwd\n") + machine.wait_until_tty_matches("1", "Current Password: ") + machine.send_chars("${testPassword}\n") + machine.wait_until_tty_matches("1", "New Password: ") + machine.send_chars("${testNewPassword}\n") + machine.wait_until_tty_matches("1", "Reenter new Password: ") + machine.send_chars("${testNewPassword}\n") + machine.wait_until_tty_matches("1", "passwd: password updated successfully") + + with subtest("Log in as ${testUser} with new password in virtual console 2"): + machine.send_key("alt-f2") + machine.wait_until_succeeds("[ $(fgconsole) = 2 ]") + machine.wait_for_unit("getty@tty2.service") + machine.wait_until_succeeds("pgrep -f 'agetty.*tty2'") + + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("${testUser}\n") + machine.wait_until_tty_matches("2", "login: ${testUser}") + machine.wait_until_succeeds("pgrep login") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("${testNewPassword}\n") + machine.wait_until_succeeds("pgrep -u ${testUser} bash") + machine.send_chars("touch done2\n") + machine.wait_for_file("/home/${testUser}/done2") ''; }) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 9d621ee54177..aa148297c35f 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.10.4"; + version = "2.10.18"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-KEEPPtWxaY6+Nu/CE+AVAnaVZ30zmASWiIYaJt4a+3E="; - x86_64-darwin = "sha256-8Rkj1pV6tJygznbfELnAhzhh7ImnTm9dxCxCjYlWdnU="; + x86_64-linux = "sha256-oo3li8w1uem9lyFqwnrZ7Fl1R7Hrd8W+PHcIiaL2/+U="; + x86_64-darwin = "sha256-xYNp6WW8uPBrfuUgE5LI+1PuQK+vTA11eOtkz2ogpk0="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 3c75c73226e5..a9914e4e28b9 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.2.7"; + version = "1.2.8"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-E+1B+KgdvOuDyJP4W5tnkDe8sC4NdplRqY24Yu/DlEA=" else "sha256-TDgi0jwNRL0zXJSIBap0Q8WX29ab2HhY0ylb/sxgapE="; + sha256 = if stdenv.isDarwin then "sha256-c01Oc20henVRTNFAuiRH5xkxFH8k0Cfd4Z+0t8iUPEg=" else "sha256-KG73QaDY5njFzGhjWtjFNucZRcLtRGTrIPgG0sdonQw="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/applications/misc/oranda/default.nix new file mode 100644 index 000000000000..9bc9d68fb44e --- /dev/null +++ b/pkgs/applications/misc/oranda/default.nix @@ -0,0 +1,58 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, oniguruma +, openssl +, xz +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "oranda"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "axodotdev"; + repo = "oranda"; + rev = "v${version}"; + hash = "sha256-MT0uwLDrofCFyyYiUOogF2kNs6EPS1qxPz0gdK+Tkkg="; + }; + + cargoHash = "sha256-dAnZc1VvOubfn7mnpttaB6FotN3Xc+t9Qn0n5uzv1Qg="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + oniguruma + openssl + xz + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + # requires internet access + checkFlags = [ + "--skip=build" + ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + meta = with lib; { + description = "Generate beautiful landing pages for your developer tools"; + homepage = "https://github.com/axodotdev/oranda"; + changelog = "https://github.com/axodotdev/oranda/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/misc/osmtogeojson/default.nix b/pkgs/applications/misc/osmtogeojson/default.nix new file mode 100644 index 000000000000..5854d36b1e7a --- /dev/null +++ b/pkgs/applications/misc/osmtogeojson/default.nix @@ -0,0 +1,27 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "osmtogeojson"; + version = "3.0.0-beta.5"; + + src = fetchFromGitHub { + owner = "tyrasd"; + repo = pname; + rev = version; + hash = "sha256-T6d/KQQGoXHgV0iNhOms8d9zfjYMfnBNwPLShrEkHG4="; + }; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + npmDepsHash = "sha256-stAVuyjuRQthQ3jQdekmZYjeau9l0GzEEMkV1q5fT2k="; + dontNpmBuild = true; + + meta = with lib; { + description = "Converts OSM data to GeoJSON"; + homepage = "https://tyrasd.github.io/osmtogeojson/"; + maintainers = with maintainers; [ thibautmarty ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/misc/osmtogeojson/package-lock.json b/pkgs/applications/misc/osmtogeojson/package-lock.json new file mode 100644 index 000000000000..92979c78b203 --- /dev/null +++ b/pkgs/applications/misc/osmtogeojson/package-lock.json @@ -0,0 +1,2967 @@ +{ + "name": "osmtogeojson", + "version": "3.0.0-beta.5", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "osmtogeojson", + "version": "3.0.0-beta.5", + "license": "MIT", + "dependencies": { + "@mapbox/geojson-rewind": "0.5.2", + "@xmldom/xmldom": "0.8.3", + "concat-stream": "2.0.0", + "geojson-numeric": "0.2.1", + "htmlparser2": "3.5.1", + "JSONStream": "0.8.0", + "optimist": "~0.3.5", + "osm-polygon-features": "^0.9.1", + "tiny-osmpbf": "^0.1.0" + }, + "bin": { + "osmtogeojson": "osmtogeojson" + }, + "devDependencies": { + "expect.js": "~0.2.0", + "faucet": "~0.0.1", + "istanbul": "^0.4.5", + "mocha": "~10.1.0", + "tape": "~5.6.1" + }, + "engines": { + "node": ">=0.5" + }, + "optionalDependencies": { + "@types/geojson": "^7946.0" + } + }, + "node_modules/@mapbox/geojson-rewind": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", + "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", + "dependencies": { + "get-stream": "^6.0.1", + "minimist": "^1.2.6" + }, + "bin": { + "geojson-rewind": "geojson-rewind" + } + }, + "node_modules/@types/geojson": { + "version": "7946.0.10", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz", + "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==", + "optional": true + }, + "node_modules/@xmldom/xmldom": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.3.tgz", + "integrity": "sha512-Lv2vySXypg4nfa51LY1nU8yDAGo/5YwF+EY/rUZgIbfvwVARcd67ttCM8SMsTeJy51YhHYavEq+FS6R0hW9PFQ==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==", + "dev": true + }, + "node_modules/amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.4.2" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/argparse/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.every": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.every/-/array.prototype.every-1.1.4.tgz", + "integrity": "sha512-Aui35iRZk1HHLRAyF7QP0KAnOnduaQ6fo6k1NVWfRc0xTs2AZ70ytlXvOmkC6Di4JmUs2Wv3DYzGtCQFSk5uGg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.foreach": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/array.prototype.foreach/-/array.prototype.foreach-1.0.4.tgz", + "integrity": "sha512-OYqqGR/56CopyheXNwdlJvFtbSvf2Z9RGvL20X6GvAuKePJ76L/D46BqZn3bITd36QA2Ti7Iy0UwVJaD/YwXZA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-array-method-boxes-properly": "^1.0.0", + "get-intrinsic": "^1.1.3", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.join": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array.prototype.join/-/array.prototype.join-1.0.1.tgz", + "integrity": "sha512-wZy9B8ee6JWSiSStaXac/L5BvoaNDo29l/PaEeIrnpW6PzLGOPBsOzNb4xMTua/q/bLBDttN7n6zc2TSp6058g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.map": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.5.tgz", + "integrity": "sha512-gfaKntvwqYIuC7mLLyv2wzZIJqrRhn5PZ9EfFejSx6a78sV7iDsGpG9P+3oUPtm1Rerqm6nrKS4FYuTIvWfo3g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.push": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.prototype.push/-/array.prototype.push-1.0.3.tgz", + "integrity": "sha512-oFJY5zqd2Izh0mEyuAQYduuzjydpaSG3t9L2oepBZUjPlRr/sNd6jqKBt5xtR0ZEKsZkhCeBQecUK16uxfuRYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", + "has-property-descriptors": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.slice": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array.prototype.slice/-/array.prototype.slice-1.0.1.tgz", + "integrity": "sha512-3LqX5RpWG4uLrHQrc7pQmQIhbqdHI77/CSSzSzRP7zC/mUqujux5yGVTvhSli2B9+8Fux5DZKt90+f84Kl4HVw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", + "dev": true + }, + "node_modules/available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "engines": [ + "node >= 6.0" + ], + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-equal": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz", + "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "es-get-iterator": "^1.1.2", + "get-intrinsic": "^1.1.3", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.4.3", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/define-properties": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "dev": true, + "dependencies": { + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/defined": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", + "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "node_modules/domhandler": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz", + "integrity": "sha512-MFFBQFGkyTuNe3vL9WEw9JdlCwIoBYpOGESLeZAvc/jClYNsOl6P1KzevJbWg76GovdEycfR7/2/Ra7NnqtMKw==", + "dependencies": { + "domelementtype": "1" + } + }, + "node_modules/domutils": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz", + "integrity": "sha512-1UdPmldjSGewOuWE40YYFZB1Q4im4LZoCMXGYeTeLz3R9hvxrDYJPRcPHXR4yBbubQebgGNCY2hwpJxmAiUMzQ==", + "dependencies": { + "domelementtype": "1" + } + }, + "node_modules/dotignore": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz", + "integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==", + "dev": true, + "dependencies": { + "minimatch": "^3.0.4" + }, + "bin": { + "ignored": "bin/ignored" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/es-abstract": { + "version": "1.21.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", + "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-set-tostringtag": "^2.0.1", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.2.0", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", + "is-callable": "^1.2.7", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.10", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.4.3", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.7", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", + "typed-array-length": "^1.0.4", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "node_modules/es-get-iterator": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==", + "dev": true, + "dependencies": { + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=0.12.0" + }, + "optionalDependencies": { + "source-map": "~0.2.0" + } + }, + "node_modules/esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expect.js": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.2.0.tgz", + "integrity": "sha512-Si9lyFUkFCY9nTSKocf/Im/knEJNHUgbEWCNpRqiM5J2w+0YPxalJo0aomfh4WxlQiZ6kG97cZlN2UhAVxPAsA==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/faucet": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/faucet/-/faucet-0.0.4.tgz", + "integrity": "sha512-vSUB+9iT2n77DPv2x3zYEt3rEIGIhVZJmNTfrx3Y0XVXlBiNOPq2jJVOucqkZ6MNHCgVQUZ5xxe78LkkYCRSFg==", + "dev": true, + "dependencies": { + "array.prototype.foreach": "^1.0.4", + "array.prototype.join": "^1.0.1", + "array.prototype.map": "^1.0.5", + "array.prototype.push": "^1.0.3", + "array.prototype.slice": "^1.0.1", + "defined": "^1.0.1", + "duplexer": "^0.1.2", + "minimist": "^1.2.7", + "npm-which": "^1.0.2", + "readable-stream": "^2.3.7", + "safe-regex-test": "^1.0.0", + "sprintf-js": "^1.1.2", + "string.prototype.split": "^1.0.7", + "string.prototype.trim": "^1.2.7", + "tap-parser": "^0.7.0", + "tape": "^5.6.3", + "through2": "^0.2.3" + }, + "bin": { + "faucet": "bin/cmd.js" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/faucet/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, + "node_modules/faucet/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/faucet/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "node_modules/faucet/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/geojson-numeric": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/geojson-numeric/-/geojson-numeric-0.2.1.tgz", + "integrity": "sha512-rvItMp3W7pe16o2EQTnRw54v6WHdiE4bYjUsdr3FZskFb6oPC7gjLe4zginP+Wd1B/HLl2acTukfn16Lmwn7lg==", + "dependencies": { + "concat-stream": "2.0.0", + "optimist": "~0.3.5" + }, + "bin": { + "geojson-numeric": "geojson-numeric" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", + "dev": true, + "dependencies": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/handlebars": { + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/handlebars/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-dynamic-import": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-dynamic-import/-/has-dynamic-import-2.0.1.tgz", + "integrity": "sha512-X3fbtsZmwb6W7fJGR9o7x65fZoodygCrZ3TVycvghP62yYQfS0t4RS0Qcz+j5tQYUKeSWS09tHkWW6WhFV3XhQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/htmlparser2": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.5.1.tgz", + "integrity": "sha512-9ouaQ6sjVJZS4NhPC65zNm2JCJotiH6BVm6iFvI90hRcsIEISMrgjqMUrPpU9G1VS4vTspH4dyaqSRf6JLQPbg==", + "dependencies": { + "domelementtype": "1", + "domhandler": "2.2", + "domutils": "1.3", + "readable-stream": "1.1" + } + }, + "node_modules/htmlparser2/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" + }, + "node_modules/htmlparser2/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/htmlparser2/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/internal-slot": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", + "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", + "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/istanbul": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", + "integrity": "sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg==", + "deprecated": "This module is no longer maintained, try this instead:\n npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.", + "dev": true, + "dependencies": { + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "istanbul": "lib/cli.js" + } + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/js-yaml/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/jsonparse": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz", + "integrity": "sha512-fw7Q/8gFR8iSekUi9I+HqWIap6mywuoe7hQIg3buTVjuZgALKj4HAmm0X6f+TaL4c9NJbvyFQdaI2ppr5p6dnQ==", + "engines": [ + "node >= 0.2.0" + ] + }, + "node_modules/JSONStream": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.0.tgz", + "integrity": "sha512-PiV28BpoUorz9kKFwRbD7+wg0t/k0ITHKn0DgCU44YZ/GaGAZRPt9q5PzoifC85gE55SEPIdMu0Labfxevj8cw==", + "dependencies": { + "jsonparse": "0.0.5", + "through": "~2.2.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz", + "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==", + "dev": true, + "dependencies": { + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "node_modules/nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", + "dev": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-path": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-1.1.0.tgz", + "integrity": "sha512-wsL+YXGWlE3DWEqhpgKdt0RWxQrHKpVZ5u6uDYFSpxrxKYVPOctOun8q77VwD02zPTQD4wkc35elWPcocaICag==", + "dev": true, + "dependencies": { + "which": "^1.2.4" + }, + "bin": { + "npm-path": "bin/npm-path" + } + }, + "node_modules/npm-which": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-1.0.2.tgz", + "integrity": "sha512-y1s2PrTct2DuRudZNyu4+l4HteWFzaHcN+mMtA54htjA8xIzYza9casIqUdf+/Lqb4Zg2harBpCxBUt83Dwnuw==", + "dev": true, + "dependencies": { + "commander": "^2.2.0", + "npm-path": "^1.0.0", + "which": "^1.0.5" + }, + "bin": { + "npm-which": "bin/npm-which.js" + } + }, + "node_modules/object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==", + "dependencies": { + "wordwrap": "~0.0.2" + } + }, + "node_modules/optimist/node_modules/wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/osm-polygon-features": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/osm-polygon-features/-/osm-polygon-features-0.9.2.tgz", + "integrity": "sha512-5zNEFCq+G6X2TDkqbKYLF1+GtWVCCLA8zX+FVhSogsiTRsGquyaGRy5cYNW4BE3ci0MKOLvNTkFNsjsCNtgz0A==" + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/pbf": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", + "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", + "dependencies": { + "ieee754": "^1.1.12", + "resolve-protobuf-schema": "^2.1.0" + }, + "bin": { + "pbf": "bin/pbf" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "node_modules/protocol-buffers-schema": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz", + "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", + "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", + "dev": true + }, + "node_modules/resolve-protobuf-schema": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", + "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==", + "dependencies": { + "protocol-buffers-schema": "^3.3.1" + } + }, + "node_modules/resumer": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", + "integrity": "sha512-Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w==", + "dev": true, + "dependencies": { + "through": "~2.3.4" + } + }, + "node_modules/resumer/node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==", + "dev": true, + "optional": true, + "dependencies": { + "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true + }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.split": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.split/-/string.prototype.split-1.0.7.tgz", + "integrity": "sha512-nKEBpIMVowgjlHVshwjhv7Tq6bp3INe+0Ib4XNjTT5RbJwIrF1t5JJ2xWrICohhCuSa6HfSZUU1EJWBFven2+Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4", + "regexp.prototype.flags": "^1.4.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==", + "dev": true, + "dependencies": { + "has-flag": "^1.0.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tap-parser": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-0.7.0.tgz", + "integrity": "sha512-eg6Vt2kTjxJyjrt1luqrMD6jbOM2W5MCZ53ci6+9K97f/aQFI0R/01l70hTES66fTuqhMkNQQGjZESz+/7wsGA==", + "dev": true, + "dependencies": { + "inherits": "~2.0.1", + "minimist": "^0.2.0", + "readable-stream": "~1.1.11" + }, + "bin": { + "tap-parser": "bin/cmd.js" + } + }, + "node_modules/tap-parser/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true + }, + "node_modules/tap-parser/node_modules/minimist": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz", + "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tap-parser/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/tap-parser/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", + "dev": true + }, + "node_modules/tape": { + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/tape/-/tape-5.6.3.tgz", + "integrity": "sha512-cUDDGSbyoSIpdUAqbqLI/r7i/S4BHuCB9M5j7E/LrLs/x/i4zeAJ798aqo+FGo+kr9seBZwr8AkZW6rjceyAMQ==", + "dev": true, + "dependencies": { + "array.prototype.every": "^1.1.4", + "call-bind": "^1.0.2", + "deep-equal": "^2.2.0", + "defined": "^1.0.1", + "dotignore": "^0.1.2", + "for-each": "^0.3.3", + "get-package-type": "^0.1.0", + "glob": "^7.2.3", + "has": "^1.0.3", + "has-dynamic-import": "^2.0.1", + "inherits": "^2.0.4", + "is-regex": "^1.1.4", + "minimist": "^1.2.7", + "object-inspect": "^1.12.3", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "resolve": "^2.0.0-next.4", + "resumer": "^0.0.0", + "string.prototype.trim": "^1.2.7", + "through": "^2.3.8" + }, + "bin": { + "tape": "bin/tape" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tape/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tape/node_modules/resolve": { + "version": "2.0.0-next.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", + "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "dev": true, + "dependencies": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tape/node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "node_modules/through": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz", + "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==" + }, + "node_modules/through2": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", + "integrity": "sha512-mLa8Bn2mZurjyomGKWRu3Bo2mvoQojFks9NvOK8H+k4kDJNkdEqG522KFZsEFBEl6rKkxTgFbE5+OPcgfvPEHA==", + "dev": true, + "dependencies": { + "readable-stream": "~1.1.9", + "xtend": "~2.1.1" + } + }, + "node_modules/through2/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true + }, + "node_modules/through2/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/through2/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", + "dev": true + }, + "node_modules/tiny-inflate": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz", + "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==" + }, + "node_modules/tiny-osmpbf": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tiny-osmpbf/-/tiny-osmpbf-0.1.0.tgz", + "integrity": "sha512-Sl0xuDdM0+bnrYPhTAWnQ5eui8+2cpYCnsBxq0EFR1/IgmfB7+FiC23I8aa7tdP4AjaWvBUMK34kfXdY6C1LCQ==", + "dependencies": { + "pbf": "^3.0.4", + "tiny-inflate": "^1.0.2" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" + }, + "node_modules/uglify-js": { + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "dev": true, + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "dev": true, + "dependencies": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", + "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true + }, + "node_modules/workerpool": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==", + "dev": true, + "dependencies": { + "object-keys": "~0.4.0" + }, + "engines": { + "node": ">=0.4" + } + }, + "node_modules/xtend/node_modules/object-keys": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", + "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index bffe67491c35..872592a0436e 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet another telephony engine"; - homepage = "http://yate.null.ro/"; + homepage = "http://yate.ro/"; # Yate's license is GPL with an exception for linking with # OpenH323 and PWlib (licensed under MPL). license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 51de6c2f35f1..d7911acefb91 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "113.0.5672.63", - "sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn", - "sha256bin64": "08jvhvgh4hbx7q98m6ax9snd9h2dbw8sp5a73273m126sv7409l2", + "version": "113.0.5672.92", + "sha256": "199vi4ay9yrvi95r0ccfih1i7wnnqfh5vkqbr35mpmr4r19hnlm4", + "sha256bin64": "0xx1c4wy0px2sndllkzbfgmjihfysxcxdpxk0zmy5yranfqbxvdv", "deps": { "gn": { "version": "2023-03-18", diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix new file mode 100644 index 000000000000..8ceacdf1261e --- /dev/null +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zarf"; + version = "0.26.2"; + + src = fetchFromGitHub { + owner = "defenseunicorns"; + repo = "zarf"; + rev = "v${version}"; + hash = "sha256-45ZGHw/u0IkDJSlNaNg9At4rvBU9+CVix8Bp58hE6gk="; + }; + + vendorHash = "sha256-5k2NnQ18bL0v7YHTvw2nz5H5n5DQOmozkUhyf97eKl8="; + proxyVendor = true; + + preBuild = '' + mkdir -p build/ui + touch build/ui/index.html + ''; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X" "github.com/defenseunicorns/zarf/src/config.CLIVersion=${src.rev}" "-X" "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}" "-X" "k8s.io/component-base/version.gitCommit=${src.rev}" "-X" "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z" ]; + + meta = with lib; { + description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev"; + homepage = "https://github.com/defenseunicorns/zarf.git"; + license = licenses.asl20; + maintainers = with maintainers; [ ragingpastry ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8d2a74f641cc..fa78893008be 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.16.0"; - hash = "sha256-q7z7TS16RORPbEMJBEmF3m2q4IdD3dM1xqv1DfgM9Zs="; + version = "6.17.0"; + hash = "sha256-CSyFkO06yeExZAQBKQNGIwc3KEFcpibm5UM3ij2k+G8="; }; signal-desktop-beta = { dir = "Signal Beta"; diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 933d2288069a..b121b1c1ec5e 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "insync"; - version = "3.3.5.40925"; + version = "3.8.5.50499"; src = fetchurl { - url = "http://s.insynchq.com/builds/${pname}_${version}-focal_amd64.deb"; - sha256 = "sha256-lYlG/8d7teX98F5eDxm4EdBfFs7Sz3Td4kKLC6KZqnQ="; + url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-focal_amd64.deb"; + hash = "sha256-CtDwU0Cey12kDjEX+Y9x7pfKNARfKDopWsDVRaA1Zts="; }; postPatch = '' @@ -78,7 +78,5 @@ stdenv.mkDerivation rec { There is a 15-day free trial, and it is a paid application after that. ''; - # download URL removed - broken = true; }; } diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 45f0a1d7f462..62ea61af9192 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-frZzd+IV4IxfPK44PWOgV9yPRPoUB3smPbxoDchbaSc="; + sha256 = "sha256-8P3aa5hjTSlGAolIwiAlPhCg8nx/pfJJE7ZbOsbLsEU="; }; buildInputs = [ diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 8e883374066d..d5d6512c734a 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -68,10 +68,23 @@ mkDerivation (common "tamarin-prover" src // { isExecutable = true; patches = [ - # Backport of https://github.com/tamarin-prover/tamarin-prover/pull/536 to 1.6.1 + # Backport unreleased patch allowing maude 3.2.1 (fetchpatch { - url = "https://github.com/tamarin-prover/tamarin-prover/commit/95fbace0c5cbea57b5f320f6bb4d0387a4beab8d.patch"; - sha256 = "sha256-Wjf7C208kcskEN1op//HQZnhoZopKQS42JvE8kV5NhI="; + name = "tamarin-prover-allow-maude-3.2.1.patch"; + url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch"; + sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg"; + }) + # Backport unreleased patch allowing maude 3.2.2 + (fetchpatch { + name = "tamarin-prover-allow-maude-3.2.2.patch"; + url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch"; + sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy"; + }) + # Backport proposed patch allowing maude 3.3 and 3.3.1 + (fetchpatch { + name = "tamarin-prover-allow-maude-3.3.patch"; + url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch"; + sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681"; }) ]; diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index 11309392259d..0105148d9628 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { homepage = "https://labplot.kde.org"; license = with licenses; [ asl20 bsd3 cc-by-30 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus mit ]; maintainers = with maintainers; [ hqurve ]; + mainProgram = "labplot2"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 05ff1f09533f..20512617a379 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.22.0"; + version = "7.22.1"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-AVWgFsxeuHADEat83XQLLeQkzw3kaUdPL0rp8b6Rxyk="; + hash = "sha256-DYbcWBJEjSJWRXNdumDhhybKSs8ofyREWqj2ghrvmBE="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index d08f41852b7d..dc668e3639f2 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-FceyGNQwA6SFg97FtX4ATlevpLzG/FPVSoKBznWIfC8="; + hash = "sha256-OVZTHgzKGpz+F1hHRmbCgjMJSFFFjL9WQBqtx7vZIHc="; }; vendorHash = "sha256-iTPdOolvWINUSSYiPZAwn5ZF44x/x1tIWnKUHAn8ITA="; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index d84e61735811..3985c1925718 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-VAn4zXypOugPIVyXQ/8Yt0rCDM7hVdIY+jpmoTHqssU="; }; - buildInputs = [ qt5.qtwayland ]; + buildInputs = lib.optionals stdenv.isLinux [ qt5.qtwayland ]; propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ]; nativeCheckInputs = with python3Packages; [ git pytestCheckHook ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 8e20cc8a7944..105c2ce3e476 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv -, ruby_2_7, tzdata, git, nettools, nixosTests, nodejs, openssl +, ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: @@ -17,8 +17,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - # GitLab doesn't support Ruby 3 https://gitlab.com/groups/gitlab-org/-/epics/5149 - ruby = ruby_2_7; + ruby = ruby_3_0; gemdir = ./rubyEnv; gemset = let x = import (gemdir + "/gemset.nix") src; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 08cf38c2dbcb..86d7b0ae3b81 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "835ef6db789d6459876c083419d61e068de15dd3", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/835ef6db789d6459876c083419d61e068de15dd3.tar.gz", - "sha256": "11506nwsd15b3jhdydr54j0jk5pzj3qhs92c167xv0f0czw5pj8a", - "msg": "Update from Hackage at 2023-04-22T18:19:29Z" + "commit": "54b1e8a3a0447c7b969fd97816c4c0821ba9fec1", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/54b1e8a3a0447c7b969fd97816c4c0821ba9fec1.tar.gz", + "sha256": "1lryj166qysqkmdy9ll15dvg9f797zmy8brzpbavxb149pa6b0j9", + "msg": "Update from Hackage at 2023-04-29T17:51:14Z" } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a2cf737a2e13..76d63c9d695d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20230406"; - rev = "04b80850c535fa8c11f435711577296a99499105"; - sha256 = "190fpgg8sbcfp2l62vaqhk3wddkbz8vf5ivd7hw5gkcyyn5px3q9"; + version = "9.7.20230505"; + rev = "983ce55815f2dd57f84ee86eee97febf7d80b470"; + sha256 = "sha256-U+LZIe9WbF/DF5Zn8w8wkRf4JJHxgdY2ahM517bwRo4="; } diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix index 7724cbccd037..aa25fb77fc52 100644 --- a/pkgs/development/compilers/ldc/bootstrap.nix +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -1,11 +1,11 @@ { callPackage }: callPackage ./binary.nix { - version = "1.25.0"; + version = "1.30.0"; hashes = { - # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "sha256-6iKnbS+oalLKmyS8qYD/wS21b7+O+VgsWG2iT4PrWPU="; - linux-x86_64 = "sha256-sfg47RdlsIpryc3iZvE17OtLweh3Zw6DeuNJYgpuH+o="; - linux-aarch64 = "sha256-UDZ43x4flSo+SfsPeE8juZO2Wtk2ZzwySk0ADHnvJBI="; - osx-arm64 = "sha256-O/x0vy0wwQFaDc4uWSeMhx+chJKqbQb6e5QNYf+7DCw="; + # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. + osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk="; + linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE="; + linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y="; + osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4="; }; } diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5badb07e0d35..8b295f60e1c2 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.30.0"; - sha256 = "sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0="; + version = "1.31.0"; + sha256 = "sha256-8cjs6eHjWAbDRBvyT75mbN3Y7vN1WSwZzY/uRwHNVFg="; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 482ebb5571f8..f88f4484cfd1 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, sha256 }: -{ lib, stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata +{ lib, stdenv, fetchurl, cmake, ninja, llvm_14, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { patchShebangs . '' + '' - rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d + rm ldc-${version}-src/tests/dmd/fail_compilation/mixin_gc.d + rm ldc-${version}-src/tests/dmd/runnable/xtest46_gc.d + rm ldc-${version}-src/tests/dmd/runnable/testptrref_gc.d # test depends on current year - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d + rm ldc-${version}-src/tests/dmd/compilable/ddocYear.d '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # https://github.com/NixOS/nixpkgs/issues/34817 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { postPatch = '' # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + substituteInPlace tests/dmd/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_11.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_14.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ae9f441574be..e5504d4d5592 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-z550IAyo4Rbq9/S2Vwgec3sy7KH2n95PH0k8vo/pBSE="; + hash = "sha256-qsuKXYuKsMAALIy1SjxhEhZIMO8B4MF2vmVbwqgzLyM="; }; enableParallelBuilding = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 08e7dd4bb466..d55a1341cf4b 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-04-11"; + version = "unstable-2023-05-05"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz"; - sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y"; + url = "https://github.com/NixOS/cabal2nix/archive/078350047d358bb450d634d775493aba89b21212.tar.gz"; + sha256 = "0rsdn2zyw0zr6pi3dg6cm3i310alppigdsv20iqpx0dzykkicywj"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 73c982570134..6989c67211c5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -61,15 +61,15 @@ self: super: { # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_11_0; - hspec-discover = cself.hspec-discover_2_11_0; - hspec = cself.hspec_2_11_0; + hspec-core = cself.hspec-core_2_11_0_1; + hspec-discover = cself.hspec-discover_2_11_0_1; + hspec = cself.hspec_2_11_0_1; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_10* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_11_0 = dontCheck csuper.hspec-discover_2_11_0; + hspec-discover_2_11_0_1 = dontCheck csuper.hspec-discover_2_11_0_1; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -85,7 +85,7 @@ self: super: { (super.guardian.overrideScope (self: super: cabalInstallOverlay self super // { # Needs at least path-io 1.8.0 due to canonicalizePath changes - path-io = self.path-io_1_8_0; + path-io = self.path-io_1_8_1; } )) [ @@ -193,6 +193,10 @@ self: super: { # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); + # Test ldap server test/ldap.js is missing from sdist + # https://github.com/supki/ldap-client/issues/18 + ldap-client-og = dontCheck super.ldap-client-og; + # For -fghc-lib see cabal.project in haskell-language-server. stylish-haskell = if lib.versionAtLeast super.ghc.version "9.2" then enableCabalFlag "ghc-lib" @@ -205,6 +209,9 @@ self: super: { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + # Remove when Stackage LTS advances to this version, should be LTS-20.20 + utility-ht = doDistribute self.utility-ht_0_0_17; + vector = overrideCabal (old: { # Too strict bounds on doctest which isn't used, but is part of the configuration jailbreak = true; @@ -409,6 +416,22 @@ self: super: { # 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30 streamly-bytestring = dontCheck (doJailbreak super.streamly-bytestring); + # The package requires streamly == 0.9.*. + # (We can remove this once the assert starts failing.) + streamly-archive = super.streamly-archive.override { + streamly = + assert (builtins.compareVersions pkgs.haskellPackages.streamly.version "0.9.0" < 0); + pkgs.haskellPackages.streamly_0_9_0; + }; + + # The package requires streamly == 0.9.*. + # (We can remove this once the assert starts failing.) + streamly-lmdb = super.streamly-lmdb.override { + streamly = + assert (builtins.compareVersions pkgs.haskellPackages.streamly.version "0.9.0" < 0); + pkgs.haskellPackages.streamly_0_9_0; + }; + # base bound digit = doJailbreak super.digit; @@ -630,10 +653,6 @@ self: super: { }) ] (dontCheck super.snappy); - # 2023-04-22: omfort-fftw 0.0.0.1 contains fixes to the tests. We can drop - # this override as soon as stackage advances. - comfort-fftw = doDistribute super.comfort-fftw_0_0_0_1; - # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; @@ -1005,12 +1024,12 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_11_0; + hspec = self.hspec_2_11_0_1; hspec-wai = self.hspec-wai.override { - hspec = self.hspec_2_11_0; + hspec = self.hspec_2_11_0_1; }; hspec-contrib = self.hspec-contrib.override { - hspec-core = self.hspec-core_2_11_0; + hspec-core = self.hspec-core_2_11_0_1; }; fsnotify = self.fsnotify_0_4_1_0; }); @@ -1604,6 +1623,7 @@ self: super: { # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. # So let's not go there and just disable the tests altogether. hspec-core = dontCheck super.hspec-core; + hspec-core_2_7_10 = doDistribute (dontCheck super.hspec-core_2_7_10); # tests seem to require a different version of hspec-core hspec-contrib = dontCheck super.hspec-contrib; @@ -1674,16 +1694,16 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_11_0 = doDistribute (super.hspec_2_11_0.override { - hspec-discover = self.hspec-discover_2_11_0; - hspec-core = self.hspec-core_2_11_0; + hspec_2_11_0_1 = doDistribute (super.hspec_2_11_0_1.override { + hspec-discover = self.hspec-discover_2_11_0_1; + hspec-core = self.hspec-core_2_11_0_1; }); - hspec-discover_2_11_0 = doDistribute (super.hspec-discover_2_11_0.override { + hspec-discover_2_11_0_1 = doDistribute (super.hspec-discover_2_11_0_1.override { hspec-meta = self.hspec-meta_2_10_5; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0_1 # is overlayed to hspec-core. - hspec-core_2_11_0 = doDistribute (dontCheck (super.hspec-core_2_11_0.override { + hspec-core_2_11_0_1 = doDistribute (dontCheck (super.hspec-core_2_11_0_1.override { hspec-meta = self.hspec-meta_2_10_5; })); @@ -2632,4 +2652,13 @@ self: super: { # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; + + # Tests fail due to the newly-build fourmolu not being in PATH + # https://github.com/fourmolu/fourmolu/issues/231 + fourmolu_0_12_0_0 = dontCheck (super.fourmolu_0_12_0_0.overrideScope (lself: lsuper: { + Cabal-syntax = lself.Cabal-syntax_3_10_1_0; + ghc-lib-parser = lself.ghc-lib-parser_9_6_1_20230312; + parsec = lself.parsec_3_1_16_1; + text = lself.text_2_0_2; + })); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index a7b90341a620..c2cafa14a674 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -27,7 +27,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 stm = doJailbreak self.stm_2_5_1_0; - exceptions = dontCheck self.exceptions_0_10_5; + exceptions = dontCheck self.exceptions_0_10_7; ## OTHER PACKAGES @@ -108,4 +108,26 @@ self: super: # Need hedgehog for tests, which fails to compile due to dep on concurrent-output zenc = dontCheck super.zenc; + + hspec = self.hspec_2_7_10; + hspec-core = self.hspec-core_2_7_10; + hspec-meta = self.hspec-meta_2_7_8; + hspec-discover = self.hspec-discover_2_7_10; + + # ReferenceError: h$primop_ShrinkSmallMutableArrayOp_Char is not defined + unordered-containers = dontCheck super.unordered-containers; + + # Without this revert, test suites using tasty fail with: + # ReferenceError: h$getMonotonicNSec is not defined + # https://github.com/UnkindPartition/tasty/pull/345#issuecomment-1538216407 + tasty = appendPatch (pkgs.fetchpatch { + name = "tasty-ghcjs.patch"; + url = "https://github.com/UnkindPartition/tasty/commit/e692065642fd09b82acccea610ad8f49edd207df.patch"; + revert = true; + relative = "core"; + hash = "sha256-ryABU2ywkVOEPC/jWv8humT3HaRpCwMYEk+Ux3hhi/M="; + }) super.tasty; + + # Tests take unacceptably long. + vector = dontCheck super.vector; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b6cce1ca3586..fe9a23d01c86 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1173,8 +1173,10 @@ broken-packages: - directed-cubical - direct-fastcgi - direct-http + - directory-ospath-streaming # dependency missing in job https://hydra.nixos.org/build/219209527 at 2023-05-10 - direct-plugins - direm + - disco # failure building library in job https://hydra.nixos.org/build/219207076 at 2023-05-10 - discordian-calendar - discord-register - discord-types @@ -1897,6 +1899,7 @@ broken-packages: - Grempa - greplicate - gridfs + - grid-proto # failure building library in job https://hydra.nixos.org/build/219248049 at 2023-05-10 - grids - grm - GroteTrap @@ -5018,6 +5021,7 @@ broken-packages: - sqlvalue-list - srcinst - srt-dhall + - srtree # dependency missing in job https://hydra.nixos.org/build/219208055 at 2023-05-10 - sscan - ssh - ssh-tunnel @@ -5106,11 +5110,9 @@ broken-packages: - streaming-png - streaming-postgresql-simple - streaming-sort - - streamly-archive - streamly-binary - streamly-cassava - streamly-examples - - streamly-lmdb - streamly-lz4 - streamly-process - stream-monad @@ -5584,6 +5586,7 @@ broken-packages: - unamb-custom - unbeliever - unbounded-delays-units + - unbound-kind-generics # failure building library in job https://hydra.nixos.org/build/219201570 at 2023-05-10 - unboxed - unboxed-containers - unboxed-references @@ -5773,6 +5776,7 @@ broken-packages: - wai-middleware-travisci - wai-middleware-validation - wai-predicates + - wai-problem-details # dependency missing in job https://hydra.nixos.org/build/219206235 at 2023-05-10 - wai-rate-limit-postgres - wai-rate-limit-redis - wai-request-spec diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6b0deb65a979..7b242e42c69e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -368,6 +368,9 @@ package-maintainers: - taffybar - arbtt - lentil + shlok: + - streamly-archive + - streamly-lmdb sorki: - cayenne-lpp - blockfrost-client diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 9c1ebda9f7a4..88c4ee1f3c16 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.18 +# Stackage LTS 20.19 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -16,7 +16,7 @@ default-package-overrides: - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.8.4 - - aern2-mp ==0.2.11.0 + - aern2-mp ==0.2.15.0 - aern2-real ==0.2.11.0 - aeson ==2.0.3.0 - aeson-attoparsec ==0.0.0 @@ -43,7 +43,7 @@ default-package-overrides: - al ==0.1.4.2 - alarmclock ==0.7.0.6 - alerts ==0.1.2.0 - - alex ==3.2.7.2 + - alex ==3.2.7.3 - alex-meta ==0.3.0.13 - algebra ==4.3.1 - algebraic-graphs ==0.6.1 @@ -81,7 +81,7 @@ default-package-overrides: - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbtt ==0.12.0.1 - - arithmoi ==0.12.0.2 + - arithmoi ==0.12.1.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 @@ -217,7 +217,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - - bm ==0.1.0.2 + - bm ==0.1.1.0 - bmp ==1.2.6.3 - bnb-staking-csvs ==0.2.1.0 - BNFC ==2.9.4.1 @@ -253,12 +253,12 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - bugzilla-redhat ==1.0.1 - - burrito ==2.0.1.5 + - burrito ==2.0.1.6 - butcher ==1.3.3.2 - bv ==0.5 - byteable ==0.1.1 - bytebuild ==0.3.12.0 - - byte-count-reader ==0.10.1.9 + - byte-count-reader ==0.10.1.10 - bytedump ==1.0 - bytehash ==0.1.0.0 - byte-order ==0.1.3.0 @@ -380,7 +380,7 @@ default-package-overrides: - combinatorial ==0.1.1 - comfort-array ==0.5.2.1 - comfort-array-shape ==0.0 - - comfort-fftw ==0.0 + - comfort-fftw ==0.0.0.1 - comfort-graph ==0.0.3.2 - commonmark ==0.2.2 - commonmark-extensions ==0.2.3.4 @@ -447,8 +447,8 @@ default-package-overrides: - cookie ==0.4.6 - copr-api ==0.1.0 - core-data ==0.3.9.1 - - core-program ==0.6.5.1 - - core-telemetry ==0.2.8.0 + - core-program ==0.6.6.0 + - core-telemetry ==0.2.9.1 - core-text ==0.3.8.1 - countable ==1.2 - country ==0.2.3 @@ -486,7 +486,7 @@ default-package-overrides: - crypt-sha512 ==0 - csp ==1.4.0 - css-text ==0.1.3.0 - - c-struct ==0.1.1.2 + - c-struct ==0.1.1.3 - csv ==0.1.2 - csv-conduit ==0.7.3.0 - ctrie ==0.2 @@ -580,7 +580,7 @@ default-package-overrides: - dhall ==1.41.2 - dhall-bash ==1.0.40 - dhall-json ==1.7.11 - - dhall-yaml ==1.2.11 + - dhall-yaml ==1.2.12 - di ==1.3 - diagrams ==1.4.0.1 - diagrams-builder ==0.8.0.5 @@ -613,7 +613,7 @@ default-package-overrides: - distributive ==0.6.2.1 - diversity ==0.8.1.0 - djinn-lib ==0.0.1.4 - - dl-fedora ==0.9.4 + - dl-fedora ==0.9.5 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.2 @@ -658,7 +658,7 @@ default-package-overrides: - dyre ==0.9.1 - eap ==0.9.0.2 - Earley ==0.13.0.1 - - easy-file ==0.2.3 + - easy-file ==0.2.4 - easy-logger ==0.1.0.7 - Ebnf2ps ==1.0.15 - echo ==0.1.4 @@ -860,14 +860,14 @@ default-package-overrides: - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.3 - generic-functor ==1.1.0.0 - - generic-lens ==2.2.1.0 + - generic-lens ==2.2.2.0 - generic-lens-core ==2.2.1.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.2.1.0 - GenericPretty ==1.2.2 - generic-random ==1.5.0.1 - generics-eot ==0.4.0.1 - - generics-sop ==0.5.1.2 + - generics-sop ==0.5.1.3 - generics-sop-lens ==0.2.0.1 - genvalidity ==1.1.0.0 - genvalidity-aeson ==1.0.0.1 @@ -1073,7 +1073,7 @@ default-package-overrides: - hedgehog-fakedata ==0.0.1.5 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.15.1 + - hedis ==0.15.2 - hedn ==0.3.0.4 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1318,7 +1318,7 @@ default-package-overrides: - inline-c-cpp ==0.5.0.0 - inliterate ==0.1.0 - input-parsers ==0.2.3.2 - - insert-ordered-containers ==0.2.5.1 + - insert-ordered-containers ==0.2.5.2 - inspection-testing ==0.4.6.1 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.3.1 @@ -1376,7 +1376,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - - json-feed ==2.0.0.7 + - json-feed ==2.0.0.8 - jsonifier ==0.2.1.2 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 @@ -1409,7 +1409,7 @@ default-package-overrides: - koji ==0.0.2 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==2.0.0.5 + - lackey ==2.0.0.6 - LambdaHack ==0.11.0.0 - lame ==0.2.0 - language-avro ==0.1.4.0 @@ -1452,7 +1452,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.0.0 - - lentil ==1.5.5.1 + - lentil ==1.5.5.2 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 @@ -1471,7 +1471,7 @@ default-package-overrides: - linear ==1.21.10 - linear-base ==0.3.1 - linear-generics ==0.2.1 - - linebreak ==1.1.0.3 + - linebreak ==1.1.0.4 - linenoise ==0.3.2 - linux-capabilities ==0.1.1.0 - linux-file-extents ==0.2.0.0 @@ -1516,7 +1516,7 @@ default-package-overrides: - lxd-client-config ==0.1.0.1 - lz4 ==0.2.3.1 - lz4-frame-conduit ==0.1.0.1 - - lzma ==0.0.0.4 + - lzma ==0.0.1.0 - lzma-clib ==5.2.2 - lzma-conduit ==1.2.3 - machines ==0.7.3 @@ -1619,7 +1619,7 @@ default-package-overrides: - monadlist ==0.0.2 - monadloc ==0.7.1 - monad-logger ==0.3.39 - - monad-logger-aeson ==0.4.0.3 + - monad-logger-aeson ==0.4.0.4 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 - monad-logger-prefix ==0.1.12 @@ -1652,15 +1652,15 @@ default-package-overrides: - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.2.0 - more-containers ==0.2.2.2 - - morpheus-graphql ==0.27.1 - - morpheus-graphql-app ==0.27.1 - - morpheus-graphql-client ==0.27.1 - - morpheus-graphql-code-gen ==0.27.1 - - morpheus-graphql-code-gen-utils ==0.27.1 - - morpheus-graphql-core ==0.27.1 - - morpheus-graphql-server ==0.27.1 - - morpheus-graphql-subscriptions ==0.27.1 - - morpheus-graphql-tests ==0.27.1 + - morpheus-graphql ==0.27.2 + - morpheus-graphql-app ==0.27.2 + - morpheus-graphql-client ==0.27.2 + - morpheus-graphql-code-gen ==0.27.2 + - morpheus-graphql-code-gen-utils ==0.27.2 + - morpheus-graphql-core ==0.27.2 + - morpheus-graphql-server ==0.27.2 + - morpheus-graphql-subscriptions ==0.27.2 + - morpheus-graphql-tests ==0.27.2 - moss ==0.2.0.1 - mountpoints ==1.0.2 - mpi-hs ==0.7.2.0 @@ -1780,7 +1780,7 @@ default-package-overrides: - OneTuple ==0.3.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.9.6.1 + - opaleye ==0.9.6.2 - OpenAL ==1.7.0.5 - openapi3 ==3.2.3 - open-browser ==0.2.1.0 @@ -1995,7 +1995,7 @@ default-package-overrides: - print-console-colors ==0.1.0.0 - probability ==0.2.8 - process-extras ==0.7.4 - - product-profunctors ==0.11.0.3 + - product-profunctors ==0.11.1.1 - profiterole ==0.1 - profiteur ==0.4.6.1 - profunctors ==5.6.2 @@ -2012,12 +2012,12 @@ default-package-overrides: - protobuf-simple ==0.1.1.1 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.1.2 + - proto-lens ==0.7.1.3 - proto-lens-arbitrary ==0.1.2.11 - - proto-lens-optparse ==0.1.1.9 + - proto-lens-optparse ==0.1.1.10 - proto-lens-protobuf-types ==0.7.1.2 - proto-lens-protoc ==0.7.1.1 - - proto-lens-runtime ==0.7.0.3 + - proto-lens-runtime ==0.7.0.4 - proto-lens-setup ==0.4.0.6 - protolude ==0.3.3 - proxied ==0.3.1 @@ -2035,8 +2035,8 @@ default-package-overrides: - PyF ==0.11.1.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.6 - - qrcode-juicypixels ==0.8.4 + - qrcode-core ==0.9.7 + - qrcode-juicypixels ==0.8.5 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - QuickCheck ==2.14.2 @@ -2049,7 +2049,7 @@ default-package-overrides: - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - - quickcheck-state-machine ==0.7.1 + - quickcheck-state-machine ==0.7.2 - quickcheck-text ==0.1.2.1 - quickcheck-transformer ==0.3.1.2 - quickcheck-unicode ==1.0.1.0 @@ -2060,12 +2060,12 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.5 + - rampart ==2.0.0.6 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.1 - random-bytestring ==0.1.4 - - random-fu ==0.3.0.0 + - random-fu ==0.3.0.1 - random-shuffle ==0.0.4 - random-tree ==0.6.0.5 - range ==0.3.0.2 @@ -2077,7 +2077,7 @@ default-package-overrides: - rank2classes ==1.4.6 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.7 + - ratel ==2.0.0.8 - ratel-wai ==2.0.0.4 - ratio-int ==0.1.2 - rattle ==0.2 @@ -2151,7 +2151,7 @@ default-package-overrides: - resource-pool ==0.2.3.2 - resourcet ==1.2.6 - result ==0.2.6.0 - - retry ==0.9.3.0 + - retry ==0.9.3.1 - rev-state ==0.1.2 - rex ==0.6.2 - rfc1751 ==0.1.3 @@ -2181,7 +2181,7 @@ default-package-overrides: - run-haskell-module ==0.0.2 - runmemo ==1.0.0.1 - run-st ==0.1.1.0 - - rvar ==0.3.0.1 + - rvar ==0.3.0.2 - s3-signer ==0.5.0.0 - safe ==0.3.19 - safe-coloured-text ==0.2.0.1 @@ -2203,9 +2203,9 @@ default-package-overrides: - sample-frame-np ==0.0.5 - sampling ==0.3.5 - sandi ==0.5 - - sandwich ==0.1.3.1 + - sandwich ==0.1.3.2 - sandwich-hedgehog ==0.1.1.0 - - sandwich-quickcheck ==0.1.0.6 + - sandwich-quickcheck ==0.1.0.7 - sandwich-slack ==0.1.1.0 - sandwich-webdriver ==0.1.2.0 - say ==0.1.0.1 @@ -2221,7 +2221,7 @@ default-package-overrides: - scientist ==0.0.0.0 - scotty ==0.12.1 - scrypt ==0.5.0 - - sdl2 ==2.5.4.0 + - sdl2 ==2.5.5.0 - sdl2-gfx ==0.3.0.0 - sdl2-image ==2.1.0.0 - sdl2-mixer ==1.2.0.0 @@ -2244,7 +2244,7 @@ default-package-overrides: - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.4 - - sendgrid-v3 ==1.0.0.0 + - sendgrid-v3 ==1.0.0.1 - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 @@ -2335,7 +2335,7 @@ default-package-overrides: - simple-media-timestamp-attoparsec ==0.1.0.0 - simple-media-timestamp-formatting ==0.1.1.0 - simple-reflect ==0.3.3 - - simple-sendfile ==0.2.30 + - simple-sendfile ==0.2.31 - simple-vec3 ==0.6.0.1 - since ==0.0.0 - singleton-bool ==0.1.6 @@ -2423,7 +2423,7 @@ default-package-overrides: - stm-containers ==1.2.0.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.10 + - stm-hamt ==1.2.0.11 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 @@ -2451,7 +2451,7 @@ default-package-overrides: - strict-base-types ==0.7 - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.2 - - strict-list ==0.1.7 + - strict-list ==0.1.7.1 - strict-tuple ==0.1.5.2 - strict-wrapper ==0.0.0.0 - stringable ==0.1.3 @@ -2460,7 +2460,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.2.0 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.2.0 + - string-interpolate ==0.3.2.1 - stringprep ==1.0.0 - string-qq ==0.0.4 - string-random ==0.1.4.3 @@ -2482,7 +2482,7 @@ default-package-overrides: - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - - swagger2 ==2.8.6 + - swagger2 ==2.8.7 - swish ==0.10.4.0 - syb ==0.7.2.3 - syb-with-class ==0.6.1.14 @@ -2530,7 +2530,7 @@ default-package-overrides: - tasty ==1.4.3 - tasty-ant-xml ==1.1.8 - tasty-autocollect ==0.3.2.0 - - tasty-bench ==0.3.3 + - tasty-bench ==0.3.4 - tasty-dejafu ==2.1.0.0 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 @@ -2649,7 +2649,7 @@ default-package-overrides: - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - timerep ==2.1.0.0 - - timers-tick ==0.5.0.3 + - timers-tick ==0.5.0.4 - timer-wheel ==0.4.0.1 - timespan ==0.4.0.0 - time-units ==1.0.0 @@ -2732,7 +2732,7 @@ default-package-overrides: - ulid ==0.3.2.0 - unagi-chan ==0.4.1.4 - unbounded-delays ==0.1.1.1 - - unbound-generics ==0.4.2 + - unbound-generics ==0.4.3 - unboxed-ref ==0.4.0.0 - unboxing-vector ==0.2.0.0 - uncaught-exception ==0.1.0 @@ -2824,7 +2824,7 @@ default-package-overrides: - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.4 - vector-extras ==0.2.8 - - vector-instances ==3.4 + - vector-instances ==3.4.2 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.2 - vector-sized ==1.5.0 @@ -2878,7 +2878,7 @@ default-package-overrides: - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 - - webby ==1.1.0 + - webby ==1.1.1 - webdriver ==0.10.0.1 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fd166bf7fd32..5b6f8b2737c7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1270,7 +1270,6 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora - - dl-fedora_0_9_5 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1284,6 +1283,7 @@ dont-distribute-packages: - doc-review - domain - domain-aeson + - domain-aeson_0_1_1_1 - domain-cereal - domaindriven - dormouse-client @@ -3007,6 +3007,7 @@ dont-distribute-packages: - pandoc-crossref_0_3_15_2 - pandoc-highlighting-extensions - pandoc-japanese-filters + - pandoc-symreg - pandora-io - papa - papa-base @@ -3247,7 +3248,6 @@ dont-distribute-packages: - quickcheck-relaxng - quickcheck-state-machine - quickcheck-state-machine-distributed - - quickcheck-state-machine_0_7_2 - quicktest - quipper - quipper-algorithms diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2681418dc3d2..3ae94f1a9947 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -514,7 +514,8 @@ self: super: builtins.intersectAttrs super { libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64 - || pkgs.stdenv.hostPlatform.isx86_64)) [ + || pkgs.stdenv.hostPlatform.isx86_64) + || (self.ghc.isGhcjs or false)) [ self.unbounded-delays ]; }) super.tasty; @@ -906,6 +907,9 @@ self: super: builtins.intersectAttrs super { # Pass the correct libarchive into the package. streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; + # Pass the correct lmdb into the package. + streamly-lmdb = super.streamly-lmdb.override { lmdb = pkgs.lmdb; }; + hlint = overrideCabal (drv: { postInstall = '' install -Dm644 data/hlint.1 -t "$out/share/man/man1" @@ -1015,14 +1019,6 @@ self: super: builtins.intersectAttrs super { hnix-store-core = super.hnix-store-core_0_6_1_0; }); - hercules-ci-api-core = - # 2023-05-02: Work around a corrupted file on cache.nixos.org. This is a hash for x86_64-linux. Remove when it has changed. - if super.hercules-ci-api-core.drvPath == "/nix/store/dgy3w43zypmdswc7a7zis0njgljqvnq0-hercules-ci-api-core-0.1.5.0.drv" - then super.hercules-ci-api-core.overrideAttrs (_: { - dummyAttr = 1; - }) - else super.hercules-ci-api-core; - hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: { @@ -1234,4 +1230,7 @@ self: super: builtins.intersectAttrs super { keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; + # Disable checks to break dependency loop with SCalendar + scalendar = dontCheck super.scalendar; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 95a32c3349e4..e28601fe3139 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14937,6 +14937,28 @@ self: { mainProgram = "nanoid"; }) {}; + "NanoID_3_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, extra, mwc-random + , optparse-applicative, text + }: + mkDerivation { + pname = "NanoID"; + version = "3.3.0"; + sha256 = "1334i8hqacsd2nr9798dibdfn7dci2r4afhhghch5nwcxm15qk6i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cereal extra mwc-random text + ]; + executableHaskellDepends = [ + base bytestring mwc-random optparse-applicative + ]; + description = "NanoID generator"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "nanoid"; + }) {}; + "NanoProlog" = callPackage ({ mkDerivation, base, containers, ListLike, uu-parsinglib }: mkDerivation { @@ -17394,7 +17416,7 @@ self: { version = "0.0.5"; sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq"; libraryHaskellDepends = [ base ]; - description = "Pure haskell Red-Black-Tree implementation"; + description = "Pure haskell Red-Black-Tree implemetation"; license = lib.licenses.bsd3; }) {}; @@ -20821,10 +20843,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.202.2.0"; - sha256 = "1w074jr2qr603hjh644cvlc0n1miaz10r8mhkskq39jn184kriyl"; - revision = "1"; - editedCabalFile = "1chcybl7wf1kkf4mnjxm3vd7hdjmq6fkc8x1hn9fydln57wjzw0v"; + version = "0.203.0.0"; + sha256 = "03c8bn7m5a9rjsna55g1qrfwnn195kgz4dm30czrb6blpd0giyhy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25518,27 +25538,6 @@ self: { }) {}; "aern2-mp" = callPackage - ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec - , integer-logarithms, mixed-types-num, QuickCheck, reflection - , regex-tdfa, template-haskell - }: - mkDerivation { - pname = "aern2-mp"; - version = "0.2.11.0"; - sha256 = "17syak48rqqlssk4gsxdfl21sidfypfwsyfmxsakahflcvl9jgpy"; - libraryHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - testHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - description = "Multi-precision ball (interval) arithmetic"; - license = lib.licenses.bsd3; - }) {}; - - "aern2-mp_0_2_15_0" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell @@ -25557,7 +25556,6 @@ self: { ]; description = "Multi-precision ball (interval) arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aern2-real" = callPackage @@ -26625,7 +26623,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson-typescript_0_5_0_0" = callPackage + "aeson-typescript_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, mtl, process, string-interpolate , template-haskell, temporary, text, th-abstraction, transformers @@ -26633,8 +26631,8 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.5.0.0"; - sha256 = "0c1pgfzwp91n1ni25lg0pvhr3p513523dbq54sj7mfa7ri85290q"; + version = "0.6.0.0"; + sha256 = "1dlbxma80vjw19c8b5b0msmsd55rpnxxqb147ppy1w4d4yvsmrr3"; libraryHaskellDepends = [ aeson base containers mtl string-interpolate template-haskell text th-abstraction transformers unordered-containers @@ -26685,6 +26683,24 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-value-parser_0_19_7_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable + , megaparsec, mtl, scientific, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-value-parser"; + version = "0.19.7.1"; + sha256 = "1w62li1g1hfdc9hf45x49fgdqs6jap06pq6nq9wr9vlmcnrzb34i"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable megaparsec mtl scientific + text transformers unordered-containers vector + ]; + description = "API for parsing \"aeson\" JSON tree into Haskell types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-via" = callPackage ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, tasty , tasty-hunit, text @@ -27572,24 +27588,6 @@ self: { }) {}; "alex" = callPackage - ({ mkDerivation, array, base, containers, directory, happy, process - }: - mkDerivation { - pname = "alex"; - version = "3.2.7.2"; - sha256 = "04yfq9inq6waw1imkj3xqfg2riijzzwlnphbll7r9gjvraw8gpmy"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ array base containers directory ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = lib.licenses.bsd3; - mainProgram = "alex"; - }) {}; - - "alex_3_2_7_3" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { @@ -27604,7 +27602,6 @@ self: { testHaskellDepends = [ base process ]; description = "Alex is a tool for generating lexical analysers in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "alex"; }) {}; @@ -35002,36 +34999,6 @@ self: { }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, chimera, constraints, containers - , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots - , mod, QuickCheck, quickcheck-classes, random, semirings - , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck - , tasty-rerun, tasty-smallcheck, transformers, vector - }: - mkDerivation { - pname = "arithmoi"; - version = "0.12.0.2"; - sha256 = "03mxkzcg2pik4p1ik648h3w953zmf47ycafm2gd7hgg4gadsnslj"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base chimera constraints containers deepseq exact-pi - integer-gmp integer-logarithms integer-roots mod random semirings - transformers vector - ]; - testHaskellDepends = [ - base containers exact-pi integer-gmp integer-roots mod QuickCheck - quickcheck-classes random semirings smallcheck tasty tasty-hunit - tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector - ]; - benchmarkHaskellDepends = [ - array base constraints containers deepseq integer-logarithms mod - random semirings tasty-bench vector - ]; - description = "Efficient basic number-theoretic functions"; - license = lib.licenses.mit; - }) {}; - - "arithmoi_0_12_1_0" = callPackage ({ mkDerivation, array, base, chimera, constraints, containers , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots , mod, QuickCheck, quickcheck-classes, random, semirings @@ -35059,7 +35026,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "arity-generic-liftA" = callPackage @@ -37753,6 +37719,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.1.0.0"; sha256 = "0ji6rcz49caqpj85dg8gs90cnc15500qyyh4b3n598a8qhbsh28i"; + revision = "1"; + editedCabalFile = "1h84bvjji5kwk54fr8q2gs8qhb39xwsm585s3472vvjh54dllf31"; libraryHaskellDepends = [ attoparsec base base-compat-batteries text time time-compat ]; @@ -41327,8 +41295,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "15"; - editedCabalFile = "0yka3aazfd5jj0dqh89cpjc8sgx3yhiiqfhrpb9z5p4zvbyvym6g"; + revision = "17"; + editedCabalFile = "1wbwmwab30g41d9m1xb0vqlfnla6h2f6if53vv99dasd03jqd32l"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -47867,10 +47835,8 @@ self: { }: mkDerivation { pname = "bm"; - version = "0.1.0.2"; - sha256 = "1rpwlbhn5fkndw19ryksm9x2fcg7z7xscigi4zfs9v4w16skn7zj"; - revision = "3"; - editedCabalFile = "12san5rjl486n4wf3918bd3rm64n52d82vgz85pjb8gc2s8drdk1"; + version = "0.1.1.0"; + sha256 = "0w8zqf01c4rzqsbh6bsjxqqh8j2mlh5i3iiba4m529kd3m6sxjp5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49471,8 +49437,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.2"; - sha256 = "1qi7p9qj8v7k5sacvdkfr2f4mjaazg6yc6v17bxfxg3h3cswb2az"; + version = "0.1.1.3"; + sha256 = "0pa3k28qia4pjmiwv8zmzka7vmfgqwf570b6fjigxvid4wlh58d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -49544,8 +49510,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.0"; - sha256 = "1d6akj5mlaycp7rgf7b5krpc3i8cypxnswcqrllhlics7ivycl79"; + version = "2.2.0.1"; + sha256 = "0iplqfvvb5q7p99fgizj0py350sghmmd7pgyq87yx28rv4d4mbm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50929,8 +50895,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "2.0.1.5"; - sha256 = "1lkv9ibz627yfk4lxj6vhzz3grahc2ckc6rn41gz1wnbv893f6qa"; + version = "2.0.1.6"; + sha256 = "1q8ahf5czy2lc8jvlx648ns6ir7q6wmb3zrgzksvznrrb8r163hv"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -51312,8 +51278,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.9"; - sha256 = "0k9ayxy7snxp0wc9wqqb8yka4zyc6s3bkm98znzbpznhqld81x8v"; + version = "0.10.1.10"; + sha256 = "0g9l8razsdy4y4s81p4w7djck6266y6p592a5vycg9z5521wayj4"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -52341,8 +52307,8 @@ self: { ({ mkDerivation, array, base, primitive, template-haskell }: mkDerivation { pname = "c-struct"; - version = "0.1.1.2"; - sha256 = "179sqqzik48xf9axhm3m9y6qv8028lh7l16cr79z85ddkvry7avd"; + version = "0.1.1.3"; + sha256 = "190xw0bjzmwzw3lav5cb7gs11wd42hj7a8pggn3nxrp46fvqf07i"; libraryHaskellDepends = [ array base primitive template-haskell ]; testHaskellDepends = [ array base primitive template-haskell ]; description = "To make a wrapper for struct of C language"; @@ -52539,8 +52505,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.20"; - sha256 = "005vpmjpxrnj84pn7qjswjrb0vzmyhid2lr923q7m4rr3bi78ac1"; + version = "0.2.21"; + sha256 = "06hpsqanj0c3wy8jmk29gg3ma189fw8l41jx4k53zdjgx9x9wqmv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53487,6 +53453,35 @@ self: { mainProgram = "cabal-plan"; }) {}; + "cabal-plan_0_7_3_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.3.0"; + sha256 = "0rjyf5dh13kqwjr520i4w1g7y37nv4rn7vbpkgcjf5qi9f2m9p6c"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-plan"; + }) {}; + "cabal-plan-bounds" = callPackage ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax , containers, optparse-applicative, pretty, text @@ -64388,27 +64383,6 @@ self: { }) {}; "comfort-fftw" = callPackage - ({ mkDerivation, base, comfort-array, deepseq - , doctest-exitcode-stdio, doctest-lib, fftw-ffi, netlib-ffi - , non-empty, QuickCheck, storable-record - }: - mkDerivation { - pname = "comfort-fftw"; - version = "0.0"; - sha256 = "1g43fj1wmzdsfqz9axrq35bp2ad2900zcqvf9b2w57k3pl2cdk65"; - libraryHaskellDepends = [ - base comfort-array deepseq fftw-ffi netlib-ffi QuickCheck - ]; - testHaskellDepends = [ - base comfort-array deepseq doctest-exitcode-stdio doctest-lib - netlib-ffi non-empty QuickCheck storable-record - ]; - description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-fftw_0_0_0_1" = callPackage ({ mkDerivation, base, comfort-array, deepseq , doctest-exitcode-stdio, doctest-lib, fftw-ffi, netlib-ffi , non-empty, QuickCheck, storable-record @@ -64426,26 +64400,26 @@ self: { ]; description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; "comfort-glpk" = callPackage ({ mkDerivation, base, comfort-array, deepseq , doctest-exitcode-stdio, doctest-lib, glpk, glpk-headers - , non-empty, QuickCheck, utility-ht + , non-empty, QuickCheck, random, transformers, utility-ht }: mkDerivation { pname = "comfort-glpk"; - version = "0.0.0.1"; - sha256 = "005k3w37xxgwbdd5wby75jhqnvim7fixp82kkqazij7wzdmnlr5h"; + version = "0.0.1"; + sha256 = "18n6nbq8gf3lx05xxak8k8frk1qhivh1hg83i0qxvabgfxl6gvxg"; libraryHaskellDepends = [ - base comfort-array deepseq glpk-headers non-empty utility-ht + base comfort-array deepseq glpk-headers non-empty transformers + utility-ht ]; librarySystemDepends = [ glpk ]; testHaskellDepends = [ - base comfort-array doctest-exitcode-stdio doctest-lib QuickCheck - utility-ht + base comfort-array doctest-exitcode-stdio doctest-lib non-empty + QuickCheck random utility-ht ]; description = "Linear Programming using GLPK and comfort-array"; license = lib.licenses.bsd3; @@ -69987,8 +69961,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.6.5.1"; - sha256 = "08znxjkr3mkkcj9chgps158a5i1szclan2nsji4lq4c7q9678f21"; + version = "0.6.6.0"; + sha256 = "0s29n16nmk9w0yg8agwjgxg6h2f3xbsf1ah74g08m0inskq96s9h"; libraryHaskellDepends = [ base bytestring core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm @@ -70007,8 +69981,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.2.8.0"; - sha256 = "0zmddy3br8c3ii6ddrcf7v742n050hh34wrfwc94jfbrq79m6k6p"; + version = "0.2.9.1"; + sha256 = "0x36wzm4akxd5lq67hqmfrm1pddriw1mvq455bz308nabjdd65vl"; libraryHaskellDepends = [ base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions @@ -75989,8 +75963,8 @@ self: { ({ mkDerivation, base, containers, data-elevator, deepseq, HUnit }: mkDerivation { pname = "data-forced"; - version = "0.2.0.0"; - sha256 = "0wg2l1ad05yhymi37wbb6sq9jab6cl69mkghp7qigviyzfcdw66y"; + version = "0.3.0.0"; + sha256 = "1y97a5n9brqi076anzlhcg61h7r7wmkcplch0y0qh2c6p8ssm91y"; libraryHaskellDepends = [ base data-elevator deepseq ]; testHaskellDepends = [ base containers HUnit ]; description = "Specify that lifted values were forced to WHNF or NF"; @@ -76107,8 +76081,8 @@ self: { pname = "data-interval"; version = "2.1.1"; sha256 = "1gxdf1pi54s9fvxgp112b0l9f4q4r29f03caz04wbhv1f6cbs912"; - revision = "1"; - editedCabalFile = "0b7wljz2xcj8j2aka343i19rzw2lva5bbd4wp9wmrzlafp8anxpd"; + revision = "2"; + editedCabalFile = "1was8y0bsr36qwqs3kphpncp7jqimvyw27nd9qx6fmyp0s71yjmw"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -76652,7 +76626,7 @@ self: { version = "1.0"; sha256 = "01gv16yz5y3wyc370a2snihz95wdnl7sk1jz9k7aypixsaw28a2f"; libraryHaskellDepends = [ base lens typelevel ]; - description = "Recursive tuple data structure. It is very useful when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; + description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -77844,7 +77818,7 @@ self: { base bytestring cereal containers criterion QuickCheck quickcheck-instances ]; - description = "This package is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package."; + description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -78839,8 +78813,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "8"; - editedCabalFile = "0dcv4kf2g4xyacjpci9kql1gm706lkzhcyz9ks9jkbdvyvs8lf90"; + revision = "9"; + editedCabalFile = "1ww3328aga9s7knbl8xxvsff13gdnl3rdqplpx11rl6k6gnr032k"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -81409,37 +81383,6 @@ self: { }) {}; "dhall-yaml" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall - , dhall-json, exceptions, HsYAML, HsYAML-aeson - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , tasty, tasty-expected-failure, tasty-hunit, text, vector - }: - mkDerivation { - pname = "dhall-yaml"; - version = "1.2.11"; - sha256 = "1iqn9gign1y9cysdghxip4gpcp3x4knirlnm3mkin7zbr9hhxflh"; - revision = "1"; - editedCabalFile = "0h7fzbx3fndfgh3afsa2gjj4zqcmdh43afzr9whxdk5n0l9cn02r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson - optparse-applicative text vector - ]; - executableHaskellDepends = [ - aeson ansi-terminal base bytestring dhall dhall-json exceptions - optparse-applicative prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - base bytestring dhall dhall-json tasty tasty-expected-failure - tasty-hunit text - ]; - description = "Convert between Dhall and YAML"; - license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "dhall-yaml_1_2_12" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -81465,7 +81408,6 @@ self: { ]; description = "Convert between Dhall and YAML"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -83549,6 +83491,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "directory-ospath-streaming" = callPackage + ({ mkDerivation, base, directory, filepath, random, tasty + , tasty-hunit, unix + }: + mkDerivation { + pname = "directory-ospath-streaming"; + version = "0.1"; + sha256 = "1xjjb9h3gxdc8m8z2xx7c7bawcrqmb94jvpfppfv01k48b6w8y3v"; + libraryHaskellDepends = [ base filepath unix ]; + testHaskellDepends = [ + base directory filepath random tasty tasty-hunit unix + ]; + description = "Stream directory entries in constant memory in vanilla IO"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "directory-tree" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -83711,7 +83671,9 @@ self: { ]; description = "Functional programming language for teaching discrete math"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "disco"; + broken = true; }) {}; "discogs-haskell" = callPackage @@ -84006,8 +83968,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; - revision = "1"; - editedCabalFile = "0mlask4a08z0bkns89857vj96cqdqvdxqf5q7qsa0kpdaqkwrjz9"; + revision = "2"; + editedCabalFile = "14zhk0ygk2cmq2pk6limj3jiaa1pfdy7n2qc9nb3gxfg7yj4qvp2"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -85091,30 +85053,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , http-client, http-client-tls, http-directory, http-types - , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args - , text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.9.4"; - sha256 = "0ni69z2bi61c1xx8gqz29447w91gzls3cvxj67vvl4yzdwnmwv21"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory extra filepath http-client - http-client-tls http-directory http-types optparse-applicative - regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - mainProgram = "dl-fedora"; - }) {}; - - "dl-fedora_0_9_5" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-client, http-client-tls, http-directory, http-types , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args @@ -86570,6 +86508,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "domain-aeson_0_1_1_1" = callPackage + ({ mkDerivation, aeson, base, domain, domain-core + , generic-arbitrary, hspec, quickcheck-classes + , quickcheck-instances, rerebase, template-haskell + , template-haskell-compat-v0208, text, th-lego, vector + }: + mkDerivation { + pname = "domain-aeson"; + version = "0.1.1.1"; + sha256 = "0g363qyri9s6qbp52znah3qgnrqh0cn4xlfyp7hmjjwmllnm8dsn"; + libraryHaskellDepends = [ + aeson base domain-core template-haskell + template-haskell-compat-v0208 text th-lego vector + ]; + testHaskellDepends = [ + domain generic-arbitrary hspec quickcheck-classes + quickcheck-instances rerebase + ]; + description = "Integration of domain with aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "domain-auth" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base , bytestring, containers, cryptonite, dns, doctest, iproute, memory @@ -89337,8 +89298,8 @@ self: { }: mkDerivation { pname = "easy-file"; - version = "0.2.3"; - sha256 = "1jac0x8n72nhr68v3nnjndb04bq951glj9r67xqbvr7glp1dhdq4"; + version = "0.2.4"; + sha256 = "1jw4y7l4ik0rbzkpr6anhydpp6dgxy9nqzsmlck5lh11mcai7l9y"; libraryHaskellDepends = [ base directory filepath time unix ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Cross-platform File handling"; @@ -90382,8 +90343,8 @@ self: { }: mkDerivation { pname = "eflint"; - version = "3.1.0.0"; - sha256 = "1bxpw80sgsgzxsxc6niwi0zjhgqxsx4kx2q5ah2vxnkfs117fmcm"; + version = "3.1.0.1"; + sha256 = "19l5m01fnm1bgwf7v6sv589xv759sizvq226ip4m9fmx3ihi5qly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100852,6 +100813,8 @@ self: { pname = "fin"; version = "0.3"; sha256 = "0dqwwd940pws4dpcaimbzxvxj7crncdcnslvjl2npa69x5vh63g2"; + revision = "1"; + editedCabalFile = "14f3mg6hjwy8yycrkj8p925kwb6hjzy2hm6yb4fwl243w92yf5qa"; libraryHaskellDepends = [ base boring dec deepseq hashable QuickCheck some universe-base ]; @@ -101206,6 +101169,8 @@ self: { pname = "finite-typelits"; version = "0.1.6.0"; sha256 = "0f047dywlxiz3pl3rq6maym9wpwjwl4zjqfwlwnj0yiv7dmlaiih"; + revision = "1"; + editedCabalFile = "0v7m5hhkkj4wyfas6a9a59sxx05rvfmhnd2qwp0wryd40f52xwmr"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; @@ -105035,8 +105000,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fractionizer"; - version = "0.6.1.2"; - sha256 = "16hvgi7g3dx63lf6h5v9l5gjq5753kqbvfn2npqpblzvgpv7lf4s"; + version = "0.9.0.0"; + sha256 = "125z1kxkzjdcfqi83dqrgqjk04baw6x0jgm2svyf5zgrxj1fjxaz"; libraryHaskellDepends = [ base ]; description = "Allows to approximate the fractional numbers in the range [0.005, 1] with sum of 2 or 3 unit fractions of special types."; license = lib.licenses.mit; @@ -107633,8 +107598,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.24.2"; - sha256 = "1dkjd66x6x9wvbdq9kr0mfkasndnnnchcqxhd2c4ffwncwvk346q"; + version = "0.24.3"; + sha256 = "0y83phng77asca4pk66w8grx8b4d1ip7xi77vrfjc04yjagrj1ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109572,26 +109537,6 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base, doctest, generic-lens-core, HUnit - , inspection-testing, lens, profunctors, text - }: - mkDerivation { - pname = "generic-lens"; - version = "2.2.1.0"; - sha256 = "17an4669igzs6pwzqxnpkx9gmxwz64p32d1zcinhh5agd56y70pa"; - revision = "1"; - editedCabalFile = "1wzxvfi9kzhbglih1syqhx42kcsvlinnfc338fl731k6hc95hmlm"; - libraryHaskellDepends = [ - base generic-lens-core profunctors text - ]; - testHaskellDepends = [ - base doctest HUnit inspection-testing lens profunctors - ]; - description = "Generically derive traversals, lenses and prisms"; - license = lib.licenses.bsd3; - }) {}; - - "generic-lens_2_2_2_0" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text }: @@ -109607,7 +109552,6 @@ self: { ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-lens-core" = callPackage @@ -110031,10 +109975,8 @@ self: { }: mkDerivation { pname = "generics-sop"; - version = "0.5.1.2"; - sha256 = "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3"; - revision = "1"; - editedCabalFile = "1s8bx25yrjqy1cj9y1s1m8a8qlby9dxjzin16yymz7g39fqcqxz8"; + version = "0.5.1.3"; + sha256 = "01xgd5b4na6xz2bw117hw37k3iqfk3mabi4aadkzs527rawwg77c"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell th-abstraction ]; @@ -110052,8 +109994,8 @@ self: { pname = "generics-sop-lens"; version = "0.2.0.1"; sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; - revision = "3"; - editedCabalFile = "0p9h7xbd0jcf85r480gbnyyh822r3wziv1rg2qwgq0ll5apqvzmn"; + revision = "4"; + editedCabalFile = "0n3ynw8zaavp5a259slff5b5smah0jfb8lxslkljsmpbndmh5sdv"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = lib.licenses.bsd3; @@ -116361,8 +116303,8 @@ self: { pname = "github"; version = "0.28.0.1"; sha256 = "16ahq2ng52ypkkgqbbmizr486px3dh709hw3jdn7jzglgvn20712"; - revision = "1"; - editedCabalFile = "1irbqis6iv62nqc75fy87mv1lahrnybq1j8mal15n129sxyyvz56"; + revision = "2"; + editedCabalFile = "1cbzn6idgmcihgkwgwc96a68hl24mai2gydbgqpydnknwmslp8qj"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -122398,8 +122340,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.2.0.0"; - sha256 = "1qngvwah69jb175shpy5n9qqyxck6687c20bqqlij4nj8amp4vfh"; + version = "1.2.0.1"; + sha256 = "0y5n1whdycszin7a0cixgf3h6v9r7vcs1z0n3hm3c8jwf8c079d8"; libraryHaskellDepends = [ base conduit containers exceptions megaparsec parser-combinators template-haskell text transformers unordered-containers vector @@ -123013,6 +122955,8 @@ self: { description = "Game engine for Prototyping on a Grid"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gridbounds" = callPackage @@ -124685,16 +124629,16 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, containers, libGL, libX11, libXcursor - , libXext, libXi, libXinerama, libXrandr + ({ mkDerivation, base, c, containers, lens, libGL, libX11 + , libXcursor, libXext, libXi, libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.6.0.2"; - sha256 = "0c6qr5jrn327phaksib176aclz1ajs3z155nzn5pbd3gsln1g9jp"; + version = "4.6.0.3"; + sha256 = "0796hlc63pmbs861316xh6wrw72zczjkl9wx6mwjfcpq1jg4b5fp"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers lens ]; librarySystemDepends = [ c libGL libX11 libXcursor libXext libXi libXinerama libXrandr ]; @@ -127133,6 +127077,47 @@ self: { maintainers = [ lib.maintainers.erictapen ]; }) {inherit (pkgs) util-linux;}; + "hakyll_4_16_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, containers, data-default, deepseq, directory + , file-embed, filepath, fsnotify, hashable, http-conduit + , http-types, lifted-async, lrucache, mtl, network-uri + , optparse-applicative, pandoc, 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, util-linux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.16.0.0"; + sha256 = "1cxhi1k2fzxzgx6wvplq90jx7mqdzpnab0qjf763s8ih8bf6zck4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary blaze-html blaze-markup bytestring containers + data-default deepseq directory file-embed filepath fsnotify + hashable http-conduit http-types lifted-async lrucache mtl + network-uri 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 = [ + aeson base bytestring containers filepath pandoc QuickCheck tagsoup + tasty tasty-golden tasty-hunit tasty-quickcheck text + unordered-containers yaml + ]; + testToolDepends = [ util-linux ]; + description = "A static website compiler library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hakyll-init"; + maintainers = [ lib.maintainers.erictapen ]; + }) {inherit (pkgs) util-linux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -132003,7 +131988,7 @@ self: { executableHaskellDepends = [ base containers lens linear mtl random sdl2 sdl2-ttf text vector ]; - description = "Snake game implementation in Haskell using SDL2"; + description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; @@ -137710,8 +137695,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.4.1.0"; - sha256 = "10qdca2pfxmk2fgnipdxxm1sh8a5dk1hb0b8f924gsfbd0pl2q4d"; + version = "0.4.2.0"; + sha256 = "0svn2biiknmb4wybya3rvjwsmpf6rv05804sm3b3975qcvg7js0q"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq directory exceptions filepath hedgehog hw-aeson mmorph mtl network process @@ -137886,33 +137871,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit - , mtl, network, network-uri, resource-pool, scanner, stm - , test-framework, test-framework-hunit, text, time, tls - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.15.1"; - sha256 = "1a09i21qmzjcx171452bm69cj188f1jha2gwj0yi7shimcqz3l8m"; - revision = "1"; - editedCabalFile = "1ppc8xygcqv9s9jf44s1hh7ndm9mrvjxjwhv5g2rfdkkbsfyr7r5"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing containers deepseq errors - exceptions HTTP mtl network network-uri resource-pool scanner stm - text time tls unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = lib.licenses.bsd3; - }) {}; - - "hedis_0_15_2" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit , mtl, network, network-uri, resource-pool, scanner, stm @@ -137935,7 +137893,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -139459,6 +139416,23 @@ self: { broken = true; }) {inherit (pkgs) ncurses;}; + "hetzner" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , country, http-conduit, ip, megaparsec, scientific, text, time + , yaml + }: + mkDerivation { + pname = "hetzner"; + version = "0.1.2.0"; + sha256 = "111wv77l9nj7l20kyl4yixzpdj4lpdqvdpzrvlhyppzfba5sx9gb"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers country http-conduit ip + megaparsec scientific text time yaml + ]; + description = "Hetzner Cloud client library"; + license = lib.licenses.mit; + }) {}; + "heukarya" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, text }: @@ -139479,27 +139453,28 @@ self: { ({ mkDerivation, abstract-par, aeson, aeson-optics, ansi-wl-pprint , array, async, base, base16, binary, brick, bytestring, cereal , containers, cryptonite, data-dword, Decimal, deepseq, directory - , filemanip, filepath, free, gmp, haskeline, here, HUnit, libff - , megaparsec, memory, monad-par, mtl, multiset, operational - , optics-core, optics-extra, optics-th, optparse-generic, process - , QuickCheck, quickcheck-instances, quickcheck-text, regex - , regex-tdfa, restless-git, rosezipper, scientific, secp256k1 - , smt2-parser, spawn, spool, stm, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-quickcheck, temporary - , text, time, transformers, tree-view, tuple, unordered-containers - , vector, vty, witherable, word-wrap, wreq + , filemanip, filepath, filepattern, free, gmp, haskeline, here + , HUnit, libff, megaparsec, memory, monad-par, mtl, multiset + , operational, optics-core, optics-extra, optics-th + , optparse-generic, process, QuickCheck, quickcheck-instances + , quickcheck-text, regex, regex-tdfa, restless-git, rosezipper + , scientific, secp256k1, smt2-parser, spawn, spool, stm, tasty + , tasty-bench, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, temporary, text, time, transformers, tree-view + , tuple, unordered-containers, vector, vty, witherable, word-wrap + , wreq }: mkDerivation { pname = "hevm"; - version = "0.50.5"; - sha256 = "1spsq9xx69l6y7qvhz4d3m8yam7af389s7ijx9y5ki1vjr4kxrwx"; + version = "0.51.0"; + sha256 = "1c0y0mbdb0p9h1x9fsfd6zwnf2kh3nh24dh8rayhqk77c4wwasvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ abstract-par aeson aeson-optics ansi-wl-pprint array async base base16 binary brick bytestring cereal containers cryptonite - data-dword Decimal deepseq directory filemanip filepath free - haskeline here HUnit megaparsec memory monad-par mtl multiset + data-dword Decimal deepseq directory filemanip filepath filepattern + free haskeline here HUnit megaparsec memory monad-par mtl multiset operational optics-core optics-extra optics-th optparse-generic process QuickCheck quickcheck-instances quickcheck-text regex regex-tdfa restless-git rosezipper scientific smt2-parser spawn @@ -140828,6 +140803,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_4_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, vector + }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.4.0"; + sha256 = "0kaazv6qfpg7n52wms08hf63ic776p9wyyylsh0d4yrh1sbh1s52"; + libraryHaskellDepends = [ base binary bytestring mtl rio vector ]; + testHaskellDepends = [ + base binary bytestring hspec mtl rio vector + ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -142572,8 +142563,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.5.0"; - sha256 = "1y5v27dyhq7qcqrdxsvmxfh98lswdvjvr8pw0hxf2005vi5sxdcf"; + version = "0.5.2"; + sha256 = "1vr4mbpkshd19ypn6xj788z2znfaqvkqg5ak7ziix955j6wsackl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153106,14 +153097,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_0" = callPackage + "hspec_2_11_0_1" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.0"; - sha256 = "1qfvablqypql0z1d5fyamaavddbr96ymkfsjzawra1vhcjy602mw"; + version = "2.11.0.1"; + sha256 = "0sz2ishjz7fa09w2215fdxw2yj6bv1q55arr554l1jdxf6mvd7r7"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -153135,14 +153126,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-api_2_11_0" = callPackage + "hspec-api_2_11_0_1" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , transformers }: mkDerivation { pname = "hspec-api"; - version = "2.11.0"; - sha256 = "1arh3bycb44dby1pqbjapxc09gg6q8bd44aqwgk8havrsnvp19ay"; + version = "2.11.0.1"; + sha256 = "0zrd2kn9qwx5cs9cbn8pz9sm8jr322jnj99lpasskpg8acby3pkk"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -153267,7 +153258,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_0" = callPackage + "hspec-core_2_11_0_1" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -153276,8 +153267,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.0"; - sha256 = "03ni0grfgj9g39vnfy2d4ijy42kgfj7c4wshk5d7qvsd31iy5mbl"; + version = "2.11.0.1"; + sha256 = "03fwa0y901khi3gp45qs72f6yzxils1dwkm8hpc2znl0ndaf06hq"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -153358,14 +153349,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_0" = callPackage + "hspec-discover_2_11_0_1" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.0"; - sha256 = "1ii5mklpc0b7gv562qhw8s76pspfkwbiz8ff7klz2k61j0zmcywd"; + version = "2.11.0.1"; + sha256 = "18acqmw3zgkn718vgjiskx266ids4pp4mamb4gxlhj2934vfl656"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -164262,10 +164253,8 @@ self: { }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.5.1"; - sha256 = "1mnc0gby7xz8065rvkqsaqk1vqs0gv1y9qgvwsvxx3gsg9yj3a7r"; - revision = "3"; - editedCabalFile = "11awwf3lm3qzjqxy8gw9cizr30228cjwhqzff7wvjvdx131s0raa"; + version = "0.2.5.2"; + sha256 = "0ybcqbcaq3ixpfrpdb0xl89gzjj3f6xhsgwwh57nlcqdcvvzhpls"; libraryHaskellDepends = [ aeson base deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids text transformers unordered-containers @@ -164796,16 +164785,17 @@ self: { }) {}; "integer-types" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec - , hspec-hedgehog, quaalude + ({ mkDerivation, base, deepseq, exceptions, hashable, hedgehog + , hspec, hspec-hedgehog, quaalude }: mkDerivation { pname = "integer-types"; - version = "0.1.0.0"; - sha256 = "0ydhb8sy8klaf0lgvckxcl15wc7b2l0kqr3q225xgkw0qz6qzbic"; - libraryHaskellDepends = [ base deepseq quaalude ]; + version = "0.1.1.0"; + sha256 = "0m22rmag4kdf3rad8i916dk1j2qwcnrviz9wwqhxz3rnf2r3jqm2"; + libraryHaskellDepends = [ base deepseq hashable quaalude ]; testHaskellDepends = [ - base deepseq exceptions hedgehog hspec hspec-hedgehog quaalude + base deepseq exceptions hashable hedgehog hspec hspec-hedgehog + quaalude ]; description = "Integer, Natural, and Positive"; license = lib.licenses.asl20; @@ -165825,8 +165815,8 @@ self: { ({ mkDerivation, array, async, base, bytestring, mtl, stm, time }: mkDerivation { pname = "io-classes"; - version = "1.0.0.1"; - sha256 = "1akhhlrzsk1xih8l1mc0mk27p5p6hks7bxkjyvh95fghjqkgsif3"; + version = "1.1.0.0"; + sha256 = "11mnmz3wvgp4vw3djlyyixxjzzqfk0qk4k3pfdywkbya2mb4n4mn"; libraryHaskellDepends = [ array async base bytestring mtl stm time ]; @@ -165840,6 +165830,8 @@ self: { pname = "io-classes-mtl"; version = "0.1.0.1"; sha256 = "0kqq14jgpkxaz106ahr20apizgdnxz2q0ih9kwgz0q4l1v106698"; + revision = "1"; + editedCabalFile = "0a5y6pch1pb7ml7cr22xl3gh6am7xcs87ad9yqamlpy4765g3ihh"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -165919,8 +165911,8 @@ self: { }: mkDerivation { pname = "io-sim"; - version = "1.0.0.1"; - sha256 = "0cknyc86mg5a5fc4kk0sk68j1vvfhdi3dqfvz5n27zz600h3mij5"; + version = "1.1.0.0"; + sha256 = "0pb9b08mj6zm45r5ka67y3wjvk767bqha8gpyzvgld5p743pgn8i"; libraryHaskellDepends = [ base containers exceptions io-classes nothunks parallel psqueues QuickCheck quiet si-timers strict-stm time @@ -169426,6 +169418,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "jose-jwt_0_9_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal + , containers, criterion, cryptonite, hspec, HUnit, memory, mtl + , QuickCheck, text, time, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "jose-jwt"; + version = "0.9.5"; + sha256 = "0iw686xqx500n2f500qwqc6j7i503r7s10sxlmfwj0wjz9mhmp57"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal containers cryptonite + memory mtl text time transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cryptonite hspec HUnit memory mtl QuickCheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; + description = "JSON Object Signing and Encryption Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "jot" = callPackage ({ mkDerivation, base, data-default, dhall, docopt, extra, filepath , process, time, turtle, yaml @@ -170081,8 +170098,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.7"; - sha256 = "0f24cdhr75sacj9n54z5k9n73cydqzjp35hq36crclj09lyf1fyp"; + version = "2.0.0.8"; + sha256 = "1iq2m3fhi7c2z9na4yqy94m047caqi60rx6d3g6bgf6mvpn5aqk3"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -174232,8 +174249,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.9.5"; - sha256 = "0pcy0xr6iq5g6w0vxvrx7wiz2gy6whb8c2hh53w8x7a2j04na8gn"; + version = "1.0"; + sha256 = "1vpy8pvs1f4wlgrsyynhwcynds0lz6yw60jdr8fhbm4b8cq0kjzr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -174957,8 +174974,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "2.0.0.5"; - sha256 = "1vrmqvjchnwjwlnsw8s8zq02vi4f0vgwgy1npvigv5xfvd9pvdvs"; + version = "2.0.0.6"; + sha256 = "0msm0qrgrnagkia8k0261p7q2ab67ml1q2nn9f951jxnhjm4mglj"; libraryHaskellDepends = [ base servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -178675,6 +178692,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "ldap-client-og" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , connection, containers, hspec, ldap-client, network, process + , semigroups, stm, text + }: + mkDerivation { + pname = "ldap-client-og"; + version = "0.3.0"; + sha256 = "0sirs44j5lp0xc6c9h7qwd2wxqzcnvw06pfvwylx252j38yy4r9i"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring connection + containers network semigroups stm text + ]; + testHaskellDepends = [ + base bytestring hspec ldap-client process semigroups + ]; + description = "Pure Haskell LDAP Client Library"; + license = lib.licenses.bsd2; + }) {}; + "ldap-scim-bridge" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , email-validate, hscim, http-client, http-client-tls, http-types @@ -179890,8 +179927,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.5.1"; - sha256 = "0y32f2ayj59by729df783ghj5y83318551wdgjjqdvrhx4vi3jsy"; + version = "1.5.5.2"; + sha256 = "0ccm21y14q87r8w888js9s6cb615mi2hif0j1ca84x934q0r2a8v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180593,17 +180630,17 @@ self: { , containers, directory, doctest, filepath, free, hspec , hspec-expectations-lens, http-client, http-conduit, http-types , lens, lifted-async, lifted-base, monad-control, mtl, network - , network-uri, profunctors, resourcet, text, transformers - , xml-conduit + , network-bsd, network-uri, profunctors, resourcet, text + , transformers, xml-conduit }: mkDerivation { pname = "libjenkins"; - version = "0.8.4"; - sha256 = "08qiny7sn18yfidlrgdgp5s0qlngcnrq9nrxbqqahq96670jyq77"; + version = "0.9.0"; + sha256 = "16h6qx15xsyhs1mkd7zmvddjxjfz31d0alp1qbivsxjhzjn3hail"; libraryHaskellDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network - network-uri profunctors resourcet text + network-bsd network-uri profunctors resourcet text ]; testHaskellDepends = [ async attoparsec base bytestring conduit containers directory @@ -182575,8 +182612,8 @@ self: { ({ mkDerivation, base, hspec, hyphenation }: mkDerivation { pname = "linebreak"; - version = "1.1.0.3"; - sha256 = "1k4vkmbwk851ln0h3i686mwf14hirna2zgcvhb4n1xlhdzb968ck"; + version = "1.1.0.4"; + sha256 = "14axpazwivl3qcvrflvzskik0kdvpg50kqpyilik22ywrqagyya0"; libraryHaskellDepends = [ base hyphenation ]; testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; @@ -185763,6 +185800,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "logict_0_8_1_0" = callPackage + ({ mkDerivation, async, base, mtl, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "logict"; + version = "0.8.1.0"; + sha256 = "04xqwfbvh5gfjwbvmadbakq0932gskh2gy68aw7251443ic4gp6k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ + async base mtl tasty tasty-hunit transformers + ]; + description = "A backtracking logic-programming monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "logict-sequence" = callPackage ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn , hspec, hspec-hedgehog, list-t, logict, mmorph, mtl, sequence @@ -187810,10 +187865,10 @@ self: { }: mkDerivation { pname = "lzma"; - version = "0.0.0.4"; - sha256 = "0fy11i7fanrsbh8w7cclwx0i6csn5df6vl38dh2112aqw6n7h382"; + version = "0.0.1.0"; + sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ xz ]; + libraryPkgconfigDepends = [ xz ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; @@ -187821,24 +187876,6 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) xz;}; - "lzma_0_0_1_0" = callPackage - ({ mkDerivation, base, bytestring, HUnit, liblzma, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "lzma"; - version = "0.0.1.0"; - sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; - libraryHaskellDepends = [ base bytestring ]; - libraryPkgconfigDepends = [ liblzma ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "LZMA/XZ compression and decompression"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {liblzma = null;}; - "lzma-clib" = callPackage ({ mkDerivation }: mkDerivation { @@ -193799,6 +193836,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_13" = callPackage + ({ mkDerivation, base, containers, microlens, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.13"; + sha256 = "1g41wb61k2l99xxy23yp2zqk0wanskgdypbjhib71ji0y1dcsfz7"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens tagged ]; + description = "Automatic generation of record lenses for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -197052,8 +197107,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.4.0.3"; - sha256 = "1i5lp7falarvwad3a7xnm865bl4q7jqj9dq96hlf4phh4rsx0h9q"; + version = "0.4.0.4"; + sha256 = "01klhx1zizf9f5cn42n0zhsspgfiqg2vi6bdd5sliyfn38z1fhrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199285,8 +199340,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.27.1"; - sha256 = "1n9qflbgl7f4qd3sxc6rwnv0rmg0dj731rf1b9avc6xw199ydr3w"; + version = "0.27.2"; + sha256 = "1lp5a6hb8y4j7zj8fa5yvw6wffl800gwfp42k9hayh2cn4fgfmz0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -199305,7 +199360,7 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql_0_27_2" = callPackage + "morpheus-graphql_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , morpheus-graphql-app, morpheus-graphql-code-gen , morpheus-graphql-core, morpheus-graphql-server @@ -199315,8 +199370,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.27.2"; - sha256 = "1lp5a6hb8y4j7zj8fa5yvw6wffl800gwfp42k9hayh2cn4fgfmz0"; + version = "0.27.3"; + sha256 = "04qah7565dzq7v4q43zjz8778pdn5jwnway5rvz4kkibcrscfagn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -199345,8 +199400,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.27.1"; - sha256 = "0qs5gx7k1ix4i0mqkmy681xlg7ckr8fy089rj4c25vgv8rm0p36w"; + version = "0.27.2"; + sha256 = "1p9m9id8p737fzpmkb7ycbfvzims4qhayf3vm0d0k6bq07mlky7y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -199363,7 +199418,7 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-app_0_27_2" = callPackage + "morpheus-graphql-app_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-core , morpheus-graphql-tests, mtl, relude, scientific, tasty @@ -199372,8 +199427,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.27.2"; - sha256 = "1p9m9id8p737fzpmkb7ycbfvzims4qhayf3vm0d0k6bq07mlky7y"; + version = "0.27.3"; + sha256 = "0dicajcqgxpv1jhnywjjs0g4p5ryv0xlrywib1xwxrb04wy9aa3f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -199424,8 +199479,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.27.1"; - sha256 = "095kyjyv7gyrlqsdbw1aab2l990risr72c2j5gcwskbgqm7p3fip"; + version = "0.27.2"; + sha256 = "099pn7k8nw1yxh0sd6g34dwgnw7skqzh7lr8lvfl1hr1i9ak6c3q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -199445,7 +199500,7 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-client_0_27_2" = callPackage + "morpheus-graphql-client_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , file-embed, modern-uri, morpheus-graphql-code-gen-utils , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl @@ -199455,8 +199510,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.27.2"; - sha256 = "099pn7k8nw1yxh0sd6g34dwgnw7skqzh7lr8lvfl1hr1i9ak6c3q"; + version = "0.27.3"; + sha256 = "1j4r6ar6l462aq8qvxikmwyxd2f8i60gd3j0qf5pxsslgjwmjbi9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -199486,8 +199541,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.27.1"; - sha256 = "0qvk2zpqhhjjfha5hfd9nkv30m07qbbnpil9h00w3skdw33mqqqk"; + version = "0.27.2"; + sha256 = "1p1s4szb284i53ifpzhm4p0bh2ba5ww42llljqvwhs5rwbz6lg8i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199508,7 +199563,7 @@ self: { mainProgram = "morpheus"; }) {}; - "morpheus-graphql-code-gen_0_27_2" = callPackage + "morpheus-graphql-code-gen_0_27_3" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, filepath , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils , morpheus-graphql-core, morpheus-graphql-server @@ -199517,8 +199572,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.27.2"; - sha256 = "1p1s4szb284i53ifpzhm4p0bh2ba5ww42llljqvwhs5rwbz6lg8i"; + version = "0.27.3"; + sha256 = "1rmxcr17xjx99aam048a4sqlwlnxjk41hx8fnb363ljid74vrcrb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199547,8 +199602,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.27.1"; - sha256 = "0f8152jzjynfl65k8f4iyyi8akqrcn9dhx8pi20yhf152h5w0clp"; + version = "0.27.2"; + sha256 = "032vsvwknlv6ha289s71cwzq1qsisn6028p8k4hyqzmvqcm5aqg7"; libraryHaskellDepends = [ base bytestring containers morpheus-graphql-core mtl prettyprinter relude template-haskell text unordered-containers @@ -199557,15 +199612,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "morpheus-graphql-code-gen-utils_0_27_2" = callPackage + "morpheus-graphql-code-gen-utils_0_27_3" = callPackage ({ mkDerivation, base, bytestring, containers , morpheus-graphql-core, mtl, prettyprinter, relude , template-haskell, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.27.2"; - sha256 = "032vsvwknlv6ha289s71cwzq1qsisn6028p8k4hyqzmvqcm5aqg7"; + version = "0.27.3"; + sha256 = "11dfnyd9wbrwjfjz1qkc188x6l4b149jsyzjwh1gqji0skzsk3f6"; libraryHaskellDepends = [ base bytestring containers morpheus-graphql-core mtl prettyprinter relude template-haskell text unordered-containers @@ -199583,8 +199638,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.27.1"; - sha256 = "1id4dxi4kpgd25ffhw5qgkl05b2642qpz5dss68nq0n1cs2c021b"; + version = "0.27.2"; + sha256 = "16zff8r85aln6fl7zl48hzkij80aippg91kwdr7q5k1i0glg2c1n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -199601,7 +199656,7 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_27_2" = callPackage + "morpheus-graphql-core_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-tests, mtl, relude , scientific, tasty, tasty-hunit, template-haskell, text @@ -199609,8 +199664,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.27.2"; - sha256 = "16zff8r85aln6fl7zl48hzkij80aippg91kwdr7q5k1i0glg2c1n"; + version = "0.27.3"; + sha256 = "0dd8bifn6qwpss06hbb0r730fqfkbd4nhwsr2bsrgxc7hvzv9wi7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -199637,8 +199692,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.27.1"; - sha256 = "0b8hipwp5ddxn92appn2n6s43kmqvqrp2rg055jkb2kcfwh8g828"; + version = "0.27.2"; + sha256 = "0jfvg2r2nhx62n10ljy6c8qg4a91jsxmzcwx6f7yj4hp2z285a2l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -199655,7 +199710,7 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-server_0_27_2" = callPackage + "morpheus-graphql-server_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , morpheus-graphql-app, morpheus-graphql-core , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl @@ -199664,8 +199719,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.27.2"; - sha256 = "0jfvg2r2nhx62n10ljy6c8qg4a91jsxmzcwx6f7yj4hp2z285a2l"; + version = "0.27.3"; + sha256 = "1hl2c78pnx2rxx869p6ixvnyhzm46f1hzalqz2vbwrflshpmjv91"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -199690,8 +199745,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.27.1"; - sha256 = "0nj05ywj460v8kd821w7br44bx8wzqbbil0jb42sv442py69d6lj"; + version = "0.27.2"; + sha256 = "0qg8nkawwjm4sak524mgbid5f9a246c8a0w6cv3x4d3w01pnk9j9"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -199701,15 +199756,15 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-subscriptions_0_27_2" = callPackage + "morpheus-graphql-subscriptions_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app , morpheus-graphql-core, mtl, relude, text, transformers , unliftio-core, unordered-containers, uuid, websockets }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.27.2"; - sha256 = "0qg8nkawwjm4sak524mgbid5f9a246c8a0w6cv3x4d3w01pnk9j9"; + version = "0.27.3"; + sha256 = "0gynrshv858g36jwvmh3q2asc6ppkr7hv9w9lx1qfjqfwm7r0140"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -199726,8 +199781,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.27.1"; - sha256 = "1nhpcai8lk3jq676zp6y6jcylm3zjzl4s6hk0f3g7vmg971ycd9w"; + version = "0.27.2"; + sha256 = "1vav6nrm26kbngzh0r5qvzg2524v30nx96s9vy61a3zmkwd9i5fc"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -199736,14 +199791,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_27_2" = callPackage + "morpheus-graphql-tests_0_27_3" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.27.2"; - sha256 = "1vav6nrm26kbngzh0r5qvzg2524v30nx96s9vy61a3zmkwd9i5fc"; + version = "0.27.3"; + sha256 = "1s9x4gcqd36gqf5w2wxiqhf7k9y44b7g7zm90y2kbclxqirs9rqf"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -207444,8 +207499,8 @@ self: { pname = "newtype-generics"; version = "0.6.2"; sha256 = "0km7cp041bgdgrxrbrawz611mcylxp943880a2yg228a09961b51"; - revision = "1"; - editedCabalFile = "0xgc7sxs1p3qibgwbikjdrhn47j7m4gk5x1wrv9hncks6hd6hsyf"; + revision = "2"; + editedCabalFile = "1sys4nr905q5wxxyq0bv4mvaagm2qdx42q5v2316l60s4ivz7jw1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -212611,35 +212666,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.9.6.1"; - sha256 = "0xk2ibdakzayqc8h72iq3gav9ism5sww4wiz0wxypm6landzikfr"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_9_6_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -212666,7 +212692,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -217483,6 +217508,7 @@ self: { ]; description = "A tool to convert symbolic regression expressions into different formats"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-symreg"; }) {}; @@ -219436,10 +219462,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "2.2.0.0"; - sha256 = "0xkrlplvi97im634v2877capdnp9bl3ynqcxvr707j1s3z3636nq"; - revision = "1"; - editedCabalFile = "08y0px0178wmm6vj8y3gssh291j40mi9il18ifl8fxpb58488imq"; + version = "2.2.0.1"; + sha256 = "11wa1kkjpdiyg007llic926zpfc3bal9rl3i6hhmrh2w4pf13a7g"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal rangeset template-haskell @@ -219823,8 +219847,8 @@ self: { pname = "password-types"; version = "1.0.0.0"; sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5"; - revision = "3"; - editedCabalFile = "0i6djm9zsb95qdan0vr9shilhmzjxqsqrjy9v16hcaph49wnw7pr"; + revision = "4"; + editedCabalFile = "0kcd10nxam2ni685j9v9lrd6pi14cpxkr6sqzwxxkhn1mmb0bik7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring memory text ]; testHaskellDepends = [ @@ -220167,14 +220191,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "path-io_1_8_0" = callPackage + "path-io_1_8_1" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.8.0"; - sha256 = "1iq6yj5kj8i20sr4h8rabway76hk0xmy9mi499xv22php3vb79l3"; + version = "1.8.1"; + sha256 = "1phaxzff8n4jfksdakbzxadh8m07h5ifscwyjz4h5568rlv7zlws"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -220361,8 +220385,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "1.0.0.3"; - sha256 = "011n6qdwndrnn366kn393hl4aw0ra40x91483ka74ld4wlzscsy3"; + version = "1.0.0.4"; + sha256 = "0pjczxpjjlzl1d56yqg07lgj5k2w1gx0krsjpkg1xar36iis5m2f"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers exceptions http-client http-types network-uri text time uuid @@ -225008,6 +225032,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "pinch_0_4_3_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, cereal, containers + , deepseq, ghc-prim, hashable, hspec, hspec-discover, network + , network-run, QuickCheck, semigroups, text, unordered-containers + , vector + }: + mkDerivation { + pname = "pinch"; + version = "0.4.3.0"; + sha256 = "1m9pmcraw3rxgib44pskldig2xp0106zpbj3dbdgxam0ikaybb71"; + libraryHaskellDepends = [ + array base bytestring cereal containers deepseq ghc-prim hashable + network semigroups text unordered-containers vector + ]; + libraryToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + async base bytestring cereal containers hspec network network-run + QuickCheck semigroups text unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "An alternative implementation of Thrift for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pinch-gen" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , language-thrift, megaparsec, mtl, optparse-applicative @@ -226231,8 +226280,8 @@ self: { pname = "pipes-safe"; version = "2.3.4"; sha256 = "1ha0q1dwl52rn59shmk8jhp7grngpiwmp8x4qa9h54flvxkqk12x"; - revision = "5"; - editedCabalFile = "0mh22g35wl0ri8fysyvk30qwkr9i7lynllwhg2z530lrsxqyfjqy"; + revision = "6"; + editedCabalFile = "00zidlhj81dp9ksnilkazi9rzi8azxxyv7gwjm0nn12jii45q6i4"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -227760,8 +227809,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.9"; - sha256 = "1h6s4cjnj20rsvjcq6xvzyxfb156l4kmca7dcfm6bqkadpp2ia1w"; + version = "1.1.1.10"; + sha256 = "14q5anaxhqwqhz3gc2vbs8hqnijg02s3py5kyifmwlh1smnx5ls2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231130,8 +231179,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "6"; - editedCabalFile = "1pvfb61ys58s66dass8qfaxrd4pbkbk8hsbrijds6gybcx3a7nhy"; + revision = "7"; + editedCabalFile = "1k5qpzxf4gp3smpriawdbwifyyf5dp2qfqm5wxk1gmbviqwm4f70"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -232200,6 +232249,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "prefix-units_0_3_0_1" = callPackage + ({ mkDerivation, base, Cabal, deepseq, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "prefix-units"; + version = "0.3.0.1"; + sha256 = "1knxb1r0lxdjr7iaqhknbzpidcz1fzfsarqg2fjz6mznjiqlsdgn"; + revision = "1"; + editedCabalFile = "0xds7l1xnxaq3frds928rkaqrqcs4cbszwwis5fzvrg20p3p9lcy"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base Cabal deepseq HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "A basic library for SI/IEC prefix units"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "prefork" = callPackage ({ mkDerivation, base, cab, containers, data-default, directory , filepath, hspec, process, stm, system-argv0, system-filepath @@ -234443,24 +234512,6 @@ self: { }) {}; "product-profunctors" = callPackage - ({ mkDerivation, base, bifunctors, contravariant, criterion - , deepseq, profunctors, tagged, template-haskell, th-abstraction - }: - mkDerivation { - pname = "product-profunctors"; - version = "0.11.0.3"; - sha256 = "11q9vxj7pnby51gwgm0d17gd6ps2bxwrvajpqaqcg6bsdgdzvjws"; - libraryHaskellDepends = [ - base bifunctors contravariant profunctors tagged template-haskell - th-abstraction - ]; - testHaskellDepends = [ base profunctors ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "product-profunctors"; - license = lib.licenses.bsd3; - }) {}; - - "product-profunctors_0_11_1_1" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion , deepseq, profunctors, tagged, template-haskell, th-abstraction }: @@ -234468,6 +234519,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; + revision = "1"; + editedCabalFile = "12qgjm4r6k28vm1756grhgh16g4qv0s2nri8ysqi7jkvbjdm1jn4"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell th-abstraction @@ -234476,7 +234529,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "product-profunctors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "prof-flamegraph" = callPackage @@ -235593,27 +235645,6 @@ self: { }) {ribosome-menu = null;}; "proto-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim - , lens-family, parsec, pretty, primitive, profunctors, QuickCheck - , tagged, tasty, tasty-quickcheck, text, transformers, vector - }: - mkDerivation { - pname = "proto-lens"; - version = "0.7.1.2"; - sha256 = "0zbkwksmnpc5ivbhckg1kjivn1qbk9pz79vifyiydp90nxjh56fy"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim lens-family parsec - pretty primitive profunctors tagged text transformers vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck vector - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens_0_7_1_3" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, tasty, tasty-quickcheck, text, transformers, vector @@ -235632,7 +235663,6 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -235707,19 +235737,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.9"; - sha256 = "1xg72lnx0r03gg41j8mgd61bil33kxpqd1jdpmgh6jx25km6rw9l"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_10" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -235730,7 +235747,6 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage @@ -235774,22 +235790,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, proto-lens, text, vector - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.7.0.3"; - sha256 = "1fb64xcrgd7v2l4hqqcs0riszklkxh516l7n4p9lwwqmagmgz36y"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family proto-lens - text vector - ]; - doHaddock = false; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_7_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: @@ -235803,7 +235803,6 @@ self: { ]; doHaddock = false; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-setup" = callPackage @@ -237268,8 +237267,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.8"; - sha256 = "1h5d5hjc9hrlk718lf62qzaq1l6ppr0l2b3fl78csyh86cihh750"; + version = "0.15.9"; + sha256 = "1i9wszs5kwwq0l8l4if05y8xc8fih10assrdj8q1ipr0hx3zjawm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238424,8 +238423,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.6"; - sha256 = "1abcv97p6ygayvcgmdnkikgxz9md1zjwcm1pglkdk2l18wav1mmd"; + version = "0.9.7"; + sha256 = "05h14ingvscyjxxig1iv7xb476qjngzfh8iw8f82jszmxdh4nwqg"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -238440,8 +238439,8 @@ self: { }: mkDerivation { pname = "qrcode-juicypixels"; - version = "0.8.4"; - sha256 = "1dmas3hv02y89akwdp7s7sm4hr3cpq68kny61pfs1p7z6wwxqlya"; + version = "0.8.5"; + sha256 = "0qgcdi77iyx04w2rx48nzk8lm9x368h9m4a468zcibn50cp4ynbg"; libraryHaskellDepends = [ base base64-bytestring bytestring JuicyPixels qrcode-core text vector @@ -239553,44 +239552,6 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bifunctors - , bytestring, containers, directory, doctest, exceptions, filelock - , filepath, generic-data, graphviz, hashable, hashtables, hs-rqlite - , HTTP, http-client, markov-chain-usage-model, matrix, monad-logger - , mtl, network, persistent, persistent-postgresql - , persistent-sqlite, persistent-template, postgresql-simple - , pretty-show, process, QuickCheck, quickcheck-instances, random - , resource-pool, resourcet, servant, servant-client, servant-server - , sop-core, split, stm, strict, string-conversions, tasty - , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unliftio - , unliftio-core, vector, wai, warp - }: - mkDerivation { - pname = "quickcheck-state-machine"; - version = "0.7.1"; - sha256 = "0s6j3y0fkbbhmid0skqxx2m3mpbphz6npw9fvim5kx7w4i6jrvfz"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers directory exceptions filepath - generic-data graphviz markov-chain-usage-model matrix mtl - pretty-show process QuickCheck random sop-core split text time - tree-diff unliftio - ]; - testHaskellDepends = [ - aeson array base bifunctors bytestring containers directory doctest - filelock filepath hashable hashtables hs-rqlite HTTP http-client - monad-logger mtl network persistent persistent-postgresql - persistent-sqlite persistent-template postgresql-simple pretty-show - process QuickCheck quickcheck-instances random resource-pool - resourcet servant servant-client servant-server split stm strict - string-conversions tasty tasty-hunit tasty-quickcheck text time - tree-diff unliftio unliftio-core vector wai warp - ]; - description = "Test monadic programs using state machine based models"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "quickcheck-state-machine_0_7_2" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bifunctors , bytestring, containers, directory, doctest, exceptions, filelock , filepath, generic-data, graphviz, hashable, hashtables, hs-rqlite @@ -240957,8 +240918,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; - version = "2.0.0.5"; - sha256 = "0g5nxvfmr1fng71qlyk30pscpd1y8qa51q9vwzwf8fd5sp13qvz9"; + version = "2.0.0.6"; + sha256 = "0znh7v4s7mljlkhk4xpgkps8irbnqh8q2hrb1niwjxnl9mvchpjg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; @@ -241192,23 +241153,6 @@ self: { }) {}; "random-fu" = callPackage - ({ mkDerivation, base, erf, math-functions, monad-loops, mtl - , random, random-shuffle, rvar, syb, template-haskell, transformers - , vector - }: - mkDerivation { - pname = "random-fu"; - version = "0.3.0.0"; - sha256 = "1iz4b8742pshzsscy6pq39x4pndvyrydzrn968fzav9b1y6ib7d1"; - libraryHaskellDepends = [ - base erf math-functions monad-loops mtl random random-shuffle rvar - syb template-haskell transformers vector - ]; - description = "Random number generation"; - license = lib.licenses.publicDomain; - }) {}; - - "random-fu_0_3_0_1" = callPackage ({ mkDerivation, base, erf, math-functions, monad-loops, mtl , random, random-shuffle, rvar, syb, template-haskell, transformers , vector @@ -241223,7 +241167,6 @@ self: { ]; description = "Random number generation"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "random-fu-multivariate" = callPackage @@ -241943,8 +241886,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.7"; - sha256 = "1998bl9sggmabl64hkxswahmxqxx4j4sjsc6ghhm67wxikql7wy4"; + version = "2.0.0.8"; + sha256 = "0sbh3q4ddsk3fbmvkhcrnp4q0d0san78nnjgplrwz4qq1zk4bp00"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types uuid @@ -246722,8 +246665,8 @@ self: { }: mkDerivation { pname = "regression-simple"; - version = "0.2"; - sha256 = "15axsj9zfllyc98dpvxm7mr1vq2jxj5g7a8lkpbr24fxn3avd708"; + version = "0.2.1"; + sha256 = "1l91wmy29581hgdmn6ds6rp7lib4zphyzmqkjykkp5zi17kv8vmd"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ ad base math-functions splitmix statistics tasty tasty-hunit @@ -249400,27 +249343,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl - , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time - , transformers, unliftio-core - }: - mkDerivation { - pname = "retry"; - version = "0.9.3.0"; - sha256 = "1kafm17xk6hylr0lwa98wxjcx7z3rgnqi4fzxcks7dy9dz5ms7n1"; - libraryHaskellDepends = [ - base exceptions ghc-prim mtl mtl-compat random transformers - unliftio-core - ]; - testHaskellDepends = [ - base exceptions ghc-prim hedgehog HUnit mtl mtl-compat random stm - tasty tasty-hedgehog tasty-hunit time transformers unliftio-core - ]; - description = "Retry combinators for monadic actions that may fail"; - license = lib.licenses.bsd3; - }) {}; - - "retry_0_9_3_1" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers, unliftio-core @@ -249439,7 +249361,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "retry-effectful" = callPackage @@ -253115,21 +253036,6 @@ self: { }) {}; "rvar" = callPackage - ({ mkDerivation, base, bytestring, MonadPrompt, mtl, random - , transformers - }: - mkDerivation { - pname = "rvar"; - version = "0.3.0.1"; - sha256 = "1wa5nxlsfm1la5s70xv3swrmidxy0h6kv9ilicwkls12gwdc2a95"; - libraryHaskellDepends = [ - base bytestring MonadPrompt mtl random transformers - ]; - description = "Random Variables"; - license = lib.licenses.publicDomain; - }) {}; - - "rvar_0_3_0_2" = callPackage ({ mkDerivation, base, bytestring, MonadPrompt, mtl, random , transformers }: @@ -253142,7 +253048,6 @@ self: { ]; description = "Random Variables"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "rwlock" = callPackage @@ -253204,8 +253109,8 @@ self: { ({ mkDerivation, array, base, bifunctors, mtl, template-haskell }: mkDerivation { pname = "rzk"; - version = "0.2.0"; - sha256 = "0b8jphdsmx9b1k2dyx7il1ci15wsqz15zgr983kpmgsr6ggjjykn"; + version = "0.3.0"; + sha256 = "0vbkk0xf7cwynb7w7793byhh40jif3343r3h06h5bm6jz1yf4qxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254516,49 +254421,6 @@ self: { }) {}; "sandwich" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lifted-async, microlens, microlens-th - , monad-control, monad-logger, mtl, optparse-applicative - , pretty-show, process, safe, safe-exceptions, stm - , string-interpolate, template-haskell, text, time, transformers - , transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; - version = "0.1.3.1"; - sha256 = "05x418al128vllrf5rcxl1asqm3lvviizgv3dhiw1pp1zppz4kk4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_3_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lifted-async, microlens, microlens-th @@ -254599,7 +254461,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-hedgehog" = callPackage @@ -254646,26 +254507,6 @@ self: { }) {}; "sandwich-quickcheck" = callPackage - ({ mkDerivation, base, free, monad-control, mtl, QuickCheck - , safe-exceptions, sandwich, text, time - }: - mkDerivation { - pname = "sandwich-quickcheck"; - version = "0.1.0.6"; - sha256 = "1vlp15hcmrxrqwzqgk7ykpg3pvr0wd2cz6pib61yrxmp7334cf4y"; - libraryHaskellDepends = [ - base free monad-control mtl QuickCheck safe-exceptions sandwich - text time - ]; - testHaskellDepends = [ - base free monad-control mtl QuickCheck safe-exceptions sandwich - text time - ]; - description = "Sandwich integration with QuickCheck"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich-quickcheck_0_1_0_7" = callPackage ({ mkDerivation, base, free, monad-control, mtl, QuickCheck , safe-exceptions, sandwich, text, time }: @@ -254683,7 +254524,6 @@ self: { ]; description = "Sandwich integration with QuickCheck"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-slack" = callPackage @@ -255195,7 +255035,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_13_0" = callPackage + "sbp_4_14_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -255204,8 +255044,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.13.0"; - sha256 = "1gg1awq7xpb6lj25wpjbhfv9vp1a8a4js2w2c7aawl39wc980i6c"; + version = "4.14.0"; + sha256 = "1ycz6yqab4l9idsr2ks5mwa9mnbvq9vsjyki4lnxaxqg83f8a0lm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255531,18 +255371,18 @@ self: { }) {}; "scalendar" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: + ({ mkDerivation, base, containers, hspec, QuickCheck, SCalendar + , text, time + }: mkDerivation { pname = "scalendar"; - version = "1.1.1"; - sha256 = "1hsj1wa4x4qf6vwnxpfl40cx1ghrkdalz5a0nq0si83ykdq14ylf"; - revision = "1"; - editedCabalFile = "0ivxl975nlrpzz3rpq4hc9zi4rp7b3lvjn6izp4l83fm3crkl15i"; + version = "1.2.0"; + sha256 = "1b33w7fh9jfsr9wrdvnhc7nvn7km69f4qb03d0hb4zlylf6mxj7m"; libraryHaskellDepends = [ base containers text time ]; testHaskellDepends = [ - base containers hspec QuickCheck text time + base containers hspec QuickCheck SCalendar text time ]; - description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; + description = "A library for handling calendars and resource availability over time"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -257137,29 +256977,6 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, linear - , SDL2, StateVar, text, transformers, vector, weigh - }: - mkDerivation { - pname = "sdl2"; - version = "2.5.4.0"; - sha256 = "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym"; - revision = "2"; - editedCabalFile = "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - testHaskellDepends = [ base deepseq linear vector weigh ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; - license = lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_5_5_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: @@ -257178,7 +256995,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -258677,8 +258493,8 @@ self: { }: mkDerivation { pname = "sendgrid-v3"; - version = "1.0.0.0"; - sha256 = "0rl1zz01ca61bmm795b769k7h399s0yhkivp2br85flhrqw3asmm"; + version = "1.0.0.1"; + sha256 = "04nsk48n1v0qw7mj006dw68pjw8zjldfdpzd41g8dhilkr4n4rip"; libraryHaskellDepends = [ aeson base bytestring containers http-client lens semigroups text wreq @@ -260979,8 +260795,8 @@ self: { pname = "servant-multipart-api"; version = "0.12.1"; sha256 = "1gifa9g7ggs0plzffrd9a8j24dmqvgbkkdkfzyy7mpmwrjqw7mcj"; - revision = "3"; - editedCabalFile = "1zhiszjg8n37g25sh2cnw509n0v4b89fd93j466f2gzwkxfaaw0m"; + revision = "4"; + editedCabalFile = "0fgkmnfz0mgld1rwdli05kx2wfdxy5fv37i73v3xyx65hn9hfcy0"; libraryHaskellDepends = [ base bytestring servant text transformers ]; @@ -265315,8 +265131,8 @@ self: { }: mkDerivation { pname = "si-timers"; - version = "1.0.0.1"; - sha256 = "112rc3178kgam5iqhih20mylbz6l2siiac5d5n1zg4dqisjnh9zn"; + version = "1.1.0.0"; + sha256 = "1xcha073j5vylddcx1hrkkwfaajw75j9dvy9haip8crli72535r1"; libraryHaskellDepends = [ base io-classes mtl stm time ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "timers using SI units (seconds)"; @@ -265757,8 +265573,8 @@ self: { }: mkDerivation { pname = "simple"; - version = "1.0.0"; - sha256 = "18kzgs897xpvhxl68z49l850j3p4559r27i3sdp5nffyir32lwa5"; + version = "2.0.0"; + sha256 = "03x82bpj72mf48qjcygv6cj3df5d5bqq43x8bfgprhq5r31s9yd8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -266429,8 +266245,8 @@ self: { }: mkDerivation { pname = "simple-postgresql-orm"; - version = "1.0.0"; - sha256 = "0dl62x99j331371m8ailvk1pajnb43nsygl33j9vnq5alz7kpifp"; + version = "2.0.0"; + sha256 = "1pnazp4flngncc4zks4br3mz0003mf0gdbnzndki8i8d9r94wx8c"; libraryHaskellDepends = [ base bytestring directory filepath postgresql-orm postgresql-simple resource-pool simple transformers @@ -266477,19 +266293,19 @@ self: { "simple-sendfile" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, hspec, HUnit, network, process, resourcet, unix + , directory, hspec, hspec-discover, HUnit, network, process + , resourcet, unix }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.30"; - sha256 = "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn"; - revision = "1"; - editedCabalFile = "0g1fn6lcl6zi08miqrg5qyhvwr328yh5mqa5lkbvm5mvk50wiqly"; + version = "0.2.31"; + sha256 = "0q65dnvmwwcvpzhg3963s7yy404h4yrjgxvdbjy0grrs1qi6w1v6"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network process resourcet unix ]; + testToolDepends = [ hspec-discover ]; description = "Cross platform library for the sendfile system call"; license = lib.licenses.bsd3; }) {}; @@ -266519,8 +266335,8 @@ self: { }: mkDerivation { pname = "simple-session"; - version = "1.0.0"; - sha256 = "0lgs260wcqa796mw9vsg9dfgx0d8kd5m067cr4s7cp4fbssja0kp"; + version = "2.0.0"; + sha256 = "0wsjvrx6ab05hgn75mphx9056yx1x9v4g0frd0cc4n32w48v30zm"; libraryHaskellDepends = [ base base64-bytestring blaze-builder byteable bytestring containers cookie cryptohash http-types simple transformers wai wai-extra @@ -266639,8 +266455,8 @@ self: { }: mkDerivation { pname = "simple-templates"; - version = "1.0.0"; - sha256 = "0vm30fdjm5fydv4ns3z2cvmqadyxb47kvj8nzwkk5jff35jaglrf"; + version = "2.0.0"; + sha256 = "12jpl09lf8v1jxk1j8v7fl2km27pr28lb2r4fsll1cw6b2xkhvaf"; libraryHaskellDepends = [ aeson attoparsec base scientific text unordered-containers vector ]; @@ -274539,15 +274355,27 @@ self: { }) {}; "srtree" = callPackage - ({ mkDerivation, base, containers, mtl, random, vector }: + ({ mkDerivation, ad, base, containers, criterion, HUnit, mtl + , random, vector + }: mkDerivation { pname = "srtree"; - version = "0.1.2.1"; - sha256 = "1laybjb57vq50bkk2mqllxwygxg7i04ng2czm8vwy18577psbz11"; + version = "1.0.0.0"; + sha256 = "04js6ph95facdm34b9bb598s2j291dv71jg886li933zn5166j29"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers mtl random vector ]; - testHaskellDepends = [ base containers mtl random vector ]; + executableHaskellDepends = [ + base containers criterion mtl random vector + ]; + testHaskellDepends = [ + ad base containers HUnit mtl random vector + ]; description = "A general framework to work with Symbolic Regression expression trees"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "bench-srtree"; + broken = true; }) {}; "srv" = callPackage @@ -277284,8 +277112,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.10"; - sha256 = "1q844hxlb3f92j3q6p3nd3hwb1d0x67z65m0znpgzfxkm69hc23r"; + version = "1.2.0.11"; + sha256 = "0dw5vrsc9dwbxnydibwlwhrrg2db2d2frlddw24nfhvydba12p3j"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -278275,6 +278103,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.3.0"; + sha256 = "0n0xa2mdbpz0h21z8xjmvkyj58kx8ln4naw5l7011qdp8lblbr2i"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -278723,8 +278573,7 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.shlok ]; }) {archive = null;}; "streamly-binary" = callPackage @@ -278873,8 +278722,7 @@ self: { testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.shlok ]; }) {inherit (pkgs) lmdb;}; "streamly-lz4" = callPackage @@ -279312,19 +279160,15 @@ self: { }) {}; "strict-list" = callPackage - ({ mkDerivation, base, deepseq, hashable, QuickCheck - , quickcheck-instances, rerebase, semigroupoids, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids + , tasty, tasty-quickcheck }: mkDerivation { pname = "strict-list"; - version = "0.1.7"; - sha256 = "0dhfnb5zvwnnbsy0c9lyymfq223zw9jgwv3wn1rq5xp1np68mkbh"; + version = "0.1.7.1"; + sha256 = "1bvzyfcjx6g5n2jm1hi0m3aw71xz842hz30giy8p33wjcbshs1c1"; libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; + testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; description = "Strict linked list"; license = lib.licenses.mit; }) {}; @@ -279333,8 +279177,8 @@ self: { ({ mkDerivation, base, io-classes }: mkDerivation { pname = "strict-mvar"; - version = "1.0.0.1"; - sha256 = "1spfih00nkr5i00dj4r70g8vq0f7gr2kia6l8w2k450b2k749596"; + version = "1.1.0.0"; + sha256 = "0wd6kdkady3pwsswyzx5w93fivsrsxvladh7ndip2qscfgpsd4fs"; libraryHaskellDepends = [ base io-classes ]; description = "Strict MVars for IO and IOSim"; license = lib.licenses.asl20; @@ -279357,8 +279201,8 @@ self: { ({ mkDerivation, array, base, io-classes, stm }: mkDerivation { pname = "strict-stm"; - version = "1.0.0.1"; - sha256 = "0xgd8hjbb7z168pn92naicfds71fd7s316w5nhvv09bkcsj7n9mx"; + version = "1.1.0.0"; + sha256 = "15yq90fa5i0v3mgrb7yhc6c753ypzpw08lh0ramx38kpv7l1gxvx"; libraryHaskellDepends = [ array base io-classes stm ]; description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; @@ -279590,10 +279434,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.2.0"; - sha256 = "1sdd472rvykrqkv76745vavpycvb0dzcaxs3yw9dfczaxaz16xws"; - revision = "1"; - editedCabalFile = "0crn9461yil03bh06z5dwii65sdq9gf7837qxfy5bxna2qwn0zz9"; + version = "0.3.2.1"; + sha256 = "1m7xpfvhsn61wvq6axxp93630l6zy3z9zxw7gx9syagjgmyh2brr"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -281968,8 +281810,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.8.0.2"; - sha256 = "1zjzi4grxzbdbbyiqm68xy3hf4xdxm7cn5g6cz7w8575yjbqghzx"; + version = "2.8.1.0"; + sha256 = "01919z0q1nsz8hv4xhn1ag44kd8i3cj7lxn2qfqw8ch3p89jnbla"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -282248,38 +282090,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core - , optics-th, QuickCheck, quickcheck-instances, scientific - , template-haskell, text, time, transformers, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.8.6"; - sha256 = "1cvz98cn4xzr7fx8q7rwr22l7l95z1cvq7qpm1shwca5j4gq5084"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat-batteries bytestring containers - cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific - template-haskell text time transformers unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = lib.licenses.bsd3; - }) {}; - - "swagger2_2_8_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -282309,7 +282119,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "swapper" = callPackage @@ -282782,6 +282591,26 @@ self: { mainProgram = "sydtest-discover"; }) {}; + "sydtest-discover_0_0_0_3" = callPackage + ({ mkDerivation, base, filepath, optparse-applicative, path + , path-io + }: + mkDerivation { + pname = "sydtest-discover"; + version = "0.0.0.3"; + sha256 = "1q0lblsi9shad3kn4vlampfxjl4kq6h04lpf5a2xwwjjbhl40ns2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath optparse-applicative path path-io + ]; + executableHaskellDepends = [ base ]; + description = "Automatic test suite discovery for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "sydtest-discover"; + }) {}; + "sydtest-hedgehog" = callPackage ({ mkDerivation, base, containers, hedgehog, stm, sydtest , sydtest-discover @@ -286248,18 +286077,6 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: - mkDerivation { - pname = "tasty-bench"; - version = "0.3.3"; - sha256 = "13hsagamakay263shjm7pmya7zbl467bgwagxspx8k4xrzzqcx3m"; - libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; - benchmarkHaskellDepends = [ base ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_3_4" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: mkDerivation { pname = "tasty-bench"; @@ -286269,7 +286086,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-checklist" = callPackage @@ -286596,18 +286412,16 @@ self: { license = lib.licenses.bsd3; }) {}; - "tasty-hspec_1_2_0_3" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck + "tasty-hspec_1_2_0_4" = callPackage + ({ mkDerivation, base, hspec, hspec-api, hspec-core, QuickCheck + , tasty, tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-hspec"; - version = "1.2.0.3"; - sha256 = "150dvscaa0sv5pjsd74mmnp9f0jmz09qs24swz73wwjzrzmnypcx"; - revision = "1"; - editedCabalFile = "01sc5gmij3280b63jpjcz0a2lq045dj5ay46yq9i896cyka6gs6r"; + version = "1.2.0.4"; + sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck + base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck ]; description = "Hspec support for the Tasty test framework"; @@ -288133,6 +287947,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_9_2" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.9.2"; + sha256 = "1sfp8bzkxqbk7cjc70sz51mm2mcq9lz6cqk9pch8g3qgcscf02f0"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell , th-abstraction @@ -289687,7 +289513,7 @@ self: { base bytestring cabal-test-bin hspec hspec-test-sandbox process shakespeare test-sandbox text unix ]; - description = "Lightweight development environments using test-sandbox"; + description = "Lightweight development enviroments using test-sandbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "test-sandbox-compose"; @@ -291707,6 +291533,8 @@ self: { pname = "th-letrec"; version = "0.1"; sha256 = "0z9j8a7p9m5kp3zzia593zbzfmqc6himrzzjfk7nplv6vfh36yah"; + revision = "1"; + editedCabalFile = "1f6wfk0k6ri8fxld4yz58n6inq8c2qpwkk0b8zd8yrc0584vqxy8"; libraryHaskellDepends = [ base containers some template-haskell transformers ]; @@ -294026,8 +293854,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "timers-tick"; - version = "0.5.0.3"; - sha256 = "1lypbvg0i0xlss7z7pv9ibqf34jqccin8m2x3y2zzfvf5rbwpkib"; + version = "0.5.0.4"; + sha256 = "0q10njbdkiknqyvp276qpac7286z204f0a7qm7hafxzn7wrrp9mn"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "tick based timers"; @@ -302424,8 +302252,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.4.2"; - sha256 = "1pbpcvkkn360l0f5m7q5piyagvxznghknzjpxc7znb35i3xqywl1"; + version = "0.4.3"; + sha256 = "06mafwa6sp0b2vb1dlpjp9bsy6h8f01qrq58c3gwvcy5lrz4hwi4"; libraryHaskellDepends = [ ansi-wl-pprint base containers contravariant deepseq exceptions mtl profunctors template-haskell transformers transformers-compat @@ -302451,6 +302279,8 @@ self: { ]; description = "Support for programming with names and binders using kind-generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unbounded-delays" = callPackage @@ -306276,6 +306106,24 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {}; + "utility-ht_0_0_17" = callPackage + ({ mkDerivation, base, doctest-exitcode-stdio, doctest-lib + , QuickCheck + }: + mkDerivation { + pname = "utility-ht"; + version = "0.0.17"; + sha256 = "164sy6vdq5vspvfcj59hsmynn97x0wimw4xa5jyzkl4b0vp8lhb2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib QuickCheck + ]; + description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; + }) {}; + "uu-cco" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -308238,8 +308086,8 @@ self: { }: mkDerivation { pname = "vector-hashtables"; - version = "0.1.1.2"; - sha256 = "0hrjvy9qg1m5g3w91zxy4syqmp8jk7ajjbxbzkhy282dwfigkyd2"; + version = "0.1.1.3"; + sha256 = "0hi37svcw1z36xmjfx0s8lh2aj7ky9az0g6v4k1wn7c785bccbv6"; libraryHaskellDepends = [ base hashable primitive vector ]; testHaskellDepends = [ base containers hashable hspec primitive QuickCheck @@ -308267,23 +308115,6 @@ self: { }) {}; "vector-instances" = callPackage - ({ mkDerivation, base, comonad, hashable, keys, pointed - , semigroupoids, semigroups, vector - }: - mkDerivation { - pname = "vector-instances"; - version = "3.4"; - sha256 = "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv"; - revision = "1"; - editedCabalFile = "177jllmcv0517vppc4lx0l0kvicgaf1h060lkcnv7fl0hnp16zf5"; - libraryHaskellDepends = [ - base comonad hashable keys pointed semigroupoids semigroups vector - ]; - description = "Orphan Instances for 'Data.Vector'"; - license = lib.licenses.bsd3; - }) {}; - - "vector-instances_3_4_2" = callPackage ({ mkDerivation, base, comonad, hashable, keys, pointed , semigroupoids, vector }: @@ -308296,7 +308127,6 @@ self: { ]; description = "Orphan Instances for 'Data.Vector'"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vector-instances-collections" = callPackage @@ -308926,6 +308756,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "versions_6_0_0" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , parser-combinators, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "versions"; + version = "6.0.0"; + sha256 = "1cb8sal6iva16mn9fw1gzac7xd80l9pn5b2msp11rwr2hn8jppyp"; + libraryHaskellDepends = [ + base deepseq hashable megaparsec parser-combinators text + ]; + testHaskellDepends = [ + base megaparsec microlens tasty tasty-hunit text + ]; + description = "Types and parsers for software version numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vessel" = callPackage ({ mkDerivation, aeson, aeson-gadt-th, base, base-orphans , bifunctors, commutative-semigroups, constraints @@ -311798,6 +311647,28 @@ self: { broken = true; }) {}; + "wai-problem-details" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default + , deriving-aeson, hspec, hspec-wai, hspec-wai-json, http-types + , network-uri, text, wai + }: + mkDerivation { + pname = "wai-problem-details"; + version = "0.1.1.0"; + sha256 = "1pi7r3c0b5gi6z2hc6m498kf1xs93gn4m2nbkm5ixnja2670qjq8"; + libraryHaskellDepends = [ + aeson base bytestring data-default deriving-aeson http-types + network-uri text wai + ]; + testHaskellDepends = [ + base data-default hspec hspec-wai hspec-wai-json http-types wai + ]; + description = "Problem details middleware for WAI"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-rate-limit" = callPackage ({ mkDerivation, base, http-types, time-units, wai }: mkDerivation { @@ -313686,8 +313557,8 @@ self: { }: mkDerivation { pname = "webby"; - version = "1.1.0"; - sha256 = "1nrk40blzmzv3drgja76bq6czlayqan4rl3wgkd7mlkbkvdplmxj"; + version = "1.1.1"; + sha256 = "0iklinrh763cq2b4h59xfiszwbjkfkfs8wbkr2p5n6xnx084jwxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -321486,9 +321357,9 @@ self: { "yeamer" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, data-default-class, diagrams-cairo - , diagrams-lib, directory, dumb-cas, filepath, flat, HaTeX - , js-jquery, microlens, microlens-th, numbered-semigroups + , bytestring, containers, data-default-class, diagrams-gi-cairo + , diagrams-lib, directory, dumb-cas, exceptions, filepath, flat + , HaTeX, js-jquery, microlens, microlens-th, numbered-semigroups , semigroups, shakespeare, tasty, tasty-hunit, tasty-quickcheck , template-haskell, temporary, TeX-my-math, texmath, text, these , these-lens, time, transformers, unix, vector, xml, yesod @@ -321496,20 +321367,20 @@ self: { }: mkDerivation { pname = "yeamer"; - version = "0.1.2.0"; - sha256 = "07xl891fdy9cilzpfpirzqmz7f6jw2m151bdk8p16633fkhsmvc3"; + version = "0.1.3.1"; + sha256 = "1ki0glpds53p31wwp73v27cb4i6s914q89kkhnl7rmafkjfdc5qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers - data-default-class directory dumb-cas filepath flat HaTeX js-jquery - microlens microlens-th numbered-semigroups semigroups shakespeare - template-haskell temporary TeX-my-math texmath text these - these-lens transformers unix vector xml yesod yesod-form - yesod-static zlib + data-default-class directory dumb-cas exceptions filepath flat + HaTeX js-jquery microlens microlens-th numbered-semigroups + semigroups shakespeare template-haskell temporary TeX-my-math + texmath text these these-lens transformers unix vector xml yesod + yesod-form yesod-static zlib ]; executableHaskellDepends = [ - base diagrams-cairo diagrams-lib flat numbered-semigroups + base diagrams-gi-cairo diagrams-lib flat numbered-semigroups semigroups shakespeare TeX-my-math time ]; testHaskellDepends = [ @@ -325186,20 +325057,20 @@ self: { "zephyr" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base - , base-compat, boxes, bytestring, containers, directory, filepath - , formatting, Glob, hspec, hspec-core, HUnit, language-javascript - , mtl, optparse-applicative, process, purescript, QuickCheck, safe - , text, transformers, utf8-string + , boxes, bytestring, containers, directory, filepath, formatting + , Glob, hspec, hspec-core, HUnit, language-javascript, mtl + , optparse-applicative, process, purescript, QuickCheck, safe, text + , transformers, unordered-containers, utf8-string }: mkDerivation { pname = "zephyr"; - version = "0.3.2"; - sha256 = "0p0n4p4792jdivgqdwf2brbkrw6b5rxfzfq9ph0sjw7h3gkj1was"; + version = "0.5.3"; + sha256 = "1chfs864kayq4xfl5yz4pcwfy1zpsq9ygbvlbj3s7lifg7khyffz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base base-compat boxes containers formatting - language-javascript mtl purescript safe text + aeson ansi-terminal base boxes containers formatting + language-javascript mtl purescript safe text unordered-containers ]; executableHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base bytestring containers @@ -325207,9 +325078,9 @@ self: { optparse-applicative purescript text transformers utf8-string ]; testHaskellDepends = [ - aeson base base-compat containers directory hspec hspec-core HUnit + aeson base containers directory hspec hspec-core HUnit language-javascript mtl optparse-applicative process purescript - QuickCheck text transformers utf8-string + QuickCheck text transformers ]; testToolDepends = [ purescript ]; description = "Zephyr, tree-shaking for the PureScript language"; @@ -325697,8 +325568,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "5"; - editedCabalFile = "1gkfbm06qpcwy17mlk522wlf7jkxsmqdl33c6ckvwkq2z9diy63a"; + revision = "6"; + editedCabalFile = "0sx3cqlky3y1wppccxr4xfkh1f749apr7y6lsip6bipb3z2j0wqf"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -325759,6 +325630,36 @@ self: { mainProgram = "haskell-zip-app"; }) {}; + "zip_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base, unix + }: + mkDerivation { + pname = "zip"; + version = "2.0.0"; + sha256 = "1j3gwhgcn2j2jsdg4dw7a5y1pw0n273zkfk782pvzjqmccaywbdp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base unix + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + description = "Operations on zip archives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "haskell-zip-app"; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index af012d811ed1..7c08b795d6a5 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla , libsigsegv, gmpxx, cln, yices +# passthru.tests +, tamarin-prover }: let @@ -46,6 +48,11 @@ stdenv.mkDerivation { for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done ''; + passthru.tests = { + # tamarin-prover only supports specific versions of maude explicitly + inherit tamarin-prover; + }; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 894bed5f5357..189c6f3a41a6 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -203,6 +203,8 @@ stdenv.mkDerivation rec { popd # ../autotest ''; + __darwinAllowLocalNetworking = true; + meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 4bdf8fcf06e4..80013e3613d0 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.13.0"; + version = "1.12.1"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "v${version}"; - hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; + rev = "release-${version}"; + hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; }; patches = [ diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 85bf2fb44906..cba73e23fd9c 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,42 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, fuse +, android-tools +}: stdenv.mkDerivation rec { pname = "adbfs-rootless"; - version = "2016-10-02"; + version = "unstable-2023-03-21"; src = fetchFromGitHub { owner = "spion"; - repo = "adbfs-rootless"; - rev = "b58963430e40c9246710a16cec58e7ffc88baa48"; - sha256 = "1kjibl86k6pf7vciwaaxwv5m4q28zdpd2g7yhp71av32jq6j3wm8"; + repo = pname; + rev = "fd56381af4dc9ae2f09b904c295686871a46ed0f"; + sha256 = "atiVjRfqvhTlm8Q+3iTNNPQiNkLIaHDLg5HZDJvpl2Q="; }; - patches = [ - (fetchpatch { - # https://github.com/spion/adbfs-rootless/issues/14 - url = "https://github.com/kronenpj/adbfs-rootless/commit/35f87ce0a7aeddaaad118daed3022e01453b838d.patch"; - sha256 = "1iigla74n3hphnyx9ffli9wqk7v71ylvsxama868czlg7851jqj9"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fuse ]; postPatch = '' # very ugly way of replacing the adb calls - sed -e 's|"adb |"${adb}/bin/adb |g' \ - -i adbfs.cpp + substituteInPlace adbfs.cpp \ + --replace '"adb ' '"${android-tools}/bin/adb ' ''; installPhase = '' + runHook preInstall install -D adbfs $out/bin/adbfs + runHook postInstall ''; meta = with lib; { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; - maintainers = with maintainers; [ Profpatsch ]; - platforms = platforms.linux; + maintainers = with maintainers; [ Profpatsch aleksana ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 924f643cc88d..92ea0794a1e1 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -13,8 +13,7 @@ buildDunePackage rec { sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0="; }; - # dune 3 is required for tests to pass - duneVersion = if doCheck then "3" else "2"; + duneVersion = "3"; nativeBuildInputs = [ cppo ]; buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 114077681c91..75449c9f625c 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -25,7 +25,6 @@ , freezegun , gunicorn , pytest-mock -, pytest-xdist , pytestCheckHook , re-assert , trustme @@ -81,12 +80,12 @@ buildPythonPackage rec { idna-ssl ]; + # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. nativeCheckInputs = [ async_generator freezegun gunicorn pytest-mock - pytest-xdist pytestCheckHook re-assert ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix new file mode 100644 index 000000000000..5f87602064bf --- /dev/null +++ b/pkgs/development/python-modules/ax/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, botorch +, ipywidgets +, jinja2 +, pandas +, plotly +, setuptools-scm +, typeguard +, hypothesis +, mercurial +, pyfakefs +, pytestCheckHook +, yappi +}: + +buildPythonPackage rec { + pname = "ax"; + version = "0.3.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = version; + hash = "sha256-1KLLjeUktXvIDOlTQzMmpbL/On8PTxZQ44Qi4BT3nPk="; + }; + + propagatedBuildInputs = [ + botorch + ipywidgets + jinja2 + pandas + plotly + setuptools-scm + typeguard + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + hypothesis + mercurial + pyfakefs + pytestCheckHook + yappi + ]; + pytestFlagsArray = [ + "--ignore=ax/benchmark" + "--ignore=ax/runners/tests/test_torchx.py" + # requires pyre_extensions + "--ignore=ax/telemetry/tests" + "--ignore=ax/core/tests/test_utils.py" + "--ignore=ax/early_stopping/tests/test_strategies.py" + # broken with sqlalchemy 2 + "--ignore=ax/service/tests/test_ax_client.py" + "--ignore=ax/service/tests/test_scheduler.py" + "--ignore=ax/service/tests/test_with_db_settings_base.py" + "--ignore=ax/storage" + ]; + pythonImportsCheck = [ "ax" ]; + + meta = with lib; { + description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments"; + homepage = "https://ax.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix new file mode 100644 index 000000000000..ac31c7fdd9a1 --- /dev/null +++ b/pkgs/development/python-modules/botorch/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gpytorch +, linear_operator +, multipledispatch +, pyro-ppl +, setuptools-scm +, torch +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "botorch"; + version = "0.8.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-VcNHgfk8OfLJseQxHksycWuCPCudCtOdcRV0XnxHSfU="; + }; + + buildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ + gpytorch + linear_operator + multipledispatch + pyro-ppl + scipy + torch + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "botorch" ]; + + meta = with lib; { + description = "Bayesian Optimization in PyTorch"; + homepage = "https://botorch.org"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 7764889888c6..e7c45afdd317 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -77,6 +77,7 @@ buildPythonPackage rec { ]; meta = with lib; { + mainProgram = "pyproject-build"; description = "Simple, correct PEP517 package builder"; longDescription = '' build will invoke the PEP 517 hooks to build a distribution package. It diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 2179364b9222..766857a66a85 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.2.2"; + version = "0.2.5"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-vMc5fgFYS06m01WDLRyna3T1uuR+JinqM6huXAQ34rI="; + hash = "sha256-T5mmHUMNbdvexeSaIDZIm/3yQcDKnWdor9IK63FE0no="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ buildPythonPackage { meta = with lib; { description = "ChaCha20Poly1305 that is reuseable for asyncio"; homepage = "https://github.com/bdraco/chacha20poly1305-reuseable"; - changelog = "https://github.com/bdraco/chacha20poly1305-reuseable/blob/main/CHANGELOG.md"; + changelog = "https://github.com/bdraco/chacha20poly1305-reuseable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 9bc81a09960c..4c69172fdd4c 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub , fetchpatch @@ -34,7 +35,8 @@ buildPythonPackage rec { version = "1.1.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Upstream package is broken on Python 3.11 https://github.com/quantumlib/Cirq/issues/6018 + disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "quantumlib"; diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index ca2f9e4256ca..2c6597aeb7f0 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "CTAP (client-to-authenticator-protocol) device backed by python's keyring library"; homepage = "https://github.com/dany74q/ctap-keyring-device"; license = licenses.mit; - maintainers = with maintainers; [ dennajort ]; + maintainers = with maintainers; [ jbgosselin ]; }; } diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index d437c5794feb..a3f2d67d35a7 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -37,5 +37,8 @@ buildPythonPackage rec { homepage = "https://dataset.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ xfnw ]; + # SQLAlchemy >= 2.0.0 is unsupported + # https://github.com/pudo/dataset/issues/411 + broken = true; }; } diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index 9214c3b430a9..37ef77947b3f 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "distutils-extra"; - version = "2.47"; + version = "2.50"; format = "setuptools"; src = fetchurl { url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2"; - hash = "sha256-vIl50yDVt5AW5lteWYqhAPlu8ErroOOJ1N/sfE2fbBU="; + hash = "sha256-aq5+JjlzD3fS4+CPxZNjyz2QNfqsChC0w6KRVgbTGwI="; }; # Tests are out-dated as the last upstream release is from 2016 diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix new file mode 100644 index 000000000000..2e9530266d17 --- /dev/null +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, beautifulsoup4 + +# tests +, django +, python +}: + +buildPythonPackage rec { + pname = "django-bootstrap4"; + version = "3.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "zostera"; + repo = "django-bootstrap4"; + rev = "v${version}"; + hash = "sha256-5t6b/1921AMDqoYg7XC2peGxOBFE8XlvgGjHnTlQa4c="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + pythonImportsCheck = [ + "bootstrap4" + ]; + + nativeCheckInputs = [ + (django.override { withGdal = true; }) + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} manage.py test -v1 --noinput + runHook postCheck + ''; + + meta = with lib; { + description = "Bootstrap 4 integration with Django"; + homepage = "https://github.com/zostera/django-bootstrap4"; + changelog = "https://github.com/zostera/django-bootstrap4/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index 53a3ca85da49..f8126f7ed3ad 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , python-crontab , celery +, cron-descriptor , django-timezone-field , tzdata , ephem @@ -15,17 +16,18 @@ buildPythonPackage rec { pname = "django-celery-beat"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WO/pRg5Dc6JBwrPYOVGPKaKK4ZvICo26INogTH6lBhM="; + hash = "sha256-zQpH9ZWEAvUawMcVvJQq4z17ULTkjLqRvD8nEr5QXfE="; }; propagatedBuildInputs = [ + cron-descriptor python-crontab celery django-timezone-field diff --git a/pkgs/development/python-modules/django-context-decorator/default.nix b/pkgs/development/python-modules/django-context-decorator/default.nix new file mode 100644 index 000000000000..44d96fa9ad33 --- /dev/null +++ b/pkgs/development/python-modules/django-context-decorator/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-context-decorator"; + version = "1.5.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rixx"; + repo = "django-context-decorator"; + rev = "v${version}"; + hash = "sha256-wgVZadI+4gK9snLfy/9FgFJJHqMyxndcxXwqIkMH29k="; + }; + + pythonImportsCheck = [ + "django_context_decorator" + ]; + + nativeCheckInputs = [ + django + pytestCheckHook + ]; + + meta = with lib; { + description = "Django @context decorator"; + homepage = "https://github.com/rixx/django-context-decorator"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 0aa6df4f2d2c..a49a51939403 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -3,6 +3,7 @@ , django , django-appconf , fetchFromGitHub +, fetchpatch , lib , python , pythonOlder @@ -32,6 +33,11 @@ buildPythonPackage rec { django-appconf ]; + patches = [ + # See: https://github.com/georgemarshall/django-cryptography/pull/88 + ./fix-setup-cfg.patch + ]; + pythonImportsCheck = [ "django_cryptography" ]; checkPhase = '' diff --git a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch b/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch new file mode 100644 index 000000000000..0cb7b9dba2aa --- /dev/null +++ b/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch @@ -0,0 +1,16 @@ +diff --git a/setup.cfg b/setup.cfg +index 865b4c3..577d917 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -35,7 +35,10 @@ project_urls = + Documentation = https://django-cryptography.readthedocs.io + + [options] +-packages = django_cryptography ++packages = ++ django_cryptography ++ django_cryptography.core ++ django_cryptography.utils + python_requires = >=3.6 + include_package_data = True + install_requires = diff --git a/pkgs/development/python-modules/django-libsass/default.nix b/pkgs/development/python-modules/django-libsass/default.nix new file mode 100644 index 000000000000..181abfafd148 --- /dev/null +++ b/pkgs/development/python-modules/django-libsass/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# dependencies +, django-compressor +, libsass + +# tests +, django +, python +}: + +buildPythonPackage rec { + pname = "django-libsass"; + version = "0.9"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "torchbox"; + repo = "django-libsass"; + rev = "refs/tags/v${version}"; + hash = "sha256-54AlRVmit0rtG1jx7O+XyA1vXLHCfoNPjHkHCQaaybA="; + }; + + propagatedBuildInputs = [ + django-compressor + libsass + ]; + + nativeCheckInputs = [ + django + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} ./runtests.py + runHook postCheck + ''; + + meta = with lib; { + description = "A django-compressor filter to compile SASS files using libsass"; + homepage = "https://github.com/torchbox/django-libsass"; + changelog = "https://github.com/torchbox/django-libsass/blob/${src.rev}/CHANGELOG.txt"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index b2ef5eff47a7..e373fa30a526 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -19,18 +19,18 @@ buildPythonPackage rec { pname = "django-markup"; - version = "1.7"; + version = "1.7.2"; format = "setuptools"; src = fetchFromGitHub { owner = "bartTC"; repo = "django-markup"; rev = "refs/tags/v${version}"; - hash = "sha256-P36DYOcjYAvzhSLe5CwzRaIm/KzrpUh0YZjzcwnSBG8="; + hash = "sha256-NvGlvrXOwDrwHhbFHrWf7Kz9sEzTTyq84/Z6jjRNy8Q="; }; postPatch = '' - sed -i "/--cov/d" setup.cfg + sed -i "/--cov/d" pyproject.toml ''; buildInputs = [ diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index aa135d17de7f..40bdf4e57ff7 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-prometheus"; - version = "2.2.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "korfuri"; repo = pname; rev = "v${version}"; - hash = "sha256-NE0zHnGGSrtkBLrSyBcQuyGrSfSQbdpevokg3YZhwDw="; + hash = "sha256-JiLH+4mmNdb9BN81J5YFiMPna/3gaKUK6ARjmCa3fE8="; }; patches = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/korfuri/django-prometheus/releases/tag/v${version}"; description = "Django middlewares to monitor your application with Prometheus.io"; homepage = "https://github.com/korfuri/django-prometheus"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index a0bfca2a8b2b..5444700999fa 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MUIwgG8GKL+V5GgiC7gZXn5tlSVrmTj/IFiP+hVB7Ks="; + hash = "sha256-UiV9eshlUqzmoI+04BXMFVI8pm7OYQZFa9lmIQrmlRg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3985fac94a1a..98e5c6b35eda 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.47.2"; + version = "0.48.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5DbnvIScSq+bu8ki0eUwUZd9Gf3KlhD+I0/PpWfGOu0="; + hash = "sha256-h4E4nwACnGPtmQjEi+O2WNvlDsfJBSngh4CYHQVxDkY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix index 2398f421e0da..77d1ecc60c75 100644 --- a/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "espeak-phonemizer"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-phonemizer"; rev = "refs/tags/v${version}"; - hash = "sha256-FiajWpxSDRxTiCj8xGHea4e0voqOvaX6oQYB72FkVbw="; + hash = "sha256-F+A2ge9YAib6IjDW3RNi7QqKnh1RGy2mlPFEB+OLCJU="; }; patches = [ diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index fe1ef2b672a1..104400d5a6aa 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.4"; + version = "0.2.5"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-YfF2jN2EPcL4pFlxJyxYwlZBpQsZ2pEwLiSS4ypmc2I="; + hash = "sha256-4P1HO0Jl5+DnhD7Hb+rIwMRBuGlXH0Zb7+nmlZSQaf4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix new file mode 100644 index 000000000000..f914bc326ba9 --- /dev/null +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, linear_operator +, scikit-learn +, torch +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gpytorch"; + version = "1.10"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "cornellius-gp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-KY3ItkVjBfIYMkZAmD56EBGR9YN/MRN7b2K3zrK6Qmk="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'find_version("gpytorch", "version.py")' \"$version\" + ''; + + propagatedBuildInputs = [ + linear_operator + scikit-learn + torch + ]; + + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "gpytorch" ]; + disabledTests = [ + # AssertionError on number of warnings emitted + "test_deprecated_methods" + # flaky numerical tests + "test_classification_error" + "test_matmul_matrix_broadcast" + ]; + + meta = with lib; { + description = "A highly efficient and modular implementation of Gaussian Processes, with GPU acceleration"; + homepage = "https://gpytorch.ai"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index f1306e085c31..aef554522940 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -51,6 +51,7 @@ , atlassian-python-api , duckduckgo-search , lark +, jq # test dependencies , pytest-vcr , pytest-asyncio @@ -65,7 +66,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.158"; + version = "0.0.163"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -74,7 +75,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-R8l7Y33CiTL4px5A7rB6PHMnSjvINZBrgANwUMFkls8="; + hash = "sha256-3oebRLMunzfz+fAS5h+HaabioIPXTJLJc0YAktLx4/U="; }; postPatch = '' @@ -188,6 +189,7 @@ buildPythonPackage rec { pexpect # pyvespa # O365 + jq ]; }; diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear_operator/default.nix new file mode 100644 index 000000000000..48fb004c14c4 --- /dev/null +++ b/pkgs/development/python-modules/linear_operator/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, scipy +, torch +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "linear_operator"; + version = "0.4.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "cornellius-gp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0f3F3k3xJACbx42jtwsAmjZwPAOfLywZs8VOrwWicc4="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'find_version("linear_operator", "version.py")' \"$version\" + ''; + + propagatedBuildInputs = [ + scipy + torch + ]; + + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "linear_operator" ]; + disabledTests = [ + # flaky numerical tests + "test_svd" + ]; + + meta = with lib; { + description = "A LinearOperator implementation to wrap the numerical nuts and bolts of GPyTorch"; + homepage = "https://github.com/cornellius-gp/linear_operator/"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index f00666502fa2..ba1e4f4022ae 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -2,28 +2,34 @@ , buildPythonPackage , fetchPypi , pythonOlder -, python -, mock +, twisted +, unittestCheckHook }: buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.5"; + version = "3.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bxv/2TuaMvwBipu/NIdQW1Lg11fsNAZpBcYKkS1JI4Q="; + hash = "sha256-8zws2w1rqnSjZyTzjBxKCZp84sjsSiu3GSFQpYVd9HY="; }; - buildInputs = [ mock ]; + passthru.optional-dependencies = { + twisted = [ + twisted + ]; + }; - checkPhase = '' - ${python.interpreter} -m unittest mpd.tests - ''; + nativeCheckInputs = [ + unittestCheckHook + ] ++ passthru.optional-dependencies.twisted; meta = with lib; { + changelog = "https://github.com/Mic92/python-mpd2/blob/v${version}/doc/changes.rst"; description = "A Python client module for the Music Player Daemon"; homepage = "https://github.com/Mic92/python-mpd2"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 1b8fe804a47c..66621b126cd5 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "nbdime"; - version = "3.1.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z3ZzIOlxN09wGhdapZq9OlVHIwOdOfrpCOctFjMNZIs="; + hash = "sha256-5Q0aDPZy4CNW4Q5tPQrqjoYSpTSubhub/VmsO2DEBes="; }; nativeBuildInputs = [ @@ -92,7 +92,5 @@ buildPythonPackage rec { description = "Tools for diffing and merging of Jupyter notebooks."; license = licenses.bsd3; maintainers = with maintainers; [ tbenst ]; - # https://github.com/jupyter/nbdime/issues/645 - broken = lib.versionAtLeast jupyter-server.version "2"; }; } diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 13c2be3a809c..42b4738fe6fa 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "Python SDK for the Okta Management API"; homepage = "https://github.com/okta/okta-sdk-python"; license = licenses.asl20; - maintainers = with maintainers; [ dennajort ]; + maintainers = with maintainers; [ jbgosselin ]; }; } diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix index 3073a35ea3e9..d712dacff7cd 100644 --- a/pkgs/development/python-modules/poetry-plugin-export/default.nix +++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rqUs73pTpc18HsloLGRBYA6v/qyk/eUH7uEZYlAgFa0="; + hash = "sha256-zA5YHZ3/iVoNf2AKqkrKVDYJIoJh+FMwuoskWHutG5I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix index 08c7a6b5c98a..d0342f8cff68 100644 --- a/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/pkgs/development/python-modules/pyduke-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyduke-energy"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mjmeli"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g+s9YaVFOCKaBGR5o9cPk4kcIW4BffFHTtmDNE8f/zE="; + hash = "sha256-7KkUpsHg3P2cF0bVl3FzyAQwzeaCmg+vzRHlM/TIcNA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix index 7aab7a2804fa..fe68e9ee46b0 100644 --- a/pkgs/development/python-modules/pytest-recording/default.nix +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "A pytest plugin that allows you recording of network interactions via VCR.py"; homepage = "https://github.com/kiwicom/pytest-recording"; license = licenses.mit; - maintainers = with maintainers; [ dennajort ]; + maintainers = with maintainers; [ jbgosselin ]; }; } diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 33c7c66149d8..993c1516bccb 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp39 = { - sha256 = "596811ae6b41e50f038e0a7cdf0a5320151508d74bac84795bbccad4f6adc6a9"; + sha256 = "4889b457363a3cfa52088b3572b864ebb391806371bc59b2bb047e44f999bb32"; }; cp310 = { - sha256 = "b19d381d425259c80b7a9b14aac9d898637ce262d91baeb9569999de3b043967"; + sha256 = "5ed5a29795b122e9e2b832d5224ab9b1cc235beab700d2a413b23c63b3d3c80c"; }; cp311 = { - sha256 = "d86126b6ab5113a3be35281d5699bad731c8f90e02cf6561057017df9312f0a5"; + sha256 = "d316861298f6e996f4841e4160ed38dc289f81cf0ffe9874dc14ef7e4e5a9190"; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index a8a8750ee3da..1a55c4f9e866 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -57,7 +57,7 @@ let pname = "ray"; - version = "2.3.0"; + version = "2.4.0"; in buildPythonPackage rec { inherit pname version; diff --git a/pkgs/development/python-modules/rouge-score/default.nix b/pkgs/development/python-modules/rouge-score/default.nix new file mode 100644 index 000000000000..09d2bcc1dc81 --- /dev/null +++ b/pkgs/development/python-modules/rouge-score/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchPypi +, fetchFromGitHub +, python +, buildPythonPackage +, absl-py +, nltk +, numpy +, six +, pytestCheckHook +, pythonOlder +}: +let + testdata = fetchFromGitHub { + owner = "google-research"; + repo = "google-research"; + sparseCheckout = [ "rouge/testdata" ]; + rev = "1d4d2f1aa6f2883a790d2ae46a6ee8ab150d8f31"; + hash = "sha256-ojqk6U2caS7Xz4iGUC9aQVHrKb2QNvMlPuQAL/jJat0="; + }; +in buildPythonPackage rec { + pname = "rouge-score"; + version = "0.1.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "rouge_score"; + inherit version; + extension = "tar.gz"; + hash = "sha256-x9TaJoPmjJq/ATXvkV1jpGZDZm+EjlWKG59+rRf/DwQ="; + }; + + # the tar file from pypi doesn't come with the test data + postPatch = '' + substituteInPlace rouge_score/test_util.py \ + --replace 'os.path.join(os.path.dirname(__file__), "testdata")' '"${testdata}/rouge/testdata/"' + ''; + + propagatedBuildInputs = [ absl-py nltk numpy six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + doCheck = true; + + disabledTests = [ + # https://github.com/google-research/google-research/issues/1203 + "testRougeLSumSentenceSplitting" + # tries to download external tokenizers via nltk + "testRougeLsumLarge" + ]; + + pythonImportsCheck = [ "rouge_score" ]; + + meta = { + description = "Python ROUGE Implementation"; + homepage = "https://github.com/google-research/google-research/tree/master/rouge"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nviets ]; + }; +} diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index ae266bb165d2..ab075702dae0 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simpful"; - version = "2.10.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aresio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vT7Y/6bD+txEVEw/zelMogQ0V7BIHHRitrC1COByzhY="; + hash = "sha256-1CU/Iz83CKRx7dsOTGfdJm98TUfc2kxCHKIEUXP36HQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/theano-pymc/default.nix b/pkgs/development/python-modules/theano-pymc/default.nix index ad0b93fe0940..441843a85272 100644 --- a/pkgs/development/python-modules/theano-pymc/default.nix +++ b/pkgs/development/python-modules/theano-pymc/default.nix @@ -44,5 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/majidaldo/Theano-PyMC"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nidabdella ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/theano/default.nix b/pkgs/development/python-modules/theano/default.nix index 627941e6bc4a..1bcbda650a25 100644 --- a/pkgs/development/python-modules/theano/default.nix +++ b/pkgs/development/python-modules/theano/default.nix @@ -100,5 +100,6 @@ in buildPythonPackage rec { description = "A Python library for large-scale array computation"; license = licenses.bsd3; maintainers = [ ]; + broken = true; }; } diff --git a/pkgs/development/tools/bin2c/default.nix b/pkgs/development/tools/bin2c/default.nix new file mode 100644 index 000000000000..02039caf457c --- /dev/null +++ b/pkgs/development/tools/bin2c/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, util-linux +}: + +stdenv.mkDerivation { + pname = "bin2c"; + version = "unstable-2020-05-30"; + + src = fetchFromGitHub { + owner = "adobe"; + repo = "bin2c"; + rev = "4300880a350679a808dc05bdc2840368f5c24d9a"; + sha256 = "sha256-PLo5kkN2k3KutVGumoXEB2x9MdxDUtpwAQZLwm4dDvw="; + }; + + makeFlags = [ "prefix=$(out)" ]; + + doCheck = !stdenv.isDarwin; + checkTarget = "test"; + checkInputs = [ util-linux ]; # uuidgen + + meta = with lib; { + description = "Embed binary & text files inside C binaries"; + homepage = "https://github.com/adobe/bin2c"; + license = licenses.asl20; + maintainers = [ maintainers.shadowrz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/tools/build-managers/gprbuild/boot.nix index 795bb4407d58..9cdfb27c8893 100644 --- a/pkgs/development/tools/build-managers/gprbuild/boot.nix +++ b/pkgs/development/tools/build-managers/gprbuild/boot.nix @@ -53,7 +53,14 @@ stdenv.mkDerivation { # introducing a wrapper for it in the future remains TODO. # For the moment this doesn't matter since we have no situation # were gprbuild is used to build something used at build time. - setupHook = ./gpr-project-path-hook.sh; + setupHooks = [ + ./gpr-project-path-hook.sh + ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ + # This setupHook replaces the paths of shared libraries starting + # with @rpath with the absolute paths on Darwin, so that the + # binaries can be run without additional setup. + ./gpr-project-darwin-rpath-hook.sh + ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/build-managers/gprbuild/default.nix b/pkgs/development/tools/build-managers/gprbuild/default.nix index 3155151ae0f8..5b3d45bf62d5 100644 --- a/pkgs/development/tools/build-managers/gprbuild/default.nix +++ b/pkgs/development/tools/build-managers/gprbuild/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit (gprbuild-boot) version src - setupHook + setupHooks meta ; diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh b/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh new file mode 100644 index 000000000000..73be2eb5960a --- /dev/null +++ b/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh @@ -0,0 +1,10 @@ +fixGprProjectDarwinRpath() { + for f in $(find $out -type f -executable); do + install_name_tool -id $f $f || true + for rpath in $(otool -L $f | grep @rpath | awk '{print $1}'); do + install_name_tool -change $rpath ${!outputLib}/lib/$(basename $rpath) $f || true + done + done +} + +preFixupPhases+=" fixGprProjectDarwinRpath" diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh index bd562b925e22..f98b2ab9e58d 100644 --- a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh +++ b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh @@ -6,16 +6,3 @@ addAdaObjectsPath() { } addEnvHooks "$targetOffset" addAdaObjectsPath - -fixDarwinRpath() { - for f in $(find $out -type f -executable); do - install_name_tool -id $f $f || true - for rpath in $(otool -L $f | grep rpath | awk '{print $1}'); do - install_name_tool -change $rpath $out/lib/$(basename $rpath) $f || true - done - done -} - -if [ "$(uname)" = "Darwin" ]; then - preFixupPhases+=" fixDarwinRpath" -fi diff --git a/pkgs/development/tools/haskell/hadrian/default.nix b/pkgs/development/tools/haskell/hadrian/default.nix index de10210ecd3e..5911c34982b0 100644 --- a/pkgs/development/tools/haskell/hadrian/default.nix +++ b/pkgs/development/tools/haskell/hadrian/default.nix @@ -2,7 +2,7 @@ ghcSrc ? null, ghcVersion ? null , mkDerivation, base, bytestring, Cabal, containers, directory , extra, filepath, lib, mtl, parsec, shake, text, transformers -, unordered-containers +, unordered-containers, cryptohash-sha256, base16-bytestring , userSettings ? null , writeText }: @@ -35,6 +35,8 @@ mkDerivation { executableHaskellDepends = [ base bytestring Cabal containers directory extra filepath mtl parsec shake text transformers unordered-containers + ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [ + cryptohash-sha256 base16-bytestring ]; description = "GHC build system"; license = lib.licenses.bsd3; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 87db3baf0b0e..2f057ada92b9 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { inherit pname; version = "1.6.9"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-community"; diff --git a/pkgs/development/tools/ocaml/cppo/ocamlbuild.nix b/pkgs/development/tools/ocaml/cppo/ocamlbuild.nix index d0627480ea1c..3f1f436b076c 100644 --- a/pkgs/development/tools/ocaml/cppo/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/cppo/ocamlbuild.nix @@ -4,10 +4,13 @@ if lib.versionOlder (lib.getVersion cppo) "1.6" then cppo else -buildDunePackage rec { +buildDunePackage { pname = "cppo_ocamlbuild"; - inherit (cppo) version useDune2 src; + inherit (cppo) version src; + + minimalOCamlVersion = "4.03"; + duneVersion = "3"; propagatedBuildInputs = [ ocamlbuild ]; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 90c0aee0ff3f..c4b69eb55309 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -1,15 +1,18 @@ -{ lib, fetchurl, yojson, csexp, buildDunePackage, merlin-lib, merlin }: +{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin }: buildDunePackage rec { pname = "dot-merlin-reader"; + duneVersion = "3"; + inherit (merlin) version src; minimalOCamlVersion = "4.06"; - buildInputs = if lib.versionAtLeast version "4.7-414" + buildInputs = [ findlib ] + ++ (if lib.versionAtLeast version "4.7-414" then [ merlin-lib ] - else [ yojson csexp ]; + else [ yojson csexp ]); meta = with lib; { description = "Reads config files for merlin"; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index e4bdb4b673d9..6643ddb0e1d1 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.5.4"; + version = "2.5.5"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aByzVPQADTNz5rVzmkNH/zk4u+RkWPcfk0sQhR3K2cQ="; + hash = "sha256-tHNDJF4gmg5JnL+bt7kaLE+Xho721K5+gg1kpIjKY1k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 7f806df22591..86aceace84e1 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -48,6 +48,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # thread 'python_data_access::tests::test_copy_string' panicked at 'called `Result::unwrap()` on an `Err` "--skip=python_data_access::tests::test_copy_string" + ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + # panicked at 'called `Result::unwrap()` on an `Err` value: failed to get os threadid + "--skip=test_thread_reuse" ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix new file mode 100644 index 000000000000..df8ff3c0e2c3 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bundle-licenses"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "sstadick"; + repo = "cargo-bundle-licenses"; + rev = "v${version}"; + hash = "sha256-tjxdZ28frY/GRFvhg28DkVajqFC+02962Sgai8NhxK0="; + }; + + cargoHash = "sha256-uVLoRLGnTe/8ipehGbc5mfWuMsFt3KP9KatXEJFUUEI="; + + meta = with lib; { + description = "Generate a THIRDPARTY file with all licenses in a cargo project"; + homepage = "https://github.com/sstadick/cargo-bundle-licenses"; + changelog = "https://github.com/sstadick/cargo-bundle-licenses/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 8a15b9417772..113af6161d89 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { name = "${pname}-fhs-env"; runScript = ""; - # Seems to be needed for GTK filepickers to work in FHSUserEnv - profile = "XDG_DATA_DIRS=\"\$XDG_DATA_DIRS:/usr/share/\""; - targetPkgs = pkgs: with pkgs; [ xorg.libXrandr diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 0da0bed0a3fa..a9ce5fa9e040 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -17,17 +17,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.3.457"; + version = "1.3.524"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-PN/Gt2iDOWsbKspyWYKjnX98xF6NQuGVFjlEg3ZZpio="; + hash = "sha256-9g0wTvG6XSKI7e3RP6e3RoYyvE5UjOYxI5hVINI9Fq8="; fetchSubmodules = true; }; - vendorHash = "sha256-vI8EyZgjJA89UmqoDuh/H+qQzAKO9pyqpmA8hci9cco="; + vendorHash = "sha256-slvBpweXRLsDegJDQ0ysZ0pugx5fdOOnD/OxWUfUnno="; buildInputs = [ alsa-lib diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh index fb13a70bc679..ebcdc72ed1bc 100755 --- a/pkgs/misc/base16-builder/generate.sh +++ b/pkgs/misc/base16-builder/generate.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -exec node2nix --nodejs-16 \ +exec node2nix --nodejs-18 \ --input node-packages.json \ --output node-packages-generated.nix \ --supplement-input supplement.json \ diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 3c03a5f0c08d..312e4c3b3cde 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1,9 +1,18 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { + "@mapbox/node-pre-gyp-1.0.10" = { + name = "_at_mapbox_slash_node-pre-gyp"; + packageName = "@mapbox/node-pre-gyp"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz"; + sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -13,13 +22,31 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; + }; + }; + "ansi-regex-5.0.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-2.2.1" = { @@ -28,7 +55,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; }; }; "any-promise-0.1.0" = { @@ -37,25 +64,25 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz"; - sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27"; + sha512 = "lqzY9o+BbeGHRCOyxQkt/Tgvz0IZhTmQiA+LxQW8wSNpcTbj8K+0cZiSEvbpNZZP9/11Gy7dnLO3GNWUXO4d1g=="; }; }; - "aproba-1.2.0" = { + "aproba-2.0.0" = { name = "aproba"; packageName = "aproba"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; - "are-we-there-yet-1.1.5" = { + "are-we-there-yet-2.0.0" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; + sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; "argparse-1.0.10" = { @@ -73,16 +100,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + sha512 = "M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "boxen-0.3.1" = { @@ -91,7 +118,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; + sha512 = "u9JPc+sK+tsB7uH0870GNESSm2I005T9nE9fug2X/6COxMJ9qXmSducVSFt5f3xdZgR/PtKXVJTxN296cMCP6w=="; }; }; "brace-expansion-1.1.11" = { @@ -109,7 +136,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz"; - sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd"; + sha512 = "IxLEnfsCYLjlpf6mG7SWpWgA4A8IAT5dAX3FxXHFn+6FTLf3ums771elQ74sj1BCOVanBf6esu0rEC6zgwfmIg=="; }; }; "camelcase-2.1.1" = { @@ -118,7 +145,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="; }; }; "camelcase-keys-2.1.0" = { @@ -127,16 +154,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + sha512 = "bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ=="; }; }; - "capture-stack-trace-1.0.1" = { + "capture-stack-trace-1.0.2" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; - sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz"; + sha512 = "X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w=="; }; }; "chalk-1.1.3" = { @@ -145,16 +172,16 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; }; }; - "chownr-1.1.4" = { + "chownr-2.0.0" = { name = "chownr"; packageName = "chownr"; - version = "1.1.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; "code-point-at-1.1.0" = { @@ -163,7 +190,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; "commander-1.1.1" = { @@ -172,7 +208,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; + sha512 = "71Rod2AhcH3JhkBikVpNd0pA+fWsmAaVoti6OR38T76chA7vE3pSerS0Jor4wDw+tOueD2zLVvFOw5H0Rcj7rA=="; }; }; "concat-map-0.0.1" = { @@ -181,7 +217,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; }; "configstore-2.1.0" = { @@ -190,7 +226,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + sha512 = "BOCxwwxF5WPspp1OBq9j0JLyL5JgJOTssz9PdOHr8VWjFijaC3PpjU48vFEX3uxx8sTusnVQckLbNzBq6fmkGw=="; }; }; "console-control-strings-1.1.0" = { @@ -199,16 +235,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; }; - "core-util-is-1.0.2" = { + "core-util-is-1.0.3" = { name = "core-util-is"; packageName = "core-util-is"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; }; "create-error-class-3.0.2" = { @@ -217,7 +253,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; "currently-unhandled-0.4.1" = { @@ -226,16 +262,16 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + sha512 = "/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="; }; }; - "debug-3.2.7" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "3.2.7"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "decamelize-1.2.0" = { @@ -244,7 +280,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; "deep-extend-0.6.0" = { @@ -262,16 +298,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; - "detect-libc-1.0.3" = { + "detect-libc-2.0.1" = { name = "detect-libc"; packageName = "detect-libc"; - version = "1.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; }; "dot-prop-3.0.0" = { @@ -280,7 +316,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + sha512 = "k4ELWeEU3uCcwub7+dWydqQBRjAjkV9L33HjVRG5Xo2QybI6ja/v+4W73SRi8ubCqJz0l9XsTP1NbewfyqaSlw=="; }; }; "duplexer2-0.1.4" = { @@ -289,7 +325,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; }; }; "ejs-2.7.4" = { @@ -301,6 +337,24 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; "error-ex-1.3.2" = { name = "error-ex"; packageName = "error-ex"; @@ -316,7 +370,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "esprima-4.0.1" = { @@ -334,7 +388,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + sha512 = "4XwZ1k4rgoF3Yap59MyXFmiUh2zu9fht32NYPSRYwLv4o8BWHxi60I1VH5kHje14qGMoS3qyfHQUsN16ROOugQ=="; }; }; "find-up-1.1.2" = { @@ -343,16 +397,16 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="; }; }; - "fs-minipass-1.2.7" = { + "fs-minipass-2.1.0" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; }; "fs-promise-0.3.1" = { @@ -361,7 +415,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz"; - sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a"; + sha512 = "JjkAd4+JaA8VTL1vmX54f7xz6AgBZ9VA6mXlIvN8eJMJGZMVyJ6fdRyjwCP0pIuEkWkM0XcbVz/4F6sFu7OdQg=="; }; }; "fs.realpath-1.0.0" = { @@ -370,7 +424,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "function-bind-1.1.1" = { @@ -382,13 +436,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gauge-2.7.4" = { + "gauge-3.0.2" = { name = "gauge"; packageName = "gauge"; - version = "2.7.4"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; + sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; "get-stdin-4.0.1" = { @@ -397,16 +451,16 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + sha512 = "F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="; }; }; - "glob-7.1.6" = { + "glob-7.2.3" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; "got-5.7.1" = { @@ -415,16 +469,16 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + sha512 = "1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; + sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; "has-1.0.3" = { @@ -442,7 +496,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; }; }; "has-unicode-2.0.1" = { @@ -451,7 +505,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; }; "hepburn-1.2.0" = { @@ -463,31 +517,31 @@ let sha512 = "xWjHb03dN/ivNcqG2vqA//sHQ0oapYGZ9QV/2TR7m2+cggxzoVpbDxZn9s/Zm1tF88/7a1IpdZyn00tNP5oABA=="; }; }; - "hosted-git-info-2.8.8" = { + "hosted-git-info-2.8.9" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; }; }; - "iconv-lite-0.4.24" = { + "https-proxy-agent-5.0.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + }; + }; + "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.24"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "ignore-walk-3.0.3" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; "imurmurhash-0.1.4" = { @@ -496,7 +550,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; }; "indent-string-2.1.0" = { @@ -505,7 +559,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + sha512 = "aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg=="; }; }; "inflight-1.0.6" = { @@ -514,7 +568,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.4" = { @@ -541,16 +595,16 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; }; - "is-core-module-2.2.0" = { + "is-core-module-2.12.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.2.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; - sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"; + sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ=="; }; }; "is-finite-1.1.0" = { @@ -568,7 +622,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; "is-npm-1.0.0" = { @@ -577,7 +640,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg=="; }; }; "is-obj-1.0.1" = { @@ -586,7 +649,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="; }; }; "is-redirect-1.0.0" = { @@ -595,7 +658,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; }; }; "is-retry-allowed-1.2.0" = { @@ -613,7 +676,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; }; "is-utf8-0.2.1" = { @@ -622,7 +685,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="; }; }; "isarray-1.0.0" = { @@ -631,7 +694,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; "js-yaml-3.14.1" = { @@ -649,7 +712,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + sha512 = "x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA=="; }; }; "latest-version-2.0.0" = { @@ -658,7 +721,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + sha512 = "8925wFYLfWBciewimt0VmDyYw0GFCRcbFSTrZGt4JgQ7lh5jb/kodMlUt0uMaxXdRKVi+7F3ib30N7fTv83ikw=="; }; }; "limax-1.7.0" = { @@ -676,7 +739,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A=="; }; }; "loud-rejection-1.6.0" = { @@ -685,7 +748,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + sha512 = "RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ=="; }; }; "lowercase-keys-1.0.1" = { @@ -697,13 +760,31 @@ let sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "make-dir-3.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; + }; + }; "map-obj-1.0.1" = { name = "map-obj"; packageName = "map-obj"; version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; }; }; "meow-3.7.0" = { @@ -712,88 +793,97 @@ let version = "3.7.0"; src = fetchurl { url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; + sha512 = "TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimist-1.2.5" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; - "minipass-2.9.0" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "2.9.0"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minizlib-1.3.3" = { + "minipass-5.0.0" = { + name = "minipass"; + packageName = "minipass"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"; + sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; + }; + }; + "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; - version = "1.3.3"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; - "ms-2.1.3" = { + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "ms-2.1.2" = { name = "ms"; packageName = "ms"; - version = "2.1.3"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "needle-2.6.0" = { - name = "needle"; - packageName = "needle"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; - sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; - }; - }; - "node-addon-api-3.1.0" = { + "node-addon-api-3.2.1" = { name = "node-addon-api"; packageName = "node-addon-api"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz"; - sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; }; - "node-pre-gyp-0.14.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.14.0"; + "node-fetch-2.6.10" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz"; + sha512 = "5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug=="; }; }; "node-status-codes-1.0.0" = { @@ -802,25 +892,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + sha512 = "1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ=="; }; }; - "nodejieba-2.5.1" = { + "nodejieba-2.5.2" = { name = "nodejieba"; packageName = "nodejieba"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.1.tgz"; - sha512 = "VnJBQSl2G8swDf3ZAXMbXrMCrGFO+kVKbkB93OaBthGbEG5BrxfD8I2m7auaRX8E5C1t+hlwo3HCmQOWKkiZ9A=="; + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.2.tgz"; + sha512 = "ByskJvaBrQ2eV+5M0OeD80S5NKoGaHc9zi3Z/PTKl/95eac2YF8RmWduq9AknLpkQLrLAIcqurrtC6BzjpKwwg=="; }; }; - "nopt-4.0.3" = { + "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; - version = "4.0.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; "normalize-package-data-2.5.0" = { @@ -832,40 +922,13 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "npm-bundled-1.1.1" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; - }; - }; - "npm-normalize-package-bin-1.0.1" = { - name = "npm-normalize-package-bin"; - packageName = "npm-normalize-package-bin"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; - }; - }; - "npm-packlist-1.4.8" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; - }; - }; - "npmlog-4.1.2" = { + "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.2"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; + sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; "number-is-nan-1.0.1" = { @@ -874,7 +937,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; }; }; "object-assign-4.1.1" = { @@ -883,7 +946,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; "once-1.4.0" = { @@ -892,7 +955,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "open-0.0.5" = { @@ -901,7 +964,7 @@ let version = "0.0.5"; src = fetchurl { url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; - sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + sha512 = "+X/dJYLapVO1VbC620DhtNZK9U4/kQVaTQp/Gh7cb6UTLYfGZzzU2ZXkWrOA/wBrf4UqAFwtLqXYTxe4tSnWQQ=="; }; }; "os-homedir-1.0.2" = { @@ -910,7 +973,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="; }; }; "os-tmpdir-1.0.2" = { @@ -919,7 +982,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; "osenv-0.1.5" = { @@ -937,7 +1000,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + sha512 = "PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg=="; }; }; "parse-json-2.2.0" = { @@ -946,7 +1009,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + sha512 = "QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="; }; }; "path-exists-2.1.0" = { @@ -955,7 +1018,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + sha512 = "yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ=="; }; }; "path-is-absolute-1.0.1" = { @@ -964,16 +1027,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-type-1.1.0" = { @@ -982,7 +1045,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg=="; }; }; "pify-2.3.0" = { @@ -991,7 +1054,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; }; }; "pinkie-2.0.4" = { @@ -1000,7 +1063,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + sha512 = "MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="; }; }; "pinkie-promise-2.0.1" = { @@ -1009,16 +1072,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="; }; }; - "pinyin-2.9.1" = { + "pinyin-2.11.2" = { name = "pinyin"; packageName = "pinyin"; - version = "2.9.1"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.1.tgz"; - sha512 = "U7kHlVP6yUYl2DV2bX4brlYWdgaAlwtqJrdkboiyri9ixRDVqVO3LD98te3PT5deN5EA9W8ywuG9GaYZfiiIlw=="; + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.11.2.tgz"; + sha512 = "tAWDBcowj09j/vLUjty98nVqrbTVNhutf1VcyID4p0sxTFPzRyXw7n7Ic0HQwBdWFIWrrDP8bYiT64gaT6h3gA=="; }; }; "prepend-http-1.0.4" = { @@ -1027,7 +1090,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + sha512 = "PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="; }; }; "process-nextick-args-2.0.1" = { @@ -1054,7 +1117,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + sha512 = "DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w=="; }; }; "read-pkg-1.1.0" = { @@ -1063,7 +1126,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ=="; }; }; "read-pkg-up-1.0.1" = { @@ -1072,16 +1135,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; + }; + }; + "readable-stream-3.6.2" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; "redent-1.0.0" = { @@ -1090,7 +1162,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + sha512 = "qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g=="; }; }; "registry-auth-token-3.4.0" = { @@ -1108,7 +1180,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA=="; }; }; "repeating-2.0.1" = { @@ -1117,25 +1189,25 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A=="; }; }; - "resolve-1.19.0" = { + "resolve-1.22.3" = { name = "resolve"; packageName = "resolve"; - version = "1.19.0"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; - sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; + sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; }; }; - "rimraf-2.7.1" = { + "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; - version = "2.7.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; "safe-buffer-5.1.2" = { @@ -1147,6 +1219,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -1156,15 +1237,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -1174,13 +1246,31 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.5.0" = { + name = "semver"; + packageName = "semver"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz"; + sha512 = "+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA=="; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + sha512 = "gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw=="; }; }; "set-blocking-2.0.0" = { @@ -1189,16 +1279,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "signal-exit-3.0.3" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "slide-1.1.6" = { @@ -1207,16 +1297,16 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + sha512 = "NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw=="; }; }; - "spdx-correct-3.1.1" = { + "spdx-correct-3.2.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz"; + sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; }; "spdx-exceptions-2.3.0" = { @@ -1237,13 +1327,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.7" = { + "spdx-license-ids-3.0.13" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.7"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; + sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; }; }; "speakingurl-14.0.1" = { @@ -1261,7 +1351,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; "string-width-1.0.2" = { @@ -1270,7 +1360,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; + }; + }; + "string-width-4.2.3" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; "string_decoder-1.1.1" = { @@ -1282,13 +1381,31 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; + }; + }; + "strip-ansi-6.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "strip-bom-2.0.0" = { @@ -1297,7 +1414,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + sha512 = "kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g=="; }; }; "strip-indent-1.0.1" = { @@ -1306,7 +1423,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + sha512 = "I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA=="; }; }; "strip-json-comments-2.0.1" = { @@ -1315,7 +1432,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; }; }; "supports-color-2.0.0" = { @@ -1324,16 +1441,25 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; }; }; - "tar-4.4.13" = { + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; + "tar-6.1.14" = { name = "tar"; packageName = "tar"; - version = "4.4.13"; + version = "6.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz"; + sha512 = "piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw=="; }; }; "timed-out-3.1.3" = { @@ -1342,7 +1468,16 @@ let version = "3.1.3"; src = fetchurl { url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + sha512 = "3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg=="; + }; + }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; }; }; "trim-newlines-1.0.0" = { @@ -1351,7 +1486,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + sha512 = "Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw=="; }; }; "unzip-response-1.0.2" = { @@ -1360,7 +1495,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + sha512 = "pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q=="; }; }; "update-notifier-0.6.3" = { @@ -1369,7 +1504,7 @@ let version = "0.6.3"; src = fetchurl { url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + sha512 = "Gjt2a7j+qL2wvazHPSkWZOay4NfZe7WpV63OtrKbK6Uxyta0U1aS7f++XSNpljIinKYLC8wrNfPHYkPmV5AhbQ=="; }; }; "url-parse-lax-1.0.0" = { @@ -1378,7 +1513,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + sha512 = "BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA=="; }; }; "util-deprecate-1.0.2" = { @@ -1387,7 +1522,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; "uuid-2.0.3" = { @@ -1396,7 +1531,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + sha512 = "FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -1408,13 +1543,31 @@ let sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; - "wide-align-1.1.3" = { + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; + }; + }; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; + }; + }; + "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; "widest-line-1.0.0" = { @@ -1423,7 +1576,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + sha512 = "r5vvGtqsHUHn98V0jURY4Ts86xJf6+SzK9rpWdV8/73nURB3WFPIHd67aOvPw2fSuunIyHjAUqiJ2TY0x4E5gw=="; }; }; "wrappy-1.0.2" = { @@ -1432,7 +1585,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "write-file-atomic-1.3.4" = { @@ -1441,7 +1594,7 @@ let version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + sha512 = "SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw=="; }; }; "xdg-basedir-2.0.0" = { @@ -1450,16 +1603,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + sha512 = "NF1pPn594TaRSUO/HARoB4jK8I+rWgcpVlpQCK6/6o5PHyLUt2CSiDrpUZbQ6rROck+W2EwF8mBJcTs+W98J9w=="; }; }; - "yallist-3.1.1" = { + "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; }; @@ -1471,72 +1624,107 @@ in version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/base16-builder/-/base16-builder-1.3.0.tgz"; - sha1 = "320eafea9333a8ea2bc8e04bda8db2537c52d23f"; + sha512 = "fXzZ8Pn1mVA0POzZJ1tQzFHlHdVHpR+z31xlbECEy+7yW3jdkYvFtZl9V0SPJSwkOA5aPQALqi4rM0BCtJiAVA=="; }; dependencies = [ + sources."@mapbox/node-pre-gyp-1.0.10" sources."abbrev-1.1.1" + sources."agent-base-6.0.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."any-promise-0.1.0" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" sources."argparse-1.0.10" sources."array-find-index-1.0.2" - sources."balanced-match-1.0.0" - sources."boxen-0.3.1" + sources."balanced-match-1.0.2" + (sources."boxen-0.3.1" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) sources."brace-expansion-1.1.11" sources."bulk-replace-0.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.1" + sources."capture-stack-trace-1.0.2" sources."chalk-1.1.3" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."code-point-at-1.1.0" + sources."color-support-1.1.3" sources."commander-1.1.1" sources."concat-map-0.0.1" - sources."configstore-2.1.0" + (sources."configstore-2.1.0" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."currently-unhandled-0.4.1" - sources."debug-3.2.7" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."delegates-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.1" sources."dot-prop-3.0.0" - sources."duplexer2-0.1.4" + (sources."duplexer2-0.1.4" // { + dependencies = [ + sources."readable-stream-2.3.8" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."ejs-2.7.4" + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."filled-array-1.1.0" sources."find-up-1.1.2" - sources."fs-minipass-1.2.7" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs-promise-0.3.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-2.7.4" + (sources."gauge-3.0.2" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) sources."get-stdin-4.0.1" - sources."glob-7.1.6" - sources."got-5.7.1" - sources."graceful-fs-4.2.4" + sources."glob-7.2.3" + (sources."got-5.7.1" // { + dependencies = [ + sources."readable-stream-2.3.8" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."graceful-fs-4.2.11" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-unicode-2.0.1" sources."hepburn-1.2.0" - sources."hosted-git-info-2.8.8" - sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.3" + sources."hosted-git-info-2.8.9" + sources."https-proxy-agent-5.0.1" + sources."iconv-lite-0.6.3" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.12.0" sources."is-finite-1.1.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-npm-1.0.0" sources."is-obj-1.0.1" sources."is-redirect-1.0.0" @@ -1551,25 +1739,35 @@ in sources."load-json-file-1.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" - sources."ms-2.1.3" - sources."needle-2.6.0" - sources."node-addon-api-3.1.0" - sources."node-pre-gyp-0.14.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" + sources."minipass-5.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."node-addon-api-3.2.1" + sources."node-fetch-2.6.10" sources."node-status-codes-1.0.0" - sources."nodejieba-2.5.1" - sources."nopt-4.0.3" - sources."normalize-package-data-2.5.0" - sources."npm-bundled-1.1.1" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npmlog-4.1.2" + sources."nodejieba-2.5.2" + sources."nopt-5.0.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."npmlog-5.0.1" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -1577,52 +1775,72 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."package-json-2.4.0" + (sources."package-json-2.4.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."parse-json-2.2.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pinyin-2.9.1" + sources."pinyin-2.11.2" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."rc-1.2.8" - sources."read-all-stream-3.1.0" + (sources."read-all-stream-3.1.0" // { + dependencies = [ + sources."readable-stream-2.3.8" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.2" sources."redent-1.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" - sources."resolve-1.19.0" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" + sources."resolve-1.22.3" + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.1" - sources."semver-diff-2.1.0" + sources."semver-7.5.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.7" sources."slide-1.1.6" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.13" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + (sources."string-width-4.2.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) + sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - sources."tar-4.4.13" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."tar-6.1.14" sources."timed-out-3.1.3" + sources."tr46-0.0.3" sources."trim-newlines-1.0.0" sources."unzip-response-1.0.2" sources."update-notifier-0.6.3" @@ -1630,12 +1848,19 @@ in sources."util-deprecate-1.0.2" sources."uuid-2.0.3" sources."validate-npm-package-license-3.0.4" - sources."wide-align-1.1.3" - sources."widest-line-1.0.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."wide-align-1.1.5" + (sources."widest-line-1.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index bde04ea963e4..2bf491c2e665 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix index 104cda58dc0a..e6abbfeb42ee 100644 --- a/pkgs/misc/base16-builder/supplement.nix +++ b/pkgs/misc/base16-builder/supplement.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: @@ -19,7 +19,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; }; }; "aproba-1.2.0" = { @@ -31,22 +31,22 @@ let sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; - "are-we-there-yet-1.1.5" = { + "are-we-there-yet-1.1.7" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "brace-expansion-1.1.11" = { @@ -73,7 +73,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; }; }; "concat-map-0.0.1" = { @@ -82,7 +82,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; }; "console-control-strings-1.1.0" = { @@ -91,16 +91,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; }; - "core-util-is-1.0.2" = { + "core-util-is-1.0.3" = { name = "core-util-is"; packageName = "core-util-is"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; }; "debug-3.2.7" = { @@ -127,7 +127,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; "detect-libc-1.0.3" = { @@ -136,7 +136,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; }; }; "fs-minipass-1.2.7" = { @@ -154,7 +154,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "gauge-2.7.4" = { @@ -163,16 +163,16 @@ let version = "2.7.4"; src = fetchurl { url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="; }; }; - "glob-7.1.6" = { + "glob-7.2.3" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; "has-unicode-2.0.1" = { @@ -181,7 +181,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; }; "iconv-lite-0.4.24" = { @@ -193,13 +193,13 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "ignore-walk-3.0.3" = { + "ignore-walk-3.0.4" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; }; }; "inflight-1.0.6" = { @@ -208,7 +208,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.4" = { @@ -235,7 +235,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; }; }; "isarray-1.0.0" = { @@ -244,25 +244,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimist-1.2.5" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; "minipass-2.9.0" = { @@ -283,13 +283,13 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; "ms-2.1.3" = { @@ -301,13 +301,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "needle-2.6.0" = { + "needle-2.9.1" = { name = "needle"; packageName = "needle"; - version = "2.6.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; - sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"; + sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; "nopt-4.0.3" = { @@ -319,13 +319,13 @@ let sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; - "npm-bundled-1.1.1" = { + "npm-bundled-1.1.2" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; + sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -361,7 +361,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; }; }; "object-assign-4.1.1" = { @@ -370,7 +370,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; "once-1.4.0" = { @@ -379,7 +379,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "os-homedir-1.0.2" = { @@ -388,7 +388,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="; }; }; "os-tmpdir-1.0.2" = { @@ -397,7 +397,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; "osenv-0.1.5" = { @@ -415,7 +415,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; "process-nextick-args-2.0.1" = { @@ -436,13 +436,13 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; "rimraf-2.7.1" = { @@ -463,6 +463,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -496,16 +505,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "signal-exit-3.0.3" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "string-width-1.0.2" = { @@ -514,7 +523,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; }; }; "string_decoder-1.1.1" = { @@ -532,7 +541,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; }; "strip-json-comments-2.0.1" = { @@ -541,16 +550,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; }; }; - "tar-4.4.13" = { + "tar-4.4.19" = { name = "tar"; packageName = "tar"; - version = "4.4.13"; + version = "4.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; + sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; "util-deprecate-1.0.2" = { @@ -559,16 +568,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; - "wide-align-1.1.3" = { + "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; "wrappy-1.0.2" = { @@ -577,7 +586,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "yallist-3.1.1" = { @@ -604,14 +613,14 @@ in sources."abbrev-1.1.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" - sources."balanced-match-1.0.0" + sources."are-we-there-yet-1.1.7" + sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-3.2.7" sources."deep-extend-0.6.0" sources."delegates-1.0.0" @@ -619,24 +628,24 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.6" + sources."glob-7.2.3" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."needle-2.6.0" + sources."needle-2.9.1" sources."nopt-4.0.3" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -649,21 +658,25 @@ in sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" sources."rc-1.2.8" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.7" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" + (sources."tar-4.4.19" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."util-deprecate-1.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."yallist-3.1.1" ]; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 8b068100f32a..b16bebbe3d60 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails passthru.tests = { - inherit (nixosTests) pam-oath-login pam-u2f shadow; + inherit (nixosTests) pam-oath-login pam-u2f shadow sssd-ldap; }; meta = with lib; { diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index 893e9635f96c..774cbe9afb6c 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_16, tone, ffmpeg-full, util-linux, libwebp }: +{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_18, tone, ffmpeg-full, util-linux, libwebp }: let - nodejs = nodejs_16; + nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.2.18"; + version = "2.2.20"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ar+OK6HiKf2/47HE+1iTw8MVz9A6qZg1hpZQdZ/40UM="; + sha256 = "sha256-nQHWmBMPBPgIe1YQi8wFmZGnwHcmYFxzfWPxyTo16zk="; }; client = buildNpmPackage { @@ -24,7 +24,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-Hsa7ZauUTtYQcCxw1cpuxQ/RfdRvBIh3PO1DXDUbELk="; + npmDepsHash = "sha256-gCeLDYuC8uK8lEWTPCxr9NlOS6ADP+1oukYR7/xZ0aA="; }; wrapper = import ./wrapper.nix { @@ -38,7 +38,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-0PFeXiS8RSffhrocrHODNpb6d9+nbpulCW5qYIrytDI="; + npmDepsHash = "sha256-LYvI+7KXXXyH6UuWEc2YdqoSdvljclLr8LlG7Cm2Pv8="; installPhase = '' mkdir -p $out/opt/client diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 27b31739ec65..9334c20943c5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.1.1"; + version = "23.02.2.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-hNz5QMnxGGZLcLPNE6jH3LTSNb1ZywTcPirY9sxCM7w="; + sha256 = "sha256-UWDtq4JSVaxiYOdplava9XUzFdMjEMQ4j8BCzVK8Ve0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index e3c427d2017b..8ee5d70abc22 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "evcc"; - version = "0.117.0"; + version = "0.117.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-tvZh6yBzasR4GMEfzLQlvfe8UDpS4rBmm5Ww6GX//xI="; + hash = "sha256-y8hc/5z92mkIio8+UFan2PDLPyewty5GuFyIKO2IEo8="; }; - vendorHash = "sha256-+KygZ2aa6JB8uZLrDjoDhxvLHstMmfaV+loVFtEG3Xo="; + vendorHash = "sha256-3EHdjRCzrty7BnaSG4TAf52jRl0AVS6baSl2XhYUH0A="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d55fbfe914c2..70ad95911618 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.82.0"; + version = "1.83.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-j2lsdLYN5LqnIevUkD85i1XNIJa/Vpc1NHhIf2djlis="; + hash = "sha256-7LMNLXTBkY7ib9DWpwccVrHxulUW8ScFr37hSGO72GM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iEPfYZd8RWlG5z8BbzESD9O0QV60EBiIIaxm9skt8Uc="; + hash = "sha256-tzkJtkAbZ9HmOQq2O7QAbRb5pYS/WoU3k1BJhZAE6OU="; }; postPatch = '' diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 2e580fb5b412..59680593b360 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-WFGVQWEYQBUzZAc8yHvD3C3bYbH0hVGoz28nVMV1IP8="; + sha256 = "sha256-V06NIjiT+uxN39vGhwvrU4hbrNezWReEtJdbW6BHIzE="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-jxo8QXw9Ca27VPjC7GYIm8SVxvhSZBQLnW2Kuthu5Rk="; + vendorSha256 = "sha256-/lM98VTQc6glhnpETW9XbxgN2fP6dBexueByFWwv5sk="; CGO_ENABLED = 0; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index ed1235d2d60b..3d97e22eca5c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/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.32.0.6973-a787c5a8e"; + version = "1.32.1.6999-91e1e2e2c"; 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 = "sha256-96nvvjrE+aHdGLKZpZvu1+JLDJNjM4fCKlK3UFW5VfM="; + sha256 = "sha256-gVM4KFRhnvEG1LAJUTdzSyJz3R3WZ8lvy7AbHLTd7XI="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-fwMD/vYdwMrUvDB7JmMmVCt47ZtD17zk3bfIuO91dH8="; + sha256 = "sha256-DSwcT67l5u8XNThbWIpdbJOb+vGUXF0u6SQSXyiOhSI="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index b43a6e42625e..57b3dd3735db 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "oil"; - version = "0.14.2"; + version = "0.15.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-I/r/DhELLpKMnZqUh847F/uVPiCYF5b574cjP59+ZG0="; + hash = "sha256-1oYP/sRhYG2oJYY80WOxqSXwqyUMbjIZdznBHcnGMxg="; }; postPatch = '' diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index d5143293b123..669f54c3559b 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -107,6 +107,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://github.com/Nike-Inc/gimme-aws-creds/releases"; description = "A CLI that utilizes Okta IdP via SAML to acquire temporary AWS credentials"; license = licenses.asl20; - maintainers = with maintainers; [ dennajort ]; + maintainers = with maintainers; [ jbgosselin ]; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index c95ec79534eb..cfaae6986906 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -60,9 +60,7 @@ in # binary wrappers don't support --run postInstall = lib.optionalString withX '' wrapProgramShell $out/bin/gnuplot \ - --prefix PATH : '${gnused}/bin' \ - --prefix PATH : '${coreutils}/bin' \ - --prefix PATH : '${fontconfig.bin}/bin' \ + --prefix PATH : '${lib.makeBinPath [ gnused coreutils fontconfig.bin ]}' \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' diff --git a/pkgs/tools/misc/codevis/default.nix b/pkgs/tools/misc/codevis/default.nix index 96e982e03bd1..0d7ba67b16ec 100644 --- a/pkgs/tools/misc/codevis/default.nix +++ b/pkgs/tools/misc/codevis/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "codevis"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sloganking"; repo = "codevis"; rev = "v${version}"; - hash = "sha256-37It/9e/H/ZxDIAeKIcFNrbMs7GJdo1kDx7gPt+pup4="; + hash = "sha256-K5rPeWP5xO46dvMaJ/bPvop5jKV6xEXF+iGzfKWWDvA="; }; - cargoHash = "sha256-pWf9qIEzuddcwMLtXzzlU+nL8iD0Ey5yj3e7GUzVzSw="; + cargoHash = "sha256-M7EssXGbT1HuPmn2mf+xGrMNVzFigZy2DXeLMHPfUXM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix deleted file mode 100644 index f44b3c7a1bcf..000000000000 --- a/pkgs/tools/misc/grub/2.0x.nix +++ /dev/null @@ -1,457 +0,0 @@ -{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool, bash -, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config -, buildPackages -, fetchpatch -, pkgsBuildBuild -, nixosTests -, fuse # only needed for grub-mount -, runtimeShell -, zfs ? null -, efiSupport ? false -, zfsSupport ? false -, xenSupport ? false -, kbdcompSupport ? false, ckbcomp -}: - -let - pcSystems = { - i686-linux.target = "i386"; - x86_64-linux.target = "i386"; - }; - - efiSystemsBuild = { - i686-linux.target = "i386"; - x86_64-linux.target = "x86_64"; - armv7l-linux.target = "arm"; - aarch64-linux.target = "aarch64"; - riscv32-linux.target = "riscv32"; - riscv64-linux.target = "riscv64"; - }; - - # For aarch64, we need to use '--target=aarch64-efi' when building, - # but '--target=arm64-efi' when installing. Insanity! - efiSystemsInstall = { - i686-linux.target = "i386"; - x86_64-linux.target = "x86_64"; - armv7l-linux.target = "arm"; - aarch64-linux.target = "arm64"; - riscv32-linux.target = "riscv32"; - riscv64-linux.target = "riscv64"; - }; - - canEfi = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) efiSystemsBuild); - inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); - - version = "2.06"; - -in ( - -assert efiSupport -> canEfi; -assert zfsSupport -> zfs != null; -assert !(efiSupport && xenSupport); - -stdenv.mkDerivation rec { - pname = "grub"; - inherit version; - - src = fetchurl { - url = "mirror://gnu/grub/grub-${version}.tar.xz"; - sha256 = "sha256-t56kSvkbk9F80/6Ava5u1DdwZ4qaWuGSzOqAPrtlfuE="; - }; - - patches = [ - ./fix-bash-completion.patch - (fetchpatch { - name = "Add-hidden-menu-entries.patch"; - # https://lists.gnu.org/archive/html/grub-devel/2016-04/msg00089.html - url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox"; - sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi"; - }) - - # Pull upstream patch to fix linkage against binutils-2.36. - (fetchpatch { - name = "binutils-2.36.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701"; - sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82"; - }) - # Properly handle multiple initrd paths in 30_os-prober - # Remove this patch once a new release is cut - (fetchpatch { - name = "Properly-handle-multiple-initrd-paths-in-os-prober.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8"; - sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM="; - }) - - # Upstreamed patches for flicker-free boot - # Remove these patches once a new release is cut - (fetchpatch { - # term/efi/console: Do not set colorstate until the first text output - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9381dbe045b39bd9395c9ab4276d95b4041ec9fb"; - sha256 = "sha256-ZFq/PdCYo6aRySZRAfZARO8BmXwGgqeXz+9uNgNJEO8="; - }) - (fetchpatch { - # term/efi/console: Do not set cursor until the first text output - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7c316e18301e101e4dcd8abe88c0bed0b1b78857"; - sha256 = "sha256-WJiK7MqmdStzq77vIDsO60Fu7i9LE/jDYzF4E9FXb7c="; - }) - (fetchpatch { - # normal/menu: Don't show "Booting `%s'" msg when auto-booting with TIMEOUT_STYLE_HIDDEN - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bb4f2b7d665c84bde402d1a528b652a61753380"; - sha256 = "sha256-lwJPPyq6yj7X1C2RuHfxnwKKstFkWGxcMXuSQqd9Z4I="; - }) - (fetchpatch { - # kern/main: Suppress the "Welcome to GRUB!" message in EFI builds - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4cbbeca0ef35097301a1086f85fd0d119e64aa"; - sha256 = "sha256-cQX4x9V5Y7SU9WACn5FzDjukL2/StAUMMoHY/DRHq+g="; - }) - - (fetchpatch { - name = "CVE-2021-3981.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0adec29674561034771c13e446069b41ef41e4d4"; - sha256 = "sha256-3vkvWjcSv0hyY2EX3ig2EXEe+XLiRsXYlcd5kpY4wXw="; - }) - # June 2022 security patches - # https://lists.gnu.org/archive/html/grub-devel/2022-06/msg00035.html - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.1.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1469983ebb9674753ad333d37087fb8cb20e1dce"; - sha256 = "sha256-oB4S0jvIXsDPcjIz1E2LKm7gwdvZjywuI1j0P6JQdJg="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.2.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=14ceb3b3ff6db664649138442b6562c114dcf56e"; - sha256 = "sha256-mKe8gzd0U4PbV8z3TWCdvv7UugEgYaVIkB4dyMrSGEE="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.3.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=04c86e0bb7b58fc2f913f798cdb18934933e532d"; - sha256 = "sha256-sA+PTlk4hwYOVKRZBHkEskabzmsf47Hi4h3mzWOFjwM="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.4.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6fe755c5c07bb386fda58306bfd19e4a1c974c53"; - sha256 = "sha256-8zmFocUfnjSyhYitUFDHoilHDnm1NJmhcKwO9dueV3k="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.5.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f1ce0e15e70ea1aafcfa26ad93e7585f65783c6f"; - sha256 = "sha256-Wrlam6CRPUAHbKqe/X1YLcRxJ2LQTtmQ/Y66gxUlqK4="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.6.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bff31cdb6b93d738f850834e6291df1d0b136fa"; - sha256 = "sha256-ReLWSePXjRweymsVAL/uoBgYMWt9vRDcY3iXlDNZT0w="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.7.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=347880a13c239b4c2811c94c9a7cf78b607332e3"; - sha256 = "sha256-07hpHuJFw95xGoJ/6ej7i6HlCFb2QRxP3arvRjKW4uU="; - }) - ## Needed to apply patch 8 - (fetchpatch { - name = "video-remove-trailing-whitespaces.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1f48917d8ddb490dcdc70176e0f58136b7f7811a"; - sha256 = "sha256-/yf/LGpwYcQ36KITzmiFfg4BvhcApKbrlFzjKK8V2kI="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.8.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e623866d9286410156e8b9d2c82d6253a1b22d08"; - sha256 = "sha256-zFxP6JY5Q9s3yJHdkbZ2w+dXFKeOCXjFnQKadB5HLCg="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.9.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=210245129c932dc9e1c2748d9d35524fb95b5042"; - sha256 = "sha256-FyZhdTlcRVmn7X2hv93RhWP7NOoEMb7ib/DWveyz3Ew="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.10.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=690bee69fae6b4bd911293d6b7e56774e29fdf64"; - sha256 = "sha256-nOAXxebCW/s5M6sjPKdSdx47/PcH1lc0yYT0flVwoC8="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.11.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d5caac8ab79d068ad9a41030c772d03a4d4fbd7b"; - sha256 = "sha256-9fGJJkgZ6+E01MJqVTR1qFITx9EAx41Hv9QNfdqBgu0="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.12.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=768ef2199e0265cf455b154f1a80a612f02274c8"; - sha256 = "sha256-2/JJJux5vqXUc77bi3aXRy8NclbvyD/0e6UN8/6Ui3c="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.13.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=166a4d61448f74745afe1dac2f2cfb85d04909bf"; - sha256 = "sha256-XxTZ8P8qr4qEXELdHwaRACPeIZ/iixlATLB5RvVQsC8="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.14.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=22a3f97d39f6a10b08ad7fd1cc47c4dcd10413f6"; - sha256 = "sha256-bzB2gmGvWR2ylvMw779KQ/VHBBMsDNbG96eg9qQlljA="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.15.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=830a9628b2c9e1b6388af624aaf4a80818ed6be0"; - sha256 = "sha256-8fna2VbbUw8zBx77osaOOHlZFgRrHqwQK87RoUtCF6w="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.16.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4817538de828319ba6d59ced2fbb9b5ca13287"; - sha256 = "sha256-iCZAyRS/a15x5aJCJBYl9nw6Hc3WRCUG7zF5V+OwDKg="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.17.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f407e34f3871a4c402bbd516e7c28ea193cef1b7"; - sha256 = "sha256-S45cLZNTWapAodKudUz2fMjnPsW6vbtNz0bIvIBGmu4="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.18.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c1b7eef9fa4aaefbf7d0507505c3bb2914e1ad6b"; - sha256 = "sha256-TWPfEAOePwC77yiVdsTSZIjfsMp7+0XabCz9K3FlV7w="; - }) - ## Needed to apply patch 19 - (fetchpatch { - name = "net-remove-trailing-whitespaces.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e453a4a64392a41bc7b37f890aceb358112d1687"; - sha256 = "sha256-JCbUB77Y6js5u99uJ9StDxNjjahNy4nO3crK8/GvmPY="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.19.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=96abf4fb9d829f4a405d5df39bc74bbccbd0e322"; - sha256 = "sha256-6E2MKO5kauFA1TA8YkUgIUusniwHS2Sr44A/a7ZqDCo="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.20.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ee9652031491326736714a988fbbaeab8ef9255c"; - sha256 = "sha256-E21q+Mj+JBQlUW0pe4zbaoL3ErXmCanyizwAsRYYZHk="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.21.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8f287c3e13da2bf82049e2e464eca7ca4fef0a85"; - sha256 = "sha256-dZ24RwYsHeUrMuiU7PDgPcw+iK9cOd6q+E0xWXbtTkE="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.22.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dad94fffe14be476df5f34a8e5a90ea62a41fe12"; - sha256 = "sha256-06TyTEvSy19dsnXZZoKBGx7ymJVWogr0NorzLflEwY4="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.23.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ec6bfd3237394c1c7dbf2fd73417173318d22f4b"; - sha256 = "sha256-NryxSekO8oSxsnv5G9mFZExm4Pwfc778mslyUDuDhlM="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.24.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b26b4c08e7119281ff30d0fb4a6169bd2afa8fe4"; - sha256 = "sha256-fSH3cxl/76DwkE8dHSR9uao9Vf1sJrhz7SmUSgDNodI="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.25.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4bd9877f62166b7e369773ab92fe24a39f6515f8"; - sha256 = "sha256-VMtR/sF8F1BMKmJ06ZZEPNH/+l0RySy/E6lVWdCyFKE="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.26.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=deae293f399dde3773cf37dfa9b77ca7e04ef772"; - sha256 = "sha256-sCC3KE9adavw7jHMTVlxtyuwDFCPRDqT24H3AKUYf68="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.27.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e40b83335bb33d9a2d1c06cc269875b3b3d6c539"; - sha256 = "sha256-cviCfBkzacAtnHGW87RLshhduE4Ym/v2Vq4h/sZDmZg="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.28.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=11e1cffb7e2492ddac4ab8d19ce466783adbb957"; - sha256 = "sha256-I1feoneVeU3XkscKfVprWWJfLUnrc5oauMXYDyDxo5M="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.29.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13dce204cf6f3f0f49c9949971052a4c9657c0c0"; - sha256 = "sha256-DzFHxgR9A8FNZ/y9OMeBvTp1K6J5ePyL06dhHQmk7Ik="; - }) - (fetchpatch { - name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.30.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2f4430cc0a44fd8c8aa7aee5c51887667ad3d6c3"; - sha256 = "sha256-AufP/10/auO4NMjYQ7yPDDbYShwGaktyQtqJx2Jasz8="; - }) - # October 2022 security patches - # https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00059.html - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.1.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f6b6236077f059e64ee315f2d7acb8fa4eda87c5"; - sha256 = "sha256-pk02iVf/u6CdsVjl8HaFBh0Bt473ZQzz5zBp9SoBLtE="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.2.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9c76ec09ae08155df27cd237eaea150b4f02f532"; - sha256 = "sha256-axbEOH5WFkUroGna2XY1f2kq7+B1Cs6LiubIA2EBdiM="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.3.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=768e1ef2fc159f6e14e7246e4be09363708ac39e"; - sha256 = "sha256-aKDUVS/Yx1c87NCrt4EG8BlSpkHijUyAJIwbmtzNjD8="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.4.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c51292274ded3259eb04c2f1c8d253ffbdb5216a"; - sha256 = "sha256-OLNOKuAJuHy2MBMnU2xcYM7AaxmDk9fchXhggoDrxJU="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.5.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=23843fe8947e4da955a05ad3d1858725bfcb56c8"; - sha256 = "sha256-ptn00nqVJlEb1c6HhoMy9nrBuctH077LM4yXKsK47gc="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.6.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b9396daf1c2e3cdc0a1e69b056852e0769fb24de"; - sha256 = "sha256-K7XNneDZjLpZh/C908+5uYsB/0oIdgQqmk0yJrdQLG4="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.7.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1d2015598cc7a9fca4b39186273e3519a88e80c7"; - sha256 = "sha256-s4pZtszH4b/0u85rpzVapZmNQdYEq/wW06SQ3PW/1aU="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.8.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=93a786a00163e50c29f0394df198518617e1c9a5"; - sha256 = "sha256-R8x557RMAxJ0ZV2jb6zDmwOPVlk6875q37fNpqKsPT0="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.9.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1eac01c147b4d85d2ec4a7e5671fa4345f2e8549"; - sha256 = "sha256-eOnhmU3pT5cCVnNHcY/BzDjldfs7yh/OGsxa15tGv94="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.10.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=992c06191babc1e109caf40d6a07ec6fdef427af"; - sha256 = "sha256-kezNKPcLmFXwyZbXtJbaPTIbE8tijmHIzdC2jsKwrNk="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.11.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9d81f71c6b8f55cf20cd56f5fe29c759df9b48cc"; - sha256 = "sha256-jnniVGy4KvFGFmcOP2YLA46k3cK8vwoByo19ismVUzE="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.12.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=22b77b87e10a3a6c9bb9885415bc9a9c678378e6"; - sha256 = "sha256-iYTEqN5997I7MVIg82jt/bbEAYhcgq8fNRCNPpY9ze0="; - }) - (fetchpatch { - name = "CVE-2022-2601.CVE-2022-3775.13.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1514678888595ef41a968a0c69b7ff769edd1e9c"; - sha256 = "sha256-tgAEoAtaNKJjscjMFkXXiVn59Pa4c+NiQ3iVW6CMrpo="; - }) - ]; - - postPatch = if kbdcompSupport then '' - sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@' - '' else '' - echo '#! ${runtimeShell}' > util/grub-kbdcomp.in - echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in - ''; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] - ++ lib.optional doCheck qemu - ++ lib.optional zfsSupport zfs; - - strictDeps = true; - - hardeningDisable = [ "all" ]; - - separateDebugInfo = !xenSupport; - - # Work around a bug in the generated flex lexer (upstream flex bug?) - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - preConfigure = - '' for i in "tests/util/"*.in - do - sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' - done - - # Apparently, the QEMU executable is no longer called - # `qemu-system-i386', even on i386. - # - # In addition, use `-nodefaults' to avoid errors like: - # - # chardev: opening backend "stdio" failed - # qemu: could not open serial device 'stdio': Invalid argument - # - # See . - sed -i "tests/util/grub-shell.in" \ - -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' - - unset CPP # setting CPP intereferes with dependency calculation - - patchShebangs . - - substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' - ''; - - configureFlags = [ - "--enable-grub-mount" # dep of os-prober - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # grub doesn't do cross-compilation as usual and tries to use unprefixed - # tools to target the host. Provide toolchain information explicitly for - # cross builds. - # - # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108 - "TARGET_CC=${stdenv.cc.targetPrefix}cc" - "TARGET_NM=${stdenv.cc.targetPrefix}nm" - "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib" - "TARGET_STRIP=${stdenv.cc.targetPrefix}strip" - ] ++ lib.optional zfsSupport "--enable-libzfs" - ++ lib.optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] - ++ lib.optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; - - # save target that grub is compiled for - grubTarget = if efiSupport - then "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi" - else lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; - - doCheck = false; - enableParallelBuilding = true; - - postInstall = '' - # Avoid a runtime reference to gcc - sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" - # just adding bash to buildInputs wasn't enough to fix the shebang - substituteInPlace $out/lib/grub/*/modinfo.sh \ - --replace ${buildPackages.bash} "/usr/bin/bash" - ''; - - passthru.tests = { - nixos-grub = nixosTests.grub; - nixos-install-simple = nixosTests.installer.simple; - nixos-install-grub1 = nixosTests.installer.grub1; - nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub; - nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation; - }; - - meta = with lib; { - description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; - - longDescription = - '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand - Unified Bootloader, which was originally designed and implemented by - Erich Stefan Boleyn. - - Briefly, the boot loader is the first software program that runs when a - computer starts. It is responsible for loading and transferring - control to the operating system kernel software (such as the Hurd or - the Linux). The kernel, in turn, initializes the rest of the - operating system (e.g., GNU). - ''; - - homepage = "https://www.gnu.org/software/grub/"; - - license = licenses.gpl3Plus; - - platforms = platforms.gnu ++ platforms.linux; - - maintainers = [ maintainers.samueldr ]; - }; -}) diff --git a/pkgs/tools/misc/grub/buggybios.patch b/pkgs/tools/misc/grub/buggybios.patch deleted file mode 100644 index 1453a8adaa00..000000000000 --- a/pkgs/tools/misc/grub/buggybios.patch +++ /dev/null @@ -1,11 +0,0 @@ -Taken from: http://savannah.gnu.org/bugs/?func=detailitem&item_id=10433 ---- grub-0.95.orig/stage2/bios.c 2004-03-27 17:34:04.000000000 +0100 -+++ grub-0.95/stage2/bios.c 2005-03-02 01:02:29.192582200 +0100 -@@ -147,6 +147,7 @@ - grub_memset (&cdrp, 0, sizeof (cdrp)); - cdrp.size = sizeof (cdrp) - sizeof (cdrp.dummy); - err = biosdisk_int13_extensions (0x4B01, drive, &cdrp); -+ err = 0; /* really ugly hack to circumvent faulty BIOS versions like Acer 292LMi */ - if (! err && cdrp.drive_no == drive) - { - if ((cdrp.media_type & 0x0F) == 0) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index bf66a467620d..6020b38b8e09 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,40 +1,456 @@ -{ lib, stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: +{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool, bash +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config +, buildPackages +, fetchpatch +, pkgsBuildBuild +, nixosTests +, fuse # only needed for grub-mount +, runtimeShell +, zfs ? null +, efiSupport ? false +, zfsSupport ? false +, xenSupport ? false +, kbdcompSupport ? false, ckbcomp +}: + +let + pcSystems = { + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; + }; + + efiSystemsBuild = { + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + armv7l-linux.target = "arm"; + aarch64-linux.target = "aarch64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; + }; + + # For aarch64, we need to use '--target=aarch64-efi' when building, + # but '--target=arm64-efi' when installing. Insanity! + efiSystemsInstall = { + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + armv7l-linux.target = "arm"; + aarch64-linux.target = "arm64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; + }; + + canEfi = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) efiSystemsBuild); + inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); + + version = "2.06"; + +in ( + +assert efiSupport -> canEfi; +assert zfsSupport -> zfs != null; +assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { pname = "grub"; - version = "0.97-73"; + inherit version; src = fetchurl { - url = "https://alpha.gnu.org/gnu/grub/grub-${lib.versions.majorMinor version}.tar.gz"; - sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; + url = "mirror://gnu/grub/grub-${version}.tar.xz"; + sha256 = "sha256-t56kSvkbk9F80/6Ava5u1DdwZ4qaWuGSzOqAPrtlfuE="; }; patches = [ - # Properly handle the case of symlinks such as - # /dev/disk/by-label/bla. The symlink resolution code in - # grub-install isn't smart enough. - ./symlink.patch - ] - ++ (lib.optional buggyBiosCDSupport ./buggybios.patch) - ++ map fetchurl (import ./grub1.patches.nix) - ; + ./fix-bash-completion.patch + (fetchpatch { + name = "Add-hidden-menu-entries.patch"; + # https://lists.gnu.org/archive/html/grub-devel/2016-04/msg00089.html + url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox"; + sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi"; + }) - preConfigure = '' - substituteInPlace ./configure.ac --replace 'AC_PREREQ(2.61)' 'AC_PREREQ(2.64)' + # Pull upstream patch to fix linkage against binutils-2.36. + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701"; + sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82"; + }) + # Properly handle multiple initrd paths in 30_os-prober + # Remove this patch once a new release is cut + (fetchpatch { + name = "Properly-handle-multiple-initrd-paths-in-os-prober.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8"; + sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM="; + }) + + # Upstreamed patches for flicker-free boot + # Remove these patches once a new release is cut + (fetchpatch { + # term/efi/console: Do not set colorstate until the first text output + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9381dbe045b39bd9395c9ab4276d95b4041ec9fb"; + sha256 = "sha256-ZFq/PdCYo6aRySZRAfZARO8BmXwGgqeXz+9uNgNJEO8="; + }) + (fetchpatch { + # term/efi/console: Do not set cursor until the first text output + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7c316e18301e101e4dcd8abe88c0bed0b1b78857"; + sha256 = "sha256-WJiK7MqmdStzq77vIDsO60Fu7i9LE/jDYzF4E9FXb7c="; + }) + (fetchpatch { + # normal/menu: Don't show "Booting `%s'" msg when auto-booting with TIMEOUT_STYLE_HIDDEN + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bb4f2b7d665c84bde402d1a528b652a61753380"; + sha256 = "sha256-lwJPPyq6yj7X1C2RuHfxnwKKstFkWGxcMXuSQqd9Z4I="; + }) + (fetchpatch { + # kern/main: Suppress the "Welcome to GRUB!" message in EFI builds + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4cbbeca0ef35097301a1086f85fd0d119e64aa"; + sha256 = "sha256-cQX4x9V5Y7SU9WACn5FzDjukL2/StAUMMoHY/DRHq+g="; + }) + + (fetchpatch { + name = "CVE-2021-3981.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0adec29674561034771c13e446069b41ef41e4d4"; + sha256 = "sha256-3vkvWjcSv0hyY2EX3ig2EXEe+XLiRsXYlcd5kpY4wXw="; + }) + # June 2022 security patches + # https://lists.gnu.org/archive/html/grub-devel/2022-06/msg00035.html + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.1.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1469983ebb9674753ad333d37087fb8cb20e1dce"; + sha256 = "sha256-oB4S0jvIXsDPcjIz1E2LKm7gwdvZjywuI1j0P6JQdJg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.2.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=14ceb3b3ff6db664649138442b6562c114dcf56e"; + sha256 = "sha256-mKe8gzd0U4PbV8z3TWCdvv7UugEgYaVIkB4dyMrSGEE="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.3.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=04c86e0bb7b58fc2f913f798cdb18934933e532d"; + sha256 = "sha256-sA+PTlk4hwYOVKRZBHkEskabzmsf47Hi4h3mzWOFjwM="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.4.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6fe755c5c07bb386fda58306bfd19e4a1c974c53"; + sha256 = "sha256-8zmFocUfnjSyhYitUFDHoilHDnm1NJmhcKwO9dueV3k="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.5.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f1ce0e15e70ea1aafcfa26ad93e7585f65783c6f"; + sha256 = "sha256-Wrlam6CRPUAHbKqe/X1YLcRxJ2LQTtmQ/Y66gxUlqK4="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.6.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bff31cdb6b93d738f850834e6291df1d0b136fa"; + sha256 = "sha256-ReLWSePXjRweymsVAL/uoBgYMWt9vRDcY3iXlDNZT0w="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.7.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=347880a13c239b4c2811c94c9a7cf78b607332e3"; + sha256 = "sha256-07hpHuJFw95xGoJ/6ej7i6HlCFb2QRxP3arvRjKW4uU="; + }) + ## Needed to apply patch 8 + (fetchpatch { + name = "video-remove-trailing-whitespaces.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1f48917d8ddb490dcdc70176e0f58136b7f7811a"; + sha256 = "sha256-/yf/LGpwYcQ36KITzmiFfg4BvhcApKbrlFzjKK8V2kI="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.8.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e623866d9286410156e8b9d2c82d6253a1b22d08"; + sha256 = "sha256-zFxP6JY5Q9s3yJHdkbZ2w+dXFKeOCXjFnQKadB5HLCg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.9.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=210245129c932dc9e1c2748d9d35524fb95b5042"; + sha256 = "sha256-FyZhdTlcRVmn7X2hv93RhWP7NOoEMb7ib/DWveyz3Ew="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.10.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=690bee69fae6b4bd911293d6b7e56774e29fdf64"; + sha256 = "sha256-nOAXxebCW/s5M6sjPKdSdx47/PcH1lc0yYT0flVwoC8="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.11.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d5caac8ab79d068ad9a41030c772d03a4d4fbd7b"; + sha256 = "sha256-9fGJJkgZ6+E01MJqVTR1qFITx9EAx41Hv9QNfdqBgu0="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.12.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=768ef2199e0265cf455b154f1a80a612f02274c8"; + sha256 = "sha256-2/JJJux5vqXUc77bi3aXRy8NclbvyD/0e6UN8/6Ui3c="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.13.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=166a4d61448f74745afe1dac2f2cfb85d04909bf"; + sha256 = "sha256-XxTZ8P8qr4qEXELdHwaRACPeIZ/iixlATLB5RvVQsC8="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.14.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=22a3f97d39f6a10b08ad7fd1cc47c4dcd10413f6"; + sha256 = "sha256-bzB2gmGvWR2ylvMw779KQ/VHBBMsDNbG96eg9qQlljA="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.15.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=830a9628b2c9e1b6388af624aaf4a80818ed6be0"; + sha256 = "sha256-8fna2VbbUw8zBx77osaOOHlZFgRrHqwQK87RoUtCF6w="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.16.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4817538de828319ba6d59ced2fbb9b5ca13287"; + sha256 = "sha256-iCZAyRS/a15x5aJCJBYl9nw6Hc3WRCUG7zF5V+OwDKg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.17.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f407e34f3871a4c402bbd516e7c28ea193cef1b7"; + sha256 = "sha256-S45cLZNTWapAodKudUz2fMjnPsW6vbtNz0bIvIBGmu4="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.18.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c1b7eef9fa4aaefbf7d0507505c3bb2914e1ad6b"; + sha256 = "sha256-TWPfEAOePwC77yiVdsTSZIjfsMp7+0XabCz9K3FlV7w="; + }) + ## Needed to apply patch 19 + (fetchpatch { + name = "net-remove-trailing-whitespaces.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e453a4a64392a41bc7b37f890aceb358112d1687"; + sha256 = "sha256-JCbUB77Y6js5u99uJ9StDxNjjahNy4nO3crK8/GvmPY="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.19.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=96abf4fb9d829f4a405d5df39bc74bbccbd0e322"; + sha256 = "sha256-6E2MKO5kauFA1TA8YkUgIUusniwHS2Sr44A/a7ZqDCo="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.20.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ee9652031491326736714a988fbbaeab8ef9255c"; + sha256 = "sha256-E21q+Mj+JBQlUW0pe4zbaoL3ErXmCanyizwAsRYYZHk="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.21.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8f287c3e13da2bf82049e2e464eca7ca4fef0a85"; + sha256 = "sha256-dZ24RwYsHeUrMuiU7PDgPcw+iK9cOd6q+E0xWXbtTkE="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.22.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dad94fffe14be476df5f34a8e5a90ea62a41fe12"; + sha256 = "sha256-06TyTEvSy19dsnXZZoKBGx7ymJVWogr0NorzLflEwY4="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.23.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ec6bfd3237394c1c7dbf2fd73417173318d22f4b"; + sha256 = "sha256-NryxSekO8oSxsnv5G9mFZExm4Pwfc778mslyUDuDhlM="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.24.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b26b4c08e7119281ff30d0fb4a6169bd2afa8fe4"; + sha256 = "sha256-fSH3cxl/76DwkE8dHSR9uao9Vf1sJrhz7SmUSgDNodI="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.25.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4bd9877f62166b7e369773ab92fe24a39f6515f8"; + sha256 = "sha256-VMtR/sF8F1BMKmJ06ZZEPNH/+l0RySy/E6lVWdCyFKE="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.26.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=deae293f399dde3773cf37dfa9b77ca7e04ef772"; + sha256 = "sha256-sCC3KE9adavw7jHMTVlxtyuwDFCPRDqT24H3AKUYf68="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.27.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e40b83335bb33d9a2d1c06cc269875b3b3d6c539"; + sha256 = "sha256-cviCfBkzacAtnHGW87RLshhduE4Ym/v2Vq4h/sZDmZg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.28.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=11e1cffb7e2492ddac4ab8d19ce466783adbb957"; + sha256 = "sha256-I1feoneVeU3XkscKfVprWWJfLUnrc5oauMXYDyDxo5M="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.29.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13dce204cf6f3f0f49c9949971052a4c9657c0c0"; + sha256 = "sha256-DzFHxgR9A8FNZ/y9OMeBvTp1K6J5ePyL06dhHQmk7Ik="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.30.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2f4430cc0a44fd8c8aa7aee5c51887667ad3d6c3"; + sha256 = "sha256-AufP/10/auO4NMjYQ7yPDDbYShwGaktyQtqJx2Jasz8="; + }) + # October 2022 security patches + # https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00059.html + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.1.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f6b6236077f059e64ee315f2d7acb8fa4eda87c5"; + sha256 = "sha256-pk02iVf/u6CdsVjl8HaFBh0Bt473ZQzz5zBp9SoBLtE="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.2.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9c76ec09ae08155df27cd237eaea150b4f02f532"; + sha256 = "sha256-axbEOH5WFkUroGna2XY1f2kq7+B1Cs6LiubIA2EBdiM="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.3.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=768e1ef2fc159f6e14e7246e4be09363708ac39e"; + sha256 = "sha256-aKDUVS/Yx1c87NCrt4EG8BlSpkHijUyAJIwbmtzNjD8="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.4.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c51292274ded3259eb04c2f1c8d253ffbdb5216a"; + sha256 = "sha256-OLNOKuAJuHy2MBMnU2xcYM7AaxmDk9fchXhggoDrxJU="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.5.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=23843fe8947e4da955a05ad3d1858725bfcb56c8"; + sha256 = "sha256-ptn00nqVJlEb1c6HhoMy9nrBuctH077LM4yXKsK47gc="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.6.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b9396daf1c2e3cdc0a1e69b056852e0769fb24de"; + sha256 = "sha256-K7XNneDZjLpZh/C908+5uYsB/0oIdgQqmk0yJrdQLG4="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.7.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1d2015598cc7a9fca4b39186273e3519a88e80c7"; + sha256 = "sha256-s4pZtszH4b/0u85rpzVapZmNQdYEq/wW06SQ3PW/1aU="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.8.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=93a786a00163e50c29f0394df198518617e1c9a5"; + sha256 = "sha256-R8x557RMAxJ0ZV2jb6zDmwOPVlk6875q37fNpqKsPT0="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.9.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1eac01c147b4d85d2ec4a7e5671fa4345f2e8549"; + sha256 = "sha256-eOnhmU3pT5cCVnNHcY/BzDjldfs7yh/OGsxa15tGv94="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.10.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=992c06191babc1e109caf40d6a07ec6fdef427af"; + sha256 = "sha256-kezNKPcLmFXwyZbXtJbaPTIbE8tijmHIzdC2jsKwrNk="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.11.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9d81f71c6b8f55cf20cd56f5fe29c759df9b48cc"; + sha256 = "sha256-jnniVGy4KvFGFmcOP2YLA46k3cK8vwoByo19ismVUzE="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.12.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=22b77b87e10a3a6c9bb9885415bc9a9c678378e6"; + sha256 = "sha256-iYTEqN5997I7MVIg82jt/bbEAYhcgq8fNRCNPpY9ze0="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.13.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1514678888595ef41a968a0c69b7ff769edd1e9c"; + sha256 = "sha256-tgAEoAtaNKJjscjMFkXXiVn59Pa4c+NiQ3iVW6CMrpo="; + }) + ]; + + postPatch = if kbdcompSupport then '' + sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@' + '' else '' + echo '#! ${runtimeShell}' > util/grub-kbdcomp.in + echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in ''; - # autoreconfHook required for the splashimage patch. - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ texinfo ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; + buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] + ++ lib.optional doCheck qemu + ++ lib.optional zfsSupport zfs; - hardeningDisable = [ "format" "stackprotector" ]; + strictDeps = true; - passthru.grubTarget = ""; + hardeningDisable = [ "all" ]; + + separateDebugInfo = !xenSupport; + + # Work around a bug in the generated flex lexer (upstream flex bug?) + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + preConfigure = + '' for i in "tests/util/"*.in + do + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' + done + + # Apparently, the QEMU executable is no longer called + # `qemu-system-i386', even on i386. + # + # In addition, use `-nodefaults' to avoid errors like: + # + # chardev: opening backend "stdio" failed + # qemu: could not open serial device 'stdio': Invalid argument + # + # See . + sed -i "tests/util/grub-shell.in" \ + -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' + + unset CPP # setting CPP intereferes with dependency calculation + + patchShebangs . + + substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' + ''; + + configureFlags = [ + "--enable-grub-mount" # dep of os-prober + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # grub doesn't do cross-compilation as usual and tries to use unprefixed + # tools to target the host. Provide toolchain information explicitly for + # cross builds. + # + # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108 + "TARGET_CC=${stdenv.cc.targetPrefix}cc" + "TARGET_NM=${stdenv.cc.targetPrefix}nm" + "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib" + "TARGET_STRIP=${stdenv.cc.targetPrefix}strip" + ] ++ lib.optional zfsSupport "--enable-libzfs" + ++ lib.optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] + ++ lib.optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; + + # save target that grub is compiled for + grubTarget = if efiSupport + then "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi" + else lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; + + doCheck = false; + enableParallelBuilding = true; + + postInstall = '' + # Avoid a runtime reference to gcc + sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" + # just adding bash to buildInputs wasn't enough to fix the shebang + substituteInPlace $out/lib/grub/*/modinfo.sh \ + --replace ${buildPackages.bash} "/usr/bin/bash" + ''; + + passthru.tests = { + nixos-grub = nixosTests.grub; + nixos-install-simple = nixosTests.installer.simple; + nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub; + nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation; + }; meta = with lib; { - homepage = "https://www.gnu.org/software/grub"; - description = "GRand Unified Bootloader"; - license = licenses.gpl2; - platforms = platforms.linux; + description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; + + longDescription = + '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand + Unified Bootloader, which was originally designed and implemented by + Erich Stefan Boleyn. + + Briefly, the boot loader is the first software program that runs when a + computer starts. It is responsible for loading and transferring + control to the operating system kernel software (such as the Hurd or + the Linux). The kernel, in turn, initializes the rest of the + operating system (e.g., GNU). + ''; + + homepage = "https://www.gnu.org/software/grub/"; + + license = licenses.gpl3Plus; + + platforms = platforms.gnu ++ platforms.linux; + + maintainers = [ maintainers.samueldr ]; }; -} +}) diff --git a/pkgs/tools/misc/grub/grub1.patches.nix b/pkgs/tools/misc/grub/grub1.patches.nix deleted file mode 100644 index 5ee8722b5eca..000000000000 --- a/pkgs/tools/misc/grub/grub1.patches.nix +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by grub1-patches.sh -let - prefix = "https://salsa.debian.org/grub-team/grub-legacy/raw/1dad5507d74ef97fdd3c6cf2a028084f6f2850c3/debian/patches"; -in -[ -{ url = "${prefix}/snapshot.patch"; sha256 = "0ixymrn5w1dq0kkxnzdjwwvhjchgyrlivfvnrfncxcv30v84xzna"; } -{ url = "${prefix}/menu.lst_gnu-hurd.patch"; sha256 = "0mz8dvgmxlyrl28dza1ncfq1xipihxgymw4aw688bgg7xxmw7jbs"; } -{ url = "${prefix}/graphics.patch"; sha256 = "1v9kp832f3rhncfdrd28djhw0zfrznfmiadch33mclnkcxprcqcs"; } -{ url = "${prefix}/raid.patch"; sha256 = "0cq6dz5s7m48g76frvbf296bv4pvqkxqcbydsvs43ymqdsary7hj"; } -{ url = "${prefix}/raid_cciss.patch"; sha256 = "0sy5xvzjsllgbn26nykkq4b69lp1fcwjkjs2kmxq38sk3dzadjfl"; } -{ url = "${prefix}/xfs_freeze.patch"; sha256 = "1wqgj8ar4x4zwa37bj4a7kldiz5v92msigy3cv879nnk6sz4rmhg"; } -{ url = "${prefix}/2gb_limit.patch"; sha256 = "06f9lfl4va3alz87wzli0df5ay0xxlqj2akr2dcay6jr27z6ks29"; } -{ url = "${prefix}/grub-special_device_names.patch"; sha256 = "098608xh20sqdjqf42fm2z23r8xd9ify1v0vmy1j9qhrhk3g9qyz"; } -{ url = "${prefix}/grub-xvd_drives.patch"; sha256 = "13k0m1c1w5d1d4qd1bshjc8kp7qba4agk2j64gb7mg8vfzjd35bj"; } -{ url = "${prefix}/initrd_max_address.patch"; sha256 = "05q90rxdnyncpanhbkrknshkk7g8ff4v8fpk7wj4sg8666d9llg3"; } -{ url = "${prefix}/splashimage_help.patch"; sha256 = "1lj3xh56wf1pdcf0fg585vmggrz7qqfzbhg91qv0rf4snf3ybfvr"; } -{ url = "${prefix}/grub-install_addsyncs.patch"; sha256 = "1dzcpxi806kw3j8mx4amyy4ibc0ir3qhqyyyxz3w43741p351r65"; } -{ url = "${prefix}/grub-install_regexp.patch"; sha256 = "0ph9lb63x858019c25aa3fpsm8rzn00ad8fp88yqqvq0xq2jxq69"; } -{ url = "${prefix}/grub-install_aoe_support.patch"; sha256 = "19szmvg13h2hhijrwbgdszldg26iz7vjnagvajxb7nav7vca6k3n"; } -{ url = "${prefix}/grub-install_xvd.patch"; sha256 = "1cgh731nhs0chj2r2dzh5dcfj5xmap34i3fk0i0aq59j83cwflgz"; } -{ url = "${prefix}/geometry-26kernel.patch"; sha256 = "01vka7jrxrwlj9m1d6schygyh964a3k1rdrm3j9x910xkz74i13n"; } -{ url = "${prefix}/print_func.patch"; sha256 = "0dvrcy1i58fgrv2x1qniqfr5az9b834hm5l94k0cy8ii2nfvk27g"; } -{ url = "${prefix}/mprotect.patch"; sha256 = "0ahgnhgw2b86j024ajs6m3h2fy2shqdssjzz0ahk8ny9f4mnvns6"; } -{ url = "${prefix}/savedefault.patch"; sha256 = "1l6x1s9mxkrf3k4j9dpg7qhvrk816vs70sw073iiisvqspnrz2j3"; } -{ url = "${prefix}/find-grub-dir.patch"; sha256 = "1vkgig4dylji03jflwikhap87lz8l470ck1bhmcy8jh0slg6ndbf"; } -{ url = "${prefix}/intelmac.patch"; sha256 = "04l9mk9xm9ml8vdlpbv3qbj7gbaa0g5k4dl7xp8wm7kmqwxd9l3m"; } -{ url = "${prefix}/crossreference_manpages.patch"; sha256 = "0kd12ck4s4bg414fmllgvq8n4b58i3kgdhmcx6riaz43gg2g2b9p"; } -{ url = "${prefix}/ext3_256byte_inode.patch"; sha256 = "0ay9svbdj7mw8p1ld0iiryg6nhd9hc1xpmr9rqg9990xzmg2h4pi"; } -{ url = "${prefix}/objcopy-absolute.patch"; sha256 = "0hkmicjli7bsmc56kr40ls21v6x3yd188xpwc08dvqxnb0763077"; } -{ url = "${prefix}/no-reorder-functions.patch"; sha256 = "0gmv0nzkqim2901hd0an90kwnr83155qp2zjp52biznad2p415gw"; } -{ url = "${prefix}/modern-automake.patch"; sha256 = "08l3y6cbk6gfj63kpqlpzrlain7nmvki7jjjxq86n7himj078znj"; } -{ url = "${prefix}/no-combine-stack-adjustments.patch"; sha256 = "0h4di8zja0rg45rs02x9qm8q1vxly1bcl6ms08wgdl5ywn6849nr"; } -{ url = "${prefix}/no-pie.patch"; sha256 = "0kshdsclza7lsd31apd28qq04arv42nd6wsj2v6q6jx7f8bgdaqw"; } -] diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/pkgs/tools/misc/grub/grub1.patches.sh deleted file mode 100755 index a7db25afb64f..000000000000 --- a/pkgs/tools/misc/grub/grub1.patches.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -p nix -i bash --pure - -# Does like `maintainers/scripts/debian-patches.sh`, but specialized for -# grub1 patches, and using the new salsa service. - -# Most common usage: `pkgs/tools/misc/grub/grub1.patches.sh pkgs/tools/misc/grub/grub1.patches.nix` -# That is, after updating the script with the new list from the series file, -# removing (by commenting) patches as required. - -set -e -set -u - -# https://salsa.debian.org/grub-team/grub-legacy/tree/master/debian/patches -SERIES=( - snapshot.patch - menu.lst_gnu-hurd.patch - graphics.patch - raid.patch - raid_cciss.patch - xfs_freeze.patch - 2gb_limit.patch - grub-special_device_names.patch - grub-xvd_drives.patch - initrd_max_address.patch - splashimage_help.patch - grub-install_addsyncs.patch - grub-install_regexp.patch - grub-install_aoe_support.patch - grub-install_xvd.patch - geometry-26kernel.patch - print_func.patch - mprotect.patch - savedefault.patch - find-grub-dir.patch - intelmac.patch - crossreference_manpages.patch - ext3_256byte_inode.patch - # Breaks on NixOS. - #use_grub-probe_in_grub-install.patch - objcopy-absolute.patch - no-reorder-functions.patch - - # We aren't building amd64 binaries, see #244498 - #fix_amd64_compile.patch - modern-automake.patch - no-combine-stack-adjustments.patch - no-pie.patch -) - -# Revision mapping to current tip of the 0.97-73 branch. -rev="1dad5507d74ef97fdd3c6cf2a028084f6f2850c3" -prefix="https://salsa.debian.org/grub-team/grub-legacy/raw/${rev}/debian/patches" -FILE="$1" -shift - -cat < "$FILE" -# Generated by grub1-patches.sh -let - prefix = "${prefix}"; -in -[ -EOF - -for PATCH in "${SERIES[@]}"; do - URL="$prefix/$PATCH" - HASH="$(nix-prefetch-url "$URL")" - echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE" -done -echo "]" >> "$FILE" diff --git a/pkgs/tools/misc/grub/symlink.patch b/pkgs/tools/misc/grub/symlink.patch deleted file mode 100644 index ac38be046188..000000000000 --- a/pkgs/tools/misc/grub/symlink.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rc grub-0.97-orig/util/grub-install.in grub-0.97/util/grub-install.in -*** grub-0.97-orig/util/grub-install.in 2008-09-18 11:32:13.000000000 +0200 ---- grub-0.97/util/grub-install.in 2008-09-18 11:36:40.000000000 +0200 -*************** -*** 194,217 **** - # Usage: resolve_symlink file - # Find the real file/device that file points at - resolve_symlink () { -! tmp_fname=$1 -! # Resolve symlinks -! while test -L $tmp_fname; do -! tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'` -! if test -z "$tmp_new_fname"; then -! echo "Unrecognized ls output" 2>&1 -! exit 1 -! fi -! -! # Convert relative symlinks -! case $tmp_new_fname in -! /*) tmp_fname="$tmp_new_fname" -! ;; -! *) tmp_fname="`echo $tmp_fname | sed 's%/[^/]*$%%'`/$tmp_new_fname" -! ;; -! esac -! done -! echo "$tmp_fname" - } - - # Usage: find_device file ---- 194,200 ---- - # Usage: resolve_symlink file - # Find the real file/device that file points at - resolve_symlink () { -! readlink -f $1 - } - - # Usage: find_device file diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index c1832acb11ca..6224811ccd52 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-vh3U4JhjlqA8i6vlOF4dhhinhD/rMWLYRx5wx5bdrGw="; + hash = "sha256-c3CMtPLo5NfKfr2meccFuDpf0ffZ3uBw995TEB5FSTs="; }; - cargoHash = "sha256-lsRwzD+4p9ijTjMLvoFxFEkvUhioUab5oVe+EZJCEwc="; + cargoHash = "sha256-2pIASIJ83lFfC7do/02MxY/OOMJG7McS6O8uRMy9kVs="; meta = with lib; { description = "A command-line hex viewer"; diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/tools/misc/killport/default.nix new file mode 100644 index 000000000000..5e424bf5440c --- /dev/null +++ b/pkgs/tools/misc/killport/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchCrate +, llvmPackages +}: +rustPlatform.buildRustPackage rec { + pname = "killport"; + version = "0.8.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-ip7Ndy4i4P6n20COfSL/EtG1Y+xoab8Gox4gcNHH1/o="; + }; + + cargoSha256 = "sha256-M4riyvGueCQDKOj+lgYPm2lZ8UjCp1y/SyG692vZbS4="; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + meta = with lib; { + description = "A command-line tool to easily kill processes running on a specified port"; + homepage = "https://github.com/jkfran/killport"; + license = licenses.mit; + maintainers = with maintainers; [ sno2wman ]; + }; +} diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 4a3887438f44..1aee06ddf564 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tjnmY7dJUE5k8hlAfNKcHqmpw0ciS6T5WJOpDvvt2V0="; + sha256 = "sha256-RmpPWS9gnBnR+Atw6uzBmeDSgoTOFSdKzHoJ84O+gyA="; }; buildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # filter out one test that fails in the sandbox of nix checkPhase = '' runHook preCheck - script -ec "busted --lpath './?.lua' --filter-out 'handles man' test" + make test BUSTED='busted --output TAP --exclude-tags=nix' runHook postCheck ''; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 33e1cda1df58..eb5caa836c51 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tldr"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-cpp-client"; rev = "v${version}"; - sha256 = "sha256-xim5SB9/26FMjLqhiV+lj+Rm5Tk5luSIqwyYb3kXoFY="; + sha256 = "sha256-9pBMo+t/44tuT/CisS0w60KaKXjPfNTMr2v6Ftjaf1k="; }; buildInputs = [ curl libzip ]; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. ''; - homepage = "https://tldr-pages.github.io"; + homepage = "https://tldr.sh"; changelog = "https://github.com/tldr-pages/tldr-c-client/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ taeer carlosdagos ]; + maintainers = with maintainers; [ taeer carlosdagos kbdharun]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 15a3ec98b568..f01c2aa17d6d 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.23.1"; + version = "3.23.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - hash = "sha256-cU4PFuVzmHPZDboZXyPUA+MMra+rUhTxjaIrx91qzes="; + hash = "sha256-u8ARJZYd+25g3G2MoLWHZd5fgxPsj7Mtx7cROa8VvUA="; }; - vendorHash = "sha256-om7tiYZn8nAOZ3jjAmF0Ncs1OPjiY8v7QW0RSY1Tv6o="; + vendorHash = "sha256-zUl1q6rRjX958VXKnVB2YmLUpKMUtFvdh+hkIrTomes="; outputs = [ "out" diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index f39401a44816..c6098e31264a 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20230413"; + version = "20230509"; format = "setuptools"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YYERI+GNRP2wGWhYAy6m8QI4alFZniCSWp9/fdb9mpM="; + hash = "sha256-dJ/LI5mQJAYsqlOk2vP6h8Iz6ZdqTi9i4fgtjVaBkuE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/tools/networking/wakeonlan/default.nix index 80147ae39ce3..b15aadcb3ee3 100644 --- a/pkgs/tools/networking/wakeonlan/default.nix +++ b/pkgs/tools/networking/wakeonlan/default.nix @@ -1,4 +1,4 @@ -{ lib, perlPackages, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, perlPackages, fetchFromGitHub, installShellFiles, shortenPerlShebang }: perlPackages.buildPerlPackage rec { pname = "wakeonlan"; @@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; nativeCheckInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; # Linting and formatting checks are of no interest for us. @@ -24,6 +24,8 @@ perlPackages.buildPerlPackage rec { installPhase = '' install -Dt $out/bin wakeonlan installManPage blib/man1/wakeonlan.1 + '' + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/wakeonlan ''; meta = with lib; { diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh index 6ec827350469..15bed4af74d4 100755 --- a/pkgs/tools/nix/info/info.sh +++ b/pkgs/tools/nix/info/info.sh @@ -51,9 +51,14 @@ Options: -d, --debug debug mode EOF - exit 1 - ;; - + case "${1:-}" in + -h|--help) + exit 0 + ;; + *) + exit 1 + ;; + esac esac done diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index 69e6555ca2ba..f3c121c7c734 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -6,20 +6,21 @@ , pkg-config , rustPlatform , nix-update-script +, nixosTests }: rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-erBmPXMyIYxRLbYG35vH67MypJoXomUEFOVu6IhmEWs="; + hash = "sha256-JH0tdUCadvovAJclpx7Fn1oD+POFpBFHdullRTcFaVQ="; }; - cargoHash = "sha256-Gq7U+Uy3psuPVY0wGM90KA5u5Wc2s4hVJma7B11Ag5g="; + cargoHash = "sha256-Wa+7Vo5VWmx47Uf6YtlzHReoWY44SxdOnscSFu74OSM="; nativeBuildInputs = [ pkg-config nix @@ -35,12 +36,13 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" "harmonia-v(.*)" ]; }; + tests = { inherit (nixosTests) harmonia; }; }; meta = with lib; { description = "Nix binary cache"; - homepage = "https://github.com/helsinki-systems/harmonia"; + homepage = "https://github.com/nix-community/harmonia"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 54af57873b26..b9f992cbb8a0 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.8.2"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-w9Jbtf/BFkr2qEVqpxkRkQ1ve5o77Mhs0kGwdG5ucKI="; + hash = "sha256-P+Gw4D+G76gifYY2OghXRzrlPiYk4KggoVMgzJbm6Is="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 249762781e7d..9b6bcf74739b 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,23 +1,52 @@ -{ stdenv, lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }: +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gnome +, gobject-introspection +, gtk3 +, intltool +, python3 +, wrapGAppsHook +}: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; - version = "0.5"; + version = "0.7"; - src = fetchgit { - url = "https://git-tails.immerda.ch/onioncircuits/"; + src = fetchFromGitLab { + domain = "gitlab.tails.boum.org"; + owner = "tails"; + repo = "onioncircuits"; rev = version; - sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm"; + sha256 = "sha256-O4tSbKBTmve4u8bXVg128RLyuxvTbU224JV8tQ+aDAQ="; }; - nativeBuildInputs = [ intltool ]; - buildInputs = [ gtk3 gobject-introspection ]; - propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ]; + nativeBuildInputs = [ + gobject-introspection + intltool + wrapGAppsHook + python3.pkgs.distutils_extra + ]; - postFixup = '' - wrapProgram "$out/bin/onioncircuits" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share" + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + stem + ]; + + patches = [ + # Fix https://gitlab.tails.boum.org/tails/onioncircuits/-/merge_requests/4 + (fetchpatch { + name = "fix-setuptool-package-discovery.patch"; + url = "https://gitlab.tails.boum.org/tails/onioncircuits/-/commit/4c620c77f36f540fa27041fcbdeaf05c9f57826c.patch"; + sha256 = "sha256-WXqyDa2meRMMHkHLO5Xl7x43KUGtlsai+eOVzUGUPpo="; + }) + ]; + + postInstall = '' + mkdir -p $out/etc/apparmor.d + + cp apparmor/usr.bin.onioncircuits $out/etc/apparmor.d ''; meta = with lib; { @@ -25,7 +54,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; license = licenses.gpl3; - maintainers = [ ]; + maintainers = with maintainers; [ milran ]; }; } diff --git a/pkgs/tools/security/sbomnix/default.nix b/pkgs/tools/security/sbomnix/default.nix new file mode 100644 index 000000000000..2449573c080a --- /dev/null +++ b/pkgs/tools/security/sbomnix/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, coreutils +, curl +, gnugrep +, gnused +, gzip +, nix +, python + # python libs +, colorlog +, graphviz +, numpy +, packageurl-python +, pandas +, requests +, reuse +, tabulate +}: + +python.pkgs.buildPythonApplication rec { + pname = "sbomnix"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "tiiuae"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-RxDFxVGivVBw2uhtzf231Q2HHTBFKSqGrknr2Es/ygM="; + }; + + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ coreutils curl gnugrep gnused gzip graphviz nix ]}" + ]; + + propagatedBuildInputs = [ + colorlog + graphviz + numpy + packageurl-python + pandas + requests + reuse + tabulate + ]; + + pythonImportsCheck = [ "sbomnix" ]; + + meta = with lib; { + description = "Generate SBOMs for nix targets"; + homepage = "https://github.com/tiiuae/sbomnix"; + license = with licenses; [ asl20 bsd3 cc-by-30 ]; + maintainers = with maintainers; [ henrirosten jk ]; + }; +} diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index b7614d74145c..d828e1b73825 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.33.0"; + version = "3.34.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZbsWPyLPN6qTMyEuisLA589B5JgYV9LixuRV91G/6oY="; + hash = "sha256-n/IzfVB40Ufr46L83WCxIyCwB9/jYVsw/J5F34/bDLg="; }; - vendorHash = "sha256-sSpRu6zLIvllrDYdtrj3oD3pCVs9ucSXbu3IYTqjT+k="; + vendorHash = "sha256-wzBJjJVBT0mGJx0WQbs2D4n7ovfz1lA2NCEpz6xuqpg="; ldflags = [ "-s" diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 9ca8fe25d19c..185db566b60f 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-UbzWI3f1ewFwg7BsqcvPZFeJt5E6alShxNuIKy+Tno0="; + sha256 = "sha256-/pjMxWQ66t9Jd8ziLJXDgnwfSgR1uS9U1uXVDTZze58="; }; - cargoHash = "sha256-ihCgaB+vP5YyqMIg8qrkCEvSQdc6Eq00D1r3PGc2WpA="; + cargoHash = "sha256-0KweijC4gA9ELmQZ7lvOx2BypMuj8KsZHxGfcRXVi4g="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk_11_0.frameworks.Foundation ]; doCheck = false; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c22d2e9f65cd..08622c30e6da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -648,6 +648,7 @@ mapAliases ({ gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 grub2_full = grub2; # Added 2022-11-18 + grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 grv = throw "grv has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d04c3f3c01e..f89f485593a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -330,6 +330,8 @@ with pkgs; bingo = callPackage ../development/tools/bingo { }; + bin2c = callPackage ../development/tools/bin2c { }; + binserve = callPackage ../servers/binserve { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -3679,9 +3681,7 @@ with pkgs; abootimg = callPackage ../development/mobile/abootimg { }; - adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { - adb = androidenv.androidPkgs_9_0.platform-tools; - }; + adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { }; adb-sync = callPackage ../development/mobile/adb-sync { inherit (androidenv.androidPkgs_9_0) platform-tools; @@ -8170,15 +8170,11 @@ with pkgs; grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { }; - grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ - stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; - } // (config.grub or {})); - trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { + grub2 = callPackage ../tools/misc/grub/default.nix { # update breaks grub2 gnulib = pkgs.gnulib.overrideAttrs (_: rec { version = "20200223"; @@ -16232,6 +16228,7 @@ with pkgs; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { }; cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { }; + cargo-bundle-licenses = callPackage ../development/tools/rust/cargo-bundle-licenses { }; cargo-cache = callPackage ../development/tools/rust/cargo-cache { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -18990,6 +18987,8 @@ with pkgs; sawjap = callPackage ../development/tools/java/sawjap { }; + sbomnix = python3.pkgs.callPackage ../tools/security/sbomnix { }; + sd-local = callPackage ../development/tools/sd-local { }; seer = libsForQt5.callPackage ../development/tools/misc/seer { }; @@ -33010,6 +33009,8 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera { }; + oranda = callPackage ../applications/misc/oranda { }; + orca = python3Packages.callPackage ../applications/misc/orca { inherit pkg-config; }; @@ -33024,6 +33025,8 @@ with pkgs; osmium-tool = callPackage ../applications/misc/osmium-tool { }; + osmtogeojson = callPackage ../applications/misc/osmtogeojson { }; + owamp = callPackage ../applications/networking/owamp { }; owofetch = callPackage ../tools/misc/owofetch { @@ -35363,6 +35366,8 @@ with pkgs; zammad = callPackage ../applications/networking/misc/zammad { }; + zarf = callPackage ../applications/networking/cluster/zarf { }; + zathuraPkgs = callPackage ../applications/misc/zathura { }; zathura = zathuraPkgs.zathuraWrapper; @@ -37949,6 +37954,8 @@ with pkgs; keymapviz = callPackage ../tools/misc/keymapviz { }; + killport = darwin.apple_sdk_11_0.callPackage ../tools/misc/killport { }; + lean = callPackage ../applications/science/logic/lean { }; lean2 = callPackage ../applications/science/logic/lean2 { }; lean3 = lean; @@ -40235,7 +40242,7 @@ with pkgs; treefmt = callPackage ../development/tools/treefmt { }; - bottom = callPackage ../tools/system/bottom { }; + bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { wlroots = wlroots_0_15; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64ec8c6f4671..520fa3ff363f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25878,10 +25878,10 @@ with self; { url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; hash = "sha256-S9KaF/DCx5LRLBAFs8J28qsPrjnACFmuF0HXlBhGpIg="; }; - buildInputs = [ pkgs.glibcLocales ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ pkgs.glibcLocales ]; propagatedBuildInputs = [ TextCharWidth ]; preConfigure = '' - substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc.bin}/bin/locale' + substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${if stdenv.isDarwin then pkgs.darwin.adv_cmds else pkgs.glibc.bin}/bin/locale' ''; meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e3021fe6a9b..26b7aee601cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -881,6 +881,8 @@ self: super: with self; { awswrangler = callPackage ../development/python-modules/awswrangler { }; + ax = callPackage ../development/python-modules/ax { }; + axis = callPackage ../development/python-modules/axis { }; azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { }; @@ -1439,6 +1441,8 @@ self: super: with self; { botocore = callPackage ../development/python-modules/botocore { }; + botorch = callPackage ../development/python-modules/botorch { }; + bottle = callPackage ../development/python-modules/bottle { }; bottleneck = callPackage ../development/python-modules/bottleneck { }; @@ -2602,6 +2606,8 @@ self: super: with self; { django-bootstrap3 = callPackage ../development/python-modules/django-bootstrap3 { }; + django-bootstrap4 = callPackage ../development/python-modules/django-bootstrap4 { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; django-cacheops = callPackage ../development/python-modules/django-cacheops { }; @@ -2628,6 +2634,8 @@ self: super: with self; { django-configurations = callPackage ../development/python-modules/django-configurations { }; + django-context-decorator = callPackage ../development/python-modules/django-context-decorator { }; + django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; @@ -2689,6 +2697,8 @@ self: super: with self; { django-js-reverse = callPackage ../development/python-modules/django-js-reverse { }; + django-libsass = callPackage ../development/python-modules/django-libsass { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; django-login-required-middleware = callPackage ../development/python-modules/django-login-required-middleware { }; @@ -4229,6 +4239,8 @@ self: super: with self; { gpy = callPackage ../development/python-modules/gpy { }; + gpytorch = callPackage ../development/python-modules/gpytorch { }; + gpt-2-simple = callPackage ../development/python-modules/gpt-2-simple { }; gpyopt = callPackage ../development/python-modules/gpyopt { }; @@ -5712,6 +5724,8 @@ self: super: with self; { limnoria = callPackage ../development/python-modules/limnoria { }; + linear_operator = callPackage ../development/python-modules/linear_operator { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; lineedit = callPackage ../development/python-modules/lineedit { }; @@ -10550,6 +10564,8 @@ self: super: with self; { ropper = callPackage ../development/python-modules/ropper { }; + rouge-score = callPackage ../development/python-modules/rouge-score { }; + routes = callPackage ../development/python-modules/routes { }; rova = callPackage ../development/python-modules/rova { };