diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ca562d2e456..40e2b8fcefb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -46,7 +46,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; - sdkVer = "24"; + sdkVer = "29"; ndkVer = "18b"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; @@ -54,7 +54,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; - sdkVer = "24"; + sdkVer = "29"; ndkVer = "18b"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 41a39e3d699..1da72ed7de5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3394,10 +3394,14 @@ name = "Hlodver Sigurdsson"; }; hugoreeves = { - email = "hugolreeves@gmail.com"; + email = "hugo@hugoreeves.com"; github = "hugoreeves"; githubId = 20039091; name = "Hugo Reeves"; + keys = [{ + longkeyid = "rsa4096/0x49FA39F8A7F735F9"; + fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; + }]; }; hodapp = { email = "hodapp87@gmail.com"; @@ -7351,6 +7355,12 @@ githubId = 1153271; name = "Sander van der Burg"; }; + sarcasticadmin = { + email = "rob@sarcasticadmin.com"; + github = "sarcasticadmin"; + githubId = 30531572; + name = "Robert James Hernandez"; + }; sargon = { email = "danielehlers@mindeye.net"; github = "sargon"; @@ -9484,6 +9494,12 @@ github = "fzakaria"; githubId = 605070; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; yevhenshymotiuk = { name = "Yevhen Shymotiuk"; email = "yevhenshymotiuk@gmail.com"; diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 166aec25512..0b8651e8f42 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -204,6 +204,16 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; Note: Password support is only avaiable in GRUB version 2. + + + Following its deprecation in 20.03, the Perl NixOS test driver has been removed. + All remaining tests have been ported to the Python test framework. + Code outside nixpkgs using make-test.nix or + testing.nix needs to be ported to + make-test-python.nix and + testing-python.nix respectively. + + @@ -223,6 +233,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; There is a new module that provides doas, a lighter alternative to sudo with many of the same features. + + + + Hercules CI Agent is a specialized build agent for projects built with Nix. See the options and setup. + diff --git a/nixos/lib/test-driver/Logger.pm b/nixos/lib/test-driver/Logger.pm deleted file mode 100644 index a3384084a0e..00000000000 --- a/nixos/lib/test-driver/Logger.pm +++ /dev/null @@ -1,75 +0,0 @@ -package Logger; - -use strict; -use Thread::Queue; -use XML::Writer; -use Encode qw(decode encode); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - -sub new { - my ($class) = @_; - - my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null"; - my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile")); - - my $self = { - log => $log, - logQueue => Thread::Queue->new() - }; - - $self->{log}->startTag("logfile"); - - bless $self, $class; - return $self; -} - -sub close { - my ($self) = @_; - $self->{log}->endTag("logfile"); - $self->{log}->end; -} - -sub drainLogQueue { - my ($self) = @_; - while (defined (my $item = $self->{logQueue}->dequeue_nb())) { - $self->{log}->dataElement("line", sanitise($item->{msg}), 'machine' => $item->{machine}, 'type' => 'serial'); - } -} - -sub maybePrefix { - my ($msg, $attrs) = @_; - $msg = $attrs->{machine} . ": " . $msg if defined $attrs->{machine}; - return $msg; -} - -sub nest { - my ($self, $msg, $coderef, $attrs) = @_; - print STDERR maybePrefix("$msg\n", $attrs); - $self->{log}->startTag("nest"); - $self->{log}->dataElement("head", $msg, %{$attrs}); - my $now = clock_gettime(CLOCK_MONOTONIC); - $self->drainLogQueue(); - eval { &$coderef }; - my $res = $@; - $self->drainLogQueue(); - $self->log(sprintf("(%.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); - $self->{log}->endTag("nest"); - die $@ if $@; -} - -sub sanitise { - my ($s) = @_; - $s =~ s/[[:cntrl:]\xff]//g; - $s = decode('UTF-8', $s, Encode::FB_DEFAULT); - return encode('UTF-8', $s, Encode::FB_CROAK); -} - -sub log { - my ($self, $msg, $attrs) = @_; - chomp $msg; - print STDERR maybePrefix("$msg\n", $attrs); - $self->drainLogQueue(); - $self->{log}->dataElement("line", $msg, %{$attrs}); -} - -1; diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm deleted file mode 100644 index 4d3d63cd2db..00000000000 --- a/nixos/lib/test-driver/Machine.pm +++ /dev/null @@ -1,734 +0,0 @@ -package Machine; - -use strict; -use threads; -use Socket; -use IO::Handle; -use POSIX qw(dup2); -use FileHandle; -use Cwd; -use File::Basename; -use File::Path qw(make_path); -use File::Slurp; -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - - -my $showGraphics = defined $ENV{'DISPLAY'}; - -my $sharedDir; - - -sub new { - my ($class, $args) = @_; - - my $startCommand = $args->{startCommand}; - - my $name = $args->{name}; - if (!$name) { - $startCommand =~ /run-(.*)-vm$/ if defined $startCommand; - $name = $1 || "machine"; - } - - if (!$startCommand) { - # !!! merge with qemu-vm.nix. - my $netBackend = "-netdev user,id=net0"; - my $netFrontend = "-device virtio-net-pci,netdev=net0"; - - $netBackend .= "," . $args->{netBackendArgs} - if defined $args->{netBackendArgs}; - - $netFrontend .= "," . $args->{netFrontendArgs} - if defined $args->{netFrontendArgs}; - - $startCommand = - "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS "; - - if (defined $args->{hda}) { - if ($args->{hdaInterface} eq "scsi") { - $startCommand .= "-drive id=hda,file=" - . Cwd::abs_path($args->{hda}) - . ",werror=report,if=none " - . "-device scsi-hd,drive=hda "; - } else { - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) - . ",if=" . $args->{hdaInterface} - . ",werror=report "; - } - } - - $startCommand .= "-cdrom $args->{cdrom} " - if defined $args->{cdrom}; - $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " - if defined $args->{usb}; - $startCommand .= "-bios $args->{bios} " - if defined $args->{bios}; - $startCommand .= $args->{qemuFlags} || ""; - } - - my $tmpDir = $ENV{'TMPDIR'} || "/tmp"; - unless (defined $sharedDir) { - $sharedDir = $tmpDir . "/xchg-shared"; - make_path($sharedDir, { mode => 0700, owner => $< }); - } - - my $allowReboot = 0; - $allowReboot = $args->{allowReboot} if defined $args->{allowReboot}; - - my $self = { - startCommand => $startCommand, - name => $name, - allowReboot => $allowReboot, - booted => 0, - pid => 0, - connected => 0, - socket => undef, - stateDir => "$tmpDir/vm-state-$name", - monitor => undef, - log => $args->{log}, - redirectSerial => $args->{redirectSerial} // 1, - }; - - mkdir $self->{stateDir}, 0700; - - bless $self, $class; - return $self; -} - - -sub log { - my ($self, $msg) = @_; - $self->{log}->log($msg, { machine => $self->{name} }); -} - - -sub nest { - my ($self, $msg, $coderef, $attrs) = @_; - $self->{log}->nest($msg, $coderef, { %{$attrs || {}}, machine => $self->{name} }); -} - - -sub name { - my ($self) = @_; - return $self->{name}; -} - - -sub stateDir { - my ($self) = @_; - return $self->{stateDir}; -} - - -sub start { - my ($self) = @_; - return if $self->{booted}; - - $self->log("starting vm"); - - # Create a socket pair for the serial line input/output of the VM. - my ($serialP, $serialC); - socketpair($serialP, $serialC, PF_UNIX, SOCK_STREAM, 0) or die; - - # Create a Unix domain socket to which QEMU's monitor will connect. - my $monitorPath = $self->{stateDir} . "/monitor"; - unlink $monitorPath; - my $monitorS; - socket($monitorS, PF_UNIX, SOCK_STREAM, 0) or die; - bind($monitorS, sockaddr_un($monitorPath)) or die "cannot bind monitor socket: $!"; - listen($monitorS, 1) or die; - - # Create a Unix domain socket to which the root shell in the guest will connect. - my $shellPath = $self->{stateDir} . "/shell"; - unlink $shellPath; - my $shellS; - socket($shellS, PF_UNIX, SOCK_STREAM, 0) or die; - bind($shellS, sockaddr_un($shellPath)) or die "cannot bind shell socket: $!"; - listen($shellS, 1) or die; - - # Start the VM. - my $pid = fork(); - die if $pid == -1; - - if ($pid == 0) { - close $serialP; - close $monitorS; - close $shellS; - if ($self->{redirectSerial}) { - open NUL, "{stateDir}; - $ENV{SHARED_DIR} = $sharedDir; - $ENV{USE_TMPDIR} = 1; - $ENV{QEMU_OPTS} = - ($self->{allowReboot} ? "" : "-no-reboot ") . - "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . - "-device virtio-serial -device virtconsole,chardev=shell " . - "-device virtio-rng-pci " . - ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); - chdir $self->{stateDir} or die; - exec $self->{startCommand}; - die "running VM script: $!"; - } - - # Process serial line output. - close $serialC; - - threads->create(\&processSerialOutput, $self, $serialP)->detach; - - sub processSerialOutput { - my ($self, $serialP) = @_; - while (<$serialP>) { - chomp; - s/\r$//; - print STDERR $self->{name}, "# $_\n"; - $self->{log}->{logQueue}->enqueue({msg => $_, machine => $self->{name}}); # !!! - } - } - - eval { - local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; }; - - # Wait until QEMU connects to the monitor. - accept($self->{monitor}, $monitorS) or die; - - # Wait until QEMU connects to the root shell socket. QEMU - # does so immediately; this doesn't mean that the root shell - # has connected yet inside the guest. - accept($self->{socket}, $shellS) or die; - $self->{socket}->autoflush(1); - }; - die "$@" if $@; - - $self->waitForMonitorPrompt; - - $self->log("QEMU running (pid $pid)"); - - $self->{pid} = $pid; - $self->{booted} = 1; -} - - -# Send a command to the monitor and wait for it to finish. TODO: QEMU -# also has a JSON-based monitor interface now, but it doesn't support -# all commands yet. We should use it once it does. -sub sendMonitorCommand { - my ($self, $command) = @_; - $self->log("sending monitor command: $command"); - syswrite $self->{monitor}, "$command\n"; - return $self->waitForMonitorPrompt; -} - - -# Wait until the monitor sends "(qemu) ". -sub waitForMonitorPrompt { - my ($self) = @_; - my $res = ""; - my $s; - while (sysread($self->{monitor}, $s, 1024)) { - $res .= $s; - last if $res =~ s/\(qemu\) $//; - } - return $res; -} - - -# Call the given code reference repeatedly, with 1 second intervals, -# until it returns 1 or a timeout is reached. -sub retry { - my ($coderef) = @_; - my $n; - for ($n = 899; $n >=0; $n--) { - return if &$coderef($n); - sleep 1; - } - die "action timed out after $n seconds"; -} - - -sub connect { - my ($self) = @_; - return if $self->{connected}; - - $self->nest("waiting for the VM to finish booting", sub { - - $self->start; - - my $now = clock_gettime(CLOCK_MONOTONIC); - local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; }; - alarm 600; - readline $self->{socket} or die "the VM quit before connecting\n"; - alarm 0; - - $self->log("connected to guest root shell"); - # We're interested in tracking how close we are to `alarm`. - $self->log(sprintf("(connecting took %.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); - $self->{connected} = 1; - - }); -} - - -sub waitForShutdown { - my ($self) = @_; - return unless $self->{booted}; - - $self->nest("waiting for the VM to power off", sub { - waitpid $self->{pid}, 0; - $self->{pid} = 0; - $self->{booted} = 0; - $self->{connected} = 0; - }); -} - - -sub isUp { - my ($self) = @_; - return $self->{booted} && $self->{connected}; -} - - -sub execute_ { - my ($self, $command) = @_; - - $self->connect; - - print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n"); - - my $out = ""; - - while (1) { - my $line = readline($self->{socket}); - die "connection to VM lost unexpectedly" unless defined $line; - #$self->log("got line: $line"); - if ($line =~ /^(.*)\|\!\=EOF\s+(\d+)$/) { - $out .= $1; - $self->log("exit status $2"); - return ($2, $out); - } - $out .= $line; - } -} - - -sub execute { - my ($self, $command) = @_; - my @res; - $self->nest("running command: $command", sub { - @res = $self->execute_($command); - }); - return @res; -} - - -sub succeed { - my ($self, @commands) = @_; - - my $res; - foreach my $command (@commands) { - $self->nest("must succeed: $command", sub { - my ($status, $out) = $self->execute_($command); - if ($status != 0) { - $self->log("output: $out"); - die "command `$command' did not succeed (exit code $status)\n"; - } - $res .= $out; - }); - } - - return $res; -} - - -sub mustSucceed { - succeed @_; -} - - -sub waitUntilSucceeds { - my ($self, $command) = @_; - $self->nest("waiting for success: $command", sub { - retry sub { - my ($status, $out) = $self->execute($command); - return 1 if $status == 0; - }; - }); -} - - -sub waitUntilFails { - my ($self, $command) = @_; - $self->nest("waiting for failure: $command", sub { - retry sub { - my ($status, $out) = $self->execute($command); - return 1 if $status != 0; - }; - }); -} - - -sub fail { - my ($self, $command) = @_; - $self->nest("must fail: $command", sub { - my ($status, $out) = $self->execute_($command); - die "command `$command' unexpectedly succeeded" - if $status == 0; - }); -} - - -sub mustFail { - fail @_; -} - - -sub getUnitInfo { - my ($self, $unit, $user) = @_; - my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user); - return undef if $status != 0; - my $info = {}; - foreach my $line (split '\n', $lines) { - $line =~ /^([^=]+)=(.*)$/ or next; - $info->{$1} = $2; - } - return $info; -} - -sub systemctl { - my ($self, $q, $user) = @_; - if ($user) { - $q =~ s/'/\\'/g; - return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'"); - } - - return $self->execute("systemctl $q"); -} - -# Fail if the given systemd unit is not in the "active" state. -sub requireActiveUnit { - my ($self, $unit) = @_; - $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub { - my $info = $self->getUnitInfo($unit); - my $state = $info->{ActiveState}; - if ($state ne "active") { - die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n"; - }; - }); -} - -# Wait for a systemd unit to reach the "active" state. -sub waitForUnit { - my ($self, $unit, $user) = @_; - $self->nest("waiting for unit ‘$unit’", sub { - retry sub { - my $info = $self->getUnitInfo($unit, $user); - my $state = $info->{ActiveState}; - die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; - if ($state eq "inactive") { - # If there are no pending jobs, then assume this unit - # will never reach active state. - my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user); - if ($jobs =~ /No jobs/) { # FIXME: fragile - # Handle the case where the unit may have started - # between the previous getUnitInfo() and - # list-jobs. - my $info2 = $self->getUnitInfo($unit); - die "unit ‘$unit’ is inactive and there are no pending jobs\n" - if $info2->{ActiveState} eq $state; - } - } - return 1 if $state eq "active"; - }; - }); -} - - -sub waitForJob { - my ($self, $jobName) = @_; - return $self->waitForUnit($jobName); -} - - -# Wait until the specified file exists. -sub waitForFile { - my ($self, $fileName) = @_; - $self->nest("waiting for file ‘$fileName’", sub { - retry sub { - my ($status, $out) = $self->execute("test -e $fileName"); - return 1 if $status == 0; - } - }); -} - -sub startJob { - my ($self, $jobName, $user) = @_; - $self->systemctl("start $jobName", $user); - # FIXME: check result -} - -sub stopJob { - my ($self, $jobName, $user) = @_; - $self->systemctl("stop $jobName", $user); -} - - -# Wait until the machine is listening on the given TCP port. -sub waitForOpenPort { - my ($self, $port) = @_; - $self->nest("waiting for TCP port $port", sub { - retry sub { - my ($status, $out) = $self->execute("nc -z localhost $port"); - return 1 if $status == 0; - } - }); -} - - -# Wait until the machine is not listening on the given TCP port. -sub waitForClosedPort { - my ($self, $port) = @_; - retry sub { - my ($status, $out) = $self->execute("nc -z localhost $port"); - return 1 if $status != 0; - } -} - - -sub shutdown { - my ($self) = @_; - return unless $self->{booted}; - - print { $self->{socket} } ("poweroff\n"); - - $self->waitForShutdown; -} - - -sub crash { - my ($self) = @_; - return unless $self->{booted}; - - $self->log("forced crash"); - - $self->sendMonitorCommand("quit"); - - $self->waitForShutdown; -} - - -# Make the machine unreachable by shutting down eth1 (the multicast -# interface used to talk to the other VMs). We keep eth0 up so that -# the test driver can continue to talk to the machine. -sub block { - my ($self) = @_; - $self->sendMonitorCommand("set_link virtio-net-pci.1 off"); -} - - -# Make the machine reachable. -sub unblock { - my ($self) = @_; - $self->sendMonitorCommand("set_link virtio-net-pci.1 on"); -} - - -# Take a screenshot of the X server on :0.0. -sub screenshot { - my ($self, $filename) = @_; - my $dir = $ENV{'out'} || Cwd::abs_path("."); - $filename = "$dir/${filename}.png" if $filename =~ /^\w+$/; - my $tmp = "${filename}.ppm"; - my $name = basename($filename); - $self->nest("making screenshot ‘$name’", sub { - $self->sendMonitorCommand("screendump $tmp"); - system("pnmtopng $tmp > ${filename}") == 0 - or die "cannot convert screenshot"; - unlink $tmp; - }, { image => $name } ); -} - -# Get the text of TTY -sub getTTYText { - my ($self, $tty) = @_; - - my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}"); - return $out; -} - -# Wait until TTY's text matches a particular regular expression -sub waitUntilTTYMatches { - my ($self, $tty, $regexp) = @_; - - $self->nest("waiting for $regexp to appear on tty $tty", sub { - retry sub { - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:"); - $self->log($self->getTTYText($tty)); - } - - return 1 if $self->getTTYText($tty) =~ /$regexp/; - } - }); -} - -# Debugging: Dump the contents of the TTY -sub dumpTTYContents { - my ($self, $tty) = @_; - - $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat"); -} - -# Take a screenshot and return the result as text using optical character -# recognition. -sub getScreenText { - my ($self) = @_; - - system("command -v tesseract &> /dev/null") == 0 - or die "getScreenText used but enableOCR is false"; - - my $text; - $self->nest("performing optical character recognition", sub { - my $tmpbase = Cwd::abs_path(".")."/ocr"; - my $tmpin = $tmpbase."in.ppm"; - - $self->sendMonitorCommand("screendump $tmpin"); - - my $magickArgs = "-filter Catrom -density 72 -resample 300 " - . "-contrast -normalize -despeckle -type grayscale " - . "-sharpen 1 -posterize 3 -negate -gamma 100 " - . "-blur 1x65535"; - my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2"; - - $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`; - my $status = $? >> 8; - unlink $tmpin; - - die "OCR failed with exit code $status" if $status != 0; - }); - return $text; -} - - -# Wait until a specific regexp matches the textual contents of the screen. -sub waitForText { - my ($self, $regexp) = @_; - $self->nest("waiting for $regexp to appear on the screen", sub { - retry sub { - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on the screen, which currently contains:"); - $self->log($self->getScreenText); - } - - return 1 if $self->getScreenText =~ /$regexp/; - } - }); -} - - -# Wait until it is possible to connect to the X server. Note that -# testing the existence of /tmp/.X11-unix/X0 is insufficient. -sub waitForX { - my ($self, $regexp) = @_; - $self->nest("waiting for the X11 server", sub { - retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); - return 0 if $status != 0; - ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); - return 1 if $status == 0; - } - }); -} - - -sub getWindowNames { - my ($self) = @_; - my $res = $self->mustSucceed( - q{xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'}); - return split /\n/, $res; -} - - -sub waitForWindow { - my ($self, $regexp) = @_; - $self->nest("waiting for a window to appear", sub { - retry sub { - my @names = $self->getWindowNames; - - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:"); - $self->log(join(", ", @names)); - } - - foreach my $n (@names) { - return 1 if $n =~ /$regexp/; - } - } - }); -} - - -sub copyFileFromHost { - my ($self, $from, $to) = @_; - my $s = `cat $from` or die; - $s =~ s/'/'\\''/g; - $self->mustSucceed("echo '$s' > $to"); -} - - -my %charToKey = ( - 'A' => "shift-a", 'N' => "shift-n", '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02", - 'B' => "shift-b", 'O' => "shift-o", '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03", - 'C' => "shift-c", 'P' => "shift-p", '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04", - 'D' => "shift-d", 'Q' => "shift-q", ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05", - 'E' => "shift-e", 'R' => "shift-r", ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06", - 'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07", - 'G' => "shift-g", 'T' => "shift-t", '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08", - 'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09", - 'I' => "shift-i", 'V' => "shift-v", ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A", - 'J' => "shift-j", 'W' => "shift-w", '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B", - 'K' => "shift-k", 'X' => "shift-x", '/' => "0x35", '?' => "shift-0x35", - 'L' => "shift-l", 'Y' => "shift-y", ' ' => "spc", - 'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret", -); - - -sub sendKeys { - my ($self, @keys) = @_; - foreach my $key (@keys) { - $key = $charToKey{$key} if exists $charToKey{$key}; - $self->sendMonitorCommand("sendkey $key"); - } -} - - -sub sendChars { - my ($self, $chars) = @_; - $self->nest("sending keys ‘$chars’", sub { - $self->sendKeys(split //, $chars); - }); -} - - -# Sleep N seconds (in virtual guest time, not real time). -sub sleep { - my ($self, $time) = @_; - $self->succeed("sleep $time"); -} - - -# Forward a TCP port on the host to a TCP port on the guest. Useful -# during interactive testing. -sub forwardPort { - my ($self, $hostPort, $guestPort) = @_; - $hostPort = 8080 unless defined $hostPort; - $guestPort = 80 unless defined $guestPort; - $self->sendMonitorCommand("hostfwd_add tcp::$hostPort-:$guestPort"); -} - - -1; diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl deleted file mode 100644 index a3354fb0e1e..00000000000 --- a/nixos/lib/test-driver/test-driver.pl +++ /dev/null @@ -1,191 +0,0 @@ -#! /somewhere/perl -w - -use strict; -use Machine; -use Term::ReadLine; -use IO::File; -use IO::Pty; -use Logger; -use Cwd; -use POSIX qw(_exit dup2); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - -$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly - -STDERR->autoflush(1); - -my $log = new Logger; - - -# Start vde_switch for each network required by the test. -my %vlans; -foreach my $vlan (split / /, $ENV{VLANS} || "") { - next if defined $vlans{$vlan}; - # Start vde_switch as a child process. We don't run it in daemon - # mode because we want the child process to be cleaned up when we - # die. Since we have to make sure that the control socket is - # ready, we send a dummy command to vde_switch (via stdin) and - # wait for a reply. Note that vde_switch requires stdin to be a - # TTY, so we create one. - $log->log("starting VDE switch for network $vlan"); - my $socket = Cwd::abs_path "./vde$vlan.ctl"; - my $pty = new IO::Pty; - my ($stdoutR, $stdoutW); pipe $stdoutR, $stdoutW; - my $pid = fork(); die "cannot fork" unless defined $pid; - if ($pid == 0) { - dup2(fileno($pty->slave), 0); - dup2(fileno($stdoutW), 1); - exec "vde_switch -s $socket --dirmode 0700" or _exit(1); - } - close $stdoutW; - print $pty "version\n"; - readline $stdoutR or die "cannot start vde_switch"; - $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket; - $vlans{$vlan} = $pty; - die unless -e "$socket/ctl"; -} - - -my %vms; -my $context = ""; - -sub createMachine { - my ($args) = @_; - my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"}); - $vms{$vm->name} = $vm; - $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; - return $vm; -} - -foreach my $vmScript (@ARGV) { - my $vm = createMachine({startCommand => $vmScript}); -} - - -sub startAll { - $log->nest("starting all VMs", sub { - $_->start foreach values %vms; - }); -} - - -# Wait until all VMs have terminated. -sub joinAll { - $log->nest("waiting for all VMs to finish", sub { - $_->waitForShutdown foreach values %vms; - }); -} - - -# In interactive tests, this allows the non-interactive test script to -# be executed conveniently. -sub testScript { - eval "$context $ENV{testScript};\n"; - warn $@ if $@; -} - - -my $nrTests = 0; -my $nrSucceeded = 0; - - -sub subtest { - my ($name, $coderef) = @_; - $log->nest("subtest: $name", sub { - $nrTests++; - eval { &$coderef }; - if ($@) { - $log->log("error: $@", { error => 1 }); - } else { - $nrSucceeded++; - } - }); -} - - -sub runTests { - if (defined $ENV{tests}) { - $log->nest("running the VM test script", sub { - eval "$context $ENV{tests}"; - if ($@) { - $log->log("error: $@", { error => 1 }); - die $@; - } - }, { expanded => 1 }); - } else { - my $term = Term::ReadLine->new('nixos-vm-test'); - $term->ReadHistory; - while (defined ($_ = $term->readline("> "))) { - eval "$context $_\n"; - warn $@ if $@; - } - $term->WriteHistory; - } - - # Copy the kernel coverage data for each machine, if the kernel - # has been compiled with coverage instrumentation. - $log->nest("collecting coverage data", sub { - foreach my $vm (values %vms) { - my $gcovDir = "/sys/kernel/debug/gcov"; - - next unless $vm->isUp(); - - my ($status, $out) = $vm->execute("test -e $gcovDir"); - next if $status != 0; - - # Figure out where to put the *.gcda files so that the - # report generator can find the corresponding kernel - # sources. - my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*"); - chomp $kernelDir; - my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir"; - - # Copy all the *.gcda files. - $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done"); - } - }); - - $log->nest("syncing", sub { - foreach my $vm (values %vms) { - next unless $vm->isUp(); - $vm->execute("sync"); - } - }); - - if ($nrTests != 0) { - $log->log("$nrSucceeded out of $nrTests tests succeeded", - ($nrSucceeded < $nrTests ? { error => 1 } : { })); - } -} - - -# Create an empty raw virtual disk with the given name and size (in -# MiB). -sub createDisk { - my ($name, $size) = @_; - system("qemu-img create -f raw $name ${size}M") == 0 - or die "cannot create image of size $size"; -} - - -END { - $log->nest("cleaning up", sub { - foreach my $vm (values %vms) { - if ($vm->{pid}) { - $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")"); - kill 9, $vm->{pid}; - } - } - }); - $log->close(); -} - -my $now1 = clock_gettime(CLOCK_MONOTONIC); - -runTests; - -my $now2 = clock_gettime(CLOCK_MONOTONIC); - -printf STDERR "test script finished in %.2fs\n", $now2 - $now1; - -exit ($nrSucceeded < $nrTests ? 1 : 0); diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix deleted file mode 100644 index 5c784c2f0ab..00000000000 --- a/nixos/lib/testing.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ system -, pkgs ? import ../.. { inherit system config; } - # Use a minimal kernel? -, minimal ? false - # Ignored -, config ? {} - # Modules to add to each VM -, extraConfigurations ? [] }: - -with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; -with pkgs; - -rec { - - inherit pkgs; - - - testDriver = lib.warn '' - Perl VM tests are deprecated and will be removed for 20.09. - Please update your tests to use the python test driver. - See https://github.com/NixOS/nixpkgs/pull/71684 for details. - '' stdenv.mkDerivation { - name = "nixos-test-driver"; - - buildInputs = [ makeWrapper perl ]; - - dontUnpack = true; - - preferLocalBuild = true; - - installPhase = - '' - mkdir -p $out/bin - cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver - chmod u+x $out/bin/nixos-test-driver - - libDir=$out/${perl.libPrefix} - mkdir -p $libDir - cp ${./test-driver/Machine.pm} $libDir/Machine.pm - cp ${./test-driver/Logger.pm} $libDir/Logger.pm - - wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}" - ''; - }; - - - # Run an automated test suite in the given virtual network. - # `driver' is the script that runs the network. - runTests = driver: - stdenv.mkDerivation { - name = "vm-test-run-${driver.testName}"; - - requiredSystemFeatures = [ "kvm" "nixos-test" ]; - - buildCommand = - '' - mkdir -p $out - - LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver - - for i in */xchg/coverage-data; do - mkdir -p $out/coverage-data - mv $i $out/coverage-data/$(dirname $(dirname $i)) - done - ''; - }; - - - makeTest = - { testScript - , makeCoverageReport ? false - , enableOCR ? false - , name ? "unnamed" - , ... - } @ t: - - let - # A standard store path to the vm monitor is built like this: - # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor - # The max filename length of a unix domain socket is 108 bytes. - # This means $name can at most be 50 bytes long. - maxTestNameLen = 50; - testNameLen = builtins.stringLength name; - - testDriverName = with builtins; - if testNameLen > maxTestNameLen then - abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + - "it's currently ${toString testNameLen} characters long.") - else - "nixos-test-driver-${name}"; - - nodes = buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { })); - - testScript' = - # Call the test script with the computed nodes. - if lib.isFunction testScript - then testScript { inherit nodes; } - else testScript; - - vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); - - vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - - ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; - - imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - - # Generate onvenience wrappers for running the test driver - # interactively with the specified network, and for starting the - # VMs from the command line. - driver = runCommand testDriverName - { buildInputs = [ makeWrapper]; - testScript = testScript'; - preferLocalBuild = true; - testName = name; - } - '' - mkdir -p $out/bin - echo "$testScript" > $out/test-script - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) - wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ - --run "export testScript=\"\$(cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests 'startAll; joinAll;' \ - --set VLANS '${toString vlans}' \ - ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} - ''; # " - - passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or {}) // t.meta; - }; - - test = passMeta (runTests driver); - report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - - nodeNames = builtins.attrNames nodes; - invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; - - in - if lib.length invalidNodeNames > 0 then - throw '' - Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as perl variables in the testing framework which will break the - script when special characters are used. - - Please stick to alphanumeric chars and underscores as separation. - '' - else - (if makeCoverageReport then report else test) // { - inherit nodes driver test; - }; - - runInMachine = - { drv - , machine - , preBuild ? "" - , postBuild ? "" - , ... # ??? - }: - let - vm = buildVM { } - [ machine - { key = "run-in-machine"; - networking.hostName = "client"; - nix.readOnlyStore = false; - virtualisation.writableStore = false; - } - ]; - - buildrunner = writeText "vm-build" '' - source $1 - - ${coreutils}/bin/mkdir -p $TMPDIR - cd $TMPDIR - - exec $origBuilder $origArgs - ''; - - testScript = '' - startAll; - $client->waitForUnit("multi-user.target"); - ${preBuild} - $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); - ${postBuild} - $client->succeed("sync"); # flush all data before pulling the plug - ''; - - vmRunCommand = writeText "vm-run" '' - xchg=vm-state-client/xchg - ${coreutils}/bin/mkdir $out - ${coreutils}/bin/mkdir -p $xchg - - for i in $passAsFile; do - i2=''${i}Path - _basename=$(${coreutils}/bin/basename ''${!i2}) - ${coreutils}/bin/cp ''${!i2} $xchg/$_basename - eval $i2=/tmp/xchg/$_basename - ${coreutils}/bin/ls -la $xchg - done - - unset i i2 _basename - export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env - unset xchg - - export tests='${testScript}' - ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm - ''; # */ - - in - lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = ["-e" vmRunCommand]; - origArgs = attrs.args; - origBuilder = attrs.builder; - }); - - - runInMachineWithX = { require ? [], ... } @ args: - let - client = - { ... }: - { - inherit require; - imports = [ - ../tests/common/auto.nix - ]; - virtualisation.memorySize = 1024; - services.xserver.enable = true; - test-support.displayManager.auto.enable = true; - services.xserver.displayManager.defaultSession = "none+icewm"; - services.xserver.windowManager.icewm.enable = true; - }; - in - runInMachine ({ - machine = client; - preBuild = - '' - $client->waitForX; - ''; - } // args); - - - simpleTest = as: (makeTest as).test; - -} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df68b8ceb04..c837976286b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -262,6 +262,7 @@ ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agents.nix ./services/continuous-integration/hail.nix + ./services/continuous-integration/hercules-ci-agent/default.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index cfc65b347bc..2ee10454fd2 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -23,11 +23,17 @@ in default = []; description = "List of packages to be added to apparmor's include path"; }; + parserConfig = mkOption { + type = types.str; + default = ""; + description = "AppArmor parser configuration file content"; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; + environment.etc."apparmor/parser.conf".text = cfg.parserConfig; boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix new file mode 100644 index 00000000000..4aed493c0fb --- /dev/null +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -0,0 +1,213 @@ +/* + +This file is for options that NixOS and nix-darwin have in common. + +Platform-specific code is in the respective default.nix files. + + */ + +{ config, lib, options, pkgs, ... }: + +let + inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule; + + cfg = + config.services.hercules-ci-agent; + + format = pkgs.formats.toml {}; + + settingsModule = { config, ... }: { + freeformType = format.type; + options = { + baseDirectory = mkOption { + type = types.path; + default = "/var/lib/hercules-ci-agent"; + description = '' + State directory (secrets, work directory, etc) for agent + ''; + }; + concurrentTasks = mkOption { + description = '' + Number of tasks to perform simultaneously, such as evaluations, derivations. + + You must have a total capacity across agents of at least 2 concurrent tasks on x86_64-linux + to allow for import from derivation. + ''; + type = types.int; + default = 4; + }; + workDirectory = mkOption { + description = '' + The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation. + ''; + type = types.path; + default = config.baseDirectory + "/work"; + defaultText = literalExample ''baseDirectory + "/work"''; + }; + staticSecretsDirectory = mkOption { + description = '' + This is the default directory to look for statically configured secrets like cluster-join-token.key. + ''; + type = types.path; + default = config.baseDirectory + "/secrets"; + defaultText = literalExample ''baseDirectory + "/secrets"''; + }; + clusterJoinTokenPath = mkOption { + description = '' + Location of the cluster-join-token.key file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/cluster-join-token.key"; + defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + binaryCachesPath = mkOption { + description = '' + Location of the binary-caches.json file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/binary-caches.json"; + defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + }; + }; + + checkNix = + if !cfg.checkNix + then "" + else if lib.versionAtLeast config.nix.package.version "2.4.0" + then "" + else pkgs.stdenv.mkDerivation { + name = "hercules-ci-check-system-nix-src"; + inherit (config.nix.package) src patches; + configurePhase = ":"; + buildPhase = '' + echo "Checking in-memory pathInfoCache expiry" + if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then + cat 1>&2 <Hercules CI is a + continuous integation service that is centered around Nix. + + Support is available at help@hercules-ci.com. + ''; + }; + patchNix = mkOption { + type = types.bool; + default = false; + description = '' + Fix Nix 2.3 cache path metadata caching behavior. Has the effect of nix.package = patch pkgs.nix; + + This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release). + ''; + }; + checkNix = mkOption { + type = types.bool; + default = true; + description = '' + Whether to make sure that the system's Nix (nix-daemon) is compatible. + + If you set this to false, please keep up with the change log. + ''; + }; + package = mkOption { + description = '' + Package containing the bin/hercules-ci-agent executable. + ''; + type = types.package; + default = pkgs.hercules-ci-agent; + defaultText = literalExample "pkgs.hercules-ci-agent"; + }; + settings = mkOption { + description = '' + These settings are written to the agent.toml file. + + Not all settings are listed as options, can be set nonetheless. + + For the exhaustive list of settings, see . + ''; + type = types.submoduleWith { modules = [ settingsModule ]; }; + }; + + /* + Internal and/or computed values. + + These are written as options instead of let binding to allow sharing with + default.nix on both NixOS and nix-darwin. + */ + tomlFile = mkOption { + type = types.path; + internal = true; + defaultText = "generated hercules-ci-agent.toml"; + description = '' + The fully assembled config file. + ''; + }; + }; + + config = mkIf cfg.enable { + nix.extraOptions = lib.addContextFrom checkNix '' + # A store path that was missing at first may well have finished building, + # even shortly after the previous lookup. This *also* applies to the daemon. + narinfo-cache-negative-ttl = 0 + ''; + nix.package = mkIf cfg.patchNix patchedNix; + services.hercules-ci-agent.tomlFile = + format.generate "hercules-ci-agent.toml" cfg.settings; + }; +} diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix new file mode 100644 index 00000000000..d2e7e8e18f9 --- /dev/null +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -0,0 +1,86 @@ +/* + +This file is for NixOS-specific options and configs. + +Code that is shared with nix-darwin goes in common.nix. + + */ + +{ pkgs, config, lib, ... }: + +let + + inherit (lib) mkIf mkDefault; + + cfg = config.services.hercules-ci-agent; + + command = "${cfg.package}/bin/hercules-ci-agent --config ${cfg.tomlFile}"; + testCommand = "${command} --test-configuration"; + +in +{ + imports = [ + ./common.nix + (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"]) + ]; + + config = mkIf cfg.enable { + + systemd.services.hercules-ci-agent = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ config.nix.package ]; + serviceConfig = { + User = "hercules-ci-agent"; + ExecStart = command; + ExecStartPre = testCommand; + Restart = "on-failure"; + RestartSec = 120; + StartLimitBurst = 30 * 1000000; # practically infinite + }; + }; + + # Changes in the secrets do not affect the unit in any way that would cause + # a restart, which is currently necessary to reload the secrets. + systemd.paths.hercules-ci-agent-restart-files = { + wantedBy = [ "hercules-ci-agent.service" ]; + pathConfig = { + Unit = "hercules-ci-agent-restarter.service"; + PathChanged = [ cfg.settings.clusterJoinTokenPath cfg.settings.binaryCachesPath ]; + }; + }; + systemd.services.hercules-ci-agent-restarter = { + serviceConfig.Type = "oneshot"; + script = '' + # Wait a bit, with the effect of bundling up file changes into a single + # run of this script and hopefully a single restart. + sleep 10 + if systemctl is-active --quiet hercules-ci-agent.service; then + if ${testCommand}; then + systemctl restart hercules-ci-agent.service + else + echo 1>&2 "WARNING: Not restarting agent because config is not valid at this time." + fi + else + echo 1>&2 "Not restarting hercules-ci-agent despite config file update, because it is not already active." + fi + ''; + }; + + # Trusted user allows simplified configuration and better performance + # when operating in a cluster. + nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; + services.hercules-ci-agent.settings.nixUserIsTrusted = true; + + users.users.hercules-ci-agent = { + home = cfg.settings.baseDirectory; + createHome = true; + group = "hercules-ci-agent"; + description = "Hercules CI Agent system user"; + isSystemUser = true; + }; + + users.groups.hercules-ci-agent = {}; + }; +} diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 05f87df43bc..302aa1ed7c4 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -322,7 +322,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you want, you can tweak the Emacs package itself from your emacs.nix. For example, if you want to have a GTK 3-based Emacs instead of the default GTK 2-based binary and remove the - automatically generated emacs.desktop (useful is you + automatically generated emacs.desktop (useful if you only use emacsclient), you can change your file emacs.nix in this way: diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ece2d091f5a..7223d95774e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -106,11 +106,28 @@ in rec { (onFullSupported "nixos.tests.networking.scripted.bridge") (onFullSupported "nixos.tests.networking.scripted.dhcpOneIf") (onFullSupported "nixos.tests.networking.scripted.dhcpSimple") + (onFullSupported "nixos.tests.networking.scripted.link") (onFullSupported "nixos.tests.networking.scripted.loopback") (onFullSupported "nixos.tests.networking.scripted.macvlan") + (onFullSupported "nixos.tests.networking.scripted.privacy") + (onFullSupported "nixos.tests.networking.scripted.routes") (onFullSupported "nixos.tests.networking.scripted.sit") (onFullSupported "nixos.tests.networking.scripted.static") + (onFullSupported "nixos.tests.networking.scripted.virtual") (onFullSupported "nixos.tests.networking.scripted.vlan") + (onFullSupported "nixos.tests.networking.networkd.bond") + (onFullSupported "nixos.tests.networking.networkd.bridge") + (onFullSupported "nixos.tests.networking.networkd.dhcpOneIf") + (onFullSupported "nixos.tests.networking.networkd.dhcpSimple") + (onFullSupported "nixos.tests.networking.networkd.link") + (onFullSupported "nixos.tests.networking.networkd.loopback") + (onFullSupported "nixos.tests.networking.networkd.macvlan") + (onFullSupported "nixos.tests.networking.networkd.privacy") + (onFullSupported "nixos.tests.networking.networkd.routes") + (onFullSupported "nixos.tests.networking.networkd.sit") + (onFullSupported "nixos.tests.networking.networkd.static") + (onFullSupported "nixos.tests.networking.networkd.virtual") + (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b922032e3f6..fabd525dd90 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -49,6 +49,7 @@ in ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; + charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix new file mode 100644 index 00000000000..acba41e228a --- /dev/null +++ b/nixos/tests/charliecloud.nix @@ -0,0 +1,43 @@ +# This test checks charliecloud image construction and run + +import ./make-test-python.nix ({ pkgs, ...} : let + + dockerfile = pkgs.writeText "Dockerfile" '' + FROM nix + RUN mkdir /home /tmp + RUN touch /etc/passwd /etc/group + CMD ["true"] + ''; + +in { + name = "charliecloud"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bzizou ]; + }; + + nodes = { + host = { ... }: { + environment.systemPackages = [ pkgs.charliecloud ]; + virtualisation.docker.enable = true; + users.users.alice = { + isNormalUser = true; + extraGroups = [ "docker" ]; + }; + }; + }; + + testScript = '' + host.start() + host.wait_for_unit("docker.service") + host.succeed( + 'su - alice -c "docker load --input=${pkgs.dockerTools.examples.nix}"' + ) + host.succeed( + "cp ${dockerfile} /home/alice/Dockerfile" + ) + host.succeed('su - alice -c "ch-build -t hello ."') + host.succeed('su - alice -c "ch-builder2tar hello /var/tmp"') + host.succeed('su - alice -c "ch-tar2dir /var/tmp/hello.tar.gz /var/tmp"') + host.succeed('su - alice -c "ch-run /var/tmp/hello -- echo Running_From_Container_OK"') + ''; +}) diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix deleted file mode 100644 index cee5da93454..00000000000 --- a/nixos/tests/make-test.nix +++ /dev/null @@ -1,9 +0,0 @@ -f: { - system ? builtins.currentSystem, - pkgs ? import ../.. { inherit system; config = {}; }, - ... -} @ args: - -with import ../lib/testing.nix { inherit system pkgs; }; - -makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f228d34a654..c48e342977e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -531,6 +531,12 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; })); + orgit-forge = super.orgit-forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { HOME = "/tmp"; diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix new file mode 100644 index 00000000000..e48ee4dd13c --- /dev/null +++ b/pkgs/applications/editors/gophernotes/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gophernotes"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "gopherdata"; + repo = "gophernotes"; + rev = "v${version}"; + sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27"; + }; + + vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs"; + + meta = with lib; { + description = "Go kernel for Jupyter notebooks"; + homepage = "https://github.com/gopherdata/gophernotes"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 72e84620252..130c0af6ee2 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.7"; + version = "3.10.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; + sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; }; passthru = { diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix new file mode 100644 index 00000000000..0378c4db13b --- /dev/null +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, mkDerivation, dpkg, fetchurl, qtbase }: + +let + # To obtain the version you will need to run the following command: + # + # dpkg-deb -I ${odafileconverter.src} | grep Version + version = "21.7.0.0"; + rpath = "$ORIGIN:${lib.makeLibraryPath [ stdenv.cc.cc qtbase ]}"; + +in mkDerivation { + pname = "oda-file-converter"; + inherit version; + nativeBuildInputs = [ dpkg ]; + + src = fetchurl { + # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time) + url = "https://download.opendesign.com/guestfiles/ODAFileConverter/ODAFileConverter_QT5_lnxX64_7.2dll.deb"; + sha256 = "0sa21nnwzqb6g7gl0z43smqgcd9h3xipj3cq2cl7ybfh3cvcxfi9"; + }; + + unpackPhase = '' + dpkg -x $src oda_unpacked + sourceRoot=$PWD/oda_unpacked + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec + cp -vr $sourceRoot/usr/share $out/share + ''; + + dontWrapQtApps = true; + fixupPhase = '' + echo "setting interpreter" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/libexec/ODAFileConverter + patchelf --set-rpath '${rpath}' $out/libexec/ODAFileConverter + wrapQtApp $out/libexec/ODAFileConverter + mv $out/libexec/ODAFileConverter $out/bin + + find $out/libexec -type f -executable | while read file; do + echo "patching $file" + patchelf --set-rpath '${rpath}' $file + done + ''; + + meta = with stdenv.lib; { + description = "For converting between different versions of .dwg and .dxf"; + homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + license = licenses.unfree; + maintainers = with maintainers; [ nagisa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 548d49422b5..008d19576da 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "0w63yx4c60r05nfswv61jw3l3zbl5n1s396a6f4ayn52fb6rxwg1"; + sha256 = "16rwhpyk0zqks9z9bv2a1a8vww2m6867kg33bjbr29hawjg68jql"; }; - cargoSha256 = "06xpk04nxkm7h4nn235x8a4gi0qhscj8kkl2f9gqphlfmm56kjfn"; + cargoSha256 = "19w9gm389lj1zwhyjifhc2fzkvrvqvyc80lwxz070cnj11ir2l9m"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 21a34539b86..ab528a2c1cb 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5.3"; + version = "9.5.4"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4"; + sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b"; + sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ="; }; }; in diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 38662bf7f69..64b1be363f3 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,15 +1,14 @@ { stdenv , pkgconfig , python3 -, fetchhg -, fetchpatch +, fetchFromGitLab , gtk3 , glib , gdbm , gtkspell3 , ofono , itstool -, libappindicator-gtk3 +, libayatana-appindicator-gtk3 , perlPackages , glibcLocales , meson @@ -18,22 +17,16 @@ stdenv.mkDerivation rec { pname = "modem-manager-gui"; - version = "0.0.19.1"; + version = "0.0.20"; - src = fetchhg { - url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; - rev = "version ${version}"; - sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "modem-manager-gui"; + rev = "upstream%2F${version}"; + sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; - patches = [ - # Fix docs build - (fetchpatch { - url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw"; - sha256 = "033nrlhjlk0zvadv5g9n2id53ajagswf77mda0ixnrskyi7wiig7"; - }) - ]; - nativeBuildInputs = [ pkgconfig python3 @@ -49,7 +42,7 @@ stdenv.mkDerivation rec { gdbm gtkspell3 ofono - libappindicator-gtk3 + libayatana-appindicator-gtk3 ]; postPatch = '' @@ -66,7 +59,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; - maintainers = with maintainers; [ ahuzik ]; + maintainers = with maintainers; [ ahuzik galagora ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index e21cd5b3f0f..ee5ea9d7e03 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.11"; + version = "1.8.12"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj"; + sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8"; }; patches = [ diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix new file mode 100644 index 00000000000..37f2a3584ee --- /dev/null +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, python3Packages +, x11Support ? !stdenv.isDarwin +, xclip ? null +, pbcopy ? null +, useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat +}: +let + wrapperPath = with stdenv.lib; makeBinPath ( + optional x11Support xclip ++ + optional stdenv.isDarwin pbcopy + ); +in +python3Packages.buildPythonPackage rec { + version = "0.9.1"; + pname = "tremc"; + + src = fetchFromGitHub { + owner = "tremc"; + repo = pname; + rev = "0.9.1"; + sha256 = "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm"; + }; + + buildInputs = with python3Packages; [ + python + wrapPython + ]; + + pythonPath = with python3Packages; [ + ipy + pyperclip + ] ++ + stdenv.lib.optional useGeoIP GeoIP; + + phases = [ "unpackPhase" "installPhase" ]; + + makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"]; + + installPhase = '' + make DESTDIR=$out install + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Curses interface for transmission"; + homepage = "https://github.com/tremc/tremc"; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index e396f1c4a91..519b1f98138 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,29 +2,27 @@ let pname = "alt-ergo"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; - sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9"; + sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; }; - preConfigure = "patchShebangs ./configure"; - nativeBuildInputs = [ which ]; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; buildInputs = with ocamlPackages; [ menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -32,7 +30,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src preConfigure nativeBuildInputs; + inherit pname version src nativeBuildInputs; configureFlags = pname; diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index a316952a010..54663f9c5e6 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchFromGitHub, python }: +{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: stdenv.mkDerivation rec { - version = "0.12"; + version = "0.18"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v"; + sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq"; }; - buildInputs = [ python ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ + docker + (python3.withPackages (ps: [ ps.lark-parser ps.requests ])) + ]; + + configureFlags = let + pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]); + in [ + "--with-python=${pythonEnv}/bin/python3" + ]; preConfigure = '' - substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' patchShebangs test/ + substituteInPlace configure.ac --replace "/usr/bin/env" "${coreutils}/bin/env" ''; makeFlags = [ @@ -24,12 +34,16 @@ stdenv.mkDerivation rec { "LIBEXEC_DIR=lib/charliecloud" ]; + # Charliecloud calls some external system tools. + # Here we wrap those deps so they are resolved inside nixpkgs. postInstall = '' - mkdir -p $out/share/charliecloud - mv $out/lib/charliecloud/examples $out/share/charliecloud - mv $out/lib/charliecloud/test $out/share/charliecloud + for file in $out/bin/* ; do \ + wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} + done ''; + passthru.tests.charliecloud = nixosTests.charliecloud; + meta = { description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers"; longDescription = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6b76ea24e3d..7c26ada9392 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -136,8 +136,13 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); - installPhase = optionalString (stdenv.isLinux) '' + installPhase = '' cd ./go/src/${goPackagePath} + install -Dm755 ./components/cli/docker $out/libexec/docker/docker + + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" + '' + optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -153,11 +158,6 @@ rec { # systemd install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service '' + '' - install -Dm755 ./components/cli/docker $out/libexec/docker/docker - - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - # completion (cli) installShellCompletion --bash ./components/cli/contrib/completion/bash/docker installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix new file mode 100644 index 00000000000..08a30b6085c --- /dev/null +++ b/pkgs/applications/window-managers/windowchef/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libxcb, libXrandr +, xcbutil, xcbutilkeysyms, xcbutilwm, xcbproto +}: + +stdenv.mkDerivation rec { + pname = "windowchef"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "tudurom"; + repo = "windowchef"; + rev = "v${version}"; + sha256 = "02fvb8fxnkpzb0vpbsl6rf7ssdrvw6mlm43qvl2sxq7zb88zdw96"; + }; + + buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A stacking window manager that cooks windows with orders from the Waitron"; + homepage = "https://github.com/tudurom/windowchef"; + maintainers = with maintainers; [ bhougland ]; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 68d840f1614..3f895d9cfed 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -68,7 +68,17 @@ done mkdir -p $out/lib/firmware for module in $(cat closure); do - for i in $(modinfo -F firmware $module); do + # for builtin modules, modinfo will reply with a wrong output looking like: + # $ modinfo -F firmware unix + # name: unix + # + # There is a pending attempt to fix this: + # https://github.com/NixOS/nixpkgs/pull/96153 + # https://lore.kernel.org/linux-modules/20200823215433.j5gc5rnsmahpf43v@blumerang/T/#u + # + # For now, the workaround is just to filter out the extraneous lines out + # of its output. + for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do mkdir -p "$out/lib/firmware/$(dirname "$i")" echo "firmware for $module: $i" cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix index 95dfd38b12a..4e6c38b032c 100644 --- a/pkgs/build-support/rust/fetchcrate.nix +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -1,10 +1,13 @@ { lib, fetchurl, unzip }: -{ crateName +{ crateName ? args.pname +, pname ? null , version , sha256 , ... } @ args: +assert pname == null || pname == crateName; + lib.overrideDerivation (fetchurl ({ name = "${crateName}-${version}.tar.gz"; @@ -30,6 +33,6 @@ lib.overrideDerivation (fetchurl ({ fi mv "$unpackDir/$fn" "$out" ''; -} // removeAttrs args [ "crateName" "version" ])) +} // removeAttrs args [ "crateName" "pname" "version" ])) # Hackety-hack: we actually need unzip hooks, too (x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 441a51033b6..9fc4b46c952 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "1.059"; + version = "1.062"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ @@ -15,7 +15,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0dlv8nrcqdn5vn3s918in5ph6kx6rg607kgp66p6ibpbg2s8ljy7"; + sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 7bb779d1d13..10819d49ed3 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -30,4 +30,34 @@ androidndk = androidComposition.ndk-bundle; targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; }; + + "21" = + let + ndkVersion = "21.0.6113669"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_21; + }; + } diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index c58457b71a4..9b9d1f7481d 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -6,6 +6,7 @@ let let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; in { + mkFlutter = mkFlutter; stable = mkFlutter rec { pname = "flutter"; channel = "stable"; diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 761681a1d4f..d3835d01e5a 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -62,8 +62,15 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 06266556cf3..a5d2bb5c88d 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -59,8 +59,15 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 35440a82607..371a369496e 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -59,8 +59,15 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index 821ac70a76d..e26eacca204 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -62,8 +62,15 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 975a3ce1e2f..22a9e6e25f9 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -62,8 +62,15 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index e87d11a4682..6f9f577743f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -38,7 +38,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200731" +, version ? "8.11.20200824" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -69,7 +69,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO @@ -110,8 +110,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "380638a33691ba43fdcd2e18bca636750e5f66f1"; - sha256 = "029cgiyhddvwnx5zx31i0vgj13zsvzb8fna99zr6ifscz6x7rid1"; + rev = "3f50154591ada9064351ccec4adfe6df53ca2439"; + sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index c54c782fafa..bbf8a579919 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -1,11 +1,14 @@ { haskellLib }: -let inherit (haskellLib) doJailbreak dontHaddock; +let inherit (haskellLib) doJailbreak dontHaddock dontCheck; in self: super: { + ghcjs = super.ghcjs.override { + shelly = super.shelly_1_8_1; + }; ghc-api-ghcjs = super.ghc-api-ghcjs.override { happy = self.happy_1_19_5; }; - haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; + haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs); haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); } diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 6d56c410aab..7b6fbc460a9 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -102,7 +102,6 @@ in stdenv.mkDerivation { inherit passthru; - meta.broken = true; # build does not succeed - meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; + meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; } diff --git a/pkgs/development/compilers/kcc/default.nix b/pkgs/development/compilers/kcc/default.nix new file mode 100644 index 00000000000..49851dd0c07 --- /dev/null +++ b/pkgs/development/compilers/kcc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }: + +stdenv.mkDerivation rec { + pname = "kcc"; + + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kcc"; + rev = version; + sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4"; + }; + + nativeBuildInputs = [ cmake bison flex ]; + + buildInputs = [ boost ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "KnightOS C compiler"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 131ad6ede3e..676af26adab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -375,6 +375,7 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; + trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -920,7 +921,12 @@ self: super: { # Generate cli completions for dhall. dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (super.dhall-nix); + dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" ( + super.dhall-nix.overrideScope (self: super: { + dhall = super.dhall_1_34_0; + repline = self.repline_0_4_0_0; + haskeline = self.haskeline_0_8_1_0; + })); # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -1155,13 +1161,6 @@ self: super: { # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 binary-instances = dontCheck super.binary-instances; - # Disabling the test suite lets the build succeed on older CPUs - # that are unable to run the generated library because they - # lack support for AES-NI, like some of our Hydra build slaves - # do. See https://github.com/NixOS/nixpkgs/issues/81915 for - # details. - cryptonite = dontCheck super.cryptonite; - # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; @@ -1333,6 +1332,12 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + # Fixed upstream but not released to Hackage yet: + # https://github.com/k0001/hs-libsodium/issues/2 + libsodium = overrideCabal super.libsodium (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; + }); + # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; @@ -1415,12 +1420,12 @@ self: super: { }); # Testsuite trying to run `which haskeline-examples-Test` - haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; + haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; # Requires repline 0.4 which is the default only for ghc8101, override for the rest zre = super.zre.override { repline = self.repline_0_4_0_0.override { - haskeline = self.haskeline_0_8_0_0; + haskeline = self.haskeline_0_8_1_0; }; }; @@ -1441,26 +1446,35 @@ self: super: { # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431. # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. - # So let's not go there any just disable the tests altogether. + # So let's not go there and just disable the tests altogether. hspec-core = dontCheck super.hspec-core; + # github.com/ucsd-progsys/liquidhaskell/issues/1729 + liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; + Diff_0_3_4 = dontCheck super.Diff_0_3_4; + + # We want the latest version of cryptonite. This is a first step towards + # resolving https://github.com/NixOS/nixpkgs/issues/81915. + cryptonite = self.cryptonite_0_27; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let hlsScopeOverride = self: super: { # haskell-language-server uses its own fork of ghcide # Test disabled: it seems to freeze (is it just that it takes a long time ?) - ghcide = dontCheck self.hls-ghcide; + ghcide = dontCheck super.hls-ghcide; # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; + hie-bios = dontCheck super.hie-bios_0_7_0; + lsp-test = dontCheck super.lsp-test_0_11_0_4; # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; # brittany has an aeson upper bound of 1.5 brittany = doJailbreak super.brittany; }; in { - haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); + # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) + haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); fourmolu = super.fourmolu.overrideScope hlsScopeOverride; } 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 f2dd8942b8c..5fcff7d9df9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -62,14 +62,16 @@ self: super: { # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; - pandoc = doJailbreak super.pandoc; system-fileio = doJailbreak super.system-fileio; unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. dhall = self.dhall_1_34_0; lens = self.lens_4_19_2; + optics = self.optics_0_3; optics-core = self.optics-core_0_3_0_1; + optics-extra = self.optics-extra_0_3; + optics-th = self.optics-th_0_3_0_2; repline = self.repline_0_4_0_0; singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; @@ -117,4 +119,10 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); + # We want the latest version of Pandoc. + pandoc = self.pandoc_2_10_1; + pandoc-citeproc = self.pandoc-citeproc_0_17_0_2; + pandoc-plot = self.pandoc-plot_0_9_2_0; + pandoc-types = self.pandoc-types_1_21; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9b0b88eaef..82dbdcf9334 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -64,7 +64,7 @@ core-packages: # # WARNING: This list is generated semiautomatically based on the most recent # LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that commend will be +# comment saying "# LTS Haskell x.y". Any changes after that comment will be # lost the next time `update-stackage.sh` runs. default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.10 + # LTS Haskell 16.11 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -207,7 +207,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0 - - amqp-utils ==0.4.4.0 + - amqp-utils ==0.4.4.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 @@ -262,7 +262,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.3 - - aura ==3.1.7 + - aura ==3.1.8 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 @@ -366,7 +366,7 @@ default-package-overrides: - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 - - byte-count-reader ==0.10.0.1 + - byte-count-reader ==0.10.1.1 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.5 + - extra ==1.7.6 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -808,7 +808,7 @@ default-package-overrides: - floatshow ==0.2.4 - flow ==1.0.21 - flush-queue ==1.0.0 - - fmlist ==0.9.3 + - fmlist ==0.9.4 - fmt ==0.6.1.2 - fn ==0.3.0.2 - focus ==1.0.1.3 @@ -1277,7 +1277,7 @@ default-package-overrides: - jwt ==0.10.0 - kan-extensions ==5.2 - kanji ==3.4.1 - - katip ==0.8.4.0 + - katip ==0.8.5.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 @@ -1348,7 +1348,7 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.1 + - ListLike ==4.7.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 @@ -1433,7 +1433,7 @@ default-package-overrides: - midi ==0.2.2.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.0 - - mime-mail-ses ==0.4.1 + - mime-mail-ses ==0.4.2 - mime-types ==0.1.0.9 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 @@ -1558,7 +1558,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.3.4.0 + - nonempty-containers ==0.3.4.1 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.0.2 @@ -1613,7 +1613,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.15.1.0 - optparse-generic ==1.3.1 - - optparse-simple ==0.1.1.2 + - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - ormolu ==0.1.2.0 @@ -1859,7 +1859,7 @@ default-package-overrides: - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 - - registry ==0.1.9.1 + - registry ==0.1.9.3 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.3 @@ -1902,7 +1902,7 @@ default-package-overrides: - safe ==0.3.19 - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - - safe-exceptions ==0.1.7.0 + - safe-exceptions ==0.1.7.1 - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 @@ -1978,7 +1978,7 @@ default-package-overrides: - servant-purescript ==0.10.0.0 - servant-rawm ==0.3.2.0 - servant-server ==0.16.2 - - servant-static-th ==0.2.3.0 + - servant-static-th ==0.2.4.0 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.23.11 @@ -2328,7 +2328,7 @@ default-package-overrides: - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - - unicode-transforms ==0.3.6 + - unicode-transforms ==0.3.7 - unification-fd ==0.10.0.1 - union-find ==0.2 - uniplate ==1.6.12 @@ -2395,7 +2395,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.1.0 + - vector-sized ==1.4.2 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2498,7 +2498,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.4.0 + - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.1 - yesod ==1.6.1.0 - yesod-auth ==1.6.10 @@ -2560,12 +2560,13 @@ extra-packages: - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - dhall == 1.29.0 # required for spago 0.14.0. + - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - doctemplates == 0.8 # required by pandoc-2.9.x - - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 - - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 + - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 + - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - haddock == 2.23.* # required on GHC < 8.10.x @@ -2579,9 +2580,9 @@ extra-packages: - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle + - hslua == 1.1.2 # required for pandoc 2.10 - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - - hslua == 1.1.2 # required for pandoc 2.10 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors @@ -2604,6 +2605,7 @@ extra-packages: - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - shelly ==1.8.1 # ghcjs depends on shelly < 1.9 - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet @@ -2756,17 +2758,26 @@ dont-distribute-packages: - accelerate-examples - accelerate-fft - accelerate-fourier-benchmark + - accelerate-io-array + - accelerate-io-bmp + - accelerate-io-bytestring + - accelerate-io-cereal + - accelerate-io-JuicyPixels + - accelerate-io-repa + - accelerate-io-vector - accelerate-llvm-ptx - bindings-yices - boolector - ccelerate-cuda + - containers-accelerate - cplex-hs - - cuda # 2020-08-18 because of dependency nvidia-x11 - cublas + - cuda # 2020-08-18 because of dependency nvidia-x11 - cufft - cusolver - cusparse - gloss-raster-accelerate + - hashable-accelerate - libnvvm - matlab - nvvm @@ -3670,6 +3681,7 @@ broken-packages: - cap - Capabilities - capability + - capataz - capnp - capped-list - capri @@ -3959,8 +3971,9 @@ broken-packages: - complexity - compose-trans - composite-aeson + - composite-aeson-path - composite-aeson-refined - - composite-base + - composite-binary - composite-ekg - composite-opaleye - composite-swagger @@ -4292,6 +4305,7 @@ broken-packages: - data-transform - data-type - data-util + - data-validation - data-variant - database-id-groundhog - database-study @@ -4415,7 +4429,6 @@ broken-packages: - dhall-check - dhall-docs - dhall-fly - - dhall-nix - dhall-text - dhall-to-cabal - dhall-yaml @@ -4763,6 +4776,9 @@ broken-packages: - EsounD - espial - ess + - essence-of-live-coding-gloss-example + - essence-of-live-coding-pulse-example + - essence-of-live-coding-warp - estimators - EstProgress - estreps @@ -5322,6 +5338,23 @@ broken-packages: - ghcprofview - ght - gi-cairo-again + - gi-cairo-connector + - gi-cairo-render + - gi-dbusmenu + - gi-dbusmenugtk3 + - gi-gdkx11 + - gi-graphene + - gi-gsk + - gi-gstpbutils + - gi-gsttag + - gi-gtk-declarative + - gi-gtk-declarative-app-simple + - gi-gtk-hs + - gi-gtkosxapplication + - gi-handy + - gi-poppler + - gi-wnck + - gi-xlib - giak - Gifcurry - ginsu @@ -5402,6 +5435,7 @@ broken-packages: - gloss-sodium - glpk-headers - glpk-hs + - gltf-codec - glue - GLUtil - gmap @@ -5793,6 +5827,7 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc + - haskell-src-match - haskell-src-meta-mwotton - haskell-stack-trace-plugin - haskell-token-utils @@ -5876,6 +5911,7 @@ broken-packages: - haskore-supercollider - haskore-synthesizer - HaskRel + - haskseg - hasktorch - hasktorch-codegen - hasktorch-ffi-th @@ -6959,6 +6995,7 @@ broken-packages: - jsonsql - jsontsv - jsonxlsx + - jsop - jspath - juandelacosa - judge @@ -7060,6 +7097,7 @@ broken-packages: - ks-test - KSP - ktx + - ktx-codec - kubernetes-client - kubernetes-client-core - kuifje @@ -7248,6 +7286,7 @@ broken-packages: - libconfig - libcspm - libexpect + - libfuse3 - libGenI - libhbb - libinfluxdb @@ -7265,7 +7304,6 @@ broken-packages: - libraft - librandomorg - librato - - libsodium - libssh2 - libssh2-conduit - libsystemd-daemon @@ -7324,17 +7362,6 @@ broken-packages: - lio-fs - lio-simple - lipsum-gen - - liquid - - liquid-base - - liquid-bytestring - - liquid-containers - - liquid-fixpoint - - liquid-ghc-prim - - liquid-parallel - - liquid-platform - - liquid-prelude - - liquid-vector - - liquidhaskell - liquidhaskell-cabal - Liquorice - list-fusion-probe @@ -7403,6 +7430,7 @@ broken-packages: - log4hs - logentries - logger + - logging-effect - logging-effect-extra - logging-effect-extra-file - logging-effect-extra-handler @@ -7475,6 +7503,7 @@ broken-packages: - lye - Lykah - lz4-conduit + - lz4-frame-conduit - lzma-enumerator - lzma-streams - lzo @@ -7691,6 +7720,7 @@ broken-packages: - ministg - minst-idx - mios + - MIP - mirror-tweet - misfortune - miso-action-logger @@ -7733,6 +7763,7 @@ broken-packages: - monad-atom - monad-atom-simple - monad-branch + - monad-classes-logging - monad-exception - monad-finally - monad-fork @@ -7922,6 +7953,7 @@ broken-packages: - mvc - mvc-updates - mvclient + - mwc-probability-transition - mwc-random-accelerate - mxnet - mxnet-dataiter @@ -8605,6 +8637,7 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy-http - polysemy-optics - polysemy-RandomFu - polysemy-webserver @@ -8702,6 +8735,7 @@ broken-packages: - pretty-ghci - pretty-ncols - prettyprinter-graphviz + - prettyprinter-lucid - prettyprinter-vty - preview - prim @@ -9257,6 +9291,7 @@ broken-packages: - ruler - ruler-core - rungekutta + - runhs - runmany - runtime-arbitrary - rvar @@ -9530,6 +9565,7 @@ broken-packages: - shadower - shake-bindist - shake-cabal-build + - shake-dhall - shake-extras - shake-minify - shake-pack @@ -9805,6 +9841,7 @@ broken-packages: - spanout - sparkle - sparrow + - spars - sparse - sparse-lin-alg - sparsebit @@ -10045,6 +10082,7 @@ broken-packages: - superconstraints - superevent - supermonad + - supernova - supero - supervisor - supervisors @@ -10218,7 +10256,6 @@ broken-packages: - termbox-bindings - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -10656,6 +10693,7 @@ broken-packages: - uri-parse - uri-template - uri-templater + - url-bytes - url-decoders - url-generic - URLb diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f2d83c8d9fe..36c45377d97 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4559,6 +4559,24 @@ self: { broken = true; }) {}; + "Diff_0_3_4" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.3.4"; + sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "O(ND) diff algorithm in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -10767,8 +10785,8 @@ self: { ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { pname = "HsOpenSSL-x509-system"; - version = "0.1.0.3"; - sha256 = "14hzjdpv8ld3nw5fcx451w49vq0s8fhs1zh984vpm85b5ypbgp2v"; + version = "0.1.0.4"; + sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr"; libraryHaskellDepends = [ base bytestring HsOpenSSL unix ]; description = "Use the system's native CA certificate store with HsOpenSSL"; license = stdenv.lib.licenses.bsd3; @@ -12672,27 +12690,6 @@ self: { }) {}; "ListLike" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.7.1"; - sha256 = "1gccb84fma0plkwjdz8hgqa70a5lr6d9gnw6pfky993555ig29mp"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - description = "Generalized support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ListLike_4_7_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string , vector @@ -12711,7 +12708,6 @@ self: { ]; description = "Generalized support for list-like structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListT" = callPackage @@ -13101,6 +13097,8 @@ self: { ]; description = "Library for using Mixed Integer Programming (MIP)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MSQueue" = callPackage @@ -13202,14 +13200,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "MapWith"; - version = "0.1.0.0"; - sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v"; - revision = "1"; - editedCabalFile = "1zkpqgxh2d1zg087766vixw5j9xh9i9z4vdp5gv87xzhc4ig9qbs"; + version = "0.2.0.0"; + sha256 = "1xkyaj83yblf42qawv4nyi8miaynydd8b3ysx62f9y10bqxk7dja"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; - description = "mapWith: like fmap, but with additional arguments (isFirst, isLast, etc)"; + description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -20637,8 +20633,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.6"; - sha256 = "1zclpawaa1cx1p58asn7lla4lakkr869qnkdvrypxxqki3406hsz"; + version = "0.3.7"; + sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21325,6 +21321,25 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_9_2" = callPackage + ({ mkDerivation, base, data-default, libX11, libXext, libXinerama + , libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.9.2"; + sha256 = "013yny4dwbs98kp7245j8dv81h4p1cdwn2rsf2hvhsplg6ixkc05"; + libraryHaskellDepends = [ base data-default ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + description = "A binding to the X11 graphics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -22125,25 +22140,26 @@ self: { }) {}; "accelerate" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans - , bytestring, Cabal, cabal-doctest, constraints, containers - , cryptonite, deepseq, directory, doctest, exceptions, filepath - , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, terminal-size, transformers, unique, unix + ({ mkDerivation, ansi-terminal, base, base-orphans, bytestring + , Cabal, cabal-doctest, containers, cryptonite, deepseq, directory + , doctest, exceptions, filepath, ghc-prim, half, hashable + , hashtables, hedgehog, lens, mtl, prettyprinter + , prettyprinter-ansi-terminal, primitive, tasty, template-haskell + , terminal-size, text, transformers, unique, unix , unordered-containers, vector }: mkDerivation { pname = "accelerate"; - version = "1.2.0.1"; - sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h"; + version = "1.3.0.0"; + sha256 = "14md9fbxckgwpbkm7hdj95ny11w5b5cj103r8razg0aw2hgid5sb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-orphans bytestring - constraints containers cryptonite deepseq directory exceptions - filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - terminal-size transformers unique unix unordered-containers vector + ansi-terminal base base-orphans bytestring containers cryptonite + deepseq directory exceptions filepath ghc-prim half hashable + hashtables hedgehog lens mtl prettyprinter + prettyprinter-ansi-terminal primitive tasty template-haskell + terminal-size text transformers unique unix unordered-containers + vector ]; testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; @@ -22173,7 +22189,7 @@ self: { }) {}; "accelerate-bignum" = callPackage - ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + ({ mkDerivation, accelerate, accelerate-io-vector, accelerate-llvm , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty , tasty-hedgehog, template-haskell, vector, vector-th-unbox @@ -22181,10 +22197,8 @@ self: { }: mkDerivation { pname = "accelerate-bignum"; - version = "0.2.0.0"; - sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; - revision = "1"; - editedCabalFile = "0lfsmhky8shyy9xhm0j2as91vrmqqrrn9r0fsv2ljc4xjklg723r"; + version = "0.3.0.0"; + sha256 = "1xwqg3d2qilkfx8wmmhp2qq5cas3pnsrpyli3a9z0yxqamibxh33"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -22194,8 +22208,9 @@ self: { tasty tasty-hedgehog ]; benchmarkHaskellDepends = [ - accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx - base criterion mwc-random vector vector-th-unbox wide-word + accelerate accelerate-io-vector accelerate-llvm-native + accelerate-llvm-ptx base criterion mwc-random vector + vector-th-unbox wide-word ]; description = "Fixed-length large integer arithmetic for Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -22211,8 +22226,8 @@ self: { }: mkDerivation { pname = "accelerate-blas"; - version = "0.2.0.1"; - sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k"; + version = "0.3.0.0"; + sha256 = "1ydym6fxvg1b5vx49r8dnn80spsq42ssbg4v01s1djklks054g7y"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -22305,37 +22320,39 @@ self: { "accelerate-examples" = callPackage ({ mkDerivation, accelerate, accelerate-fft, accelerate-io - , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base - , binary, bmp, bytestring, bytestring-lexing, cereal + , accelerate-io-bmp, accelerate-io-repa, accelerate-io-vector + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint + , array, base, binary, bmp, bytestring, bytestring-lexing, cereal , colour-accelerate, containers, criterion, criterion-measurement , directory, fclabels, filepath, gloss, gloss-accelerate , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate - , linear, linear-accelerate, matrix-market-attoparsec, mwc-random - , normaldistribution, QuickCheck, random, repa, repa-io, scientific - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + , linear-accelerate, matrix-market-attoparsec, mwc-random + , mwc-random-accelerate, normaldistribution, QuickCheck, random + , repa, repa-io, scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.2.0.1"; - sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj"; + version = "1.3.0.0"; + sha256 = "145m2bi8bini6z2jg6g99vnsc3m7pqz4dc9l34j8fg40fw65rwi0"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ accelerate accelerate-llvm-native accelerate-llvm-ptx ansi-wl-pprint base containers criterion directory fclabels HUnit - linear mwc-random QuickCheck test-framework test-framework-hunit + QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-fft accelerate-io base binary bmp bytestring - bytestring-lexing cereal colour-accelerate containers criterion - criterion-measurement directory fclabels filepath gloss + accelerate accelerate-fft accelerate-io accelerate-io-bmp + accelerate-io-repa accelerate-io-vector array base binary bmp + bytestring bytestring-lexing cereal colour-accelerate containers + criterion criterion-measurement directory fclabels filepath gloss gloss-accelerate gloss-raster-accelerate gloss-rendering lens-accelerate linear-accelerate matrix-market-attoparsec - mwc-random normaldistribution random repa repa-io scientific vector - vector-algorithms + mwc-random mwc-random-accelerate normaldistribution random repa + repa-io scientific vector vector-algorithms ]; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -22351,10 +22368,8 @@ self: { }: mkDerivation { pname = "accelerate-fft"; - version = "1.2.0.0"; - sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; - revision = "2"; - editedCabalFile = "096vhbwbkyvjx8znjqnb3lz43kzqq0x7kcfv1gmmbjjrcmwaj2y5"; + version = "1.3.0.0"; + sha256 = "1a7cwzbs8r3rvaymrq2kfx83lqb3i7wz0gmz3ppz59f40rxn974x"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base bytestring carray containers cuda cufft @@ -22433,27 +22448,121 @@ self: { }) {}; "accelerate-io" = callPackage - ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog - , primitive, repa, tasty, tasty-hedgehog, vector - }: + ({ mkDerivation, accelerate, base }: mkDerivation { pname = "accelerate-io"; - version = "1.2.0.0"; - sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; - revision = "2"; - editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq"; - libraryHaskellDepends = [ - accelerate array base bmp bytestring primitive repa vector - ]; - testHaskellDepends = [ - accelerate array base hedgehog tasty tasty-hedgehog vector - ]; - description = "Read and write Accelerate arrays in various formats"; + version = "1.3.0.0"; + sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg"; + libraryHaskellDepends = [ accelerate base ]; + description = "Convert between Accelerate arrays and raw pointers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "accelerate-io-JuicyPixels" = callPackage + ({ mkDerivation, accelerate, accelerate-io-vector, base + , JuicyPixels, vector + }: + mkDerivation { + pname = "accelerate-io-JuicyPixels"; + version = "0.1.0.0"; + sha256 = "0rr43lwmc16r99si1s4nimxxydlsxb6ck45absrxy6vnkln7x185"; + libraryHaskellDepends = [ + accelerate accelerate-io-vector base JuicyPixels vector + ]; + description = "Convert between Accelerate arrays and JuicyPixels images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-array" = callPackage + ({ mkDerivation, accelerate, array, base, hedgehog, primitive + , tasty, tasty-hedgehog + }: + mkDerivation { + pname = "accelerate-io-array"; + version = "0.1.0.0"; + sha256 = "1gcxd4m3h1xr8ia8z7c8sxznm90h2q3mzwhi5vsv8s1gh7sdym9m"; + libraryHaskellDepends = [ accelerate array base primitive ]; + testHaskellDepends = [ + accelerate array base hedgehog tasty tasty-hedgehog + ]; + description = "Convert between Accelerate and array"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-bmp" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base, bmp }: + mkDerivation { + pname = "accelerate-io-bmp"; + version = "0.1.0.0"; + sha256 = "0x7bkn4j7s9dzlfk4q1lh6fyd4bir1zkm4x37c65nl9g86154sc8"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base bmp + ]; + description = "Convert between Accelerate arrays and BMP images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-bytestring" = callPackage + ({ mkDerivation, accelerate, base, bytestring }: + mkDerivation { + pname = "accelerate-io-bytestring"; + version = "0.1.0.0"; + sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1"; + libraryHaskellDepends = [ accelerate base bytestring ]; + description = "Convert between Accelerate and ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-cereal" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base, cereal + }: + mkDerivation { + pname = "accelerate-io-cereal"; + version = "0.1.0.0"; + sha256 = "13im1kmrd2yjxxrmpzp2030jhhq9fm9xa76yl11xwpd82z10a2pl"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base cereal + ]; + description = "Binary serialisation of Accelerate arrays using cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-repa" = callPackage + ({ mkDerivation, accelerate, base, repa }: + mkDerivation { + pname = "accelerate-io-repa"; + version = "0.1.0.0"; + sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp"; + libraryHaskellDepends = [ accelerate base repa ]; + description = "Convert between Accelerate and Repa arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-vector" = callPackage + ({ mkDerivation, accelerate, base, hedgehog, primitive, tasty + , tasty-hedgehog, vector + }: + mkDerivation { + pname = "accelerate-io-vector"; + version = "0.1.0.0"; + sha256 = "1nh7n3qj4csxyzvkhkvfr9bii2vmqky51f32pz3bphrwfvhzdrri"; + libraryHaskellDepends = [ accelerate base primitive vector ]; + testHaskellDepends = [ + accelerate base hedgehog tasty tasty-hedgehog vector + ]; + description = "Convert between Accelerate and vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-kullback-liebler" = callPackage ({ mkDerivation, accelerate, accelerate-llvm-native , accelerate-llvm-ptx, base, composition-prelude, cpphs, criterion @@ -22481,20 +22590,19 @@ self: { }) {}; "accelerate-llvm" = callPackage - ({ mkDerivation, abstract-deque, accelerate, base, bytestring - , chaselev-deque, containers, data-default-class, deepseq - , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure - , mtl, mwc-random, primitive, template-haskell - , unordered-containers, vector + ({ mkDerivation, accelerate, base, bytestring, constraints + , containers, data-default-class, deepseq, directory, dlist + , exceptions, filepath, llvm-hs, llvm-hs-pure, mtl, primitive + , template-haskell, unordered-containers, vector }: mkDerivation { pname = "accelerate-llvm"; - version = "1.2.0.1"; - sha256 = "1cv5s7fgkdd3m95vy2rrq2kvzyzxx6vwgsc5nqcmfdp00z8znjhk"; + version = "1.3.0.0"; + sha256 = "1fjjfjav11s6grwl6ihqdrzx738bwki0l25qlp4zzz2hi2440qbp"; libraryHaskellDepends = [ - abstract-deque accelerate base bytestring chaselev-deque containers + accelerate base bytestring constraints containers data-default-class deepseq directory dlist exceptions filepath - llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell + llvm-hs llvm-hs-pure mtl primitive template-haskell unordered-containers vector ]; description = "Accelerate backend component generating LLVM IR"; @@ -22505,19 +22613,19 @@ self: { "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring - , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc - , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, lockfree-queue - , mtl, template-haskell, time, unique, unix, vector + , c2hs, cereal, containers, deepseq, directory, dlist, filepath + , ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure + , lockfree-queue, mtl, template-haskell, unique, unix, vector }: mkDerivation { pname = "accelerate-llvm-native"; - version = "1.2.0.1"; - sha256 = "0sml5rj3dnxlv14i4xbs1sadnprjga1iws7fl7sxkyjzxqc04vrj"; + version = "1.3.0.0"; + sha256 = "1x4wfbp83ppzknd98k2ad160a8kdqh96qqmyfzdqyvy44iskxcn6"; libraryHaskellDepends = [ - accelerate accelerate-llvm base bytestring Cabal cereal containers - directory dlist filepath ghc ghc-prim hashable libffi llvm-hs - llvm-hs-pure lockfree-queue mtl template-haskell time unique unix - vector + accelerate accelerate-llvm base bytestring cereal containers + deepseq directory dlist filepath ghc ghc-prim hashable libffi + llvm-hs llvm-hs-pure lockfree-queue mtl template-haskell unique + unix vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ accelerate base ]; @@ -22530,17 +22638,18 @@ self: { "accelerate-llvm-ptx" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , containers, cuda, deepseq, directory, dlist, file-embed, filepath - , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process - , template-haskell, time, unordered-containers + , ghc-heap, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty + , process, template-haskell, unordered-containers }: mkDerivation { pname = "accelerate-llvm-ptx"; - version = "1.2.0.1"; - sha256 = "0c9hl19v4si0lnah4l63kqhpxz16zy0wi3cg28gz00mxzgqilivs"; + version = "1.3.0.0"; + sha256 = "0bb7p67dv5csbblnaxbm7hkq8y2qknz0yd1f0rav29igsv3a9rfx"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring containers cuda deepseq - directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure - mtl nvvm pretty process template-haskell time unordered-containers + directory dlist file-embed filepath ghc-heap hashable llvm-hs + llvm-hs-pure mtl nvvm pretty process template-haskell + unordered-containers ]; testHaskellDepends = [ accelerate base ]; description = "Accelerate backend for NVIDIA GPUs"; @@ -29131,26 +29240,6 @@ self: { }) {}; "amqp-utils" = 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.4.0"; - sha256 = "07zpmq9sx6lmnma4dxxph0jficghrlfbb568frh3d6fbdiqgmfgl"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - amqp base bytestring connection containers data-default-class - directory hinotify magic network process text time tls unix - utf8-string x509-system - ]; - description = "Generic Haskell AMQP tools"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "amqp-utils_0_4_4_1" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers , data-default-class, directory, hinotify, magic, network, process , text, time, tls, unix, utf8-string, x509-system @@ -29168,7 +29257,6 @@ self: { ]; description = "AMQP toolset for the command line"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -31827,10 +31915,8 @@ self: { }: mkDerivation { pname = "archive-libarchive"; - version = "1.0.0.0"; - sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb"; - revision = "1"; - editedCabalFile = "12wq8nisyr2i1861v2377llha63nqpiys9vk6dvg9rfz7f6qqdch"; + version = "1.0.0.1"; + sha256 = "079wm4c9bahvi693g6655ag9rz9l5g7i4b82q7zm0hz383f94zsl"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; @@ -34888,10 +34974,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.1.7"; - sha256 = "0w7m65bh38gdq186b16pcnq7k2nakiy749m7z092cv4k5w72gal5"; - revision = "1"; - editedCabalFile = "1g8hm1bd4yssmy1qkarnwd8w2wz8c2m02gk1agh3pyv60f9q66s7"; + version = "3.1.8"; + sha256 = "19zm9bwpixqdg4a5mcrv2c8fyhygjzawjrwv1jwwhcczqsrjwvrw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35047,8 +35131,8 @@ self: { }: mkDerivation { pname = "autoapply"; - version = "0.4"; - sha256 = "0b7la51399kcj9a4z9j49xd9v2zs172vygs3djz5qid7fsl37pgm"; + version = "0.4.1"; + sha256 = "1jgzfdi5p0pns6w7543yp2ljglnmym9qplyb4vafynzg3bjhzvz0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base logict mtl template-haskell th-desugar transformers @@ -37803,8 +37887,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "6"; - editedCabalFile = "05z53pc1gi62lzl262mc1qx12qqrds6ab6rflwpfcxbp0a67c825"; + revision = "7"; + editedCabalFile = "1vry5qh9w1adwyfrlx8x2772knwmdvxgq2nfzng7vybll2cqph4c"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -46415,21 +46499,6 @@ self: { }) {}; "byte-count-reader" = callPackage - ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text - }: - mkDerivation { - pname = "byte-count-reader"; - version = "0.10.0.1"; - sha256 = "0ibckpy0wz2f8590z92lvkmwcf29lv6sby1y3cz3cihxvp3bw3il"; - libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; - testHaskellDepends = [ - base extra hspec parsec parsec-numbers text - ]; - description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "byte-count-reader_0_10_1_1" = callPackage ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text }: mkDerivation { @@ -46442,7 +46511,6 @@ self: { ]; description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "byte-order" = callPackage @@ -48297,8 +48365,8 @@ self: { pname = "cabal-plan"; version = "0.7.0.0"; sha256 = "1wv375dq50fibzg6xa9vrr8q4lhaqcl254b9a2vc42rrjvhxxmzc"; - revision = "1"; - editedCabalFile = "0gc64mgk11nszilkbid351zxh5cpy85kqcc3mrkrw2fsbcga08as"; + revision = "2"; + editedCabalFile = "1c3w9d75kqxhyafjyl8fyzbrp80idvhd693rsd08gws8blkk1vzr"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -49871,6 +49939,8 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capnp" = callPackage @@ -57317,10 +57387,8 @@ self: { ({ mkDerivation, accelerate, base }: mkDerivation { pname = "colour-accelerate"; - version = "0.3.0.0"; - sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; - revision = "1"; - editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn"; + version = "0.4.0.0"; + sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8"; libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -58541,8 +58609,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.7.3.0"; - sha256 = "0wb15vq95kf6jigfy0n3jampnx8xmkxmh2lnxgfsc8zac9hwls55"; + version = "0.7.4.0"; + sha256 = "1k8m89cff8b3yc1af0l9vd13pav2hjy51gcadahn07zpwv1bszfj"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -58561,14 +58629,27 @@ self: { broken = true; }) {}; + "composite-aeson-path" = callPackage + ({ mkDerivation, base, composite-aeson, path }: + mkDerivation { + pname = "composite-aeson-path"; + version = "0.7.4.0"; + sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx"; + libraryHaskellDepends = [ base composite-aeson path ]; + description = "Formatting data for the path library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-aeson-refined" = callPackage ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl , refined }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.7.3.0"; - sha256 = "0g0i8zwky1ygniyxpvgl1r78b4qak1mx1wpy2pj815zrd43x1y60"; + version = "0.7.4.0"; + sha256 = "049lrm5iip5y3c9m9x4sjangaigdprj1553sw2vrcvnvn8xfq57s"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -58579,25 +58660,37 @@ self: { }) {}; "composite-base" = callPackage - ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl - , profunctors, QuickCheck, template-haskell, text, transformers - , transformers-base, unliftio-core, vinyl + ({ mkDerivation, base, deepseq, exceptions, hspec, lens + , monad-control, mtl, profunctors, QuickCheck, template-haskell + , text, transformers, transformers-base, unliftio-core, vinyl }: mkDerivation { pname = "composite-base"; - version = "0.7.3.0"; - sha256 = "07zbs89cqm7b78jfh2lwma3spsklc6wq0f58g14p27wgm253xkwp"; + version = "0.7.4.0"; + sha256 = "1ml1y1zh8znvaqydwcnv8n69rzmx7zy2bpzr65gy79xbczz3dxwz"; libraryHaskellDepends = [ - base exceptions lens monad-control mtl profunctors template-haskell - text transformers transformers-base unliftio-core vinyl - ]; - testHaskellDepends = [ - base exceptions hspec lens monad-control mtl profunctors QuickCheck + base deepseq exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl ]; + testHaskellDepends = [ + base deepseq exceptions hspec lens monad-control mtl profunctors + QuickCheck template-haskell text transformers transformers-base + unliftio-core vinyl + ]; description = "Shared utilities for composite-* packages"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-binary" = callPackage + ({ mkDerivation, base, binary, composite-base }: + mkDerivation { + pname = "composite-binary"; + version = "0.7.4.0"; + sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp"; + libraryHaskellDepends = [ base binary composite-base ]; + description = "Orphan binary instances"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -58607,8 +58700,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.7.3.0"; - sha256 = "1402ay8gxqp1fh2ija9ry5g366p5vx64ikmfal9hr2c42c2kmcf9"; + version = "0.7.4.0"; + sha256 = "0y8wnp6n1fvqfrkm1lqv8pdfq7a4k7gaxl3i9dh6xfzyamlghg82"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -58618,6 +58711,17 @@ self: { broken = true; }) {}; + "composite-hashable" = callPackage + ({ mkDerivation, base, composite-base, hashable }: + mkDerivation { + pname = "composite-hashable"; + version = "0.7.4.0"; + sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1"; + libraryHaskellDepends = [ base composite-base hashable ]; + description = "Orphan hashable instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -58625,8 +58729,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.3.0"; - sha256 = "0b9h0z4v0268qgcwq53p59nkwbbg77dqm9snr4zif71xhmlfscpx"; + version = "0.7.4.0"; + sha256 = "0nzyslqgh7m9ryqw4rajq2m4kfknqzdq0aqnygyz0sblmgixn4hm"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -58649,8 +58753,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.3.0"; - sha256 = "1gzmksq2dfywird7gyjc95v3spgxsab3jbakg5il2fmkx35cc1za"; + version = "0.7.4.0"; + sha256 = "0a7pcs06m0w0mq60y3hhgn4a36gx5daypc1nh1ndsm6x3q3d99q8"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -61407,6 +61511,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "containers-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm-native, base + , containers, half, hashable-accelerate, hedgehog, tasty + , tasty-hedgehog + }: + mkDerivation { + pname = "containers-accelerate"; + version = "0.1.0.0"; + sha256 = "1bfw5k6nq15szgwjkzd17inmlk0ii0pd6a4lrixi8gyjf6ksm6n1"; + libraryHaskellDepends = [ accelerate base hashable-accelerate ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native base containers half + hashable-accelerate hedgehog tasty tasty-hedgehog + ]; + description = "Hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "containers-benchmark" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , ghc-prim, random @@ -61782,6 +61905,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_5_2" = callPackage + ({ mkDerivation, base, contravariant, template-haskell + , template-haskell-compat-v0208 + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.5.2"; + sha256 = "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9"; + libraryHaskellDepends = [ + base contravariant template-haskell template-haskell-compat-v0208 + ]; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control" = callPackage ({ mkDerivation, base, basic, stm, template-haskell, transformers }: @@ -65622,8 +65761,8 @@ self: { }: mkDerivation { pname = "cublas"; - version = "0.5.0.0"; - sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f"; + version = "0.6.0.0"; + sha256 = "0yxyynvf9zlkc8yhra5j1sk1d8hbiqvzbsh02mc1y8hcf8nzyp61"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex template-haskell @@ -65705,10 +65844,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.10.1.0"; - sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp"; - revision = "2"; - editedCabalFile = "1nw135pd2ab3mmyq3xmkxynzfb54qr7a8xssq5ivrk83yzvs87im"; + version = "0.10.2.0"; + sha256 = "0fkjibnnxradhsbasx1mw0c088cfwypnk6a5002rxpzxid5qrp9l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -65768,8 +65905,8 @@ self: { }: mkDerivation { pname = "cufft"; - version = "0.9.0.1"; - sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3"; + version = "0.10.0.0"; + sha256 = "1prma5srgfnhjvf1rvxd1kznv42k4svhk05j93mx1pcx7jd1cmvz"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -66187,8 +66324,8 @@ self: { }: mkDerivation { pname = "cusolver"; - version = "0.2.0.0"; - sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a"; + version = "0.3.0.0"; + sha256 = "0xskvpjqlckpfrfvnb2afj29p2gnzafq2v98pbvwsprmn60np9mq"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cublas cuda cusparse half storable-complex template-haskell @@ -66205,8 +66342,8 @@ self: { }: mkDerivation { pname = "cusparse"; - version = "0.2.0.0"; - sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6"; + version = "0.3.0.0"; + sha256 = "0x2ab7sd7j1mmjns8332mm2nzikprq3w6fbrnbcfk5lz2x0bgir2"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex ]; libraryToolDepends = [ c2hs ]; @@ -68766,6 +68903,20 @@ self: { broken = true; }) {}; + "data-validation" = callPackage + ({ mkDerivation, base, containers, hspec, template-haskell }: + mkDerivation { + pname = "data-validation"; + version = "0.1.0.1"; + sha256 = "0bc3i4pnz1v516cmsnay1hpmh9r7zglwyv2ai1ncxy2k4l78pih0"; + libraryHaskellDepends = [ base containers template-haskell ]; + testHaskellDepends = [ base containers hspec template-haskell ]; + description = "A library for creating type safe validations"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "data-variant" = callPackage ({ mkDerivation, base, safe }: mkDerivation { @@ -68981,8 +69132,8 @@ self: { }: mkDerivation { pname = "dataflower"; - version = "0.2.2.0"; - sha256 = "169m0yngaslc2pysdpf65pmf9zr037ij7y95rqi6bp3dxcxfcwlg"; + version = "0.3.0.0"; + sha256 = "0nxir4syhbw5spqks3pxj71w781vn8mqxdiig9dqnrv5ks02bqp6"; libraryHaskellDepends = [ base hashable mtl pretty-show stm time transformers vector ]; @@ -72441,8 +72592,6 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-nixpkgs" = callPackage @@ -76179,21 +76328,21 @@ self: { }) {}; "dobutokO-poetry" = callPackage - ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr - , mmsyn7s, uniqueness-periods, vector + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn2, mmsyn3 + , mmsyn5, mmsyn6ukr, mmsyn7s, uniqueness-periods, vector }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.15.0.0"; - sha256 = "1091wqxzg138bc8kk55fkgv5ripq48zyvm3in2b2g54zjy6l4f1p"; + version = "0.16.3.0"; + sha256 = "151ncvk2jz2nlgr52485p6mdqix7qlld96kzi9y3hxag2kpb0723"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s uniqueness-periods vector ]; executableHaskellDepends = [ - base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s uniqueness-periods vector ]; description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text"; @@ -76915,8 +77064,8 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.1"; - sha256 = "16pf0lzzg0wwk5q44ybbc2hbrjs5hzsai0ssm836xiywsqwp61a7"; + version = "0.2.2"; + sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -83348,19 +83497,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding_0_2_2" = callPackage + "essence-of-live-coding_0_2_3" = callPackage ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck - , syb, test-framework, test-framework-quickcheck2, transformers - , vector-sized + , syb, test-framework, test-framework-quickcheck2, time + , transformers, vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.2"; - sha256 = "1hczvr1byk8qjkb45w9nvjmbqfmxl15dgn7kvp0rby0dkrn85275"; + version = "0.2.3"; + sha256 = "19sc5wgby356bm5rh7sr41ydhw3v1pqbz76xyf7081kg77qcbc0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foreign-store syb transformers vector-sized + base containers foreign-store syb time transformers vector-sized ]; executableHaskellDepends = [ base transformers ]; testHaskellDepends = [ @@ -83387,14 +83536,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-gloss_0_2_2" = callPackage + "essence-of-live-coding-gloss_0_2_3" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss , syb, transformers }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.2"; - sha256 = "19kxrjyhikgb49qdb7rlap8bbjsvkyi2ni6a1m1hjyxjziypsw0y"; + version = "0.2.3"; + sha256 = "0msc2pfg7096azk4ggb267cfm2vh02kcksgdmzl46rc5if98xmi7"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -83409,8 +83558,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss-example"; - version = "0.2.2"; - sha256 = "07kgmbwm9swdavsypxnqf64fh9b2c2h9rmkm38hcl6lahdb2rb44"; + version = "0.2.3"; + sha256 = "08hzfi3mspxlkbhh8mr1q330yp94s6s9w55pla7x10qj8vda4shc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83419,6 +83568,8 @@ self: { ]; description = "General purpose live coding framework - Gloss example"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-pulse" = callPackage @@ -83436,14 +83587,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-pulse_0_2_2" = callPackage + "essence-of-live-coding-pulse_0_2_3" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store , pulse-simple, transformers }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.2"; - sha256 = "15v4bzkx4j6mvprk1d215ywamjjvmf6g13cppd109aj4h40zcxbi"; + version = "0.2.3"; + sha256 = "1mxgicmy5xmmad0r0b3dn18ab9dn8r3rqglqxa6v75kl8lswm0c8"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -83458,8 +83609,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse-example"; - version = "0.2.2"; - sha256 = "1476wxny2yhq2f2cn2bqrcm4dri39mql509pf9yq2kyd76lkrcgx"; + version = "0.2.3"; + sha256 = "0da3l6z0lnjlq62vx18s2jyvrydffxvcjhv2ydlwczrcy0wggdln"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83468,6 +83619,8 @@ self: { ]; description = "General purpose live coding framework - pulse backend example"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-quickcheck" = callPackage @@ -83486,14 +83639,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-quickcheck_0_2_2" = callPackage + "essence-of-live-coding-quickcheck_0_2_3" = callPackage ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding , QuickCheck, syb, transformers }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.2"; - sha256 = "1v7ijzs64bqn8nyp1msrrvk6kfkzx5a87ib74fmcasiww1y4lwgl"; + version = "0.2.3"; + sha256 = "0shbpc1ivqr3m9p76kf1vj7g1rqy3magxyh58w1mxymf4c61a9gr"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -83509,14 +83662,16 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.2"; - sha256 = "14ygm62ak6gprx0r545xmv5nk544p0gsip3017p7ziy3k01mwhgh"; + version = "0.2.3"; + sha256 = "1rpp6xm3s3fji1pcdajc06iw0zhk3mbd245h6a0z6ygf8id7sh50"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; testHaskellDepends = [ base essence-of-live-coding http-client ]; description = "General purpose live coding framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "estimator" = callPackage @@ -85968,8 +86123,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.7.5"; - sha256 = "1cickrjvg4i25yn3qg4f0id0bmq115siysyqnh0yk9rwjlnrxyn9"; + version = "1.7.6"; + sha256 = "1mdqw88crblabxz4sg803ww6pkl5prnjnpjwh11n32y2npky5ask"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -85980,6 +86135,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_7_7" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.7"; + sha256 = "1ark7b6xknc44v8jg5aymxffj5d0qr81frjpg2ffqrkwnhva0w5s"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -88878,9 +89052,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.4"; - sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr"; - enableSeparateDataOutput = true; + version = "0.6.5"; + sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh"; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -91119,17 +91292,6 @@ self: { }) {}; "fmlist" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fmlist"; - version = "0.9.3"; - sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf"; - libraryHaskellDepends = [ base ]; - description = "FoldMap lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fmlist_0_9_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; @@ -91138,7 +91300,6 @@ self: { libraryHaskellDepends = [ base ]; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fmt" = callPackage @@ -94406,8 +94567,8 @@ self: { }: mkDerivation { pname = "functor-combinators"; - version = "0.3.5.1"; - sha256 = "07hwsy8nly4sps3fsyfmq54cwfb850j1i1darwsyw24ignbd60j4"; + version = "0.3.6.0"; + sha256 = "0idf896xadp5v5k4m0s087xvvs9008sxw61djqb9v0x08rs5zy8f"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant deriving-compat free invariant kan-extensions mmorph mtl @@ -94917,8 +95078,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.16.3"; - sha256 = "0y9g7nldcx2y7h3gb652i5r3lfvbriaqfqs2gnxym1r9w9kki0si"; + version = "0.16.4"; + sha256 = "14k682phqdp2scmv064i6jyymf3j2f3bs25yw1qff76bkymv02vd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96563,6 +96724,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-functor" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-functor"; + version = "0.1.0.0"; + sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Deriving generalized functors with GHC.Generics"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text @@ -96632,6 +96805,17 @@ self: { broken = true; }) {}; + "generic-match" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-match"; + version = "0.2.0.2"; + sha256 = "16r43gzl3a8ycxbhggqk09mrm63r9db85nk1j2x4j4lzcwap7bid"; + libraryHaskellDepends = [ base ]; + description = "First class pattern matching"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-maybe" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , directory, doctest, filepath, generic-deriving, ghc-prim, hlint @@ -100041,6 +100225,8 @@ self: { ]; description = "GI friendly Binding to the Cairo library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-cairo-render" = callPackage @@ -100060,6 +100246,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "GI friendly Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage @@ -100079,6 +100267,8 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenu_0_4_8" = callPackage @@ -100099,6 +100289,7 @@ self: { description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -100123,6 +100314,8 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-dbusmenugtk3_0_4_9" = callPackage @@ -100148,6 +100341,7 @@ self: { description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -100287,6 +100481,8 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "gi-gdkx11_4_0_2" = callPackage @@ -100310,6 +100506,7 @@ self: { description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4-x11 = null;}; "gi-ggit" = callPackage @@ -100486,6 +100683,8 @@ self: { libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-graphene_1_0_2" = callPackage @@ -100506,6 +100705,7 @@ self: { description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-gsk" = callPackage @@ -100530,6 +100730,8 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4 = null;}; "gi-gst" = callPackage @@ -100615,6 +100817,8 @@ self: { libraryPkgconfigDepends = [ gstreamer-pbutils ]; description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-pbutils = null;}; "gi-gsttag" = callPackage @@ -100636,6 +100840,8 @@ self: { libraryPkgconfigDepends = [ gstreamer-tag ]; description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-tag = null;}; "gi-gstvideo" = callPackage @@ -100755,6 +100961,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -100773,6 +100981,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-hs" = callPackage @@ -100790,6 +101000,8 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-hs_0_3_9" = callPackage @@ -100808,6 +101020,7 @@ self: { description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtkosxapplication" = callPackage @@ -100829,6 +101042,8 @@ self: { libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "GtkosxApplication bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk-mac-integration-gtk3 = null;}; "gi-gtksource" = callPackage @@ -100877,6 +101092,8 @@ self: { libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage @@ -101076,6 +101293,8 @@ self: { libraryPkgconfigDepends = [ poppler ]; description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) poppler;}; "gi-secret" = callPackage @@ -101238,6 +101457,8 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage @@ -101257,6 +101478,8 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "gi-xlib_2_0_9" = callPackage @@ -101277,6 +101500,7 @@ self: { description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -101343,6 +101567,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ginger_0_10_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , data-default, filepath, http-types, mtl, optparse-applicative + , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , utf8-string, vector, yaml + }: + mkDerivation { + pname = "ginger"; + version = "0.10.1.0"; + sha256 = "0579ajr1rng0bd0pml69f6yz4aykvk8zcni0p7ck628qx4jzxihx"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring data-default filepath http-types + mtl parsec regex-tdfa safe scientific text time transformers + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring data-default optparse-applicative process + text transformers unordered-containers utf8-string yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default mtl tasty tasty-hunit + tasty-quickcheck text time transformers unordered-containers + utf8-string + ]; + description = "An implementation of the Jinja2 template language in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gingersnap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , http-types, microspec, postgresql-simple, resource-pool @@ -103295,14 +103552,16 @@ self: { }) {}; "gloss-accelerate" = callPackage - ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: + ({ mkDerivation, accelerate, base, gloss, gloss-rendering + , linear-accelerate + }: mkDerivation { pname = "gloss-accelerate"; - version = "2.0.0.1"; - sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; - revision = "1"; - editedCabalFile = "0349yyzxn7r82mz4vr71dibzp0sh45b4a06hm0c0z9d7vlxj0sjj"; - libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; + version = "2.1.0.0"; + sha256 = "1l09li68r04qij11p7rf9dwfv9cdncj7nm6crq6bm834il3zg4zx"; + libraryHaskellDepends = [ + accelerate base gloss gloss-rendering linear-accelerate + ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -103449,10 +103708,8 @@ self: { }: mkDerivation { pname = "gloss-raster-accelerate"; - version = "2.0.0.0"; - sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "3"; - editedCabalFile = "0nk901zy01x7v7faa20j0yawqfw3nfl27xr19ip7bn3agmq4sqq2"; + version = "2.1.0.0"; + sha256 = "0yxlpz5wqfriijzkhqgjyv3g0wcmdy33ifbziqrdm9phvsjygvza"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -103529,6 +103786,26 @@ self: { broken = true; }) {inherit (pkgs) glpk;}; + "gltf-codec" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , directory, filepath, scientific, shower, text + , unordered-containers, vector + }: + mkDerivation { + pname = "gltf-codec"; + version = "0.1.0.1"; + sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring scientific text + unordered-containers vector + ]; + testHaskellDepends = [ base bytestring directory filepath shower ]; + description = "glTF scene loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "glue" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec , lifted-base, monad-control, monad-loops, QuickCheck @@ -107905,6 +108182,36 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "graphql-client" = callPackage + ({ mkDerivation, aeson, aeson-schemas, base, bytestring, file-embed + , http-client, http-client-tls, http-types, mtl + , optparse-applicative, path, path-io, tasty, tasty-hunit + , template-haskell, text, transformers, typed-process + , unliftio-core + }: + mkDerivation { + pname = "graphql-client"; + version = "1.0.0"; + sha256 = "1qzrlk3vkvavi14zz7dkndz8qh449s6rpbrd5phqclgbrah1hj3a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + template-haskell text transformers unliftio-core + ]; + executableHaskellDepends = [ + aeson aeson-schemas base bytestring file-embed http-client + http-client-tls http-types mtl optparse-applicative path path-io + template-haskell text transformers typed-process unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + tasty tasty-hunit template-haskell text transformers unliftio-core + ]; + description = "A client for Haskell programs to query a GraphQL API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { @@ -114050,6 +114357,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_20_0" = callPackage + ({ mkDerivation, array, base, containers, mtl, process }: + mkDerivation { + pname = "happy"; + version = "1.20.0"; + sha256 = "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-dot" = callPackage ({ mkDerivation, array, base, clock, happy, HUnit, language-dot , pretty, transformers, xml @@ -114754,6 +115077,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable-accelerate" = callPackage + ({ mkDerivation, accelerate, base, template-haskell }: + mkDerivation { + pname = "hashable-accelerate"; + version = "0.1.0.0"; + sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738"; + libraryHaskellDepends = [ accelerate base template-haskell ]; + description = "A class for types which can be converted into a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat @@ -114924,6 +115259,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashmap-throw" = callPackage + ({ mkDerivation, base, exceptions, hashable, hashmap }: + mkDerivation { + pname = "hashmap-throw"; + version = "0.1.0.0"; + sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5"; + libraryHaskellDepends = [ base exceptions hashable hashmap ]; + description = "Throw behaviour for hashmap lookup"; + license = stdenv.lib.licenses.mit; + }) {}; + "hashrename" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory, filepath }: @@ -115231,15 +115577,15 @@ self: { broken = true; }) {}; - "haskeline_0_8_0_0" = callPackage + "haskeline_0_8_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.0.0"; - sha256 = "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb"; + version = "0.8.1.0"; + sha256 = "0r6skxr45k0qq5vlh9dyl5g5ham994b8z0k3z3v56bi3npvyi6xw"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -116567,6 +116913,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; + revision = "1"; + editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -116706,6 +117054,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-match" = callPackage + ({ mkDerivation, base, containers, filepath, haskell-src-exts + , hspec, interpolatedstring-perl6, pretty-simple, split + , template-haskell, text, transformers + }: + mkDerivation { + pname = "haskell-src-match"; + version = "0.0.0.1"; + sha256 = "0lhdnmzmwxsiw0if600apdvmkbqz44zwr7sypfclixl9c6h31wg0"; + libraryHaskellDepends = [ + base containers haskell-src-exts interpolatedstring-perl6 + pretty-simple split template-haskell transformers + ]; + testHaskellDepends = [ + base filepath hspec interpolatedstring-perl6 template-haskell text + ]; + description = "Testing code generators piece by piece"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskell-src-meta" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans @@ -118586,6 +118956,8 @@ self: { ]; description = "Simple unsupervised segmentation model"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktags" = callPackage @@ -122670,8 +123042,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.3"; - sha256 = "19mz8cqrk7v49h8k2bcpv31qnplx7r10k010gzcwmhhfyrlyrqyg"; + version = "0.7.4"; + sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124545,7 +124917,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hie-bios_0_6_2" = callPackage + "hie-bios_0_7_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger @@ -124555,8 +124927,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.6.2"; - sha256 = "0x0lgrkbp4f9r96cf65d8qg55hp2qb14xd3zzap5yhybhlp54w8m"; + version = "0.7.0"; + sha256 = "17jfiyxq1m0n1i9a565niczivkkxdd36l9gxqbhfafxsykggliab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136143,6 +136515,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_4_2" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat + , bytestring, containers, cookie, hashable, hspec, hspec-discover + , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged + , text, time-compat, transformers, unordered-containers, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.4.2"; + sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base base-compat bytestring + containers cookie hashable http-types tagged text time-compat + transformers unordered-containers uuid-types + ]; + testHaskellDepends = [ + base base-compat bytestring cookie hspec HUnit nats QuickCheck + quickcheck-instances text time-compat unordered-containers + uuid-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -136183,7 +136581,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_7_2" = callPackage + "http-client_0_7_2_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -136192,8 +136590,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.2"; - sha256 = "1ld8bx1bnf1gpvdy9wn14b31k94rjvl40zqrgd7nb20zd2l354vp"; + version = "0.7.2.1"; + sha256 = "0b699f07yqa525xqqcs4cn32fryjc2212sv8v83yfqlqwdwzr7jg"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -136776,6 +137174,31 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "http-link-header_1_1_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, directory + , errors, hspec, hspec-attoparsec, http-api-data, network-uri + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "http-link-header"; + version = "1.1.1"; + sha256 = "0bgffcmdswmpw3gl2yricz56y0cxb4x8l0j0qs60c6h16rcp5xwh"; + libraryHaskellDepends = [ + attoparsec base bytestring errors http-api-data network-uri text + ]; + testHaskellDepends = [ + attoparsec base bytestring errors hspec hspec-attoparsec + http-api-data network-uri QuickCheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion directory errors http-api-data + network-uri text transformers + ]; + description = "A parser and writer for the HTTP Link header per RFC 5988"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -141518,6 +141941,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_10_1_2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, filepath, ghc, ghc-boot + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, raw-strings-qq + , setenv, shelly, split, stm, strict, text, time, transformers + , unix, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.10.1.2"; + sha256 = "1gs2j0qgxzf346nlnq0zx12yj528ykxia5r3rlldpf6f01zs89v8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline + haskell-src-exts hlint http-client http-client-tls ipython-kernel + mtl parsec process random shelly split stm strict text time + transformers unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix unordered-containers + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -143033,22 +143492,22 @@ self: { }) {}; "indigo" = callPackage - ({ mkDerivation, base, constraints, containers, fmt, hedgehog - , hspec-expectations, HUnit, lorentz, morley, morley-prelude - , reflection, singletons, tasty, tasty-discover, tasty-hedgehog - , tasty-hunit-compat, template-haskell, vinyl + ({ mkDerivation, base, cleveland, constraints, containers, fmt + , hedgehog, hspec-expectations, HUnit, lorentz, morley + , morley-prelude, reflection, singletons, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit-compat, template-haskell, vinyl }: mkDerivation { pname = "indigo"; - version = "0.1.0.0"; - sha256 = "03bspqbw8iz25d58xvy18qzk7wrm5k48k6bvnnslkikqy2bnkcr1"; + version = "0.2.0"; + sha256 = "070ha5s8yirci7zdnh8gy8hdh158zsj7z7blwsr7inw753fsh1jp"; libraryHaskellDepends = [ base constraints containers lorentz morley morley-prelude reflection singletons template-haskell vinyl ]; testHaskellDepends = [ - base containers fmt hedgehog hspec-expectations HUnit lorentz - morley morley-prelude singletons tasty tasty-hedgehog + base cleveland containers fmt hedgehog hspec-expectations HUnit + lorentz morley morley-prelude singletons tasty tasty-hedgehog tasty-hunit-compat ]; testToolDepends = [ tasty-discover ]; @@ -143056,7 +143515,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {cleveland = null;}; "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: @@ -144665,8 +145124,8 @@ self: { ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { pname = "intmap-graph"; - version = "1.1.0.0"; - sha256 = "0yg88vvq53kbzw2r8i1w1g4am4bkp8qzgy9qsc7wknb3zwlzs89w"; + version = "1.3.0.0"; + sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0"; libraryHaskellDepends = [ base containers text vector word8 ]; description = "A graph library that allows to explore edges after their type"; license = stdenv.lib.licenses.bsd3; @@ -144732,15 +145191,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "intro_0_8_0_0" = callPackage + "intro_0_9_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, extra, hashable , lens, mtl, optics, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.8.0.0"; - sha256 = "1vmhmpcikxlmad2c55bdlsa7j1x30irjb7dp69qii650qslh2rf3"; + version = "0.9.0.0"; + sha256 = "0x48bj9nri2zhsjpwx08nvjmpsjq6zd61npa02zsf357wylxir0x"; libraryHaskellDepends = [ base bytestring containers extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -145599,6 +146058,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_10_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text + , containers, cryptonite, directory, filepath, memory, mtl, parsec + , process, temporary, text, transformers, unordered-containers + , uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.10.2.1"; + sha256 = "016w7bmji3k1cnnl3vq35zq6fnqdvc2x762zfzv4ync2jz63rq38"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-text containers cryptonite + directory filepath memory mtl parsec process temporary text + transformers unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -146950,8 +147432,8 @@ self: { ({ mkDerivation, base, binary, ixset-typed }: mkDerivation { pname = "ixset-typed-binary-instance"; - version = "0.1.0.0"; - sha256 = "1qa00y5cn3i2b66h87i6sfx6xx4yvgq7gk6maij5b9w4c821h4m4"; + version = "0.1.0.2"; + sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx"; libraryHaskellDepends = [ base binary ixset-typed ]; description = "Binary instance for ixset-typed"; license = stdenv.lib.licenses.mit; @@ -146977,8 +147459,8 @@ self: { ({ mkDerivation, base, hashable, ixset-typed }: mkDerivation { pname = "ixset-typed-hashable-instance"; - version = "0.1.0.1"; - sha256 = "14cd3kzhqv8w9f756drhjpmrr32i6n9sjmp9fk2gngsigaksnvnk"; + version = "0.1.0.2"; + sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv"; libraryHaskellDepends = [ base hashable ixset-typed ]; description = "Hashable instance for ixset-typed"; license = stdenv.lib.licenses.mit; @@ -149432,25 +149914,27 @@ self: { "jsop" = callPackage ({ mkDerivation, aeson, base, containers, generics-sop, lens , lens-aeson, monoidal-containers, protolude, string-interpolate - , tasty, tasty-discover, tasty-hspec, text + , tasty, tasty-discover, tasty-hspec, text, unordered-containers }: mkDerivation { pname = "jsop"; - version = "0.1.0.0"; - sha256 = "0yaxcpxgn00jf3igvncg59ca6hz28sf791872n617v3vh7arv8y3"; + version = "0.2.0.1"; + sha256 = "05qacp69pk4fm1b1mrk2ax8f8mbfzsb71bkj2qraa116xym61j38"; libraryHaskellDepends = [ aeson base containers generics-sop lens lens-aeson monoidal-containers protolude string-interpolate tasty - tasty-discover tasty-hspec text + tasty-discover tasty-hspec text unordered-containers ]; testHaskellDepends = [ aeson base containers generics-sop lens lens-aeson monoidal-containers protolude string-interpolate tasty - tasty-discover tasty-hspec text + tasty-discover tasty-hspec text unordered-containers ]; testToolDepends = [ tasty-discover ]; description = "Cherry picking in JSON objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jspath" = callPackage @@ -149558,18 +150042,18 @@ self: { }) {}; "juicy-gcode" = callPackage - ({ mkDerivation, base, configurator, lens, linear, matrix + ({ mkDerivation, base, configurator, gitrev, lens, linear, matrix , optparse-applicative, svg-tree, text }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.10"; - sha256 = "17ps1kkbjvlvyjzbqagwikw960nn8q4dzjvng0waknr2gaa125bj"; + version = "0.2.0.1"; + sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base configurator lens linear matrix optparse-applicative svg-tree - text + base configurator gitrev lens linear matrix optparse-applicative + svg-tree text ]; description = "SVG to G-Code converter"; license = stdenv.lib.licenses.bsd3; @@ -150293,41 +150777,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.8.4.0"; - sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_8_5_0" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -150360,7 +150809,6 @@ self: { ]; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -152191,6 +152639,27 @@ self: { broken = true; }) {egl = null; inherit (pkgs) glew;}; + "ktx-codec" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, shower, text, vector + }: + mkDerivation { + pname = "ktx-codec"; + version = "0.0.1.1"; + sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0"; + libraryHaskellDepends = [ + base binary bytestring containers text vector + ]; + testHaskellDepends = [ + base binary bytestring containers directory filepath shower text + vector + ]; + description = "Khronos texture format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kubernetes-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, connection, containers, data-default-class, either @@ -153786,8 +154255,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.0"; - sha256 = "0pi983l9s182c4xcqj7xq3idv8wnshx7zva5a5wfhws403y5yy7v"; + version = "1.3.0.1"; + sha256 = "0681w4rz547if52yk0k32drhllx0k906nir0gs6xv0pqxkjc07ri"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156345,12 +156814,10 @@ self: { ({ mkDerivation, accelerate, base, lens }: mkDerivation { pname = "lens-accelerate"; - version = "0.2.0.0"; - sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; - revision = "1"; - editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9"; + version = "0.3.0.0"; + sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y"; libraryHaskellDepends = [ accelerate base lens ]; - description = "Instances to mix lens with accelerate"; + description = "Instances to mix lens with Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -157296,8 +157763,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.2.5.2"; - sha256 = "1qydgw1c74c0xp2d5d85qbyyng9rgqgxgvj6fhh94wzgkxj99al6"; + version = "3.0.0.0"; + sha256 = "0qwnp5jzmlvi7bpbh1dhz3lp91qf5phr8hb7m3h5q0a50d72dqpp"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -157418,6 +157885,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {ffi = null;}; + "libfuse3" = callPackage + ({ mkDerivation, base, bytestring, clock, fuse3, resourcet, time + , unix + }: + mkDerivation { + pname = "libfuse3"; + version = "0.1.0.0"; + sha256 = "0qwlaqcpmi7dfsjk219z0hrqmayg46qx1cwj1vcz1nfv8jlm8yif"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring clock resourcet time unix + ]; + libraryPkgconfigDepends = [ fuse3 ]; + description = "A Haskell binding for libfuse-3.x"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) fuse3;}; + "libgit" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -157968,8 +158455,6 @@ self: { testPkgconfigDepends = [ libsodium ]; description = "Low-level bindings to the libsodium C library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsodium;}; "libssh2" = callPackage @@ -158869,10 +159354,8 @@ self: { }: mkDerivation { pname = "linear-accelerate"; - version = "0.6.0.0"; - sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; - revision = "1"; - editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v"; + version = "0.7.0.0"; + sha256 = "1rdbmchbvrg5g0ndfppswydn15qbp2k9dvx7wapfpy8971qqf2df"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -159706,23 +160189,19 @@ self: { benchmarkHaskellDepends = [ aeson attoparsec base criterion text ]; description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-base" = callPackage ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-base"; - version = "4.14.0.0"; - sha256 = "07qy1xc04wbd46cd0zgw3znczang1h1sgllxswjjimaw1wp49xh3"; + version = "4.14.1.0"; + sha256 = "0w5pwksyf8fbr8v8j5mshcysxlbz4lxdvmayc3pj8cm8xcdrvzkm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; description = "Drop-in base replacement for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-bytestring" = callPackage @@ -159738,8 +160217,6 @@ self: { libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the bytestring package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-containers" = callPackage @@ -159755,8 +160232,6 @@ self: { libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the containers package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-fixpoint" = callPackage @@ -159769,8 +160244,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.8.10.1"; - sha256 = "0mavpfwsm3a6cnw2p75hvjch1j0nb8qm1rflq304iz6msg9zbhsv"; + version = "0.8.10.2"; + sha256 = "1sdd88p5mz9xfqk9pbn138ixxdrq089iy5imskvhx66dwwrmrr8l"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -159790,8 +160265,6 @@ self: { doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -159806,8 +160279,6 @@ self: { libraryHaskellDepends = [ ghc-prim liquidhaskell ]; description = "Drop-in ghc-prim replacement for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-parallel" = callPackage @@ -159822,22 +160293,18 @@ self: { libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-platform" = callPackage ({ mkDerivation }: mkDerivation { pname = "liquid-platform"; - version = "0.8.10.1"; - sha256 = "1l1qpg08fhf2xbj7i3hy36idm2z4yggg7mlzyncjkjlqxdnmm44k"; + version = "0.8.10.2"; + sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf"; isLibrary = false; isExecutable = true; description = "A battery-included platform for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-prelude" = callPackage @@ -159846,16 +160313,14 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.8.10.1"; - sha256 = "0pcz59spsg3x4c5553yksfqgdjlh2c33id10b6p8hnm6hyqcbjvn"; + version = "0.8.10.2"; + sha256 = "0s52kd2x4h24j6z7cjkrarnqr7kp198qal55y84740rllskv3ijh"; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring containers liquid-base liquidhaskell ]; description = "General utility modules for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-vector" = callPackage @@ -159869,8 +160334,6 @@ self: { libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquidhaskell" = callPackage @@ -159886,10 +160349,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.10.1"; - sha256 = "0xyxb0sifqgp1hl6lcydf7svw6w968hd3dgmnlly8ddpdmhsw9jm"; - revision = "1"; - editedCabalFile = "0bg9660c5454jiimgwciimd114r81gfjdad6nzbgyhkvilfd0wad"; + version = "0.8.10.2"; + sha256 = "0byh5lia3kb44sgmilya881dp9il3n5qvrn16brnkvl9xhr9rdyi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159897,9 +160358,9 @@ self: { aeson base binary bytestring Cabal cereal cmdargs containers data-default deepseq Diff directory extra filepath fingertree ghc ghc-boot ghc-paths ghc-prim githash gitrev hashable hscolour - liquid-fixpoint mtl optics optparse-simple parsec pretty split syb - template-haskell temporary text time transformers - unordered-containers vector + liquid-fixpoint mtl optics optparse-applicative optparse-simple + parsec pretty split syb template-haskell temporary text time + transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -159911,8 +160372,6 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -160983,12 +161442,17 @@ self: { }) {}; "llvm-pretty" = callPackage - ({ mkDerivation, base, containers, monadLib, parsec, pretty }: + ({ mkDerivation, base, containers, microlens, microlens-th + , monadLib, parsec, pretty, template-haskell, th-abstraction + }: mkDerivation { pname = "llvm-pretty"; - version = "0.7.1.1"; - sha256 = "17lb4jfkaxz2ahjfvq2mxnb82k209qg13rhdg76v3j8yahr5z0a2"; - libraryHaskellDepends = [ base containers monadLib parsec pretty ]; + version = "0.11.0"; + sha256 = "17jw5i68fz2vk40dcqf8k7j6j6h8acg4fhnyygb72jbk17md4q94"; + libraryHaskellDepends = [ + base containers microlens microlens-th monadLib parsec pretty + template-haskell th-abstraction + ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -161579,18 +162043,19 @@ self: { "log-elasticsearch" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bloodhound, bytestring, deepseq, http-client, http-client-tls - , log-base, semigroups, text, text-show, time, transformers - , unordered-containers, vector + , bytestring, deepseq, http-client, http-client-tls, http-types + , log-base, network-uri, semigroups, text, text-show, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.2.0"; - sha256 = "0kcixyklnak34v8vmmpw8vpm1mvf3wll6xpcdvfg1c75wc9n1hqy"; + version = "0.11.0.0"; + sha256 = "1l64mxk3zmlfsqwlhsq62jp8rawj3jbw9izihg7555q51pbqlg5w"; libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bloodhound bytestring - deepseq http-client http-client-tls log-base semigroups text - text-show time transformers unordered-containers vector + aeson aeson-pretty base base64-bytestring bytestring deepseq + http-client http-client-tls http-types log-base network-uri + semigroups text text-show time transformers unordered-containers + vector ]; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; @@ -161833,6 +162298,8 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-effect-extra" = callPackage @@ -162013,6 +162480,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logict_0_7_0_3" = callPackage + ({ mkDerivation, base, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "logict"; + version = "0.7.0.3"; + sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl tasty tasty-hunit ]; + description = "A backtracking logic-programming monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logict-state" = callPackage ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { @@ -162560,8 +163040,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.5.0"; - sha256 = "0wvvxc49bc8cyfhhwzzhrdf3sia03d8hx2cxpjg3jab8bbxbqza1"; + version = "0.6.0"; + sha256 = "1mzw2m46g5gffhihjfwimrhwqlky3z420b5wifdvxybm5vfc0qm2"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -163093,8 +163573,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.1.1.1"; - sha256 = "1dl44rc5b3wrgfcllp6h1sw4w18jgglh1grh5w9g37rcxi2cxwll"; + version = "0.2.0.0"; + sha256 = "1b4s4yfhxnixc33kz0hnj2v5vrwag4vnssp8ma0vjgh17b9g4qzr"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -163553,14 +164033,44 @@ self: { broken = true; }) {}; + "lz4-frame-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, hspec, inline-c, optparse-applicative, QuickCheck + , raw-strings-qq, resourcet, template-haskell, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "lz4-frame-conduit"; + version = "0.1.0.0"; + sha256 = "0nvvf42m4vbadl869hgyqrzbzbxp9q7rlbrldi4y6zw48ig21r1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra containers inline-c + raw-strings-qq resourcet template-haskell unliftio unliftio-core + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra optparse-applicative + resourcet text + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec QuickCheck resourcet + unliftio-core + ]; + description = "Conduit implementing the official LZ4 frame streaming format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lz4-hs" = callPackage ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty , tasty-hunit, temporary }: mkDerivation { pname = "lz4-hs"; - version = "0.1.4.1"; - sha256 = "15jm8lbwhgp29yvnwsxsmbixvgpxrnw7jc96zwmzbqx365r4dfqr"; + version = "0.1.5.0"; + sha256 = "0qqv6n7hjcjkc1pzhwkdr9l1kfb8rqndx2lfm6j4bhmvrwwrn8lw"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -169564,25 +170074,6 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-client-tls, http-conduit - , http-types, mime-mail, old-locale, text, time, transformers - , xml-conduit, xml-types - }: - mkDerivation { - pname = "mime-mail-ses"; - version = "0.4.1"; - sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7"; - libraryHaskellDepends = [ - base base64-bytestring byteable bytestring conduit cryptohash - http-client http-client-tls http-conduit http-types mime-mail - old-locale text time transformers xml-conduit xml-types - ]; - description = "Send mime-mail messages via Amazon SES"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail-ses_0_4_2" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , byteable, bytestring, case-insensitive, conduit, cryptohash , http-client, http-client-tls, http-conduit, http-types, mime-mail @@ -169609,7 +170100,6 @@ self: { ]; description = "Send mime-mail messages via Amazon SES"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-string" = callPackage @@ -171685,6 +172175,8 @@ self: { ]; description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-codec" = callPackage @@ -173747,8 +174239,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.5.0"; - sha256 = "151idw4dhdlsw9ga8q0mp3vnv520ljmkr0wm2hhhd7k0xliy177a"; + version = "1.6.0"; + sha256 = "0i06yh7v2zz8lcjhc96k5wsfj9i401mgs05myg46ml04zz4pw408"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176956,6 +177448,8 @@ self: { ]; description = "A Markov stochastic transition operator with logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mwc-random" = callPackage @@ -177001,10 +177495,8 @@ self: { ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { pname = "mwc-random-accelerate"; - version = "0.1.0.0"; - sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; - revision = "3"; - editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic"; + version = "0.2.0.0"; + sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -180687,8 +181179,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.3.1.1"; - sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky"; + version = "0.4.0.0"; + sha256 = "1hnsk8xsa89p4ywvyb4xfdk3l16mlhmb73sy1vbgckc7mlv3mmb4"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri test-invariant text @@ -181757,8 +182249,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.0.0"; - sha256 = "0agj882mfnr53jlpn1cnds31b78qw3a13md1ap6jj2rnxs2zjcai"; + version = "0.1.1.0"; + sha256 = "1dciwsw7cv1f73awrqr3gw3zj3mizaw53q3ibkawq9gbfsfg8yiz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -182445,8 +182937,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.3.4.0"; - sha256 = "1np8gypq49j90clavh17wzxp9y6z23lngal815jsg4p35qc0h01l"; + version = "0.3.4.1"; + sha256 = "0cpn0f0gnir9w366hw2906316qx5yc06rrrlv67xba1p66507m83"; libraryHaskellDepends = [ aeson base comonad containers deepseq nonempty-vector semigroupoids these vector @@ -183778,12 +184270,14 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.9.0.0"; - sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb"; + version = "0.10.0.0"; + sha256 = "188zf4hlqgjj5xgsfvrkynhq8pc29qfkaz6rp61ij3adc30410al"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; - libraryHaskellDepends = [ base bytestring cuda template-haskell ]; + libraryHaskellDepends = [ + base bytestring cuda directory filepath template-haskell + ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to NVVM"; license = stdenv.lib.licenses.bsd3; @@ -185190,6 +185684,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_7_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.0.0"; + sha256 = "1a4ymnfw7gdqf2b5lsrfhxf53ybjfcyx31fdxn52fv89jc2h2yiy"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -185979,14 +186502,14 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_6_0" = callPackage + "opentelemetry_0_6_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events , hashable }: mkDerivation { pname = "opentelemetry"; - version = "0.6.0"; - sha256 = "0gl3xax7gz89fc12lyw468qhailgja06skj6siscq9pip03gj6ck"; + version = "0.6.1"; + sha256 = "0i88ciig40gil4gaj95qw28c2racdr2jb6rcpnsf60fzkqc8b3fk"; libraryHaskellDepends = [ base bytestring exceptions ghc-trace-events hashable ]; @@ -186030,7 +186553,7 @@ self: { broken = true; }) {}; - "opentelemetry-extra_0_6_0" = callPackage + "opentelemetry-extra_0_6_1" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clock , containers, directory, exceptions, filepath, gauge , generic-arbitrary, ghc-events, hashable, hashtables, http-client @@ -186041,8 +186564,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.6.0"; - sha256 = "025fsryqzv0cfny1myrhs4bdrdg8sfp86rvxf671sbl8nli48x1a"; + version = "0.6.1"; + sha256 = "0ggxkhcrjj8sg6zf9jnp1j05wwlsay6k95c79j9j3dvw8qy2yjbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186111,7 +186634,7 @@ self: { broken = true; }) {}; - "opentelemetry-lightstep_0_6_0" = callPackage + "opentelemetry-lightstep_0_6_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra @@ -186120,8 +186643,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.6.0"; - sha256 = "09xqda7hxx4dn85hs2zh7y3jjxvi7xprcpv8mmam38hzyhjw2rv7"; + version = "0.6.1"; + sha256 = "1a7rrm5aahqh63j0rr7nvd4y3q64m8qr7is0r0a17fwkkpppmyln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186155,14 +186678,14 @@ self: { broken = true; }) {}; - "opentelemetry-wai_0_6_0" = callPackage + "opentelemetry-wai_0_6_1" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.6.0"; - sha256 = "1bqq1fs7krckx43w2j4pvfncbyy60rrh6w8n1pcvb629dary5lwn"; + version = "0.6.1"; + sha256 = "0g1a044sphd35z9crc8wbxsk4hfh1gpfi4g8rr1k4f842hznj7nf"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -187069,24 +187592,6 @@ self: { }) {}; "optparse-simple" = callPackage - ({ mkDerivation, base, bytestring, directory, githash - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; - version = "0.1.1.2"; - sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base githash optparse-applicative template-haskell transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_1_3" = callPackage ({ mkDerivation, base, bytestring, directory, githash , optparse-applicative, template-haskell, transformers }: @@ -187102,7 +187607,6 @@ self: { testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -189072,7 +189576,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_1_0" = callPackage + "pandoc-plot_0_9_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -189081,8 +189585,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.1.0"; - sha256 = "0vfcn0h5x9jsf3jjriqd6wfa9cpi7icz4k8pkqmhjz5sgs2yv7i4"; + version = "0.9.2.0"; + sha256 = "0fryriyqlmfc82nqbqw7a8n7325wwag29v3ag61s600jw66i9fsc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189521,7 +190025,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_1" = callPackage + "pantry_0_5_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -189535,8 +190039,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.1"; - sha256 = "1q1q8jflhd5r70czsclkj27yqk4v8b1njdw8f4qb3xvf9c3gzl70"; + version = "0.5.1.2"; + sha256 = "1ix1y334l4a7zcqm8i849g67mgvkqzikbhcbkqc1d6hg1lhc7xzr"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -191533,8 +192037,8 @@ self: { ({ mkDerivation, base, binary, path }: mkDerivation { pname = "path-binary-instance"; - version = "0.1.0.0"; - sha256 = "1mrmp58s7f88hyq493h39c1f19r92yh2qw1diml61iwhm765j7ir"; + version = "0.1.0.1"; + sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y"; libraryHaskellDepends = [ base binary path ]; description = "Binary instance for Path"; license = stdenv.lib.licenses.mit; @@ -191594,8 +192098,8 @@ self: { ({ mkDerivation, base, path }: mkDerivation { pname = "path-like"; - version = "0.2.0.1"; - sha256 = "03d5kqs6xr22dl7gjydi1nlzy13wsc0dkmd93pwf37yp85y4bxrp"; + version = "0.2.0.2"; + sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9"; libraryHaskellDepends = [ base path ]; description = "PathLike, FileLike and DirLike type classes for the Path library"; license = stdenv.lib.licenses.mit; @@ -193683,8 +194187,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.10.0.0"; - sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n"; + version = "2.10.0.1"; + sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -193896,24 +194400,23 @@ self: { }) {}; "persistent-redis" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, hedis - , http-api-data, monad-control, mtl, path-pieces, persistent - , persistent-template, scientific, template-haskell, text, time - , transformers, utf8-string + ({ mkDerivation, aeson, base, binary, bytestring, hedis + , http-api-data, mtl, path-pieces, persistent, persistent-template + , scientific, template-haskell, text, time, transformers + , utf8-string }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2.2"; - sha256 = "1mkdc3s39h0zqzf86zzwyfxfpc4fasrhpfdypkj8mkljbh7v1i1l"; + version = "2.5.2.5"; + sha256 = "0h2bwr5svj36n3axnrgnrzkysg4ywf9d97x4fwwsjgn01gwr262k"; libraryHaskellDepends = [ - aeson attoparsec base binary bytestring hedis http-api-data - monad-control mtl path-pieces persistent scientific text time - transformers utf8-string + aeson base binary bytestring hedis http-api-data mtl path-pieces + persistent scientific text time transformers utf8-string ]; testHaskellDepends = [ - aeson attoparsec base binary bytestring hedis http-api-data - monad-control mtl path-pieces persistent persistent-template - scientific template-haskell text time transformers utf8-string + aeson base binary bytestring hedis http-api-data mtl path-pieces + persistent persistent-template scientific template-haskell text + time transformers utf8-string ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; @@ -194144,6 +194647,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-test_2_0_3_2" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, mtl, path-pieces, persistent + , persistent-template, QuickCheck, quickcheck-instances, random + , resourcet, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-test"; + version = "2.0.3.2"; + sha256 = "0d7a6m4qm6xzyv7h2fqn9hgv7r7q6dwh7x04ddsrygjxdgpwgqf3"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger mtl + path-pieces persistent persistent-template QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + description = "Tests for Persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , http-api-data, monad-logger, path-pieces, persistent @@ -198377,6 +198904,40 @@ self: { broken = true; }) {}; + "polysemy-http" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , case-insensitive, co-log-core, co-log-polysemy, composition + , containers, data-default, either, hedgehog, http-client + , http-client-tls, http-conduit, http-types, lens, mono-traversable + , network, polysemy, polysemy-plugin, relude, servant + , servant-client, servant-server, string-interpolate, tasty + , tasty-hedgehog, template-haskell, text, warp + }: + mkDerivation { + pname = "polysemy-http"; + version = "0.1.0.0"; + sha256 = "025dch3cq8bgyy78yg4jrcxxmkdyl03y38zrgjhfv00rrwcffhm0"; + libraryHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring case-insensitive + co-log-core co-log-polysemy composition containers data-default + either http-client http-client-tls http-conduit http-types lens + mono-traversable polysemy polysemy-plugin relude string-interpolate + template-haskell text + ]; + testHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring case-insensitive + co-log-core co-log-polysemy composition containers data-default + either hedgehog http-client http-client-tls http-conduit http-types + lens mono-traversable network polysemy polysemy-plugin relude + servant servant-client servant-server string-interpolate tasty + tasty-hedgehog template-haskell text warp + ]; + description = "Polysemy effect for http-client"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -201980,6 +202541,8 @@ self: { libraryHaskellDepends = [ base lucid prettyprinter text ]; description = "A prettyprinter backend for lucid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prettyprinter-vty" = callPackage @@ -203532,8 +204095,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.3"; - sha256 = "02i79irax13rny953k6fvswsgbif9nnvysnnbq3k4w37b3g5maiv"; + version = "0.3.2"; + sha256 = "1clh7gfqh2yf17jc453y8cc8qcga9h0j5a60nfr1sjd5byr8j8ab"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -204138,8 +204701,8 @@ self: { }: mkDerivation { pname = "proto-lens-jsonpb"; - version = "0.2.0.1"; - sha256 = "0hsjn0iy0bbpb1sczk6vj2vah5f60w8cpm2gach5zlb9qpvkg4x4"; + version = "0.2.0.2"; + sha256 = "1r98841byxkg5941yjrw15n56i0x68qr3gk29bimwcfifdf0idm2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring proto-lens-runtime text vector @@ -204792,6 +205355,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "psql-utils" = callPackage + ({ mkDerivation, aeson, base, hashable, postgresql-simple + , resource-pool, time + }: + mkDerivation { + pname = "psql-utils"; + version = "0.1.0.0"; + sha256 = "09s26lqqdy2qah6i0yim9g2h61hramhij7r9kbcccbc3fgv4sd6s"; + libraryHaskellDepends = [ + aeson base hashable postgresql-simple resource-pool time + ]; + description = "PostgreSQL Simple util tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "psqueues" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue @@ -207453,6 +208031,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickjs-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , HUnit, inline-c, mtl, QuickCheck, scientific, string-conv, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "quickjs-hs"; + version = "0.1.2.1"; + sha256 = "0dbypa7p3x5j2nmbw2qvs4aik74jfkfa9b0mmv2290p6sj9ag1hd"; + revision = "1"; + editedCabalFile = "0f18980s2sky2fnrdnadyhivjhbzxcq9m3isnji8q2gbzpbywca7"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions inline-c mtl scientific + string-conv text time transformers unliftio-core + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base exceptions HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers vector + ]; + description = "Wrapper for the QuickJS Javascript Engine"; + license = stdenv.lib.licenses.mit; + }) {}; + "quicklz" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2 @@ -208686,6 +209289,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; + revision = "1"; + editedCabalFile = "11l9bcjy63qvcm4n7djp2l1l8668hbckkkdb2nj5g6iyy9pb2sa9"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -210786,28 +211391,35 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_4_1_0" = callPackage + "reanimate_0_4_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base - , base64-bytestring, bytestring, cassava, cereal, chiphunk, colour - , containers, cubicbezier, directory, earcut, filepath, fsnotify - , geojson, hashable, hmatrix, JuicyPixels, lens, linear, matrix - , mtl, neat-interpolation, open-browser, optparse-applicative - , parallel, process, random, random-shuffle, reanimate-svg, split - , temporary, text, time, vector, vector-space, websockets, xml + , base64-bytestring, bytestring, cassava, cereal, colour + , containers, cubicbezier, directory, filelock, filepath, fsnotify + , geojson, ghcid, hashable, hgeometry, hgeometry-combinatorial + , JuicyPixels, lens, linear, matrix, mtl, neat-interpolation + , open-browser, optparse-applicative, parallel, process, QuickCheck + , random, random-shuffle, reanimate-svg, split, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time + , vector, vector-space, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "0.4.1.0"; - sha256 = "12mql2i3433y3cj4x3rcilmvja4cnyk9y5cykw16sg30kbp1riki"; + version = "0.4.2.0"; + sha256 = "0dihh2k0cvh17qb37pfn1h6g620yzp923wrjqy22qbmlld896snk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring - bytestring cassava cereal chiphunk colour containers cubicbezier - directory earcut filepath fsnotify geojson hashable hmatrix - JuicyPixels lens linear matrix mtl neat-interpolation open-browser - optparse-applicative parallel process random random-shuffle - reanimate-svg split temporary text time vector vector-space - websockets xml + bytestring cassava cereal colour containers cubicbezier directory + filelock filepath fsnotify geojson ghcid hashable hgeometry + hgeometry-combinatorial JuicyPixels lens linear matrix mtl + neat-interpolation open-browser optparse-applicative parallel + process random random-shuffle reanimate-svg split temporary text + time vector vector-space websockets xml + ]; + testHaskellDepends = [ + base bytestring directory filepath linear process QuickCheck tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-rerun temporary + text vector ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; @@ -210973,8 +211585,8 @@ self: { }: mkDerivation { pname = "recommender-als"; - version = "0.2.0.0"; - sha256 = "14nw3ns52da4jlbwblbavchxzv1pjhc1zkjzcwfrqznxgsd5525p"; + version = "0.2.1.1"; + sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; @@ -213453,35 +214065,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph - , MonadRandom, mtl, multimap, protolude, random, resourcet - , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog - , tasty-th, template-haskell, text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.9.1"; - sha256 = "0vnx2sq3m6mqm1wcicknf7b8pfamx4pbn51hmzs6arwnvsq23vng"; - libraryHaskellDepends = [ - base containers exceptions hashable mmorph mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base bytestring containers directory exceptions generic-lens - hashable hedgehog io-memoize mmorph MonadRandom mtl multimap - protolude random resourcet semigroupoids semigroups tasty - tasty-discover tasty-hedgehog tasty-th template-haskell text - transformers-base universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_9_3" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph , MonadRandom, mtl, multimap, protolude, random, resourcet @@ -214504,8 +215087,8 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "4"; - editedCabalFile = "1lswfxmfn31gm2ayqwns9q9kpbad69scxpq6ybyzxkb9jd0jx4bl"; + revision = "5"; + editedCabalFile = "1v9bza21a3h0pkaxs628jjfli157d44i757da250fxwwamk8sg88"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -219009,6 +219592,8 @@ self: { testHaskellDepends = [ base directory hspec process ]; description = "Stack wrapper for single-file Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "runmany" = callPackage @@ -219263,10 +219848,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.7.0"; - sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "6"; - editedCabalFile = "0x82m44qwf3fls3ypbdca958l9hhfqyfip6rzzxi7648f0sasv21"; + version = "0.1.7.1"; + sha256 = "0gkxacfiqp55xzbmpz5i5c4kqma8jal49q7c8gl9n9qq5c5dvxjb"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -219364,8 +219947,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; - revision = "3"; - editedCabalFile = "12jjph25vffkj55ds468zv144qxwyrb6qmp2g1pb03732n6z9596"; + revision = "4"; + editedCabalFile = "12z5z68bfrzv3laagbssdcv7g97bpk2wf1bjirrivbhdbslf6l4q"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -223130,21 +223713,19 @@ self: { "semantic-source" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , doctest, generic-monoid, hashable, hedgehog, lingo, pathtype - , QuickCheck, semilattices, tasty, tasty-hedgehog, tasty-hunit - , text + , hashable, hedgehog, lingo, pathtype, semilattices, tasty + , tasty-hedgehog, tasty-hunit, text }: mkDerivation { pname = "semantic-source"; - version = "0.1.0.0"; - sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5"; + version = "0.1.0.1"; + sha256 = "1v4q9yc91lrx02wdhxp1njzm8g9qlwr40593lwcn6bxlad5sk6yd"; libraryHaskellDepends = [ - aeson base bytestring containers deepseq generic-monoid hashable - lingo pathtype semilattices text + aeson base bytestring containers deepseq hashable lingo pathtype + semilattices text ]; testHaskellDepends = [ - base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit - text + base hedgehog tasty tasty-hedgehog tasty-hunit text ]; description = "Types and functionality for working with source code"; license = stdenv.lib.licenses.mit; @@ -225661,14 +226242,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-lucid_0_9_0_1" = callPackage + "servant-lucid_0_9_0_2" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.1"; - sha256 = "1jhs9qy36vccy90s24cd9bmhqs604xqd9m8a4fbkjxrcpgdzfjgq"; + version = "0.9.0.2"; + sha256 = "0l68dffx746j3p2l5x59cj5cdng2dw6vjq5x5h44m0ccbsmlckpz"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -226225,8 +226806,8 @@ self: { }: mkDerivation { pname = "servant-reflex"; - version = "0.3.4"; - sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk"; + version = "0.3.5"; + sha256 = "0b4ppjnfas6pwypd16vkq98q1fs0l7cw32hhliv582xfvc0v3k8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226516,8 +227097,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.3.0"; - sha256 = "0gyfjrrq7anhn4b613gnaa0r2xm8rkminx1nrrbpn6bw47axadj4"; + version = "0.2.4.0"; + sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228248,14 +228829,16 @@ self: { }: mkDerivation { pname = "shake-dhall"; - version = "0.1.1.2"; - sha256 = "0jlbq9d6sjrbywd0afgsqqw1ffjlh5k4mr5v2bn45js29hipkivk"; + version = "0.1.1.3"; + sha256 = "1crakjnib9hvqph8f0wn0ii0y4hp9vix40kd8fpz85mdqfsynf5q"; libraryHaskellDepends = [ base containers dhall directory filepath shake text ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dhall dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-elm" = callPackage @@ -228439,12 +229022,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "shake-plus_0_3_2_0" = callPackage + "shake-plus_0_3_3_0" = callPackage ({ mkDerivation, base, extra, path, rio, shake }: mkDerivation { pname = "shake-plus"; - version = "0.3.2.0"; - sha256 = "0cgn1hgxp3kly7yp4s8mx714p1gnf30jpp6vjl47l19vc21hfzj5"; + version = "0.3.3.0"; + sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; @@ -228452,18 +229035,19 @@ self: { }) {}; "shake-plus-extended" = callPackage - ({ mkDerivation, base, comonad, extra, ixset-typed - , ixset-typed-binary-instance, ixset-typed-hashable-instance, path - , path-binary-instance, rio, shake, shake-plus, within + ({ mkDerivation, aeson, base, binary-instances, comonad, extra + , http-conduit, ixset-typed, ixset-typed-binary-instance + , ixset-typed-hashable-instance, path, path-binary-instance, rio + , shake, shake-plus, within }: mkDerivation { pname = "shake-plus-extended"; - version = "0.3.0.0"; - sha256 = "040g0h0a03wmwhbqn06jxwf5h0lwsiqfa1x1x9wzyw8m52f5ngn4"; + version = "0.4.0.0"; + sha256 = "1y12hcsyp8slzacjz8dim64m9sr09z7ppv3s4l30wyha9r395x8i"; libraryHaskellDepends = [ - base comonad extra ixset-typed ixset-typed-binary-instance - ixset-typed-hashable-instance path path-binary-instance rio shake - shake-plus within + aeson base binary-instances comonad extra http-conduit ixset-typed + ixset-typed-binary-instance ixset-typed-hashable-instance path + path-binary-instance rio shake shake-plus within ]; description = "Experimental extensions to shake-plus"; license = stdenv.lib.licenses.mit; @@ -228578,6 +229162,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_25" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, th-lift, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.25"; + sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + th-lift time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -229132,6 +229742,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "shelly_1_8_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.8.1"; + sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y"; + revision = "1"; + editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib @@ -235576,18 +236218,18 @@ self: { "souffle-haskell" = callPackage ({ mkDerivation, array, base, containers, deepseq, directory, extra , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl - , process, template-haskell, temporary, text, type-errors-pretty - , vector + , neat-interpolation, process, template-haskell, temporary, text + , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "1.1.0"; - sha256 = "0s8zl7f6v89m6a3yhlmji1lb8k3rfwzyyg307m3f35a9kms0988p"; + version = "2.0.0"; + sha256 = "0x6v1g5in762w1hhwcg5ipa0c491wp0mflqljjpl99da6kr1l93f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base deepseq directory filepath mtl process template-haskell - temporary text type-errors-pretty vector + array base containers deepseq directory filepath mtl process + template-haskell temporary text type-errors-pretty vector ]; executableHaskellDepends = [ array base containers deepseq directory extra filepath megaparsec @@ -235595,9 +236237,9 @@ self: { vector ]; testHaskellDepends = [ - array base deepseq directory filepath hedgehog hspec hspec-hedgehog - mtl process template-haskell temporary text type-errors-pretty - vector + array base containers deepseq directory filepath hedgehog hspec + hspec-hedgehog mtl neat-interpolation process template-haskell + temporary text type-errors-pretty vector ]; description = "Souffle Datalog bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -236009,6 +236651,19 @@ self: { broken = true; }) {}; + "spars" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "spars"; + version = "0.1.0.0"; + sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6"; + libraryHaskellDepends = [ base containers ]; + description = "A sparse set-based parsing library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sparse" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , criterion, deepseq, directory, doctest, filepath, hlint @@ -243692,6 +244347,28 @@ self: { broken = true; }) {}; + "supernova" = callPackage + ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring + , Cabal, crc32c, exceptions, lens-family-core, logging, managed + , network, proto-lens, proto-lens-runtime, proto-lens-setup + , streamly, text, unliftio + }: + mkDerivation { + pname = "supernova"; + version = "0.0.1"; + sha256 = "0v0x1xk63kxrf2ihhdr24z7ami557d3w2zizd0g8xqp02pr5gs8z"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + base bifunctor binary bytestring crc32c exceptions lens-family-core + logging managed network proto-lens proto-lens-runtime text unliftio + ]; + testHaskellDepends = [ aeson async base bytestring streamly text ]; + description = "Apache Pulsar client for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "supero" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath , haskell-src-exts, mtl, process, time, uniplate @@ -248765,6 +249442,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.4"; + sha256 = "0byc81m07v5a765vs4jpwgmgkf54c2n5yaqz8ava1sspmmf2p9fh"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "template-haskell-util" = callPackage ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }: mkDerivation { @@ -249605,8 +250294,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; @@ -254913,8 +255600,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "5"; - editedCabalFile = "049d9bk5f8qa6d7gjgg4nqd56xz1mrxr1rxcwxsrk4vkqcpmzs6q"; + revision = "6"; + editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; @@ -256959,8 +257646,8 @@ self: { pname = "tree-diff"; version = "0.1"; sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; - revision = "4"; - editedCabalFile = "0zl94ppd94szvmqa7vnpbcr2zfppbqm4k6isidzks2mz2ji9dc1i"; + revision = "5"; + editedCabalFile = "1b60x9cgp7hn42hc97q866ybhg5hx3sp45j6gngpbwryg29r2p4h"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers hashable parsec parsers pretty @@ -258954,8 +259641,8 @@ self: { }: mkDerivation { pname = "twirp"; - version = "0.2.0.0"; - sha256 = "00dc6bil998fdvb5p0r2782cy3nknw6s8k5a0cv4yqmha4iyn32m"; + version = "0.2.0.1"; + sha256 = "05np0zvnvy8wrm9lirrkwhd0n8f44j4xwr6lrywxxy9r00mx8bbl"; libraryHaskellDepends = [ aeson base bytestring http-media http-types proto-lens proto-lens-jsonpb proto-lens-runtime servant text wai @@ -261725,28 +262412,6 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath - , gauge, getopt-generics, optparse-applicative, path, path-io - , QuickCheck, split, text - }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.3.6"; - sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bitarray bytestring text ]; - testHaskellDepends = [ - base deepseq getopt-generics QuickCheck split text - ]; - benchmarkHaskellDepends = [ - base deepseq filepath gauge optparse-applicative path path-io text - ]; - description = "Unicode normalization"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode-transforms_0_3_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, filepath, gauge , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck , split, text @@ -261766,7 +262431,6 @@ self: { ]; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-tricks" = callPackage @@ -262455,7 +263119,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_7_0" = callPackage + "universum_1_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -262463,8 +263127,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.7.0"; - sha256 = "079sck4cfhvx4zda5qiz7vs3050l87ik9hx8yjc6bihrzlqvmgfb"; + version = "1.7.1"; + sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -263638,6 +264302,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "url-bytes" = callPackage + ({ mkDerivation, base, byteslice, bytesmith, bytestring, deepseq + , gauge, HUnit, primitive, tasty, tasty-hunit, template-haskell + , uri-bytestring, weigh + }: + mkDerivation { + pname = "url-bytes"; + version = "0.1.0.0"; + sha256 = "0nbxnmz1m2icg3vvdndr4zydwr8nbgxhb70ak2jzc6d92c3vhvqi"; + libraryHaskellDepends = [ + base byteslice bytesmith primitive template-haskell + ]; + testHaskellDepends = [ + base byteslice HUnit primitive tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytestring deepseq gauge primitive uri-bytestring + weigh + ]; + description = "Memory efficient url type and parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "url-decoders" = callPackage ({ mkDerivation, base, base-prelude, binary-parser, bytestring , criterion, http-types, QuickCheck, quickcheck-instances, rerebase @@ -266127,23 +266816,6 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; - version = "1.4.1.0"; - sha256 = "14l6c8l8l29f6kdffknd70kkccfjcf105i1zd0kchgsgjnr9p6l1"; - libraryHaskellDepends = [ - adjunctions base binary comonad deepseq distributive - finite-typelits hashable indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_1_4_2" = callPackage ({ mkDerivation, adjunctions, base, binary, comonad, deepseq , distributive, finite-typelits, hashable, indexed-list-literals , primitive, vector @@ -266158,7 +266830,6 @@ self: { ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -267655,8 +268326,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.5"; - sha256 = "17r0rn2xs5l5x9vwa5vyc4q11gyw2v29qs7vqicla0qb4hh140fj"; + version = "3.6.6"; + sha256 = "09mq11jqrd9sgx4xcy3xxji21yfhzl9a49mh5fp80y2mxsxdl0v9"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -272193,14 +272864,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "within_0_2_0_0" = callPackage + "within_0_2_0_1" = callPackage ({ mkDerivation, base, comonad, exceptions, free, hashable, path , path-like }: mkDerivation { pname = "within"; - version = "0.2.0.0"; - sha256 = "1jvfxcxyavadcbslb50a6ad7bmnwz45d6zaxyc38y61kh0r82242"; + version = "0.2.0.1"; + sha256 = "1yzfzizx45ngvvbshgw9z8hxl8z7vcr1gann6wnxq4b9669h29ic"; libraryHaskellDepends = [ base comonad exceptions free hashable path path-like ]; @@ -275657,8 +276328,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.35.1"; - sha256 = "1fizszhij2if9wxwzi728l93j9p5y9kfqnwnxk6nl66g64rsbp5x"; + version = "0.36"; + sha256 = "0kqnadgsqn7m3zw2vk22ssf4aw67rij9l1lpjfsnv2qw0m5apsdl"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -276805,35 +277476,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.11.4.0"; - sha256 = "0v69d10ni6ydj4g63ajcmnx6a2j3kbl91vpz678l7k5mkd3chkns"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_5_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -276860,7 +277502,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -279935,15 +280576,20 @@ self: { }) {}; "yhseq" = callPackage - ({ mkDerivation, base, hspec, hspec-discover }: + ({ mkDerivation, base, containers, hspec, hspec-discover, vector }: mkDerivation { pname = "yhseq"; - version = "0.2.1.2"; - sha256 = "1mxjfbnic6pn4jnyc83afpmgq4wnb09f72d359pwx693mfi6vbiy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec hspec-discover ]; + version = "0.3.0.1"; + sha256 = "1daipppqia4ig7xa9wxy2g3gcxrcwhxm1g6j5l81v56vfh0smg9r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers vector ]; + executableHaskellDepends = [ base containers vector ]; + testHaskellDepends = [ + base containers hspec hspec-discover vector + ]; testToolDepends = [ hspec-discover ]; - description = "Calculation of Y-sequence Hexirp edition"; + description = "Calculation of YH sequence system"; license = stdenv.lib.licenses.asl20; }) {}; @@ -280993,8 +281639,8 @@ self: { }: mkDerivation { pname = "zenacy-html"; - version = "2.0.1"; - sha256 = "074iidhiwzajz207q4k7f8sdg6w4421qfwr2s905226jd2xm1680"; + version = "2.0.2"; + sha256 = "12m953skm4ms6y211ahjrr6gkmrh4p3h2snpcpg1fc039nxgkc9p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281018,6 +281664,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "zenacy-unicode" = callPackage + ({ mkDerivation, base, bytestring, HUnit, test-framework + , test-framework-hunit, text, vector, word8 + }: + mkDerivation { + pname = "zenacy-unicode"; + version = "1.0.0"; + sha256 = "03sksmmmn380nvh0f139g63b4yx42ziimv79xjja7yx6mhaa0pqf"; + libraryHaskellDepends = [ base bytestring vector word8 ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + description = "Unicode utilities for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "zenc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -281765,8 +282427,8 @@ self: { }: mkDerivation { pname = "zipper-extra"; - version = "0.1.3.1"; - sha256 = "1n6amxaydfannxhgnbj5g315m96h5wvgrdw89n6761vii76csky4"; + version = "0.1.3.2"; + sha256 = "0cq21hf40qp025ir9kihsp6b09bsrlgiqd5cfq688w57c2vhcmci"; libraryHaskellDepends = [ base comonad comonad-extras exceptions split ]; diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index bf6c5b1baf3..997fd2ab634 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "0hk30adrm0s1g5flfaqfr3lc72y3hlmhqnyrqd7p0y91rsaw86b9"; + sha256 = "0b6ymi2a9is2q6n49dvlnjxknikj0rfff5ygbc4n7894h5mllvvr"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index f98547011bd..1786aebae83 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -14,7 +14,7 @@ , lldbVersions ? [ ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "18.1.5063045" +, ndkVersion ? "21.0.6113669" , useGoogleAPIs ? false , useGoogleTVAddOns ? false , includeExtras ? [] diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix index 23a55595cce..231e5b8ea22 100644 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -672,70 +672,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; - sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; @@ -896,70 +832,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; - sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b81fab1ed76..6bdb7181590 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -7,12 +7,14 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; - patchInstructions = lib.optionalString (os == "linux") '' + patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + '' # TODO: allow this stuff rm -rf docs tests @@ -46,6 +48,6 @@ deployAndroidPackage { do ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done - ''; + ''); noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix new file mode 100644 index 00000000000..246397b6081 --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -0,0 +1,22 @@ +{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +, logs, magic-mime }: + +if !stdenv.lib.versionAtLeast cohttp.version "0.99" then + cohttp +else if !stdenv.lib.versionAtLeast async.version "0.13" then + throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" +else + + buildDunePackage { + pname = "cohttp-async"; + useDune2 = true; + inherit (cohttp) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation for the Async concurrency library"; + }; + } diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix new file mode 100644 index 00000000000..f16819ed8ae --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -0,0 +1,19 @@ +{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: + +if !stdenv.lib.versionAtLeast conduit.version "1.0" +then conduit +else + +buildDunePackage { + pname = "conduit-async"; + useDune2 = true; + inherit (conduit) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async async_ssl conduit ]; + + meta = conduit.meta // { + description = "A network connection establishment library for Async"; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 7fbeefb3926..27b2a329b26 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; meta = { - description = "Network connection library for TCP and SSL"; + description = "A network connection establishment library"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 4ce502af19f..4734d83d55f 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.12.0"; + version = "6.12.1"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; + sha256 = "04c1sz113015gyhj3w7flw7l4bv0v50q6n04kk8dybcravzy2xgx"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix index d16ceefd04c..b92027a65a0 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -1,5 +1,6 @@ { janePackage , ctypes +, dune-configurator , num , octavius , ppxlib @@ -417,6 +418,15 @@ rec { propagatedBuildInputs = [ async shell ]; }; + async_ssl = janePackage { + pname = "async_ssl"; + useDune2 = true; + hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k"; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + core_bench = janePackage { pname = "core_bench"; hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 88a4028aa6d..c0944f4ff17 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,7 @@ , requests_download , zipfile36 , pythonOlder -, pytest_4 +, pytest , testpath , responses , pytoml @@ -39,7 +39,7 @@ buildPythonPackage rec { zipfile36 ]; - checkInputs = [ pytest_4 testpath responses ]; + checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. # Disable test that wants hg diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 690f2abb659..492a0519d18 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.10.1"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0v4yzrmrp1l3nlkw9ibllgblwy8y45anzfkkky2vghkl6w8411xa"; + sha256 = "0yxrz897kpjypfqzcy0ry90hc34w47q4fzqidp81h6pg01c03x6a"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix new file mode 100644 index 00000000000..2aef23fe4a4 --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, jupyterhub +}: + +buildPythonPackage rec { + pname = "jupyterhub-tmpauthenticator"; + version = "0.6"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l"; + }; + + propagatedBuildInputs = [ jupyterhub ]; + + # No tests available in the package + doCheck = false; + + pythonImportsCheck = [ "tmpauthenticator" ]; + + meta = with lib; { + description = "Simple Jupyterhub authenticator that allows anyone to log in."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterhub/tmpauthenticator"; + maintainers = with maintainers; [ chiroptical ]; + }; +} diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index f40a24afeae..50b81cef945 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.6.1"; + version = "0.5.8"; src = fetchPypi { inherit pname version; - sha256 = "a86c6448fb3c0f5e149f3347fbf0cd776431aec16a137a9b45298b6fe5991e42"; + sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index a7c96ef2e6e..cbd3f54c547 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.47"; + version = "3.5.48"; src = fetchPypi { inherit pname version; - sha256 = "0gw0902yjszwxk0air69in7nk4h2q36r96ga3r4bz0p0cnmagcj5"; + sha256 = "0bfe3fe6e1bd1d922f83683eae2ba1d2d29de94e25fb115eacca9530b4b02f76"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix new file mode 100644 index 00000000000..e1d1185f6f5 --- /dev/null +++ b/pkgs/development/python-modules/ujson/2.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ujson"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with stdenv.lib; { + homepage = "https://pypi.python.org/pypi/ujson"; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index b54a831e955..f30acee3667 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-18"; + version = "2.0.0-RC6-25"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0vym99fyn0g8l5y2zvhf73ww17wywrh503wg5aw4nilj8w1ncvn2"; + sha256 = "0hkkfm18v2hvkf344ln9ka8gi3jdl6bvqpafc6h06f06vmp8prch"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index 98f1b0c494c..9674ca1272d 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -18,8 +18,8 @@ mkDerivation { version = "0.2.0"; src = fetchgit { url = "https://github.com/wz1000/ghcide"; - sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; - rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; + sha256 = "112bsk2660750n94gnsgrvd30rk0ccxb8dbhka606a11pcqv5cgx"; + rev = "3f6cd4553279ec47d1599b502720791a4f4613cd"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/misc/kimg/default.nix b/pkgs/development/tools/misc/kimg/default.nix new file mode 100644 index 00000000000..b6f490e1d9d --- /dev/null +++ b/pkgs/development/tools/misc/kimg/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: + +stdenv.mkDerivation rec { + pname = "kimg"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kimg"; + rev = version; + sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + }; + + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + + buildInputs = [ imagemagick ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 2cfe95152a3..dfcc2f1a747 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.1"; + version = "1.6.2"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0jm8950rk0cdf84z0yxm8ic3pm353cgmxr1akn6kq1bwg2w0vsrq"; + sha256 = "104jw2jcshzds74d7m4yqn6mbk7lgps6qnqmp6h395b1mdyjhink"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock deleted file mode 100644 index 3be32ff068e..00000000000 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ /dev/null @@ -1,1283 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "adler" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" - -[[package]] -name = "aho-corasick" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -dependencies = [ - "memchr 0.1.11", -] - -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr 2.3.3", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "attohttpc" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "openssl", - "url", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "cargo-make" -version = "0.32.2" -dependencies = [ - "ci_info", - "clap", - "colored", - "dirs", - "duckscript", - "duckscriptsdk", - "envmnt", - "fern", - "fsio", - "git_info", - "glob", - "home", - "indexmap", - "log", - "run_script", - "rust_info", - "rusty-hook", - "semver", - "serde", - "serde_derive", - "serde_json", - "shell2batch", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "chrono" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" -dependencies = [ - "num", - "time", -] - -[[package]] -name = "ci_info" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e" -dependencies = [ - "envmnt", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static 1.4.0", -] - -[[package]] -name = "dirs" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "duckscript" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4c3da85470786f086bd14c0b299092715a99f8d8bb0ac2b787cbaab71e6ba6" -dependencies = [ - "fsio", -] - -[[package]] -name = "duckscriptsdk" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15dee0b26565d497303de383d0e20dbb5f6e95cdcba902aee109dc55fe62b8af" -dependencies = [ - "attohttpc", - "base64 0.12.3", - "cfg-if", - "duckscript", - "fs_extra", - "fsio", - "ftp", - "glob", - "home", - "java-properties", - "meval", - "num_cpus", - "rand", - "serde_json", - "uname", - "walkdir", - "which", - "whoami", -] - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "envmnt" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "fern" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" -dependencies = [ - "log", -] - -[[package]] -name = "flate2" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" -dependencies = [ - "cfg-if", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "fs_extra" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" - -[[package]] -name = "fsio" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3" -dependencies = [ - "rand", - "users", -] - -[[package]] -name = "ftp" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542951aad0071952c27409e3bd7cb62d1a3ad419c4e7314106bf994e0083ad5d" -dependencies = [ - "chrono", - "lazy_static 0.1.16", - "regex 0.1.80", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "git_info" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641b847f0375f4b2c595438eefc17a9c0fbf47b400cbdd1ad9332bf1e16b779d" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "autocfg", -] - -[[package]] -name = "hermit-abi" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -dependencies = [ - "libc", -] - -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "itoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -[[package]] -name = "java-properties" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -dependencies = [ - "encoding", - "regex 1.3.9", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" - -[[package]] -name = "log" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "memchr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "meval" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -dependencies = [ - "fnv", - "nom", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nias" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" - -[[package]] -name = "nom" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-integer", - "num-iter", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "openssl" -version = "0.10.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "lazy_static 1.4.0", - "libc", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pkg-config" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" - -[[package]] -name = "ppv-lite86" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" - -[[package]] -name = "proc-macro2" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -dependencies = [ - "getrandom", - "redox_syscall", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -dependencies = [ - "aho-corasick 0.5.3", - "memchr 0.1.11", - "regex-syntax 0.3.9", - "thread_local 0.2.7", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick 0.7.13", - "memchr 2.3.3", - "regex-syntax 0.6.18", - "thread_local 1.0.1", -] - -[[package]] -name = "regex-syntax" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "run_script" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc35067815a04a35fe2144361e1257b0f1041f0d413664f38e44d1a73cb4" -dependencies = [ - "fsio", -] - -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -dependencies = [ - "base64 0.11.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rust_info" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" - -[[package]] -name = "rusty-hook" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3" -dependencies = [ - "ci_info", - "getopts", - "nias", - "toml", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" - -[[package]] -name = "serde_derive" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shell2batch" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -dependencies = [ - "regex 1.3.9", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -dependencies = [ - "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -dependencies = [ - "kernel32-sys", - "libc", -] - -[[package]] -name = "thread_local" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -dependencies = [ - "thread-id", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static 1.4.0", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "tinyvec" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "url" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -dependencies = [ - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "users" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "utf8-ranges" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" - -[[package]] -name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "which" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" -dependencies = [ - "libc", - "thiserror", -] - -[[package]] -name = "whoami" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index f02ee5e5107..dbe64fc7ec1 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,32 +1,22 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config +{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.2"; + version = "0.32.3"; - src = - let - source = fetchFromGitHub { - owner = "sagiegurari"; - repo = pname; - rev = version; - sha256 = "0l0pislc7pgx1m68kirvadraq88c86mm1k46wbz3a47ph2d4g912"; - }; - in - runCommand "source" {} '' - cp -R ${source} $out - chmod +w $out - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = fetchCrate { + inherit pname version; + sha256 = "0qcwhmba83rrwqnlkcmvnmbj9jb2bwm0mka8rcp26y4yxmjm431n"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "16ygkh8sbb37nfc41shxg9nh2mbszyschbqrrr1gr7xzf1z36ipp"; + cargoSha256 = "1dmcdzdm7kzmrq2xsiaikns2xzjpdmh9w8pw653nlqfjjr2h6pxp"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix new file mode 100644 index 00000000000..a3f8196b124 --- /dev/null +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, wxGTK31 +, meson +, ninja +}: + +stdenv.mkDerivation { + pname = "wxFormBuilder"; + version = "unstable-2020-08-18"; + + src = fetchFromGitHub { + owner = "wxFormBuilder"; + repo = "wxFormBuilder"; + rev = "d053665cc33a79dd935b518b5e7aea6baf493c92"; + sha256 = "sha256-hTO7Fyp5ZWpq2CfIYEXB85oOkNrqr6Njfh8h0t9B6wU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + ninja + meson + ]; + + buildInputs = [ + wxGTK31 + ]; + + meta = with stdenv.lib; { + description = "RAD tool for wxWidgets GUI design"; + homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; + license = licenses.gpl2; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/games/exult/arch.patch b/pkgs/games/exult/arch.patch deleted file mode 100644 index 70de34184a2..00000000000 --- a/pkgs/games/exult/arch.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -aur exult-1.4.9rc1.orig/desktop/exult.desktop exult-1.4.9rc1/desktop/exult.desktop ---- exult-1.4.9rc1.orig/desktop/exult.desktop 2008-07-11 05:41:06.000000000 +0600 -+++ exult-1.4.9rc1/desktop/exult.desktop 2012-05-19 13:15:30.616084585 +0600 -@@ -1,9 +1,8 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=Exult - Comment=Exult Ultima 7 Engine - Exec=exult --Icon=exult.png -+Icon=exult - Terminal=false - Type=Application --Categories=Application;Game;RolePlaying; -+Categories=Game;RolePlaying; -diff -aur exult-1.4.9rc1.orig/files/databuf.h exult-1.4.9rc1/files/databuf.h ---- exult-1.4.9rc1.orig/files/databuf.h 2010-03-10 09:07:05.000000000 +0500 -+++ exult-1.4.9rc1/files/databuf.h 2012-05-19 12:50:16.856076030 +0600 -@@ -18,6 +18,7 @@ - #define DATA_H - - #include -+#include - #include - #include - #include -diff -aur exult-1.4.9rc1.orig/files/U7obj.h exult-1.4.9rc1/files/U7obj.h ---- exult-1.4.9rc1.orig/files/U7obj.h 2010-02-25 07:52:07.000000000 +0500 -+++ exult-1.4.9rc1/files/U7obj.h 2012-05-19 12:50:35.916076137 +0600 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "common_types.h" - #include "utils.h" - -diff -aur exult-1.4.9rc1.orig/imagewin/manip.h exult-1.4.9rc1/imagewin/manip.h ---- exult-1.4.9rc1.orig/imagewin/manip.h 2010-08-29 20:26:00.000000000 +0600 -+++ exult-1.4.9rc1/imagewin/manip.h 2012-05-19 13:02:45.159413596 +0600 -@@ -319,7 +319,7 @@ - static uintD copy(uintS src) - { - unsigned int r, g, b; -- split_source(src,r,g,b); -+ ManipBaseSrc::split_source(src,r,g,b); - return ManipBaseDest::rgb(r,g,b); - } - static void copy(uintD& dest, uintS src) -diff -aur exult-1.4.9rc1.orig/istring.h exult-1.4.9rc1/istring.h ---- exult-1.4.9rc1.orig/istring.h 2005-06-07 15:55:39.000000000 +0600 -+++ exult-1.4.9rc1/istring.h 2012-05-19 13:01:14.886079750 +0600 -@@ -162,19 +162,19 @@ - - _Myt& operator+=(const _Myt& _Right) - { // append _Right -- append(_Right); -+ this->append(_Right); - return (*this); - } - - _Myt& operator+=(const _Elem *_Ptr) - { // append [_Ptr, ) -- append(_Ptr); -+ this->append(_Ptr); - return (*this); - } - - _Myt& operator+=(_Elem _Ch) - { // append 1 * _Ch -- append(static_cast(1), _Ch); -+ this->append(static_cast(1), _Ch); - return (*this); - } - -diff -aur exult-1.4.9rc1.orig/shapes/pngio.cc exult-1.4.9rc1/shapes/pngio.cc ---- exult-1.4.9rc1.orig/shapes/pngio.cc 2010-02-15 18:48:11.000000000 -0200 -+++ exult-1.4.9rc1/shapes/pngio.cc 2013-09-22 20:56:37.809763588 -0300 -@@ -26,6 +26,7 @@ - #ifdef HAVE_CONFIG_H - # include - #endif -+#include - - #ifdef HAVE_PNG_H - -@@ -79,7 +80,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -208,7 +209,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); -@@ -306,7 +307,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -395,7 +396,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); - diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index e735c9c5817..adbf4dd0702 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL, libogg, libvorbis, zlib, unzip }: +{ stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: let @@ -12,27 +12,20 @@ let in stdenv.mkDerivation rec { - name = "exult-1.4.9rc1"; + name = "exult-1.6"; src = fetchurl { url = "mirror://sourceforge/exult/${name}.tar.gz"; - sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd"; + sha256 = "1dm27qkxj30567zb70q4acddsizn0xyi3z87hg7lysxdkyv49s3s"; }; configureFlags = [ "--disable-tools" ]; - patches = - [ # Arch Linux patch set. - ./arch.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libogg libvorbis zlib unzip ]; + buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; - NIX_LDFLAGS = "-lX11"; postInstall = diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index c0fe7d28225..20ad47d3e0a 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -14,42 +14,43 @@ , ocl-icd ? null , gperftools ? null , eigen ? null -, gpuEnabled ? true -, useAVX2 ? false -, cudaSupport ? false -, useTcmalloc ? true}: +, enableAVX2 ? false +, enableBigBoards ? false +, enableCuda ? false +, enableGPU ? true +, enableTcmalloc ? true}: -assert !gpuEnabled -> ( +assert !enableGPU -> ( eigen != null && - !cudaSupport); + !enableCuda); -assert cudaSupport -> ( +assert enableCuda -> ( libGL_driver != null && cudatoolkit != null && cudnn != null); -assert !cudaSupport -> ( - !gpuEnabled || ( +assert !enableCuda -> ( + !enableGPU || ( opencl-headers != null && ocl-icd != null)); -assert useTcmalloc -> ( +assert enableTcmalloc -> ( gperftools != null); let - env = if cudaSupport + env = if enableCuda then gcc8Stdenv else stdenv; in env.mkDerivation rec { pname = "katago"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "1r84ws2rj7j8085v1cqffy9rg65rzrhk6z8jbxivqxsmsgs2zs48"; + sha256 = "030ff9prnvpadgcb4x4hx6b6ggg10bwqcj8vd8nwrdz9sjq67yf7"; }; nativeBuildInputs = [ @@ -60,42 +61,44 @@ in env.mkDerivation rec { buildInputs = [ libzip boost - ] ++ lib.optionals (!gpuEnabled) [ + ] ++ lib.optionals (!enableGPU) [ eigen - ] ++ lib.optionals (gpuEnabled && cudaSupport) [ + ] ++ lib.optionals (enableGPU && enableCuda) [ cudnn libGL_driver - ] ++ lib.optionals (gpuEnabled && !cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ gperftools ]; cmakeFlags = [ "-DNO_GIT_REVISION=ON" - ] ++ lib.optionals (!gpuEnabled) [ + ] ++ lib.optionals (!enableGPU) [ "-DUSE_BACKEND=EIGEN" - ] ++ lib.optionals useAVX2 [ + ] ++ lib.optionals enableAVX2 [ "-DUSE_AVX2=ON" - ] ++ lib.optionals (gpuEnabled && cudaSupport) [ + ] ++ lib.optionals (enableGPU && enableCuda) [ "-DUSE_BACKEND=CUDA" - ] ++ lib.optionals (gpuEnabled && !cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ "-DUSE_BACKEND=OPENCL" - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ "-DUSE_TCMALLOC=ON" + ] ++ lib.optionals enableBigBoards [ + "-DUSE_BIGGER_BOARDS_EXPENSIVE=ON" ]; preConfigure = '' cd cpp/ - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' export CUDA_PATH="${cudatoolkit}" export EXTRA_LDFLAGS="-L/run/opengl-driver/lib" ''; installPhase = '' mkdir -p $out/bin; cp katago $out/bin; - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' wrapProgram $out/bin/katago \ --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" ''; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 807ab4fa44b..0e10add5561 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -130,7 +130,11 @@ let libapparmor.python ]; - prePatch = prePatchCommon; + prePatch = prePatchCommon + '' + substituteInPlace ./utils/apparmor/easyprof.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + substituteInPlace ./utils/apparmor/aa.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + substituteInPlace ./utils/logprof.conf --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + ''; inherit patches; postPatch = "cd ./utils"; makeFlags = [ "LANGS=" ]; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 98de3ed1b11..f8e9a4135a3 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; + sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c="; }; format = "other"; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index a92970726dc..55faa216a12 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb"; + sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a321f609df8..f788057e386 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p"; + sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly"; }; patches = [ diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 4e76fc35689..61564a69232 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.2"; + version = "1.7.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0xqyq3a43j2rav5n87lv1d0f66h9kqjnlxq5nq5d54h5g5qbsr3y"; + sha256 = "1y3w1ap1cxmi691wfz078r2h74pcwf38zs8lr985pfmb25w47q0l"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 8e0c71e08d7..7387270b737 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,6 +1,6 @@ { stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , installShellFiles , makeWrapper , coreutils @@ -12,11 +12,9 @@ rustPlatform.buildRustPackage rec { pname = "broot"; version = "0.20.3"; - src = fetchFromGitHub { - owner = "Canop"; - repo = pname; - rev = "v${version}"; - sha256 = "0hbz7cslngl77qka8sl84fjhijbqbw69dj058ghhsgaxw06nypg2"; + src = fetchCrate { + inherit pname version; + sha256 = "0vw956c5xpjsbd9b0ardvgi9jjqb230m2x5n4h9ai0yiwizc8rh6"; }; cargoSha256 = "1zl4p3n327iq7nm7hi79zjxv2gvw9f3lwgkg1qp52kycv1af5gqp"; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 06b7b0a5200..e59c2387a3c 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -21,6 +21,12 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) + + # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` + (fetchpatch { + url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; + sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 4e00a4ddd49..63cdb61dd33 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool +{ stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkgconfig autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d11c41195ce..e99f2aa12d5 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200722"; + name = "parallel-20200822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0vqd8nhf4lkvbfy7nnibxjkpzpfandpklqm0hrix5vki5x7x80a8"; + sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 5b139bf4929..8689e6467fb 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.15"; + version = "1.2020.16"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0dvm24ihdr71giz0mihg7wjqf2nrkk7a52vbbzimrvbilaih6s8v"; + sha256 = "0k9dligb0b2kc8rl9k5wp9sh8z1kb8g97v5pfiiwa321lp8y6wpp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix new file mode 100644 index 00000000000..b87a83fcdf9 --- /dev/null +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: + +stdenv.mkDerivation rec { + pname = "sd-mux-ctrl-unstable"; + version = "2020-02-17"; + + src = fetchgit { + url = "https://git.tizen.org/cgit/tools/testlab/sd-mux"; + rev = "9dd189d973da64e033a0c5c2adb3d94b23153d94"; + sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ libftdi1 popt ]; + + postInstall = '' + install -D -m 644 ../doc/man/sd-mux-ctrl.1 $out/share/man/man1/sd-mux-ctrl.1 + ''; + + meta = with stdenv.lib; { + description = "Tool for controlling multiple sd-mux devices"; + homepage = "https://wiki.tizen.org/SD_MUX"; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 416d8d92afa..15ad1c70a8d 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,5 +1,8 @@ -{ stdenv, makeWrapper -, buildGoModule, fetchFromGitHub, installShellFiles +{ stdenv +, makeWrapper +, buildGoModule +, fetchFromGitHub +, installShellFiles , git , gnupg , xclip @@ -26,11 +29,13 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; - wrapperPath = stdenv.lib.makeBinPath ([ - git - gnupg - xclip - ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); + wrapperPath = stdenv.lib.makeBinPath ( + [ + git + gnupg + xclip + ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard + ); postInstall = '' for shell in bash fish zsh; do @@ -49,11 +54,11 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = "https://www.gopass.pw/"; - license = licenses.mit; - maintainers = with maintainers; [ andir rvolosatovs ]; - platforms = platforms.unix; + description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ andir rvolosatovs ]; + platforms = platforms.unix; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index bee2c7a1a8f..b76dfd2256a 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "podiff"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; - sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.2.tar.gz"; + sha256 = "1l2b4hh53xlx28riigwarzkhxpv1pcz059xj1ka33ccvxc6c20k9"; }; patchPhase = '' diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 1f0c28d49b7..cdb156f3121 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; + sha256 = "0dx21ws4nzzizzjb0g172fzvjgwck88ikr5c2av08ii06rys1567"; }; vendorSha256 = null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1352a07c8..08b55eae214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1183,6 +1183,7 @@ in androidndkPkgs = androidndkPkgs_18b; androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; + androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; @@ -2268,6 +2269,8 @@ in obinskit = callPackage ../applications/misc/obinskit {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4884,6 +4887,11 @@ in kippo = callPackage ../servers/kippo { }; + kimg = callPackage ../development/tools/misc/kimg { + asciidoc = asciidoc-full; + imagemagick = imagemagick7Big; + }; + kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -6804,6 +6812,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; + sd-switch = callPackage ../os-specific/linux/sd-switch { }; sdate = callPackage ../tools/misc/sdate { }; @@ -9234,6 +9244,8 @@ in jwasm = callPackage ../development/compilers/jwasm { }; + knightos-kcc = callPackage ../development/compilers/kcc { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -15674,6 +15686,8 @@ in wt3 wt4; + wxformbuilder = callPackage ../development/tools/wxformbuilder { }; + wxGTK = wxGTK28; wxGTK30 = wxGTK30-gtk2; @@ -20346,6 +20360,8 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; + gophernotes = callPackage ../applications/editors/gophernotes { }; + goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; @@ -20987,6 +21003,8 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; @@ -23370,6 +23388,8 @@ in treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; + tremc = callPackage ../applications/networking/p2p/tremc { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { @@ -24718,13 +24738,13 @@ in katago = callPackage ../games/katago { }; katagoWithCuda = katago.override { - cudaSupport = true; + enableCuda = true; cudnn = cudnn_cudatoolkit_10_2; cudatoolkit = cudatoolkit_10_2; }; katagoCPU = katago.override { - gpuEnabled = false; + enableGPU = false; }; klavaro = callPackage ../games/klavaro {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a9bea0a60f6..ba02c3bb524 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -137,12 +137,16 @@ let cohttp = callPackage ../development/ocaml-modules/cohttp { }; + cohttp-async = callPackage ../development/ocaml-modules/cohttp/async.nix { }; + cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { }; conduit = callPackage ../development/ocaml-modules/conduit { }; + conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; + conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { }; conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { }; @@ -991,7 +995,7 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes dune-configurator janePackage num octavius ppxlib re; inherit (pkgs) openssl; } else if lib.versionOlder "4.07" ocaml.version diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7324a36ae0..e3148fbaaa4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4544,6 +4544,8 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; + jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; @@ -6991,7 +6993,9 @@ in { carbon = callPackage ../development/python-modules/carbon { }; - ujson = callPackage ../development/python-modules/ujson { }; + ujson = if isPy27 + then callPackage ../development/python-modules/ujson/2.nix { } + else callPackage ../development/python-modules/ujson { }; unidecode = callPackage ../development/python-modules/unidecode {}; @@ -7851,7 +7855,7 @@ in { rxv = callPackage ../development/python-modules/rxv { }; userpath = callPackage ../development/python-modules/userpath { }; - + pooch = callPackage ../development/python-modules/pooch {}; });