diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 747ce847541..b0babe8da74 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8878,7 +8878,7 @@ name = "Guillaume Loetscher"; }; sternenseemann = { - email = "post@lukasepple.de"; + email = "sternenseemann@systemli.org"; github = "sternenseemann"; githubId = 3154475; name = "Lukas Epple"; diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 6dd14d6051e..3760c52d363 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -91,6 +91,11 @@ + + + The systemConfig kernel parameter is no longer added to boot loader entries. It has been unused since September 2010, but if do have a system generation from that era, you will now be unable to boot into them. + + systemd-journal2gelf no longer parses json and expects the receiving system to handle it. How to achieve this with Graylog is described in this GitHub issue. diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 8159576a62a..123f487baf9 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -26,7 +26,7 @@ let # A clue for the kernel loading kernelParams = pkgs.writeText "kernel-params.txt" '' Kernel Parameters: - init=/boot/init systemConfig=/boot/init ${toString config.boot.kernelParams} + init=/boot/init ${toString config.boot.kernelParams} ''; # System wide nixpkgs config diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix index f2af7dcde3d..a79209d7dfe 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix @@ -23,13 +23,13 @@ let label nixos MENU LABEL ^NixOS using nfsroot KERNEL bzImage - append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw + append ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw # I don't know how to make this boot with nfsroot (using the initrd) label nixos_initrd MENU LABEL NixOS booting the poor ^initrd. KERNEL bzImage - append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw + append initrd=initrd ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw label memtest MENU LABEL ^${pkgs.memtest86.name} diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 11dec37b3fa..796078d7ef8 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -53,7 +53,7 @@ in ${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \ --initrd=/run/current-system/initrd \ --reset-vga --console-vga \ - --command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" + --command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" ''; kernelParams = [ "crashkernel=${crashdump.reservedMemory}" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3055459e781..644229627b2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -461,6 +461,7 @@ ./services/misc/errbot.nix ./services/misc/etcd.nix ./services/misc/etebase-server.nix + ./services/misc/etesync-dav.nix ./services/misc/ethminer.nix ./services/misc/exhibitor.nix ./services/misc/felix.nix diff --git a/nixos/modules/services/misc/etesync-dav.nix b/nixos/modules/services/misc/etesync-dav.nix new file mode 100644 index 00000000000..9d7cfda371b --- /dev/null +++ b/nixos/modules/services/misc/etesync-dav.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.etesync-dav; +in + { + options.services.etesync-dav = { + enable = mkEnableOption "etesync-dav"; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "The server host address."; + }; + + port = mkOption { + type = types.port; + default = 37358; + description = "The server host port."; + }; + + apiUrl = mkOption { + type = types.str; + default = "https://api.etesync.com/"; + description = "The url to the etesync API."; + }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; + + sslCertificate = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/etesync.crt"; + description = '' + Path to server SSL certificate. It will be copied into + etesync-dav's data directory. + ''; + }; + + sslCertificateKey = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/etesync.key"; + description = '' + Path to server SSL certificate key. It will be copied into + etesync-dav's data directory. + ''; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.etesync-dav = { + description = "etesync-dav - A CalDAV and CardDAV adapter for EteSync"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.etesync-dav ]; + environment = { + ETESYNC_LISTEN_ADDRESS = cfg.host; + ETESYNC_LISTEN_PORT = toString cfg.port; + ETESYNC_URL = cfg.apiUrl; + ETESYNC_DATA_DIR = "/var/lib/etesync-dav"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = "etesync-dav"; + ExecStart = "${pkgs.etesync-dav}/bin/etesync-dav"; + ExecStartPre = mkIf (cfg.sslCertificate != null || cfg.sslCertificateKey != null) ( + pkgs.writers.writeBash "etesync-dav-copy-keys" '' + ${optionalString (cfg.sslCertificate != null) '' + cp ${toString cfg.sslCertificate} $STATE_DIRECTORY/etesync.crt + ''} + ${optionalString (cfg.sslCertificateKey != null) '' + cp ${toString cfg.sslCertificateKey} $STATE_DIRECTORY/etesync.key + ''} + '' + ); + Restart = "on-failure"; + RestartSec = "30min 1s"; + }; + }; + }; + } diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 854684b87fa..5ffffb95edb 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -109,7 +109,7 @@ addEntry() { exit 1 fi fi - echo " APPEND systemConfig=$path init=$path/init $extraParams" + echo " APPEND init=$path/init $extraParams" } tmpFile="$target/extlinux/extlinux.conf.tmp.$$" diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 6e354f013fa..e0167654748 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -102,10 +102,10 @@ if (stat($bootPath)->dev != stat("/nix/store")->dev) { # Discover information about the location of the bootPath struct(Fs => { - device => '$', - type => '$', - mount => '$', -}); + device => '$', + type => '$', + mount => '$', + }); sub PathInMount { my ($path, $mount) = @_; my @splitMount = split /\//, $mount; @@ -154,16 +154,16 @@ sub GetFs { return $bestFs; } struct (Grub => { - path => '$', - search => '$', -}); + path => '$', + search => '$', + }); my $driveid = 1; sub GrubFs { my ($dir) = @_; my $fs = GetFs($dir); my $path = substr($dir, length($fs->mount)); if (substr($path, 0, 1) ne "/") { - $path = "/$path"; + $path = "/$path"; } my $search = ""; @@ -251,8 +251,8 @@ my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; if ($grubVersion == 1) { $conf .= " - default $defaultEntry - timeout $timeout + default $defaultEntry + timeout $timeout "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n"; @@ -302,51 +302,51 @@ else { if ($copyKernels == 0) { $conf .= " - " . $grubStore->search; + " . $grubStore->search; } # FIXME: should use grub-mkconfig. $conf .= " - " . $grubBoot->search . " - if [ -s \$prefix/grubenv ]; then - load_env - fi + " . $grubBoot->search . " + if [ -s \$prefix/grubenv ]; then + load_env + fi - # ‘grub-reboot’ sets a one-time saved entry, which we process here and - # then delete. - if [ \"\${next_entry}\" ]; then - set default=\"\${next_entry}\" - set next_entry= - save_env next_entry - set timeout=1 - else - set default=$defaultEntry - set timeout=$timeout - fi + # ‘grub-reboot’ sets a one-time saved entry, which we process here and + # then delete. + if [ \"\${next_entry}\" ]; then + set default=\"\${next_entry}\" + set next_entry= + save_env next_entry + set timeout=1 + else + set default=$defaultEntry + set timeout=$timeout + fi - # Setup the graphics stack for bios and efi systems - if [ \"\${grub_platform}\" = \"efi\" ]; then - insmod efi_gop - insmod efi_uga - else - insmod vbe - fi + # Setup the graphics stack for bios and efi systems + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi "; if ($font) { copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; $conf .= " - insmod font - if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=$gfxpayloadEfi - else - set gfxmode=$gfxmodeBios - set gfxpayload=$gfxpayloadBios - fi - terminal_output gfxterm - fi + insmod font + if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=$gfxpayloadEfi + else + set gfxmode=$gfxmodeBios + set gfxpayload=$gfxpayloadBios + fi + terminal_output gfxterm + fi "; } if ($splashImage) { @@ -363,14 +363,14 @@ else { } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " - insmod " . substr($suffix, 1) . " - if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi + insmod " . substr($suffix, 1) . " + if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then + set color_normal=white/black + set color_highlight=black/white + else + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi "; } @@ -380,21 +380,21 @@ else { # Copy theme rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; $conf .= " - # Sets theme. - set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt - export theme - # Load theme fonts, if any - "; + # Sets theme. + set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt + export theme + # Load theme fonts, if any + "; - find( { wanted => sub { - if ($_ =~ /\.pf2$/i) { - $font = File::Spec->abs2rel($File::Find::name, $theme); - $conf .= " - loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font - "; - } - }, no_chdir => 1 }, $theme ); - } + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); + $conf .= " + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font + "; + } + }, no_chdir => 1 }, $theme ); + } } $conf .= "$extraConfig\n"; @@ -433,25 +433,25 @@ sub addEntry { # Include second initrd with secrets if (-e -x "$path/append-initrd-secrets") { - my $initrdName = basename($initrd); - my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + my $initrdName = basename($initrd); + my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; - mkpath(dirname($initrdSecretsPath), 0, 0755); - my $oldUmask = umask; - # Make sure initrd is not world readable (won't work if /boot is FAT) - umask 0137; - my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; - # Check whether any secrets were actually added - if (-e $initrdSecretsPathTemp && ! -z _) { - rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; - $copied{$initrdSecretsPath} = 1; - $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; - } else { - unlink $initrdSecretsPathTemp; - rmdir dirname($initrdSecretsPathTemp); - } - umask $oldUmask; + mkpath(dirname($initrdSecretsPath), 0, 0755); + my $oldUmask = umask; + # Make sure initrd is not world readable (won't work if /boot is FAT) + umask 0137; + my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; + # Check whether any secrets were actually added + if (-e $initrdSecretsPathTemp && ! -z _) { + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; + $copied{$initrdSecretsPath} = 1; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + } else { + unlink $initrdSecretsPathTemp; + rmdir dirname($initrdSecretsPathTemp); + } + umask $oldUmask; } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; @@ -459,9 +459,8 @@ sub addEntry { # FIXME: $confName my $kernelParams = - "systemConfig=" . Cwd::abs_path($path) . " " . - "init=" . Cwd::abs_path("$path/init") . " " . - readFile("$path/kernel-params"); + "init=" . Cwd::abs_path("$path/init") . " " . + readFile("$path/kernel-params"); my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : ""; if ($grubVersion == 1) { @@ -503,9 +502,9 @@ foreach my $link (@links) { my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); if ($cfgName) { $entryName = $cfgName; @@ -530,8 +529,8 @@ sub addProfile { sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; } my @links = sort - { nrFromGen($b) <=> nrFromGen($a) } - (glob "$profile-*-link"); + { nrFromGen($b) <=> nrFromGen($a) } + (glob "$profile-*-link"); my $curEntry = 0; foreach my $link (@links) { @@ -542,9 +541,9 @@ sub addProfile { } my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link); } @@ -566,7 +565,7 @@ $extraPrepareConfig =~ s/\@bootPath\@/$bootPath/g; # Run extraPrepareConfig in sh if ($extraPrepareConfig ne "") { - system((get("shell"), "-c", $extraPrepareConfig)); + system((get("shell"), "-c", $extraPrepareConfig)); } # write the GRUB config. @@ -627,13 +626,13 @@ foreach my $fn (glob "$bootPath/kernels/*") { # struct(GrubState => { - name => '$', - version => '$', - efi => '$', - devices => '$', - efiMountPoint => '$', - extraGrubInstallArgs => '@', -}); + name => '$', + version => '$', + efi => '$', + devices => '$', + efiMountPoint => '$', + extraGrubInstallArgs => '@', + }); # If you add something to the state file, only add it to the end # because it is read line-by-line. sub readGrubState { diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index 2a1ec479fea..bd3fc64999d 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -49,7 +49,6 @@ addEntry() { echo "#!/bin/sh" echo "# $name" echo "# created by init-script-builder.sh" - echo "export systemConfig=$(readlink -f $path)" echo "exec $stage2" )" diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 97e824fe629..6bee900c683 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -101,7 +101,7 @@ def write_entry(profile, generation, machine_id): entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) generation_dir = os.readlink(system_dir(profile, generation)) tmp_path = "%s.tmp" % (entry_file) - kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) + kernel_params = "init=%s/init " % generation_dir with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/applications/editors/jed/default.nix index 7b197be0e6f..29c8bc258cc 100644 --- a/pkgs/applications/editors/jed/default.nix +++ b/pkgs/applications/editors/jed/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "--with-slang=${slang}" "JED_ROOT=${placeholder "out"}/share/jed" ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 77af6b67939..af98580a8bf 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "03q1mdz47crflkvpc364ky52farad7517jhszb1fg1s3c2bnndn0"; + sha256 = "sha256-40VgWfSjyERHJapiIXSk89O3X1V8rb8JEWqfnAyf1Sc="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix index 3aad18ef11c..0ba381901b9 100644 --- a/pkgs/applications/editors/viw/default.nix +++ b/pkgs/applications/editors/viw/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkFlags = [ "test-command" "test-buffer" "test-state" ]; installPhase = '' diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index a1357ff0a08..00a3914e173 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "CC=cc" - "CXX=c++" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" "CFLAGS=-DENABLE_NLS" ]; diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix index 9b2fcf3d17a..9ea26b52bc3 100644 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile"; - makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "Klondike Solitaire in your ncurses terminal"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1445219c1b2..a236e50218e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,22 +31,22 @@ } }, "dev": { - "version": "90.0.4412.3", - "sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442", - "sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz", + "version": "90.0.4421.5", + "sha256": "0605ibr2fr13rmmxs7lw4dh25i9r6ic08ykdr7002m4rp8kxwsw6", + "sha256bin64": "05mlm9l6q1w9rxid7cvaazzbw79wj9fjw6ka7wpr0gz4r3gmazsb", "deps": { "gn": { - "version": "2021-01-25", + "version": "2021-02-09", "url": "https://gn.googlesource.com/gn", - "rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6", - "sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc" + "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", + "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" } } }, "ungoogled-chromium": { - "version": "88.0.4324.150", - "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", - "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", + "version": "88.0.4324.182", + "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", + "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", "deps": { "gn": { "version": "2020-11-05", @@ -55,8 +55,8 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "88.0.4324.150-1", - "sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y" + "rev": "88.0.4324.182-1", + "sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay" } } } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2862e4df796..9845491f235 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" ]; - buildFlags = [ "CC=cc" ]; # fix build on darwin + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix build on darwin meta = with lib; { homepage = "https://github.com/matrix-org/purple-matrix"; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index f4e2db01fbc..e15cac60295 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "HSTDIR=${htslib}" "prefix=$(out)" - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" ]; preCheck = '' diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 22883cc522f..28a21522c6b 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "INSTALLDIR=$(out)/bin" ]; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 587568f8c29..1a2835932c6 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" ''; - buildFlags = [ "CC=cc" "CXX=c++" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ]; installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ gmp mpir cddlib ]; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 679b29cb062..588df51554a 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ECM = if ecm == null then "0" else "1"; # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too - makeFlags = [ "CC=cc" "all" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "all" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index eed1c8e3fd4..14330b0f19b 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 3aaa465a3cc..f060a7b2e5a 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -248,10 +248,10 @@ in stdenv.mkDerivation { # Need these tools on the build system when cross compiling, # hacky, but have found no other way. preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" - CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" ''; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 695109fd8a4..1d84da72c94 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -40,13 +40,8 @@ buildGoPackage rec { installPhase = '' install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] - ''; - - # completion installed separately so it can be overridden in docker - # can be moved to installPhase when docker uses containerd >= 1.4 - postInstall = '' - installShellFiles --bash contrib/autocomplete/ctr - installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + installShellCompletion --bash contrib/autocomplete/ctr + installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete ''; passthru.tests = { inherit (nixosTests) docker; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index e427a85d038..c201c55dcea 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/install" "install" ''; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' runHook preInstall diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 98a6b9877d1..82dd336e5e5 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=cc AR=ar zic + make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 2720ad6cf0b..3060e6d4e56 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -11,9 +11,9 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + version = "1.14.15"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.15"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; @@ -258,5 +258,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; + knownVulnerabilities = [ + "Support for Go 1.14 ended with the release of Go 1.16: https://golang.org/doc/devel/release.html#policy" + ]; }; } diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 284ddd6451e..13263104056 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -11,9 +11,9 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + version = "1.15.8"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.8"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 15e1279eba8..8267e9745dc 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -11,9 +11,9 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + version = "1.16"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix deleted file mode 100644 index ec3fd97da9b..00000000000 --- a/pkgs/development/compilers/go/1.4.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross -, pkg-config -, pcre -, Security }: - -let - libc = if stdenv ? cross then libcCross else stdenv.cc.libc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.4-bootstrap-${builtins.substring 0 7 revision}"; - revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6"; - - src = fetchurl { - url = "https://github.com/golang/go/archive/${revision}.tar.gz"; - sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre ]; - depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; - - hardeningDisable = [ "all" ]; - - # The tests try to do stuff with 127.0.0.1 and localhost - __darwinAllowLocalNetworking = true; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go - patchShebangs ./ # replace /bin/bash - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - '' + lib.optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - # Find the loader dynamically - LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)" - - # Replace references to the loader - find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; - ''; - - patches = [ - ./remove-tools-1.4.patch - ]; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.hostPlatform.system == "i686-linux" then "386" - else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if stdenv.isAarch32 then "arm" - else throw "Unsupported system"; - GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 0; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - ''; - - meta = with lib; { - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 8b8df28e1b6..2bdf6a4950c 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -11,9 +11,7 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix new file mode 100644 index 00000000000..9a0dc343546 --- /dev/null +++ b/pkgs/development/compilers/go/binary.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, version, hashes }: +let + toGoKernel = platform: + if platform.isDarwin then "darwin" + else platform.parsed.kernel.name; + + toGoCPU = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}"); + + toGoPlatform = platform: "${toGoKernel platform}-${toGoCPU platform}"; + + platform = toGoPlatform stdenv.hostPlatform; +in +stdenv.mkDerivation rec { + name = "go-${version}-${platform}-bootstrap"; + + src = fetchurl { + url = "https://golang.org/dl/go${version}.${platform}.tar.gz"; + sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}"); + }; + + # We must preserve the signature on Darwin + dontStrip = stdenv.hostPlatform.isDarwin; + + installPhase = '' + mkdir -p $out/share/go $out/bin + mv bin/* $out/bin + cp -r . $out/share/go + ${lib.optionalString stdenv.isLinux ('' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/go + '')} + '' ; +} diff --git a/pkgs/development/compilers/go/bootstrap.nix b/pkgs/development/compilers/go/bootstrap.nix index 12ef9a25a4e..71573b0bdd2 100644 --- a/pkgs/development/compilers/go/bootstrap.nix +++ b/pkgs/development/compilers/go/bootstrap.nix @@ -1,17 +1,15 @@ -{ stdenv, srcOnly, fetchurl, callPackage, Security }: - -let -go_bootstrap = if stdenv.isAarch64 then - srcOnly { - name = "go-1.8-linux-arm64-bootstrap"; - src = fetchurl { - url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; - sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; - }; - } -else - callPackage ./1.4.nix { - inherit Security; +{ callPackage }: +callPackage ./binary.nix { + version = "1.16"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8"; + darwin-arm64 = "4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810"; + linux-386 = "ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa"; + linux-amd64 = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"; + linux-arm64 = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098"; + linux-armv6l = "d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd"; + linux-ppc64le = "27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6"; + linux-s390x = "be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe"; }; -in - go_bootstrap +} diff --git a/pkgs/development/compilers/go/print-hashes.sh b/pkgs/development/compilers/go/print-hashes.sh new file mode 100755 index 00000000000..97be7d189ad --- /dev/null +++ b/pkgs/development/compilers/go/print-hashes.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -euo pipefail + +BASEURL=https://golang.org/dl/ +VERSION=${1:-} + +if [[ -z $VERSION ]] +then + echo "No version supplied" + exit -1 +fi + +curl -s "${BASEURL}?mode=json&include=all" | \ + jq '.[] | select(.version == "go'${VERSION}'")' | \ + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' diff --git a/pkgs/development/compilers/go/remove-tools-1.4.patch b/pkgs/development/compilers/go/remove-tools-1.4.patch deleted file mode 100644 index 807ab8e089c..00000000000 --- a/pkgs/development/compilers/go/remove-tools-1.4.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go -index 3b511b1..a46ebd8 100644 ---- a/misc/makerelease/makerelease.go -+++ b/misc/makerelease/makerelease.go -@@ -65,9 +65,6 @@ const ( - // These must be the command that cmd/go knows to install to $GOROOT/bin - // or $GOROOT/pkg/tool. - var toolPaths = []string{ -- "golang.org/x/tools/cmd/cover", -- "golang.org/x/tools/cmd/godoc", -- "golang.org/x/tools/cmd/vet", - } - - var preBuildCleanFiles = []string{ -diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c -index b6c61b4..2006bc2 100644 ---- a/src/cmd/dist/build.c -+++ b/src/cmd/dist/build.c -@@ -210,7 +210,9 @@ init(void) - workdir = xworkdir(); - xatexit(rmworkdir); - -- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); -+ xgetenv(&b, "GOTOOLDIR"); -+ if (b.len == 0) -+ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); - tooldir = btake(&b); - - bfree(&b); -diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go -index b71feb7..8468ea8 100644 ---- a/src/cmd/go/pkg.go -+++ b/src/cmd/go/pkg.go -@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{ - "cmd/pack": toTool, - "cmd/pprof": toTool, - "cmd/yacc": toTool, -- "golang.org/x/tools/cmd/cover": toTool, -- "golang.org/x/tools/cmd/godoc": toBin, -- "golang.org/x/tools/cmd/vet": toTool, -+ "nixos.org/x/tools/cmd/cover": toTool, -+ "nixos.org/x/tools/cmd/godoc": toBin, -+ "nixos.org/x/tools/cmd/vet": toTool, - "code.google.com/p/go.tools/cmd/cover": stalePath, - "code.google.com/p/go.tools/cmd/godoc": stalePath, - "code.google.com/p/go.tools/cmd/vet": stalePath, -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 311ecb0..f151d8f 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1367,7 +1367,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 6cc5df8..9a9a964 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -152,6 +152,17 @@ func GOROOT() string { - return defaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index ec8fa793cfd..f6d2053f315 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp perl ]; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; src = fetchurl { url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index d8d141a5e56..2471910fdb5 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; # tests are run as part of the compilation process doCheck = false; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f03f4a6dcc0..2f3ea3a4533 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1408,7 +1408,12 @@ self: super: { # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = dontCheck super.haskell-language-server; + haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) { + # 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update + preConfigure = '' + substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0" + ''; + }; # 2021-02-08: Jailbreaking because of # https://github.com/haskell/haskell-language-server/issues/1329 @@ -1502,6 +1507,8 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; + hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; }); + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; @@ -1581,4 +1588,7 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; + + # Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8 + yarn-lock = doJailbreak super.yarn-lock; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index c162740b8d7..60d3f423246 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -92,11 +92,4 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - - # Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3. - # https://github.com/agda/agda/issues/5109 - Agda = appendPatch super.Agda (pkgs.fetchpatch { - url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch"; - sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3"; - }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e03c9425ed2..e0fde52b017 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -75,8 +75,10 @@ default-package-overrides: - gi-gdkx11 < 4 - ghcide < 0.7.4 # for hls 0.9.0 - hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0 + - hls-plugin-api < 0.7.1.0 # for hls 0.9.0 + - hls-retrie-plugin < 0.1.1.1 # for hls 0.9.0 - # Stackage Nightly 2021-02-10 + # Stackage Nightly 2021-02-12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -211,38 +213,38 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0.1 - - amqp-utils ==0.4.4.1 + - amqp-utils ==0.4.5.0 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 + - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - ap-normalize ==0.1.0.0 + - app-settings ==0.2.0.12 - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.9.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 - - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.2 - - ascii-case ==1.0.0.2 - - ascii-char ==1.0.0.6 - - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.2 - - ascii-predicates ==1.0.0.2 + - ascii ==1.0.1.4 + - ascii-case ==1.0.0.4 + - ascii-char ==1.0.0.8 + - ascii-group ==1.0.0.4 + - ascii-predicates ==1.0.0.4 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.2 - - ascii-th ==1.0.0.2 + - ascii-superset ==1.0.1.4 + - ascii-th ==1.0.0.4 + - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -258,7 +260,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atomic-primops ==0.8.4 - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.4 + - attoparsec ==0.13.2.5 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 @@ -270,8 +272,8 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.20 - auto-update ==0.1.6 + - autoexporter ==1.1.20 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 @@ -279,6 +281,11 @@ default-package-overrides: - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.3.0 @@ -292,12 +299,7 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - basement ==0.0.11 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -310,8 +312,8 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.10 - bimap ==0.4.0 - - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 + - bimaps ==0.1.0.2 - bin ==0.1 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 @@ -331,8 +333,8 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 + - bitset-word8 ==0.1.1.2 - bitvec ==1.0.3.0 - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 @@ -358,8 +360,8 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.3 - - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 + - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 @@ -377,10 +379,10 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byteable ==0.1.1 - byte-count-reader ==0.10.1.2 - - bytedump ==1.0 - byte-order ==0.1.2.0 + - byteable ==0.1.1 + - bytedump ==1.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -396,6 +398,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 + - ca-province-codes ==1.0.0.0 - cabal-appimage ==0.3.0.2 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 @@ -408,13 +411,12 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 - - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 + - cased ==0.1.0.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -475,12 +477,12 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - - code-page ==0.2.1 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 + - code-page ==0.2.1 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -527,8 +529,8 @@ default-package-overrides: - conferer-aeson ==1.0.0.0 - conferer-hspec ==1.0.0.0 - conferer-warp ==1.0.0.0 - - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 + - ConfigFile ==1.1.4 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -536,8 +538,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraints ==0.12 - constraint-tuples ==0.1.2 + - constraints ==0.12 - construct ==0.3 - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 @@ -565,8 +567,13 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.2 - crypto-enigma ==0.1.1.6 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - cryptocompare ==0.1.2 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -575,11 +582,6 @@ default-package-overrides: - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -604,7 +606,7 @@ default-package-overrides: - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.4 + - data-ascii ==1.0.0.6 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 @@ -616,7 +618,6 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 - - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.3.1 @@ -635,6 +636,7 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 + - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -653,8 +655,8 @@ default-package-overrides: - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.2.2 + - deriveJsonNoPrefix ==0.1.0.1 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.10 @@ -663,17 +665,17 @@ default-package-overrides: - dhall-json ==1.7.5 - dhall-lsp-server ==1.0.13 - dhall-yaml ==1.2.5 + - di-core ==1.0.4 + - di-monad ==1.3.1 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 - - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - di-monad ==1.3.1 - - directory-tree ==0.12.1 - direct-sqlite ==2.3.26 + - directory-tree ==0.12.1 - dirichlet ==0.1.0.2 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -685,6 +687,8 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - doctemplates ==0.9 @@ -693,8 +697,6 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dot ==0.3 - dotenv ==0.8.0.7 - dotgen ==0.4.3 @@ -734,10 +736,10 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 - - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 + - elm2nix ==0.2.1 - elynx ==0.5.0.1 - elynx-markov ==0.5.0.1 - elynx-nexus ==0.5.0.1 @@ -749,9 +751,9 @@ default-package-overrides: - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 + - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 - - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envparse ==0.4.1 - envy ==2.1.0.0 @@ -773,25 +775,25 @@ default-package-overrides: - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 + - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 - - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 + - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 + - exp-pairs ==0.2.1.0 - experimenter ==0.1.0.4 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -818,10 +820,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - filelock ==0.1.1.5 - - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 + - filelock ==0.1.1.5 + - filemanip ==0.3.6.3 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -851,9 +853,9 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 - - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 + - foldable1 ==0.1.0.0 - foldl ==1.4.10 - folds ==0.7.5 - follow-file ==0.0.3 @@ -867,10 +869,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.5 - free-categories ==0.2.0.2 + - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 - - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -886,8 +888,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.0 - fuzzy-time ==0.1.0.0 + - fuzzyset ==0.2.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -903,8 +905,8 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - GenericPretty ==1.2.2 - generic-random ==1.3.0.1 + - GenericPretty ==1.2.2 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 @@ -938,9 +940,6 @@ default-package-overrides: - ghc-core ==0.5.6 - ghc-events ==0.15.1 - ghc-exactprint ==0.6.3.4 - - ghcid ==0.8.7 - - ghci-hexcalc ==0.1.1.0 - - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.10.4.20210206 - ghc-lib-parser ==8.10.4.20210206 - ghc-lib-parser-ex ==8.10.0.19 @@ -952,9 +951,12 @@ default-package-overrides: - ghc-tcplugins-extra ==0.4.1 - ghc-trace-events ==0.1.2.1 - ghc-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.4 + - ghc-typelits-knownnat ==0.7.5 - ghc-typelits-natnormalise ==0.7.3 - ghc-typelits-presburger ==0.5.2.0 + - ghci-hexcalc ==0.1.1.0 + - ghcid ==0.8.7 + - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -972,9 +974,10 @@ default-package-overrides: - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 + - gi-pango ==1.0.23 + - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - github-release ==1.3.6 @@ -983,7 +986,6 @@ default-package-overrides: - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 - - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -998,14 +1000,14 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 + - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 - - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.2.0.0 - - greskell-core ==0.1.3.5 + - greskell ==1.2.0.1 + - greskell-core ==0.1.3.6 - greskell-websocket ==0.1.2.5 - groom ==0.1.2.1 - group-by-date ==0.1.0.4 @@ -1086,9 +1088,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 + - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - hie-bios ==0.7.2 - - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1127,15 +1129,16 @@ default-package-overrides: - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 + - hs-php-session ==0.0.9.3 + - hsass ==0.8.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1163,13 +1166,12 @@ default-package-overrides: - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.5 + - hspec-need-env ==0.1.0.6 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 - - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1183,7 +1185,6 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1195,13 +1196,14 @@ default-package-overrides: - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 - - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 + - http2 ==2.0.5 + - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1214,7 +1216,6 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 - - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1239,6 +1240,7 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 + - hweblib ==0.6.3 - hxt ==9.3.1.21 - hxt-charproperties ==9.5.0.0 - hxt-css ==0.1.0.3 @@ -1322,13 +1324,13 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - iterable ==3.0 - it-has ==0.2.0.0 + - iterable ==3.0 + - ix-shapable ==0.1.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 - - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 @@ -1339,9 +1341,9 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.12 - - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 + - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1420,9 +1422,9 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 + - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 - - lift-generics ==0.2 - line ==4.0.1 - linear ==1.21.4 - linear-circuit ==0.1.0.2 @@ -1431,11 +1433,11 @@ default-package-overrides: - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 - - ListLike ==4.7.4 - list-predicate ==0.1.0.1 - - listsafe ==0.1.0.1 - list-singleton ==1.0.0.5 - list-t ==1.0.4 + - ListLike ==4.7.4 + - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1468,8 +1470,8 @@ default-package-overrides: - machines ==0.7.1 - magic ==1.1 - magico ==0.0.2.1 - - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 + - mainland-pretty ==0.7.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 @@ -1481,9 +1483,9 @@ default-package-overrides: - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - massiv-test ==0.1.6.1 - - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 + - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1495,9 +1497,9 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.4.0.0 - mcmc-types ==1.0.3 + - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1526,12 +1528,12 @@ default-package-overrides: - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 + - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 - - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1543,8 +1545,8 @@ default-package-overrides: - mmark-ext ==0.2.1.2 - mmorph ==1.1.4 - mnist-idx ==0.1.2.8 - - mockery ==0.3.5 - mock-time ==0.1.0 + - mockery ==0.3.5 - mod ==0.1.2.1 - model ==0.5 - modern-uri ==0.3.3.1 @@ -1554,9 +1556,7 @@ default-package-overrides: - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.1.0.0 @@ -1565,26 +1565,28 @@ default-package-overrides: - monad-memo ==0.5.3 - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 + - monad-parallel ==0.7.2.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 + - monadic-arrays ==0.2.2 + - monadlist ==0.0.2 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 + - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1597,14 +1599,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multiarg ==0.30.0.10 - multi-containers ==0.1.1 + - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 - murmur-hash ==0.1.0.9 + - murmur3 ==1.0.4 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1652,16 +1654,16 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 + - no-value ==1.0.0.0 + - non-empty ==0.3.2 + - non-empty-sequence ==0.2.0.4 + - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 - - non-negative ==0.1.2 + - nonemptymap ==0.0.6.0 - not-gloss ==0.7.7.0 - - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.3 @@ -1677,9 +1679,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 + - o-clock ==1.2.0.1 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 - - o-clock ==1.2.0.1 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1692,9 +1694,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 + - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.1.0 - - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1758,10 +1760,10 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.0 - pcg-random ==0.1.3.7 - - pcre2 ==1.1.4 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 + - pcre2 ==1.1.4 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 @@ -1784,12 +1786,12 @@ default-package-overrides: - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 - pg-harness-client ==0.6.0 - - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 + - pgp-wordlist ==0.1.0.3 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 - - pipes ==4.3.14 + - pipes ==4.3.15 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1824,6 +1826,7 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 + - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 @@ -1832,28 +1835,27 @@ default-package-overrides: - postgresql-simple ==0.6.4 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 - - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 - - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-diff ==0.2.0.3 - pretty-hex ==1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 + - prettyclass ==1.0.0.0 - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 @@ -1867,14 +1869,20 @@ default-package-overrides: - product-profunctors ==0.11.0.2 - profiterole ==0.1 - profunctors ==5.5.2 - - projectroot ==0.2.0.1 - project-template ==0.2.1.0 + - projectroot ==0.2.0.1 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 + - proto-lens ==0.7.0.0 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1882,12 +1890,6 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.0.0 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1934,37 +1936,38 @@ default-package-overrides: - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 + - Ranged-sets ==0.4.0 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.13 - rate-limit ==1.4.2 + - ratel ==1.0.13 - ratel-wai ==1.1.4 - rattle ==0.2 + - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 - - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 + - readable ==0.3.1 - reanimate ==1.1.3.2 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 - record-hasfield ==1.0 - - records-sop ==0.1.0.3 - record-wrangler ==0.1.1.0 + - records-sop ==0.1.0.3 - recursion-schemes ==5.2.1 - reducers ==3.12.3 - - refact ==0.3.0.2 - ref-fd ==0.4.0.2 + - ref-tf ==0.4.0.2 + - refact ==0.3.0.2 - refined ==0.6.2 - reflection ==2.1.6 - reform ==0.2.7.4 @@ -1972,7 +1975,6 @@ default-package-overrides: - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 - - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 @@ -2030,15 +2032,15 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 - - safecopy ==0.10.3.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 - - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - safe-money ==0.9 - - SafeSemaphore ==0.10.1 - safe-tensor ==0.2.1.0 + - safecopy ==0.10.3.1 + - safeio ==0.0.5.0 + - SafeSemaphore ==0.10.1 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 @@ -2076,8 +2078,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.5 - semigroups ==0.19.1 - - semirings ==0.6 - semiring-simple ==1.0.0.1 + - semirings ==0.6 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2123,9 +2125,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 + - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - shortcut-links ==0.5.1.1 @@ -2196,16 +2198,16 @@ default-package-overrides: - splitmix ==0.1.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 + - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 - - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 + - stackcollapse-ghc ==0.0.1.3 - stateref ==0.3 - StateVar ==1.2.1 - static-text ==0.2.0.6 @@ -2220,8 +2222,8 @@ default-package-overrides: - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.4 - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.5 - stm-split ==0.0.2.1 + - STMonadTrans ==0.4.5 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 @@ -2242,7 +2244,6 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 - - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 @@ -2250,8 +2251,9 @@ default-package-overrides: - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - string-random ==0.1.4.0 - - stringsearch ==0.3.6.6 - string-transform ==1.1.1 + - stringbuilder ==0.5.1 + - stringsearch ==0.3.6.6 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 @@ -2276,10 +2278,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 + - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.3 - tagchup ==0.4.1.1 @@ -2346,7 +2348,6 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2357,8 +2358,9 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.11 - - tfp ==1.0.1.1 + - textlocal ==0.1.0.5 - tf-random ==0.5 + - tfp ==1.0.1.1 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1.1 @@ -2366,10 +2368,6 @@ default-package-overrides: - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2377,33 +2375,37 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - thread-hierarchy ==0.3.0.2 - - thread-local-storage ==0.2 - - threads ==0.5.1.6 - - thread-supervisor ==0.2.0.0 - - threepenny-gui ==0.9.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 - - throttle-io-stream ==0.2.0.1 - - through-text ==0.1.0.0 - - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - th-test-utils ==1.1.0 - th-utilities ==0.2.4.1 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 + - thread-hierarchy ==0.3.0.2 + - thread-local-storage ==0.2 + - thread-supervisor ==0.2.0.0 + - threads ==0.5.1.6 + - threepenny-gui ==0.9.0.0 + - throttle-io-stream ==0.2.0.1 + - through-text ==0.1.0.0 + - throwable-exceptions ==0.1.0.9 - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - time-compat ==1.9.5 - - timeit ==2.0 - - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - timerep ==2.0.1.0 - - timer-wheel ==0.3.0 - time-units ==1.0.0 + - timeit ==2.0 + - timelens ==0.2.0.2 + - timer-wheel ==0.3.0 + - timerep ==2.0.1.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2439,14 +2441,10 @@ default-package-overrides: - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 + - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 - - typecheck-plugin-nat-simple ==0.1.0.2 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2456,12 +2454,16 @@ default-package-overrides: - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - - type-natural ==1.0.0.0 + - type-natural ==1.1.0.0 - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 + - typecheck-plugin-nat-simple ==0.1.0.2 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 + - typerep-map ==0.3.3.0 - tzdata ==0.2.20201021.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 @@ -2602,18 +2604,18 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.5 - - witherable-class ==0 - - within ==0.2.0.1 - with-location ==0.1.0 - with-utf8 ==1.0.2.1 + - witherable-class ==0 + - within ==0.2.0.1 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word24 ==2.0.1 - - word8 ==0.1.3 - word-trie ==0.3.0 - word-wrap ==0.4.1 + - word24 ==2.0.1 + - word8 ==0.1.3 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.3 @@ -2640,7 +2642,6 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 @@ -2650,6 +2651,7 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 + - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.3 @@ -2657,11 +2659,12 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 + - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 - yesod-auth-oauth2 ==0.6.1.7 - - yesod-bin ==1.6.0.6 + - yesod-bin ==1.6.1 - yesod-core ==1.6.18.8 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 @@ -2674,7 +2677,6 @@ default-package-overrides: - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - yesod-websockets ==0.3.0.2 - - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2689,9 +2691,9 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.7.0 - zip-archive ==0.4.1 + - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - zippers ==0.3 - - zip-stream ==0.2.0.1 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2808,6 +2810,33 @@ package-maintainers: - zre utdemir: - nix-tree + turion: + - rhine + - rhine-gloss + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck + - Agda + - dunai + - finite-typelits + - pulse-simple + - simple-affine-space + sternenseemann: + # also maintain upstream package + - spacecookie + - gopher-proxy + # other packages I can help out for + - systemd + - fast-logger + - Euterpea2 + - utc + - socket + - gitit + - yarn-lock + - yarn2nix + poscat: + - hinit unsupported-platforms: alsa-mixer: [ x86_64-darwin ] @@ -6418,7 +6447,6 @@ broken-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hinit - hinquire - hinstaller - hint-server @@ -6954,6 +6982,7 @@ broken-packages: - iban - ical - iCalendar + - ice40-prim - IcoGrid - iconv-typed - ide-backend @@ -7329,7 +7358,6 @@ broken-packages: - keyvaluehash - keyword-args - khph - - ki - kicad-data - kickass-torrents-dump-parser - kickchan @@ -9400,7 +9428,6 @@ broken-packages: - regex-tdfa-pipes - regex-tdfa-quasiquoter - regex-tdfa-rc - - regex-tdfa-text - regex-tdfa-unittest - regex-tdfa-utf8 - regex-tre @@ -11460,7 +11487,6 @@ broken-packages: - xml-conduit-stylist - xml-enumerator - xml-enumerator-combinators - - xml-extractors - xml-html-conduit-lens - xml-monad - xml-parsec @@ -11539,8 +11565,6 @@ broken-packages: - yandex-translate - yaop - yap - - yarn-lock - - yarn2nix - yarr - yarr-image-io - yavie diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 4e23ab80c1b..21aa86ee5a4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -207,6 +207,7 @@ self: super: builtins.intersectAttrs super { network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw + pixiv = dontCheck super.pixiv; raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw scotty-binding-play = dontCheck super.scotty-binding-play; @@ -226,6 +227,7 @@ self: super: builtins.intersectAttrs super { http-client-tls = dontCheck super.http-client-tls; http-conduit = dontCheck super.http-conduit; transient-universe = dontCheck super.transient-universe; + telegraph = dontCheck super.telegraph; typed-process = dontCheck super.typed-process; js-jquery = dontCheck super.js-jquery; hPDB-examples = dontCheck super.hPDB-examples; @@ -806,4 +808,8 @@ self: super: builtins.intersectAttrs super { # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); + + # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. + # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b + hadolint = disableCabalFlag super.hadolint "static"; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6928bba47fa..b4fcf554bbf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -824,7 +824,7 @@ self: { description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ abbradar ]; + maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; "Agda-executable" = callPackage @@ -17052,15 +17052,15 @@ self: { "Rattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim - , simple-affine-space + , simple-affine-space, transformers }: mkDerivation { pname = "Rattus"; - version = "0.4"; - sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1"; + version = "0.5"; + sha256 = "1dh6ln8awqhgnk7hqh4zdkv4pqy3wmsqbmqrd016raf8vjbc1i3m"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc ghc-prim simple-affine-space + base containers ghc ghc-prim simple-affine-space transformers ]; testHaskellDepends = [ base containers ]; description = "A modal FRP language"; @@ -20805,8 +20805,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.12"; - sha256 = "0j46hhwfqbry6w8l8wj0p486rsyvxkk6dbvhd1sjkha6cy5cvar4"; + version = "0.4"; + sha256 = "1v4m9b13p0sf3gs8qvdgkai4r9kb6sszw2qdyxrn6i4nq62f19zq"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21177,12 +21177,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_11_0_0" = callPackage + "Win32_2_11_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.11.0.0"; - sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm"; + version = "2.11.1.0"; + sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -21983,16 +21983,18 @@ self: { "Z-IO" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hashable - , hspec, hspec-discover, HUnit, primitive, QuickCheck + , hspec, hspec-discover, HUnit, microlens, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time , unordered-containers, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.6.1.0"; - sha256 = "0m0qvamvixxm9yd45393j44mnnlnw2672gcdv7kaqw4hjczlddmq"; + version = "0.6.2.0"; + sha256 = "0d004yi1i45ccqhl4vqw6h4qxav693vas359gs76bz04wdbqgrah"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base containers exceptions primitive stm time unix-time + base containers exceptions microlens primitive stm time unix-time unordered-containers Z-Data ]; libraryToolDepends = [ hspec-discover ]; @@ -24399,6 +24401,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson_1_5_6_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, data-fix, deepseq, Diff, directory, dlist + , filepath, generic-deriving, ghc-prim, hashable, hashable-time + , integer-logarithms, primitive, QuickCheck, quickcheck-instances + , scientific, strict, tagged, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-abstraction, these + , time, time-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.5.6.0"; + sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers + data-fix deepseq dlist ghc-prim hashable primitive scientific + strict tagged template-haskell text th-abstraction these time + time-compat unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers data-fix Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific strict tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + these time time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -24505,6 +24540,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-combinators_0_0_4_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, doctest, fail, hspec, scientific, text, time + , time-compat, unordered-containers, utf8-string, uuid-types + , vector, void + }: + mkDerivation { + pname = "aeson-combinators"; + version = "0.0.4.1"; + sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg"; + libraryHaskellDepends = [ + aeson base bytestring containers fail scientific text time + time-compat unordered-containers uuid-types vector void + ]; + testHaskellDepends = [ + aeson base bytestring doctest hspec text utf8-string + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq text + ]; + description = "Aeson combinators for dead simple JSON decoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-commit" = callPackage ({ mkDerivation, aeson, aeson-qq, base, mtl, tasty, tasty-hspec , text @@ -29602,8 +29662,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.4.1"; - sha256 = "1vs0p7pc6z9mfjd2vns66wnhl8v1n9rbgabyjw0v832m2pwizzmj"; + version = "0.4.5.0"; + sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29615,15 +29675,15 @@ self: { license = lib.licenses.gpl3; }) {}; - "amqp-utils_0_4_5_0" = callPackage + "amqp-utils_0_4_5_1" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers , data-default-class, directory, hinotify, magic, network, process , text, time, tls, unix, utf8-string, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.4.5.0"; - sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; + version = "0.4.5.1"; + sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -31874,10 +31934,10 @@ self: { }: mkDerivation { pname = "approx"; - version = "0.1.0.0"; - sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2"; + version = "0.1.0.1"; + sha256 = "0vzi0ai7lf7ji2lbf9v412fvrins7acy0dqs4j8ylfd1chck1w99"; revision = "1"; - editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1"; + editedCabalFile = "0kj9qqfv8fzg5b6l33avflxjlmd52wjsjridff1d5n071dnif37y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31890,7 +31950,7 @@ self: { base containers hashable QuickCheck text time unordered-containers vector ]; - description = "Easy-to-use reasonable way of emulating approximate in Haskell"; + description = "Easy-to-use emulation of approximate, ranges and tolerances in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -31949,6 +32009,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "approximate_0_3_3" = callPackage + ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq + , ghc-prim, hashable, lens, log-domain, pointed, safecopy + , semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "approximate"; + version = "0.3.3"; + sha256 = "1hvgx5m83zzpy2l0bbs39yvybhsxlq9919hp7wn27n5j0lk7wplk"; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq ghc-prim hashable lens + log-domain pointed safecopy semigroupoids semigroups vector + ]; + description = "Approximate discrete values and numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "approximate-equality" = callPackage ({ mkDerivation, base, type-level-natural-number }: mkDerivation { @@ -33295,23 +33373,6 @@ self: { }) {}; "ascii" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-group - , ascii-predicates, ascii-superset, ascii-th, base, bytestring - , data-ascii, text - }: - mkDerivation { - pname = "ascii"; - version = "1.0.1.2"; - sha256 = "051q0gamgvgd4j1bzqxww7qy4syx21s0vqhfihwlb2ypxf2s2fqa"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-group ascii-predicates ascii-superset - ascii-th base bytestring data-ascii text - ]; - description = "The ASCII character set and encoding"; - license = lib.licenses.asl20; - }) {}; - - "ascii_1_0_1_4" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group , ascii-predicates, ascii-superset, ascii-th, base, bytestring , data-ascii, text @@ -33326,7 +33387,6 @@ self: { ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-art-to-unicode" = callPackage @@ -33345,17 +33405,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.2"; - sha256 = "1qs1rccslixsg4szgp7y98sqhhn0asp9qmk9vfrwdjfipmf3z72p"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33364,21 +33413,9 @@ self: { libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.6"; - sha256 = "049xccazgjb1zzqbzpgcw77hsl5j3j8l7f0268wxjy87il3wfnx3"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_8" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33387,7 +33424,6 @@ self: { libraryHaskellDepends = [ base hashable ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33418,17 +33454,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.2"; - sha256 = "19l50ksqa7jdsl0pmrmy8q8jbgmb1j3hr63jjzys220f0agsgcwr"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33437,7 +33462,6 @@ self: { libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33456,17 +33480,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.2"; - sha256 = "0dzrxqhq7vqplg4aanc4kindwpizv3d777ri81sj1m1zn3vzvrrq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33475,7 +33488,6 @@ self: { libraryHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33523,19 +33535,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.2"; - sha256 = "0hx5kh6h239hqrnqyda55769jfbxjxcr4mihya1djl7ls1fy493v"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_4" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33546,7 +33545,6 @@ self: { ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33568,20 +33566,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.2"; - sha256 = "1dmr2g4kx14qad62awk4pv3izx5gm8bmzvs03gn3xrbzssjb8pvc"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell }: mkDerivation { @@ -33593,7 +33577,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -33816,8 +33799,8 @@ self: { pname = "asn1-encoding"; version = "0.9.6"; sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"; - revision = "1"; - editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n"; + revision = "2"; + editedCabalFile = "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -33992,6 +33975,8 @@ self: { pname = "assoc"; version = "1.0.2"; sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q"; + revision = "1"; + editedCabalFile = "17ycclzwnysca80frsyyb6sdd2r5p83lkgwxjjnjg6j62pvf8958"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -34222,6 +34207,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "async_2_2_3" = callPackage + ({ mkDerivation, base, hashable, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.2.3"; + sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable stm ]; + testHaskellDepends = [ + base HUnit stm test-framework test-framework-hunit + ]; + description = "Run IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -34996,36 +35000,6 @@ self: { }) {}; "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.2.4"; - sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; - revision = "1"; - editedCabalFile = "0jlipzz2b1jb8yw22rvnhvbnadzcdf3wkwn4svl3j4m6858s0har"; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - description = "Fast combinator parsing for bytestrings and text"; - license = lib.licenses.bsd3; - }) {}; - - "attoparsec_0_13_2_5" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -35051,7 +35025,6 @@ self: { ]; description = "Fast combinator parsing for bytestrings and text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -40578,8 +40551,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "4"; - editedCabalFile = "07jwyndphnfr20ihagncpl8rr7i62hxf0b9m2bdahyzvz0yzdsl2"; + revision = "5"; + editedCabalFile = "1h2d37szfrcwn9rphnijn4q9l947b0wwqjs1aqmm62xkhbad7jf6"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -42782,6 +42755,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "bits_0_5_3" = callPackage + ({ mkDerivation, base, bytes, mtl, transformers }: + mkDerivation { + pname = "bits"; + version = "0.5.3"; + sha256 = "0avcm2635nvgghr7nbci66s4l5q4k6ag81hla1xai58b159anyq0"; + libraryHaskellDepends = [ base bytes mtl transformers ]; + description = "Various bit twiddling and bitwise serialization primitives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bits-atomic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47313,6 +47298,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytes_0_17_1" = callPackage + ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal + , containers, hashable, mtl, scientific, text, time, transformers + , transformers-compat, unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.17.1"; + sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; + libraryHaskellDepends = [ + base binary binary-orphans bytestring cereal containers hashable + mtl scientific text time transformers transformers-compat + unordered-containers void + ]; + description = "Sharing code for serialization between binary and cereal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -47376,15 +47380,23 @@ self: { broken = true; }) {}; - "bytestring_0_11_0_0" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: + "bytestring_0_11_1_0" = callPackage + ({ mkDerivation, base, deepseq, dlist, ghc-prim, integer-gmp + , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , transformers + }: mkDerivation { pname = "bytestring"; - version = "0.11.0.0"; - sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj"; - revision = "1"; - editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr"; + version = "0.11.1.0"; + sha256 = "1a29kwczd1hcpir691x936i9c5ys9d7m1lyby48djs9w54ksy1jw"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; + testHaskellDepends = [ + base deepseq dlist ghc-prim tasty tasty-hunit tasty-quickcheck + transformers + ]; + benchmarkHaskellDepends = [ + base deepseq dlist random tasty-bench + ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -50659,8 +50671,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.10.0.0"; - sha256 = "054cy2rr2hg0brrbxff4my3q2fzr1qk7ik2xyip65dq54958ibqk"; + version = "0.10.0.1"; + sha256 = "1p5vx7gcswz08f790swb8pi2ckbphqr76j8gav4rvrbalscd3zvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51567,8 +51579,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "1"; - editedCabalFile = "1ph8rf91z4nf1ryrh9s4gd1kq98jlgk2manwddkpch8k0n9xvfk4"; + revision = "2"; + editedCabalFile = "1y08lhkh6c6421g3nwwkrrv3r36l75x9j2hnm5khagjpm5njjzma"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -53160,6 +53172,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "charset_0_3_8" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , unordered-containers + }: + mkDerivation { + pname = "charset"; + version = "0.3.8"; + sha256 = "1rw6y2insgljbi5l1nwqwv9v865sswjly9rvwipd8zajkgks7aks"; + libraryHaskellDepends = [ + array base bytestring containers unordered-containers + ]; + description = "Fast unicode character sets based on complemented PATRICIA tries"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "charsetdetect" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -57105,6 +57133,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "cmdargs_0_10_21" = callPackage + ({ mkDerivation, base, filepath, process, template-haskell + , transformers + }: + mkDerivation { + pname = "cmdargs"; + version = "0.10.21"; + sha256 = "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath process template-haskell transformers + ]; + description = "Command line argument processing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cmdargs-browser" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , http-types, js-jquery, process, text, transformers, wai @@ -57525,8 +57571,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.14"; - sha256 = "1vkjnyzcl44h9b24k1h5mz61gdz42bs64ifxwijx8a2a72mwmaa6"; + version = "0.1.3.17"; + sha256 = "1x289bmzrj1yrr934b51v3amldhjdanjv4kxnay89n8avix899yw"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58039,8 +58085,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.8.0.0"; - sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3"; + version = "0.9.0.0"; + sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59543,6 +59589,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "compensated_0_8_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , criterion, deepseq, distributive, hashable, lens, log-domain + , safecopy, semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "compensated"; + version = "0.8.2"; + sha256 = "0mqy5c5wh4m3l78fbd20vnllpsn383q07kxl6j62iakcyhr1264p"; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq distributive + hashable lens log-domain safecopy semigroupoids semigroups vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Compensated floating-point arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "competition" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -61869,14 +61934,15 @@ self: { , base-unicode-symbols, bytestring, Cabal, case-insensitive , deepseq, directory, dlist, filepath, mtl, network-uri , optparse-applicative, process, profunctors, semigroupoids - , semigroups, text, transformers, unordered-containers, yaml + , semigroups, text, transformers, unordered-containers, vector + , yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.5.0"; - sha256 = "0pgx2wzzqxgafgf3qjys05hp89lz4fwczsx0i581n8ngs3p4i0wh"; - revision = "1"; - editedCabalFile = "0srscnmj5dhaq0djx0lhcggl53ipn6pw8vgsvgzhhjrbmnn2zb2p"; + version = "0.6.0"; + sha256 = "1lncsh3dfl8iz1yr2b0mmpcdyww3cbr3jglp85iqmpvzv66m2kbg"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base bytestring Cabal directory filepath process ]; @@ -61885,8 +61951,9 @@ self: { bytestring Cabal case-insensitive deepseq directory dlist filepath mtl network-uri optparse-applicative process profunctors semigroupoids semigroups text transformers unordered-containers - yaml + vector yaml ]; + executableHaskellDepends = [ base base-unicode-symbols Cabal mtl ]; testHaskellDepends = [ base base-unicode-symbols bytestring Cabal mtl text transformers unordered-containers yaml @@ -62442,6 +62509,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_13" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13"; + sha256 = "143558jykvya7y8134dx30g6nh27q5s61nbq369p69igd1aayncj"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -65292,6 +65379,8 @@ self: { pname = "criterion"; version = "1.5.9.0"; sha256 = "0qhlylhra1d3vzk6miqv0gdrn10gw03bdwv8b4bfmdzgpf0zgqr1"; + revision = "1"; + editedCabalFile = "140444pqw65vsqpa168c13cljb66rdgvq41mxnvds296wxq2yz7i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -65315,6 +65404,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion-cmp" = callPackage + ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava + , containers, filepath, optparse-applicative, vector + }: + mkDerivation { + pname = "criterion-cmp"; + version = "0.1.0.0"; + sha256 = "0p9l9c89bg1n7xjdq3npvknlfb36gkvpgwhq7i0qd2g20ysdxppd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base boxes bytestring cassava containers filepath + optparse-applicative vector + ]; + description = "A simple tool for comparing in Criterion benchmark results"; + license = lib.licenses.bsd3; + }) {}; + "criterion-compare" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams , clay, colour, containers, data-default, filepath, lens, lucid @@ -68511,22 +68618,6 @@ self: { }) {}; "data-ascii" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , hashable, semigroups, text - }: - mkDerivation { - pname = "data-ascii"; - version = "1.0.0.4"; - sha256 = "17pb1kmqln7cswsc4c7xipq619aj2y0kjhrcm23r8b39c0g02scy"; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive hashable semigroups - text - ]; - description = "Type-safe, bytestring-based ASCII values"; - license = lib.licenses.bsd3; - }) {}; - - "data-ascii_1_0_0_6" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , hashable, semigroups, text }: @@ -68540,7 +68631,6 @@ self: { ]; description = "Type-safe, bytestring-based ASCII values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-aviary" = callPackage @@ -72034,6 +72124,29 @@ self: { license = lib.licenses.mit; }) {}; + "deferred-folds_0_9_16" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.16"; + sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -73617,8 +73730,8 @@ self: { pname = "dhall"; version = "1.38.0"; sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229"; - revision = "1"; - editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r"; + revision = "2"; + editedCabalFile = "13ppbn4kcrfls9fm9sqjwa4hb4nj8q6fqfxj3a62vck7qc1rbvn0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73660,6 +73773,8 @@ self: { pname = "dhall-bash"; version = "1.0.36"; sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; + revision = "1"; + editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73703,8 +73818,8 @@ self: { pname = "dhall-docs"; version = "1.0.4"; sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; - revision = "2"; - editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; + revision = "3"; + editedCabalFile = "116m74khdfx57ghrid1myqyj8acrhzhnjzjmxnsn3yghdan29797"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73770,8 +73885,8 @@ self: { pname = "dhall-json"; version = "1.7.5"; sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; - revision = "1"; - editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; + revision = "2"; + editedCabalFile = "0181ma0qzkcfg4g5fcyivmjfn542m9cmq74r6hxilfjvfzhk7fqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73821,8 +73936,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.13"; sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; - revision = "2"; - editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; + revision = "4"; + editedCabalFile = "04m040956j49qr8hzlj2jj101pjj6n0f5g5hhf5m73y1bww43ahf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73965,6 +74080,8 @@ self: { pname = "dhall-yaml"; version = "1.2.5"; sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf"; + revision = "1"; + editedCabalFile = "034rykrnmsnc9v9hsblkzjp26b8wv265sd31gwhqxy2358y4s33h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74669,6 +74786,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-solve_0_1_3" = callPackage + ({ mkDerivation, base, deepseq, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "diagrams-solve"; + version = "0.1.3"; + sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base deepseq tasty tasty-hunit tasty-quickcheck + ]; + description = "Pure Haskell solver routines used by diagrams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, filepath, hashable @@ -79255,6 +79389,18 @@ self: { broken = true; }) {}; + "drama" = callPackage + ({ mkDerivation, base, criterion, ki, transformers, unagi-chan }: + mkDerivation { + pname = "drama"; + version = "0.1.0.1"; + sha256 = "0ssmw1yci4369hvpdc5f4ng6s4m7m2lgn9sp6jbgj90izwg0px8w"; + libraryHaskellDepends = [ base ki transformers unagi-chan ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Simple actor library for Haskell"; + license = lib.licenses.bsd3; + }) {}; + "draw-poker" = callPackage ({ mkDerivation, base, random-shuffle, safe }: mkDerivation { @@ -80016,6 +80162,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "dunai-core" = callPackage @@ -81121,6 +81268,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "echo_0_1_4" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "echo"; + version = "0.1.4"; + sha256 = "0hqfdd4kvpp59cjjv790bkf72yqr9xjfqlbjcrdsc9a8j3r1pzn9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process ]; + description = "A cross-platform, cross-console way to handle echoing terminal input"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ecma262" = callPackage ({ mkDerivation, base, containers, data-default, lens, parsec, safe , transformers @@ -82991,6 +83152,25 @@ self: { broken = true; }) {}; + "elynx_0_5_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.5.0.2"; + sha256 = "1hky4amw78ciblr6alcxp79dshsc5wqswp16hbqdry132xps9dw3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -83013,6 +83193,28 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-markov_0_5_0_2" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.5.0.2"; + sha256 = "0wlcq3q26lgwixhsq1afz9i3phr2sncwc0r6m4adminh9m1zdr5z"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random primitive statistics vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec mwc-random vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -83025,6 +83227,19 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-nexus_0_5_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.5.0.2"; + sha256 = "1y7ndj216w58s85bfgp4vg7zi1asj6br68k000hy4a8cchjprlp9"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -83045,6 +83260,27 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-seq_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.5.0.2"; + sha256 = "11nl8gw05gvd6j7dflqzi21kixmm0jalpqv9x9f6bb7qwdv1xak2"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, fast-logger @@ -83067,6 +83303,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-tools_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, monad-control, monad-logger, mwc-random + , optparse-applicative, primitive, template-haskell, text, time + , transformers, transformers-base, vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.5.0.2"; + sha256 = "1q62f0b0fk6g2a4w5bbbpldv0awk7cn2q544xcxplanpr3fmaj8v"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 deepseq directory fast-logger hmatrix + monad-control monad-logger mwc-random optparse-applicative + primitive template-haskell text time transformers transformers-base + vector zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus @@ -83094,6 +83353,33 @@ self: { broken = true; }) {}; + "elynx-tree_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, deepseq, double-conversion, elynx-nexus + , elynx-tools, hspec, math-functions, microlens, mwc-random + , parallel, primitive, QuickCheck, statistics + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.5.0.2"; + sha256 = "1ywqbc80hq4dprzrrq9gyi7h2624i2mgpd43pv045dldh7dqhygn"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers deepseq + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics + ]; + testHaskellDepends = [ + attoparsec base bytestring containers elynx-tools hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion elynx-tools microlens mwc-random parallel + ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -84900,6 +85186,32 @@ self: { broken = true; }) {}; + "ersatz_0_4_9" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , data-default, fail, lens, mtl, parsec, process, semigroups + , temporary, transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.9"; + sha256 = "1pnqz7zvkfw70pjhhs5lm965iydrj8cgbj685fh50fpm0wapnmfd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -85163,6 +85475,7 @@ self: { ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -85178,6 +85491,7 @@ self: { ]; description = "General purpose live coding framework - Gloss backend"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-gloss-example" = callPackage @@ -85211,6 +85525,7 @@ self: { ]; description = "General purpose live coding framework - pulse backend"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-pulse-example" = callPackage @@ -85245,6 +85560,7 @@ self: { ]; description = "General purpose live coding framework - QuickCheck integration"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-warp" = callPackage @@ -85732,17 +86048,23 @@ self: { "evdev" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, extra - , libevdev, monad-loops, time, unix + , filepath-bytestring, libevdev, monad-loops, rawfilepath, tasty + , tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "evdev"; - version = "2.0.0.1"; - sha256 = "0ryq50g7z70rnv07pnvwssl0qrvhbljkq9yk1z8gj9kvqdsw9cmg"; + version = "2.1.0"; + sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; libraryHaskellDepends = [ - base bytestring containers extra monad-loops time unix + base bytestring containers extra filepath-bytestring monad-loops + rawfilepath time unix ]; libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring containers extra filepath-bytestring monad-loops + rawfilepath tasty tasty-hunit tasty-quickcheck time unix + ]; description = "Bindings to libevdev"; license = lib.licenses.bsd3; }) {inherit (pkgs) libevdev;}; @@ -85755,6 +86077,8 @@ self: { pname = "evdev-streamly"; version = "0.0.1.0"; sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp"; + revision = "1"; + editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj"; libraryHaskellDepends = [ base bytestring containers evdev extra posix-paths rawfilepath streamly streamly-fsnotify unix @@ -86722,8 +87046,8 @@ self: { }: mkDerivation { pname = "exh"; - version = "1.0.0"; - sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l"; + version = "1.0.2"; + sha256 = "10pvr8ya2f7arp8cqi4g97dpqin1h8n0xmnihqszchcils0v2ayn"; libraryHaskellDepends = [ aeson base bytestring conduit containers html-conduit http-client in-other-words language-javascript megaparsec optics-core optics-th @@ -88588,6 +88912,8 @@ self: { pname = "fast-logger"; version = "3.0.2"; sha256 = "0ilbjz09vw35jzfvkiqjy6zjbci2l60wcyjzfysrbxzk24qxmb5z"; + revision = "1"; + editedCabalFile = "1w8nsnjnpaxz8hm66gmh18msmc9hsafpladwy4ihvydb421fqpq2"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -88596,6 +88922,28 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; + }) {}; + + "fast-logger_3_0_3" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "3.0.3"; + sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "fast-math" = callPackage @@ -91255,6 +91603,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "finito" = callPackage @@ -93136,6 +93485,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "fmr" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fmr"; + version = "0.1"; + sha256 = "1hwi4f027pv1sy6pmanc0488xdy398iv50yapivyk2l9kipfnq3q"; + libraryHaskellDepends = [ base ]; + description = "Fake monadic records library"; + license = lib.licenses.bsd3; + }) {}; + "fmt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover @@ -93312,8 +93672,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "foldable-ix"; - version = "0.1.0.0"; - sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79"; + version = "0.2.0.0"; + sha256 = "1xbdwnvbg4phkqrcb9izabff85dhdj004nnbgk53f50if9sv4463"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; @@ -93492,6 +93852,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "folds_0_7_6" = callPackage + ({ mkDerivation, adjunctions, base, bifunctors, comonad + , constraints, contravariant, data-reify, distributive, lens, mtl + , pointed, profunctors, reflection, semigroupoids, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "folds"; + version = "0.7.6"; + sha256 = "06sy3arl37k7qz6zm2rscpvzl9za165214f5bgjppj7zdv0qkc3v"; + configureFlags = [ "-f-test-hlint" ]; + libraryHaskellDepends = [ + adjunctions base bifunctors comonad constraints contravariant + data-reify distributive lens mtl pointed profunctors reflection + semigroupoids transformers unordered-containers vector + ]; + description = "Beautiful Folding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "folds-common" = callPackage ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck }: @@ -96451,8 +96832,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "6"; - editedCabalFile = "0r0h3hp182w9ndhr5lrvhzl1vyj2f3vvh32fpdnbxb8xkkhx55sa"; + revision = "7"; + editedCabalFile = "0dagdnlb3wfrli6adpy4fjlgdc982pjgwcnq2sb7p3zm86ngi07v"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -96460,6 +96841,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "functor-classes-compat_1_0_1" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + , vector + }: + mkDerivation { + pname = "functor-classes-compat"; + version = "1.0.1"; + sha256 = "0p6kwj1yimis0rg2gihwkgxkjj1psxy38hxa94gz5pd638314hi3"; + libraryHaskellDepends = [ + base containers hashable unordered-containers vector + ]; + description = "Data.Functor.Classes instances for core packages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "functor-combinators" = callPackage ({ mkDerivation, assoc, base, bifunctors, comonad, constraints , containers, contravariant, dependent-sum, deriving-compat, free @@ -101437,26 +101834,6 @@ self: { }) {}; "ghc-typelits-knownnat" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; - version = "0.7.4"; - sha256 = "1i3kwq8i3p4i2jmmq8irycs0z3g69qy4i5smh14kbcz3pl35x71l"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_7_5" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers @@ -101474,7 +101851,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -101493,6 +101869,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_7_4" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra + , integer-gmp, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.7.4"; + sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra integer-gmp transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty @@ -101825,65 +102218,65 @@ self: { broken = true; }) {shake-bench = null;}; - "ghcide_0_7_4_0" = callPackage + "ghcide_0_7_5_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, Diff - , directory, dlist, extra, filepath, fingertree, fuzzy, ghc - , ghc-boot, ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hiedb, hls-plugin-api, hp2pretty, hslogger, implicit-hie-cradle - , lens, lsp-test, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck + , containers, cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, extra, filepath + , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check + , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl + , network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unordered-containers - , utf8-string, vector, yaml + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml }: mkDerivation { pname = "ghcide"; - version = "0.7.4.0"; - sha256 = "00f2p18g6w7vf2a344fr4k0rg7spnbri76d1by7403g1daqwkar9"; + version = "0.7.5.0"; + sha256 = "157h7jliwf25yjip9hfc5lghifqgqz3ckj894fnmx7pw4jfwyc2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq Diff directory dlist extra filepath fingertree - fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths - Glob haddock-library hashable haskell-lsp haskell-lsp-types + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens mtl network-uri opentelemetry parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie - rope-utf16-splay safe safe-exceptions shake sorted-list - sqlite-simple stm syb text time transformers unix - unordered-containers utf8-string vector + implicit-hie-cradle lens lsp lsp-types mtl network-uri + opentelemetry parallel prettyprinter prettyprinter-ansi-terminal + regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake + sorted-list sqlite-simple stm syb text time transformers unix + unliftio unliftio-core unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hiedb hls-plugin-api lens lsp-test optparse-applicative - process safe-exceptions shake text unordered-containers + filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api + lens lsp lsp-test lsp-types optparse-applicative process + safe-exceptions shake text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers data-default directory extra filepath ghc ghc-typelits-knownnat haddock-library - haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test - network-uri optparse-applicative process QuickCheck - quickcheck-instances record-dot-preprocessor record-hasfield - rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text ]; + testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ aeson base directory extra filepath optparse-applicative shake shake-bench text yaml ]; - benchmarkToolDepends = [ hp2pretty ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -102176,17 +102569,17 @@ self: { "ghcprofview" = callPackage ({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk - , haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text + , haskell-gi-base, mtl, regex-tdfa, scientific, text }: mkDerivation { pname = "ghcprofview"; - version = "0.1.0.0"; - sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a"; + version = "0.1.0.1"; + sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa - regex-tdfa-text scientific text + aeson base containers ghc-prof gi-gtk haskell-gi-base mtl + regex-tdfa scientific text ]; description = "GHC .prof files viewer"; license = lib.licenses.bsd3; @@ -104469,6 +104862,7 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "gitlab-api" = callPackage @@ -105553,8 +105947,8 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.2"; - sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh"; + version = "0.1.0.3"; + sha256 = "0kgkzskn2k9zgihrb1v9xy5yfjlggmpj15g1bdgx7faipksaa3fb"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector @@ -108739,6 +109133,7 @@ self: { ]; description = "proxy gopher over http"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "gopherbot" = callPackage @@ -110405,27 +110800,6 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hashable, hint, hspec, semigroups - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "1.2.0.0"; - sha256 = "0rljpnq690jxqlkbp7ksx5i91r2hrmqvppp5s6sgp373sw9kzkwb"; - libraryHaskellDepends = [ - aeson base exceptions greskell-core hashable semigroups text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = lib.licenses.bsd3; - }) {}; - - "greskell_1_2_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hashable, hint, hspec, semigroups , text, transformers, unordered-containers, vector @@ -110444,31 +110818,9 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.3.5"; - sha256 = "08jpgnsnmh9zbm1pw768ik28vhl3m4jz75l8cbxb3whfgwk5vyy4"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_3_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, hspec-discover, QuickCheck , scientific, semigroups, text, unordered-containers, uuid, vector @@ -110488,7 +110840,6 @@ self: { testToolDepends = [ doctest doctest-discover hspec-discover ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -115796,8 +116147,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.1"; - sha256 = "1166ccqpjwr331chf7hi4n42m2frahpf93ardfjgv8x6d0p5pfss"; + version = "2.4.1.1"; + sha256 = "164pjybk054a3h3ydfakzibngpmp8a4cbzg0sip9slfb739nz25j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -117059,6 +117410,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit + , integer-gmp, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.3.1.0"; + sha256 = "1i57iibad5gjk88yq1svi35mjcbgjmms7jzd28wva8f598x84qc0"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -117140,6 +117512,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable-time_0_2_1" = callPackage + ({ mkDerivation, base, hashable, time, time-compat }: + mkDerivation { + pname = "hashable-time"; + version = "0.2.1"; + sha256 = "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh"; + libraryHaskellDepends = [ base hashable time time-compat ]; + description = "Hashable instances for Data.Time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashabler" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp , primitive, template-haskell, text @@ -118337,6 +118721,8 @@ self: { pname = "haskell-language-server"; version = "0.9.0.0"; sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; + revision = "7"; + editedCabalFile = "11dfc9887aq521ywm0m5gpmihvvkypkr3y1cfk6afg210ij6ka40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120179,14 +120565,14 @@ self: { "haskellish" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, mtl - , template-haskell + , template-haskell, text }: mkDerivation { pname = "haskellish"; - version = "0.2.3.1"; - sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0"; + version = "0.2.4.3"; + sha256 = "09hxl72ivd7dc1fcwdd5w081crc4b8yinxddxcydb9ak0dg7hj26"; libraryHaskellDepends = [ - base containers haskell-src-exts mtl template-haskell + base containers haskell-src-exts mtl template-haskell text ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; @@ -120666,8 +121052,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.42.2"; - sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; + version = "0.46.6"; + sha256 = "13qqq08bh1a07zvd5rkfgyvh2ln0261q2hybjkjigw05mhrblf5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120711,8 +121097,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.42.1"; - sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; + version = "0.46.6"; + sha256 = "0a71gg790ix0z1q99m7cri4bpql222yprmj0vnvmacprnbihw77n"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -123861,6 +124247,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "heaps_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "heaps"; + version = "0.4"; + sha256 = "1zbw0qrlnhb42v04phzwmizbpwg21wnpl7p4fbr9xsasp7w9scl9"; + libraryHaskellDepends = [ base ]; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "heapsize" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-heap , hashable, hashtables, primitive, transformers @@ -127033,6 +127431,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "hie-bios_0_7_3" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger + , hspec-expectations, optparse-applicative, process, tasty + , tasty-expected-failure, tasty-hunit, temporary, text, time + , transformers, unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.7.3"; + sha256 = "0njgxy8dx43smqk4wv3zg0c8a7llbgnz4fbil9dw53yx2xncgapi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base directory filepath ghc optparse-applicative + ]; + testHaskellDepends = [ + base directory extra filepath ghc hspec-expectations tasty + tasty-expected-failure tasty-hunit temporary text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -127749,23 +128180,23 @@ self: { "hinit" = callPackage ({ mkDerivation, base, Cabal, containers, directory, exceptions - , fused-effects, generic-lens, Glob, haskeline, lens, megaparsec - , mustache, optparse-applicative, parser-combinators, path, path-io + , fused-effects, Glob, haskeline, megaparsec, mustache, optics-core + , optparse-applicative, parser-combinators, path, path-io , prettyprinter, prettyprinter-ansi-terminal, process , quickcheck-text, spdx-license, string-interpolate, text, time , tomland }: mkDerivation { pname = "hinit"; - version = "0.2.0"; - sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v"; + version = "0.2.1"; + sha256 = "10lhx18g50f24l867kjqgb2qpky3vvx7w7s4sc3pidr3hc0ams3g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base Cabal containers directory exceptions fused-effects - generic-lens Glob haskeline lens megaparsec mustache - optparse-applicative parser-combinators path path-io prettyprinter + base Cabal containers directory exceptions fused-effects Glob + haskeline megaparsec mustache optics-core optparse-applicative + parser-combinators path path-io prettyprinter prettyprinter-ansi-terminal process spdx-license string-interpolate text time tomland ]; @@ -127775,8 +128206,7 @@ self: { ]; description = "Generic project initialization tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ poscat ]; }) {}; "hinotify_0_3_9" = callPackage @@ -129481,18 +129911,17 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-explicit-imports-plugin_0_1_0_1" = callPackage + "hls-explicit-imports-plugin_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , haskell-lsp-types, hls-plugin-api, shake, text - , unordered-containers + , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "0.1.0.1"; - sha256 = "0n36yk21wh9wklp8bnrg4b6qck2nf34m8p3fpilwpnzfchk6wr1y"; + version = "0.1.0.2"; + sha256 = "0cfkb7ph6ryakybjxmyf6cc615p57wzv6ys2zy4fak1iib8bzwyx"; libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers + aeson base containers deepseq ghc ghcide hls-plugin-api lsp + lsp-types shake text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -129554,6 +129983,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-plugin-api_0_7_1_0" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger + , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix + , unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.7.1.0"; + sha256 = "036lrij56fzd3rbrxrxpvmq2ng0yp4qrnrl8k6g60p5sf9abqzc2"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hslogger lens lsp opentelemetry process regex-tdfa + shake text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types @@ -129573,6 +130022,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-retrie-plugin_0_1_1_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie + , safe-exceptions, shake, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-retrie-plugin"; + version = "0.1.1.1"; + sha256 = "1k85wgnd5f1jqjd09y9gacc5w8kypy84qaly32411xsw4hfsil8a"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra ghc ghcide hashable + hls-plugin-api lsp lsp-types retrie safe-exceptions shake text + transformers unordered-containers + ]; + description = "Retrie integration plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie @@ -132308,6 +132776,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hp2pretty_0_10" = callPackage + ({ mkDerivation, array, attoparsec, base, containers, filepath + , floatshow, mtl, optparse-applicative, semigroups, text + }: + mkDerivation { + pname = "hp2pretty"; + version = "0.10"; + sha256 = "1irm8mvcib39r8imdx7y7jisp162i0rwk8w3irs2j746c8vhyv12"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text + ]; + description = "generate pretty graphs from heap profiles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec @@ -134192,6 +134679,18 @@ self: { broken = true; }) {}; + "hs-swisstable-hashtables-class" = callPackage + ({ mkDerivation, base, hashtables, swisstable }: + mkDerivation { + pname = "hs-swisstable-hashtables-class"; + version = "0.1.0.0"; + sha256 = "15zc24ai13x11ksyhsrs05v9vh93mdlmx9p3rg3lkllqjqy6b35m"; + libraryHaskellDepends = [ base hashtables swisstable ]; + testHaskellDepends = [ base hashtables swisstable ]; + description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; + license = lib.licenses.bsd3; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -134699,6 +135198,8 @@ self: { pname = "hsc2hs"; version = "0.68.7"; sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; + revision = "1"; + editedCabalFile = "0nzmlx0kdsq5231m6dbvdb5zssj1h4lkqplp8rb28z3yl5h6h3sa"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -135977,8 +136478,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "1"; - editedCabalFile = "1g58f8lxcrmv4wh0k48car5lcl5j0k9lwfq5nfkjj9f5gim5yrc8"; + revision = "2"; + editedCabalFile = "1bkv1rbbx0bhyvrmnsyspm30q48820a6rym0msxjdzp8r56rbm9w"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -136992,20 +137493,6 @@ self: { }) {}; "hspec-need-env" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-expectations - , setenv, transformers - }: - mkDerivation { - pname = "hspec-need-env"; - version = "0.1.0.5"; - sha256 = "0bgjhzc4m24sbmfyczq1r61gbgm5i1lsgyql88ki4flllscg4hsh"; - libraryHaskellDepends = [ base hspec-core hspec-expectations ]; - testHaskellDepends = [ base hspec hspec-core setenv transformers ]; - description = "Read environment variables for hspec tests"; - license = lib.licenses.bsd3; - }) {}; - - "hspec-need-env_0_1_0_6" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , hspec-expectations, setenv, transformers }: @@ -137018,7 +137505,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Read environment variables for hspec tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-parsec" = callPackage @@ -140092,6 +140578,8 @@ self: { pname = "http2"; version = "2.0.5"; sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676"; + revision = "1"; + editedCabalFile = "0xxi7gcldh3fvnh98khw9f2vm5w85sakbb6165s779nkvq7p8ak2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140112,6 +140600,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_2_0_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.6"; + sha256 = "17m1avrppiz8i6qwjlgg77ha88sx8f8vvfa57z369aszhld6nx9a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -141168,6 +141688,8 @@ self: { pname = "hw-bits"; version = "0.7.2.1"; sha256 = "18l9r0yhddkzgbc2vvk0qr9brb5ih25zjfga3bddb5j8gpaaq65q"; + revision = "1"; + editedCabalFile = "14y67p3rsj97rzlh2cw7iy04gb6cfa977bjbr35vgkav0skbigbn"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -141955,6 +142477,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.4.1"; sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h"; + revision = "1"; + editedCabalFile = "0flhrgqgwgxwk6ik3k7322dn8ybyjzh6g1csg2d9bafldj7akcwv"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -143261,6 +143785,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hyperloglog_0_4_4" = callPackage + ({ mkDerivation, approximate, base, binary, bits, bytes, cereal + , cereal-vector, comonad, deepseq, distributive, hashable, lens + , reflection, semigroupoids, semigroups, siphash, tagged, vector + }: + mkDerivation { + pname = "hyperloglog"; + version = "0.4.4"; + sha256 = "0iwjxv934vid7bzaxyqq4v7r52vdcqjxmw043dmxykwyzim59l3v"; + libraryHaskellDepends = [ + approximate base binary bits bytes cereal cereal-vector comonad + deepseq distributive hashable lens reflection semigroupoids + semigroups siphash tagged vector + ]; + description = "An approximate streaming (constant space) unique object counter"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hyperloglogplus" = callPackage ({ mkDerivation, base, bits, containers, HUnit, murmur-hash , semigroups, tasty, tasty-hunit, vector @@ -143329,6 +143872,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "hyphenation_0_8_1" = callPackage + ({ mkDerivation, base, bytestring, containers, text + , unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.8.1"; + sha256 = "0pzm9sfn1bw7yvwhby9a6d9z2ghcn91rcbj08x380gff31kn8lbx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers text unordered-containers zlib + ]; + description = "Configurable Knuth-Liang hyphenation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -143674,6 +144234,24 @@ self: { broken = true; }) {}; + "ice40-prim" = callPackage + ({ mkDerivation, base, Cabal, clash-prelude, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, interpolate + }: + mkDerivation { + pname = "ice40-prim"; + version = "0.1.0.0"; + sha256 = "00l0kwwayf0bark2yqjrx8imr8997d5mrnhjf3zsayxk9a521j99"; + libraryHaskellDepends = [ + base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise interpolate + ]; + description = "Lattice iCE40 Primitive IP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "icepeak" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, hashable, hspec, hspec-core, hspec-expectations @@ -146732,6 +147310,23 @@ self: { license = lib.licenses.mit; }) {}; + "inspection-testing_0_4_3_0" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.3.0"; + sha256 = "1pba3br5vd11svk9fpg5s977q55qlvhlf95nd5ay79bwdjm10hj3"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -147299,6 +147894,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "intern_0_9_4" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "intern"; + version = "0.9.4"; + sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; + libraryHaskellDepends = [ + array base bytestring hashable text unordered-containers + ]; + description = "Efficient hash-consing for arbitrary data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "internetmarke" = callPackage ({ mkDerivation, base, explicit-exception, HPDF, parsec, process , transformers, utility-ht @@ -147633,6 +148244,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "intervals_0_9_2" = callPackage + ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: + mkDerivation { + pname = "intervals"; + version = "0.9.2"; + sha256 = "1qibvgys8lw61x9na3iy3dcglyj9qyhcbfc00glnagl7cbk1shlv"; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Interval Arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "intmap-graph" = callPackage ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { @@ -147847,6 +148471,8 @@ self: { pname = "invertible"; version = "0.2.0.7"; sha256 = "1ngcmy59cyrg5idcn8a4gxg6ipq88rhhwhdb09gra8jcraq9n7ii"; + revision = "1"; + editedCabalFile = "19xcczz26ji5xaws4ikvacqz991qgislj32hs8rlks07qw3qmnbn"; libraryHaskellDepends = [ base haskell-src-meta invariant lens partial-isomorphisms semigroupoids template-haskell transformers @@ -150702,6 +151328,22 @@ self: { license = lib.licenses.mit; }) {}; + "jira-wiki-markup_1_3_3" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.3.3"; + sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -153153,6 +153795,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_2" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.2"; + sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -154691,8 +155352,6 @@ self: { testHaskellDepends = [ base stm ]; description = "A lightweight, structured-concurrency library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kibro" = callPackage @@ -155233,10 +155892,8 @@ self: { }: mkDerivation { pname = "kqueue"; - version = "0.2"; - sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h"; - revision = "3"; - editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7"; + version = "0.2.1"; + sha256 = "0svrswcglipmm47lnqi41hcsn1gvkcniva6qajwqxrdr0wvvhgdi"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; description = "A binding to the kqueue event library"; @@ -157093,6 +157750,28 @@ self: { license = lib.licenses.gpl3; }) {}; + "language-docker_9_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text + , time + }: + mkDerivation { + pname = "language-docker"; + version = "9.1.3"; + sha256 = "00nr8fb981rkjzy2xhppvg9avsi377ww28d50rldm5wh7ax9s3w2"; + libraryHaskellDepends = [ + base bytestring containers data-default-class megaparsec + prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec HUnit + megaparsec prettyprinter QuickCheck split text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -158784,8 +159463,8 @@ self: { ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }: mkDerivation { pname = "lazy-priority-queue"; - version = "0.1.0.1"; - sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v"; + version = "0.1.1"; + sha256 = "1b853cqc1wybwmnywh9jhcv382v43mfyqxskffizp1m10gii9ss5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -158793,7 +159472,7 @@ self: { testHaskellDepends = [ base doctest lens ]; testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; - license = lib.licenses.bsd3; + license = lib.licenses.gpl3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158924,6 +159603,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "lca_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lca"; + version = "0.4"; + sha256 = "0miji532qc725vprhnc5p3k4i6515i1fn1g0f7hm0gmq0hvvh51f"; + libraryHaskellDepends = [ base ]; + description = "O(log n) persistent online lowest common ancestor search without preprocessing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lcs" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -159577,6 +160268,45 @@ self: { license = lib.licenses.bsd2; }) {}; + "lens_5" = callPackage + ({ mkDerivation, array, assoc, base, base-compat, base-orphans + , bifunctors, bytestring, call-stack, comonad, containers + , contravariant, criterion, deepseq, distributive, exceptions + , filepath, free, generic-deriving, ghc-prim, hashable, HUnit + , indexed-traversable, indexed-traversable-instances + , kan-extensions, mtl, parallel, profunctors, QuickCheck + , reflection, semigroupoids, simple-reflect, strict, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-abstraction, these + , transformers, transformers-compat, unordered-containers, vector + }: + mkDerivation { + pname = "lens"; + version = "5"; + sha256 = "06nvmg9aan4s4ldq3c2a4z15r29hsxyvbjid2yvskmlw5pvwpncy"; + libraryHaskellDepends = [ + array assoc base base-orphans bifunctors bytestring call-stack + comonad containers contravariant distributive exceptions filepath + free ghc-prim hashable indexed-traversable + indexed-traversable-instances kan-extensions mtl parallel + profunctors reflection semigroupoids strict tagged template-haskell + text th-abstraction these transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + base containers deepseq HUnit mtl QuickCheck simple-reflect + test-framework test-framework-hunit test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base base-compat bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + description = "Lenses, Folds and Traversals"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -159607,6 +160337,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-action_0_2_5" = callPackage + ({ mkDerivation, base, comonad, contravariant, lens, mtl + , profunctors, semigroupoids, transformers + }: + mkDerivation { + pname = "lens-action"; + version = "0.2.5"; + sha256 = "02sv76far3y57p2pgcjsx5ffaai8rm4669qkp82l06vv964f0v2r"; + libraryHaskellDepends = [ + base comonad contravariant lens mtl profunctors semigroupoids + transformers + ]; + description = "Monadic Getters and Folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, doctest, generic-deriving, lens, scientific @@ -159630,6 +160377,23 @@ self: { license = lib.licenses.mit; }) {}; + "lens-aeson_1_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, lens + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.1.1"; + sha256 = "1g37c8p25by3hvy5lmq4rqyl9wxmxmci2h16rj4i5jcp7slf3mvg"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + description = "Law-abiding lenses for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -159836,8 +160600,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "4"; - editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7"; + revision = "5"; + editedCabalFile = "0zv5r50xz8msrcwrvqym88pwihqcpmlk3vi493jdhik4n70cs0c6"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = lib.licenses.bsd3; @@ -160475,8 +161239,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.6"; - sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw"; + version = "0.6.2"; + sha256 = "00axpwgwzqchma89fdp1dxk97palvgv4j1ag8dq1w4gl9yh5q0vx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq hashable ]; @@ -161365,8 +162129,8 @@ self: { ({ mkDerivation, base, bytestring, libtelnet }: mkDerivation { pname = "libtelnet"; - version = "0.1.0.0"; - sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; + version = "0.1.0.1"; + sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -161379,8 +162143,8 @@ self: { ({ mkDerivation, base, bytestring, libversion }: mkDerivation { pname = "libversion"; - version = "0.1.0"; - sha256 = "0w5maaklglbxp7k0ah699w1mhjsjrpgw9n7axld319dpfdwhl94j"; + version = "0.1.1"; + sha256 = "0zxkwiacaznf30wgywmawmqrpvi4r1wwfh6pys82jgr0v8yla4v8"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libversion ]; description = "Haskell binding to libversion"; @@ -162163,6 +162927,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_21_5" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, random, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.5"; + sha256 = "19pvz467wd8gss95qfi90xnd5fwm6dpdppr21g5n30x4m7niymn3"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids semigroups tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -164880,6 +165672,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "log-domain_0_13_1" = callPackage + ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq + , distributive, hashable, semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.13.1"; + sha256 = "0ipiiflzs1r7wm5k8b9cqn4l09rjdyks3pxnm4p3kmncd5s2ajsv"; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + semigroupoids semigroups vector + ]; + description = "Log-domain arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects , monad-control, text, transformers-base @@ -166236,8 +167045,8 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.0.0.1"; - sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1"; + version = "1.1.1.0"; + sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166311,27 +167120,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "lsp-test_0_12_0_0" = callPackage + "lsp-test_0_13_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix + , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl + , parser-combinators, process, some, text, time, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.12.0.0"; - sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd"; + version = "0.13.0.0"; + sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath Glob - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default directory filepath haskell-lsp hspec lens + aeson base data-default directory filepath hspec lens lsp-types text unordered-containers ]; description = "Functional test framework for LSP servers"; @@ -166341,20 +167150,20 @@ self: { "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum-template, directory - , filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay - , scientific, some, template-haskell, temporary, text - , unordered-containers + , data-default, deepseq, dependent-sum, dependent-sum-template + , directory, filepath, hashable, hslogger, lens, network-uri + , rope-utf16-splay, scientific, some, template-haskell, temporary + , text, unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.0.0.1"; - sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27"; + version = "1.1.0.0"; + sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq - dependent-sum-template directory filepath hashable hslogger lens - network-uri rope-utf16-splay scientific some template-haskell - temporary text unordered-containers + dependent-sum dependent-sum-template directory filepath hashable + hslogger lens network-uri rope-utf16-splay scientific some + template-haskell temporary text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; @@ -166504,6 +167313,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "lua" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit }: + mkDerivation { + pname = "lua"; + version = "1.0.0"; + sha256 = "0ly10sy9xlvalaximff287wd6hr3hxqicsx5alwpqbg9ajxlx798"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "Lua, an embeddable scripting language"; + license = lib.licenses.mit; + }) {}; + "lua-bc" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, pretty, text, vector @@ -167446,6 +168267,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "machines_0_7_2" = callPackage + ({ mkDerivation, adjunctions, base, comonad, conduit, containers + , criterion, distributive, mtl, pipes, pointed, profunctors + , semigroupoids, semigroups, streaming, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.7.2"; + sha256 = "0pgsa67j9l1zmazlqdb5wg3cqsikyfvkq8yih7iwcqzkys5qssvr"; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + benchmarkHaskellDepends = [ + base conduit criterion mtl pipes streaming + ]; + description = "Networked stream transducers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -172799,6 +173643,8 @@ self: { pname = "microstache"; version = "1.0.1.2"; sha256 = "1xdca11z5cy7vfy2dszhr6qvlrxw6pn0d9iri7mg56lvi02javik"; + revision = "1"; + editedCabalFile = "1l72cfbrr6kxh0z2dx2pghxl7ljlbmbk8s9wlgk35bjm925kkxfl"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -174491,6 +175337,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "mmorph_1_1_5" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.5"; + sha256 = "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmsyn2" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -174620,20 +175480,20 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn7ukr - , process, vector + ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 + , mmsyn7ukr-common, process }: mkDerivation { pname = "mmsyn7l"; - version = "0.8.0.0"; - sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd"; + version = "0.9.0.0"; + sha256 = "0j8xi8jxak818sw310srxljrywggsa8ss1l4yw0razsa28h92nxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn7ukr process vector + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; executableHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn7ukr process vector + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = lib.licenses.mit; @@ -174941,6 +175801,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "modern-uri_0_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck + , reflection, tagged, template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.3.4.0"; + sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + description = "Modern library for working with URIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -179190,8 +180077,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.5.0.0"; - sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr"; + version = "0.5.0.1"; + sha256 = "0r5kbi378iwg5b578dydvv4smy2xqn4y33h015fp5nyphxz83173"; libraryHaskellDepends = [ aeson base conduit http-types mtl mu-schema sop-core template-haskell text wai @@ -180853,6 +181740,8 @@ self: { pname = "mwc-random"; version = "0.15.0.1"; sha256 = "1p8c5g4hb72k90ai39rgpn6cr942i6636l1y0zfp9xgjb3v0a2q3"; + revision = "1"; + editedCabalFile = "1ay26mvzxqw6rzw3hkib1j12gk6fa2hsilz12q8vhp646bqqc744"; libraryHaskellDepends = [ base math-functions primitive random time vector ]; @@ -182877,8 +183766,6 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-lens" = callPackage @@ -182895,8 +183782,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-rpc" = callPackage @@ -182918,8 +183803,6 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-spider" = callPackage @@ -183748,6 +184631,8 @@ self: { pname = "network-byte-order"; version = "0.1.6"; sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; + revision = "1"; + editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; @@ -184528,8 +185413,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-types-icmp"; - version = "1.0.0.1"; - sha256 = "1j2z51jvrhh9nlnx9sfiabgascyp80ha1906hdm2d4w8xyrp7d1c"; + version = "1.0.0.2"; + sha256 = "1s449djcr78k8ywzypmc62d7lysm245ih60z4wi6p0kmyv1qcj75"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Types for representing ICMP and ICMPv6 messages"; @@ -186936,6 +187821,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_3_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async + , auto-update, base, bytestring, containers, directory, exceptions + , filepath, hedgehog, junit-xml, pretty-diff, pretty-show + , safe-exceptions, terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.3.1.0"; + sha256 = "0dg94blhrrnzh00kgjz5bclcwzx87ky2210nxx8902xx54x928vc"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async auto-update base bytestring + containers directory exceptions filepath hedgehog junit-xml + pretty-diff pretty-show safe-exceptions terminal-size text time + vector + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal async auto-update base bytestring + containers directory exceptions filepath hedgehog junit-xml + pretty-diff pretty-show safe-exceptions terminal-size text time + vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -190639,6 +191551,8 @@ self: { pname = "optics-extra"; version = "0.3"; sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4"; + revision = "1"; + editedCabalFile = "0bizzsgmq7b337wpraavgss7r0c5vp2n2gwl8h4xa0qxx0d1wm1p"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors mtl optics-core text transformers unordered-containers vector @@ -193878,8 +194792,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "2"; - editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6"; + revision = "3"; + editedCabalFile = "1lv3y3zrdfc09nsiqxg7mzcahgnqi6z9caspd4lvifhhfrqy2722"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -195507,6 +196421,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "patrol" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, http-client, http-types, network-uri, text, time + , uuid + }: + mkDerivation { + pname = "patrol"; + version = "0.0.1"; + sha256 = "08rxyx01mamvc3mfyzyqajfj7239sklz30fw4z8rvi2jrgisbpy7"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-types network-uri text time uuid + ]; + description = "Sentry SDK"; + license = lib.licenses.isc; + }) {}; + "patronscraper" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt }: mkDerivation { @@ -196863,8 +197794,8 @@ self: { pname = "perfect-vector-shuffle"; version = "0.1.1.1"; sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "4"; - editedCabalFile = "14q0773vxmkh4nwskiq85ch175jq12xms2lypaddglciykqs6ml6"; + revision = "5"; + editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198714,8 +199645,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.1.0.0"; - sha256 = "0fd2pslmgm5bvv0yiza87vp61601pl1c69xa5snbgrnb2mlp6f98"; + version = "0.2.0.0"; + sha256 = "1382i77ci70ax7lvbkqqvg1wr2pp5irl8wxvypngr15czqgj7sca"; libraryHaskellDepends = [ base phonetic-languages-permutations-array subG ]; @@ -199693,29 +200624,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.14"; - sha256 = "11r8cqy98w1y0avgn53x1fzqxpdfg7wvwwkfppnk9yip0lkcp3yv"; - libraryHaskellDepends = [ - base exceptions mmorph mtl transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = lib.licenses.bsd3; - }) {}; - - "pipes_4_3_15" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, test-framework , test-framework-quickcheck2, transformers, void @@ -199736,7 +200644,6 @@ self: { ]; description = "Compositional pipelines"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -199906,6 +200813,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-bytestring_2_1_7" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse + , stringsearch, transformers + }: + mkDerivation { + pname = "pipes-bytestring"; + version = "2.1.7"; + sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse stringsearch + transformers + ]; + description = "ByteString support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-bzip" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib , data-default, directory, hspec, MonadRandom, mtl, pipes @@ -200190,8 +201114,8 @@ self: { pname = "pipes-extras"; version = "1.0.15"; sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; - revision = "2"; - editedCabalFile = "1aprq51r83v5qja9vy01s8d17bnncnvp1mw6h6maxgzh2xppim8b"; + revision = "3"; + editedCabalFile = "177l1fs1wgm34ifbx83xxf29m0ghq6z9skpkwm86qfln2hpikkj9"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -200566,6 +201490,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-parse_3_0_9" = callPackage + ({ mkDerivation, base, pipes, transformers }: + mkDerivation { + pname = "pipes-parse"; + version = "3.0.9"; + sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3"; + libraryHaskellDepends = [ base pipes transformers ]; + description = "Parsing infrastructure for the pipes ecosystem"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-postgresql-simple" = callPackage ({ mkDerivation, async, base, bytestring, exceptions, mtl, pipes , pipes-concurrency, pipes-safe, postgresql-simple, stm, text @@ -200674,6 +201610,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-safe_2_3_3" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, primitive, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.3.3"; + sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -200934,6 +201887,21 @@ self: { broken = true; }) {}; + "pixel-printer" = callPackage + ({ mkDerivation, base, JuicyPixels, lens }: + mkDerivation { + pname = "pixel-printer"; + version = "0.1.0"; + sha256 = "1cx485lvd5z6895jv1iiq93kspch78w9m730ggw6nvf0rimvazyy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base JuicyPixels lens ]; + executableHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base ]; + description = "A program for turning pixel art into 3D prints"; + license = lib.licenses.gpl3; + }) {}; + "pixela" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , http-client, http-client-tls, http-types, split, text, time @@ -201746,8 +202714,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.6.1"; - sha256 = "004mfq0d10s26sgk12zrhgmxcfxnhvdyajr48scxf5rh1fv9440i"; + version = "1.6.2"; + sha256 = "1lgk25chpl6albf8pzq8q40di02rgv7g3bsf586a5pl2kdh2p2qq"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random split @@ -206036,6 +207004,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pretty-diff_0_4_0_0" = callPackage + ({ mkDerivation, base, data-default, Diff, tasty, tasty-hunit + , tasty-test-reporter, text + }: + mkDerivation { + pname = "pretty-diff"; + version = "0.4.0.0"; + sha256 = "10fsa49pd0d5rvl0093x2hrcbv44hq7xc9d2x369ygd6q7pxkbnz"; + libraryHaskellDepends = [ base data-default Diff text ]; + testHaskellDepends = [ + base data-default Diff tasty tasty-hunit tasty-test-reporter text + ]; + description = "Pretty printing a diff of two values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pretty-display" = callPackage ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: mkDerivation { @@ -206737,6 +207722,30 @@ self: { broken = true; }) {}; + "primitive-extras_0_9" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.9"; + sha256 = "04sb2q5r5z1sdj976p8p6hgx360agwxjqmcrgr8vcgyfgzphizfr"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -207757,14 +208766,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "profunctors_5_6_1" = callPackage + "profunctors_5_6_2" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.6.1"; - sha256 = "1b2fgnhl3j790rra615q6y9xx97lip0smfg1c13ad1brvyjygps6"; + version = "5.6.2"; + sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -209445,8 +210454,8 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.1.3"; - sha256 = "1qrcsci4jccx4l1zlpqr202jl2dhpmcbbq94gfgdax80q8js3yrq"; + version = "0.1.1.4"; + sha256 = "1g9b3dixrgi1k8vg85mgdpnph1dz02xggwp61naak6j392kg6rkf"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; @@ -209752,6 +210761,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {inherit (pkgs) libpulseaudio;}; "pulseaudio" = callPackage @@ -211735,6 +212745,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.25.2"; sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h"; + revision = "1"; + editedCabalFile = "0pmsq83jzf7gxr59h8j85121n6n0iqbl3smccl9v7n3gkp70kr2q"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -213373,8 +214385,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "4"; - editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk"; + revision = "5"; + editedCabalFile = "1jai1pcs39ijdhxc8q36x1yayr8rsblhx3y88paf4bqxrks2vmrh"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -213441,6 +214453,24 @@ self: { license = lib.licenses.mit; }) {}; + "random-bytestring_0_1_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, cryptonite + , entropy, ghc-prim, mwc-random, pcg-random, primitive, random + }: + mkDerivation { + pname = "random-bytestring"; + version = "0.1.4"; + sha256 = "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j"; + libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; + benchmarkHaskellDepends = [ + async base bytestring criterion cryptonite entropy ghc-prim + mwc-random pcg-random primitive random + ]; + description = "Efficient generation of random bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "random-class" = callPackage ({ mkDerivation, base, primitive, transformers, util }: mkDerivation { @@ -214666,6 +215696,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "rcu_0_2_5" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , deepseq, fail, ghc-prim, optparse-applicative, parallel + , primitive, rdtsc, time, transformers + }: + mkDerivation { + pname = "rcu"; + version = "0.2.5"; + sha256 = "1p2cg6xy5cjdizqialv9y8qylwdri5fhby2xh04fnhpjapsrbc7l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base fail ghc-prim parallel primitive transformers + ]; + executableHaskellDepends = [ base transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim optparse-applicative + primitive rdtsc time transformers + ]; + description = "Read-Copy-Update for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rdf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq , dlist, fgl, text, transformers @@ -217913,8 +218967,6 @@ self: { libraryHaskellDepends = [ array base regex-base regex-tdfa text ]; description = "Text interface for regex-tdfa"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regex-tdfa-unittest" = callPackage @@ -221117,8 +222169,8 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.4.2"; - sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2"; + version = "0.4.3"; + sha256 = "13brargymd1c9b0csaprj85qdqg98bzj3z2smbb0v66myj48v6fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -221145,6 +222197,7 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "rhine-gloss" = callPackage @@ -221159,6 +222212,7 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "rhythm-game-tutorial" = callPackage @@ -221645,6 +222699,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "rio-process-pool" = callPackage + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , data-default, hashable, HUnit, mtl, QuickCheck, rio, tasty + , tasty-html, tasty-hunit, tasty-quickcheck, text, unliftio + , unliftio-messagebox + }: + mkDerivation { + pname = "rio-process-pool"; + version = "1.0.0"; + sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base containers data-default hashable mtl QuickCheck rio text + unliftio unliftio-messagebox + ]; + executableHaskellDepends = [ + async base containers data-default hashable mtl QuickCheck rio text + unliftio unliftio-messagebox + ]; + testHaskellDepends = [ + async atomic-primops base containers data-default hashable HUnit + mtl QuickCheck rio tasty tasty-html tasty-hunit tasty-quickcheck + text unliftio unliftio-messagebox + ]; + benchmarkHaskellDepends = [ + async base containers criterion data-default hashable mtl + QuickCheck rio text unliftio unliftio-messagebox + ]; + description = "A library for process pools coupled with asynchronous message queues"; + license = lib.licenses.bsd2; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -225392,16 +226479,16 @@ self: { , containers, crackNum, deepseq, directory, doctest, filepath , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, time, transformers, uniplate, z3 + , template-haskell, text, time, transformers, uniplate, z3 }: mkDerivation { pname = "sbv"; - version = "8.9"; - sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51"; + version = "8.10"; + sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath mtl - pretty process QuickCheck random syb template-haskell time + pretty process QuickCheck random syb template-haskell text time transformers uniplate ]; testHaskellDepends = [ @@ -225412,7 +226499,7 @@ self: { testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ base bench-show containers crackNum deepseq directory filepath - gauge mtl process random silently syb time + gauge mtl process random silently syb text time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; @@ -227283,6 +228370,76 @@ self: { license = lib.licenses.bsd2; }) {}; + "sdp" = callPackage + ({ mkDerivation, base, data-default-class, ghc-prim }: + mkDerivation { + pname = "sdp"; + version = "0.2"; + sha256 = "1q9l87rvvx7bqbqx1675r2mvj3b2jf0ywa55xcv2ybsl621z52y0"; + libraryHaskellDepends = [ base data-default-class ghc-prim ]; + description = "Simple Data Processing"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-deepseq" = callPackage + ({ mkDerivation, base, deepseq, sdp }: + mkDerivation { + pname = "sdp-deepseq"; + version = "0.2"; + sha256 = "127vzi2a65j5czipgybdhfxfzfzx3r0hrrag1nha40vdgsd3j7w4"; + libraryHaskellDepends = [ base deepseq sdp ]; + description = "DeepSeq SDP extension"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-hashable" = callPackage + ({ mkDerivation, base, hashable, sdp }: + mkDerivation { + pname = "sdp-hashable"; + version = "0.2"; + sha256 = "0cl9a10ww93n64sq4mnc3m56y4add04s06gi8n9rmad93v3xfk3j"; + libraryHaskellDepends = [ base hashable sdp ]; + description = "Hashable instances for SDP"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-quickcheck" = callPackage + ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, sdp + , sdp-deepseq, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "sdp-quickcheck"; + version = "0.2"; + sha256 = "1gmsn5vw8a0qgqkaya7689spmbgcrqqg9zxbkdf4xq38q94zvwvh"; + libraryHaskellDepends = [ base QuickCheck sdp ]; + testHaskellDepends = [ + base QuickCheck sdp test-framework test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base criterion ghc-prim QuickCheck sdp sdp-deepseq + ]; + description = "SDP QuickCheck support"; + license = lib.licenses.bsd3; + }) {}; + + "sdp4vector" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, sdp + , sdp-quickcheck, test-framework, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "sdp4vector"; + version = "0.2"; + sha256 = "1d18zgwawn598sax2m6cvb5w1k1vpc8n6bfdrvn0wrm8i6fvn0bq"; + libraryHaskellDepends = [ base sdp vector ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances sdp sdp-quickcheck + test-framework test-framework-quickcheck2 vector + ]; + description = "SDP wrapper for Vector"; + license = lib.licenses.bsd3; + }) {}; + "sdr" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-to-vector , cairo, cereal, Chart, Chart-cairo, colour, containers, criterion @@ -231459,6 +232616,22 @@ self: { license = lib.licenses.mit; }) {}; + "servant-validate" = callPackage + ({ mkDerivation, base, containers, hspec, servant + , should-not-typecheck, text + }: + mkDerivation { + pname = "servant-validate"; + version = "0.1.0.0"; + sha256 = "0igcbcax6xxp0h1c4kjbgl2iw1gbadn5ccb1kx0cpp0lydszlv80"; + libraryHaskellDepends = [ base containers servant text ]; + testHaskellDepends = [ + base containers hspec servant should-not-typecheck text + ]; + description = "Chekc static properties of servant APIs"; + license = lib.licenses.bsd3; + }) {}; + "servant-waargonaut" = callPackage ({ mkDerivation, base, bytestring, http-media, http-types, lens , servant, servant-server, tasty, tasty-wai, text, transformers @@ -231717,14 +232890,39 @@ self: { license = lib.licenses.mit; }) {}; + "serversession_1_0_2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, data-default, hashable, hspec, nonce, path-pieces + , persistent-test, QuickCheck, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "serversession"; + version = "1.0.2"; + sha256 = "02ynhgq6gn5ddx2yd8ns8ay0rrhzln2h6jrmnwk7x1fqqfvzx0jf"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring data-default hashable nonce + path-pieces persistent-test text time transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers data-default + hspec nonce path-pieces QuickCheck text time transformers + unordered-containers + ]; + description = "Secure, modular server-side sessions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "serversession-backend-acid-state" = callPackage ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy , serversession, unordered-containers }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.3"; - sha256 = "1rkw5an7lwx05063caqjhvf449jxij2zrbymg64p600mngb1flq0"; + version = "1.0.4"; + sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -231748,8 +232946,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.4"; - sha256 = "074pxfv1yj6ffxp4bg0ia20w7ikdja3g3k1l93nnjcni13zddwn7"; + version = "1.0.5"; + sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -231774,8 +232972,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.3"; - sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf"; + version = "1.0.4"; + sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -233996,8 +235194,8 @@ self: { pname = "show-combinators"; version = "0.2.0.0"; sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; - revision = "1"; - editedCabalFile = "1pczjf7z43nzfgza9fa29flbmvkj07p4dw16v9bjv36i8dv6cjc7"; + revision = "2"; + editedCabalFile = "0n3xlpm41wpw1ybmacg9s7150nx00qrdlw2rq4fzz7iw7333cyjx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -234376,8 +235574,8 @@ self: { }: mkDerivation { pname = "signable"; - version = "0.2"; - sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s"; + version = "0.3"; + sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q"; libraryHaskellDepends = [ asn1-encoding asn1-types base binary bytestring casing cryptonite memory microlens pem proto-lens proto-lens-runtime @@ -234617,6 +235815,7 @@ self: { ]; description = "A simple library for affine and vector spaces"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "simple-atom" = callPackage @@ -237017,6 +238216,30 @@ self: { broken = true; }) {}; + "slynx_0_5_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , monad-logger, mwc-random, optparse-applicative, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.5.0.2"; + sha256 = "0qpw3h1lbz299gb2jdcsj7svhxsi9icqaws8xpik58a3hb0r8icb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix monad-logger mwc-random + optparse-applicative statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -237133,8 +238356,8 @@ self: { }: mkDerivation { pname = "smallcheck-series"; - version = "0.7.0.0"; - sha256 = "11pb4k0y8fqfkq5ajspn5nnliskvk8qp02dzpcjrzqk27da2iwb6"; + version = "0.7.1.0"; + sha256 = "0c5cpnrxqfhrxgic6rk6vy3wj537k249fg0wzczwx30vdqzcmnkx"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -237980,6 +239203,8 @@ self: { pname = "snap-core"; version = "1.0.4.2"; sha256 = "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs"; + revision = "1"; + editedCabalFile = "065v61clskzikywv0gy9n4fjaszi2fnjklal83kqbzhzzgkf83ng"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -239573,6 +240798,7 @@ self: { ]; description = "An extensible socket library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "socket-activation" = callPackage @@ -240341,6 +241567,7 @@ self: { ]; description = "Gopher Library and Server Daemon"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "spacefill" = callPackage @@ -244651,6 +245878,34 @@ self: { broken = true; }) {}; + "stm-hamt_1_2_0_5" = callPackage + ({ mkDerivation, async, base, criterion, deferred-folds, focus + , free, hashable, list-t, mwc-random, mwc-random-monad, primitive + , primitive-extras, QuickCheck, quickcheck-instances, rebase + , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-hamt"; + version = "1.2.0.5"; + sha256 = "09hz5v2ldinyl6brrl87f46wg16y9d1fnwb5v8s17ph00sb95lgg"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t primitive + primitive-extras transformers + ]; + testHaskellDepends = [ + deferred-folds focus QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async criterion focus free list-t mwc-random mwc-random-monad + rebase + ]; + description = "STM-specialised Hash Array Mapped Trie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "stm-incremental" = callPackage ({ mkDerivation, base, hspec, stm }: mkDerivation { @@ -246130,8 +247385,8 @@ self: { pname = "streamproc"; version = "1.6.2"; sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; - revision = "1"; - editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs"; + revision = "2"; + editedCabalFile = "1j3frdzhlvmggqq07b7kiz6h7mim64n2frsb2d3hzsjd7jym526j"; libraryHaskellDepends = [ base ]; description = "Stream Processer Arrow"; license = lib.licenses.bsd3; @@ -246569,6 +247824,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "string-interpolate_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, hspec-core + , interpolate, neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.3.1.0"; + sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode template-haskell text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -247145,6 +248429,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structs_0_1_5" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "structs"; + version = "0.1.5"; + sha256 = "1qsj5w6g0lcvbrm0zs37f1yk3im1swhnb4j1mbpr3fyc3zswwbjf"; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell th-abstraction + ]; + testHaskellDepends = [ + base primitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -248967,6 +250271,28 @@ self: { broken = true; }) {}; + "swisstable" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, hashtables + , primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector + }: + mkDerivation { + pname = "swisstable"; + version = "0.1.0.2"; + sha256 = "0zffsavnxnwhzxgbwpqg38gnjywgfdk60hbg0wvpggk1zaw0ylr1"; + libraryHaskellDepends = [ base hashable primitive vector ]; + testHaskellDepends = [ + base hashable primitive QuickCheck tasty tasty-discover tasty-hunit + vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq hashable hashtables primitive QuickCheck + vector + ]; + description = "SwissTable hash map"; + license = lib.licenses.bsd3; + }) {}; + "sws" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, hourglass @@ -250516,6 +251842,7 @@ self: { testHaskellDepends = [ base network unix ]; description = "Systemd facilities (Socket activation, Notify)"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "systemstats" = callPackage @@ -252087,6 +253414,23 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-expected-failure_0_12_3" = callPackage + ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden + , tasty-hedgehog, tasty-hunit, unbounded-delays + }: + mkDerivation { + pname = "tasty-expected-failure"; + version = "0.12.3"; + sha256 = "0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb"; + libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; + testHaskellDepends = [ + base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit + ]; + description = "Mark tasty tests as failure expected"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-fail-fast" = callPackage ({ mkDerivation, base, containers, directory, stm, tagged, tasty , tasty-golden, tasty-hunit, tasty-tap @@ -254568,8 +255912,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "5"; - editedCabalFile = "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6"; + revision = "6"; + editedCabalFile = "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -254680,8 +256024,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; - revision = "2"; - editedCabalFile = "1apgf91van2070m6jhj9w3h2xmr42r4kk0da9crq9994hd8zwny2"; + revision = "3"; + editedCabalFile = "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -255988,8 +257332,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; - revision = "2"; - editedCabalFile = "17cb7p0qywf2dsrq3g8qb3ssknd9wl5k0nc2pxz9gc3l8rxpkw51"; + revision = "3"; + editedCabalFile = "1wjy98ihhipzr34b310sgjjq3cc12aydhckbrgr21kxkzwglm4nv"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -257180,6 +258524,8 @@ self: { pname = "these"; version = "1.1.1.1"; sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; + revision = "1"; + editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -258200,6 +259546,8 @@ self: { pname = "time-compat"; version = "1.9.5"; sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii"; + revision = "1"; + editedCabalFile = "1f6r8cyfgzpfg9nrsqbf99pi44fyds9wcmgwxb4s0zmlb5dbv1m5"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -259617,6 +260965,30 @@ self: { broken = true; }) {}; + "tlynx_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , monad-logger, mwc-random, optparse-applicative, parallel + , statistics, text, transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.5.0.2"; + sha256 = "1d28xk346h92imp6lnmy0g9mql8nd1zna1mnfs6mqhf38l8sm0k4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async monad-logger mwc-random + optparse-applicative parallel statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -260178,6 +261550,38 @@ self: { license = lib.licenses.mpl20; }) {}; + "tomland_1_3_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog + , hspec-megaparsec, markdown-unlit, megaparsec, mtl + , parser-combinators, text, time, transformers + , unordered-containers, validation-selective + }: + mkDerivation { + pname = "tomland"; + version = "1.3.2.0"; + sha256 = "0yj39mh4z3v3jqri38s3ylrglv657g3m7gqr2rz8ydlvx2draknc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + validation-selective + ]; + executableHaskellDepends = [ + base bytestring containers hashable text time unordered-containers + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers directory hashable hedgehog hspec + hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time + unordered-containers + ]; + description = "Bidirectional TOML serialization"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -262523,6 +263927,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "trifecta_2_1_1" = callPackage + ({ mkDerivation, ansi-terminal, array, base, blaze-builder + , blaze-html, blaze-markup, bytestring, charset, comonad + , containers, deepseq, fingertree, ghc-prim, hashable + , indexed-traversable, lens, mtl, parsers, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers + , transformers, unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "2.1.1"; + sha256 = "1lhzi0xxvilvgjy3yf3f85wfmrks562hhsnl0kg1xwji36rgwp6y"; + libraryHaskellDepends = [ + ansi-terminal array base blaze-builder blaze-html blaze-markup + bytestring charset comonad containers deepseq fingertree ghc-prim + hashable indexed-traversable lens mtl parsers prettyprinter + prettyprinter-ansi-terminal profunctors reducers transformers + unordered-containers utf8-string + ]; + testHaskellDepends = [ base parsers QuickCheck ]; + description = "A modern parser combinator library with convenient diagnostics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "trigger" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, clock, directory , exceptions, filepath, formatting, fsnotify, Glob, hspec, process @@ -264702,33 +266131,6 @@ self: { }) {}; "type-natural" = callPackage - ({ mkDerivation, base, constraints, equational-reasoning, ghc - , ghc-typelits-knownnat, ghc-typelits-natnormalise - , ghc-typelits-presburger, integer-logarithms, QuickCheck - , quickcheck-instances, tasty, tasty-discover - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell - }: - mkDerivation { - pname = "type-natural"; - version = "1.0.0.0"; - sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0"; - libraryHaskellDepends = [ - base constraints equational-reasoning ghc ghc-typelits-knownnat - ghc-typelits-natnormalise ghc-typelits-presburger - integer-logarithms template-haskell - ]; - testHaskellDepends = [ - base equational-reasoning integer-logarithms QuickCheck - quickcheck-instances tasty tasty-discover tasty-expected-failure - tasty-hunit tasty-quickcheck template-haskell - ]; - testToolDepends = [ tasty-discover ]; - description = "Type-level natural and proofs of their properties"; - license = lib.licenses.bsd3; - }) {}; - - "type-natural_1_1_0_0" = callPackage ({ mkDerivation, base, constraints, equational-reasoning, ghc , ghc-typelits-knownnat, ghc-typelits-natnormalise , ghc-typelits-presburger, integer-logarithms, QuickCheck @@ -264752,7 +266154,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Type-level natural and proofs of their properties"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "type-of-html" = callPackage @@ -265802,6 +267203,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "ua-parser_0_7_6_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, criterion, data-default + , deepseq, file-embed, filepath, HUnit, pcre-light, tasty + , tasty-hunit, tasty-quickcheck, text, yaml + }: + mkDerivation { + pname = "ua-parser"; + version = "0.7.6.0"; + sha256 = "0sakvmmf6p2ca0dbkwqdj5cv93gp78srw0zc4f1skcgndkmxwk6l"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring data-default file-embed pcre-light text yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq file-embed + filepath pcre-light text yaml + ]; + description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -267937,8 +269364,8 @@ self: { }: mkDerivation { pname = "unliftio-messagebox"; - version = "1.0.2"; - sha256 = "0pl75f3wbcy31b4firqw0y2mdl3axjdwx0w1vckidprv8sncsrm7"; + version = "2.0.0"; + sha256 = "0gwykcv91hn2pwnpwyc9032h84rdid28x34n0896319hl1rg5w9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269357,6 +270784,7 @@ self: { ]; description = "A pragmatic time and date library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "utf" = callPackage @@ -269794,8 +271222,8 @@ self: { pname = "uuid"; version = "1.3.13"; sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; - revision = "3"; - editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq"; + revision = "6"; + editedCabalFile = "06w8i9hi9ha84nmj6fcj44apzv61m3ryc0a1yxxqq5n8vznk2iya"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -269811,6 +271239,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "uuid_1_3_14" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, time, uuid-types + }: + mkDerivation { + pname = "uuid"; + version = "1.3.14"; + sha256 = "1msj296faldr9fiwjqi9ixx3xl638mg6ffk7axic14wf8b9zw73a"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 cryptohash-sha1 entropy + network-info random text time uuid-types + ]; + testHaskellDepends = [ + base bytestring QuickCheck random tasty tasty-hunit + tasty-quickcheck + ]; + description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uuid-aeson" = callPackage ({ mkDerivation, aeson, base, text, uuid }: mkDerivation { @@ -269914,8 +271364,8 @@ self: { pname = "uuid-types"; version = "1.0.3"; sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj"; - revision = "3"; - editedCabalFile = "0znx08r25sgs5j7ix8i9aikhgad0kc9i6vgkg0g3jzxk5haal9sf"; + revision = "4"; + editedCabalFile = "0ipwfd5y8021ygpadjjhchw5irm0x27dlv1k2hf4znza5v7hadcn"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random text ]; @@ -269929,6 +271379,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "uuid-types_1_0_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder + , hashable, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.4"; + sha256 = "01pc93z6in6g717mxkhl111qc842fz1c2z7ml6n5jhm7lg52ran2"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable random text + ]; + testHaskellDepends = [ + base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + description = "Type definitions for Universally Unique Identifiers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uulib" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -270697,6 +272168,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "vault_0_3_1_5" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "vault"; + version = "0.3.1.5"; + sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + description = "a persistent store for values of arbitrary types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vault-tool" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, text, unordered-containers @@ -271609,8 +273095,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.3.1.6"; - sha256 = "0s9d3g47qnzcpi2p1z60axrr53jbc6q4qyma88qxsrf6ava115ar"; + version = "0.3.1.7"; + sha256 = "1181gfxyxf2m3m23xg89kmmp8aizrm9sm908ydbkw885idh2k5x0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -272981,8 +274467,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.9.1"; - sha256 = "1rdhkxrjxcvdx3hd74xcgx28nd8ca8la5kclbxwbgciby8plpymv"; + version = "3.10"; + sha256 = "10bdm8rxak8kdiiqnjl5yw3n14zjr5gj1m9bpiiz0cabf72x54xx"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -273011,8 +274497,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.4.1"; - sha256 = "1kd8v3l6c1szip8d7aw03s9vs5bnwbm66c98wbvmbmwc46rrkksh"; + version = "0.4.2"; + sha256 = "0mf1jf5xv31818c7rarvz0aqc1qxgh7fqfp893pryhwwcr8r2qqa"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -277594,6 +279080,31 @@ self: { license = lib.licenses.mpl20; }) {}; + "with-utf8_1_0_2_2" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hedgehog + , HUnit, process, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix + }: + mkDerivation { + pname = "with-utf8"; + version = "1.0.2.2"; + sha256 = "04ymb90yli9sbdl750yh0nvpn6crnrb2axhx8hrswz5g86cabcmq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe-exceptions text ]; + executableHaskellDepends = [ + base directory filepath process safe-exceptions text th-env + ]; + testHaskellDepends = [ + base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog + tasty-hunit temporary text unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Get your IO right on the first try"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "withdependencies" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , profunctors @@ -280489,8 +282000,6 @@ self: { libraryHaskellDepends = [ base mtl transformers xml ]; description = "Extension to the xml package to extract data from parsed xml"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-hamlet" = callPackage @@ -280616,6 +282125,8 @@ self: { pname = "xml-lens"; version = "0.3"; sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz"; + revision = "1"; + editedCabalFile = "0is48y2k6lsdwd2cqwvhxfjs7q5qccis8vcmw7cws18cb7vjks1x"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -282764,8 +284275,7 @@ self: { ]; description = "Represent and parse yarn.lock files"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "yarn2nix" = callPackage @@ -282803,8 +284313,7 @@ self: { ]; description = "Convert yarn.lock files to nix expressions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "yarr" = callPackage @@ -282839,6 +284348,23 @@ self: { broken = true; }) {inherit (pkgs) libdevil;}; + "yasi" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "yasi"; + version = "0.1.1.1"; + sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Yet another string interpolator"; + license = lib.licenses.cc0; + }) {}; + "yate" = callPackage ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific , template-haskell, text, unordered-containers, vector @@ -283706,33 +285232,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, directory, file-embed, filepath - , fsnotify, http-client, http-client-tls, http-reverse-proxy - , http-types, network, optparse-applicative, process - , project-template, say, split, stm, streaming-commons, tar, text - , time, transformers, transformers-compat, unliftio - , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0.6"; - sha256 = "044xk75pymw6limz08zicxp4lw8jqf6f2ilj8i2qw2h419w3ry9f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal conduit conduit-extra containers - data-default-class directory file-embed filepath fsnotify - http-client http-client-tls http-reverse-proxy http-types network - optparse-applicative process project-template say split stm - streaming-commons tar text time transformers transformers-compat - unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib - ]; - description = "The yesod helper executable"; - license = lib.licenses.mit; - }) {}; - - "yesod-bin_1_6_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath , fsnotify, http-client, http-client-tls, http-reverse-proxy @@ -283757,7 +285256,6 @@ self: { ]; description = "The yesod helper executable"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -287256,6 +288754,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "zippers_0_3_1" = callPackage + ({ mkDerivation, base, criterion, fail, indexed-traversable, lens + , profunctors, semigroupoids, semigroups + }: + mkDerivation { + pname = "zippers"; + version = "0.3.1"; + sha256 = "17z1zi9zd6a8g7sp4zyimgwdvhjj27hj4znbm4ps0kp73gadb953"; + libraryHaskellDepends = [ + base fail indexed-traversable lens profunctors semigroupoids + semigroups + ]; + benchmarkHaskellDepends = [ base criterion lens ]; + description = "Traversal based zippers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "zippo" = callPackage ({ mkDerivation, base, mtl, yall }: mkDerivation { @@ -287793,6 +289309,29 @@ self: { broken = true; }) {}; + "zuul" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, filepath, http-client, http-client-tls + , optparse-generic, tasty, tasty-hunit, text, xdg-basedir + }: + mkDerivation { + pname = "zuul"; + version = "0.1.0.0"; + sha256 = "1agacvixl6s3np8jizmy9vbpzhbb0am9hs8qlc5sqvbg98qr8x1v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-client http-client-tls text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base containers directory filepath + optparse-generic text xdg-basedir + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A zuul client library"; + license = lib.licenses.asl20; + }) {}; + "zxcvbn-c" = callPackage ({ mkDerivation, base }: mkDerivation { diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index 7a7d6a933bc..0484f4c59ba 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) - ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] + ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ] ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index ad95edb68cb..a3de9225d1c 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -61,7 +61,7 @@ let "--enable-avplay" "--enable-shared" "--enable-runtime-cpudetect" - "--cc=cc" + "--cc=${stdenv.cc.targetPrefix}cc" (enableFeature enableGPL "gpl") (enableFeature enableGPL "swscale") (enableFeature mp3Support "libmp3lame") diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 3b5da68a59d..52d294525a0 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - makeFlags = [ "PREFIX=$(out)" "CXX=c++" ]; + makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 23d82d4ba2f..ee3cf93bc21 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { else "generic" # "chooses options that should be OK for most platforms" }" - "CXX=c++" + "CXX=${stdenv.cc.targetPrefix}c++" ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index b79de9278d4..251a3f9f55b 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; - makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"]; postFixup = '' ${lib.optionalString (stdenv.isLinux) '' diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index ce905bff17c..7cacab9bdf4 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { mathastext pgf relsize + sansmath sfmath siunitx xcolor diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 0d1a331798c..8f3e1aba350 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libbasename = "libzn_poly"; libext = stdenv.targetPlatform.extensions.sharedLibrary; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 38dcee84a92..ba3164db11a 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index b493dbd5a06..8ef1c3627f0 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,23 +1,26 @@ { stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum -, fpath, ke, logs, lwt, ocamlgraph, uri, rresult +, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64 , result, bigstringaf, optint, mirage-flow, domain-name, emile , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt }: buildDunePackage rec { pname = "git"; - version = "3.2.0"; + version = "3.3.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "14rq7h1n5v2n0507ycbac8sq21xnzhgirxmlmqv4j5k3aajdcj16"; + sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0"; }; + buildInputs = [ + base64 + ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow @@ -31,7 +34,7 @@ buildDunePackage rec { meta = { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ sternenseemann vbgl ]; homepage = "https://github.com/mirage/ocaml-git"; }; } diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 37be4c68ad4..58ac0204b4b 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -6,6 +6,7 @@ , tcpip, awa-mirage, mirage-flow , alcotest, alcotest-lwt, base64, cstruct , ke, mirage-crypto-rng, ocurl, git-binary +, ptime }: buildDunePackage { @@ -14,6 +15,14 @@ buildDunePackage { useDune2 = true; + patches = [ + # https://github.com/mirage/ocaml-git/pull/472 + (fetchpatch { + url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch"; + sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my"; + }) + ]; + buildInputs = [ awa awa-mirage cmdliner git-cohttp-unix mirage-clock mirage-clock-unix tcpip @@ -26,17 +35,10 @@ buildDunePackage { ]; checkInputs = [ alcotest alcotest-lwt base64 cstruct ke - mirage-crypto-rng ocurl git-binary + mirage-crypto-rng ocurl git-binary ptime ]; doCheck = true; - patches = [ - (fetchpatch { - url = "https://github.com/mirage/ocaml-git/commit/09b41073fa869c0a595e1d8ed7224d539682af1c.patch"; - sha256 = "1avbxv60gbrll9gny1pl6jwbx5b8282h3frhzy2ghb0fx1pggp6w"; - }) - ]; - meta = { description = "Unix backend for the Git protocol(s)"; inherit (git.meta) homepage license maintainers; diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index 166c4c6b853..fe13377b3c2 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage -, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri +, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri , repr, ppx_irmin, bheap }: @@ -13,7 +13,6 @@ buildDunePackage { propagatedBuildInputs = [ astring - base64 digestif fmt jsonm diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 6e4598dd986..ca205cac4e1 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -1,4 +1,6 @@ -{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin }: +{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin +, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix +}: buildDunePackage rec { @@ -10,8 +12,14 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - # test requires network - doCheck = false; + doCheck = true; + checkInputs = [ + alcotest + alcotest-lwt + logs + cohttp-lwt-unix + yojson + ]; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/pkgs/development/ocaml-modules/irmin/layers.nix b/pkgs/development/ocaml-modules/irmin/layers.nix index 9e6b237f1e2..40410b004ae 100644 --- a/pkgs/development/ocaml-modules/irmin/layers.nix +++ b/pkgs/development/ocaml-modules/irmin/layers.nix @@ -12,9 +12,6 @@ buildDunePackage { lwt ]; - # mutual dependency on irmin-test - doCheck = false; - meta = irmin.meta // { description = "Combine different Irmin stores into a single, layered store"; }; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 91fd1155181..1d605763ab5 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1b6lav5br1b83cwdc3gj9mqkzhlbfjrbyjx0107zvj54m82dbrxb"; + sha256 = "131pcgmpys6danprcbxzf4pdsl0ka74bpmmxz8db4507cvxhsz3n"; }; minimumOCamlVersion = "4.08"; @@ -18,13 +18,10 @@ buildDunePackage rec { ppxlib ]; - # tests depend on irmin, would create mutual dependency - doCheck = false; - meta = { homepage = "https://irmin.org/"; description = "PPX deriver for Irmin generics"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ vbgl sternenseemann ]; }; } diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index d2f040609d3..f55a2fe7509 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { preBuild = '' export HOME=$(mktemp -d) + export GO111MODULE=off ''; # tests requires cluster for testing diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index e60b40c7fd4..775ad6937dc 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6"; }; - makeFlags = [ "CC=cc prefix=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 2d4dba61b87..d3bca0b684c 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb-compat-0_1 ]; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index fc041f2ee8d..2fd98490287 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index bc7d4b1b3dc..8b9646713e8 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' # Manually copy, make install copies to /usr/local/bin diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 0206821f387..a2c00ddc149 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; targets = (optionalString server "server") + (optionalString client " client"); - makeFlags = [ "-C source/src" "CXX=c++" targets ]; + makeFlags = [ "-C source/src" "CXX=${stdenv.cc.targetPrefix}c++" targets ]; desktop = makeDesktopItem { name = "AssaultCube"; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 7b644aa7147..11ac23fcef3 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp -, tileMode ? false, enableSound ? tileMode +, tileMode ? false, enableSound ? tileMode, buildPackages # MacOS / Darwin builds , darwin ? null @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++" "FORCE_PKGCONFIG=y" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "DATADIR=${placeholder "out"}" diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index d6ba771de7e..f9939f063c8 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux sed \ - -e 's,^CC=.*$,CC=cc,' \ + -e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ -e 's,^CFLAGS=-g,CFLAGS=,' \ diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index 8716a82fc10..2e9f1a9c2b9 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; - makeFlags = ["CC=cc"]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./bcc-warning-fix.patch ]; diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix index 08068debeef..1e939538cda 100644 --- a/pkgs/misc/emulators/simh/default.nix +++ b/pkgs/misc/emulators/simh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; + makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; preInstall = '' install -d ${placeholder "out"}/bin diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index f6b76066863..87b7d33c5d8 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; preBuild = " - makeFlagsArray=(prefix=$out E=echo RANLIB=ranlib INSTALL='install -c') + makeFlagsArray=(prefix=$out E=echo RANLIB=${stdenv.cc.targetPrefix}ranlib INSTALL='install -c') "; # Work around a broken Makefile. diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index b848a868274..5e8bb550cf9 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config +, libuuid +}: stdenv.mkDerivation rec { pname = "nvme-cli"; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libuuid ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index e5a461b0e0e..014ac4c54be 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 ] ++ lib.optional enableXinerama libXinerama; - buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index d0d0ef90e68..4021bc92e06 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { postPatch = '' for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ - --replace "= gcc" "=cc" \ - --replace "= g++" "=c++" \ + --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \ + --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \ --replace "-DGNU_RUNTIME=1" "" \ --replace "-fgnu-runtime" "-fobjc-nonfragile-abi" done diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 6affd3ec662..df8ca279107 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; - makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; + makeFlags = lib.optionals stdenv.cc.isClang [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dt $out/bin bchunk diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 70ab6db07c2..795589a64ec 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { dontConfigure = true; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install --directory --mode=755 $out/bin diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 85b95a6f769..c6e0a3a2851 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 596ea053166..78ce2d39f09 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,15 +1,19 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: stdenv.mkDerivation rec { - version = "0.631"; + version = "0.640"; pname = "lrzip"; src = fetchurl { - url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2"; - sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d"; + url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; + sha256 = "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9"; }; - buildInputs = [ zlib lzo bzip2 nasm perl ]; + buildInputs = [ zlib lzo bzip2 lz4 nasm perl ]; + + configureFlags = [ + "--disable-asm" + ]; meta = { homepage = "http://ck.kolivas.org/apps/lrzip/"; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index e4a8b705a16..18a156ea504 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; - makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat configurePhase = '' sed -i s,/usr,$out, Makefile diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index 92890c056b1..7f57cab585b 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/tools/misc/convfont/default.nix index aeecb053212..501c4e29a41 100644 --- a/pkgs/tools/misc/convfont/default.nix +++ b/pkgs/tools/misc/convfont/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 convfont $out/bin/convfont diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index 8caf4cb706f..0c5ffb4a6de 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 7a066428687..5a1452007af 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; postInstall = '' diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 25eee1c7b83..dfde5a9113b 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkg-config ]; - makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 1b760298191..66344c9fdee 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [xlibsWrapper]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -pv "$out/bin" diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 1f0831fb890..8b8c0018c66 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7"; }; - makeFlags = [ "CC=cc" ]; # gcc and/or clang compat + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat installPhase = '' install -D -m ugo=rx connect $out/bin/connect diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index 869cd46b330..d31751e7d5c 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make CC=cc posix + make CC=${stdenv.cc.targetPrefix}cc posix ''; installPhase = '' diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 6ff8ba096b4..a682e15891f 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o" - ] ++ lib.optional stdenv.isDarwin "CC=cc"; + ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 579026f07ca..a185c09bda6 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./apg.patch diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index b58163630c6..891311ddaa0 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index fcf9c4c1ac2..b072b3b5574 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 460838965a0..bdd7d18923f 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 3c58eda6501..f39349b2fbf 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 -t $out/bin src/boxes diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 32620fe98c5..92737e27ee3 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D {,$out/bin/}yamdi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a70ec8166cf..d77b084f777 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -284,6 +284,7 @@ in grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { + go = buildPackages.go_1_15; writePython3 = buildPackages.writers.writePython3; }; @@ -1295,7 +1296,9 @@ in gaia = callPackage ../development/libraries/gaia { }; - galene = callPackage ../servers/web-apps/galene {}; + galene = callPackage ../servers/web-apps/galene { + buildGoModule = buildGo115Module; + }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1361,6 +1364,8 @@ in hime = callPackage ../tools/inputmethods/hime {}; + hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; + hostctl = callPackage ../tools/system/hostctl { }; hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; @@ -2805,6 +2810,7 @@ in step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; + buildGoModule = buildGo115Module; }; step-cli = callPackage ../tools/security/step-cli { }; @@ -3293,7 +3299,9 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { + go = go_1_15; + }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -8658,7 +8666,9 @@ in uwsgi = callPackage ../servers/uwsgi { }; - v2ray = callPackage ../tools/networking/v2ray { }; + v2ray = callPackage ../tools/networking/v2ray { + buildGoModule = buildGo115Module; + }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; @@ -10201,31 +10211,31 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_15; + go = go_1_16; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -17079,7 +17089,9 @@ in tremor = callPackage ../development/libraries/tremor { }; - trillian = callPackage ../tools/misc/trillian { }; + trillian = callPackage ../tools/misc/trillian { + buildGoModule = buildGo115Module; + }; twolame = callPackage ../development/libraries/twolame { }; @@ -17534,7 +17546,7 @@ in go = buildPackages.go_1_16; }; - buildGoPackage = buildGo115Package; + buildGoPackage = buildGo116Package; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; @@ -17546,7 +17558,7 @@ in go = buildPackages.go_1_16; }; - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -17885,7 +17897,9 @@ in grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo115Module; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -18093,7 +18107,9 @@ in nsq = callPackage ../servers/nsq { }; - oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + oauth2_proxy = callPackage ../servers/oauth2_proxy { + buildGoModule = buildGo115Module; + }; openbgpd = callPackage ../servers/openbgpd { }; @@ -18371,7 +18387,9 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo115Package; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -21630,7 +21648,9 @@ in coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim { + buildGoPackage = buildGo115Package; + }; cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; @@ -23913,7 +23933,9 @@ in ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = callPackage ../tools/misc/nncp { }; + nncp = callPackage ../tools/misc/nncp { + go = go_1_15; + }; notion = callPackage ../applications/window-managers/notion { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b37fedfaef..b78a29ed59f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8914,6 +8914,20 @@ let }; }; + gotofile = buildPerlPackage { + pname = "goto-file"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/goto-file-0.005.tar.gz"; + sha256 = "c6cdd5ee4a6cdcbdbf314d92a4f9985dbcdf9e4258048cae76125c052aa31f77"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Stop parsing the current file and move on to a different one"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Graph = buildPerlPackage { pname = "Graph"; version = "0.9712"; @@ -11798,6 +11812,20 @@ let }; }; + LongJump = buildPerlPackage { + pname = "Long-Jump"; + version = "0.000001"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Long-Jump-0.000001.tar.gz"; + sha256 = "d5d6456d86992b559d8f66fc90960f919292cd3803c13403faac575762c77af4"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Mechanism for returning to a specific point from a deeply nested stack"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LWP = buildPerlPackage { pname = "libwww-perl"; version = "6.49"; @@ -19794,6 +19822,55 @@ let }; }; + Test2Harness = buildPerlPackage { + pname = "Test2-Harness"; + version = "1.000042"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz"; + sha256 = "aaf231a68af1a6ffd6a11188875fcf572e373e43c8285945227b9d687b43db2d"; + }; + + checkPhase = '' + patchShebangs ./t ./scripts/yath + ./scripts/yath test -j $NIX_BUILD_CORES + ''; + + propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ]; + meta = { + description = "A new and improved test harness with better Test2 integration"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Test2PluginMemUsage = buildPerlPackage { + pname = "Test2-Plugin-MemUsage"; + version = "0.002003"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-MemUsage-0.002003.tar.gz"; + sha256 = "5e0662d5a823ae081641f5ce82843111eec1831cd31f883a6c6de54afdf87c25"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Collect and display memory usage information"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Test2PluginUUID = buildPerlPackage { + pname = "Test2-Plugin-UUID"; + version = "0.002001"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-UUID-0.002001.tar.gz"; + sha256 = "4c6c8d484d7153d8779dc155a992b203095b5c5aa1cfb1ee8bcedcd0601878c9"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ DataUUID ]; + meta = { + description = "Use REAL UUIDs in Test2"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; version = "0.09";