diff --git a/.editorconfig b/.editorconfig
index 75c34374130..43970edebe5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -57,10 +57,13 @@ indent_size = unset
[deps.nix]
insert_final_newline = unset
+[eggs.nix]
+trim_trailing_whitespace = unset
+
[gemset.nix]
insert_final_newline = unset
-[node-packages.nix]
+[node-{composition,packages}.nix]
insert_final_newline = unset
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
@@ -102,5 +105,8 @@ insert_final_newline = unset
indent_size = unset
trim_trailing_whitespace = unset
+[pkgs/top-level/emscripten-packages.nix]
+trim_trailing_whitespace = unset
+
[pkgs/top-level/perl-packages.nix]
indent_size = unset
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
new file mode 100644
index 00000000000..98c7afbab78
--- /dev/null
+++ b/.github/workflows/editorconfig.yml
@@ -0,0 +1,27 @@
+name: "Checking EditorConfig"
+
+on:
+ pull_request:
+
+jobs:
+ tests:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - uses: technote-space/get-diff-action@v3.1.0
+ - name: Fetch editorconfig-checker
+ if: env.GIT_DIFF
+ env:
+ ECC_VERSION: "2.1.0"
+ ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
+ run: |
+ curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \
+ tar xzf ec-linux-amd64.tar.gz && \
+ mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker
+ - name: Checking EditorConfig
+ if: env.GIT_DIFF
+ run: |
+ ./bin/editorconfig-checker -disable-indentation \
+ ${{ env.GIT_DIFF }}
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 3f8946628a3..002d8c435e2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2879,6 +2879,12 @@
githubId = 5918766;
name = "Franz Thoma";
};
+ fooker = {
+ email = "fooker@lab.sh";
+ github = "fooker";
+ githubId = 405105;
+ name = "Dustin Frisch";
+ };
forkk = {
email = "forkk@forkk.net";
github = "forkk";
@@ -7355,6 +7361,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";
@@ -7989,6 +8001,12 @@
githubId = 65870;
name = "Сухарик";
};
+ SuperSandro2000 = {
+ email = "sandro.jaeckel@gmail.com";
+ github = "SuperSandro2000";
+ githubId = 7258858;
+ name = "Sandro Jäckel";
+ };
SuprDewd = {
email = "suprdewd@gmail.com";
github = "SuprDewd";
@@ -9488,6 +9506,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/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 4ccb8483430..fb90e62769f 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -35,6 +35,10 @@ lua-cmsgpack,,,,,
lua-iconv,,,,,
lua-lsp,,http://luarocks.org/dev,,,
lua-messagepack,,,,,
+lua-resty-http,,,,,
+lua-resty-jwt,,,,,
+lua-resty-openidc,,,,,
+lua-resty-session,,,,,
lua-term,,,,,
lua-toml,,,,,
lua-zlib,,,,,koral
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/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index dc11eaa1982..93f94587c0a 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -1,14 +1,19 @@
#! /somewhere/python3
+from contextlib import contextmanager, _GeneratorContextManager
+from queue import Queue, Empty
+from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
+from xml.sax.saxutils import XMLGenerator
+import queue
+import io
+import _thread
import argparse
import atexit
import base64
-import io
-import itertools
-import logging
+import codecs
import os
import pathlib
+import ptpython.repl
import pty
-import queue
import re
import shlex
import shutil
@@ -16,12 +21,9 @@ import socket
import subprocess
import sys
import tempfile
-import _thread
import time
-from contextlib import contextmanager
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple
-
-import ptpython.repl
+import traceback
+import unicodedata
CHAR_TO_KEY = {
"A": "shift-a",
@@ -86,24 +88,13 @@ CHAR_TO_KEY = {
")": "shift-0x0B",
}
-# Forward reference
+# Forward references
+log: "Logger"
machines: "List[Machine]"
-logging.basicConfig(format="%(message)s")
-logger = logging.getLogger("test-driver")
-logger.setLevel(logging.INFO)
-machine_colours_iter = (
- "\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37)))
-)
-
-
-class MachineLogAdapter(logging.LoggerAdapter):
- def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]:
- return (
- f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}",
- kwargs,
- )
+def eprint(*args: object, **kwargs: Any) -> None:
+ print(*args, file=sys.stderr, **kwargs)
def make_command(args: list) -> str:
@@ -111,7 +102,8 @@ def make_command(args: list) -> str:
def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]:
- logger.info(f"starting VDE switch for network {vlan_nr}")
+ global log
+ log.log("starting VDE switch for network {}".format(vlan_nr))
vde_socket = tempfile.mkdtemp(
prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr)
)
@@ -150,6 +142,70 @@ def retry(fn: Callable) -> None:
raise Exception("action timed out")
+class Logger:
+ def __init__(self) -> None:
+ self.logfile = os.environ.get("LOGFILE", "/dev/null")
+ self.logfile_handle = codecs.open(self.logfile, "wb")
+ self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")
+ self.queue: "Queue[Dict[str, str]]" = Queue()
+
+ self.xml.startDocument()
+ self.xml.startElement("logfile", attrs={})
+
+ def close(self) -> None:
+ self.xml.endElement("logfile")
+ self.xml.endDocument()
+ self.logfile_handle.close()
+
+ def sanitise(self, message: str) -> str:
+ return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C")
+
+ def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str:
+ if "machine" in attributes:
+ return "{}: {}".format(attributes["machine"], message)
+ return message
+
+ def log_line(self, message: str, attributes: Dict[str, str]) -> None:
+ self.xml.startElement("line", attributes)
+ self.xml.characters(message)
+ self.xml.endElement("line")
+
+ def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
+ eprint(self.maybe_prefix(message, attributes))
+ self.drain_log_queue()
+ self.log_line(message, attributes)
+
+ def enqueue(self, message: Dict[str, str]) -> None:
+ self.queue.put(message)
+
+ def drain_log_queue(self) -> None:
+ try:
+ while True:
+ item = self.queue.get_nowait()
+ attributes = {"machine": item["machine"], "type": "serial"}
+ self.log_line(self.sanitise(item["msg"]), attributes)
+ except Empty:
+ pass
+
+ @contextmanager
+ def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+ eprint(self.maybe_prefix(message, attributes))
+
+ self.xml.startElement("nest", attrs={})
+ self.xml.startElement("head", attributes)
+ self.xml.characters(message)
+ self.xml.endElement("head")
+
+ tic = time.time()
+ self.drain_log_queue()
+ yield
+ self.drain_log_queue()
+ toc = time.time()
+ self.log("({:.2f} seconds)".format(toc - tic))
+
+ self.xml.endElement("nest")
+
+
class Machine:
def __init__(self, args: Dict[str, Any]) -> None:
if "name" in args:
@@ -179,11 +235,8 @@ class Machine:
self.pid: Optional[int] = None
self.socket = None
self.monitor: Optional[socket.socket] = None
+ self.logger: Logger = args["log"]
self.allow_reboot = args.get("allowReboot", False)
- self.logger = MachineLogAdapter(
- logger,
- extra=dict(machine=self.name, colour_code=next(machine_colours_iter)),
- )
@staticmethod
def create_startcommand(args: Dict[str, str]) -> str:
@@ -239,6 +292,14 @@ class Machine:
def is_up(self) -> bool:
return self.booted and self.connected
+ def log(self, msg: str) -> None:
+ self.logger.log(msg, {"machine": self.name})
+
+ def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager:
+ my_attrs = {"machine": self.name}
+ my_attrs.update(attrs)
+ return self.logger.nested(msg, my_attrs)
+
def wait_for_monitor_prompt(self) -> str:
assert self.monitor is not None
answer = ""
@@ -253,7 +314,7 @@ class Machine:
def send_monitor_command(self, command: str) -> str:
message = ("{}\n".format(command)).encode()
- self.logger.info(f"sending monitor command: {command}")
+ self.log("sending monitor command: {}".format(command))
assert self.monitor is not None
self.monitor.send(message)
return self.wait_for_monitor_prompt()
@@ -320,19 +381,16 @@ class Machine:
return self.execute("systemctl {}".format(q))
def require_unit_state(self, unit: str, require_state: str = "active") -> None:
- self.logger.info(
- f"checking if unit ‘{unit}’ has reached state '{require_state}'"
- )
- info = self.get_unit_info(unit)
- state = info["ActiveState"]
- if state != require_state:
- raise Exception(
- "Expected unit ‘{}’ to to be in state ".format(unit)
- + "'{}' but it is in state ‘{}’".format(require_state, state)
- )
-
- def log(self, message: str) -> None:
- self.logger.info(message)
+ with self.nested(
+ "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state)
+ ):
+ info = self.get_unit_info(unit)
+ state = info["ActiveState"]
+ if state != require_state:
+ raise Exception(
+ "Expected unit ‘{}’ to to be in state ".format(unit)
+ + "'{}' but it is in state ‘{}’".format(require_state, state)
+ )
def execute(self, command: str) -> Tuple[int, str]:
self.connect()
@@ -356,25 +414,27 @@ class Machine:
"""Execute each command and check that it succeeds."""
output = ""
for command in commands:
- self.logger.info(f"must succeed: {command}")
- (status, out) = self.execute(command)
- if status != 0:
- self.logger.info(f"output: {out}")
- raise Exception(
- "command `{}` failed (exit code {})".format(command, status)
- )
- output += out
+ with self.nested("must succeed: {}".format(command)):
+ (status, out) = self.execute(command)
+ if status != 0:
+ self.log("output: {}".format(out))
+ raise Exception(
+ "command `{}` failed (exit code {})".format(command, status)
+ )
+ output += out
return output
def fail(self, *commands: str) -> str:
"""Execute each command and check that it fails."""
output = ""
for command in commands:
- self.logger.info(f"must fail: {command}")
- (status, out) = self.execute(command)
- if status == 0:
- raise Exception("command `{}` unexpectedly succeeded".format(command))
- output += out
+ with self.nested("must fail: {}".format(command)):
+ (status, out) = self.execute(command)
+ if status == 0:
+ raise Exception(
+ "command `{}` unexpectedly succeeded".format(command)
+ )
+ output += out
return output
def wait_until_succeeds(self, command: str) -> str:
@@ -388,9 +448,9 @@ class Machine:
status, output = self.execute(command)
return status == 0
- self.logger.info(f"waiting for success: {command}")
- retry(check_success)
- return output
+ with self.nested("waiting for success: {}".format(command)):
+ retry(check_success)
+ return output
def wait_until_fails(self, command: str) -> str:
"""Wait until a command returns failure.
@@ -403,21 +463,21 @@ class Machine:
status, output = self.execute(command)
return status != 0
- self.logger.info(f"waiting for failure: {command}")
- retry(check_failure)
- return output
+ with self.nested("waiting for failure: {}".format(command)):
+ retry(check_failure)
+ return output
def wait_for_shutdown(self) -> None:
if not self.booted:
return
- self.logger.info("waiting for the VM to power off")
- sys.stdout.flush()
- self.process.wait()
+ with self.nested("waiting for the VM to power off"):
+ sys.stdout.flush()
+ self.process.wait()
- self.pid = None
- self.booted = False
- self.connected = False
+ self.pid = None
+ self.booted = False
+ self.connected = False
def get_tty_text(self, tty: str) -> str:
status, output = self.execute(
@@ -435,19 +495,19 @@ class Machine:
def tty_matches(last: bool) -> bool:
text = self.get_tty_text(tty)
if last:
- self.logger.info(
+ self.log(
f"Last chance to match /{regexp}/ on TTY{tty}, "
f"which currently contains: {text}"
)
return len(matcher.findall(text)) > 0
- self.logger.info(f"waiting for {regexp} to appear on tty {tty}")
- retry(tty_matches)
+ with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
+ retry(tty_matches)
def send_chars(self, chars: List[str]) -> None:
- self.logger.info(f"sending keys ‘{chars}‘")
- for char in chars:
- self.send_key(char)
+ with self.nested("sending keys ‘{}‘".format(chars)):
+ for char in chars:
+ self.send_key(char)
def wait_for_file(self, filename: str) -> None:
"""Waits until the file exists in machine's file system."""
@@ -456,16 +516,16 @@ class Machine:
status, _ = self.execute("test -e {}".format(filename))
return status == 0
- self.logger.info(f"waiting for file ‘{filename}‘")
- retry(check_file)
+ with self.nested("waiting for file ‘{}‘".format(filename)):
+ retry(check_file)
def wait_for_open_port(self, port: int) -> None:
def port_is_open(_: Any) -> bool:
status, _ = self.execute("nc -z localhost {}".format(port))
return status == 0
- self.logger.info(f"waiting for TCP port {port}")
- retry(port_is_open)
+ with self.nested("waiting for TCP port {}".format(port)):
+ retry(port_is_open)
def wait_for_closed_port(self, port: int) -> None:
def port_is_closed(_: Any) -> bool:
@@ -487,17 +547,17 @@ class Machine:
if self.connected:
return
- self.logger.info("waiting for the VM to finish booting")
- self.start()
+ with self.nested("waiting for the VM to finish booting"):
+ self.start()
- tic = time.time()
- self.shell.recv(1024)
- # TODO: Timeout
- toc = time.time()
+ tic = time.time()
+ self.shell.recv(1024)
+ # TODO: Timeout
+ toc = time.time()
- self.logger.info("connected to guest root shell")
- self.logger.info(f"(connecting took {toc - tic:.2f} seconds)")
- self.connected = True
+ self.log("connected to guest root shell")
+ self.log("(connecting took {:.2f} seconds)".format(toc - tic))
+ self.connected = True
def screenshot(self, filename: str) -> None:
out_dir = os.environ.get("out", os.getcwd())
@@ -506,12 +566,15 @@ class Machine:
filename = os.path.join(out_dir, "{}.png".format(filename))
tmp = "{}.ppm".format(filename)
- self.logger.info(f"making screenshot {filename}")
- self.send_monitor_command("screendump {}".format(tmp))
- ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True)
- os.unlink(tmp)
- if ret.returncode != 0:
- raise Exception("Cannot convert screenshot")
+ with self.nested(
+ "making screenshot {}".format(filename),
+ {"image": os.path.basename(filename)},
+ ):
+ self.send_monitor_command("screendump {}".format(tmp))
+ ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True)
+ os.unlink(tmp)
+ if ret.returncode != 0:
+ raise Exception("Cannot convert screenshot")
def copy_from_host_via_shell(self, source: str, target: str) -> None:
"""Copy a file from the host into the guest by piping it over the
@@ -587,18 +650,20 @@ class Machine:
tess_args = "-c debug_file=/dev/null --psm 11 --oem 2"
- self.logger.info("performing optical character recognition")
- with tempfile.NamedTemporaryFile() as tmpin:
- self.send_monitor_command("screendump {}".format(tmpin.name))
+ with self.nested("performing optical character recognition"):
+ with tempfile.NamedTemporaryFile() as tmpin:
+ self.send_monitor_command("screendump {}".format(tmpin.name))
- cmd = "convert {} {} tiff:- | tesseract - - {}".format(
- magick_args, tmpin.name, tess_args
- )
- ret = subprocess.run(cmd, shell=True, capture_output=True)
- if ret.returncode != 0:
- raise Exception("OCR failed with exit code {}".format(ret.returncode))
+ cmd = "convert {} {} tiff:- | tesseract - - {}".format(
+ magick_args, tmpin.name, tess_args
+ )
+ ret = subprocess.run(cmd, shell=True, capture_output=True)
+ if ret.returncode != 0:
+ raise Exception(
+ "OCR failed with exit code {}".format(ret.returncode)
+ )
- return ret.stdout.decode("utf-8")
+ return ret.stdout.decode("utf-8")
def wait_for_text(self, regex: str) -> None:
def screen_matches(last: bool) -> bool:
@@ -606,15 +671,15 @@ class Machine:
matches = re.search(regex, text) is not None
if last and not matches:
- self.logger.info(f"Last OCR attempt failed. Text was: {text}")
+ self.log("Last OCR attempt failed. Text was: {}".format(text))
return matches
- self.logger.info(f"waiting for {regex} to appear on screen")
- retry(screen_matches)
+ with self.nested("waiting for {} to appear on screen".format(regex)):
+ retry(screen_matches)
def wait_for_console_text(self, regex: str) -> None:
- self.logger.info(f"waiting for {regex} to appear on console")
+ self.log("waiting for {} to appear on console".format(regex))
# Buffer the console output, this is needed
# to match multiline regexes.
console = io.StringIO()
@@ -637,7 +702,7 @@ class Machine:
if self.booted:
return
- self.logger.info("starting vm")
+ self.log("starting vm")
def create_socket(path: str) -> socket.socket:
if os.path.exists(path):
@@ -694,7 +759,7 @@ class Machine:
# Store last serial console lines for use
# of wait_for_console_text
- self.last_lines: queue.Queue = queue.Queue()
+ self.last_lines: Queue = Queue()
def process_serial_output() -> None:
assert self.process.stdout is not None
@@ -702,7 +767,8 @@ class Machine:
# Ignore undecodable bytes that may occur in boot menus
line = _line.decode(errors="ignore").replace("\r", "").rstrip()
self.last_lines.put(line)
- self.logger.info(line)
+ eprint("{} # {}".format(self.name, line))
+ self.logger.enqueue({"msg": line, "machine": self.name})
_thread.start_new_thread(process_serial_output, ())
@@ -711,10 +777,10 @@ class Machine:
self.pid = self.process.pid
self.booted = True
- self.logger.info(f"QEMU running (pid {self.pid})")
+ self.log("QEMU running (pid {})".format(self.pid))
def cleanup_statedir(self) -> None:
- self.logger.info("delete the VM state directory")
+ self.log("delete the VM state directory")
if os.path.isfile(self.state_dir):
shutil.rmtree(self.state_dir)
@@ -729,7 +795,7 @@ class Machine:
if not self.booted:
return
- self.logger.info("forced crash")
+ self.log("forced crash")
self.send_monitor_command("quit")
self.wait_for_shutdown()
@@ -749,8 +815,8 @@ class Machine:
status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
return status == 0
- self.logger.info("waiting for the X11 server")
- retry(check_x)
+ with self.nested("waiting for the X11 server"):
+ retry(check_x)
def get_window_names(self) -> List[str]:
return self.succeed(
@@ -763,17 +829,19 @@ class Machine:
def window_is_visible(last_try: bool) -> bool:
names = self.get_window_names()
if last_try:
- self.logger.info(
- f"Last chance to match {regexp} on the window list, "
- + f"which currently contains: {', '.join(names)}"
+ self.log(
+ "Last chance to match {} on the window list,".format(regexp)
+ + " which currently contains: "
+ + ", ".join(names)
)
return any(pattern.search(name) for name in names)
- self.logger.info("Waiting for a window to appear")
- retry(window_is_visible)
+ with self.nested("Waiting for a window to appear"):
+ retry(window_is_visible)
def sleep(self, secs: int) -> None:
- time.sleep(secs)
+ # We want to sleep in *guest* time, not *host* time.
+ self.succeed(f"sleep {secs}")
def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None:
"""Forward a TCP port on the host to a TCP port on the guest.
@@ -798,22 +866,23 @@ class Machine:
def create_machine(args: Dict[str, Any]) -> Machine:
global log
+ args["log"] = log
args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1"
return Machine(args)
def start_all() -> None:
global machines
- logger.info("starting all VMs")
- for machine in machines:
- machine.start()
+ with log.nested("starting all VMs"):
+ for machine in machines:
+ machine.start()
def join_all() -> None:
global machines
- logger.info("waiting for all VMs to finish")
- for machine in machines:
- machine.wait_for_shutdown()
+ with log.nested("waiting for all VMs to finish"):
+ for machine in machines:
+ machine.wait_for_shutdown()
def test_script() -> None:
@@ -824,12 +893,13 @@ def run_tests() -> None:
global machines
tests = os.environ.get("tests", None)
if tests is not None:
- logger.info("running the VM test script")
- try:
- exec(tests, globals())
- except Exception:
- logging.exception("error:")
- sys.exit(1)
+ with log.nested("running the VM test script"):
+ try:
+ exec(tests, globals())
+ except Exception as e:
+ eprint("error: ")
+ traceback.print_exc()
+ sys.exit(1)
else:
ptpython.repl.embed(locals(), globals())
@@ -842,19 +912,18 @@ def run_tests() -> None:
@contextmanager
def subtest(name: str) -> Iterator[None]:
- logger.info(name)
- try:
- yield
- return True
- except Exception as e:
- logger.info(f'Test "{name}" failed with error: "{e}"')
- raise e
+ with log.nested(name):
+ try:
+ yield
+ return True
+ except Exception as e:
+ log.log(f'Test "{name}" failed with error: "{e}"')
+ raise e
return False
-def main() -> None:
- global machines
+if __name__ == "__main__":
arg_parser = argparse.ArgumentParser()
arg_parser.add_argument(
"-K",
@@ -864,6 +933,8 @@ def main() -> None:
)
(cli_args, vm_scripts) = arg_parser.parse_known_args()
+ log = Logger()
+
vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split()))
vde_sockets = [create_vlan(v) for v in vlan_nrs]
for nr, vde_socket, _, _ in vde_sockets:
@@ -874,27 +945,23 @@ def main() -> None:
if not cli_args.keep_vm_state:
machine.cleanup_statedir()
machine_eval = [
- "global {0}; {0} = machines[{1}]".format(m.name, idx)
- for idx, m in enumerate(machines)
+ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines)
]
exec("\n".join(machine_eval))
@atexit.register
def clean_up() -> None:
- logger.info("cleaning up")
- for machine in machines:
- if machine.pid is None:
- continue
- logger.info(f"killing {machine.name} (pid {machine.pid})")
- machine.process.kill()
- for _, _, process, _ in vde_sockets:
- process.terminate()
+ with log.nested("cleaning up"):
+ for machine in machines:
+ if machine.pid is None:
+ continue
+ log.log("killing {} (pid {})".format(machine.name, machine.pid))
+ machine.process.kill()
+ for _, _, process, _ in vde_sockets:
+ process.terminate()
+ log.close()
tic = time.time()
run_tests()
toc = time.time()
print("test script finished in {:.2f}s".format(toc - tic))
-
-
-if __name__ == "__main__":
- main()
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 4812567b8c6..c6939c7d698 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -62,7 +62,7 @@ rec {
''
mkdir -p $out
- tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
+ LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
for i in */xchg/coverage-data; do
mkdir -p $out/coverage-data
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/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 437199bae1d..ed9c2509b6b 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -288,7 +288,10 @@ fi
if [ "$action" = edit ]; then
if [[ -z $flake ]]; then
NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)}
- exec "${EDITOR:-nano}" "$NIXOS_CONFIG"
+ if [[ -d $NIXOS_CONFIG ]]; then
+ NIXOS_CONFIG=$NIXOS_CONFIG/default.nix
+ fi
+ exec ${EDITOR:-nano} "$NIXOS_CONFIG"
else
exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
fi
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/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/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index c726a08e34f..5056d50153f 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -11,23 +11,23 @@ let
then cfg.package
else cfg.package.withPackages (_: cfg.extraPlugins);
+ toStr = value:
+ if true == value then "yes"
+ else if false == value then "no"
+ else if isString value then "'${lib.replaceStrings ["'"] ["''"] value}'"
+ else toString value;
+
# The main PostgreSQL configuration file.
- configFile = pkgs.writeText "postgresql.conf"
- ''
- hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
- ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
- log_destination = 'stderr'
- log_line_prefix = '${cfg.logLinePrefix}'
- listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}'
- port = ${toString cfg.port}
- ${cfg.extraConfig}
- '';
+ configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings));
groupAccessAvailable = versionAtLeast postgresql.version "11.0";
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "postgresql" "extraConfig" ] "Use services.postgresql.settings instead.")
+ ];
###### interface
@@ -212,10 +212,28 @@ in
'';
};
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = "Additional text to be appended to postgresql.conf.";
+ settings = mkOption {
+ type = with types; attrsOf (oneOf [ bool float int str ]);
+ default = {};
+ description = ''
+ PostgreSQL configuration. Refer to
+
+ for an overview of postgresql.conf.
+
+
+ String values will automatically be enclosed in single quotes. Single quotes will be
+ escaped with two single quotes as described by the upstream documentation linked above.
+
+ '';
+ example = literalExample ''
+ {
+ log_connections = true;
+ log_statement = "all";
+ logging_collector = true
+ log_disconnections = true
+ log_destination = lib.mkForce "syslog";
+ }
+ '';
};
recoveryConfig = mkOption {
@@ -245,6 +263,16 @@ in
config = mkIf cfg.enable {
+ services.postgresql.settings =
+ {
+ hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}";
+ ident_file = "${pkgs.writeText "pg_ident.conf" cfg.identMap}";
+ log_destination = "stderr";
+ log_line_prefix = cfg.logLinePrefix;
+ listen_addresses = if cfg.enableTCPIP then "*" else "localhost";
+ port = cfg.port;
+ };
+
services.postgresql.package =
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 924a007efc6..0fbc9cecb4d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -500,13 +500,6 @@ in
config = {
- assertions = [
- {
- assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
- message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
- }
- ];
-
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 0e71cf92569..1313bdaccc4 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -1,12 +1,12 @@
{ config, lib, pkgs, ... }:
let
- inherit (lib) mkDefault mkEnableOption mkIf mkOption types;
+ inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types;
inherit (lib) concatStringsSep literalExample mapAttrsToList;
- inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast;
+ inherit (lib) optional optionalAttrs optionalString;
cfg = config.services.redmine;
-
+ format = pkgs.formats.yaml {};
bundle = "${cfg.package}/share/redmine/bin/bundle";
databaseYml = pkgs.writeText "database.yml" ''
@@ -20,24 +20,8 @@ let
${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"}
'';
- configurationYml = pkgs.writeText "configuration.yml" ''
- default:
- scm_subversion_command: ${pkgs.subversion}/bin/svn
- scm_mercurial_command: ${pkgs.mercurial}/bin/hg
- scm_git_command: ${pkgs.gitAndTools.git}/bin/git
- scm_cvs_command: ${pkgs.cvs}/bin/cvs
- scm_bazaar_command: ${pkgs.breezy}/bin/bzr
- scm_darcs_command: ${pkgs.darcs}/bin/darcs
-
- ${cfg.extraConfig}
- '';
-
- additionalEnvironment = pkgs.writeText "additional_environment.rb" ''
- config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
- config.logger.level = Logger::INFO
-
- ${cfg.extraEnv}
- '';
+ configurationYml = format.generate "configuration.yml" cfg.settings;
+ additionalEnvironment = pkgs.writeText "additional_environment.rb" cfg.extraEnv;
unpackTheme = unpack "theme";
unpackPlugin = unpack "plugin";
@@ -56,8 +40,13 @@ let
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql";
in
-
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.")
+ (mkRemovedOptionModule [ "services" "redmine" "database" "password" ] "Use services.redmine.database.passwordFile instead.")
+ ];
+
+ # interface
options = {
services.redmine = {
enable = mkEnableOption "Redmine";
@@ -93,21 +82,24 @@ in
description = "The state directory, logs and plugins are stored here.";
};
- extraConfig = mkOption {
- type = types.lines;
- default = "";
+ settings = mkOption {
+ type = format.type;
+ default = {};
description = ''
- Extra configuration in configuration.yml.
-
- See
+ Redmine configuration (configuration.yml). Refer to
+
for details.
'';
example = literalExample ''
- email_delivery:
- delivery_method: smtp
- smtp_settings:
- address: mail.example.com
- port: 25
+ {
+ email_delivery = {
+ delivery_method = "smtp";
+ smtp_settings = {
+ address = "mail.example.com";
+ port = 25;
+ };
+ };
+ }
'';
};
@@ -186,16 +178,6 @@ in
description = "Database user.";
};
- password = mkOption {
- type = types.str;
- default = "";
- description = ''
- The password corresponding to .
- Warning: this is stored in cleartext in the Nix store!
- Use instead.
- '';
- };
-
passwordFile = mkOption {
type = types.nullOr types.path;
default = null;
@@ -226,11 +208,12 @@ in
};
};
+ # implementation
config = mkIf cfg.enable {
assertions = [
- { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null;
- message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set";
+ { assertion = cfg.database.passwordFile != null || cfg.database.socket != null;
+ message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set";
}
{ assertion = cfg.database.createLocally -> cfg.database.user == cfg.user;
message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true";
@@ -243,6 +226,22 @@ in
}
];
+ services.redmine.settings = {
+ production = {
+ scm_subversion_command = "${pkgs.subversion}/bin/svn";
+ scm_mercurial_command = "${pkgs.mercurial}/bin/hg";
+ scm_git_command = "${pkgs.gitAndTools.git}/bin/git";
+ scm_cvs_command = "${pkgs.cvs}/bin/cvs";
+ scm_bazaar_command = "${pkgs.breezy}/bin/bzr";
+ scm_darcs_command = "${pkgs.darcs}/bin/darcs";
+ };
+ };
+
+ services.redmine.extraEnv = mkBefore ''
+ config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
+ config.logger.level = Logger::INFO
+ '';
+
services.mysql = mkIf mysqlLocal {
enable = true;
package = mkDefault pkgs.mariadb;
@@ -338,7 +337,7 @@ in
# handle database.passwordFile & permissions
- DBPASS=$(head -n1 ${cfg.database.passwordFile})
+ DBPASS=${optionalString (cfg.database.passwordFile != null) "$(head -n1 ${cfg.database.passwordFile})"}
cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml"
sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml"
chmod 440 "${cfg.stateDir}/config/database.yml"
@@ -379,17 +378,6 @@ in
redmine.gid = config.ids.gids.redmine;
};
- warnings = optional (cfg.database.password != "")
- ''config.services.redmine.database.password will be stored as plaintext
- in the Nix store. Use database.passwordFile instead.'';
-
- # Create database passwordFile default when password is configured.
- services.redmine.database.passwordFile =
- (mkDefault (toString (pkgs.writeTextFile {
- name = "redmine-database-password";
- text = cfg.database.password;
- })));
-
};
}
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index cc789897b29..17c549d42c3 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -458,7 +458,7 @@ in {
systemd.services.NetworkManager-dispatcher = {
wantedBy = [ "network.target" ];
- restartTriggers = [ configFile ];
+ restartTriggers = [ configFile overrideNameserversScript ];
# useful binaries for user-specified hooks
path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index b33e905c67d..b4bc2f694e4 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -34,8 +34,8 @@ let
User tor
DataDirectory ${torDirectory}
${optionalString cfg.enableGeoIP ''
- GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip
- GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
+ GeoIPFile ${cfg.package.geoip}/share/tor/geoip
+ GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6
''}
${optint "ControlPort" cfg.controlPort}
@@ -123,6 +123,16 @@ in
'';
};
+ package = mkOption {
+ type = types.package;
+ default = pkgs.tor;
+ defaultText = "pkgs.tor";
+ example = literalExample "pkgs.tor";
+ description = ''
+ Tor package to use
+ '';
+ };
+
enableGeoIP = mkOption {
type = types.bool;
default = true;
@@ -749,8 +759,8 @@ in
serviceConfig =
{ Type = "simple";
# Translated from the upstream contrib/dist/tor.service.in
- ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
- ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}";
+ ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config";
+ ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
KillSignal = "SIGINT";
TimeoutSec = 30;
@@ -773,7 +783,7 @@ in
};
};
- environment.systemPackages = [ pkgs.tor ];
+ environment.systemPackages = [ cfg.package ];
services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) {
enable = true;
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index fe10972b2af..36af5de4c90 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -121,12 +121,13 @@ let
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon
# Copy udev.
- copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
- copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
copy_bin_and_libs ${udev}/bin/udevadm
+ copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
for BIN in ${udev}/lib/udev/*_id; do
copy_bin_and_libs $BIN
done
+ # systemd-udevd is only a symlink to udevadm these days
+ ln -sf udevadm $out/bin/systemd-udevd
# Copy modprobe.
copy_bin_and_libs ${pkgs.kmod}/bin/kmod
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index b215392f250..10343df70aa 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -903,11 +903,9 @@ in
)
]);
passwd = (mkMerge [
- [ "mymachines" ]
(mkAfter [ "systemd" ])
]);
group = (mkMerge [
- [ "mymachines" ]
(mkAfter [ "systemd" ])
]);
};
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ece2d091f5a..945ba90e345 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -106,11 +106,29 @@ 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")
+ # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709)
+ #(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/common/acme/server/mkcerts.nix b/nixos/tests/common/acme/server/mkcerts.nix
index 2474019cbac..c9616bf9672 100644
--- a/nixos/tests/common/acme/server/mkcerts.nix
+++ b/nixos/tests/common/acme/server/mkcerts.nix
@@ -59,7 +59,8 @@ pkgs.runCommand "acme-snakeoil-ca" {
openssl genrsa -out snakeoil.key 4096
openssl req -new -key snakeoil.key -out snakeoil.csr
openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
- -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500
+ -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 \
+ -extfile "$OPENSSL_CONF" -extensions req_ext
addpem snakeoil.key ${lib.escapeShellArg fqdn} key
addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert
'') domains}
diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix
index fd537c3260f..7325b027c7e 100644
--- a/nixos/tests/common/acme/server/snakeoil-certs.nix
+++ b/nixos/tests/common/acme/server/snakeoil-certs.nix
@@ -2,170 +2,171 @@
{
ca.key = builtins.toFile "ca.key" ''
-----BEGIN PRIVATE KEY-----
- MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl
- DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet
- aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u
- QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d
- tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV
- +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU
- WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6
- s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk
- m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ
- hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon
- VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope
- pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81
- s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk
- kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V
- fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4
- TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw
- q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI
- /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O
- Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX
- R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO
- QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX
- wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg
- 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h
- yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA
- 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO
- 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm
- 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj
- RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2
- kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ
- ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1
- VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR
- UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG
- 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf
- q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR
- 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt
- 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6
- 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom
- lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p
- V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ
- 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i
- /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj
- cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA
- SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj
- nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL
- 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv
- zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6
- r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84
- Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh
- cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg
- JUsBXFNz132nP4iIr3UKrPedQZijSi4=
+ MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDd1G7OFpXIoHnr
+ rxdw+hiJVDY6nQDDKFt9FBKwlv7x2hCvX7bnyvHaL7H61c+80McGPISrQn3+MjuR
+ Zuqwax49DddNXbGt4WqGlx4LAeI37OgNUUz9foNr2rDDV744vwp14/PD1f3nqpWf
+ Ogzzsh8rxac0mZ5Se9HxOIpI7NRNuHJjj7HWZ4YxeOvi289rmpu0JPcp25njw7h6
+ FNfHu8GGp34Uj6wAxubdRyfViV8z9FMfbglLuA9i1OiSy3NQpq8VwBG+u/0iC7PQ
+ sQjxSragQu25sfATYIrFJQ4ZCvh0nxqKMeyPPBi6dAcMpa2AZAqtqv+CwWdo36Bt
+ S5XiC7rApgYn+yteKQHSbnCiG2W/boSbfg9lRk3w41dESENCADVajLb3Eovvp0tB
+ O/BALudvWjzAPbpXleVNr6ngWtGlsZTC7LXDgBqdW2KlzpZGcz+PW3ATlwip/ZFR
+ t7A15u5dVkWPVoPuQ0w1Tw+g9dxWFTNk3h+2d7K87IxQbcvqxeIDSEVFMrxo0e4C
+ G2udMcelZwARl6iNTAETa2zJW0XtAdGVM+HY1S/kU6U9J3nubDttAkAMABjPwyjL
+ G7hfyWqUHf9yPs49GsftAVvIy8XIeu0shD1BG11/VzvwpUCiRc+btuWi2erZ4ZfP
+ oQ5YoS9gt4S+Ipz7TPGBl+AUk9HO2QIDAQABAoICAGW+aLAXxc2GZUVHQp4r55Md
+ T94kYtQgL4435bafGwH8vchiQzcfazxiweRFqwl0TMS8fzE5xyYPDilLpfsStoTU
+ U1sFzVfuWviuWTY9P+/ctjZdgs2F+GtAm/CMzw+h9/9IdWbuQI3APO4SJxyjJw7h
+ kiZbCzXT2uAjybFXBq07GyQ1JSEszGzmhHLB1OoKuL2wcrj9IyFHhNZhtvLCWCoV
+ qotttjuI/xyg5VFYt5TRzEpPIu5a1pvDAYVK0XI9cXKtbLYp7RlveqMOgAaD+S2a
+ ZQTV60JH9n4j18p+sKR00SxvZ4vuyXzDePRBDUolGIy9MIJdiLueTiuzDmTmclnM
+ 8Yy7oliawW2Bn+1gaWpqmgzEUw9bXRSqIp2zGZ7HaQ+5c/MhS002+/i8WQyssfeg
+ 9EfI+Vl0D2avTxCECmsfjUxtkhzMYPVNbRPjt0QBEM+s8lDoNsP2zhMO441+TKpe
+ /5KZHIW+Y0US6GMIUs1o1byKfNz8Nj5HjEKO9CMyK6SBMJnCMroPD4H6opqk3lw9
+ 4mk04BdN556EzyJDT0a5/VpXG2DUYwFaNwE1ZPMu3Yx6IBoM1xx8mR80vHQCddmF
+ NP+BzkpUiHf0Txyy0YQWECZ/anTt0Bo0XqY5tirIM2dkG0ngNl9tGlw6gVAY1ky8
+ +cr7qKmhhwMWojaX/L+9AoIBAQD/BZAeF3l9I5RBh6ktWA+opzVyd6ejdLpc2Q1z
+ fmSmtUKRsEe51sWaIf6Sez408UaCMT2IQuppPgMnV8xfMM1/og75Cs8aPyAohwKo
+ IbOenXhLfFZiYB4y/Pac3F+FzNKsTT6n+fsE+82UHafY5ZI2FlPb2L0lfyx09zXv
+ fBYhcXgwSx5ymJLJSl8zFaEGn9qi3UB5ss44SaNM0n8SFGUQUk3PR7SFWSWgNxtl
+ CP7LWTsjXYoC/qBMe7b8JieK5aFk1EkkG1EkJvdiMnulMcMJzl+kj6LqVPmVDoZS
+ mMGvgKGJPpFgrbJ5wlA7uOhucGmMpFWP9RCav66DY4GHrLJPAoIBAQDerkZQ03AN
+ i2iJVjtL97TvDjrE8vtNFS/Auh8JyDIW4GGK3Y/ZoMedQpuu3e6NYM9aMjh+QJoA
+ kqhaiZ/tMXjEXJByglpc3a43g2ceWtJg5yLgexGgRtegbA57PRCo35Vhc6WycD1l
+ 6FZNxpTkd2BXX/69KWZ6PpSiLYPvdzxP5ZkYqoWRQIa4ee4orHfz/lUXJm1XwmyG
+ mx3hN9Z9m8Q/PGMGfwrorcp4DK53lmmhTZyPh+X5T5/KkVmrw/v5HEEB3JsknStR
+ 3DAqp2XZcRHsGQef9R7H+PINJm9nebjCraataaE4gr76znXKT23P80Ce5Lw6OQUW
+ XHhoL16gS+pXAoIBADTuz6ofTz01PFmZsfjSdXWZN1PKGEaqPOB2wP7+9h9QMkAR
+ KeId/Sfv9GotII1Woz70v4Pf983ebEMnSyla9NyQI7F3l+MnxSIEW/3P+PtsTgLF
+ DR0gPERzEzEd4Mnh6LyQz/eHwJ2ZMmOTADrZ8848Ni3EwAXfbrfcdBqAVAufBMZp
+ YSmCF72mLTpqO+EnHvd9GxvnjDxMtJOGgY+cIhoQK0xh4stm5JNrvMjs5A4LOGYv
+ zSyv80/Mwf92X/DJlwVZttDCxsXNPL3qIpX4TTZk2p9KnRMsjh1tRV4xjMpD1cOp
+ 8/zwMMJrHcI3sC70MERb+9KEmGy2ap+k8MbbhqsCggEAUAqqocDupR+4Kq2BUPQv
+ 6EHgJA0HAZUc/hSotXZtcsWiqiyr2Vkuhzt7BGcnqU/kGJK2tcL42D3fH/QaNUM0
+ Grj+/voWCw1v4uprtYCF4GkUo0X5dvgf570Pk4LGqzz6z/Wm2LX5i9jwtLItsNWs
+ HpwVz97CxCwcdxMPOpNMbZek6TXaHvTnuAWz8pDT6TNBWLnqUcJECjpVii/s/Gdy
+ KhzFp38g57QYdABy8e9x9pYUMY9yvaO+VyzZ46DlwIxEXavzZDzOZnVUJvDW7krz
+ Wz8/+2I7dzvnnYx0POiG3gtXPzwZxFtS1IpD0r2sRjQ0xSiI9BCs4HXKngBw7gN7
+ rwKCAQEAloJOFw4bafVXZVXuQVnLDm0/MNTfqxUzFE6V2WkMVkJqcpKt+ndApM8P
+ MJvojHWw1fmxDzIAwqZ9rXgnwWKydjSZBDYNjhGFUACVywHe5AjC4PPMUdltGptU
+ lY0BjC7qtwkVugr65goQkEzU61y9JgTqKpYsr3D+qXcoiDvWRuqk5Q0WfYJrUlE0
+ APWaqbxmkqUVDRrXXrifiluupk+BCV7cFSnnknSYbd9FZd9DuKaoNBlkp2J9LZE+
+ Ux74Cfro8SHINHmvqL+YLFUPVDWNeuXh5Kl6AaJ7yclCLXLxAIix3/rIf6mJeIGc
+ s9o9Sr49cibZ3CbMjCSNE3AOeVE1/Q==
-----END PRIVATE KEY-----
'';
ca.cert = builtins.toFile "ca.cert" ''
-----BEGIN CERTIFICATE-----
- MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL
- BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy
- MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG
- 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw
- MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h
- BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg
- pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw
- UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m
- qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6
- BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju
- 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou
- Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A
- r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf
- ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc
- P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G
- A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w
- DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm
- mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+
- /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ
- k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O
- mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv
- yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F
- 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb
- HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V
- QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB
- +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ
- fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc
- F8Y7
+ MIIFDzCCAvegAwIBAgIUX0P6NfX4gRUpFz+TNV/f26GHokgwDQYJKoZIhvcNAQEL
+ BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEyWhgPMjEy
+ MDA3MzEwNzQyMTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG
+ 9w0BAQEFAAOCAg8AMIICCgKCAgEA3dRuzhaVyKB5668XcPoYiVQ2Op0AwyhbfRQS
+ sJb+8doQr1+258rx2i+x+tXPvNDHBjyEq0J9/jI7kWbqsGsePQ3XTV2xreFqhpce
+ CwHiN+zoDVFM/X6Da9qww1e+OL8KdePzw9X956qVnzoM87IfK8WnNJmeUnvR8TiK
+ SOzUTbhyY4+x1meGMXjr4tvPa5qbtCT3KduZ48O4ehTXx7vBhqd+FI+sAMbm3Ucn
+ 1YlfM/RTH24JS7gPYtTokstzUKavFcARvrv9Iguz0LEI8Uq2oELtubHwE2CKxSUO
+ GQr4dJ8aijHsjzwYunQHDKWtgGQKrar/gsFnaN+gbUuV4gu6wKYGJ/srXikB0m5w
+ ohtlv26Em34PZUZN8ONXREhDQgA1Woy29xKL76dLQTvwQC7nb1o8wD26V5XlTa+p
+ 4FrRpbGUwuy1w4AanVtipc6WRnM/j1twE5cIqf2RUbewNebuXVZFj1aD7kNMNU8P
+ oPXcVhUzZN4ftneyvOyMUG3L6sXiA0hFRTK8aNHuAhtrnTHHpWcAEZeojUwBE2ts
+ yVtF7QHRlTPh2NUv5FOlPSd57mw7bQJADAAYz8Moyxu4X8lqlB3/cj7OPRrH7QFb
+ yMvFyHrtLIQ9QRtdf1c78KVAokXPm7blotnq2eGXz6EOWKEvYLeEviKc+0zxgZfg
+ FJPRztkCAwEAAaNTMFEwHQYDVR0OBBYEFNhBZxryvykCjfPO85xB3wof2enAMB8G
+ A1UdIwQYMBaAFNhBZxryvykCjfPO85xB3wof2enAMA8GA1UdEwEB/wQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggIBAEZwlsQ+3yd1MVxLRy9RjoA8hI7iWBNmvPUyNjlb
+ l/L9N+dZgdx9G5h/KPRUyzvUc/uk/ZxTWVPIOp13WI65qwsBKrwvYKiXiwzjt+9V
+ CKDRc1sOghTSXk4FD3L5UcKvTQ2lRcFsqxbkopEwQWhoCuhe4vFyt3Nx8ZGLCBUD
+ 3I5zMHtO8FtpZWKJPw46Yc1kasv0nlfly/vUbnErYfgjWX1hgWUcRgYdKwO4sOZ7
+ KbNma0WUsX5mWhXo4Kk7D15wATHO+j9s+j8m86duBL3A4HzpTo1DhHvBi0dkg0CO
+ XuSdByIzVLIPh3yhCHN1loRCP2rbzKM8IQeU/X5Q4UJeC/x9ew8Kk+RKXoHc8Y2C
+ JQO1DxuidyDJRhbb98wZo2YfIsdWQGjYZBe1XQRwBD28JnB+Rb9shml6lORWQn9y
+ P/STo9uWm5zvOCfqwbnCoetljDweItINx622G9SafBwPZc3o79oL7QSl8DgCtN6g
+ p0wGIlIBx+25w/96PqZcrYb8B7/uBHJviiKjBXDoIJWNiNRhW5HaFjeJdSKq7KIL
+ I/PO9KuHafif36ksG69X02Rio2/cTjgjEW1hGHcDRyyJWWaj7bd2eWuouh6FF22b
+ PA6FGY4vewDPnbLKLaix2ZIKxtedUDOH/qru3Mv58IFXmQ4iyM8oC8aOxYSQLZDn
+ 1yJD
-----END CERTIFICATE-----
'';
"acme.test".key = builtins.toFile "acme.test.key" ''
-----BEGIN RSA PRIVATE KEY-----
- MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1
- TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL
- V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj
- N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk
- ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf
- xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr
- 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg
- r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3
- ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI
- pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB
- D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA
- AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+
- ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV
- tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB
- 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2
- v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn
- dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j
- ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx
- ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y
- wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf
- gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS
- 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ
- hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ
- Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A
- sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY
- zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA
- cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e
- /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb
- +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW
- 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef
- aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk
- aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg
- aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7
- LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G
- XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC
- Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4
- f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV
- I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad
- hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183
- yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO
- i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk
- QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF
- +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8
- xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN
- iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2
- 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH
- 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl
- 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF
- dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg=
+ MIIJKgIBAAKCAgEA3dJl4ByHHRcqbZzblszHIS5eEW3TcXTvllqC1nedGLGU9dnA
+ YbdpDUYhvWz/y9AfRZ1d8jYz01jZtt5xWYG0QoQUdkCc9QPPh0Axrl38cGliB6IZ
+ IY0qftW9zrLSgCOUnXL/45JqSpD57DHMSSiJl3hoOo4keBaMRN/UK6F3DxD/nZEs
+ h+yBBh2js3qxleExqkX8InmjK9pG8j7qa4Be5Lh4iILBHbGAMaxM7ViNAg4KgWyg
+ d5+4qB86JFtE/cJ+r3D62ARjVaxU6ePOL0AwS/vx5ls6DFQC7+1CpGCNemgLPzcc
+ 70s0V0SAnF73xHYqRWjJFtumyvyTkiQWLg0zDQOugWd3B9ADuaIEx2nviPyphAtj
+ M3ZKrL2zN1aIfqzbxJ/L8TQFa2WPsPU2+iza/m9kMfLXZ4XPF/SJxQ+5yVH+rxx5
+ OWrXZ13nCMyeVoaXQofmG7oZvOQbtuT9r5DQZd9WN0P3G3sy0/dNnlNVn8uCBvXJ
+ TQhRKsy1FESZdgcFNtpJEG7BRG9Gc6i0V39aSRzShZyKJSBQhlc0FMTlX445EYsh
+ PKjEC/+Suq9wy/LuLjIkkqBbVg4617IlibLz0fDY/yrZqkfSqhCVsWnra21Ty3Mp
+ vD+wnskTzuGrvCVTe3KcWp+wkeH0xvhr8FXX6nn492YCfvZSITO3FF+qWt8CAwEA
+ AQKCAgEAk2xV0NCk66yNwjPRrTOD1IWgdyzqrijtYpvdAPSWL+c1/P8vYMIoy22k
+ 1uQuTSKQ5g9kdKmZYAlZCLRl2Pre9qYZg04GAsD5mAYN/rjwITWotTICSc4sRAeC
+ EnG+fPMovkvDzVdt1QjtURD3mFeculKH0wLNMhKqPswTkrvJCPZfLDVjxyJjzdC9
+ D3enttjnzSaeH7t/upFjPXSbD79NUe1YDkH4XuetL1Y3+jYz4P279bBgJaC9dN7s
+ IWWXQJ+W2rrXu+GOs03JUXjZe4XJk3ZqmpJezfq3yQWCmQSigovLjcPvMwpkSut4
+ HnTvbl6qUV8G5m4tOBMNcL8TDqAvIGY8Q2NAT0iKJN187FbHpjSwQL/Ckgqz/taJ
+ Q82LfIA1+IjwW372gY2Wge8tM/s3+2vOEn2k91sYfiKtrRFfrHBurehVQSpJb2gL
+ YPoUhUGu4C1nx44sQw+DgugOBp1BTKA1ZOBIk6NyS/J9sU3jSgMr88n10TyepP6w
+ OVk9kcNomnm/QIOyTDW4m76uoaxslg7kwOJ4j6wycddS8JtvEO4ZPk/fHZCbvlMv
+ /dAKsC3gigO2zW6IYYb7mSXI07Ew/rFH1NfSILiGw8GofJHDq3plGHZo9ycB6JC+
+ 9C8n9IWjn8ahwbulCoQQhdHwXvf61t+RzNFuFiyAT0PF2FtD/eECggEBAPYBNSEY
+ DSQc/Wh+UlnwQsevxfzatohgQgQJRU1ZpbHQrl2uxk1ISEwrfqZwFmFotdjjzSYe
+ e1WQ0uFYtdm1V/QeQK+8W0u7E7/fof4dR6XxrzJ2QmtWEmCnLOBUKCfPc7/4p4IU
+ 7Q8PDwuwvXgaASZDaEsyTxL9bBrNMLFx9hIScQ9CaygpKvufilCHG79maoKArLwX
+ s7G16qlT4YeEdiNuLGv0Ce0txJuFYp7cGClWQhruw+jIbr+Sn9pL9cn8GboCiUAq
+ VgZKsofhEkKIEbP1uFypX2JnyRSE/h0qDDcH1sEXjR9zYYpQjVpk3Jiipgw4PXis
+ 79uat5/QzUqVc1sCggEBAObVp686K9NpxYNoEliMijIdzFnK5J/TvoX9BBMz0dXc
+ CgQW40tBcroU5nRl3oCjT1Agn8mxWLXH3czx6cPlSA8fnMTJmev8FaLnEcM15pGI
+ 8/VCBbTegdezJ8vPRS/T9c4CViXo7d0qDMkjNyn22ojPPFYh8M1KVNhibDTEpXMQ
+ vJxBJgvHePj+5pMOIKwAvQicqD07fNp6jVPmB/GnprBkjcCQZtshNJzWrW3jk7Fr
+ xWpQJ8nam8wHdMvfKhpzvD6azahwmfKKaQmh/RwmH4xdtIKdh4j+u+Ax+Bxi0g7V
+ GQfusIFB1MO48yS6E56WZMmsPy+jhTcIB4prIbfu4c0CggEBALgqqUKwRc4+Ybvj
+ rfUk+GmT/s3QUwx/u4xYAGjq7y/SgWcjG9PphC559WPWz/p2sITB7ehWs5CYTjdj
+ +SgWKdVY/KZThamJUTy4yAZ8lxH1gGpvvEOs+S8gmGkMt88t8ILMPWMWFW7LoEDp
+ PL74ANpLZn29GROnY1IhQQ3mughHhBqfZ6d2QnaDtsGYlD5TBvPSLv7VY7Jr9VR0
+ toeEtAjMRzc+SFwmgmTHk9BIB1KTAAQ3sbTIsJh8xW1gpo5jTEND+Mpvp10oeMVe
+ yxPB2Db4gt/j8MOz3QaelbrxqplcJfsCjaT49RHeQiRlE/y070iApgx8s0idaFCd
+ ucLXZbcCggEBANkcsdg9RYVWoeCj3UWOAll6736xN/IgDb4mqVOKVN3qVT1dbbGV
+ wFvHVq66NdoWQH4kAUaKWN65OyQNkQqgt/MJj8EDwZNVCeCrp2hNZS0TfCn9TDK/
+ aa7AojivHesLWNHIHtEPUdLIPzhbuAHvXcJ58M0upTfhpwXTJOVI5Dji0BPDrw47
+ Msw3rBU6n35IP4Q/HHpjXl58EDuOS4B+aGjWWwF4kFWg2MR/oqWN/JdOv2LsO1A/
+ HnR7ut4aa5ZvrunPXooERrf6eSsHQnLcZKX4aNTFZ/pxZbJMLYo9ZEdxJVbxqPAa
+ RA1HAuJTZiquV+Pb755WFfEZy0Xk19URiS0CggEAPT1e+9sdNC15z79SxvJQ4pmT
+ xiXat+1pq9pxp5HEOre2sSAd7CF5lu/1VQd6p0gtLZY+Aw4BXOyMtzYWgIap+u9j
+ ThFl9qrTFppG5KlFKKpQ8dQQ8ofO1akS8cK8nQeSdvrqEC/kGT2rmVdeevhBlfGy
+ BZi2ikhEQrz5jsLgIdT7sN2aLFYtmzLU9THTvlfm4ckQ7jOTxvVahb+WRe/iMCwP
+ Exrb83JDo31jHvAoYqUFrZkmPA+DUWFlrqb21pCzmC/0iQSuDcayRRjZkY/s5iAh
+ gtI6YyAsSL8hKvFVCC+VJf1QvFOpgUfsZjrIZuSc3puBWtN2dirHf7EfyxgEOg==
-----END RSA PRIVATE KEY-----
'';
"acme.test".cert = builtins.toFile "acme.test.cert" ''
-----BEGIN CERTIFICATE-----
- MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
- IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD
- DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm
- Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE
- YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4
- AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP
- 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4
- PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ
- zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ
- 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336
- jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk
- sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt
- I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk
- xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA
- A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx
- yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3
- chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds
- +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y
- qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e
- +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S
- EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK
- mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi
- OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf
- 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d
- MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA==
+ MIIEwDCCAqigAwIBAgICApowDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLU25h
+ a2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEzWhgPMjEyMDA3MzEwNzQyMTNaMBQxEjAQ
+ BgNVBAMMCWFjbWUudGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ AN3SZeAchx0XKm2c25bMxyEuXhFt03F075ZagtZ3nRixlPXZwGG3aQ1GIb1s/8vQ
+ H0WdXfI2M9NY2bbecVmBtEKEFHZAnPUDz4dAMa5d/HBpYgeiGSGNKn7Vvc6y0oAj
+ lJ1y/+OSakqQ+ewxzEkoiZd4aDqOJHgWjETf1Cuhdw8Q/52RLIfsgQYdo7N6sZXh
+ MapF/CJ5oyvaRvI+6muAXuS4eIiCwR2xgDGsTO1YjQIOCoFsoHefuKgfOiRbRP3C
+ fq9w+tgEY1WsVOnjzi9AMEv78eZbOgxUAu/tQqRgjXpoCz83HO9LNFdEgJxe98R2
+ KkVoyRbbpsr8k5IkFi4NMw0DroFndwfQA7miBMdp74j8qYQLYzN2Sqy9szdWiH6s
+ 28Sfy/E0BWtlj7D1Nvos2v5vZDHy12eFzxf0icUPuclR/q8ceTlq12dd5wjMnlaG
+ l0KH5hu6GbzkG7bk/a+Q0GXfVjdD9xt7MtP3TZ5TVZ/Lggb1yU0IUSrMtRREmXYH
+ BTbaSRBuwURvRnOotFd/Wkkc0oWciiUgUIZXNBTE5V+OORGLITyoxAv/krqvcMvy
+ 7i4yJJKgW1YOOteyJYmy89Hw2P8q2apH0qoQlbFp62ttU8tzKbw/sJ7JE87hq7wl
+ U3tynFqfsJHh9Mb4a/BV1+p5+PdmAn72UiEztxRfqlrfAgMBAAGjGDAWMBQGA1Ud
+ EQQNMAuCCWFjbWUudGVzdDANBgkqhkiG9w0BAQsFAAOCAgEAM5WrCpBOmLrZ1QX8
+ l6vxVXwoI8pnqyy3cbAm3aLRPbw4gb0Ot90Pv/LoMhP0fkrNOKwH/FGRjSXyti0X
+ TheKrP7aEf6XL2/Xnb8rK2jYMQo6YJU9T+wBJA6Q+GBrc8SE75KfOi5NWJr8T4Ju
+ Etb+G05hXClrN19VFzIoz3L4kRV+xNMialcOT3xQfHtXCQUgwAWpPlwcJA/Jf60m
+ XsfwQwk2Ir16wq+Lc3y+mQ7d/dbG+FVrngFk4qN2B9M/Zyv4N9ZBbqeDUn3mYtJE
+ FeJrwHgmwH6slf1gBN3gxUKRW7Bvzxk548NdmLOyN+Y4StsqbOaYGtShUJA7f1Ng
+ qQqdgvxZ9MNwwMv9QVDZEnaaew3/oWOSmQGAai4hrc7gLMLJmIxzgfd5P6Dr06e4
+ 2zwsMuI8Qh/IDqu/CfmFYvaua0FEeyAtpoID9Y/KPM7fu9bJuxjZ6kqLVFkEi9nF
+ /rCMchcSA8N2z/vLPabpNotO7OYH3VD7aQGTfCL82dMlp1vwZ39S3Z1TFLLh3MZ+
+ BYcAv8kUvCV6kIdPAXvJRSQOJUlJRV7XiI2mwugdDzMx69wQ0Zc1e4WyGfiSiVYm
+ ckSJ/EkxuwT/ZYLqCAKSFGMlFhad9g1Zyvd67XgfZq5p0pJTtGxtn5j8QHy6PM6m
+ NbjvWnP8lDU8j2l3eSG58S14iGs=
-----END CERTIFICATE-----
'';
}
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/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix
index 3be95187fe2..432b46234f9 100644
--- a/nixos/tests/postgresql-wal-receiver.nix
+++ b/nixos/tests/postgresql-wal-receiver.nix
@@ -14,13 +14,10 @@ let
baseBackupDir = "/tmp/pg_basebackup";
walBackupDir = "/tmp/pg_wal";
atLeast12 = lib.versionAtLeast pkg.version "12.0";
- restoreCommand = ''
- restore_command = 'cp ${walBackupDir}/%f %p'
- '';
recoveryFile = if atLeast12
then pkgs.writeTextDir "recovery.signal" ""
- else pkgs.writeTextDir "recovery.conf" "${restoreCommand}";
+ else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'";
in {
name = "postgresql-wal-receiver-${postgresqlPackage}";
@@ -30,14 +27,17 @@ let
services.postgresql = {
package = pkg;
enable = true;
- extraConfig = ''
- wal_level = archive # alias for replica on pg >= 9.6
- max_wal_senders = 10
- max_replication_slots = 10
- '' + lib.optionalString atLeast12 ''
- ${restoreCommand}
- recovery_end_command = 'touch recovery.done'
- '';
+ settings = lib.mkMerge [
+ {
+ wal_level = "archive"; # alias for replica on pg >= 9.6
+ max_wal_senders = 10;
+ max_replication_slots = 10;
+ }
+ (lib.mkIf atLeast12 {
+ restore_command = "cp ${walBackupDir}/%f %p";
+ recovery_end_command = "touch recovery.done";
+ })
+ ];
authentication = ''
host replication ${replicationUser} all trust
'';
diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix
index 319e5e94ece..d5fb2431dba 100644
--- a/nixos/tests/systemd-networkd.nix
+++ b/nixos/tests/systemd-networkd.nix
@@ -7,18 +7,19 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
virtualisation.vlans = [ 1 ];
environment.systemPackages = with pkgs; [ wireguard-tools ];
boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
- systemd.tmpfiles.rules = [
- "f /run/wg_priv 0640 root systemd-network - ${privk}"
- ];
systemd.network = {
enable = true;
netdevs = {
"90-wg0" = {
netdevConfig = { Kind = "wireguard"; Name = "wg0"; };
wireguardConfig = {
- PrivateKeyFile = "/run/wg_priv";
+ # NOTE: we're storing the wireguard private key in the
+ # store for this test. Do not do this in the real
+ # world. Keep in mind the nix store is
+ # world-readable.
+ PrivateKeyFile = pkgs.writeText "wg0-priv" privk;
ListenPort = 51820;
- FwMark = 42;
+ FirewallMark = 42;
};
wireguardPeers = [ {wireguardPeerConfig={
Endpoint = "192.168.1.${peerId}:51820";
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 9d21f9158f3..dfa16eecfad 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -144,9 +144,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
)
output = machine.succeed("systemctl show | grep Watchdog")
- assert "RuntimeWatchdogUSec=30s" in output
- assert "RebootWatchdogUSec=10m" in output
- assert "KExecWatchdogUSec=5m" in output
+ # assert "RuntimeWatchdogUSec=30s" in output
+ # for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here.
+ assert "RebootWatchdogUSec=10min" in output
+ assert "KExecWatchdogUSec=5min" in output
# Test systemd cryptsetup support
with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"):
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 18f2b4f67cd..20526c8c6c5 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Sound editor with graphical UI";
- homepage = "http://audacityteam.org/";
+ homepage = "https://www.audacityteam.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lheckemann ];
platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix
index 49b788f6653..255cf3f5e3b 100644
--- a/pkgs/applications/audio/axoloti/libusb1.nix
+++ b/pkgs/applications/audio/axoloti/libusb1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
+{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
stdenv.mkDerivation rec {
name = "libusb-1.0.19";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
- sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
+ sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 9bf4d3a5704..515f8a6f9af 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -5,8 +5,7 @@
, pkgconfig
, cmake
, llvm
-# TODO: put back when it builds again
-# , emscripten
+, emscripten
, openssl
, libsndfile
, libmicrohttpd
@@ -47,7 +46,7 @@ let
inherit src;
nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
- buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
+ buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
passthru = {
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 796812a9bd0..467ba6fe3f7 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
] ++ (with python3Packages; [
configobj
requests
- tornado_4
+ tornado
]);
# no tests implemented
diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index ae65d9b2f6e..28216020b78 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
- gst-python pygobject3 pykka tornado_4 requests setuptools
+ gst-python pygobject3 pykka tornado requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index 75990d593df..c0986880c09 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -4,7 +4,7 @@
, faacSupport ? false, faac ? null
, flacSupport ? true, flac ? null
, soxSupport ? true, sox ? null
-, vorbisSupport ? true, vorbisTools ? null
+, vorbisSupport ? true, vorbis-tools ? null
}:
assert mp3Support -> lame != null;
@@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null;
assert faacSupport -> faac != null;
assert flacSupport -> flac != null;
assert soxSupport -> sox != null;
-assert vorbisSupport -> vorbisTools != null;
+assert vorbisSupport -> vorbis-tools != null;
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
@@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication {
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional flacSupport flac
++ stdenv.lib.optional soxSupport sox
- ++ stdenv.lib.optional vorbisSupport vorbisTools;
+ ++ stdenv.lib.optional vorbisSupport vorbis-tools;
# upstream has no tests
checkPhase = ''
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 68eefadf411..cf3f173a096 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook
-, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
+{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext
+, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
@@ -16,26 +16,38 @@ in buildPythonApplication rec {
disabled = !isPy3k;
- nativeBuildInputs = [ pkgconfig gettext ];
+ nativeBuildInputs = [
+ gettext
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
buildInputs = [
- intltool wrapGAppsHook
+ glib
gnome3.adwaita-icon-theme
gsettings-desktop-schemas
+ gtk3
+ gdk-pixbuf
];
+ # The optional tagpy dependency (for editing metadata) is not yet
+ # included because it's difficult to build.
+ pythonPath = [
+ dbus-python
+ mpd2
+ pygobject3
+ setuptools
+ ];
+
+ # Otherwise the setup hook for gobject-introspection is not run:
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
postPatch = ''
# Remove "Local MPD" tab which is not suitable for NixOS.
sed -i '/localmpd/d' sonata/consts.py
'';
- propagatedBuildInputs = [
- gobject-introspection gtk3 pygobject3 setuptools
- ];
-
- # The optional tagpy dependency (for editing metadata) is not yet
- # included because it's difficult to build.
- pythonPath = [ dbus-python pygobject3 mpd2 ];
-
meta = {
description = "An elegant client for the Music Player Daemon";
longDescription = ''
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index e8b6a4d4313..2593bf38d19 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -1,8 +1,8 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
-, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
+, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
+, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland
, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat
, capnproto, liboggz, libfishsound, libid3tag, opusfile
, wrapQtAppsHook
@@ -10,13 +10,14 @@
stdenv.mkDerivation rec {
pname = "sonic-visualiser";
- version = "4.0.1";
+ version = "4.2";
src = fetchurl {
- url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz";
- sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6";
+ url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz";
+ sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q";
};
+ nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
buildInputs =
[ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
# portaudio
libpulseaudio
libmad
- libogg # ?
libfishsound
liblo
libX11
@@ -37,15 +37,13 @@ stdenv.mkDerivation rec {
opusfile
];
- nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
-
- enableParallelBuilding = true;
-
# comment out the tests
preConfigure = ''
sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "View and analyse contents of music audio files";
homepage = "https://www.sonicvisualiser.org/";
diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix
index df5806b50b9..3e133a0caa1 100644
--- a/pkgs/applications/audio/soundkonverter/default.nix
+++ b/pkgs/applications/audio/soundkonverter/default.nix
@@ -1,6 +1,6 @@
# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
{
- mkDerivation, fetchFromGitHub, lib, makeWrapper,
+ mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper,
cmake, extra-cmake-modules, pkgconfig,
libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
qtbase, phonon,
@@ -53,6 +53,15 @@ mkDerivation rec {
rev = "v" + version;
sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l";
};
+ patches = [
+ # already merged into master, so it can go during the next release
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch";
+ sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w=";
+ name = "soundkonverter_taglib.patch";
+ stripLen = 1;
+ })
+ ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 3a0bef24ab7..14a6853af1c 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -19,9 +19,9 @@ let
sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290";
};
latestVersion = { # canary & dev
- version = "4.2.0.7"; # "Android Studio 4.2 Canary 7"
- build = "201.6720134";
- sha256Hash = "1c9s6rd0z596qr7hbil5rl3fqby7c8h7ma52d1qj5rxra73k77nz";
+ version = "4.2.0.8"; # "Android Studio 4.2 Canary 8"
+ build = "202.6787931";
+ sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 3e01bcdb0f9..9d5978e605a 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
+{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
with stdenv.lib;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
rmdir $out/usr
ln -sf $out/opt/brackets/brackets $out/bin/brackets
- ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
substituteInPlace $out/opt/brackets/brackets.desktop \
--replace "Exec=/opt/brackets/brackets" "Exec=brackets"
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/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 26c5ee42152..abf55b42c55 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
+{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
}:
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
mv $out/share/LightTable/light $out/bin/light
- ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
+ ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
substituteInPlace $out/bin/light \
- --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \
+ --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \
--replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
--replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 8fe93d37c7e..b04c575dded 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -38,6 +38,7 @@ let
meta = with stdenv.lib; {
description = "Neovim client library and GUI, in Qt5";
+ homepage = "https://github.com/equalsraf/neovim-qt";
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 049ba45f7af..3c55cffdcf1 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
, makeWrapper
-, electron_8
+, electron_9
, dpkg
, gtk3
, glib
@@ -13,15 +13,15 @@
}:
let
- electron = electron_8;
+ electron = electron_9;
in
stdenv.mkDerivation rec {
pname = "typora";
- version = "0.9.89";
+ version = "0.9.95";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6";
+ sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 38d695bd74a..57bd73d6019 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -62,7 +62,7 @@ in
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
++ [ libsecret libXScrnSaver ];
- runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ];
+ runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ];
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
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/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index a8dbff6ca8b..5d037bba5ba 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
];
runtimeDependencies = [
- systemd.lib
+ (lib.getLib systemd)
];
dontBuild = true;
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 0ffcb5cdb41..20e295c85e9 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -1,7 +1,8 @@
-{ lib
+{ stdenv
+, lib
, mkDerivation
-, fetchurl
-, cmake
+, fetchFromGitHub
+, fetchpatch
, extra-cmake-modules
# common deps
@@ -9,6 +10,7 @@
# client deps
, qtbase
+, qtkeychain
, qtmultimedia
, qtsvg
, qttools
@@ -23,6 +25,8 @@
# optional server deps
, libmicrohttpd
, libsodium
+, withSystemd ? stdenv.isLinux
+, systemd ? null
# options
, buildClient ? true
@@ -35,11 +39,9 @@
with lib;
let
- commonDeps = [
- karchive
- ];
clientDeps = [
qtbase
+ qtkeychain
qtmultimedia
qtsvg
qttools
@@ -49,40 +51,57 @@ let
libvpx # WebM video export
miniupnpc # automatic port forwarding
];
+
serverDeps = [
# optional:
libmicrohttpd # HTTP admin api
libsodium # ext-auth support
- ];
+ ] ++ optional withSystemd systemd;
+
kisDeps = [
qtx11extras
];
+ boolToFlag = bool:
+ if bool then "ON" else "OFF";
+
in mkDerivation rec {
pname = "drawpile";
version = "2.1.17";
- src = fetchurl {
- url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
- sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf";
+ src = fetchFromGitHub {
+ owner = "drawpile";
+ repo = "drawpile";
+ rev = "${version}";
+ sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
};
- nativeBuildInputs = [
- cmake
- extra-cmake-modules
+ patches = [
+ # fix for libmicrohttpd 0.9.71
+ (fetchpatch {
+ url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff";
+ sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA=";
+ name = "mhdfix.patch"; })
];
- buildInputs =
- commonDeps ++
- optionals buildClient clientDeps ++
- optionals buildServer serverDeps ++
- optionals enableKisTablet kisDeps ;
- cmakeFlags =
- optional (!buildClient ) "-DCLIENT=off" ++
- optional (!buildServer ) "-DSERVER=off" ++
- optional (!buildServerGui ) "-DSERVERGUI=off" ++
- optional ( buildExtraTools) "-DTOOLS=on" ++
- optional ( enableKisTablet) "-DKIS_TABLET=on";
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [
+ karchive
+ ]
+ ++ optionals buildClient clientDeps
+ ++ optionals buildServer serverDeps
+ ++ optionals enableKisTablet kisDeps;
+
+ cmakeFlags = [
+ "-Wno-dev"
+ "-DINITSYS=systemd"
+ "-DCLIENT=${boolToFlag buildClient}"
+ "-DSERVER=${boolToFlag buildServer}"
+ "-DSERVERGUI=${boolToFlag buildServerGui}"
+ "-DTOOLS=${boolToFlag buildExtraTools}"
+ "-DKIS_TABLET=${boolToFlag enableKisTablet}"
+ ];
meta = {
description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 4782d920148..82128f81353 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "feh";
- version = "3.4.1";
+ version = "3.5";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
- sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q";
+ sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 1c1c6ba08ee..2962825e49b 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,31 +1,40 @@
-{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
-, fetchpatch }:
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, gettext
+, pkg-config
+, libxml2
+, gtk3
+, libportal
+, wrapGAppsHook
+}:
-let
- version = "2.3.1";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gcolor3";
- inherit version;
+ version = "2.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gcolor3";
rev = "v${version}";
- sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
+ sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU=";
};
- patches = [
- # Remove useage of deprecrated G_PARAM_PRIVATE
- (fetchpatch {
- url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
- sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
- })
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ pkg-config
+ libxml2 # xml-stripblanks preprocessing of GResource
+ wrapGAppsHook
];
- nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
-
- buildInputs = [ gtk3 hicolor-icon-theme ];
+ buildInputs = [
+ gtk3
+ libportal
+ ];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
@@ -34,7 +43,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3";
- homepage = "https://www.hjdskes.nl/projects/gcolor3/";
+ homepage = "https://gitlab.gnome.org/World/gcolor3";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
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/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index edd923822ea..19e8121ac08 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
$out/opt/pencil/pencil
# fix missing libudev
- ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
wrapProgram $out/opt/pencil/pencil \
--prefix LD_LIBRARY_PATH : $out/opt/pencil
'';
diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
index 485397ec4aa..1537bd25d55 100644
--- a/pkgs/applications/kde/calendarsupport.nix
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
+ akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}:
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
+ akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index ea2e3722419..8816ae3cbbc 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -100,7 +100,6 @@ let
kcalutils = callPackage ./kcalutils.nix {};
kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
- kdav = callPackage ./kdav.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 3d632271869..f0ce412cff1 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src)
+WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src)
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
index bb8a97e8341..0e815127fa1 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -11,7 +11,6 @@ mkDerivation {
maintainers = kdepimTeam;
};
output = [ "out" "dev" ];
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
deleted file mode 100644
index ebb81248475..00000000000
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
-index 27d5bc8..8d43140 100644
---- a/src/grantleetheme.cpp
-+++ b/src/grantleetheme.cpp
-@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other)
- , description(other.description)
- , name(other.name)
- , dirName(other.dirName)
-- , absolutePath(other.absolutePath)
-+ , absolutePaths(other.absolutePaths)
- , author(other.author)
- , email(other.email)
- , loader(other.loader)
-@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
-
- void ThemePrivate::setupLoader()
- {
-- // Get the parent dir with themes, we set the theme directory separately
-- QDir dir(absolutePath);
-- dir.cdUp();
-+ QStringList templateDirs;
-+ for (const QString& path : absolutePaths) {
-+ QDir dir(path);
-+ dir.cdUp();
-+ templateDirs << dir.absolutePath();
-+ }
-
- loader = QSharedPointer::create();
-- loader->setTemplateDirs({ dir.absolutePath() });
-+ loader->setTemplateDirs(templateDirs);
- loader->setTheme(dirName);
-
- if (!sEngine) {
-@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de
- KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
- if (group.isValid()) {
- d->dirName = dirName;
-- d->absolutePath = themePath;
-+ d->absolutePaths = QStringList(themePath);
- d->name = group.readEntry("Name", QString());
- d->description = group.readEntry("Description", QString());
- d->themeFileName = group.readEntry("FileName", QString());
-@@ -140,7 +143,7 @@ Theme::~Theme()
-
- bool Theme::operator==(const Theme &other) const
- {
-- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
-+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
- }
-
- Theme &Theme::operator=(const Theme &other)
-@@ -184,7 +187,12 @@ QString Theme::dirName() const
-
- QString Theme::absolutePath() const
- {
-- return d->absolutePath;
-+ return d->absolutePaths.first();
-+}
-+
-+QStringList Theme::absolutePaths() const
-+{
-+ return d->absolutePaths;
- }
-
- QString Theme::author() const
-@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
- return result;
- }
-
-+void Theme::addThemeDir(const QString& path)
-+{
-+ QDir dir(path);
-+ dir.cdUp();
-+ d->absolutePaths << dir.absolutePath();
-+}
-+
- void Theme::addPluginPath(const QString &path)
- {
- if (!ThemePrivate::sEngine) {
-diff --git a/src/grantleetheme.h b/src/grantleetheme.h
-index a25c27b..be38299 100644
---- a/src/grantleetheme.h
-+++ b/src/grantleetheme.h
-@@ -48,11 +48,14 @@ public:
- Q_REQUIRED_RESULT QStringList displayExtraVariables() const;
- Q_REQUIRED_RESULT QString dirName() const;
- Q_REQUIRED_RESULT QString absolutePath() const;
-+ Q_REQUIRED_RESULT QStringList absolutePaths() const;
- Q_REQUIRED_RESULT QString author() const;
- Q_REQUIRED_RESULT QString authorEmail() const;
-
- Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
-
-+ void addThemeDir(const QString&);
-+
- static void addPluginPath(const QString &path);
-
- private:
-diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h
-index eb73dcb..00510e9 100644
---- a/src/grantleetheme_p.h
-+++ b/src/grantleetheme_p.h
-@@ -43,7 +43,7 @@ public:
- QString description;
- QString name;
- QString dirName;
-- QString absolutePath;
-+ QStringList absolutePaths;
- QString author;
- QString email;
-
-diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp
-index 606d717..dc99041 100644
---- a/src/grantleethememanager.cpp
-+++ b/src/grantleethememanager.cpp
-@@ -125,25 +125,18 @@ public:
-
- for (const QString &directory : qAsConst(themesDirectories)) {
- QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
-- QStringList alreadyLoadedThemeName;
- while (dirIt.hasNext()) {
- dirIt.next();
- const QString dirName = dirIt.fileName();
- GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
- if (theme.isValid()) {
- QString themeName = theme.name();
-- if (alreadyLoadedThemeName.contains(themeName)) {
-- int i = 2;
-- const QString originalName(theme.name());
-- while (alreadyLoadedThemeName.contains(themeName)) {
-- themeName = originalName + QStringLiteral(" (%1)").arg(i);
-- ++i;
-- }
-- theme.d->name = themeName;
-+ QMap::iterator i = themes.find(dirName);
-+ if (i != themes.end()) {
-+ i.value().addThemeDir(dirIt.filePath());
-+ } else {
-+ themes.insert(dirName, theme);
- }
-- alreadyLoadedThemeName << themeName;
-- themes.insert(dirName, theme);
-- //qDebug()<<" theme.name()"<addDir(directory);
-@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS
- GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
- if (theme.isValid()) {
- if (dirName == themeName) {
-- return theme.absolutePath();
-+ return theme.absolutePaths().first();
- }
- }
- }
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
deleted file mode 100644
index 9095599ea56..00000000000
--- a/pkgs/applications/kde/grantleetheme/series
+++ /dev/null
@@ -1 +0,0 @@
-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
index 8224b98253b..30955d1c274 100644
--- a/pkgs/applications/kde/incidenceeditor.nix
+++ b/pkgs/applications/kde/incidenceeditor.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
- kdiagram, kldap, kmime, qtbase,
+ kdiagram, kldap, kmime, pimcommon, qtbase
}:
mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
- kldap kmime qtbase
+ kldap kmime pimcommon qtbase
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix
index 6189e8706db..a9b906b7b23 100644
--- a/pkgs/applications/kde/kdepim-apps-libs/default.nix
+++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix
@@ -11,7 +11,6 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
deleted file mode 100644
index 02c369cc4ee..00000000000
--- a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-===================================================================
---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-@@ -50,9 +50,9 @@ public:
- mTemplateLoader.clear();
- }
-
-- void changeGrantleePath(const QString &path)
-+ void changeGrantleePath(const QStringList &paths)
- {
-- mTemplateLoader->setTemplateDirs(QStringList() << path);
-+ mTemplateLoader->setTemplateDirs(paths);
- mEngine->addTemplateLoader(mTemplateLoader);
-
- mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
-@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
-
- void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
- {
-- d->changeGrantleePath(path);
-+ d->changeGrantleePath(QStringList(path));
- }
-
- void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
- {
-- d->changeGrantleePath(theme.absolutePath());
-+ d->changeGrantleePath(theme.absolutePaths());
- }
-
- inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
-Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-===================================================================
---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-@@ -74,9 +74,9 @@ public:
- mTemplateLoader.clear();
- }
-
-- void changeGrantleePath(const QString &path)
-+ void changeGrantleePath(const QStringList &paths)
- {
-- mTemplateLoader->setTemplateDirs(QStringList() << path);
-+ mTemplateLoader->setTemplateDirs(paths);
- mEngine->addTemplateLoader(mTemplateLoader);
-
- mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
-@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
-
- void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
- {
-- d->changeGrantleePath(path);
-+ d->changeGrantleePath(QStringList(path));
- }
-
- void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
- {
-- d->changeGrantleePath(theme.absolutePath());
-+ d->changeGrantleePath(theme.absolutePaths());
- }
-
- void GrantleeContactFormatter::setForceDisableQRCode(bool b)
diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series
deleted file mode 100644
index 1e8a52b55e9..00000000000
--- a/pkgs/applications/kde/kdepim-apps-libs/series
+++ /dev/null
@@ -1 +0,0 @@
-kdepim-apps-libs-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix
index 65719514f96..27ca6ff9aaf 100644
--- a/pkgs/applications/kde/kdepim-runtime/default.nix
+++ b/pkgs/applications/kde/kdepim-runtime/default.nix
@@ -4,8 +4,8 @@
shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
- kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
- pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
+ kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
+ pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns,
}:
mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
- kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
- pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
+ kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
+ pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns
];
}
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index 6b8941e5787..d225eba8223 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -27,5 +27,4 @@ mkDerivation {
kdepim-addons
];
propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
- patches = [ ./kmail.patch ];
}
diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch
deleted file mode 100644
index 71a23be2d83..00000000000
--- a/pkgs/applications/kde/kmail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
-index 48ed076..9c56896 100644
---- a/agents/archivemailagent/CMakeLists.txt
-+++ b/agents/archivemailagent/CMakeLists.txt
-@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
- add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
- target_link_libraries(archivemailagent
- KF5::MailCommon
-+ KF5::Libkdepim
- KF5::I18n
- KF5::Notifications
- KF5::IconThemes
-diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
-index a56b730..83604cf 100644
---- a/agents/followupreminderagent/CMakeLists.txt
-+++ b/agents/followupreminderagent/CMakeLists.txt
-@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent
- KF5::AkonadiMime
- KF5::AkonadiAgentBase
- KF5::DBusAddons
-+ KF5::FollowupReminder
- KF5::XmlGui
- KF5::KIOWidgets
- KF5::Notifications
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index 978baa925e5..eb28458392c 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -4,7 +4,7 @@
qtwebengine,
kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
- mailcommon, libkdepim
+ mailcommon, libkdepim, pimcommon
}:
mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
qtwebengine
kcmutils kcrash kdbusaddons kparts kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
- mailcommon libkdepim
+ mailcommon libkdepim pimcommon
];
}
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
index f002ff0f340..5de58658777 100644
--- a/pkgs/applications/kde/mailimporter.nix
+++ b/pkgs/applications/kde/mailimporter.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
- kmime, kxmlgui, libkdepim
+ kmime, kxmlgui, libkdepim, pimcommon
}:
mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
- kxmlgui libkdepim
+ kxmlgui libkdepim pimcommon
];
}
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index cd9ff2528fa..2e74f528aeb 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -1,9 +1,9 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
+ akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
- kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
+ kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
}:
@@ -15,12 +15,12 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
- kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
+ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
+ kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
kpurpose kwallet kwindowsystem libkdepim qtwebengine
];
propagatedBuildInputs = [
- akonadi akonadi-contacts kconfig kcontacts kimap
+ akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 12a84991adb..78674306e2f 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1739 +4,1731 @@
{
akonadi = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz";
- sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32";
- name = "akonadi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-20.08.0.tar.xz";
+ sha256 = "a18ce2d8c9e9fc7f195a7546ee5b7c2541e37ceb7afa0aa25e9ade4f54de2813";
+ name = "akonadi-20.08.0.tar.xz";
};
};
akonadi-calendar = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz";
- sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb";
- name = "akonadi-calendar-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-20.08.0.tar.xz";
+ sha256 = "4664e2dc6bc0762d999662188c64410fa70be2cef1be221569ec3b9270f80fd8";
+ name = "akonadi-calendar-20.08.0.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz";
- sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2";
- name = "akonadi-calendar-tools-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-tools-20.08.0.tar.xz";
+ sha256 = "f994db29d374b0fbfd3328fc618df44680b0dfaec1cf9f842a7a9c6ecbb841fa";
+ name = "akonadi-calendar-tools-20.08.0.tar.xz";
};
};
akonadiconsole = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz";
- sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c";
- name = "akonadiconsole-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadiconsole-20.08.0.tar.xz";
+ sha256 = "a43c6b756a69301f7756464deea58c72aaefaa1b47f1136959588e8f41b7b91b";
+ name = "akonadiconsole-20.08.0.tar.xz";
};
};
akonadi-contacts = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz";
- sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d";
- name = "akonadi-contacts-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-contacts-20.08.0.tar.xz";
+ sha256 = "206f0704768a789201ead784e78d7138aba6b50b8f3880369df8799730fca8b4";
+ name = "akonadi-contacts-20.08.0.tar.xz";
};
};
akonadi-import-wizard = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz";
- sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2";
- name = "akonadi-import-wizard-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-import-wizard-20.08.0.tar.xz";
+ sha256 = "d742ced3b498f39edff33f7fc73db1e882bf4b1e17b35d5f734f8732cb1e7bde";
+ name = "akonadi-import-wizard-20.08.0.tar.xz";
};
};
akonadi-mime = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz";
- sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac";
- name = "akonadi-mime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-mime-20.08.0.tar.xz";
+ sha256 = "c0a709e25fef86f778ef21adbf78c6beab203f4f4a8d9f5e17a4d3175fe01d33";
+ name = "akonadi-mime-20.08.0.tar.xz";
};
};
akonadi-notes = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz";
- sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55";
- name = "akonadi-notes-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-notes-20.08.0.tar.xz";
+ sha256 = "aeb348d6af30e8775d60cab0894634c6e5ac95a3baf97f69407602dea5944525";
+ name = "akonadi-notes-20.08.0.tar.xz";
};
};
akonadi-search = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz";
- sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf";
- name = "akonadi-search-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-search-20.08.0.tar.xz";
+ sha256 = "06974398ddd6cbd42d0cb9dc3cac4b6ad6bdc8062d1f94523a973ed702b40e2f";
+ name = "akonadi-search-20.08.0.tar.xz";
};
};
akregator = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz";
- sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c";
- name = "akregator-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/akregator-20.08.0.tar.xz";
+ sha256 = "e8dbef1b8e8c165e824f108a33f9d2a6a0ea8668299f808fcc2ce2b4d398dcf5";
+ name = "akregator-20.08.0.tar.xz";
};
};
analitza = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz";
- sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7";
- name = "analitza-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/analitza-20.08.0.tar.xz";
+ sha256 = "51bc5ecd31e557fcf5660e57458aa866ee44e386550bb2c37c22fae252405aa1";
+ name = "analitza-20.08.0.tar.xz";
};
};
ark = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz";
- sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc";
- name = "ark-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ark-20.08.0.tar.xz";
+ sha256 = "7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098";
+ name = "ark-20.08.0.tar.xz";
};
};
artikulate = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz";
- sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea";
- name = "artikulate-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/artikulate-20.08.0.tar.xz";
+ sha256 = "30ef4eedabebccfb600eec1ba7bc691e8ad4e0de8d7fdcf56a630714d6b9848b";
+ name = "artikulate-20.08.0.tar.xz";
};
};
audiocd-kio = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz";
- sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929";
- name = "audiocd-kio-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/audiocd-kio-20.08.0.tar.xz";
+ sha256 = "7a01d5b89f5271ee1eba203e15c46b146879e4651643ec6348e1033c0ffdc8c7";
+ name = "audiocd-kio-20.08.0.tar.xz";
};
};
baloo-widgets = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz";
- sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3";
- name = "baloo-widgets-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/baloo-widgets-20.08.0.tar.xz";
+ sha256 = "37800c3cde7e2a9cfbab2e11f21dd1ae76b2a31b687802bc45027966a8734985";
+ name = "baloo-widgets-20.08.0.tar.xz";
};
};
blinken = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz";
- sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb";
- name = "blinken-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/blinken-20.08.0.tar.xz";
+ sha256 = "0a08f5fc8e0c100956bb99910265d9630191e462f8f812842e79b64e76055c1c";
+ name = "blinken-20.08.0.tar.xz";
};
};
bomber = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz";
- sha256 = "b292c11ebfb4311420ce6b9a4b132a437d061946e8eb08556fec89bb84c23428";
- name = "bomber-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/bomber-20.08.0.tar.xz";
+ sha256 = "91b4ff0e0615cd42e36c6755d30ee62b74d6c5ae309512b9f8f347c34786ec47";
+ name = "bomber-20.08.0.tar.xz";
};
};
bovo = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz";
- sha256 = "5365c0fd5a57814f224585e4331be129414d1f5d51d2b90bac8421df4ae5f300";
- name = "bovo-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/bovo-20.08.0.tar.xz";
+ sha256 = "f66997324d596095b30442b2446a3c581834ad60d1a27fd7f7f394549f2418a8";
+ name = "bovo-20.08.0.tar.xz";
};
};
calendarsupport = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz";
- sha256 = "40b069e1561fac49f46dd0504af0ac459010ac98f30748b8f15a50ca1fd35b5b";
- name = "calendarsupport-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/calendarsupport-20.08.0.tar.xz";
+ sha256 = "1c1682d46f248b092062a461cdefec9da3733cb0ee1a590b7c48c4977028e977";
+ name = "calendarsupport-20.08.0.tar.xz";
};
};
cantor = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz";
- sha256 = "ff589ccb48016fd784de9883fe19ee0c2c450e3993e9cc5f7dc499448db0c6a4";
- name = "cantor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/cantor-20.08.0.tar.xz";
+ sha256 = "1d4babf783f53929f0ea42380dacdb7ab989b66383dd3c37ab22787a26715082";
+ name = "cantor-20.08.0.tar.xz";
};
};
cervisia = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz";
- sha256 = "3e2aac0a08c01d9ea5c5814e739f082ec5a510cd8f0f6bce37cfff9130b0f078";
- name = "cervisia-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/cervisia-20.08.0.tar.xz";
+ sha256 = "6e10acc196661b7d1873e370eb67486386e25e4d6b7946ade8479b70fba34d66";
+ name = "cervisia-20.08.0.tar.xz";
};
};
dolphin = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz";
- sha256 = "5e493e898e02005780b59474f506904742625b50e4669c113906d4f30daa863e";
- name = "dolphin-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/dolphin-20.08.0.tar.xz";
+ sha256 = "fe5a68d9afd0771ba9ffc2d5d79e7bc43da85fd3ee3c2493a9a2d5c359c3cd6f";
+ name = "dolphin-20.08.0.tar.xz";
};
};
dolphin-plugins = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz";
- sha256 = "f0dad66e7302711e136b0253fb73dbf16bc9facdbb4ad617207fb818fc84130a";
- name = "dolphin-plugins-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/dolphin-plugins-20.08.0.tar.xz";
+ sha256 = "a8a0c35f75eb8e63ee90f44ce930babceff86676b8bba213c82b7ffb29e526bb";
+ name = "dolphin-plugins-20.08.0.tar.xz";
};
};
dragon = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz";
- sha256 = "2b0d6414f2cea9f2a0b2ebddeffa7e5342db96fac34b2a00439fca5784f6131f";
- name = "dragon-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/dragon-20.08.0.tar.xz";
+ sha256 = "0e3a540b3f93118a9a17f2c6f675d0f007b123266c6e71a27b5ddb6b9a7e14a8";
+ name = "dragon-20.08.0.tar.xz";
};
};
elisa = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz";
- sha256 = "d99dc2eb80d4219d08c72e612ac07cbb6c91c2eff365b49da69cbc3c1e70885b";
- name = "elisa-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/elisa-20.08.0.tar.xz";
+ sha256 = "acbff9f3c3d26c2a2c249974ccd8ff0bdeb22148a8a5b72e1199f1ec2f9d712e";
+ name = "elisa-20.08.0.tar.xz";
};
};
eventviews = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz";
- sha256 = "f10d43f57e62d68b6d0b41e9e3442baee8b68664e085f6e4347ac6adc1af32ff";
- name = "eventviews-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/eventviews-20.08.0.tar.xz";
+ sha256 = "205607d89d739f1efa4472303206647d04fba4e9d80610800a4a229676ede732";
+ name = "eventviews-20.08.0.tar.xz";
};
};
ffmpegthumbs = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz";
- sha256 = "089305a75d32cf8bf1b9279623b524912af78aa538379dcccf998ca1ab165164";
- name = "ffmpegthumbs-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ffmpegthumbs-20.08.0.tar.xz";
+ sha256 = "84c3a8f064423d7e51a57b9ed32a9f4fdbca73f7fa7e47a6289d9b516f1ba9ff";
+ name = "ffmpegthumbs-20.08.0.tar.xz";
};
};
filelight = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz";
- sha256 = "d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4";
- name = "filelight-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/filelight-20.08.0.tar.xz";
+ sha256 = "29ea650f7b0f1863ea6caeca39362eff652edee755963967eb4653665a2499b4";
+ name = "filelight-20.08.0.tar.xz";
};
};
granatier = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz";
- sha256 = "9d06047f613a03b32d603e90bd14ca2873be9da9b4b17b98a65242e9855a7aaf";
- name = "granatier-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/granatier-20.08.0.tar.xz";
+ sha256 = "9fd034875c2ac80a089145c47f36b3b97ed69eaa1693aa83bc5bd76561096efd";
+ name = "granatier-20.08.0.tar.xz";
};
};
grantlee-editor = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz";
- sha256 = "1a3e4ece1a37e11735291bbec99314bc0ede0714377db916ed1266ec19325ef5";
- name = "grantlee-editor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/grantlee-editor-20.08.0.tar.xz";
+ sha256 = "08aeac1c6bacabdeb4e4273efc5c5f4995454c45bd51069b3ef6105237b84afa";
+ name = "grantlee-editor-20.08.0.tar.xz";
};
};
grantleetheme = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz";
- sha256 = "c5b2e4b1d5e14b39d2e66d160ba0b86c16f86e921abf578640bf1576a5f25eb3";
- name = "grantleetheme-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/grantleetheme-20.08.0.tar.xz";
+ sha256 = "7e86d2f9f5a725f988211f676da2c4191ed6df55418135f3a54da5d687d63e8e";
+ name = "grantleetheme-20.08.0.tar.xz";
};
};
gwenview = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz";
- sha256 = "d176021d6784e33cb0aaa6fa2517e81f9eac237079d2a06d6b55b8f4b04e8bd9";
- name = "gwenview-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/gwenview-20.08.0.tar.xz";
+ sha256 = "e7a6d96801bfc41156292faac915691b929d4da641cf04839c74a68debc95c44";
+ name = "gwenview-20.08.0.tar.xz";
};
};
incidenceeditor = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz";
- sha256 = "b3c70c926acab7a0585bf2bf7575ebe4d04c439fc49af073d0cb599f3b9e57c2";
- name = "incidenceeditor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/incidenceeditor-20.08.0.tar.xz";
+ sha256 = "5f23343959cd672570a4a3439be0e8b27c413b9747a17bd04138359c43dac678";
+ name = "incidenceeditor-20.08.0.tar.xz";
};
};
juk = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz";
- sha256 = "2566257f83db74d69b95e109146a82e1e03966b3592c891b48e81cf2a13d812b";
- name = "juk-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/juk-20.08.0.tar.xz";
+ sha256 = "ec00ef054768efc64b5b0da69fba90104689b314a064f52989d1c6dbd73dad1b";
+ name = "juk-20.08.0.tar.xz";
};
};
k3b = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz";
- sha256 = "562dc91be0a992ef0f139310bfd941202e4ae273e11b754d02a8cf6f85f20420";
- name = "k3b-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/k3b-20.08.0.tar.xz";
+ sha256 = "d10ac6bfa89744ec857ce7c65d5d7eae5f26ce151341d6f393b9a141cc05540a";
+ name = "k3b-20.08.0.tar.xz";
};
};
kaccounts-integration = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz";
- sha256 = "57661418d6fe58f9c3d308ba8804e5bc83312bba0967e13bf144b1a7dba9b36d";
- name = "kaccounts-integration-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-integration-20.08.0.tar.xz";
+ sha256 = "b1d0912ec7771be6c04f4cf635d9196acee1c63f47fe1814a5da2002196125a0";
+ name = "kaccounts-integration-20.08.0.tar.xz";
};
};
kaccounts-providers = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz";
- sha256 = "ffeeac1283c453a4bbd4249cbe314eb7f9800a9cbedce192fdb1f12f30670e3e";
- name = "kaccounts-providers-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-providers-20.08.0.tar.xz";
+ sha256 = "5a2293e124839dec3ca5cbe72548ff01ce3c0f7edc5c6dd78ca4d8a27054f574";
+ name = "kaccounts-providers-20.08.0.tar.xz";
};
};
kaddressbook = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz";
- sha256 = "d1c8f6af88572548a90756963921a8555df239467858432079a37788f4980b58";
- name = "kaddressbook-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kaddressbook-20.08.0.tar.xz";
+ sha256 = "e34b4515a5721b9dd1d9d391acb81905bc2b6a0d219347c7dac87ebbb5b7b921";
+ name = "kaddressbook-20.08.0.tar.xz";
};
};
kajongg = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz";
- sha256 = "0175fb44b4f092fa318113a576f41e0a29dc1f5d7dfbf0ca7877a5c46a095d00";
- name = "kajongg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kajongg-20.08.0.tar.xz";
+ sha256 = "1813ff2d960f96d63c5680b4a7e7dca6249146876c7a6d203eb0f9768eca244b";
+ name = "kajongg-20.08.0.tar.xz";
};
};
kalarm = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz";
- sha256 = "71f94af998495c759b9c2e7bf2092887748301c993f76dbf36f6ac9e4bb2a1f5";
- name = "kalarm-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kalarm-20.08.0.tar.xz";
+ sha256 = "02c1a62f603cc6917d0f95eff4aaa23cf808395bed9b1dad21817f6c32256748";
+ name = "kalarm-20.08.0.tar.xz";
};
};
kalarmcal = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz";
- sha256 = "19c9aab451f95f7689d8b18059e84f189b11cf15bb7f60fe55402b944512692e";
- name = "kalarmcal-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kalarmcal-20.08.0.tar.xz";
+ sha256 = "bd4f048a976829ee5768b9d26aebe4efbbfa0a2991486c8f57f250fe4198532c";
+ name = "kalarmcal-20.08.0.tar.xz";
};
};
kalgebra = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz";
- sha256 = "988ae02433e961a84da35498aa6ff88fbcc36f8f12d55457116935740d3f1475";
- name = "kalgebra-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kalgebra-20.08.0.tar.xz";
+ sha256 = "658fd3eae218b6b73dbf3ff2edb59c511bfb11d549b7e41a5224c62b4bfedc2c";
+ name = "kalgebra-20.08.0.tar.xz";
};
};
kalzium = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz";
- sha256 = "b884fc8c13c3618a73e3ecfd265660e7045245059a951aff32c12ee5981902ca";
- name = "kalzium-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kalzium-20.08.0.tar.xz";
+ sha256 = "e9b402ea91ac87a19cef6e686bfb8507f6afac0d19c5dc7de777475d5db1b06f";
+ name = "kalzium-20.08.0.tar.xz";
};
};
kamera = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz";
- sha256 = "dcac50db634fccb3e602abb575322342d50c56832a61731546cf1fec552d5b3e";
- name = "kamera-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kamera-20.08.0.tar.xz";
+ sha256 = "ca4194b99703a1908d4991538419c49fc28f5df8cb32f7c07a20454f4918f12a";
+ name = "kamera-20.08.0.tar.xz";
};
};
kamoso = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz";
- sha256 = "9b6410f75bd47901cdd787ea5a7a7bc93da16837f955f27de9e609d9e7b4b896";
- name = "kamoso-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kamoso-20.08.0.tar.xz";
+ sha256 = "c27ea592a70d7634740973e860acdf8cda49c0880a13f623c315fbc02cc3d592";
+ name = "kamoso-20.08.0.tar.xz";
};
};
kanagram = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz";
- sha256 = "7fe8fde45d54b09118238f4a7a63aa2f6fc24ae14c49739ffe71cffc44bc5a95";
- name = "kanagram-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kanagram-20.08.0.tar.xz";
+ sha256 = "d7fc300883bb5420ce1f9bc2ec52324a74b775a8ecea12b904afedc0a6af6ca3";
+ name = "kanagram-20.08.0.tar.xz";
};
};
kapman = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz";
- sha256 = "e3c34e94a204e6d9a4ebb35c415b8c5707313fba746867f2984fd0e95926d529";
- name = "kapman-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kapman-20.08.0.tar.xz";
+ sha256 = "24ad6ae146c0770fe4498983604b25ced25eab98b4a94898311553f7e4a97475";
+ name = "kapman-20.08.0.tar.xz";
};
};
kapptemplate = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz";
- sha256 = "72ce76b66ae503591a60081f334c2d2a0e9338a125b64de413e1e4ab81c29013";
- name = "kapptemplate-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kapptemplate-20.08.0.tar.xz";
+ sha256 = "ef92d56a155f1218d28a63167e67f4fc7bbdf9ba63344bef9512b2e1435f322d";
+ name = "kapptemplate-20.08.0.tar.xz";
};
};
kate = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz";
- sha256 = "38d92f2b95032cd20bd5b78ada2ee25fc9c06593047d063c28419df0839bc334";
- name = "kate-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kate-20.08.0.tar.xz";
+ sha256 = "aa0695f40cf9d491a08338f1c9b4331dfbb63cb311cf815ed0499b38940fa0db";
+ name = "kate-20.08.0.tar.xz";
};
};
katomic = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz";
- sha256 = "9ced288f46af528aa31931a0ab1a1b2d346d63ce6729e508163bf3370dbd261f";
- name = "katomic-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/katomic-20.08.0.tar.xz";
+ sha256 = "006c55f3f688f70b51cf89589843037f09d30e826cf1a30ec441e84724ad27ab";
+ name = "katomic-20.08.0.tar.xz";
};
};
kbackup = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz";
- sha256 = "0360f5b5d512a48975e09e5c1d2f035b7c2e1ead00b9b9f76059b76eb4499f92";
- name = "kbackup-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kbackup-20.08.0.tar.xz";
+ sha256 = "5d5882df3dfa6a078940ea6e292fd1c1aba7c016426e36d87f0d7f8c149bcd59";
+ name = "kbackup-20.08.0.tar.xz";
};
};
kblackbox = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz";
- sha256 = "8bf24ceaf33fabd3ec3030b42565dcbb2d8b282553a3222d741b0b43d70d3a38";
- name = "kblackbox-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kblackbox-20.08.0.tar.xz";
+ sha256 = "0f6d0341e5bbc16d2d0ec9dc14027ebc91fdda2b9eb2ac6061055a60541db358";
+ name = "kblackbox-20.08.0.tar.xz";
};
};
kblocks = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz";
- sha256 = "128cbd7751883cc46d3bc0fcf3c2fc40d8d87631ad54c90459727da209237609";
- name = "kblocks-20.04.3.tar.xz";
- };
- };
- kblog = {
- version = "20.04.3";
- src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kblog-20.04.3.tar.xz";
- sha256 = "5932a8ba3ec33f13aec201252abb6d0712740f52af03747e9eb0f6c0764cb9b4";
- name = "kblog-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kblocks-20.08.0.tar.xz";
+ sha256 = "041904451ce1aec7da113ed4fb442abd92083b8d7522b1c91e05933d574fba8e";
+ name = "kblocks-20.08.0.tar.xz";
};
};
kbounce = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz";
- sha256 = "21977895752b7a33484463cf3fe47ff6f4d5ad4bb8ee824b92b309c5c0ee3837";
- name = "kbounce-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kbounce-20.08.0.tar.xz";
+ sha256 = "7949b9ea43ca93b13378c018d8a532c200233f5f3d2acaba3c74d90f3ed79ccb";
+ name = "kbounce-20.08.0.tar.xz";
};
};
kbreakout = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz";
- sha256 = "4e9bd79060d826d99573e3db364005b32d70643b0fe0d7c5e427fb1c8a34896b";
- name = "kbreakout-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kbreakout-20.08.0.tar.xz";
+ sha256 = "0aa63a16d45ca432065777352f69a7fc0993fd0077f14e05cb89b06a1b69ad69";
+ name = "kbreakout-20.08.0.tar.xz";
};
};
kbruch = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz";
- sha256 = "7381df5deb97580a0d60881d591b3d18715c8ad5692a580aebe82a836f1bb8df";
- name = "kbruch-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kbruch-20.08.0.tar.xz";
+ sha256 = "9e0c51ec0e32a8b46b567c7d275acb3845e09aef446c27324d872fc3a096113e";
+ name = "kbruch-20.08.0.tar.xz";
};
};
kcachegrind = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz";
- sha256 = "ef6e782540c254eada9e75049eb02919afd7adc9940ace79aa20dcad26240770";
- name = "kcachegrind-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kcachegrind-20.08.0.tar.xz";
+ sha256 = "94b3963e9eebc0bf67644de1666cf019649f5eaf924ac01c1af6e48619a11f87";
+ name = "kcachegrind-20.08.0.tar.xz";
};
};
kcalc = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz";
- sha256 = "1ec38e3bf0c17df25a3367d4f3d5f7ef32b9a6fb5f081c20ad0091a968a2cf4a";
- name = "kcalc-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kcalc-20.08.0.tar.xz";
+ sha256 = "3b6dee02e43ddb85ae6748cd8aefb422112be411e778c56372e97de0046bfca2";
+ name = "kcalc-20.08.0.tar.xz";
};
};
kcalutils = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz";
- sha256 = "6604e0377c8955be7963853691aeaf689c00e2f78caab6b3472ffb4c822e07a3";
- name = "kcalutils-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kcalutils-20.08.0.tar.xz";
+ sha256 = "82504223fe3a0f6149204aa5f3b38dc7fb05a25048e4a0159ba6e1923c24c1f8";
+ name = "kcalutils-20.08.0.tar.xz";
};
};
kcharselect = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz";
- sha256 = "0da77b66efeab1ba7c17335853f3c3feab9b53b4c37cfa6a9f983327d13080f4";
- name = "kcharselect-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kcharselect-20.08.0.tar.xz";
+ sha256 = "91b17c42286c3a715dcde764057364bada6d07ae163f9b5cdc7daec338ee3a72";
+ name = "kcharselect-20.08.0.tar.xz";
};
};
kcolorchooser = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz";
- sha256 = "276cee46f92eeb5b47ec09366498b117c657fb2e618fc9fe34c797d4384549fd";
- name = "kcolorchooser-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kcolorchooser-20.08.0.tar.xz";
+ sha256 = "df1bfd346bfcdea7a585f489f62ab2f76993ce07f83c47cb8202be981b8a3829";
+ name = "kcolorchooser-20.08.0.tar.xz";
};
};
kcron = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz";
- sha256 = "b1d7d36e5b9efe4fd5c5fedf0b9e267fd2aaf6423e6a18bb64112a0c8257e4fa";
- name = "kcron-20.04.3.tar.xz";
- };
- };
- kdav = {
- version = "20.04.3";
- src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz";
- sha256 = "b645d5d17c967fd09c3d7abdfc262740a95870dd66bd3e5f4c0382da097d8510";
- name = "kdav-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kcron-20.08.0.tar.xz";
+ sha256 = "e45d06ed0665d8f1cad3d44cc43035d50fc533bf9ab6e10fe53ab23f2ed5e708";
+ name = "kcron-20.08.0.tar.xz";
};
};
kdebugsettings = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz";
- sha256 = "5f42891c0990216780fbe005521e423d922007c7ddeac97a05c3c99b6fe30344";
- name = "kdebugsettings-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdebugsettings-20.08.0.tar.xz";
+ sha256 = "21914b67dfc654ed525118afeda74e6a0539af9a0f3be05c490e9edbf13b2328";
+ name = "kdebugsettings-20.08.0.tar.xz";
};
};
kdeconnect-kde = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz";
- sha256 = "412940a35dcd9f1491a54e4f9fd5ffdadc890bb9a45cfe2a0f8cb1ee7dc1ccbb";
- name = "kdeconnect-kde-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdeconnect-kde-20.08.0.tar.xz";
+ sha256 = "3de16bf165b68635919e68fa2460a5d14139cd9a63cb27573a7b2b2a5b0044a1";
+ name = "kdeconnect-kde-20.08.0.tar.xz";
};
};
kde-dev-scripts = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz";
- sha256 = "0b321954ea79e829d81c9be0170babae87e5eab22c8d42b296746d5a0160fbae";
- name = "kde-dev-scripts-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-scripts-20.08.0.tar.xz";
+ sha256 = "2c3120e63ebcd41e30acfd53063bad659e1982f79b81429e0541b0100bc25ad3";
+ name = "kde-dev-scripts-20.08.0.tar.xz";
};
};
kde-dev-utils = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz";
- sha256 = "8f004e47bbd5ee032d711673b3320e59663087c636c9c51d031dc563b5391c83";
- name = "kde-dev-utils-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-utils-20.08.0.tar.xz";
+ sha256 = "7998afa4ac1b293eb3ba8f48ea77cd0bc22d2c2eda84e291d8c9cf2a5e719547";
+ name = "kde-dev-utils-20.08.0.tar.xz";
};
};
kdeedu-data = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz";
- sha256 = "e717f82a1b4729f0a6df65221e9c2b01df17acf3d4eb8c2340cea23b6b65d969";
- name = "kdeedu-data-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdeedu-data-20.08.0.tar.xz";
+ sha256 = "c863f72c8dacb47dc8c82f966f4b70d33f75c2b9f6d63c174e9f3a2c73241943";
+ name = "kdeedu-data-20.08.0.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz";
- sha256 = "24ce0c1565b8bc922ea08c3d6bb625ff4bba2e656545e09e410a0ff3bc84c80f";
- name = "kdegraphics-mobipocket-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-mobipocket-20.08.0.tar.xz";
+ sha256 = "2c11b6efe2c5f7725341c861dd9ba8e919ba3734866e808225c13bb2f2d90a2d";
+ name = "kdegraphics-mobipocket-20.08.0.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz";
- sha256 = "b72bdd67738391a10672cd20667555168382285a764bd9e712e1485e7860441f";
- name = "kdegraphics-thumbnailers-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-thumbnailers-20.08.0.tar.xz";
+ sha256 = "d466c08b4a5e4ccc36907dd38e82019f9060c2ea1931f336f9fbb2f79036566e";
+ name = "kdegraphics-thumbnailers-20.08.0.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz";
- sha256 = "8cdbe70cd4263e8be6fdc0de987cb9255efae9b747018bc5098c0882a3d69c4d";
- name = "kdenetwork-filesharing-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdenetwork-filesharing-20.08.0.tar.xz";
+ sha256 = "8fabf6b5eae8c32bf75db911ae76d35aa9fee66355964cf0ad8150f960b83256";
+ name = "kdenetwork-filesharing-20.08.0.tar.xz";
};
};
kdenlive = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz";
- sha256 = "29e5fa37f4680683cc6e244cee4d0b3a0e3e3290f15c0e0b6015ae4784d7315e";
- name = "kdenlive-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdenlive-20.08.0.tar.xz";
+ sha256 = "89914ee37f5bbdd16051b0db4a6cfb6f8c3d748f47c9e28e5349920ca133c0bd";
+ name = "kdenlive-20.08.0.tar.xz";
};
};
kdepim-addons = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz";
- sha256 = "db0c70df94891bd6f90db533287269909e3442bfd0f546fa3f951d71f6268e9d";
- name = "kdepim-addons-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdepim-addons-20.08.0.tar.xz";
+ sha256 = "4045f7879cc47829a82a4ada18a35cb3bdf89a489a15cd0bd48441c305b3cb06";
+ name = "kdepim-addons-20.08.0.tar.xz";
};
};
kdepim-apps-libs = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz";
- sha256 = "7d69ac9cecfe0035e4806f0ff43fd41ac3755d788fffea9fd51427e1bc7027e3";
- name = "kdepim-apps-libs-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdepim-apps-libs-20.08.0.tar.xz";
+ sha256 = "bf7ac0af294510e4127808f3f2c1e25368c97b78ff0a5405219abb67173598a0";
+ name = "kdepim-apps-libs-20.08.0.tar.xz";
};
};
kdepim-runtime = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz";
- sha256 = "1e4cffed12098baf29d8acfc4e4e12848d36ad8f55bf75d8c089a57e6f906494";
- name = "kdepim-runtime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdepim-runtime-20.08.0.tar.xz";
+ sha256 = "f6e4ff70b9cb85e8590ab8d7432abe1b6a2daa14d09a2974f8902b882b16409d";
+ name = "kdepim-runtime-20.08.0.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz";
- sha256 = "7d55121100d048bdab5f045126261eaad55ed58a2de97b211ad6acf03e22344b";
- name = "kdesdk-kioslaves-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-kioslaves-20.08.0.tar.xz";
+ sha256 = "0ab8188c1746ec5786d94e5988487b766a04a9df1c275b25778ab2948e302776";
+ name = "kdesdk-kioslaves-20.08.0.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz";
- sha256 = "e526cbad484807e11e03d85e5fc706df118e8f3327846f396e8df024b770c566";
- name = "kdesdk-thumbnailers-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-thumbnailers-20.08.0.tar.xz";
+ sha256 = "8f2adb38ca24b82119eb52ef879f5fd6a5d48b9c012956a518cefefd86fbd6d3";
+ name = "kdesdk-thumbnailers-20.08.0.tar.xz";
};
};
kdf = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz";
- sha256 = "f52e34c36cd924ae6f8fa1291d548abbf5e0bcf0c82d69a583f01dfe128332a8";
- name = "kdf-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdf-20.08.0.tar.xz";
+ sha256 = "2f5fddbaf09d3cfdfb3e18b0a9292ecb6bcf14969e4d031a4215f22fecda0892";
+ name = "kdf-20.08.0.tar.xz";
};
};
kdialog = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz";
- sha256 = "75b8214980f5043d23b0226827f049815147e1206ffd64c1fe9e091e63c27a62";
- name = "kdialog-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdialog-20.08.0.tar.xz";
+ sha256 = "669da86bebf2cfac4cda7c873bb57417aac8d293cee8c5950968495520954ed5";
+ name = "kdialog-20.08.0.tar.xz";
};
};
kdiamond = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz";
- sha256 = "f1bd1c5471224d4ab2269637bd89e11e5903bf4f15f1b2a3ae01c252adad7096";
- name = "kdiamond-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kdiamond-20.08.0.tar.xz";
+ sha256 = "56efcb8b2bf81d62324911f404e918f7bcd62f6fa2ee9d4e513df54e37631889";
+ name = "kdiamond-20.08.0.tar.xz";
};
};
keditbookmarks = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz";
- sha256 = "ec25b40d0ab85e3f72eb334ea7d658d6fe19ae08d626d9fbf0ad71d57594ad88";
- name = "keditbookmarks-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/keditbookmarks-20.08.0.tar.xz";
+ sha256 = "7fab031ae4d62e3c9d37dce671af4580afe01e6e3411ef199115568e893b7df5";
+ name = "keditbookmarks-20.08.0.tar.xz";
};
};
kfind = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz";
- sha256 = "ff0d412dcd4b5812eb781618c4bf52d33f4691af2b9def4ba56644b5a668ef6e";
- name = "kfind-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kfind-20.08.0.tar.xz";
+ sha256 = "f47f1ee0dc1c75b90d70027eb0ce2b470912aff9db2c18a0380eb65b16e6c842";
+ name = "kfind-20.08.0.tar.xz";
};
};
kfloppy = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz";
- sha256 = "4e0d392471eddd23847129b5538846edd1a834f02119d312aed3698e6bfd9e1c";
- name = "kfloppy-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kfloppy-20.08.0.tar.xz";
+ sha256 = "85732b804ee19c1a1db82845d7ab8c1ba1872d8d40737ee5b6beef8798c457f3";
+ name = "kfloppy-20.08.0.tar.xz";
};
};
kfourinline = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz";
- sha256 = "c339009355dea086c28baa454aac1c15d601e15685ba8006100f50475518875f";
- name = "kfourinline-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kfourinline-20.08.0.tar.xz";
+ sha256 = "9b1d520d61ddd98ce629a50355a190bded41d6abea100d87f3650e15e0c358b6";
+ name = "kfourinline-20.08.0.tar.xz";
};
};
kgeography = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz";
- sha256 = "69b4b06cfb1f6abb5c12bb0bf9334f178af2018288ee507678efe594e0392887";
- name = "kgeography-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kgeography-20.08.0.tar.xz";
+ sha256 = "7fd2b7449309d6c42e01038c93ce8dda9c7a8acb806b27b9ff58d4556711ff5e";
+ name = "kgeography-20.08.0.tar.xz";
};
};
kget = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz";
- sha256 = "930b7ed50d19e41bfead8e6d71d8ec4024d688907489c17fb9274a73e4c7c0c2";
- name = "kget-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kget-20.08.0.tar.xz";
+ sha256 = "de46cbe0a53c7246d1aeb4f15d24b90633eaf37e236d67882e1454b61fea1a09";
+ name = "kget-20.08.0.tar.xz";
};
};
kgoldrunner = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz";
- sha256 = "ab535067a8991a94bd7cd5a990a6120538206d241c8e8149c7b774cbdd1d0941";
- name = "kgoldrunner-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kgoldrunner-20.08.0.tar.xz";
+ sha256 = "29caf1637daea69013061d170a749411b18f543af7e2f8a0f295f1eb5cb62586";
+ name = "kgoldrunner-20.08.0.tar.xz";
};
};
kgpg = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz";
- sha256 = "bcd3211ab8112f070215e8e6451021859fefc57b813bdad1b421a1f129e17cbb";
- name = "kgpg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kgpg-20.08.0.tar.xz";
+ sha256 = "102cc0d44b7621ebad1d5914bbb44a598689ebb95093e4a76713679996c2af0c";
+ name = "kgpg-20.08.0.tar.xz";
};
};
khangman = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz";
- sha256 = "db827d20ce5f0522675d75c18fd4c804047cc2e5a2ca2f7a7421b5fc91952831";
- name = "khangman-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/khangman-20.08.0.tar.xz";
+ sha256 = "11f442e24f0a428c0338000f66687bc021f4290bcd8cc0acc3fd882ce3cf4b0b";
+ name = "khangman-20.08.0.tar.xz";
};
};
khelpcenter = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz";
- sha256 = "3930c321388f27925a63add5f11fe65eb34b7301fb22d78f16f5f3de8467a9ed";
- name = "khelpcenter-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/khelpcenter-20.08.0.tar.xz";
+ sha256 = "2c45fb76c5503441dcf9ab1cae386dd2e10a2ad1af08f60090d362e82364e98c";
+ name = "khelpcenter-20.08.0.tar.xz";
};
};
kidentitymanagement = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz";
- sha256 = "09e63cdb07bb38ba8c82d796212b1bd9d218dbe8adde215bff9c689c93b90917";
- name = "kidentitymanagement-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kidentitymanagement-20.08.0.tar.xz";
+ sha256 = "4c7dca3e27f87203b27af219ebe07701e641a56dd7a8c1d7a3fa7cef2fe1c5af";
+ name = "kidentitymanagement-20.08.0.tar.xz";
};
};
kig = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz";
- sha256 = "ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023";
- name = "kig-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kig-20.08.0.tar.xz";
+ sha256 = "fa9754f5a67e35fdfd8b836d423001fc48fe5c41fadbfceece834fb3f5b6cccd";
+ name = "kig-20.08.0.tar.xz";
};
};
kigo = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz";
- sha256 = "ccc4f9638bfd3e1bf7f25621e10907f08cd0354858f9a174ab8f5c51c77e8a77";
- name = "kigo-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kigo-20.08.0.tar.xz";
+ sha256 = "5e787cad2370b479feeae3be81b0972314429e0e896b9943445653731c9c6040";
+ name = "kigo-20.08.0.tar.xz";
};
};
killbots = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz";
- sha256 = "66c48ddeb49118ea8139422c0370256f88a4e3104dbe664bc25d2c63edfdf326";
- name = "killbots-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/killbots-20.08.0.tar.xz";
+ sha256 = "3b647fd8af007619acdfc7c72d572a3184a8e8c5ecbeb472559c5e40e9d53257";
+ name = "killbots-20.08.0.tar.xz";
};
};
kimagemapeditor = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz";
- sha256 = "d86f8a9e0a1aba71236f7af844076758774ab1c10b4b2fa1d244c9b5d24adf33";
- name = "kimagemapeditor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kimagemapeditor-20.08.0.tar.xz";
+ sha256 = "17d3ccfc35aecd802729da6c78a78cb358cf68bd5079bcae6d83af0874e86a00";
+ name = "kimagemapeditor-20.08.0.tar.xz";
};
};
kimap = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz";
- sha256 = "870d22a4f07080453ade2e1224acb563232211fe48e1beabe8c58d27730b4bfa";
- name = "kimap-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kimap-20.08.0.tar.xz";
+ sha256 = "4ebb75312aac29274d8faa68f885c78a77c1173fc0200c08825670ac263cbec6";
+ name = "kimap-20.08.0.tar.xz";
};
};
kio-extras = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz";
- sha256 = "ff0edabe83ee4958ce7559e935f6b7ae3f76aee43ee5774543368ca334b21090";
- name = "kio-extras-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kio-extras-20.08.0.tar.xz";
+ sha256 = "6bfbb92dd56755ec0b2dee0cd889d6081ae00df339c05b4cb7a173a463275e2d";
+ name = "kio-extras-20.08.0.tar.xz";
+ };
+ };
+ kio-gdrive = {
+ version = "20.08.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.08.0/src/kio-gdrive-20.08.0.tar.xz";
+ sha256 = "c08f809d575a24887aacd1a046b01cf2c3df7b77813fecf89cb6cdbec13ab299";
+ name = "kio-gdrive-20.08.0.tar.xz";
};
};
kipi-plugins = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz";
- sha256 = "e128ba8a2194bb0ce6a5eac97d56479003f08c1d740a56a6c8d976df1a71632a";
- name = "kipi-plugins-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kipi-plugins-20.08.0.tar.xz";
+ sha256 = "f8f03a9797b4855839693ffca93245460e78fd2f6eeb763d16dd159711f40683";
+ name = "kipi-plugins-20.08.0.tar.xz";
};
};
kirigami-gallery = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kirigami-gallery-20.04.3.tar.xz";
- sha256 = "1868c4782c8a9c7a80eb6b465a27cb7fc46dc9a8e47d2530559ba3b2f1131461";
- name = "kirigami-gallery-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kirigami-gallery-20.08.0.tar.xz";
+ sha256 = "8cabcee747152b41b558c0a9eb1fd0d55fb155b3b807a57d2176023806a59f2b";
+ name = "kirigami-gallery-20.08.0.tar.xz";
};
};
kiriki = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz";
- sha256 = "1df78a7b9e91f20841411fc2561d077dcd897211e5c20f1f526670c9f3b7a97d";
- name = "kiriki-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kiriki-20.08.0.tar.xz";
+ sha256 = "56db705674a43c249f2374eb1ce2c20e4b3e22223348959b3f5db67c0f52db4f";
+ name = "kiriki-20.08.0.tar.xz";
};
};
kiten = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz";
- sha256 = "3b0bdd2b711ee67bbc194b301da3ed99d4ee75bb6ff18ab50c0a1b4c1c4ef162";
- name = "kiten-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kiten-20.08.0.tar.xz";
+ sha256 = "17cb8344d679040b5c7be99049f73b88517cf127e3d045d469cdae9602945263";
+ name = "kiten-20.08.0.tar.xz";
};
};
kitinerary = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz";
- sha256 = "8c7dab2e28891af268d22884ecbb9cd7031c4b34352ed3b576dbb6dcb5977c7e";
- name = "kitinerary-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kitinerary-20.08.0.tar.xz";
+ sha256 = "a87ce5dd8e978dad8bcac7d92d89c4a5eeaa847e8819c2aa84ebce51dfe95f50";
+ name = "kitinerary-20.08.0.tar.xz";
};
};
kjumpingcube = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz";
- sha256 = "1716e1de95e8610dc80d991c4518beedbdf6d4c40a07f71a1dba0971e0a6cb9b";
- name = "kjumpingcube-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kjumpingcube-20.08.0.tar.xz";
+ sha256 = "5ea4187326a0ff0a77c0aef774d9ba9c3c20b438def85abe9e4b0822a8350a70";
+ name = "kjumpingcube-20.08.0.tar.xz";
};
};
kldap = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz";
- sha256 = "ab32ef61da11f1401f9d648f6831a946dd6964ffd4f35f6c84ad9ca19dd422f1";
- name = "kldap-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kldap-20.08.0.tar.xz";
+ sha256 = "db358a6ec50f5d3988583096ccc5fe1389999b4dd3a3c787d7797f6e0b32ee53";
+ name = "kldap-20.08.0.tar.xz";
};
};
kleopatra = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz";
- sha256 = "59c6eb6b626b502f6b194ac4bbde8ed95e613d6b6fd54818c0206dd84575a34d";
- name = "kleopatra-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kleopatra-20.08.0.tar.xz";
+ sha256 = "776fbb8d06edc83834745a8af05b23297aeba89b8dce3410a2d48f37a91b5a87";
+ name = "kleopatra-20.08.0.tar.xz";
};
};
klettres = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz";
- sha256 = "ed943bce624a599f7759487d0ff3b16c340f2beadbad25dab30b6607dbd2695e";
- name = "klettres-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/klettres-20.08.0.tar.xz";
+ sha256 = "55748999e29ecec5fb3ce206c74bc44f7e83f4f239edd61c161e4df4e597bca2";
+ name = "klettres-20.08.0.tar.xz";
};
};
klickety = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz";
- sha256 = "703158b1c1cafc16368fa09c4c58ea6d10942b90af693a851f9b5ec84add691d";
- name = "klickety-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/klickety-20.08.0.tar.xz";
+ sha256 = "0b6d71d54a5521ae8cc66eca1d397289a35733af2fc686b82bc01dd6777fa926";
+ name = "klickety-20.08.0.tar.xz";
};
};
klines = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz";
- sha256 = "83bebb2dbb7da8e325a378da3903246ff562c56dcf9ea4991dedb5b253c81f7d";
- name = "klines-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/klines-20.08.0.tar.xz";
+ sha256 = "778928fc55fe551eb836beba3f74b0f20602a0fae7366c71fa84a95ad6ca803a";
+ name = "klines-20.08.0.tar.xz";
};
};
kmag = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz";
- sha256 = "f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464";
- name = "kmag-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmag-20.08.0.tar.xz";
+ sha256 = "b1a8fe75a03dbeac8f2080808f580bea588bf39c97534ddfa0cbf7d0de20efb7";
+ name = "kmag-20.08.0.tar.xz";
};
};
kmahjongg = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz";
- sha256 = "1f4fce58163323c23aa37f849e556ee4ed7fe33fb36e21754116e1d0e2c33673";
- name = "kmahjongg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmahjongg-20.08.0.tar.xz";
+ sha256 = "05538c97613d6e3547161136b9d7aec9bb2918c9f4033a084e1576041b83d4e6";
+ name = "kmahjongg-20.08.0.tar.xz";
};
};
kmail = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz";
- sha256 = "5b653c680097a7be4ff53bc902bc3fcda9edac99f699a63a1375a1df81240d03";
- name = "kmail-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmail-20.08.0.tar.xz";
+ sha256 = "0432ec1fd68868e9385dd3f6b9e2429feb5b5057317ef3940eb0e67a63e0c0f0";
+ name = "kmail-20.08.0.tar.xz";
};
};
kmail-account-wizard = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz";
- sha256 = "ba789c679664a390480808431510d7d6ee1591a5f7be3dfceb5951347e3cc9b1";
- name = "kmail-account-wizard-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmail-account-wizard-20.08.0.tar.xz";
+ sha256 = "9f4eac46049acbc7452bbbf84569031d91f86c2577beecacb3a6200deefcc253";
+ name = "kmail-account-wizard-20.08.0.tar.xz";
};
};
kmailtransport = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz";
- sha256 = "45685bf61f24c9c7070a9f5b982d48005a7bf0ef04f391df2959772b17857cc2";
- name = "kmailtransport-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmailtransport-20.08.0.tar.xz";
+ sha256 = "af337017b884519065fea520fd66a8fc2e553d84ca3d8afc35739c18e67b4d73";
+ name = "kmailtransport-20.08.0.tar.xz";
};
};
kmbox = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz";
- sha256 = "50b2a8ba98cf24117ba66ddb9b51d1db575998b36ad1aa15fec0135446cc7561";
- name = "kmbox-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmbox-20.08.0.tar.xz";
+ sha256 = "58a2ecc7222a8ee5697102ca2bc871e7e30c823dcd906ac4160323fd1ba14d85";
+ name = "kmbox-20.08.0.tar.xz";
};
};
kmime = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz";
- sha256 = "a416e16f61a2dd4274b1abc54af71ffe73b01c93137bc1fa462642bb947d150c";
- name = "kmime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmime-20.08.0.tar.xz";
+ sha256 = "55f2160fa78202cf45a4b08b9bb2fec1bc54a3700f6c9aceeec8d7fc3a64a317";
+ name = "kmime-20.08.0.tar.xz";
};
};
kmines = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz";
- sha256 = "8a729ffd6406d7d6173fbd050e40a566b5ce4e7b960f3971fff82fef9c18c4d3";
- name = "kmines-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmines-20.08.0.tar.xz";
+ sha256 = "d8d0f1a82fe279ed208a9005e8ffbe1277e25b33e9e0a1301013820e559ba750";
+ name = "kmines-20.08.0.tar.xz";
};
};
kmix = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz";
- sha256 = "1830bc59d836d2155fd7a24c5afe3c7f5682a96217c159a062fd28b851414dc6";
- name = "kmix-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmix-20.08.0.tar.xz";
+ sha256 = "4553362d4d14fdaf019b1fc55b98aac16c2db56542996a3c2f87603c41bc2859";
+ name = "kmix-20.08.0.tar.xz";
};
};
kmousetool = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz";
- sha256 = "acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715";
- name = "kmousetool-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmousetool-20.08.0.tar.xz";
+ sha256 = "285d947548ee863de6274888b097e19aff39ed2bb8cdd33e37707c39c8417863";
+ name = "kmousetool-20.08.0.tar.xz";
};
};
kmouth = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz";
- sha256 = "edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2";
- name = "kmouth-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmouth-20.08.0.tar.xz";
+ sha256 = "a783e73e8087d090cf4eba89fabcb9aee8c6b0858a6dea8a137323c1bbc110b1";
+ name = "kmouth-20.08.0.tar.xz";
};
};
kmplot = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz";
- sha256 = "57389abae04c204d0c2462709b70a919e0050b20867bcb23f3ab72788051e501";
- name = "kmplot-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kmplot-20.08.0.tar.xz";
+ sha256 = "f2d31d8c9091c74c6d0e65a0cba77bac23eb6f78913b31d049a0e2c9ca4ec8c0";
+ name = "kmplot-20.08.0.tar.xz";
};
};
knavalbattle = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz";
- sha256 = "78feb74eb2e52d4738e5aa8969dc4db00307bb758623cbf34d7f245242f07279";
- name = "knavalbattle-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/knavalbattle-20.08.0.tar.xz";
+ sha256 = "887d2f4e24d522ab66c2a4e183b9d5359213d67382fa2350f2edff6478666aa8";
+ name = "knavalbattle-20.08.0.tar.xz";
};
};
knetwalk = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz";
- sha256 = "6bc61fb70eb0cde3f312aa672f848447ed5eb5bbc2d48d65c6a010c12e154054";
- name = "knetwalk-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/knetwalk-20.08.0.tar.xz";
+ sha256 = "83fdf150c1c14f7c1807b73ce1d4bacfd10469f565541a379daa828755ddf5c6";
+ name = "knetwalk-20.08.0.tar.xz";
};
};
knights = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz";
- sha256 = "b695e1f141dc3fd1a5deca6179bddb0f3d4aa9103c5cc539c01a2a789adade4f";
- name = "knights-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/knights-20.08.0.tar.xz";
+ sha256 = "b754af5da0ee922834644c578f2133695cc446dfb8ac327fae357e7a6c027bf7";
+ name = "knights-20.08.0.tar.xz";
};
};
knotes = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz";
- sha256 = "90c47b902f738492286d9b3e0acb26e6a10504e1c933f921213cd1784309b796";
- name = "knotes-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/knotes-20.08.0.tar.xz";
+ sha256 = "35454e609c6ea2f805c8976d2897d2b2b9137a61ad8d396be2b510881bbd7cf3";
+ name = "knotes-20.08.0.tar.xz";
};
};
kolf = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz";
- sha256 = "dc2fd28fbfaa21d75ad6482513adddb9bd04ac0432d2d72419f85d65140ee186";
- name = "kolf-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kolf-20.08.0.tar.xz";
+ sha256 = "dbc0d129e1d1fc8c597979c5ec96d612014aa56b0b0825be653b410995987305";
+ name = "kolf-20.08.0.tar.xz";
};
};
kollision = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz";
- sha256 = "49365efc2cfc4c9406cbedf84ad8a135df79536cba166cd77402955803a56207";
- name = "kollision-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kollision-20.08.0.tar.xz";
+ sha256 = "a7d59d6f4132a669ce4fe74b3b58168ce6f2036a27d37cc6362b471b58a70fe4";
+ name = "kollision-20.08.0.tar.xz";
};
};
kolourpaint = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz";
- sha256 = "55ec6d42fcf10b15b80b6fdabacdf189d1cda283a19a1c04b6a4a58abb56bee8";
- name = "kolourpaint-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kolourpaint-20.08.0.tar.xz";
+ sha256 = "f2b5dee4e8c2b8245b2fd652c5ead015f637f62bc4b799735af255e2c5831629";
+ name = "kolourpaint-20.08.0.tar.xz";
};
};
kompare = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz";
- sha256 = "6c49547c3adbe96c184bae6eda47963ce42ede2808e5588ec3f8ea924853a941";
- name = "kompare-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kompare-20.08.0.tar.xz";
+ sha256 = "712d248edc6eae8dd94d41efccde94ccbc5753ecd01eb69cb3d80757a63805a3";
+ name = "kompare-20.08.0.tar.xz";
};
};
konqueror = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz";
- sha256 = "d2f81f697e88eb4fe962aaa43942ef35e7a03df10f811a46ae6805a27e637e35";
- name = "konqueror-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/konqueror-20.08.0.tar.xz";
+ sha256 = "4db172cff4bd3fd06ee1905dcf87013059e02902808e77acfc4bf2734d6ff73f";
+ name = "konqueror-20.08.0.tar.xz";
};
};
konquest = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz";
- sha256 = "004b3d8d38acecb0d5e78d037a47d137f0517d74768da461ce51fbd2a549578d";
- name = "konquest-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/konquest-20.08.0.tar.xz";
+ sha256 = "e6938230c2fdd94903d13ed34f8d1e8db8221c9ceb571c5737f429291d4cca04";
+ name = "konquest-20.08.0.tar.xz";
};
};
konsole = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz";
- sha256 = "7874b6117d31eecd9fc475536c9bfc73c78d66d57b128cffb0bb931881564f15";
- name = "konsole-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/konsole-20.08.0.tar.xz";
+ sha256 = "b641bc2f66195887a25ec588b638a78a0d00e6d2d41c126bca9a45f30f70aee9";
+ name = "konsole-20.08.0.tar.xz";
};
};
kontact = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz";
- sha256 = "c35a68a0a99195d1d9b63f7c8edaadb9e4f1dd6957e3823e2e44c8225ccafde7";
- name = "kontact-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kontact-20.08.0.tar.xz";
+ sha256 = "d759b475938079f87d5042d4fc6608c0263800cfc2156e83c874faa77c488646";
+ name = "kontact-20.08.0.tar.xz";
};
};
kontactinterface = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz";
- sha256 = "9c0587df91b9de55218d7313c445c68d13b22aeb09dc142caf8d8036574e3b09";
- name = "kontactinterface-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kontactinterface-20.08.0.tar.xz";
+ sha256 = "6b20e160642063b966f359ecf2e1946db161728d42f4e6b15a77f6a19f151048";
+ name = "kontactinterface-20.08.0.tar.xz";
};
};
kopete = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz";
- sha256 = "b37a120e3239ee4e53aedf5756c63f62a737c0774021ec27b120b054e57f886b";
- name = "kopete-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kopete-20.08.0.tar.xz";
+ sha256 = "44805238ed04620101d3921e3eab0bb89d329c4d216b9cb49589459a3e4ea7e6";
+ name = "kopete-20.08.0.tar.xz";
};
};
korganizer = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz";
- sha256 = "bf2ee5a3e50dca9ab0cde0b5b0d67dc561788527a216d4ef159144da5bf192a3";
- name = "korganizer-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/korganizer-20.08.0.tar.xz";
+ sha256 = "c99470c92327e9e6c91276b4141bb36b08e3a9726e40edba6656d1014ee46b82";
+ name = "korganizer-20.08.0.tar.xz";
};
};
kpat = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz";
- sha256 = "2a207c9efa1a62c99f8b33cf44782c563ee032b706ef63548239a4c303ec9a66";
- name = "kpat-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kpat-20.08.0.tar.xz";
+ sha256 = "feaca3a018a8b2a94a183915b29ff671474911b1da3a149bf3ba70fdcd0a6f53";
+ name = "kpat-20.08.0.tar.xz";
};
};
kpimtextedit = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz";
- sha256 = "f6cc5cf0ca2e598ba0c98590f16a8fabf87e1592ad62e6832c787cf2c3616cb8";
- name = "kpimtextedit-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kpimtextedit-20.08.0.tar.xz";
+ sha256 = "3ae3b9f8a980d10e366351efaf2b186fd911402da5b5ee634f4687d43586ce34";
+ name = "kpimtextedit-20.08.0.tar.xz";
};
};
kpkpass = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz";
- sha256 = "1f8b9bd587c278773fb016bc9fb774b03f82bcdf3c95fdca8bfc070f9a3ff322";
- name = "kpkpass-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kpkpass-20.08.0.tar.xz";
+ sha256 = "553b841cf3fdf4809251941997f7dee8e09360a5b7df386e3540c73d176ba055";
+ name = "kpkpass-20.08.0.tar.xz";
};
};
kqtquickcharts = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz";
- sha256 = "69ff44ceb85779f7d4f52e092a8a5d18231ea0704d67d34d15ef94acf0d668c7";
- name = "kqtquickcharts-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kqtquickcharts-20.08.0.tar.xz";
+ sha256 = "f17807dfa20de202615c56779ef6e4d355a275b576d6e0969357fdb359b1b235";
+ name = "kqtquickcharts-20.08.0.tar.xz";
};
};
krdc = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz";
- sha256 = "4e8f60b4abd05d45e59a773a63cc185529e9fbabb295524a59c835af547d4bc8";
- name = "krdc-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/krdc-20.08.0.tar.xz";
+ sha256 = "96f4411dc80e746142796745c3b7fca4663aa37878391a00d1e70f2ba3be652c";
+ name = "krdc-20.08.0.tar.xz";
};
};
kreversi = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz";
- sha256 = "b2d9220f5919361ff81473c8b597585cc4c004b16ee459691e26feeb2e0c3114";
- name = "kreversi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kreversi-20.08.0.tar.xz";
+ sha256 = "341603d23ffaf94af6c246540bbe7ba86aca3e5afe3135a0511aca22cd6a4d7f";
+ name = "kreversi-20.08.0.tar.xz";
};
};
krfb = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz";
- sha256 = "44532435ef824ff09d877d6984dbdfdcc5fd941f9e2abed65829dba89afeee0d";
- name = "krfb-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/krfb-20.08.0.tar.xz";
+ sha256 = "f7ca46cc216ecd3790d045a36a642c834a9af4024409075e7a5bf8b498c67e4b";
+ name = "krfb-20.08.0.tar.xz";
};
};
kross-interpreters = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz";
- sha256 = "7e5d1f771477831f42dc209c0333977af17a143ec8c7f60acbab9f5390818457";
- name = "kross-interpreters-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kross-interpreters-20.08.0.tar.xz";
+ sha256 = "7a27547b150d686524578fc256e1282f64554513d2724994020caf89e7a60b10";
+ name = "kross-interpreters-20.08.0.tar.xz";
};
};
kruler = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz";
- sha256 = "66a02829d860777184e281747dd696c6bd326d874a96173d9c47759b9e7243fe";
- name = "kruler-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kruler-20.08.0.tar.xz";
+ sha256 = "71ca2308b8cee2fdd01faac526d20c813cab3664443b78e751f9d7d024e4e2c0";
+ name = "kruler-20.08.0.tar.xz";
};
};
kshisen = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz";
- sha256 = "ee91821b13dc13d54a0cdf64582eff820faf934df3654135c55bd3210b98bd52";
- name = "kshisen-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kshisen-20.08.0.tar.xz";
+ sha256 = "5b3cc83d3cd427dcbaa98e2536f58deb36ee4eefe0a35e6d5c9613a64abad0d8";
+ name = "kshisen-20.08.0.tar.xz";
};
};
ksirk = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz";
- sha256 = "c3c86db84b2603a0cd11e7b0da5e3c66b81c26983ace113b836ec3579dce736a";
- name = "ksirk-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ksirk-20.08.0.tar.xz";
+ sha256 = "7e4acd8586a2c8619c3ca08138ca22cee46b4c46d5972a571665b09c6468cd06";
+ name = "ksirk-20.08.0.tar.xz";
};
};
ksmtp = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz";
- sha256 = "107d135e9337dfec6f16095c75dd0cf81bdc86cee6eeb6d212954a08a9c2e3ce";
- name = "ksmtp-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ksmtp-20.08.0.tar.xz";
+ sha256 = "3fe08534bdb7037a8fd9a8c1a37456abe80252994232cfe31c368dcdc3c328c2";
+ name = "ksmtp-20.08.0.tar.xz";
};
};
ksnakeduel = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz";
- sha256 = "99a033313a3093489d39e7d537d064287aeebbfea05accfe8a189f0296664bf2";
- name = "ksnakeduel-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ksnakeduel-20.08.0.tar.xz";
+ sha256 = "ebc5353ea2e5d16f2d966859b0ea081c81ed7d10c1975054e441545b79f60e5e";
+ name = "ksnakeduel-20.08.0.tar.xz";
};
};
kspaceduel = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz";
- sha256 = "dda32d2a89645129c7ee83aca7b21bc01d5120e0d58e8f39516c0837be531e38";
- name = "kspaceduel-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kspaceduel-20.08.0.tar.xz";
+ sha256 = "6cd633521091ac8a1eed28b234657ba2db287c3b29ee2d071005f3438bbb1b07";
+ name = "kspaceduel-20.08.0.tar.xz";
};
};
ksquares = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz";
- sha256 = "eb72d929cd59b076d20483ee03548d72df3dc894b631947ce3440aff0ecad730";
- name = "ksquares-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ksquares-20.08.0.tar.xz";
+ sha256 = "84b459e6c1058f637b4894a4f97dfd95b0c9bb70954059d24538f80918b45ed3";
+ name = "ksquares-20.08.0.tar.xz";
};
};
ksudoku = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz";
- sha256 = "2df6e5cf78eee919624aa71716ef35baa9215e44662cdd7b315cfbc328c6ac19";
- name = "ksudoku-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ksudoku-20.08.0.tar.xz";
+ sha256 = "0dbe6e03ca8b7203a307f97dad4a8035c20f3172d3e005b047557c2334c04a92";
+ name = "ksudoku-20.08.0.tar.xz";
};
};
ksystemlog = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz";
- sha256 = "03a6f81d1b4aa8557f7da6777ef909a02fbd811b3a39df81312dc0a70bbb8f77";
- name = "ksystemlog-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ksystemlog-20.08.0.tar.xz";
+ sha256 = "359eaa1cc34fa06b2ef3788c249c2b3355d6d39cddbf809df07179c10630e9a4";
+ name = "ksystemlog-20.08.0.tar.xz";
};
};
kteatime = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz";
- sha256 = "2ddc0df953a66376e5b0c11544a6a2ec9f173e4481a44a290aada20402c7d686";
- name = "kteatime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kteatime-20.08.0.tar.xz";
+ sha256 = "c7142cd0329cf23fdb79d3c2d508cb00cb70c517db1f832d2a39ba7c4e103fd3";
+ name = "kteatime-20.08.0.tar.xz";
};
};
ktimer = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz";
- sha256 = "e9881d68ed4fbbff5900d615f81145cd73e70a08092a83b87d71705ee5904395";
- name = "ktimer-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktimer-20.08.0.tar.xz";
+ sha256 = "4a3722945f26df087158a5af69cc81ba10054a778f04fecd32ff816732dff0dd";
+ name = "ktimer-20.08.0.tar.xz";
};
};
ktnef = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz";
- sha256 = "31f5f15ab27112f99ab7b2575a4f90bf612b99a3816544e6919ad4c5a2dc7145";
- name = "ktnef-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktnef-20.08.0.tar.xz";
+ sha256 = "69d18a052cc522161821f98fb4103d38e1ff566622915b7138866e7737ffa62f";
+ name = "ktnef-20.08.0.tar.xz";
};
};
ktouch = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz";
- sha256 = "7f1c456ae758a6e7eb58e83120289fa8eb5c56c3c98cd9c9f974cea5dd156ea8";
- name = "ktouch-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktouch-20.08.0.tar.xz";
+ sha256 = "c4b218f672c0cb86930cdadf622d758a42b54732319e8ea86405b7f9b3281802";
+ name = "ktouch-20.08.0.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz";
- sha256 = "d45588dbd1441ccb0576e7f76489217351bad5fd25d4636ae9da6f81654f5f4b";
- name = "ktp-accounts-kcm-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-accounts-kcm-20.08.0.tar.xz";
+ sha256 = "912552aa0df62298323c5eaaf36975b71ef50be56a5b69ceddcd5f00d4acb4f9";
+ name = "ktp-accounts-kcm-20.08.0.tar.xz";
};
};
ktp-approver = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz";
- sha256 = "9c91d44476151f39ef02e2eeede7dee7f24689643a07d51d44ca8d98577d24a2";
- name = "ktp-approver-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-approver-20.08.0.tar.xz";
+ sha256 = "463a9009599b6e18b2e30793b6bce408e4c9a0edb2de458fb588204eb0aa2f3a";
+ name = "ktp-approver-20.08.0.tar.xz";
};
};
ktp-auth-handler = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz";
- sha256 = "6c73960c44ff42e8c0b6be54b308fc992ab8177f90954ebd960ea6d610e14568";
- name = "ktp-auth-handler-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-auth-handler-20.08.0.tar.xz";
+ sha256 = "d2f1dd4c5f4043eebeb178dd20eedc95dea47a4c75f2df13cd1d9cd0288b699a";
+ name = "ktp-auth-handler-20.08.0.tar.xz";
};
};
ktp-call-ui = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz";
- sha256 = "b997c6252c35f7e295f2389ac76c5dc12227e8a6bbfd1b42d72b622d488bcf98";
- name = "ktp-call-ui-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-call-ui-20.08.0.tar.xz";
+ sha256 = "2744e739456fd3aba322eb3c47be84511450dd713838e133be4f1957a3b9a0bf";
+ name = "ktp-call-ui-20.08.0.tar.xz";
};
};
ktp-common-internals = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz";
- sha256 = "0e7a1c61869d297831615c719e5c79f2b00a6572479d2c2eaca642de6d376efd";
- name = "ktp-common-internals-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-common-internals-20.08.0.tar.xz";
+ sha256 = "9ee962e2afd5db0fc23da69468f008ff239e97ef77d8930f7e5960d732d8a4b2";
+ name = "ktp-common-internals-20.08.0.tar.xz";
};
};
ktp-contact-list = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz";
- sha256 = "c909e21fb168c14c61d1d617b6854ff505eaf4693479d8d0bba746fde0ee11af";
- name = "ktp-contact-list-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-list-20.08.0.tar.xz";
+ sha256 = "ec00bf525450c972634e60dfb423f9cd2be7caa4181e84efa7d88fc6f079a995";
+ name = "ktp-contact-list-20.08.0.tar.xz";
};
};
ktp-contact-runner = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz";
- sha256 = "cb3313ca916a7e3fff78529ccc4a499763766957d22f65dee9663cd950c2b4a6";
- name = "ktp-contact-runner-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-runner-20.08.0.tar.xz";
+ sha256 = "1123adbdfdbdb8bb524ba39ab175f39964cef2ecf5eed9a0a1d0129d7ae8ecbc";
+ name = "ktp-contact-runner-20.08.0.tar.xz";
};
};
ktp-desktop-applets = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz";
- sha256 = "40f1125d4d91e2586d06d45b59d12ac19ee93aaae8c3d4df75db196f7e91e875";
- name = "ktp-desktop-applets-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-desktop-applets-20.08.0.tar.xz";
+ sha256 = "6a6eb5090f6273abb9ff1b70777c32bd4ba5fd0d270dfa0490ac370c31d0cab5";
+ name = "ktp-desktop-applets-20.08.0.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz";
- sha256 = "74df7140bac0b87e3ff39e8ab692bb4c65a10612f328c8d60a84433ae865de52";
- name = "ktp-filetransfer-handler-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-filetransfer-handler-20.08.0.tar.xz";
+ sha256 = "df16a920a233eaec25c73514e951f5f569a0f0f6d4ba46b60a0c2bc3da4ab6cd";
+ name = "ktp-filetransfer-handler-20.08.0.tar.xz";
};
};
ktp-kded-module = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz";
- sha256 = "972a4a5d7108351a07be670654b4e78dfe9fb7657336c563040e1e831134aad2";
- name = "ktp-kded-module-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-kded-module-20.08.0.tar.xz";
+ sha256 = "f321a7db60b0fcd9dd207c38c8097e6cdb3a22aba6730bc03f9ea67bc8d9bb2e";
+ name = "ktp-kded-module-20.08.0.tar.xz";
};
};
ktp-send-file = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz";
- sha256 = "fa67edd7ec516ed727d5df0d30ccf6b990cee40f8062a9966a8643d6f26c8344";
- name = "ktp-send-file-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-send-file-20.08.0.tar.xz";
+ sha256 = "86d3ca20eb3c3fbfa169a355c0e64d1574433c6985d5188697ef18e521d82104";
+ name = "ktp-send-file-20.08.0.tar.xz";
};
};
ktp-text-ui = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz";
- sha256 = "be6253246134aa6513b0ff36d25a833d469e6850da1f5c8c05666a555bbfd9b2";
- name = "ktp-text-ui-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-text-ui-20.08.0.tar.xz";
+ sha256 = "a1f5c4c98761f61abd62b6e788a8ec5c4e2b4020e92f3c0c75770c0f01386676";
+ name = "ktp-text-ui-20.08.0.tar.xz";
};
};
ktuberling = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz";
- sha256 = "0fb7ef29c5bf02de56243e608a050fce992df56586d305a157ed3ac70f002a44";
- name = "ktuberling-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/ktuberling-20.08.0.tar.xz";
+ sha256 = "8d56e4330b68d8597d502db311282a9d59f8ad91f8acfa7f029d354ac399b702";
+ name = "ktuberling-20.08.0.tar.xz";
};
};
kturtle = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz";
- sha256 = "e04034812c62e22be0ee7eb91d89a9e0e0c73bb5cba8e914373f407c99e8c0cb";
- name = "kturtle-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kturtle-20.08.0.tar.xz";
+ sha256 = "9c086a0aec74d9d5aa5792f026e6b44b8fdc613cfdeba060fb4694fb3e9b27f9";
+ name = "kturtle-20.08.0.tar.xz";
};
};
kubrick = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz";
- sha256 = "983310938ad0437902d886f433b0693a3a08faaca0f5553a3aa24e89e3215fb9";
- name = "kubrick-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kubrick-20.08.0.tar.xz";
+ sha256 = "2cf725a96d52d7be157690fb9ce6fe0dcc2cb853fe6e1f9d56ae6c23c09974cc";
+ name = "kubrick-20.08.0.tar.xz";
};
};
kwalletmanager = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz";
- sha256 = "3821d17f5238bd51b9d19ef5974e063aa6426f35afcd0cffa89af109c770151e";
- name = "kwalletmanager-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kwalletmanager-20.08.0.tar.xz";
+ sha256 = "4dea2e1b08cc996d6d4961393d9c8f24051b0a7f6373c4cf575ddf8324804b7a";
+ name = "kwalletmanager-20.08.0.tar.xz";
};
};
kwave = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz";
- sha256 = "111ea78c90371f566500e88d746812b17875e154e431b3694e3d226f3f19e988";
- name = "kwave-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kwave-20.08.0.tar.xz";
+ sha256 = "7291122e5112eea9b8026937682f77d78e43153c4dc38005ac31fd7235a18e69";
+ name = "kwave-20.08.0.tar.xz";
};
};
kwordquiz = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz";
- sha256 = "464684309e098c4e8663d39cd98f53a640a93e1d8ac169a2a0ac3cc98d7f8e12";
- name = "kwordquiz-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/kwordquiz-20.08.0.tar.xz";
+ sha256 = "c8350fcf5b4ed61a43d3d72aabfef645e7d1908ef753df36c0124601873b4951";
+ name = "kwordquiz-20.08.0.tar.xz";
};
};
libgravatar = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz";
- sha256 = "0a5eadd5c8492eb17225e0ff2d221f69231e72ca9b8a78080301639662a18acf";
- name = "libgravatar-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libgravatar-20.08.0.tar.xz";
+ sha256 = "9faf1ab53cebf2f54fb851ec5bcffc65b18a846a50e3d890b66b947ab93d6397";
+ name = "libgravatar-20.08.0.tar.xz";
};
};
libkcddb = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz";
- sha256 = "d205d3a458c0d54d7118e36006710fe2d2993de5b417c9d8936762fa710634b4";
- name = "libkcddb-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkcddb-20.08.0.tar.xz";
+ sha256 = "516723e29ae37c84865eaf86f82481c4275ea8507e172fc8a0279572705fbc6a";
+ name = "libkcddb-20.08.0.tar.xz";
};
};
libkcompactdisc = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz";
- sha256 = "5bc98eba521f66cb52645786cf875037397e4dbd3ec4c9a23687d936d1505d24";
- name = "libkcompactdisc-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkcompactdisc-20.08.0.tar.xz";
+ sha256 = "043a0ca6dd5d85b4313495d0ae530fe96448da2f472a8af2a633d646be0c065c";
+ name = "libkcompactdisc-20.08.0.tar.xz";
};
};
libkdcraw = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz";
- sha256 = "e37e9210a250955d1fe63d2d96571d0630572633e567eb047af9f24db2b86cb5";
- name = "libkdcraw-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkdcraw-20.08.0.tar.xz";
+ sha256 = "8e2e1577a751eb0c570e5f6ad394d459ef3d127ee8950eee25a4ebf62a2eece7";
+ name = "libkdcraw-20.08.0.tar.xz";
};
};
libkdegames = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz";
- sha256 = "fda965e2ff166abe89cf008a5160262f061a6c3aeda4a71a834b5ed66ea6d0be";
- name = "libkdegames-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkdegames-20.08.0.tar.xz";
+ sha256 = "d77f5e2d913c68286014fe1438b9909826931aaa944a0ce1753d1a449766d99c";
+ name = "libkdegames-20.08.0.tar.xz";
};
};
libkdepim = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz";
- sha256 = "f4ecc6d33aace0a0025afe390a113f79bb052b816c567ea31996aaf08fe873ea";
- name = "libkdepim-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkdepim-20.08.0.tar.xz";
+ sha256 = "4f5f0688529d13c10c1c3509f64874a069a5d6cae84f81b258b1d081e86771e0";
+ name = "libkdepim-20.08.0.tar.xz";
};
};
libkeduvocdocument = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz";
- sha256 = "a53e17a84420fca8f9572d8439da2c63d1241a607952454003a4020104a25558";
- name = "libkeduvocdocument-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkeduvocdocument-20.08.0.tar.xz";
+ sha256 = "21ee64628a012478eb8c53ce2374a57d587f6160f32f09231c78e9fac7600d5d";
+ name = "libkeduvocdocument-20.08.0.tar.xz";
};
};
libkexiv2 = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz";
- sha256 = "12fa569aca07269e880bd976a6cc37b4f585fe2aac8837d437bc29999d95f6be";
- name = "libkexiv2-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkexiv2-20.08.0.tar.xz";
+ sha256 = "d4e3fcdaf160c70165b1217931484d544d56ca7630d5f2c85484caebb2afe399";
+ name = "libkexiv2-20.08.0.tar.xz";
};
};
libkgapi = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz";
- sha256 = "9b689d8c4a1df0b792604cf5951b30d8343e984d890f4a3fb946a449723e520d";
- name = "libkgapi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkgapi-20.08.0.tar.xz";
+ sha256 = "215d21a89887522bbac09774723098dac1602bfc39e4ca23306d08b11d0cd89d";
+ name = "libkgapi-20.08.0.tar.xz";
};
};
libkgeomap = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz";
- sha256 = "34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d";
- name = "libkgeomap-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkgeomap-20.08.0.tar.xz";
+ sha256 = "bf39da71ec7cc40e536bf071abda61569acec4ae027d896738ae1ace74eaddf7";
+ name = "libkgeomap-20.08.0.tar.xz";
};
};
libkipi = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz";
- sha256 = "4a72f0d1423a6a6f7017bf0598c99261575feb4d9af73520074f6f0b7f9e4c25";
- name = "libkipi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkipi-20.08.0.tar.xz";
+ sha256 = "2a66512b9c840e7e19f943066197a4ef68aea8cd059427732dec9cf5de84294e";
+ name = "libkipi-20.08.0.tar.xz";
};
};
libkleo = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz";
- sha256 = "ef2a37a1c8793e4c89dcf49bc330044a617b4b04472679b179992b188e412c50";
- name = "libkleo-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkleo-20.08.0.tar.xz";
+ sha256 = "44100f7a001ca7eb8cc4b2b9eeab5e8806a5d4eb2a01a69eeaf1843f4e023f85";
+ name = "libkleo-20.08.0.tar.xz";
};
};
libkmahjongg = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz";
- sha256 = "24fcff9d91c5143c7275c5c97c2be32e85f5c788749df3acc841fd28bee450a0";
- name = "libkmahjongg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkmahjongg-20.08.0.tar.xz";
+ sha256 = "1792a04f59fe188a7707c0f77e9ef598e9dfb6444c7aba574a4a46760aeaf63a";
+ name = "libkmahjongg-20.08.0.tar.xz";
};
};
libkomparediff2 = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz";
- sha256 = "e27a5fd3dd80a9c7c052ec3c824acc529073464788d1c6950d4d2c407b74c0b0";
- name = "libkomparediff2-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libkomparediff2-20.08.0.tar.xz";
+ sha256 = "0571d016675496341d6e841d88b2ff8682b2958d91a38a69a6130a0766ff6a1b";
+ name = "libkomparediff2-20.08.0.tar.xz";
};
};
libksane = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz";
- sha256 = "34827bcc5b9277292dd4434f2bf7610a28d54c86565f0410d4470c61f374c46e";
- name = "libksane-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libksane-20.08.0.tar.xz";
+ sha256 = "536e0f914095ddfeee132e227d9d2a840186da512b82d95fc9a7262a3a912ea6";
+ name = "libksane-20.08.0.tar.xz";
};
};
libksieve = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz";
- sha256 = "8aacc0c41ac2b7bf48c8479c8fba581a325828b907053eba6b9b5ff4c63d0529";
- name = "libksieve-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/libksieve-20.08.0.tar.xz";
+ sha256 = "af6b4a1b787efdf20792a8ded6ae4d8f49d4cef129b4b3fd7048441bb879b586";
+ name = "libksieve-20.08.0.tar.xz";
};
};
lokalize = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz";
- sha256 = "fccba64af9faa5cbb5dfdb303009504993fe71282f0dbc9c748c5a28a327c379";
- name = "lokalize-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/lokalize-20.08.0.tar.xz";
+ sha256 = "dd05509386b816aeb02797769c28e12cf8b3f38d88f722a699a77db94c9ab71e";
+ name = "lokalize-20.08.0.tar.xz";
};
};
lskat = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz";
- sha256 = "b7e33cc8097ee4bf4e5182a2a5db1e142c65b119424079f5e7f179720092815b";
- name = "lskat-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/lskat-20.08.0.tar.xz";
+ sha256 = "9a6af851f0fb0b7e6f6d1983bf3c7f12a74022977e879a525424d2867762b471";
+ name = "lskat-20.08.0.tar.xz";
};
};
mailcommon = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz";
- sha256 = "80b6285c8152a64362f5f406b4a766b0937ff29acf87133b0326b6e7ce66809f";
- name = "mailcommon-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/mailcommon-20.08.0.tar.xz";
+ sha256 = "fa110a41d5e4848d203d3c17fe18c584d892bf78f750c36a5e88a80c80dcd04a";
+ name = "mailcommon-20.08.0.tar.xz";
};
};
mailimporter = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz";
- sha256 = "13a95ee3d89d658222dcdc905311c72b1ba04e6b8aac863dee767a4d72d3d54e";
- name = "mailimporter-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/mailimporter-20.08.0.tar.xz";
+ sha256 = "5263fdc50b772458cb584f799f80da765e0ac3c4f2e0fecee15305db829cd851";
+ name = "mailimporter-20.08.0.tar.xz";
};
};
marble = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz";
- sha256 = "9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b";
- name = "marble-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/marble-20.08.0.tar.xz";
+ sha256 = "0f61c29acc3f88a0eeb0e0923f8c5138188712aad6aa4d9445add186d5962381";
+ name = "marble-20.08.0.tar.xz";
};
};
mbox-importer = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz";
- sha256 = "ce208091272052a909521cda31a74b2f4c8e8fabcb2937c24639673d1f43981d";
- name = "mbox-importer-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/mbox-importer-20.08.0.tar.xz";
+ sha256 = "075afd543bec9c8c2d056b96704fbfd2fbc4498b289596d4fbb0cd49ff5c720b";
+ name = "mbox-importer-20.08.0.tar.xz";
};
};
messagelib = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz";
- sha256 = "aa2c254f50ed4664b67df5857bba063d1400fe280f3a58658cfa59d3155b2adf";
- name = "messagelib-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/messagelib-20.08.0.tar.xz";
+ sha256 = "13aa522b8ff8cf2d7ac7ca6ae4c92e1bd2379d13fc23cabaa36fd6d6bda261cd";
+ name = "messagelib-20.08.0.tar.xz";
};
};
minuet = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz";
- sha256 = "9afb598280a9b90013833005299fb0c33c3c7cc02b687f65616e04dc12e21d41";
- name = "minuet-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/minuet-20.08.0.tar.xz";
+ sha256 = "f3e57e225ec6a0515d39bf868cdd934a6823071527f6da9910b839abc96c8fdb";
+ name = "minuet-20.08.0.tar.xz";
};
};
okular = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz";
- sha256 = "60865a5d09f41d30572b72224fb61baf9dde18cf6e246565d852e672e7bc4cfe";
- name = "okular-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/okular-20.08.0.tar.xz";
+ sha256 = "8d775292cc6b2cb703e5ff716337a49352cd6d3faa90d6d7ac2f4e9d006a4047";
+ name = "okular-20.08.0.tar.xz";
};
};
palapeli = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz";
- sha256 = "8ae05cce4a1ccb5226c9895195c47825054363a127905dacd5b25fc2a4df3828";
- name = "palapeli-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/palapeli-20.08.0.tar.xz";
+ sha256 = "bbbf4d6c0a2048e2bb5e2483acf1970748d9f109e25f3c5cbf6f04709a61aeab";
+ name = "palapeli-20.08.0.tar.xz";
};
};
parley = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz";
- sha256 = "b5e74fbd458824d26c0ea7cb8ed5510e3f6e849c9dbda4bc7804b9b95a64da03";
- name = "parley-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/parley-20.08.0.tar.xz";
+ sha256 = "b1c8d5f39a563ddcc6a00a7e1008608bd58bdcdfc23c11c822b15625f5a48d60";
+ name = "parley-20.08.0.tar.xz";
};
};
picmi = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz";
- sha256 = "57406f820d58132602b3e6524bad2d7aba3466f7c1a78a623077e7df5faf6838";
- name = "picmi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/picmi-20.08.0.tar.xz";
+ sha256 = "5003bcf33c08eebe24fb689790aef56eb418990a7c6588e2bd1c94ec6f398a5a";
+ name = "picmi-20.08.0.tar.xz";
};
};
pimcommon = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz";
- sha256 = "a5d295f7174cafeb27bc1aed03a715525b132f9dca734a183dd705a2c7ffa40b";
- name = "pimcommon-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/pimcommon-20.08.0.tar.xz";
+ sha256 = "4280d7116d392dff4febbadbca6fa20c38b787da7af537ce4e64af28509bd82e";
+ name = "pimcommon-20.08.0.tar.xz";
};
};
pim-data-exporter = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz";
- sha256 = "742727f09c984ff86f0406fa756b8ab50e695d6bd8a10abd7d55950c1c2c10de";
- name = "pim-data-exporter-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/pim-data-exporter-20.08.0.tar.xz";
+ sha256 = "42f070d3aea3871004bea3fa712f01ef307ba12328495ded06d3115e7e8ed894";
+ name = "pim-data-exporter-20.08.0.tar.xz";
};
};
pim-sieve-editor = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz";
- sha256 = "e59c4eee3f7548fc724f7b79cbff2f90c10be92eb0cab7259dd57fd221f2b7dc";
- name = "pim-sieve-editor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/pim-sieve-editor-20.08.0.tar.xz";
+ sha256 = "65167f716ce2cc70a4ccbf7f9a5b2a873f36df54984dcc46af1d5694973e709a";
+ name = "pim-sieve-editor-20.08.0.tar.xz";
};
};
poxml = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz";
- sha256 = "a070eb5c12e14df691648a9a3e482c021c484f59dfaac413eeacc002cdc1833a";
- name = "poxml-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/poxml-20.08.0.tar.xz";
+ sha256 = "07f5e8f0b215d864d48523c9a1b689f7434dfc0a561d5cf253ad69698770e096";
+ name = "poxml-20.08.0.tar.xz";
};
};
print-manager = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz";
- sha256 = "9d877925cafdf7dfa0dcce5694f849b13ca8bb7c4552a800eebd26a3fc42d376";
- name = "print-manager-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/print-manager-20.08.0.tar.xz";
+ sha256 = "6fe74bc4555f92b7d372d01878cbf25b4339f3f0047b52bd0c92571a2b835271";
+ name = "print-manager-20.08.0.tar.xz";
};
};
rocs = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz";
- sha256 = "1620ff8360568ab4201d526ea4489bd672f6715b6d200251d63ed139dcc58a94";
- name = "rocs-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/rocs-20.08.0.tar.xz";
+ sha256 = "447fecd5e87171cae444e70146b5ce99ac94a558db5f7e1ff9053c31953ba48e";
+ name = "rocs-20.08.0.tar.xz";
};
};
signon-kwallet-extension = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz";
- sha256 = "a391ceff9c86f2e3d8a74a26ffb4143d0adffc8669a51a019d39f16a8e207c1c";
- name = "signon-kwallet-extension-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/signon-kwallet-extension-20.08.0.tar.xz";
+ sha256 = "ec65a9b05dd014ec541ba87e39b6ae8a7af8bf4017f58c7b566960e452f99493";
+ name = "signon-kwallet-extension-20.08.0.tar.xz";
};
};
spectacle = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz";
- sha256 = "71e852aceaac1dc76cd9aa4aa8284ced1c149d7374d9e06f996f4259a72ccbd6";
- name = "spectacle-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/spectacle-20.08.0.tar.xz";
+ sha256 = "8712c8fc19bc2cc39c5e51cf62dedfba423ad53225b629d667d7ffb8d3900692";
+ name = "spectacle-20.08.0.tar.xz";
};
};
step = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/step-20.04.3.tar.xz";
- sha256 = "89d7e29b6e5f888886022701cbfd628c322daa3da43dda4c3fd90d1a137aa29d";
- name = "step-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/step-20.08.0.tar.xz";
+ sha256 = "8415f807de351b85bc3c4feb9ac45b01300210b9517987c617cd49ba6d472418";
+ name = "step-20.08.0.tar.xz";
};
};
svgpart = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz";
- sha256 = "2ffb67858ac5c01f5bb5d4728526786c5b6b6a8b70d688123c52efa084fae1b4";
- name = "svgpart-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/svgpart-20.08.0.tar.xz";
+ sha256 = "3ebb9140ac13c7ece171622ead8c7fd1b1128cccde9635cbc912ca7f8da767a7";
+ name = "svgpart-20.08.0.tar.xz";
};
};
sweeper = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz";
- sha256 = "16b247b9e3f3d3497f31f9dcb91ff06725a07f0f56a934fdf1ecf1af1ab1b426";
- name = "sweeper-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/sweeper-20.08.0.tar.xz";
+ sha256 = "b0d7b983a5bb8ceb2454863181c6a2d55c42114f58f66241f46c3365d90a52ec";
+ name = "sweeper-20.08.0.tar.xz";
};
};
umbrello = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz";
- sha256 = "c34a5f6ca945dd409921903abd2e0078b6a056a0d221d59674980ce424cf1e62";
- name = "umbrello-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/umbrello-20.08.0.tar.xz";
+ sha256 = "49e9f7e0748b8f103f72bbc3fbe0ab7b3605646b5024512118dd9beafd64a041";
+ name = "umbrello-20.08.0.tar.xz";
};
};
yakuake = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz";
- sha256 = "62466165becc848d05461f7b12b67615a517d2919b6fccd8441dfeed9a0a04fa";
- name = "yakuake-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/yakuake-20.08.0.tar.xz";
+ sha256 = "1c13334e0e4c1a6a3f8e11ed6cd05b2cecdd0eb29201c41bd26ca62e22cc084a";
+ name = "yakuake-20.08.0.tar.xz";
};
};
zeroconf-ioslave = {
- version = "20.04.3";
+ version = "20.08.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz";
- sha256 = "3b2ac8833499a53a78547ae34be4a29a6cb79d54601a8c638b225f1c2059d9f0";
- name = "zeroconf-ioslave-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.0/src/zeroconf-ioslave-20.08.0.tar.xz";
+ sha256 = "78bdd0b377132abf30f1ed40c15eae3f0726d7075b311c3b23c71ad59725dc22";
+ name = "zeroconf-ioslave-20.08.0.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 4d078f39224..ac296c1224a 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, wrapQtAppsHook
, python3
-, python3Packages
, zbar
, secp256k1
, enableQt ? true
@@ -22,6 +21,20 @@
let
version = "4.0.2";
+ # electrum is not compatible with dnspython 2.0.0 yet
+ # use the latest 1.x release instead
+ py = python3.override {
+ packageOverrides = self: super: {
+ dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec {
+ version = "1.16.0";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
+ };
+ });
+ };
+ };
+
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
else if stdenv.isDarwin then "libsecp256k1.0.dylib"
@@ -45,7 +58,7 @@ let
};
in
-python3Packages.buildPythonApplication {
+py.pkgs.buildPythonApplication {
pname = "electrum";
inherit version;
@@ -61,7 +74,7 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = with py.pkgs; [
aiohttp
aiohttp-socks
aiorpcx
@@ -116,7 +129,7 @@ python3Packages.buildPythonApplication {
wrapQtApp $out/bin/electrum
'';
- checkInputs = with python3Packages; [ pytest ];
+ checkInputs = with py.pkgs; [ pytest ];
checkPhase = ''
py.test electrum/tests
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 816b352460b..578c56a748a 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -23,6 +23,8 @@ in mkDerivation rec {
propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];
+ NIX_LDFLAGS = "-ltag";
+
meta = with lib; {
description = "A powerful batch renamer for KDE";
homepage = "https://kde.org/applications/utilities/krename/";
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/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix
index bb85c84f7ee..dc03b9b4f93 100644
--- a/pkgs/applications/misc/obinskit/default.nix
+++ b/pkgs/applications/misc/obinskit/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchurl
, libxkbcommon
, systemd
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/opt/obinskit/resources/app.asar \
- --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 77c1f67ecf0..ccb7f3e47c8 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -35,13 +35,13 @@
buildPythonApplication rec {
pname = "orca";
- version = "3.36.4";
+ version = "3.36.5";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz";
+ sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x";
};
patches = [
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index d763bd6d6b0..05cf15b8acc 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -4,6 +4,7 @@
, fetchurl
, makeDesktopItem
, makeWrapper
+, lib
, stdenv
, udev
, wrapGAppsHook
@@ -82,7 +83,7 @@ let
'';
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
];
postFixup = ''
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7016887e99d..d0937a9c6d4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -197,7 +197,7 @@ let
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 618a6fc519d..e8e5109351e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
{
- version = "79.0";
+ version = "80.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885";
+ sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157";
+ sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05";
+ sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80";
+ sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36";
+ sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492";
+ sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561";
+ sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b";
+ sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40";
+ sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125";
+ sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067";
+ sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d";
+ sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc";
+ sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155";
+ sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f";
+ sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42";
+ sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1";
+ sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b";
+ sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c";
+ sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a";
+ sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b";
+ sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49";
+ sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85";
+ sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd";
+ sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e";
+ sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c";
+ sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657";
+ sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41";
+ sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e";
+ sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f";
+ sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c";
+ sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead";
+ sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0";
+ sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400";
+ sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c";
+ sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2";
+ sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a";
+ sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36";
+ sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef";
+ sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c";
+ sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54";
+ sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99";
+ sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48";
+ sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db";
+ sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b";
+ sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3";
+ sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3";
+ sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac";
+ sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3";
+ sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f";
+ sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4";
+ sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7";
+ sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984";
+ sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60";
+ sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0";
+ sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e";
+ sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029";
+ sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905";
+ sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4";
+ sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7";
+ sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59";
+ sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35";
+ sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737";
+ sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9";
+ sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3";
+ sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951";
+ sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e";
+ sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564";
+ sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e";
+ sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a";
+ sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430";
+ sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba";
+ sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38";
+ sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79";
+ sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb";
+ sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313";
+ sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38";
+ sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa";
+ sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75";
+ sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7";
+ sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f";
+ sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1";
+ sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1";
+ sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74";
+ sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e";
+ sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218";
+ sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018";
+ sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38";
+ sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3";
+ sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9";
+ sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f";
+ sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f";
+ sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0";
+ sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb";
+ sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834";
+ sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38";
+ sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33";
+ sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594";
+ sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5";
+ sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92";
+ sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea";
+ sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c";
+ sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a";
+ sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518";
+ sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa";
+ sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33";
+ sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3";
+ sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3";
+ sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734";
+ sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e";
+ sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683";
+ sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235";
+ sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b";
+ sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6";
+ sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947";
+ sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f";
+ sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780";
+ sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6";
+ sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15";
+ sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e";
+ sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4";
+ sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8";
+ sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000";
+ sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a";
+ sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840";
+ sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa";
+ sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f";
+ sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d";
+ sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49";
+ sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249";
+ sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5";
+ sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265";
+ sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc";
+ sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143";
+ sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585";
+ sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd";
+ sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97";
+ sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741";
+ sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6";
+ sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62";
+ sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc";
+ sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721";
+ sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095";
+ sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c";
+ sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5";
+ sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840";
+ sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165";
+ sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a";
+ sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579";
+ sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995";
+ sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49";
+ sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c";
+ sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05";
+ sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8";
+ sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35";
+ sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc";
+ sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba";
+ sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24";
+ sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917";
+ sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a";
+ sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7";
+ sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8";
+ sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9";
+ sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c";
+ sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335";
+ sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884";
+ sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1";
+ sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689";
+ sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc";
+ sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3";
+ sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab";
+ sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7";
+ sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7";
+ sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9";
+ sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b";
+ sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee";
+ sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481";
+ sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a";
+ sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d";
+ sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7";
+ sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b";
+ sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e";
+ sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0";
+ sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304";
+ sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182";
+ sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7";
+ sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee";
+ sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a";
+ sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f";
+ sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e";
+ sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad";
+ sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1";
+ sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 2fc15a42a8b..1f1831d3c91 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -141,6 +141,14 @@ stdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
+ '' + lib.optionalString (lib.versionAtLeast ffversion "80") ''
+ substituteInPlace dom/system/IOUtils.h \
+ --replace '#include "nspr/prio.h"' '#include "prio.h"'
+
+ substituteInPlace dom/system/IOUtils.cpp \
+ --replace '#include "nspr/prio.h"' '#include "prio.h"' \
+ --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \
+ --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"'
'';
nativeBuildInputs =
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 62181321cac..ce9365f72fe 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "79.0";
+ ffversion = "80.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r";
+ sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc";
};
patches = [
@@ -35,10 +35,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
- ffversion = "78.1.0esr";
+ ffversion = "78.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa";
+ sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q";
};
patches = [
@@ -63,10 +63,10 @@ rec {
firefox-esr-68 = (common rec {
pname = "firefox-esr";
- ffversion = "68.11.0esr";
+ ffversion = "68.12.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx";
+ sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index f2bf39b548b..eefe7af26a1 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -104,7 +104,7 @@ in stdenv.mkDerivation rec {
# This is a little tricky. Without it the app starts then crashes. Then it
# brings up the crash report, which also crashes. `strace -f` hints at a
# missing libudev.so.0.
- systemd.lib
+ (lib.getLib systemd)
];
installPhase = ''
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/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index 567a75a31ab..f9a2693f243 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -197,7 +197,7 @@ let
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index f69082bff3a..98b71cfe112 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -1,15 +1,22 @@
-{ lib, python3Packages }:
+{ lib, python3 }:
-python3Packages.buildPythonApplication rec {
+let
+ python = python3.override {
+ self = python;
+ packageOverrides = self: super: {
+ tornado = super.tornado_5;
+ };
+ };
+in with python.pkgs; buildPythonApplication rec {
pname = "luigi";
version = "3.0.1";
- src = python3Packages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i";
};
- propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
+ propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ];
# Requires tox, hadoop, and google cloud
doCheck = false;
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 0143e401c19..f8bcdc4bef7 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchurl
, rpmextract
, libnotify
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
expat
gdk-pixbuf
dbus
- udev.lib
+ (lib.getLib udev)
freetype
nspr
glib
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index d1206cdf9b2..3f05e3d7a5d 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, makeWrapper
, wrapGAppsHook
, autoPatchelfHook
@@ -64,7 +65,7 @@ stdenv.mkDerivation {
expat
stdenv.cc.cc
];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src .";
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 6bf3efa5364..e6f80de821f 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
+{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook
}:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src .";
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index c210211df6b..69a95b3459b 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
];
runtimeDependencies = [
- systemd.lib
+ (lib.getLib systemd)
libnotify
libdbusmenu
];
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index e3b664e5fc2..d58e27cc62b 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
runtimeDependencies = [
- systemd.lib
+ (lib.getLib systemd)
pulseaudio
];
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index bece4e467a3..2910c389daa 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpmextract, autoPatchelfHook
+{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
, wrapGAppsHook }:
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
]) ++ [
gtk3 nss alsaLib
];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = ''
rpmextract $src
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 1cd2df4c7ac..bdc8aabf61c 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
alsaLib gtk3 nss
];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (getLib udev) libnotify ];
installPhase = ''
mkdir -p $out/bin $out/opt/wavebox
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 532eeb1d038..48eb1ef202c 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -5,6 +5,7 @@
, makeDesktopItem
, makeWrapper
, stdenv
+, lib
, udev
, wrapGAppsHook
, cpio
@@ -107,7 +108,7 @@ let
'';
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
];
postFixup = ''
diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix
index 3bb68d7805c..6c6bf6f93db 100644
--- a/pkgs/applications/networking/mailreaders/mailspring/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchurl
, autoPatchelfHook
, alsaLib
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
runtimeDependencies = [
coreutils
openssl
- udev.lib
+ (lib.getLib udev)
];
unpackPhase = ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix
index e0f75692d26..c48a6d1c606 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix
@@ -1,615 +1,615 @@
{
- version = "68.11.0";
+ version = "68.12.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ar/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "878336931005573f76fb15c25fcf2593bfabde16356ec6b1f9b8913663b5fcaa";
+ sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ast/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "5e3f29fb47ccb059d983946d6efec14b8ab00695fdd84a5cc7baa0cc40657cc5";
+ sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/be/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "5cd4c3a3d6ac865b727b58cbb51def60779c0d731a9f6b8f01d4b8cdc90d42b5";
+ sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/bg/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "f359cf1bd12f14bd6636fdb0bd885ed829235559c20c86bd361668f057039f34";
+ sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/br/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "6cfc9608b392b1e604eaefda5a5dcdc346bd88a1bc411532e8864a04631cf6f8";
+ sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ca/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "9068b49e2d8a6f5e82b70ddda1b0a048d094328c96cf21848eefa431d358e6ca";
+ sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cak/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "b3aef7c88302e2b9d0fcff8daa0d8ad4e2893d41e54ec29b746e79d5b03128b2";
+ sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cs/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "a2338c8ac38a4cef41d8fab1e7857c290afa30af0b131a31e675368944d69ba9";
+ sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cy/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "b02118f945ee76653df0364da6b2b8c597fff2bf52f4e20b64f2b8ac69aaf60a";
+ sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/da/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "a565beeaf67c01edf83a2478732fa9e245645d6e6b4fb566affe552762b8bc86";
+ sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/de/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "00a8f51254b2152ba37d964bfaca77cc06b9d778ef750eb6500e01510e298fb4";
+ sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/dsb/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "7cfcafbf7f46a4be23003a59390b0404d04ee344c883c29a18f42accb5fddc4c";
+ sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/el/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "b0d0865f8b64de26af8eeff6eb84f159f585e3f9f7590dab413e04167215dcf3";
+ sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-GB/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "eb6731a9baaa1cd99584aec7c6dcce8f819d41106ac6ed4f42f02f747cb2afe4";
+ sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-US/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "6ddd72732957282280a7209f2d5137229ca8af4ad7f02e112187fe333cc79a7f";
+ sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-AR/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "0d620d929ed41ffd16cfd8297ec70e8cb9105e726af99d2cd207de50920a1f93";
+ sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-ES/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "28bac94492c7444caab029f3cc3995275000496aab854f20368f941514cd7b11";
+ sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/et/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "49fe0adb4fc5c5135083ba53369030faa95d3a530e8eb49180f81e359229bf81";
+ sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/eu/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "a422935f96d5a3033c6c2a7bd39f19e3f84211d99b57d3996b31e404414703e4";
+ sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fi/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "649c3908ecccc8466e555aa76aac47bf7153da8b6f45ddf83f36f6ac676cb4c3";
+ sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "8270cf0e0acfb7280b8616462cd87a1d8d929c7c5fd4839f9607cb588a97c025";
+ sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fy-NL/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "177a9f337719b2902ae964525803cd437b2cbcc8c7b85c7881e14f7e0d207875";
+ sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ga-IE/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "80d3625a04d027382ec3fdfdabd45d501fa4b451c82ec5cfdf5c3352a395a6ba";
+ sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gd/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "0b2fc2582ef518529f204b5096601047b5b3406201b1fc9f7ea88736d1ce1e0a";
+ sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "d1cfc4e646fa6ce03765a56ea4cc2ad3936ec8224f1a7f5e74a34c189be11721";
+ sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/he/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "588f22ff9dd4dea7c808c4786f2c897842dedbf2a04c0b4d28b3aa162f88773c";
+ sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "126ae387a1c97d253c4ca60441a192d6a00f63f0483b2888371624337e4fd2a9";
+ sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hsb/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "456c323f61f77c07ae73a260a3ad2641190f165d14c75da1dba33ed1f8d2a3d5";
+ sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hu/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "4790f014d95fe3ae00433e27fa291f7e4657b8062538ca52c46dd46ea41a05cb";
+ sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hy-AM/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "7d81493a67e27eb485c1cb702cb8305788733e133bcb22659026737cc2afe1e9";
+ sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/id/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "9f558c85ba88c6350da0445ca2d2b63205c8c1e6700388e1d4f7de0978321667";
+ sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/is/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "1f1f65bb573fb4fb563e890c043ff8c3283687575892853dd3e076473072b63f";
+ sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/it/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "de6c3adf83745370241c8935edccc412a60642ec758bd891d03c098b40b8792f";
+ sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ja/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "8b2ce4598af7323f59a31269c24bd05e369d9898266dc6e8cfa360dae7609273";
+ sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ka/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "be74a3edf9a1d931124c4351b51147be2e7a74f453d07482bce4f7721de701ce";
+ sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kab/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "1be81ab7bb429b44e0c63c81ebf249b66a79d43a3dba39ba0af6242db165d6d3";
+ sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kk/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "ee308381b1e0643b7e0683c365c763beb4afcaf21c9b0a1e8c8c2ec3c218c965";
+ sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ko/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "af2d7ee49a6295e41dbfcc7b8e19b8f146890f12baa36ffddbc7dfbfa39a8eb3";
+ sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/lt/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "8d384844274d048772fbc35da75f91ab6398ca64e26f089c4da116065584acf1";
+ sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ms/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "6e447b3ed1903a20001963021598d957270c88980ff04d3da6c819ab106a2210";
+ sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nb-NO/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "710a982216120cbec822d7a9f74d8ae789b4a234fb3a192797604c9a47a23a62";
+ sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "2b02b7e3b5e310e5b7935cb72e59d6a385567100d22e87d196c4b4700851d439";
+ sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nn-NO/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "128807f651cc0b09618bad42703970c391c17f5ff883c3ab11d115d0878fe1aa";
+ sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "181721ac04e9911f57ec7b4f36a5db82e261da71a310dc502efab75a101bec03";
+ sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-BR/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "e82f40343e28ecd0abafb71f421c6d7df40b7cfca4898503b32fb0500686d7c4";
+ sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-PT/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "96bea893919ff89441dd47e027a7d83aa691cc99abf4eaa342c941777ecf319a";
+ sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/rm/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "544f666af94043737503a30551ad5832f22ae529bc32495bef9d7443c8869072";
+ sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ro/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "4c6e7793c206999e0a9510b390e4b47d82e19dc2da1cae8b4341b8afee440191";
+ sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ru/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "66e951339323a3a44326cada8c572d7040d33057a3a487d8078eb27efa791eb8";
+ sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/si/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "3ef89e462359d09d95216a132c462f0529948073a4f0aef6358362d0457e747e";
+ sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sk/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "476641e4d45cd114dca94f59ddee15fda5fbd432c50e4f29af09eb3298782854";
+ sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "5e85ff37554f47f585a155db65ae9e782c8604fa44db8d0dc9c3e2741704909d";
+ sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sq/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "fc4f839973d6986979089c1dcc1e9b219007c34ecd2d587538db706e4b01eccd";
+ sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "85a32f352d2b535366dd10a49116e65de4c8ec87886b37e34ac55082c4c310fd";
+ sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sv-SE/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "19af3a847c9e28baed2db8f6b025dcfb0e688932b0483bae461c86861bfa67ea";
+ sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/tr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "deea2513814df3e7a9004316dc50f6fa2bac46e0d9456cf124e33e6e03a9b4c8";
+ sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uk/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "22b34b43ccc74eb2dc565a0c63bde89ff0d22f710bd26868341be91f51489f94";
+ sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uz/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "26bb8336c617dc6fe485339b3c8da814f7aa0b46eb0a821db36309305ea87e58";
+ sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/vi/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "88705691ae084991c198865f1e93d1ed127496245313cb8f28dafac0a64793a5";
+ sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-CN/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "5ebf1ad54acb6d6d17985d80bff9a0b39726d1f62eea30ad9ca0f04577f640a1";
+ sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-TW/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "b795b0127cf922f65a2ad2d8f17ebe64089c6d06fe7a701c289b7af5afe7c371";
+ sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ar/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "d19d082b55d76862977b9357e9cf245697c24d207a6d6b3aacd81abf1443747b";
+ sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ast/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "6cd6c484888fe96fb08eab2b6b2a4dc8495823efee6a373536c26e9679fc664e";
+ sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/be/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "bdd2ac4571d6444ff9a3ffd72c1b55cf5f564c740b5ceafce7a2e2268f482dda";
+ sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/bg/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "3354c7e4b505e99a53a10cdbeac5b6425b13182def27a82c839eaee6ba6e2f86";
+ sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/br/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "27339c12c5cdabea7a9a057cad70fa02cf4f69860e71b604f81a60f891345268";
+ sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ca/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "b65b6d20d7251795e0a9f0ce88f8133d7742c6361375e4897a0bb2e043dd8c97";
+ sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cak/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "173a85565dfb7b9d44b5757245f8b5f8a62fd15a8a15bfee0680a96ef8f84625";
+ sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cs/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "9cb5def4eca0bb103516a66f90baf91f7b4e962d5ed59b4f09ae9f19e7f95b47";
+ sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cy/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "8b51e01daf38091d3b1b32a249f3c6fb220ad8075bbfd16914cb72b24435d8bb";
+ sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/da/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "1269600ab71c691563482c6d5787a7670fdceeda3a07c61d7cf2477aa16fe075";
+ sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/de/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "46c5fcae1b11b7e31fff2e70397a560c502bb3360ed646dd09945fcee81efad7";
+ sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/dsb/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "4dc661243d99edb84d0bafd45300bf18d86d5289ede3db066ff89cc4094afed1";
+ sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/el/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "efd5f7f46d53bf34146a6f39149abb2aed9c47b735339cf767e32e6387ba50bb";
+ sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-GB/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "ce97a84ba103a7e5bedba43ee47a5c603c1b5d9bf3bc1a8cab4c26ec9ace21c7";
+ sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-US/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "632f078407322995eef93db134f1da753a1b35696a668a5b8be29f908a34c223";
+ sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-AR/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "88b67f07b6069adcb82c04f818493e25bd145b5d874a7503453e88ea14200499";
+ sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-ES/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "a52a6917d77364e5f7ed06f4484abf7e607c53445ff338e65af6b9bad4626e0d";
+ sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/et/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "a0c15f0000a00984760419e6f737840b4637bf5aa014ee88093aa2a7a3258807";
+ sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/eu/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "d69e9af1a381743acc9ee1f800999b015129cba4fc112f312a04884c121535b0";
+ sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fi/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "876673de48a047d75e0ac766dca338629069af1872308a7bc6a7e068da026d3a";
+ sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "d83d87dca716d4cd3850df1c5923e88f15e35354abc874202c8c12bf8d1a006f";
+ sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fy-NL/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "0cce3392aaace190f9ea0247d89699f73d534762278f4776146a1f75bbc09996";
+ sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ga-IE/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "83b7e660e8098718bd4b205ad2de53522bd94e7a602afb960b6381fe4c11a395";
+ sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gd/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "447a887ef76e57b9c12a0991d7eaf903ce29d7621d4f9143edd18b56bdab81d3";
+ sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "288b865596e2b8b1087cbca98bd9c55f9aff1f1cb8d432953d20854b0b1e9ab8";
+ sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/he/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "9d801a18324849e4a6faf3266c09eb5898c8122e89b020e35ea25a6b3899a4d2";
+ sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "f20210372b36b43cdae8f7f1294927dfb364d1ca4db21ee8af1c059a06f3e45e";
+ sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hsb/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "54daf67c97f2e7496fabe6bef2d1d9a60baccfee35d7331444d48fc6fe675c26";
+ sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hu/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "0791aa7bec49ff1bfe862f9114ed4b0013361f2f1fa0e4745ad49c8c0e0a9f84";
+ sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hy-AM/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "e64bacff30d0b2b2a5038aa11d719c9ef3124d64b9923d52a9c5856f6584f9c2";
+ sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/id/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ba6108ba9b4f31f49e7c925a6051738276c67545f7f8d2b3cb378e8834dbd0ce";
+ sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/is/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "a3eac36b640a61f2fc6bd62350bd8aaf020636035547c2b9d687df2bd2d7174b";
+ sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/it/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "bf3cc19a7d1c1415cad867b72c5765dfced27511616a8cbd230516adf8d3f20a";
+ sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ja/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "d4788294f5e91c033c3c3251cfb614e50843631252a2b1fcc6389d099b1fee1e";
+ sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ka/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "8735be035cf0ab5d4b2102aab8b207c1cc686da8843b45f15c1be91931850968";
+ sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kab/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "a570fd29e5eacdc08ed484bce7336f90ae74744e80d8f2ac0f05395cb3363e51";
+ sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kk/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "186b7457a96a64da0564c1b411bb04598de1067362a6238f7327abe780cc6aa3";
+ sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ko/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "3c9513362c6b7a64bf6e74bbfad6ef586b0085baeb9a8ad8eb2fbc73461e9f67";
+ sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/lt/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "e90df1606ec0e875fa02f7bf5a52b14d84f758bdc18ab0f395703c0129a18e57";
+ sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ms/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "ea686adcfb5cf4b1642e7dcb21053090ffb57d344b27269d807cebcf8469934c";
+ sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nb-NO/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "6f827fee307917b590b99b5c85b16337865f027059f52bc9ab12da33f80448b9";
+ sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "b88843831b982d1317e8bf64df99a8c7a1fa9f67461aa966b2737f12715c9cf3";
+ sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nn-NO/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "ab8383a432f55944d417108b59d891953f2d322ec81d09e971ec63d1883d4b46";
+ sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "0f8c0feb68b090598a3db9295d4b4e09d9ffdedb69a73914228d7ef76b768414";
+ sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-BR/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "ca78fad9dce15534754571b14d82ede798b123210599ade352016420faf0db5a";
+ sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-PT/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "cf79430e02259d9117feeaebb5fe02139c3e3d95013e48fe290550814200cf6e";
+ sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/rm/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "cc7d9614130f24969356b3496f4d322a9f73cafa5c7b60302ca8f2e2efe1f6ec";
+ sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ro/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "a8fcc2c6e0755fe701a56c2fa3bbf2d288d6351179ee74b8aa3da3180f14cdd1";
+ sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ru/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "b9f68985e70f8aa47c36cd4a4fc0fb41918d43f089cc760ace8ec879e2561770";
+ sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/si/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "a2563b3c9d0ecb567c366aa41cb6a10bde8d09b8c1065cd3934c8c221afee056";
+ sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sk/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "566906f011283fd27abf55e1e9a1bf7504e4028f7c4a631716ba590c07fe9d91";
+ sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sl/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "8b74b751b3ee706be9aeb06726ffd3a989a57a1dc9794112262fa2aac45498ad";
+ sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sq/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "9f7bcc51d4bb3f7c8d6ae49c61b88c17a7a59f6de8d2f62e0ee3fb3a68d30791";
+ sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "809c22c379c0c9943acb23de8b7023843ad6ecfedb9cf89006d6889ac1214203";
+ sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sv-SE/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "9381345ab9229f4b8465c183c936c17ab73680fa6aca27535daff9a2f9a133a3";
+ sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/tr/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "0f08bc1e65a8bccf8765cf26af5c09ebf6b77ff463af2f8f133dd2499c1d935c";
+ sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uk/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "37a1fee3bcf2fca901c542295d01a32545e814217985414419a270ad9576c14c";
+ sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uz/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "50668670b10f3171b9033306d43c51ce24f1a48286c4156eff369530ae6d93d1";
+ sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/vi/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "3588d2ed7c67459f5c091a1881821eaba72c9f3307624f7890549fcd1da120f6";
+ sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-CN/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "d8f2976535ef60e62c94338fd049365234a7b2a8658b32df231d1faa22529c0e";
+ sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-TW/thunderbird-68.11.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "aca4a8410429bde9926f6ce6a183439750f490fd68dda229531b2e16bb7068ef";
+ sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 1e238bf8843..86dbf80a6e1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
{
- version = "78.1.1";
+ version = "78.2.1";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/af/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/af/thunderbird-78.2.1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "540aa91a70379c4d6975820649abbe3063515bae031229f01ed7e794cf87395d";
+ sha256 = "de73b113e488e76caca47b90abb4fa3f1c4d6ce04885d036f2e6aed81fe34038";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ar/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ar/thunderbird-78.2.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "18d1b4f33895b5c4b17199ca8412f8060f40660c7e45e024d0dda486ad290044";
+ sha256 = "d6eeb95b1bd8e53663bd48570a0c2a03f570f906ca715ddf1d9f2cb8de37f3b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ast/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ast/thunderbird-78.2.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "dd87c494ef5f142517aeec3d8890bc553664b323f2cadb46bca597101b275c91";
+ sha256 = "f244c41515a2382d15697a47b88781120c649e319d86a1c6350fd20cade25809";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/be/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/be/thunderbird-78.2.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "90e0d5354f41244e2ebaeeeb65959d64fcef52f914a15af7b9808125e6e25639";
+ sha256 = "188c8850324bbc04535d4a1dfe1ef1f2e52de8cc2e1df7432623f6afcf8dbf1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/bg/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/bg/thunderbird-78.2.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "4e8f53fc2e1c3b8dddec3d62bfa104a458943c1b0794fcca3a1658b812359b97";
+ sha256 = "3e7ab29fc795b577aa3bd2ac3df872c31a7ed22960e987d9bca6f348becb69a3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/br/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/br/thunderbird-78.2.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "068c48e37b4d921cb33e2df27b32a8e9abfc29698c30779b1771f2ab61697f27";
+ sha256 = "c1138c59275149aaa6071cf128e7b480b7f74fa0d8f237552a5c54ce1ae573e0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ca/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ca/thunderbird-78.2.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "1f09e12e53d7bc76551c47995b0fa5ff649db94013a66e4ee445e6901352ead6";
+ sha256 = "4d18b0b11710ab3427bf917ebe17cdf5e98508f517cf5cc4c97822d42a019dd1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cak/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cak/thunderbird-78.2.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "e917249cbc16e1ccaf630a5335577e76d971f422fb7c7d9b7c7f05805de18d78";
+ sha256 = "5231c3b6c9b57ab528905184b740dd23de470f8bc4814a13000c8fc1fe4877cc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cs/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cs/thunderbird-78.2.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "89926439c396b64a701d688b2520eb1364e5f2a348a645651396e7f91a4b774a";
+ sha256 = "04d1614000f1854b5d82e0d1740beb43ed9bef440b43f7bedce32cccec48fd59";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cy/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cy/thunderbird-78.2.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "65a124a1840efdc33b0426a0a8ab8426423425326f7905844c74f7503c6e60f4";
+ sha256 = "0ef895fdc1878b77650846d2ea4624a50d06838a3c51a91523019bb4d00a1322";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/da/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/da/thunderbird-78.2.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "a572014192e6ba98994f8693b062400b7909bdcede065dd363a3ab182cf40293";
+ sha256 = "e909f7ba1890cebcac435c2cfaab7db1791785e6b5b1e8b205ee3b9962624c8d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/de/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/de/thunderbird-78.2.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "a0eeef52d89bee326402354eb1de3f531c9c255d31840ed91e93110c9f170aaa";
+ sha256 = "cce1e0acc3c61a66e5eaa065e81e01edb298b6dbf07a2376bf5a96ad2c1e784d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/dsb/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/dsb/thunderbird-78.2.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "35d0295ebd60415457a7defa40c5bdee2dbf40b08dad387aef0557dc511ce489";
+ sha256 = "a5acad173a15e77e21057e7450d997387f88a608dd602df7509fa13743758445";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/el/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/el/thunderbird-78.2.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "135fe2424a1731e24c9602c40e0ae4f8fc551ed058fcd17516ce8f39a7d88bbe";
+ sha256 = "7cb4dd233037415d9de96e0c292bd0a288ea62bc875b79a138aaf9639a8f8896";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-CA/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-CA/thunderbird-78.2.1.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "b5741a82e8d59300c1f2046b4a4deaa2804d90ad8e8cda7cda9a39b7d6293b87";
+ sha256 = "158547432a7f38ab87ac5334b891921ef54f199896fe459cf65c81344d900edc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-GB/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-GB/thunderbird-78.2.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "61b0e85a24f56b1b7ad03e9d8206313d50cfc6480627cd377a4a4b1bfdd9f13a";
+ sha256 = "1f434d2aa74143eb8695fe54f031fdc7270b1dfe7365896b08f9a55c9dcc8197";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-US/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-US/thunderbird-78.2.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "9f0cc0edd2b23bc67824d3e8ed19b8c0a331e69a307b6d48c20e0e29e756e7e7";
+ sha256 = "f5004ba1ac64911aec7dec3ec60a415500adfb0bfd566197f0f4fb139c71ff2a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-AR/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-AR/thunderbird-78.2.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "b0390addfb6133074aab52d1b6b73eccb9fae9031967fc94d57f95be30cce54d";
+ sha256 = "49063e6e19b9c4ee1cd63826fda1c969d9739759a57ffabba5e2f93fc11de06a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-ES/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-ES/thunderbird-78.2.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "4d9f115bba5f9f32247465398e8ccd2f279776fadc3961f79b9fcc923c9cc363";
+ sha256 = "216fe2514dc21190532b19af814b825d8a39c7dfe91a120848491f98c49f8ec4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/et/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/et/thunderbird-78.2.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "6db8f8c69d8452e402724bf3fc6fb42242d2839307f6ad387f813a97286f4773";
+ sha256 = "5a89262ffbdc536abf9d780d5d30ce7d0c626a4cf75bfe957689640f94323a34";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/eu/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/eu/thunderbird-78.2.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "7c8165bc0a0feffd71431f3dd30ce99092a0816581363c2d317c6f40149234e1";
+ sha256 = "f59c050361c617e4b2ca92f8e7081a135e976bb99ea4b650b80064aedef2c698";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fa/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fa/thunderbird-78.2.1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "9537892fa5e9ba5b3f79b96fafef1e8e37c4813f0515f965ce05b410bc7c9448";
+ sha256 = "b9764595b4cb08584ccce801c08fa19dbbced21c3f89045800d83d531b0c825a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fi/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fi/thunderbird-78.2.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "31ca37c4d0f13d1a30b2d7541fa9fbe80add66c6d787bbec069cb904d1157e18";
+ sha256 = "98169b3018a61ae6c2303300c1942c7d1d14a5318147a08a883b5a7b7042eba6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fr/thunderbird-78.2.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "c7507fd9096e9c47632be197054be68631c9d1812b7242b4de06774dbc9c3b1b";
+ sha256 = "49563e87d9543c52d33b7168c78adaab0483f14ceef22759541e927c13620657";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fy-NL/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fy-NL/thunderbird-78.2.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "0a3d9d62861eb11bf409ac20905e787fdb273dd1d74b754f10790ff7deb7160d";
+ sha256 = "1f3444faf91c24f8608ec59a4f705b42c7520079e4ad6756e693e92cdc8b142d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ga-IE/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ga-IE/thunderbird-78.2.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "4bd0b50313e9a85a83d5b5a032710478feb2df52936bcdfd2621cf30a4d02efb";
+ sha256 = "28b27f73016f0a4d53a6c47248c26458ca2bdceb46ae231f16086b8cabed5210";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gd/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gd/thunderbird-78.2.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "a72ed3ea99e863f4a6150cfeeaa0052adf84f8f5ad52388b8bc30bf15d58a310";
+ sha256 = "b81b247ebecd1727d27b64f96ba08b08cf59921e9b2e8ae732407b27e233c971";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gl/thunderbird-78.2.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "5d9bae1205ac9490821b1b6d5b700a540bccbb21a3d41943d7f3ccb8576e2087";
+ sha256 = "ea019d11fed7d87173b218d86fcee0dea7d4e20200bc73171fa8c1bc8f7288fe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/he/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/he/thunderbird-78.2.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "7cd6417391db27934b6945edcdd9d14b46a69052af7bccd5a62fed588c77894a";
+ sha256 = "6308a7e4e2cc35e48bbd67a1a7b8ab37112f47ab228c703a6db681ac7af79cb6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hr/thunderbird-78.2.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "b641cb7393e1e655adff946c82c43edf580e9fe3852b5c0cffe8f6d12759d190";
+ sha256 = "3fb27f1e001817260981567fdb9949ad2f34818e9c919bd16fa0e939cf993cb4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hsb/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hsb/thunderbird-78.2.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "39a27b797117eaed4e939e1c38ade2da13486f9050b5c4d87219cdd46abb67c4";
+ sha256 = "2240e34fd713b39b410b584a8a6d06525f6abe0db2ee7b76b740a7252ec85e36";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hu/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hu/thunderbird-78.2.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "5c9795de2316add4e482f9e074c861ef2e05411ea3792d6256d3c43359dc692f";
+ sha256 = "f303a1f1219c7b23d71471a00174e6084cee3773af72e855faa63a5384b08aee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hy-AM/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hy-AM/thunderbird-78.2.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "be1ba0a8fecf9a577cd63de519f92f48ddaf7c4b68fd629f94bb2ebff3cf16fb";
+ sha256 = "3e74775e459ebdca2661e2e2f55307429dcc4d4a6623bbb8447946a75c94dd20";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/id/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/id/thunderbird-78.2.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "15eb3d6acda87645da2874cc92366fb50e821d7ec7885f87951366ddc66db2a0";
+ sha256 = "0c9baf8cff28193f774e13c3a49cfd0ebcf27d8ef73ade151d2371ea69cbafac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/is/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/is/thunderbird-78.2.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "06549f464526e931f23c0925b402eb3da6fbd9bd16595387604fe7edc62c4672";
+ sha256 = "5c505948333d9259d87aa5f2b53f33ade1bbbfd29b9d5438c2688d34891e29bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/it/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/it/thunderbird-78.2.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "d81344b5dc0e131d1796f63de559a18b59dc70403a957eab737354ab05fd31c4";
+ sha256 = "a99896e8ccf8d01099834ee502601cb9de993fd7101e426cb87c240a744f2f88";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ja/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ja/thunderbird-78.2.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "48bd5534bfebd6c6f976ea4230ac7d364544c1467b2912f0db46fd23944d0908";
+ sha256 = "83be10be5e946b785ac61e9a51c7054357c69af0a8e7bca524e27961dea4eef8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ka/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ka/thunderbird-78.2.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "8f581c4d9f6c2e8f79bf7be92bf06a69d0dfed017346e1c380a31f541c5155fa";
+ sha256 = "585a1d805663225b1c154e27b54aa1aa5d8a1b96576c0f8ea36bde7844921474";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kab/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kab/thunderbird-78.2.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "2cbcf1e64dcb914af8dfa0f8dab462d59d37992b3f4e22159e2edd340cb6e73a";
+ sha256 = "85128be7e4c28a526d0a395e38e86e5e85dc6c154be6b16fb2df6675effe3d0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kk/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kk/thunderbird-78.2.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "1fd067e9751c60dc6c6dcf1e5cfee3650758ae6593cb20fa5e6103cd01e6e6b7";
+ sha256 = "09538c022bbcfcb2a77a7ab11b5569eb56b483817d199cfd0ede68ad556601d0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ko/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ko/thunderbird-78.2.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "efdd154ad42d1b8f257d0cf619afc4bdea44d7014882c82847cb5f21d7037469";
+ sha256 = "3e6f472e69d40d46f388096e1d13bc6735860021fc655e3efd4e5b93b1a83240";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/lt/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/lt/thunderbird-78.2.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "4256ec374ea5a22553469393e7fde51b46cd2ade5a620e9b0fc442e9d524494f";
+ sha256 = "8b85c0874306afd3a39d8cf851d378f5f1bfce74129b16b02230c516001adc92";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ms/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ms/thunderbird-78.2.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "40f6fc9fb01a83288a6952b7a6e625bd00659594f7fa21ee883c16501407b8be";
+ sha256 = "b14e7baa06a2d4f98313a7f363b0d998f902164abad13a992878812cc5a0b6c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nb-NO/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nb-NO/thunderbird-78.2.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "b3f363ccbc5946c6e0e87ca4b75e12e4e4372688ae7a034c9cf37fd401794840";
+ sha256 = "c3718581db153ad8b171b3c454e9d156e3d55ff0969217ac36435d13ac0c7c3a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nl/thunderbird-78.2.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "6963f3f09cf8a3370b06c894aa744c4ddbaa7c11df4e41f540a21427ec391135";
+ sha256 = "802417acdc722e34c21936f840cd347ae86cf5ac8ad2ae05bd1e1ae078c4518c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nn-NO/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nn-NO/thunderbird-78.2.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "da647b3c85db5ebbfbc530dd8d8fb1005928430775cd5c8a2999709614f4e35c";
+ sha256 = "5034f1fe526cab8de8091d5f20851a678e742ed37fa80e8491f3891ed89c43a8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pa-IN/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pa-IN/thunderbird-78.2.1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "9df18348eedd3b43a13ac991b875fe12678929faa58712b09ee7364a8dedbd2e";
+ sha256 = "01ae1e84d990433b7cbb12dc637deec37b32998803cb60f5834d386e080505f7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pl/thunderbird-78.2.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "7f60d5a0a819f6b69cd3f8444c12758f7cee17a681859c03cbea29ec27e1221e";
+ sha256 = "84b877dba77c8be4400f4fc76128a85878781c4d8ff7845d265225211092674e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-BR/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-BR/thunderbird-78.2.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "229073650b742b4566350ce82ea65f93f639a2b502bf706de4038c3c13ead354";
+ sha256 = "4daabc0cad02b878d8e17af4402b6b52fdd7783f89192909a43bed09f8aae196";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-PT/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-PT/thunderbird-78.2.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "f8596511964a688747ce51cf0ca6bb6da65ea78b9b3ef70ced4f69fae8edbeb0";
+ sha256 = "6ce92a7a1ea62398d22ee4e4fbdc383daa5d35d38c83cf1852953757563d17ba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/rm/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/rm/thunderbird-78.2.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "fb101dae4058f2cf804aacaf60c1354415cb0287432bb367a83e2ef8109375ce";
+ sha256 = "d876eb51534d8a5796b486f22f9602bcb9c4cd9c99042583f95c4464f7ee99f8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ro/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ro/thunderbird-78.2.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "1cb1fc985122dea685fc1998764c60979a7c357d5e1e0646b8c4f45e856b4f00";
+ sha256 = "ab4bfaea0914401188d486554963c9ab3014237e7116afdf274dce6e55725cae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ru/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ru/thunderbird-78.2.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "d89b9a418c78422e2a715e7e1c5d2bf57e90c2293ad63dc5e9f2645fdc910103";
+ sha256 = "e722a13113896bde97dd72d0c7182c26734d7d546d8fe210bbce900854ac925c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/si/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/si/thunderbird-78.2.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "584cd0dca877163073824e9dfbee4d6146e0ef8bd0b23cd2325462a1a72a41a4";
+ sha256 = "595588d25de16c3781c85a9ed5e3c767d4df85f0820d4503770468b1669e9411";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sk/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sk/thunderbird-78.2.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "cbb2b5678d11eef244a175d88207e00fc59584afd0b788a82319987368ff19c2";
+ sha256 = "f30929cad216539754842c0d938b4d5b8ec5f4e813b3ff0d5108d9c4a0fc6df2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sl/thunderbird-78.2.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "e8727e9942c4555d6413a3ebe1d4b2ab2ea39da4f5b3b2ad7baaeb8abf49fd47";
+ sha256 = "65d716b3fb5cad93d17704b62fd035a86ef6838cfff6ad95e571cedbb9e0974d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sq/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sq/thunderbird-78.2.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "31141f45121dab9c5ce3f3d6195264df91e61e434ee993c409c3cac164215737";
+ sha256 = "38c652f6aae768ab7a8b0c1e975c676a3724ae22f5f7e3ffc6224ee032a9dc47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sr/thunderbird-78.2.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "dc9a868b1345da0633d090877ae6cddaa3a1b2bb1fc3113bc9de2aac1c30366c";
+ sha256 = "7f73bcc8efb4452fedb0f9707c5e2b1d0db936fda4c6b9582207043aeddf8747";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sv-SE/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sv-SE/thunderbird-78.2.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "fab7e11f8de1fcd2e8719d20e818d8bd2c39f7539328fb79f2cce56d4f312a78";
+ sha256 = "221974d62563b49f6c030b7a1f6307a71e60ce2a0e107b551363621320bba485";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/th/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/th/thunderbird-78.2.1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "fa3173940d4e7109385d65b479297110545cc7e2e76e8a657f376553e370563a";
+ sha256 = "a8641ee0dc5bcd40ec84a4d4640e74e44710b5ac10d629ea0dd42ad2370e8d3b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/tr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/tr/thunderbird-78.2.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "a8cf6b95a6b890892d034c0b014a62f710bbafa34f3282a80e17828ad9365513";
+ sha256 = "1d80d967b5ef98f0e642390c55618d454f2d82acec36bfd56db21e872490ff66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uk/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uk/thunderbird-78.2.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "a5086a87a87ccb605154aad5bc2986d6fe995391189b3e452640210e2016b08f";
+ sha256 = "fcc24a9885db5511c0b2859e6472d436769da2670573177f7bf332fb363a3ee3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uz/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uz/thunderbird-78.2.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "b5bea650b678808b7fbcca432c1de0121dc19886b2f32e764e4fe1a797d1e8ab";
+ sha256 = "b0f62e8fc5c6da398ad2e1a3488ddb37f0075c90ad54e6028293be7cfcd2f6f0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/vi/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/vi/thunderbird-78.2.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "8b8b57417b1d6faeb283b1b6037eac92841029bd73769d5cb8bc6c227e87efbf";
+ sha256 = "0e38a1b645894ff81a481250ed434157fa2b70792b423c31dab61288612a82f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-CN/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-CN/thunderbird-78.2.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "4a0c8629e2a5e5f95799169dba4ee9c10b728bf503e090ed829cdd11fbeb57d1";
+ sha256 = "04f37793bd17df88573d9d3f8c8412c26cfb3332395689a06f5fca6efb02b2ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-TW/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-TW/thunderbird-78.2.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "11a892d8ec3ec6e2dccbad4b97ce2fe7cb0a0b1dc309bef9819432f0be9d510c";
+ sha256 = "6c1e5b71bb2a9e005971050c9643c52090828e1ecb3910d66d2d0dbaa107011c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/af/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/af/thunderbird-78.2.1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "a254eecebf45c16f55b7d72cc38da2c4d22f49704cdb5db72d2adfc199a7a78c";
+ sha256 = "2601d98ad27a2ed7277f673876c2a7d206fe1cfd8c7c8febdead85884031a416";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ar/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ar/thunderbird-78.2.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "3e735d996bb3bf2674f1c04f035489893169ab632208af1427756bc3c15b1600";
+ sha256 = "5d126b1152b42b6bd6c29ac602b59ab88f3491b0b6f2a69aa1e6ae3d9ded04d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ast/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ast/thunderbird-78.2.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "a8fe0f85c250b0f71b0bac30cd51e10e5d1ded4265775afe93f986ccde4fbc49";
+ sha256 = "7b22fbd980df00d6b1a2c0f14d68a3a7daf06dcb6a13033ca2619371b098445c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/be/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/be/thunderbird-78.2.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "279a98d38f6c33945ddd1e86c9263e72f9a52555e7f26c56a2f3062696436bbb";
+ sha256 = "bd59d2a9e70944a736e8e5db100b2cbe937fb8021577fdd912087e2cbe38723f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/bg/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/bg/thunderbird-78.2.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "cb23b56841818af2e3e8dc922cace29c8538d22977ee951dee744bbc490c24a6";
+ sha256 = "ce3906cafce8ce00c4b69f2b1b584f7e4148d2d40ac12916f1108f78d7d3cdae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/br/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/br/thunderbird-78.2.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "f729274b064205cb9baf57be3732268a2c56893ac6b17ae6ddc0aed3269fda15";
+ sha256 = "2f41237e0dd3dff4e0e4b196f8d02b988d7e5db3ac1984ea5577ce5052d43514";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ca/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ca/thunderbird-78.2.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "eb434c12d8d841eb8426b95663591f742a9e62b630cadb7afebfa79ab1142a38";
+ sha256 = "0ec94acd77cca38d37dd23fb240c3c9e3840defccb491704d01072c1cab1f543";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cak/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cak/thunderbird-78.2.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "daa19634d796f849ab9b3a575bc53e451453902f82ce7384a7ae5ae4f99a2165";
+ sha256 = "1c77ebb51a83c57c7d81ef278f9fceae07f98330a8ccf8f863c2f0b613141e23";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cs/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cs/thunderbird-78.2.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "181cc3c70985d41a806395b353ccd98475c37ae8151fd5f59adbe25bf2059457";
+ sha256 = "adf8c11ff60e697fc5087698088c42c95a15766ccebf24d77141a53dc255c366";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cy/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cy/thunderbird-78.2.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "4cb93a1b38582e6fd4e4fc514c36e469b88bedf0bd36bee4d7a66d9c33c3c8ca";
+ sha256 = "9b7c51652714c116c9bb22fab4f0fc6dcbce6ad2133cc860067898841d01b5b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/da/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/da/thunderbird-78.2.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "6eb46018b763d22e62739ec9dd98d5f3804f85b5b65ca3092c42d5d9a1a258ee";
+ sha256 = "e7245ea0909efccaa9b94701061410437f16273c935484dd3638f5f4fa65aad9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/de/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/de/thunderbird-78.2.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "dff12cffa89c1ad5666b92b66361e17c604f0ca34305fb0e3b06be5fa8fb0f96";
+ sha256 = "302394d24f919b0a24dc574001458b265bfc90024bf21b3d98a43b31ae50adf7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/dsb/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/dsb/thunderbird-78.2.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "efa2f9449703fc0941620650f1ca1332682b2866339413aa03f2438580d18f78";
+ sha256 = "18ea8d27387581d49dd156957a089f1dbbe05f2772811aeddb1ebe81d26961e6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/el/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/el/thunderbird-78.2.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "675cfc628dd02fe874a701e0e16986c797adac263605b304c1c69bb01552037f";
+ sha256 = "bcec06d4b01268ca90d99a98a45c2ef5927ae4152b6b2d356332f3690de08f62";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-CA/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-CA/thunderbird-78.2.1.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "a710c91df20b4b25d9e363b585344e1595ab96b9cc1df35e973e485834942957";
+ sha256 = "475a1393917665c17bc5e787ef29dd886f1480d544f55d1caacb2a89503da685";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-GB/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-GB/thunderbird-78.2.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "3acd3020cb6116588a0f061aa9ba5d620477e3265eefac3dc22f4705757fe025";
+ sha256 = "dda5664fd8d843f3f29b85b855d54e00d15188c57e80c01d79a8be0a2eaa0be1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-US/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-US/thunderbird-78.2.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "bf9ebc54aff457654b5ea1fc81437281f70d78de96d5a4d3586ae83fb8135d39";
+ sha256 = "b299267b8a113dcd325bc6a928c561fe872535e1e876518e3075b85043aa7b23";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-AR/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-AR/thunderbird-78.2.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "cf1c278a36c9303956ac8dc29a51226a42ea17cf64559c34bef318c79ba6ed74";
+ sha256 = "e3e7cb829b07b7db95cad09c8887b9c91123665cd4601b685e3c7a7b0036992d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-ES/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-ES/thunderbird-78.2.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "4a9356476a18f292f763f1647611189ebe89ee368a3f01a7c75ef8dce48d91af";
+ sha256 = "be8428e1cce22aff5000bdc11f632adfc4c1096060a7456d36230ebd6040d12d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/et/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/et/thunderbird-78.2.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "03d3a43153b714f334a8f5d7d23e9080624488ec54400451b508c6aa50bcd594";
+ sha256 = "deb81a63704b12ad2a945f5f0dcec878c3b7ec46f551f2d0122c03c52c031f73";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/eu/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/eu/thunderbird-78.2.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "a7cca16186f0e2627dc6e06164b3cb2bb691cf798f7c41378ae90349521d9199";
+ sha256 = "8a2935dd5f83854b4d98bdab67e7b376a7e1d19a2ff790234516ba8211ed7345";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fa/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fa/thunderbird-78.2.1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "6a19a79d409acdc25c69b5c8d75a18f2de665a7d18244d578e4ef0f65597daea";
+ sha256 = "c39189bc1f740a1e5a372eaf3c6e99090f04ed8b1e86016c54ed25612d16f341";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fi/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fi/thunderbird-78.2.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "4b82f0fadfb5f388948e33fd3408e9f6ece6737c8e5e4b53c164a124f017e553";
+ sha256 = "4f23c9941975e67e6e40d7a504a24e4058a27786c5989dd3e25cfc4fab4c4c0e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fr/thunderbird-78.2.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "bc4fb423664576d4d94eb24383e3f4f23c199e52f1c985fd3bfccc947212f82a";
+ sha256 = "4de9885664bf4828355d09ceae11fc7cfb603d4514255b4de464c0653ddd45b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fy-NL/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fy-NL/thunderbird-78.2.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "6eb76c3a4d3b31160dc0d0b807596095354c7c0740f5593f86042af1e1b03d48";
+ sha256 = "82ae68d970a02ad57aa9c3dfb6c1ef7783c25211e9228c0bad515c3fef385f88";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ga-IE/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ga-IE/thunderbird-78.2.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "5321fff3eb4d341307233976de74624f6002abb8662f40ecbf77e3bdb5757add";
+ sha256 = "e6035d81bfa5c58ab79e71b9895638f23e47e8ab2990794786c5e9f590bb70e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gd/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gd/thunderbird-78.2.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "515207242fffd0513a550017f8bfb53061f0a0e3d795a111adf0154b55363d38";
+ sha256 = "2c628c5ed8ad0c00c42b384f8b925887e624f6a6dee69c86800a9b5137f04886";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gl/thunderbird-78.2.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "84c32bd92a783c680343aa5b01dbf58e37eda9ee466b16f817a79a135e37fbe5";
+ sha256 = "49b8e22610f8e602a3870f541209251b61da8cb81df7f0a762d01002fef568e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/he/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/he/thunderbird-78.2.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "96d07263578fb16068e0f48309552ea9237d3dd5a46fc63e3293326778cb7af1";
+ sha256 = "5bb7193eb498d1edd713e18bbac630ba881b0a9b7fca9b05c9b8e4dd1ea1edbf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hr/thunderbird-78.2.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "9c612aad3a12530052dd609c2f20a3739c458b3c7f3d761e7c00754f9b43db95";
+ sha256 = "c31022ae9a1665cc0b22ab0e911730ccf5cd0dd24614fbd8d3bd51624760baa3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hsb/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hsb/thunderbird-78.2.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "376e4d8eadb9bb8f301053d30260ab0cbeb3dc9f590564583f07547585105fe0";
+ sha256 = "3e286b3ccf66300ead4d6b98a88a370fa1bac96244b143005c4974f075ceca92";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hu/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hu/thunderbird-78.2.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "4e7e51dbbe359ec542e553f5b0691f1d191343261094828b2572dd5a03ec2c8a";
+ sha256 = "6d0c88c46d0f4ffb296638e4e8217041d8fdaec3abaa6bda7b7cf97c4bcabc2a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hy-AM/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hy-AM/thunderbird-78.2.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "735624e30d1986d6c822fcbee4694389cf8a0061eba40926265bd4ac998e2186";
+ sha256 = "aac23dfa8c299623bca2e3b0501a636c630fbf3f5b08689911569a568b3ad060";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/id/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/id/thunderbird-78.2.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ce6d668f38d1e74e7c8bbfc7408edc749eed9449908044bdd57b2dcd868cb89f";
+ sha256 = "5bd5597cb6e91613a39c288d694f3af4f5686dcab1573e3b58c04dce3d1de865";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/is/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/is/thunderbird-78.2.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "589369ce68b6c78ad7753ddd14412eb68f438dbd7cae449f828288d25ee3f795";
+ sha256 = "bcd926c704177945aa7b917fe12940e058d12e6cf8a3eedbf1ab205fb9c41b80";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/it/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/it/thunderbird-78.2.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "fd909d5aaa68a208050a0812f15024ef115b99fbde0edb0afe995c3b766c0d76";
+ sha256 = "04ca02a4fed6e8d904173d9ce52c16e47d7e9b3d16f5483d986f8188ec79d65c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ja/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ja/thunderbird-78.2.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "160c2a1c36ef34339270abd59fed13b37414f8c37edd60463e0945e6751a0c74";
+ sha256 = "1dbdc30ec3a06f2e7e7d38d9036fb90a2fdaad42356e9386ecc710d9a51f94b3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ka/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ka/thunderbird-78.2.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "e822a28e62aae6d6e84e6788d5311af45396248f48cc60152b4273d75359dd8f";
+ sha256 = "2db1fa86ac87e0b8001b99c0eea30589db515c58e10548565533014481b1be9a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kab/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kab/thunderbird-78.2.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "2ea58cc79b80966b5bbc310fa32bd27621f95d4ffbd3646bf9e04f922c36ca6e";
+ sha256 = "8499d0d8a0372617800b039c9198cc372783b8ff4ce385fc692e39b1dca22576";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kk/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kk/thunderbird-78.2.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "a874bc02f065be73a54b70567b7a04be5fc6a9f766f3b054b12555763361ea2a";
+ sha256 = "29b228042a7f06c22300b123cc0fcdf7a86005d0d4c3c282c97635ebc25ce826";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ko/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ko/thunderbird-78.2.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "d9678f72569dfde84544fcb9afa7cb8d5a4a35baa52d4e560aa2b082a418ab00";
+ sha256 = "a7af79975107cb32b408c7dd26827793c3c11f998705bc711c60f3dd6b7a1173";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/lt/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/lt/thunderbird-78.2.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "1d7ec489dc52fae0f7597e40f8505bdd6a57a717389c75b66481749e85e2fab6";
+ sha256 = "7a5010761d0af24a6852f32b1ebd6b543b1e1011888ded3f4a4297fc35f455b5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ms/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ms/thunderbird-78.2.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "5d0c7cc00139c39a69dfc9ba1dc5c83b56973f26679860d048952bcf09baa737";
+ sha256 = "8573dc35bd69ff20d05aa06484a2243f5a35ec78c1c31dbccc067f0cb9e6617a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nb-NO/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nb-NO/thunderbird-78.2.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "e72a25e7d53e6e0d470632c487d31e08afdb6c27543d50c93ff72ecac3f70bc6";
+ sha256 = "722c0a4ce2a0d774f8971707ff553d9f2e62af10267ef491e670b020a2d8a49c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nl/thunderbird-78.2.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "19efd7323e671fe25b64ee44c85f698f608e6c2b18fdbfc9f0cc95b9cd8cd149";
+ sha256 = "63a08123e795ab8e51a2c98f33b0b6424c1f5f2c09a5d1683585f9762813afaf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nn-NO/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nn-NO/thunderbird-78.2.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "b4be21281c6a13de05e5d0b96e43454bab662140a00d3837f609e23f14360c90";
+ sha256 = "8968de35faf9fe304631ece4e08a9944342a08dc518ac1eec0ba2d5c1ff268ed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pa-IN/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pa-IN/thunderbird-78.2.1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "f2795a504616404616f7d22022e105e9e4ea54025d60e262c405b867cb9c7936";
+ sha256 = "57685a05321195019ef4d3c489dbb14ac0f1bd5ce51fda1f7573392de215e4e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pl/thunderbird-78.2.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "52f80b074dc168ec00d0fd78f6376c1dfd357c2b7e7ed78bb1b9cf17536508a6";
+ sha256 = "d98967c9d54f9314faae53472b9d1506576761cd3de09747d3b407e1f26931e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-BR/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-BR/thunderbird-78.2.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "d02867899a54eebffb2b6e600f7e6260b960d686a8bcd61ce705e9d0bbebe377";
+ sha256 = "14fa89b2d8f659a90e19068130ce1a2da83137b7fb9a5a009d2363ccc2415009";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-PT/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-PT/thunderbird-78.2.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "659a7ff3a0dcbb4f3fec32eda6b5a2087191c8d49ea310662ad540433d869180";
+ sha256 = "279f325e75157e0cedffe6a455e731373b077078f70b89bba76e12e2439350d8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/rm/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/rm/thunderbird-78.2.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "d9ee3c5e3cf2d7eedced9d12bf4d499ae931c262be166af6a14bbd4a2538788a";
+ sha256 = "7432093e7516625957c3dcb90e8668fab1e22c0edba0411e3e2106d49e052fdf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ro/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ro/thunderbird-78.2.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "c3db9965a25d52d25cde0b52bffcc274ae32862fb29be368f27b102774d0971b";
+ sha256 = "f5d5f564cf56c66d1f2f9717df7c7f021532dc1912384c9921ca286030f7d82c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ru/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ru/thunderbird-78.2.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "f0356ef5eadccfcdfc694d0bed9b1e4027e4883095f9c117403a68f1cb2810c8";
+ sha256 = "4c4e31e74c4d10d88044fc49c24b3ae3ffb0b18e4a23295b60ac2d38d723753a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/si/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/si/thunderbird-78.2.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "5b5d17a2b098fbe1c2d8686ab0e1adb7c72efedc38365ca9b39b1e122302c85c";
+ sha256 = "689be324633f6a872a09d6498d8772562dceca9bca96f7029830c965ad2e4138";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sk/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sk/thunderbird-78.2.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "b39bd41a38947ea467e1a89c5a173fd07cbce09562c10e6a60adb2150b04c9cf";
+ sha256 = "194ff5a23a3a40ba98fb1968965c79f99246c6d93b81254d11df5d22530f1d86";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sl/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sl/thunderbird-78.2.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "602e0feffc5b786930005c376ca3e8819b834a0cfc9a649bc46d86c27999144d";
+ sha256 = "9746db435fe3dbf5ab51603780d52862a6afda0e40c1ebc915b309ac93e75e25";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sq/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sq/thunderbird-78.2.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "fb265490d00c3a844f73e8f531b7c73f3787cb4e4ddc7cdcde72017fd7f3d612";
+ sha256 = "86f675921cdf0de41855d5e2c3d2d56c163d915ac8a0f8cc9678d1a55f87e069";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sr/thunderbird-78.2.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "1574eaee6effc4df2c88fc94597e295f352455a9f68501080385c08cb4ab7e35";
+ sha256 = "587e4c867dd43621c8e5e04461c4a2dcf2b0f256476b5b72d8fc6722e573e347";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sv-SE/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sv-SE/thunderbird-78.2.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "8d55df4937fe28f7b9d0fcaebcde3fb9650de9f0b74f677111f339ae2365b822";
+ sha256 = "a46294d3dafc8bfaaa7f5376c2db2402f31f24664e73045c653ea8660079b879";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/th/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/th/thunderbird-78.2.1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "6a872a6c332c7b3bfc24721bf1114c85475a73ae5c7b16d8637b0eb0045e112d";
+ sha256 = "6105278c11c3e586240d50c9612730e75caecd08765b5b5cfe010f37d71c971d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/tr/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/tr/thunderbird-78.2.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "26d2b8493a1508591b45f9ecc43598e244856c0d9bc3c185721a7239679c4e63";
+ sha256 = "4bdd2c91e8f361d1b2ade88cec06accb244adf3d7f1d714feea3e4004ed31968";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uk/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uk/thunderbird-78.2.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "ddb4b5fab55ded8f7bc2ae914f41af42b3b69c738727b055efd5e05b253ac872";
+ sha256 = "40e2012a5b5dc05cb887a6c4cbb0c8f7bbc25cebd2de1247e5e8dc355cad78fe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uz/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uz/thunderbird-78.2.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "dce93fab320f90ece938ae2b2343c1d27a1143b0183318a9d9e0cbbcfb607982";
+ sha256 = "15f4aafba6b2bcb102683d9a665d208ab21c5767cf6d59c45d996fa26ef1e12a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/vi/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/vi/thunderbird-78.2.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "cf1b4f96ef1a510d21b232e748ace6e567d27e382393a7d7f51ab392f026d55c";
+ sha256 = "32640a1c8e42cc79774a3b75539010dfb65e32c703992001eb03916d4fb46e91";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-CN/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-CN/thunderbird-78.2.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "574acd0743a1202b6629883618278eb3ce113c518bc9c39f3d90e2dc12d4f644";
+ sha256 = "09b52b6ebf0033738444bacfb53b84b1c98f7d3e10b32c001356083afbe4e89e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-TW/thunderbird-78.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-TW/thunderbird-78.2.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "51ccc5a4696841b3391a5dd9fb9ff1f55a9f6ccd6fbd86587ffb86c5f664f10f";
+ sha256 = "606e416a158023f674eda141bf67f9b3956e3e231ba85605173d73cad0d22a59";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix
index 3143c7f62bb..fef707b7293 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix
@@ -71,13 +71,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "68.11.0";
+ version = "68.12.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "1rdxizg1mpagh17fhnrbkilyv1i2zfcr6z62jf3ng31ns94za9kdg9f580srkp63png67jaj3b1kc33v5vb8wavl09n5d38g113x2m9";
+ "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7";
};
nativeBuildInputs = [
@@ -307,7 +307,7 @@ stdenv.mkDerivation rec {
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = ''
local xul="$out/lib/thunderbird/libxul.so"
- patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
+ patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
'';
doInstallCheck = true;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 53d337067d7..7a10c7f1d2a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "78.1.1";
+ version = "78.2.1";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "1lf15zl3p8y1vxv4s04y088flkspf0r0c6j8gfrlfzla5ckfcsbad3zbygh6y73m35j882g7fbacby5a4hiw891zq2kji5dn3nbahyi";
+ "2iya9a5qaini524wrdrnxx6wsrgb8fa2b1m42mlypskxjjgb7n66vpxlbpi9x9mqzc63ca2ag36fjpbpsvbv5ppxvpfwk2j1zbfvb5w";
};
nativeBuildInputs = [
@@ -301,7 +301,7 @@ stdenv.mkDerivation rec {
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = ''
local xul="$out/lib/thunderbird/libxul.so"
- patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
+ patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
'';
doInstallCheck = true;
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/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 265c8add278..aa7aaab29ac 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchurl, dpkg
+{ stdenv, lib, makeWrapper, fetchurl, dpkg
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
unpackPhase = "dpkg-deb -x $src .";
- runtimeDependencies = [ systemd.lib libnotify libappindicator ];
+ runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ];
installPhase = ''
runHook preInstall
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/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 36ae194a165..c19cb585952 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
openssl'
pango
speex
- systemd.lib
+ (lib.getLib systemd)
stdenv.cc.cc
xorg.libXaw
xorg.libXmu
diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix
index 2019e1c2b81..9ce2f1fcfd1 100644
--- a/pkgs/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@@ -5,6 +5,7 @@
, makeDesktopItem
, makeWrapper
, stdenv
+, lib
, udev
, wrapGAppsHook
}:
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
- runtimeDependencies = [ udev.lib ];
+ runtimeDependencies = [ (lib.getLib udev) ];
postFixup = ''
makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 6915be9b6d6..40c4b77f1b6 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -7,7 +7,7 @@
knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
kwindowsystem, kxmlgui, sonnet, threadweaver,
kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
- eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen,
+ eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
poppler, pstoedit, qca-qt5, vc
# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
@@ -15,18 +15,14 @@
mkDerivation rec {
pname = "calligra";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
- sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
+ sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE=";
};
- patches = [ ./qt5_11.patch ];
-
- enableParallelBuilding = true;
-
- nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost qtwebkit qtx11extras shared-mime-info
@@ -35,7 +31,7 @@ mkDerivation rec {
kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
kcontacts akonadi akonadi-calendar akonadi-contacts
- eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge
+ eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge
libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
];
@@ -43,13 +39,10 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
- postInstall = ''
- for i in $out/bin/*; do
- wrapProgram $i \
- --prefix PATH ':' "${pstoedit.out}/bin" \
- --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share"
- done
- '';
+ qtWrapperArgs = [
+ "--prefix PATH : ${lib.getBin pstoedit}/bin"
+ "--prefix XDG_DATA_DIRS : ${breeze-icons}/share"
+ ];
meta = with lib; {
description = "A suite of productivity applications";
@@ -64,7 +57,5 @@ mkDerivation rec {
maintainers = with maintainers; [ phreedom ebzzry zraexy ];
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2 ];
- hydraPlatforms = [];
- broken = true; # fails to start, kde home not found
};
}
diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix
new file mode 100644
index 00000000000..55703ea44d6
--- /dev/null
+++ b/pkgs/applications/radio/noaa-apt/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, atk
+, cairo
+, gdk-pixbuf
+, glib
+, gtk3
+, openssl
+, pango
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "noaa-apt";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "martinber";
+ repo = "noaa-apt";
+ rev = "v${version}";
+ sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ atk
+ cairo
+ gdk-pixbuf
+ glib
+ gtk3
+ openssl
+ pango
+ ];
+
+ cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh";
+
+ preBuild = ''
+ # Used by macro pointing to resource location at compile time.
+ export NOAA_APT_RES_DIR=$out/share/noaa-apt
+ '';
+
+ postInstall = ''
+ # Resources.
+ mkdir -p $out/share/noaa-apt
+ cp -R $src/res/* $out/share/noaa-apt/
+
+ # Desktop icon.
+ install -Dm644 -t $out/share/applications $src/debian/ar.com.mbernardi.noaa-apt.desktop
+ install -Dm644 -t $out/share/icons/hicolor/48x48/apps $src/debian/noaa-apt.png
+ install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/noaa-apt.svg
+ '';
+
+ meta = with lib; {
+ description = "NOAA APT image decoder.";
+ homepage = "http://noaa-apt.mbernardi.com.ar/";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ trepetti ];
+ changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}";
+ };
+}
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/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 224795f2a66..32a75cabc13 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.18.4";
+ version = "3.19.0";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
- sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn";
+ sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix
index 84adb2358d2..40b2711ff65 100644
--- a/pkgs/applications/science/math/rofi-calc/default.nix
+++ b/pkgs/applications/science/math/rofi-calc/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "rofi-calc";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
- sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa";
+ sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index fe211d1b87f..9389934ffc6 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
{
- "version": "13.0.12",
- "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq",
+ "version": "13.0.14",
+ "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v13.0.12-ee",
+ "rev": "v13.0.14-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "13.0.12",
+ "GITALY_SERVER_VERSION": "13.0.14",
"GITLAB_PAGES_VERSION": "1.18.0",
"GITLAB_SHELL_VERSION": "13.2.0",
"GITLAB_WORKHORSE_VERSION": "8.31.2"
}
-}
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 5f3fa345d85..84cf1e500a2 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -19,14 +19,14 @@ let
};
};
in buildGoPackage rec {
- version = "13.0.12";
+ version = "13.0.14";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw";
+ sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv";
};
# Fix a check which assumes that hook files are writeable by their
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..78d6631c2dc 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
@@ -180,7 +180,7 @@ rec {
'';
preFixup = ''
- find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' +
+ find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
'' + optionalString (stdenv.isLinux) ''
find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' +
'';
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 7154b8e614c..bfa0e0e5446 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -67,10 +67,6 @@ buildGoPackage rec {
runHook postInstall
'';
- postFixup = ''
- find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
- '';
-
meta = with stdenv.lib; {
homepage = "http://www.sylabs.io/";
description = "Application containers for linux";
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/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index e077fc30344..40a6c887439 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -6,11 +6,12 @@
, fetchzip
, optipng
, cairo
-, python3Packages
+, python3
, pkgconfig
, pngquant
, which
, imagemagick
+, zopfli
}:
let
@@ -110,25 +111,36 @@ in
};
noto-fonts-emoji = let
- version = "unstable-2019-10-22";
+ version = "unstable-2020-08-20";
+ emojiPythonEnv =
+ python3.withPackages (p: with p; [ fonttools nototools ]);
in stdenv.mkDerivation {
pname = "noto-fonts-emoji";
inherit version;
src = fetchFromGitHub {
- owner = "googlei18n";
+ owner = "googlefonts";
repo = "noto-emoji";
- rev = "018aa149d622a4fea11f01c61a7207079da301bc";
- sha256 = "0qmnnjpp5lza6g5m3ki6hj46p891h9vl42k3acd0qw8i0jj5yn2c";
+ rev = "1bc491419fa2925d018f27bfe702792031be0e68";
+ sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy";
};
- buildInputs = [ cairo ];
- nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ]
- ++ (with python3Packages; [ python fonttools nototools ]);
+ nativeBuildInputs = [
+ cairo
+ imagemagick
+ zopfli
+ pngquant
+ which
+ pkgconfig
+ emojiPythonEnv
+ ];
postPatch = ''
- sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile
- patchShebangs flag_glyph_name.py
+ patchShebangs *.py
+ patchShebangs third_party/color_emoji/*.py
+ # remove check for virtualenv, since we handle
+ # python requirements using python.withPackages
+ sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile
'';
enableParallelBuilding = true;
@@ -141,7 +153,7 @@ in
meta = with lib; {
inherit version;
description = "Color and Black-and-White emoji fonts";
- homepage = "https://github.com/googlei18n/noto-emoji";
+ homepage = "https://github.com/googlefonts/noto-emoji";
license = with licenses; [ ofl asl20 ];
platforms = platforms.all;
maintainers = with maintainers; [ mathnerd314 ];
@@ -165,7 +177,7 @@ in
meta = with stdenv.lib; {
description = "Noto Emoji with extended Blob support";
- homepage = https://github.com/C1710/blobmoji;
+ homepage = "https://github.com/C1710/blobmoji";
license = with licenses; [ ofl asl20 ];
platforms = platforms.all;
maintainers = with maintainers; [ rileyinman ];
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index 3cc1570161e..6ea26f7c79d 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,32 +1,62 @@
-{ fetchFromGitHub, lib, fetchpatch, buildPythonPackage, isPy3k, fonttools, numpy, pillow, six, bash }:
+{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder
+, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
+, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml
+, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
+, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
+, pillow, six, bash, setuptools_scm }:
buildPythonPackage rec {
pname = "nototools";
- version = "unstable-2019-10-21";
+ version = "0.2.12";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "googlefonts";
repo = "nototools";
- rev = "cae92ce958bee37748bf0602f5d7d97bb6db98ca";
- sha256 = "1jqr0dz23rjqiyxw1w69l6ry16dwdcf3c6cysiy793g2v7pir2yi";
+ rev = "v${version}";
+ sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5";
};
- propagatedBuildInputs = [ fonttools numpy ];
-
- patches = lib.optionals isPy3k [
- # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497
- (fetchpatch {
- url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch";
- sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq";
- })
- ];
-
postPatch = ''
- sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py
+ sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
'';
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [
+ afdko
+ appdirs
+ attrs
+ black
+ booleanoperations
+ brotlipy
+ click
+ defcon
+ fontmath
+ fontparts
+ fontpens
+ fonttools
+ lxml
+ mutatormath
+ pathspec
+ psautohint
+ pyclipper
+ pytz
+ regex
+ scour
+ toml
+ typed-ast
+ ufonormalizer
+ ufoprocessor
+ unicodedata2
+ zopfli
+ ];
+
checkInputs = [
- pillow six bash
+ pillow
+ six
+ bash
];
checkPhase = ''
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/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix
index ac3930853cf..8435957fe20 100644
--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@@ -3,9 +3,8 @@
{ stdenv
, fetchFromGitHub
-, fetchpatch
, cairo
-, graphicsmagick
+, imagemagick
, pkg-config
, pngquant
, python3
@@ -15,7 +14,7 @@
}:
let
- version = "12.1.5";
+ version = "13.0.1";
twemojiSrc = fetchFromGitHub {
name = "twemoji";
@@ -25,6 +24,9 @@ let
sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9";
};
+ pythonEnv =
+ python3.withPackages (p: [ p.fonttools p.nototools ]);
+
in
stdenv.mkDerivation rec {
pname = "twitter-color-emoji";
@@ -44,23 +46,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cairo
- graphicsmagick
+ imagemagick
pkg-config
pngquant
- python3
- python3.pkgs.nototools
+ pythonEnv
which
zopfli
];
- patches = [
- # ImageMagick -> GraphicsMagick
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch";
- sha256 = "06vg16z79s5adyjy8r3mr8fd391b1hi4xkqvbzkmnjwaai7p08lk";
- })
- ];
-
postPatch = let
templateSubstitutions = stdenv.lib.concatStringsSep "; " [
''s#Noto Color Emoji#Twitter Color Emoji#''
@@ -74,7 +67,7 @@ stdenv.mkDerivation rec {
''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#''
];
in ''
- patchShebangs ./flag_glyph_name.py
+ ${noto-fonts-emoji.postPatch}
sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl
pushd ${twemojiSrc.name}/assets/72x72/
@@ -88,6 +81,8 @@ stdenv.mkDerivation rec {
"EMOJI=TwitterColorEmoji"
"EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72"
"BODY_DIMENSIONS=76x72"
+ # twemoji contains some codepoints noto doesn't like
+ "BYPASS_SEQUENCE_CHECK=True"
];
enableParallelBuilding = true;
diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix
index 7a473567589..5f09927e15c 100644
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
- version = "7.4.3";
+ version = "7.5.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- sha256 = "1g8xyv0najy4lpwa9xplx3ylxvn86dyi58j7qanc6r9yddy85ln9";
+ sha256 = "0ig5wc6dkbly6yrvd13h4lyr8x0y7k3d9iv4rhg0pnjgcpna83mw";
};
buildInputs = [
diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/data/themes/venta/default.nix
new file mode 100644
index 00000000000..1086aaeb709
--- /dev/null
+++ b/pkgs/data/themes/venta/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetchFromGitHub
+, gdk-pixbuf
+, gtk-engine-murrine
+, gtk_engines
+, librsvg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "venta";
+ version = "2020-08-20";
+
+ src = fetchFromGitHub {
+ owner = "darkomarko42";
+ repo = pname;
+ rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca";
+ sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb";
+ };
+
+ buildInputs = [
+ gdk-pixbuf
+ gtk_engines
+ librsvg
+ ];
+
+ propagatedUserEnvPkgs = [
+ gtk-engine-murrine
+ ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/themes
+ cp -a Venta* $out/share/themes
+ rm $out/share/themes/*/COPYING
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Gtk theme based on windows 10 style";
+ homepage = "https://www.pling.com/p/1386774/";
+ license = licenses.gpl3Only;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index a84fc9c2e02..07239f9d509 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -108,7 +108,6 @@ buildGoPackage rec {
installPhase = ''
make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
mv $out/share/gocode $out/share/go
- remove-references-to -t ${go} $out/lib/deepin-api/*
'';
postFixup = ''
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index c4edcef15af..8a36446491f 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -134,7 +134,6 @@ buildGoPackage rec {
installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath}
- remove-references-to -t ${go} $out/lib/deepin-daemon/*
searchHardCodedPaths $out
'';
diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix
index 75b36e85de3..ab17f04db68 100644
--- a/pkgs/desktops/deepin/startdde/default.nix
+++ b/pkgs/desktops/deepin/startdde/default.nix
@@ -139,7 +139,6 @@ buildGoPackage rec {
installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath}
rm -rf $out/share/lightdm # this is uselesss for NixOS
- remove-references-to -t ${go} $out/sbin/*
'';
postFixup = ''
diff --git a/pkgs/desktops/plasma-5/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/addons/caffeine-plus.nix
new file mode 100644
index 00000000000..66e1255f223
--- /dev/null
+++ b/pkgs/desktops/plasma-5/addons/caffeine-plus.nix
@@ -0,0 +1,32 @@
+{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules
+, kwindowsystem, plasma-framework }:
+
+mkDerivation rec {
+ pname = "plasma-applet-caffeine-plus";
+ version = "1.4";
+
+ src = fetchFromGitHub {
+ owner = "qunxyz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo=";
+ };
+
+ buildInputs = [
+ kwindowsystem plasma-framework
+ ];
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ cmakeFlags = [
+ "-Wno-dev"
+ ];
+
+ meta = with lib; {
+ description = "Disable screensaver and auto suspend";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (src.meta) homepage;
+ inherit (kwindowsystem.meta) platforms;
+ };
+}
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 77763c5e203..ad78d602dec 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,6 +1,7 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
+ qtbase,
kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
plasma-framework, plasma-workspace, qtx11extras
}:
@@ -13,5 +14,5 @@ mkDerivation {
plasma-framework plasma-workspace qtx11extras
];
outputs = [ "bin" "dev" "out" ];
- enableParallelBuilding = false;
+ meta.broken = lib.versionOlder qtbase.version "5.14";
}
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/binaryen/0001-Get-rid-of-git-dependency.patch b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch
deleted file mode 100644
index 79b053592a9..00000000000
--- a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch
-Date: Sat, 14 Mar 2020 00:37:31 +0100
-Subject: [PATCH] Get rid of git dependency
-
----
- CMakeLists.txt | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4acf703e1..4e9bd60b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE)
- SET(CMAKE_BUILD_TYPE "Release")
- ENDIF()
-
--FIND_PACKAGE(Git QUIET REQUIRED)
--EXECUTE_PROCESS(COMMAND
-- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags
-- RESULT_VARIABLE
-- GIT_HASH_RESULT
-- OUTPUT_VARIABLE
-- GIT_HASH
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
--IF(${GIT_HASH_RESULT})
-- MESSAGE(WARNING "Error running git describe to determine version")
-- SET(BINARYEN_VERSION_INFO "(unable to determine version)")
--ELSE()
-- SET(BINARYEN_VERSION_INFO "${GIT_HASH}")
--ENDIF()
-+SET(BINARYEN_VERSION_INFO "@emscriptenv@")
- CONFIGURE_FILE(config.h.in config.h)
-
- OPTION(BUILD_STATIC_LIB "Build as a static library" OFF)
---
-2.25.0
-
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index e9dc939b5ed..6de4e0fb304 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,38 +1,23 @@
-{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
-
-let
- defaultVersion = "95";
-
- # Map from git revs to SHA256 hashes
- sha256s = {
- version_95 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3";
- "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
- };
-in
+{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
stdenv.mkDerivation rec {
- version = if emscriptenRev == null
- then defaultVersion
- else "emscripten-${emscriptenRev}";
- rev = if emscriptenRev == null
- then "version_${version}"
- else emscriptenRev;
pname = "binaryen";
+ version = "96";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "binaryen";
- sha256 =
- if builtins.hasAttr rev sha256s
- then builtins.getAttr rev sha256s
- else null;
- inherit rev;
+ rev = "version_${version}";
+ sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag";
};
- patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll {
- src = ./0001-Get-rid-of-git-dependency.patch;
- emscriptenv = "1.39.1";
- });
+ patches = [
+ # Adds --minimize-wasm-changes option required by emscripten 2.0.1
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch";
+ sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s";
+ })
+ ];
nativeBuildInputs = [ cmake python3 ];
@@ -43,4 +28,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ asppsa ];
license = licenses.asl20;
};
+
+ passthru.tests = {
+ inherit emscripten;
+ };
}
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 2ee1223a53b..7c0d42f1864 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
- version = "20200614";
+ version = "20200719";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli";
+ sha256 = "18095i98mk5kc1vpaf6gvmvhiyl2x4zrcwd7ix5l98jydldiz7wx";
};
sourceRoot = ".";
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index cd5142acce8..ac13f955930 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,63 +1,104 @@
-{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
-, jre, binaryen, enableWasm ? true , cmake
+{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
+, jre, binaryen
+, llvmPackages_11
+, symlinkJoin, makeWrapper
+, mkYarnModules
}:
-let
- rev = emscriptenVersion;
- appdir = "share/emscripten";
- binaryenVersioned = binaryen.override { emscriptenRev = rev; };
-in
+stdenv.mkDerivation rec {
+ pname = "emscripten";
+ version = "2.0.1";
-stdenv.mkDerivation {
- name = "emscripten-${rev}";
+ llvmEnv = symlinkJoin {
+ name = "emscripten-llvm-${version}";
+ paths = with llvmPackages_11; [ clang-unwrapped lld llvm ];
+ };
+
+ nodeModules = mkYarnModules {
+ name = "emscripten-node-modules-${version}";
+ inherit pname version;
+ # it is vitally important the the package.json has name and version fields
+ packageJSON = ./package.json;
+ yarnLock = ./yarn.lock;
+ yarnNix = ./yarn.nix;
+ };
src = fetchFromGitHub {
owner = "emscripten-core";
repo = "emscripten";
- sha256 = "1j3f0hpy05qskaiyv75l7wv4n0nzxhrh9b296zchx3f6f9h2rghq";
- inherit rev;
+ sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk";
+ rev = version;
};
- buildInputs = [ nodejs cmake python ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ nodejs python3 ];
+
+ buildPhase = ''
+ patchShebangs .
- buildCommand = ''
- mkdir -p $out/${appdir}
- cp -r $src/* $out/${appdir}
- chmod -R +w $out/${appdir}
- grep -rl '^#!/usr.*python' $out/${appdir} | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
- sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py
- sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/${appdir}/tools/shared.py
- sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/${appdir}/tools/shared.py
# fixes cmake support
- sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" $out/${appdir}/emcc.py
- mkdir $out/bin
- ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
+ sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
- echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config
- echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config
- echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config
- echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
- echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config
- echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
- echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
- echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
+ # disables cache in user home, use installation directory instead
+ sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py
+ sed -i "/^def check_sanity/a\\ return" tools/shared.py
+
+ # required for wasm2c
+ ln -s ${nodeModules}/node_modules .
+
+ echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten
+ echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten
+ echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten
+ echo "JS_ENGINES = [NODE_JS]" >> .emscripten
+ echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten
+ echo "JAVA = '${jre}/bin/java'" >> .emscripten
# to make the test(s) below work
- echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
- ''
- + stdenv.lib.optionalString enableWasm ''
- echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config
- ''
- +
- ''
- echo "--------------- running test -----------------"
- # quick hack to get the test working
- HOME=$TMPDIR
- cp $out/${appdir}/config $HOME/.emscripten
- export PATH=$PATH:$out/bin
+ # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten
+ echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten
- #export EMCC_DEBUG=2
- ${python}/bin/python $src/tests/runner.py test_hello_world
- echo "--------------- /running test -----------------"
+ # make emconfigure/emcmake use the correct (wrapped) binaries
+ sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py
+ sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py
+ sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py
+ sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py
+
+ # The tests use the C compiler to compile generated C code,
+ # use the wrapped compiler
+ sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py
+ '';
+
+ installPhase = ''
+ appdir=$out/share/emscripten
+ mkdir -p $appdir
+ cp -r . $appdir
+ chmod -R +w $appdir
+
+ mkdir -p $out/bin
+ for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do
+ makeWrapper $appdir/$b $out/bin/$b \
+ --set NODE_PATH ${nodeModules}/node_modules \
+ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \
+ --set PYTHON ${python3}/bin/python
+ done
+
+ # precompile libc (etc.) in all variants:
+ pushd $TMPDIR
+ echo 'int main() { return 42; }' >test.c
+ for LTO in -flto ""; do
+ # wasm2c doesn't work with PIC
+ $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c
+
+ for RELOCATABLE in "" "-s RELOCATABLE"; do
+ $out/bin/emcc $RELOCATABLE $LTO test.c
+ done
+ done
+ popd
+
+ export PYTHON=${python3}/bin/python
+ export NODE_PATH=${nodeModules}/node_modules
+ pushd $appdir
+ python tests/runner.py test_hello_world
+ popd
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix
deleted file mode 100644
index 57496d28860..00000000000
--- a/pkgs/development/compilers/emscripten/fastcomp/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }:
-let
- callPackage = newScope (self // {inherit stdenv;});
-
- self = {
- emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {};
- emscriptenfastcomp-wrapped = wrapCCWith {
- cc = self.emscriptenfastcomp-unwrapped;
- # Never want Apple's cctools for WASM target
- bintools = binutils;
- libc = stdenv.cc.libc;
- extraBuildCommands = ''
- # hardening flags break WASM support
- cat > $out/nix-support/add-hardening.sh
- '';
- };
- emscriptenfastcomp = symlinkJoin {
- name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}";
- paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ];
- preferLocalBuild = false;
- allowSubstitutes = true;
- postBuild = ''
- # replace unwrapped clang-3.9 binary by wrapper
- ln -sf $out/bin/clang $out/bin/clang-[0-9]*
- '';
- };
- };
-in self
diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
deleted file mode 100644
index f8f06e24f8b..00000000000
--- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, gccForLibs, ... }:
-
-let
- rev = emscriptenVersion;
-in
-stdenv.mkDerivation rec {
- name = "emscripten-fastcomp-${rev}";
-
- src = fetchFromGitHub {
- owner = "emscripten-core";
- repo = "emscripten-fastcomp";
- sha256 = "0bd0l5k2fa4k0nax2cpxi003pqffqivx4z4m2j5xdha1a12sid8i";
- inherit rev;
- };
-
- srcFL = fetchFromGitHub {
- owner = "emscripten-core";
- repo = "emscripten-fastcomp-clang";
- sha256 = "1iw2qplhp489qzw0rma73sab7asnm27g4m95sr36c6kq9cq6agri";
- inherit rev;
- };
-
- nativeBuildInputs = [ cmake python gtest ];
- preConfigure = ''
- cp -Lr ${srcFL} tools/clang
- chmod +w -R tools/clang
- '';
- cmakeFlags = [
- "-DCMAKE_BUILD_TYPE=Release"
- "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
- "-DLLVM_INCLUDE_EXAMPLES=OFF"
- "-DLLVM_INCLUDE_TESTS=ON"
- #"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
- "-DLLVM_BUILD_TESTS=ON"
- "-DCLANG_INCLUDE_TESTS=ON"
- ] ++ (stdenv.lib.optional stdenv.isLinux
- # necessary for clang to find crtend.o
- "-DGCC_INSTALL_PREFIX=${gccForLibs}"
- );
- enableParallelBuilding = true;
-
- passthru = {
- isClang = true;
- };
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/emscripten-core/emscripten-fastcomp";
- description = "Emscripten LLVM";
- platforms = platforms.all;
- maintainers = with maintainers; [ qknight matthewbauer ];
- license = stdenv.lib.licenses.ncsa;
- };
-}
diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json
new file mode 100644
index 00000000000..039d215efcd
--- /dev/null
+++ b/pkgs/development/compilers/emscripten/package.json
@@ -0,0 +1,15 @@
+{
+ "name": "emscripten",
+ "version": "2.0.1",
+ "private": true,
+ "devDependencies": {
+ "ws": "~0.4.28"
+ },
+ "dependencies": {
+ "google-closure-compiler": "20200224.0.0",
+ "html-minifier-terser": "5.0.2",
+ "source-map": "0.5.6",
+ "wasm2c": "1.0.0",
+ "acorn": "7.3.1"
+ }
+}
diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock
new file mode 100644
index 00000000000..079b254a472
--- /dev/null
+++ b/pkgs/development/compilers/emscripten/yarn.lock
@@ -0,0 +1,346 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+acorn@7.3.1:
+ version "7.3.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
+ integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
+
+ansi-styles@^3.2.1:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+ dependencies:
+ color-convert "^1.9.0"
+
+buffer-from@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+ integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+camel-case@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+ integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
+ dependencies:
+ no-case "^2.2.0"
+ upper-case "^1.1.1"
+
+chalk@2.x:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+ dependencies:
+ ansi-styles "^3.2.1"
+ escape-string-regexp "^1.0.5"
+ supports-color "^5.3.0"
+
+clean-css@^4.2.1:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+ integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
+ dependencies:
+ source-map "~0.6.0"
+
+clone-buffer@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+ integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
+
+clone-stats@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+ integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
+
+clone@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+ integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+cloneable-readable@^1.0.0:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
+ integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
+ dependencies:
+ inherits "^2.0.1"
+ process-nextick-args "^2.0.0"
+ readable-stream "^2.3.5"
+
+color-convert@^1.9.0:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+ dependencies:
+ color-name "1.1.3"
+
+color-name@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+commander@^2.20.0:
+ version "2.20.3"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^4.0.0:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+ integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+commander@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
+ integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=
+
+core-util-is@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+escape-string-regexp@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+google-closure-compiler-java@^20200224.0.0:
+ version "20200224.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc"
+ integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ==
+
+google-closure-compiler-js@^20200224.0.0:
+ version "20200224.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500"
+ integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g==
+
+google-closure-compiler-linux@^20200224.0.0:
+ version "20200224.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902"
+ integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ==
+
+google-closure-compiler-osx@^20200224.0.0:
+ version "20200224.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed"
+ integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ==
+
+google-closure-compiler-windows@^20200224.0.0:
+ version "20200224.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58"
+ integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg==
+
+google-closure-compiler@20200224.0.0:
+ version "20200224.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283"
+ integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog==
+ dependencies:
+ chalk "2.x"
+ google-closure-compiler-java "^20200224.0.0"
+ google-closure-compiler-js "^20200224.0.0"
+ minimist "1.x"
+ vinyl "2.x"
+ vinyl-sourcemaps-apply "^0.2.0"
+ optionalDependencies:
+ google-closure-compiler-linux "^20200224.0.0"
+ google-closure-compiler-osx "^20200224.0.0"
+ google-closure-compiler-windows "^20200224.0.0"
+
+has-flag@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+he@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+html-minifier-terser@5.0.2:
+ version "5.0.2"
+ resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16"
+ integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==
+ dependencies:
+ camel-case "^3.0.0"
+ clean-css "^4.2.1"
+ commander "^4.0.0"
+ he "^1.2.0"
+ param-case "^2.1.1"
+ relateurl "^0.2.7"
+ terser "^4.3.9"
+
+inherits@^2.0.1, inherits@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+isarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+lower-case@^1.1.1:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+ integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+
+minimist@1.x:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+nan@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
+ integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=
+
+no-case@^2.2.0:
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+ integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+ dependencies:
+ lower-case "^1.1.1"
+
+options@>=0.0.5:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+ integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
+
+param-case@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+ integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
+ dependencies:
+ no-case "^2.2.0"
+
+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+readable-stream@^2.3.5:
+ version "2.3.7"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
+relateurl@^0.2.7:
+ version "0.2.7"
+ resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+ integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
+
+remove-trailing-separator@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+ integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+replace-ext@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+ integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+source-map-support@~0.5.12:
+ version "0.5.19"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+ integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+ dependencies:
+ buffer-from "^1.0.0"
+ source-map "^0.6.0"
+
+source-map@0.5.6:
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+ integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+
+source-map@^0.5.1:
+ version "0.5.7"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+ integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+string_decoder@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+ dependencies:
+ safe-buffer "~5.1.0"
+
+supports-color@^5.3.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+ dependencies:
+ has-flag "^3.0.0"
+
+terser@^4.3.9:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+ integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+ dependencies:
+ commander "^2.20.0"
+ source-map "~0.6.1"
+ source-map-support "~0.5.12"
+
+tinycolor@0.x:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164"
+ integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=
+
+upper-case@^1.1.1:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+ integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
+
+util-deprecate@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+vinyl-sourcemaps-apply@^0.2.0:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+ integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
+ dependencies:
+ source-map "^0.5.1"
+
+vinyl@2.x:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
+ integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
+ dependencies:
+ clone "^2.1.1"
+ clone-buffer "^1.0.0"
+ clone-stats "^1.0.0"
+ cloneable-readable "^1.0.0"
+ remove-trailing-separator "^1.0.1"
+ replace-ext "^1.0.0"
+
+wasm2c@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"
+ integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA==
+
+ws@~0.4.28:
+ version "0.4.32"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32"
+ integrity sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=
+ dependencies:
+ commander "~2.1.0"
+ nan "~1.0.0"
+ options ">=0.0.5"
+ tinycolor "0.x"
diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix
new file mode 100644
index 00000000000..af01d9c6869
--- /dev/null
+++ b/pkgs/development/compilers/emscripten/yarn.nix
@@ -0,0 +1,437 @@
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+ offline_cache = linkFarm "offline" packages;
+ packages = [
+ {
+ name = "acorn___acorn_7.3.1.tgz";
+ path = fetchurl {
+ name = "acorn___acorn_7.3.1.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz";
+ sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd";
+ };
+ }
+ {
+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
+ path = fetchurl {
+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz";
+ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
+ };
+ }
+ {
+ name = "buffer_from___buffer_from_1.1.1.tgz";
+ path = fetchurl {
+ name = "buffer_from___buffer_from_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz";
+ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
+ };
+ }
+ {
+ name = "camel_case___camel_case_3.0.0.tgz";
+ path = fetchurl {
+ name = "camel_case___camel_case_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz";
+ sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
+ };
+ }
+ {
+ name = "chalk___chalk_2.4.2.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_2.4.2.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+ sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
+ };
+ }
+ {
+ name = "clean_css___clean_css_4.2.3.tgz";
+ path = fetchurl {
+ name = "clean_css___clean_css_4.2.3.tgz";
+ url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz";
+ sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
+ };
+ }
+ {
+ name = "clone_buffer___clone_buffer_1.0.0.tgz";
+ path = fetchurl {
+ name = "clone_buffer___clone_buffer_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
+ sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
+ };
+ }
+ {
+ name = "clone_stats___clone_stats_1.0.0.tgz";
+ path = fetchurl {
+ name = "clone_stats___clone_stats_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
+ sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
+ };
+ }
+ {
+ name = "clone___clone_2.1.2.tgz";
+ path = fetchurl {
+ name = "clone___clone_2.1.2.tgz";
+ url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz";
+ sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
+ };
+ }
+ {
+ name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
+ path = fetchurl {
+ name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
+ sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
+ };
+ }
+ {
+ name = "color_convert___color_convert_1.9.3.tgz";
+ path = fetchurl {
+ name = "color_convert___color_convert_1.9.3.tgz";
+ url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz";
+ sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8";
+ };
+ }
+ {
+ name = "color_name___color_name_1.1.3.tgz";
+ path = fetchurl {
+ name = "color_name___color_name_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
+ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+ };
+ }
+ {
+ name = "commander___commander_2.20.3.tgz";
+ path = fetchurl {
+ name = "commander___commander_2.20.3.tgz";
+ url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
+ sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
+ };
+ }
+ {
+ name = "commander___commander_4.1.1.tgz";
+ path = fetchurl {
+ name = "commander___commander_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz";
+ sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068";
+ };
+ }
+ {
+ name = "commander___commander_2.1.0.tgz";
+ path = fetchurl {
+ name = "commander___commander_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz";
+ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+ };
+ }
+ {
+ name = "core_util_is___core_util_is_1.0.2.tgz";
+ path = fetchurl {
+ name = "core_util_is___core_util_is_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+ };
+ }
+ {
+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+ path = fetchurl {
+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+ };
+ }
+ {
+ name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz";
+ sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc";
+ };
+ }
+ {
+ name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz";
+ sha1 = "cf4b598abf7be686c683e530529756805b8af500";
+ };
+ }
+ {
+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz";
+ sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902";
+ };
+ }
+ {
+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz";
+ sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed";
+ };
+ }
+ {
+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz";
+ sha1 = "cae323b898625ca57b0e87aaddde021a414dda58";
+ };
+ }
+ {
+ name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz";
+ sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283";
+ };
+ }
+ {
+ name = "has_flag___has_flag_3.0.0.tgz";
+ path = fetchurl {
+ name = "has_flag___has_flag_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
+ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+ };
+ }
+ {
+ name = "he___he_1.2.0.tgz";
+ path = fetchurl {
+ name = "he___he_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz";
+ sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
+ };
+ }
+ {
+ name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz";
+ path = fetchurl {
+ name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz";
+ url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz";
+ sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16";
+ };
+ }
+ {
+ name = "inherits___inherits_2.0.4.tgz";
+ path = fetchurl {
+ name = "inherits___inherits_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
+ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
+ };
+ }
+ {
+ name = "isarray___isarray_1.0.0.tgz";
+ path = fetchurl {
+ name = "isarray___isarray_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+ };
+ }
+ {
+ name = "lower_case___lower_case_1.1.4.tgz";
+ path = fetchurl {
+ name = "lower_case___lower_case_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz";
+ sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
+ };
+ }
+ {
+ name = "minimist___minimist_1.2.5.tgz";
+ path = fetchurl {
+ name = "minimist___minimist_1.2.5.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
+ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
+ };
+ }
+ {
+ name = "nan___nan_1.0.0.tgz";
+ path = fetchurl {
+ name = "nan___nan_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz";
+ sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+ };
+ }
+ {
+ name = "no_case___no_case_2.3.2.tgz";
+ path = fetchurl {
+ name = "no_case___no_case_2.3.2.tgz";
+ url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz";
+ sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
+ };
+ }
+ {
+ name = "options___options_0.0.6.tgz";
+ path = fetchurl {
+ name = "options___options_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz";
+ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+ };
+ }
+ {
+ name = "param_case___param_case_2.1.1.tgz";
+ path = fetchurl {
+ name = "param_case___param_case_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz";
+ sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
+ };
+ }
+ {
+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+ path = fetchurl {
+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
+ };
+ }
+ {
+ name = "readable_stream___readable_stream_2.3.7.tgz";
+ path = fetchurl {
+ name = "readable_stream___readable_stream_2.3.7.tgz";
+ url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
+ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
+ };
+ }
+ {
+ name = "relateurl___relateurl_0.2.7.tgz";
+ path = fetchurl {
+ name = "relateurl___relateurl_0.2.7.tgz";
+ url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz";
+ sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+ };
+ }
+ {
+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+ path = fetchurl {
+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+ sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+ };
+ }
+ {
+ name = "replace_ext___replace_ext_1.0.1.tgz";
+ path = fetchurl {
+ name = "replace_ext___replace_ext_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz";
+ sha1 = "2d6d996d04a15855d967443631dd5f77825b016a";
+ };
+ }
+ {
+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
+ path = fetchurl {
+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
+ url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
+ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
+ };
+ }
+ {
+ name = "source_map_support___source_map_support_0.5.19.tgz";
+ path = fetchurl {
+ name = "source_map_support___source_map_support_0.5.19.tgz";
+ url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz";
+ sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
+ };
+ }
+ {
+ name = "source_map___source_map_0.5.6.tgz";
+ path = fetchurl {
+ name = "source_map___source_map_0.5.6.tgz";
+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz";
+ sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+ };
+ }
+ {
+ name = "source_map___source_map_0.5.7.tgz";
+ path = fetchurl {
+ name = "source_map___source_map_0.5.7.tgz";
+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+ };
+ }
+ {
+ name = "source_map___source_map_0.6.1.tgz";
+ path = fetchurl {
+ name = "source_map___source_map_0.6.1.tgz";
+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz";
+ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263";
+ };
+ }
+ {
+ name = "string_decoder___string_decoder_1.1.1.tgz";
+ path = fetchurl {
+ name = "string_decoder___string_decoder_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz";
+ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
+ };
+ }
+ {
+ name = "supports_color___supports_color_5.5.0.tgz";
+ path = fetchurl {
+ name = "supports_color___supports_color_5.5.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz";
+ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
+ };
+ }
+ {
+ name = "terser___terser_4.8.0.tgz";
+ path = fetchurl {
+ name = "terser___terser_4.8.0.tgz";
+ url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz";
+ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17";
+ };
+ }
+ {
+ name = "tinycolor___tinycolor_0.0.1.tgz";
+ path = fetchurl {
+ name = "tinycolor___tinycolor_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz";
+ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+ };
+ }
+ {
+ name = "upper_case___upper_case_1.1.3.tgz";
+ path = fetchurl {
+ name = "upper_case___upper_case_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz";
+ sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
+ };
+ }
+ {
+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
+ path = fetchurl {
+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+ };
+ }
+ {
+ name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
+ path = fetchurl {
+ name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
+ url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz";
+ sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
+ };
+ }
+ {
+ name = "vinyl___vinyl_2.2.0.tgz";
+ path = fetchurl {
+ name = "vinyl___vinyl_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
+ sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
+ };
+ }
+ {
+ name = "wasm2c___wasm2c_1.0.0.tgz";
+ path = fetchurl {
+ name = "wasm2c___wasm2c_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz";
+ sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0";
+ };
+ }
+ {
+ name = "ws___ws_0.4.32.tgz";
+ path = fetchurl {
+ name = "ws___ws_0.4.32.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz";
+ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+ };
+ }
+ ];
+}
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/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix
index ae723a14531..aa34798cc58 100644
--- a/pkgs/development/compilers/gcc/10/default.nix
+++ b/pkgs/development/compilers/gcc/10/default.nix
@@ -11,7 +11,7 @@
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
@@ -151,11 +151,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 6a2c506b1bf..213d0c91ff3 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -11,7 +11,7 @@
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
@@ -160,11 +160,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 6f4fd415fc0..98d4b61648e 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -11,7 +11,7 @@
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
@@ -173,11 +173,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 8e3f9634717..a2f034a4827 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -13,7 +13,7 @@
, texinfo ? null
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
@@ -191,11 +191,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index dcd129ff25a..6d066044ec1 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -10,7 +10,7 @@
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
@@ -158,11 +158,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 5a6e20c0f41..9e6a24d1294 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -10,7 +10,7 @@
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
@@ -148,11 +148,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 5f0a69583a1..7cfc977b3f4 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -12,7 +12,7 @@
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
-, gmp, mpfr, libmpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
@@ -158,11 +158,14 @@ stdenv.mkDerivation ({
# For building runtime libs
depsBuildTarget =
- if hostPlatform == buildPlatform then [
- targetPackages.stdenv.cc.bintools # newly-built gcc will be used
- ] else assert targetPlatform == hostPlatform; [ # build != host == target
- stdenv.cc
- ];
+ (
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ]
+ )
+ ++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 45587020844..d242f1a822c 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -241,7 +241,7 @@ postInstall() {
# More dependencies with the previous gcc or some libs (gccbug stores the build command line)
rm -rf $out/bin/gccbug
- if type "patchelf"; then
+ if [[ buildConfig == *"linux"* ]]; then
# Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do
PREV_RPATH=`patchelf --print-rpath "$i"`
@@ -250,6 +250,16 @@ postInstall() {
done
fi
+ if [[ targetConfig == *"linux"* ]]; then
+ # For some reason, when building for linux on darwin, the libs retain
+ # RPATH to $out.
+ for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do
+ PREV_RPATH=`patchelf --print-rpath "$i"`
+ NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
+ patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
+ done
+ fi
+
if type "install_name_tool"; then
for i in "${!outputLib}"/lib/*.*.dylib; do
install_name_tool -id "$i" "$i" || true
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/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix
index 4b1358b7247..dcc3457fe11 100644
--- a/pkgs/development/compilers/sagittarius-scheme/default.nix
+++ b/pkgs/development/compilers/sagittarius-scheme/default.nix
@@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
in
stdenv.mkDerivation rec {
pname = "sagittarius-scheme";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchurl {
url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz";
- sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr";
+ sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8";
};
preBuild = ''
# since we lack rpath during build, need to explicitly add build path
diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix
index eb431b9faf2..f6109398da8 100644
--- a/pkgs/development/coq-modules/gappalib/default.nix
+++ b/pkgs/development/coq-modules/gappalib/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, which, coq, flocq }:
stdenv.mkDerivation {
- name = "coq${coq.coq-version}-gappalib-1.4.3";
+ name = "coq${coq.coq-version}-gappalib-1.4.4";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz";
- sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370";
+ url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz";
+ sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn";
};
nativeBuildInputs = [ which ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
};
passthru = {
- compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ];
+ compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ];
};
}
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 402c3e781ad..7db4992d1d6 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -235,7 +235,7 @@ let
'';
preFixup = (args.preFixup or "") + ''
- find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
+ find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
'';
strictDeps = true;
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 9d3c7c3d573..de0a35b6934 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -211,8 +211,7 @@ let
'';
preFixup = preFixup + ''
- find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
- find $out/libexec -type f -exec ${removeExpr removeReferences} '{}' + || true
+ find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
'';
strictDeps = true;
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/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index 03a3b953709..dcfa41cc308 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -6,67 +6,81 @@
}:
let
- envs = let
- inherit python;
- pythonEnv = python.withPackages(ps: with ps; [ ]);
- pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]);
- in {
- # Plain Python interpreter
- plain = rec {
- env = python;
- interpreter = env.interpreter;
- is_venv = "False";
- is_nixenv = "False";
- is_virtualenv = "False";
- };
- } // lib.optionalAttrs (!python.isPyPy) {
- # Use virtualenv from a Nix env.
- nixenv-virtualenv = rec {
- env = runCommand "${python.name}-virtualenv" {} ''
- ${pythonVirtualEnv.interpreter} -m virtualenv $out
- '';
- interpreter = "${env}/bin/${python.executable}";
- is_venv = "False";
- is_nixenv = "True";
- is_virtualenv = "True";
- };
- } // lib.optionalAttrs (python.implementation != "graal") {
- # Python Nix environment (python.buildEnv)
- nixenv = rec {
- env = pythonEnv;
- interpreter = env.interpreter;
- is_venv = "False";
- is_nixenv = "True";
- is_virtualenv = "False";
- };
- } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec {
- # Venv built using plain Python
- # Python 2 does not support venv
- # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.
- plain-venv = rec {
- env = runCommand "${python.name}-venv" {} ''
- ${python.interpreter} -m venv $out
- '';
- interpreter = "${env}/bin/${python.executable}";
- is_venv = "True";
- is_nixenv = "False";
- is_virtualenv = "False";
+ environmentTests = let
+ envs = let
+ inherit python;
+ pythonEnv = python.withPackages(ps: with ps; [ ]);
+ pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]);
+ in {
+ # Plain Python interpreter
+ plain = rec {
+ env = python;
+ interpreter = env.interpreter;
+ is_venv = "False";
+ is_nixenv = "False";
+ is_virtualenv = "False";
+ };
+ } // lib.optionalAttrs (!python.isPyPy) {
+ # Use virtualenv from a Nix env.
+ nixenv-virtualenv = rec {
+ env = runCommand "${python.name}-virtualenv" {} ''
+ ${pythonVirtualEnv.interpreter} -m virtualenv $out
+ '';
+ interpreter = "${env}/bin/${python.executable}";
+ is_venv = "False";
+ is_nixenv = "True";
+ is_virtualenv = "True";
+ };
+ } // lib.optionalAttrs (python.implementation != "graal") {
+ # Python Nix environment (python.buildEnv)
+ nixenv = rec {
+ env = pythonEnv;
+ interpreter = env.interpreter;
+ is_venv = "False";
+ is_nixenv = "True";
+ is_virtualenv = "False";
+ };
+ } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec {
+ # Venv built using plain Python
+ # Python 2 does not support venv
+ # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.
+ plain-venv = rec {
+ env = runCommand "${python.name}-venv" {} ''
+ ${python.interpreter} -m venv $out
+ '';
+ interpreter = "${env}/bin/${python.executable}";
+ is_venv = "True";
+ is_nixenv = "False";
+ is_virtualenv = "False";
+ };
+
+ } // lib.optionalAttrs (python.pythonAtLeast "3.8") {
+ # Venv built using Python Nix environment (python.buildEnv)
+ # TODO: Cannot create venv from a nix env
+ # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
+ nixenv-venv = rec {
+ env = runCommand "${python.name}-venv" {} ''
+ ${pythonEnv.interpreter} -m venv $out
+ '';
+ interpreter = "${env}/bin/${pythonEnv.executable}";
+ is_venv = "True";
+ is_nixenv = "True";
+ is_virtualenv = "False";
+ };
};
- } // lib.optionalAttrs (python.pythonAtLeast "3.8") {
- # Venv built using Python Nix environment (python.buildEnv)
- # TODO: Cannot create venv from a nix env
- # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
- nixenv-venv = rec {
- env = runCommand "${python.name}-venv" {} ''
- ${pythonEnv.interpreter} -m venv $out
- '';
- interpreter = "${env}/bin/${pythonEnv.executable}";
- is_venv = "True";
- is_nixenv = "True";
- is_virtualenv = "False";
- };
- };
+ testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({
+ inherit (python) pythonVersion;
+ } // attrs) ''
+ cp -r ${./tests/test_environments} tests
+ chmod -R +w tests
+ substituteAllInPlace tests/test_python.py
+ ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py
+ mkdir $out
+ touch $out/success
+ '';
+
+ in lib.mapAttrs testfun envs;
# All PyPy package builds are broken at the moment
integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec {
@@ -76,15 +90,6 @@ let
};
};
- testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({
- inherit (python) pythonVersion;
- } // attrs) ''
- cp -r ${./tests} tests
- chmod -R +w tests
- substituteAllInPlace tests/test_python.py
- ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py
- mkdir $out
- touch $out/success
- '';
-in lib.mapAttrs testfun envs // integrationTests
+
+in environmentTests // integrationTests
diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py
similarity index 100%
rename from pkgs/development/interpreters/python/tests/test_python.py
rename to pkgs/development/interpreters/python/tests/test_environments/test_python.py
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index fb33743dc9a..0c708cd3171 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.08.1";
+ version = "2020.08.2";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1jwlqppm2g6ivzpipkcyihsxzsii3qyx1f35n7wj5dsf99b3hkfm";
+ sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 93b42d2b8e1..3f5f7afcfed 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.08.1";
+ version = "2020.08.2";
src = fetchurl {
- url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "0pxmg22dx6rhfgrxq4gbwqf6d2nahw6iprjvrg8brkbcbyj3ryhd";
+ url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
+ sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 65d85eddbe4..51f13de08a8 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "enchant";
- version = "2.2.8";
+ version = "2.2.9";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7";
+ sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index c00e8035f18..14f822432ee 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -2,7 +2,10 @@
, fetchFromGitHub
, meson
, ninja
-, pkgconfig
+, pkg-config
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
, wayland
, gtk3
, gobject-introspection
@@ -10,30 +13,39 @@
stdenv.mkDerivation rec {
pname = "gtk-layer-shell";
- version = "0.1.0";
+ version = "0.2.0";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "wmww";
repo = "gtk-layer-shell";
rev = "v${version}";
- sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8";
+ sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg";
};
nativeBuildInputs = [
- meson ninja pkgconfig
+ meson
+ ninja
+ pkg-config
+ gobject-introspection
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
];
buildInputs = [
- wayland gtk3 gobject-introspection
+ wayland
+ gtk3
];
mesonFlags = [
- "-Dout=${placeholder "out"}"
+ "-Ddocs=true"
];
meta = with stdenv.lib; {
description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
- license = licenses.mit;
+ license = licenses.lgpl3Plus;
maintainers = with maintainers; [ eonpatapon ];
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index f4074772867..966d89e4cbf 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -146,6 +146,7 @@ let
kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils {};
kconfigwidgets = callPackage ./kconfigwidgets {};
+ kdav = callPackage ./kdav.nix {};
kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 81a755bd3ba..839b2eb466d 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/)
+WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/)
diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix
similarity index 83%
rename from pkgs/applications/kde/kdav.nix
rename to pkgs/development/libraries/kde-frameworks/kdav.nix
index 800c92511de..a03cca3fdf2 100644
--- a/pkgs/applications/kde/kdav.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdav.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, kdepimTeam,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, kio, qtxmlpatterns,
}:
@@ -8,7 +8,6 @@ mkDerivation {
name = "kdav";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
- maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kio qtxmlpatterns ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
index ffc7edadfab..f82bf828e8e 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
+++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
@@ -21,14 +21,14 @@ index 44fbacd..6b5abf5 100644
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
- if (daemon.isEmpty()) {
-- qWarning() << "kdesud daemon not found.";
+- qCWarning(KSU_LOG) << "kdesud daemon not found.";
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
+ if (!QFile::exists(daemon)) { // if not in wrappers
+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
+ if (daemon.isEmpty()) {
-+ qWarning() << "kdesud daemon not found.";
++ qCWarning(KSU_LOG) << "kdesud daemon not found.";
+ }
}
}
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 7dd91ffb247..990c3c4fdf9 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -9,13 +9,6 @@ let
self = mkDerivation {
name = "krunner";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- patches = [
- # Un-deprecate virtual method to restore binary compatibility.
- (assert !(lib.versionOlder "5.72" self.version); fetchpatch {
- url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff";
- sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby";
- })
- ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index c19836ed7a7..36e0ddc3f94 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, propagateBin,
extra-cmake-modules,
- qtbase, wayland, wayland-protocols
+ plasma-wayland-protocols, qtbase, wayland, wayland-protocols
}:
mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ wayland wayland-protocols ];
+ buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
propagatedBuildInputs = [ qtbase ];
setupHook = propagateBin; # XDG_CONFIG_DIRS
}
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 8ac9d33c8de..070b11f6bfb 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,659 +4,667 @@
{
attica = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz";
- sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d";
- name = "attica-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz";
+ sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a";
+ name = "attica-5.73.0.tar.xz";
};
};
baloo = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz";
- sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b";
- name = "baloo-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz";
+ sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe";
+ name = "baloo-5.73.0.tar.xz";
};
};
bluez-qt = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz";
- sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad";
- name = "bluez-qt-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz";
+ sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4";
+ name = "bluez-qt-5.73.0.tar.xz";
};
};
breeze-icons = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz";
- sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155";
- name = "breeze-icons-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz";
+ sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b";
+ name = "breeze-icons-5.73.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz";
- sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878";
- name = "extra-cmake-modules-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz";
+ sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4";
+ name = "extra-cmake-modules-5.73.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz";
- sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961";
- name = "frameworkintegration-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz";
+ sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3";
+ name = "frameworkintegration-5.73.0.tar.xz";
};
};
kactivities = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz";
- sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f";
- name = "kactivities-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz";
+ sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a";
+ name = "kactivities-5.73.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz";
- sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978";
- name = "kactivities-stats-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz";
+ sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a";
+ name = "kactivities-stats-5.73.0.tar.xz";
};
};
kapidox = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz";
- sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5";
- name = "kapidox-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz";
+ sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5";
+ name = "kapidox-5.73.0.tar.xz";
};
};
karchive = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz";
- sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624";
- name = "karchive-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz";
+ sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f";
+ name = "karchive-5.73.0.tar.xz";
};
};
kauth = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz";
- sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5";
- name = "kauth-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz";
+ sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9";
+ name = "kauth-5.73.0.tar.xz";
};
};
kbookmarks = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz";
- sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a";
- name = "kbookmarks-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz";
+ sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51";
+ name = "kbookmarks-5.73.0.tar.xz";
};
};
kcalendarcore = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz";
- sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94";
- name = "kcalendarcore-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz";
+ sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713";
+ name = "kcalendarcore-5.73.0.tar.xz";
};
};
kcmutils = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz";
- sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d";
- name = "kcmutils-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz";
+ sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9";
+ name = "kcmutils-5.73.0.tar.xz";
};
};
kcodecs = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz";
- sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28";
- name = "kcodecs-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz";
+ sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67";
+ name = "kcodecs-5.73.0.tar.xz";
};
};
kcompletion = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz";
- sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4";
- name = "kcompletion-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz";
+ sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a";
+ name = "kcompletion-5.73.0.tar.xz";
};
};
kconfig = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz";
- sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4";
- name = "kconfig-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz";
+ sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e";
+ name = "kconfig-5.73.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz";
- sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f";
- name = "kconfigwidgets-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz";
+ sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e";
+ name = "kconfigwidgets-5.73.0.tar.xz";
};
};
kcontacts = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz";
- sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd";
- name = "kcontacts-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz";
+ sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb";
+ name = "kcontacts-5.73.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz";
- sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b";
- name = "kcoreaddons-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz";
+ sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51";
+ name = "kcoreaddons-5.73.0.tar.xz";
};
};
kcrash = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz";
- sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005";
- name = "kcrash-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz";
+ sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583";
+ name = "kcrash-5.73.0.tar.xz";
+ };
+ };
+ kdav = {
+ version = "5.73.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz";
+ sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31";
+ name = "kdav-5.73.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz";
- sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c";
- name = "kdbusaddons-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz";
+ sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba";
+ name = "kdbusaddons-5.73.0.tar.xz";
};
};
kdeclarative = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz";
- sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8";
- name = "kdeclarative-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz";
+ sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598";
+ name = "kdeclarative-5.73.0.tar.xz";
};
};
kded = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz";
- sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc";
- name = "kded-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz";
+ sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895";
+ name = "kded-5.73.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz";
- sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7";
- name = "kdelibs4support-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz";
+ sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b";
+ name = "kdelibs4support-5.73.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz";
- sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b";
- name = "kdesignerplugin-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz";
+ sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2";
+ name = "kdesignerplugin-5.73.0.tar.xz";
};
};
kdesu = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz";
- sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a";
- name = "kdesu-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz";
+ sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d";
+ name = "kdesu-5.73.0.tar.xz";
};
};
kdewebkit = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz";
- sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d";
- name = "kdewebkit-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz";
+ sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b";
+ name = "kdewebkit-5.73.0.tar.xz";
};
};
kdnssd = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz";
- sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958";
- name = "kdnssd-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz";
+ sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d";
+ name = "kdnssd-5.73.0.tar.xz";
};
};
kdoctools = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz";
- sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09";
- name = "kdoctools-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz";
+ sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d";
+ name = "kdoctools-5.73.0.tar.xz";
};
};
kemoticons = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz";
- sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc";
- name = "kemoticons-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz";
+ sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778";
+ name = "kemoticons-5.73.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz";
- sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe";
- name = "kfilemetadata-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz";
+ sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894";
+ name = "kfilemetadata-5.73.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz";
- sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c";
- name = "kglobalaccel-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz";
+ sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f";
+ name = "kglobalaccel-5.73.0.tar.xz";
};
};
kguiaddons = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz";
- sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2";
- name = "kguiaddons-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz";
+ sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350";
+ name = "kguiaddons-5.73.0.tar.xz";
};
};
kholidays = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz";
- sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417";
- name = "kholidays-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz";
+ sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab";
+ name = "kholidays-5.73.0.tar.xz";
};
};
khtml = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz";
- sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10";
- name = "khtml-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz";
+ sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262";
+ name = "khtml-5.73.0.tar.xz";
};
};
ki18n = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz";
- sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881";
- name = "ki18n-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz";
+ sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689";
+ name = "ki18n-5.73.0.tar.xz";
};
};
kiconthemes = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz";
- sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496";
- name = "kiconthemes-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz";
+ sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356";
+ name = "kiconthemes-5.73.0.tar.xz";
};
};
kidletime = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz";
- sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d";
- name = "kidletime-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz";
+ sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2";
+ name = "kidletime-5.73.0.tar.xz";
};
};
kimageformats = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz";
- sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94";
- name = "kimageformats-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz";
+ sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b";
+ name = "kimageformats-5.73.0.tar.xz";
};
};
kinit = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz";
- sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6";
- name = "kinit-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz";
+ sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770";
+ name = "kinit-5.73.0.tar.xz";
};
};
kio = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz";
- sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6";
- name = "kio-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz";
+ sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66";
+ name = "kio-5.73.0.tar.xz";
};
};
kirigami2 = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz";
- sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356";
- name = "kirigami2-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz";
+ sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb";
+ name = "kirigami2-5.73.0.tar.xz";
};
};
kitemmodels = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz";
- sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7";
- name = "kitemmodels-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz";
+ sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371";
+ name = "kitemmodels-5.73.0.tar.xz";
};
};
kitemviews = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz";
- sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de";
- name = "kitemviews-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz";
+ sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727";
+ name = "kitemviews-5.73.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz";
- sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3";
- name = "kjobwidgets-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz";
+ sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf";
+ name = "kjobwidgets-5.73.0.tar.xz";
};
};
kjs = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz";
- sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734";
- name = "kjs-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz";
+ sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5";
+ name = "kjs-5.73.0.tar.xz";
};
};
kjsembed = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz";
- sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486";
- name = "kjsembed-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz";
+ sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3";
+ name = "kjsembed-5.73.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz";
- sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca";
- name = "kmediaplayer-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz";
+ sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2";
+ name = "kmediaplayer-5.73.0.tar.xz";
};
};
knewstuff = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz";
- sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855";
- name = "knewstuff-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz";
+ sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e";
+ name = "knewstuff-5.73.0.tar.xz";
};
};
knotifications = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz";
- sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440";
- name = "knotifications-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz";
+ sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c";
+ name = "knotifications-5.73.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz";
- sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e";
- name = "knotifyconfig-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz";
+ sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4";
+ name = "knotifyconfig-5.73.0.tar.xz";
};
};
kpackage = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz";
- sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba";
- name = "kpackage-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz";
+ sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f";
+ name = "kpackage-5.73.0.tar.xz";
};
};
kparts = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz";
- sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90";
- name = "kparts-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz";
+ sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2";
+ name = "kparts-5.73.0.tar.xz";
};
};
kpeople = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz";
- sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403";
- name = "kpeople-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz";
+ sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4";
+ name = "kpeople-5.73.0.tar.xz";
};
};
kplotting = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz";
- sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1";
- name = "kplotting-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz";
+ sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14";
+ name = "kplotting-5.73.0.tar.xz";
};
};
kpty = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz";
- sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9";
- name = "kpty-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz";
+ sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c";
+ name = "kpty-5.73.0.tar.xz";
};
};
kquickcharts = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz";
- sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a";
- name = "kquickcharts-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz";
+ sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe";
+ name = "kquickcharts-5.73.0.tar.xz";
};
};
kross = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz";
- sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c";
- name = "kross-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz";
+ sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e";
+ name = "kross-5.73.0.tar.xz";
};
};
krunner = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz";
- sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952";
- name = "krunner-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz";
+ sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09";
+ name = "krunner-5.73.0.tar.xz";
};
};
kservice = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz";
- sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce";
- name = "kservice-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz";
+ sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b";
+ name = "kservice-5.73.0.tar.xz";
};
};
ktexteditor = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz";
- sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da";
- name = "ktexteditor-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz";
+ sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18";
+ name = "ktexteditor-5.73.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz";
- sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4";
- name = "ktextwidgets-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz";
+ sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5";
+ name = "ktextwidgets-5.73.0.tar.xz";
};
};
kunitconversion = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz";
- sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb";
- name = "kunitconversion-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz";
+ sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935";
+ name = "kunitconversion-5.73.0.tar.xz";
};
};
kwallet = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz";
- sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5";
- name = "kwallet-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz";
+ sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1";
+ name = "kwallet-5.73.0.tar.xz";
};
};
kwayland = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz";
- sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2";
- name = "kwayland-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz";
+ sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe";
+ name = "kwayland-5.73.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz";
- sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e";
- name = "kwidgetsaddons-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz";
+ sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6";
+ name = "kwidgetsaddons-5.73.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz";
- sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda";
- name = "kwindowsystem-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz";
+ sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8";
+ name = "kwindowsystem-5.73.0.tar.xz";
};
};
kxmlgui = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz";
- sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc";
- name = "kxmlgui-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz";
+ sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb";
+ name = "kxmlgui-5.73.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz";
- sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f";
- name = "kxmlrpcclient-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz";
+ sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047";
+ name = "kxmlrpcclient-5.73.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz";
- sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d";
- name = "modemmanager-qt-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz";
+ sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd";
+ name = "modemmanager-qt-5.73.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz";
- sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034";
- name = "networkmanager-qt-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz";
+ sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f";
+ name = "networkmanager-qt-5.73.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz";
- sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04";
- name = "oxygen-icons5-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz";
+ sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc";
+ name = "oxygen-icons5-5.73.0.tar.xz";
};
};
plasma-framework = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz";
- sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067";
- name = "plasma-framework-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz";
+ sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93";
+ name = "plasma-framework-5.73.0.tar.xz";
};
};
prison = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz";
- sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f";
- name = "prison-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz";
+ sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87";
+ name = "prison-5.73.0.tar.xz";
};
};
purpose = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz";
- sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be";
- name = "purpose-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz";
+ sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32";
+ name = "purpose-5.73.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz";
- sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700";
- name = "qqc2-desktop-style-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz";
+ sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd";
+ name = "qqc2-desktop-style-5.73.0.tar.xz";
};
};
solid = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz";
- sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b";
- name = "solid-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz";
+ sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933";
+ name = "solid-5.73.0.tar.xz";
};
};
sonnet = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz";
- sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72";
- name = "sonnet-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz";
+ sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c";
+ name = "sonnet-5.73.0.tar.xz";
};
};
syndication = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz";
- sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0";
- name = "syndication-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz";
+ sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954";
+ name = "syndication-5.73.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz";
- sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84";
- name = "syntax-highlighting-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz";
+ sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b";
+ name = "syntax-highlighting-5.73.0.tar.xz";
};
};
threadweaver = {
- version = "5.71.0";
+ version = "5.73.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz";
- sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d";
- name = "threadweaver-5.71.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz";
+ sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38";
+ name = "threadweaver-5.73.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 52e6264843b..7903fc74639 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -3,15 +3,12 @@
, libatasmart, parted
, utillinux }:
-let
+stdenv.mkDerivation rec {
pname = "kpmcore";
-
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "3.3.0";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq";
};
@@ -24,12 +21,14 @@ in stdenv.mkDerivation rec {
utillinux # needs blkid (note that this is not provided by utillinux-compat)
];
+
nativeBuildInputs = [ extra-cmake-modules ];
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
maintainers = with lib.maintainers; [ peterhoeg ];
- # The build requires at least Qt 5.12:
- broken = lib.versionOlder qtbase.version "5.12.0";
+ # The build requires at least Qt 5.14:
+ broken = lib.versionOlder qtbase.version "5.14";
};
}
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index bf80562a0b1..be3ab953c0a 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libpipeline-1.5.1";
+ name = "libpipeline-1.5.3";
src = fetchurl {
url = "mirror://savannah/libpipeline/${name}.tar.gz";
- sha256 = "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn";
+ sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index f3816c2ef0c..ebaf43e7681 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, getopt, makeWrapper, utillinux }:
+{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }:
stdenv.mkDerivation rec {
pname = "libseccomp";
- version = "2.4.3";
+ version = "2.5.0";
src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
- sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg";
+ sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz";
};
outputs = [ "out" "lib" "dev" "man" ];
- buildInputs = [ getopt makeWrapper ];
+ buildInputs = [ getopt makeWrapper gperf ];
patchPhase = ''
patchShebangs .
@@ -25,13 +25,14 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "High level library for the Linux Kernel seccomp filter";
- homepage = "https://github.com/seccomp/libseccomp";
- license = licenses.lgpl21;
- platforms = platforms.linux;
+ homepage = "https://github.com/seccomp/libseccomp";
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
badPlatforms = [
"alpha-linux"
- "riscv64-linux" "riscv32-linux"
- "sparc-linux" "sparc64-linux"
+ "riscv32-linux"
+ "sparc-linux"
+ "sparc64-linux"
];
maintainers = with maintainers; [ thoughtpolice ];
};
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
new file mode 100644
index 00000000000..ed19fab6d99
--- /dev/null
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ version = "1.3.0";
+ pname = "libthreadar";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
+ sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ configureFlags = [
+ "--disable-build-html"
+ ];
+
+ postInstall = ''
+ # Disable html help
+ rm -r "$out"/share
+ '';
+
+ meta = {
+ homepage = "http://libthreadar.sourceforge.net/";
+ description = ''
+ Libthreadar is a C++ library providing a small set of C++ classes to manipulate
+ threads in a very simple and efficient way from your C++ code.
+ '';
+ maintainers = with maintainers; [ izorkin ];
+ license = licenses.lgpl3;
+ platforms = platforms.unix;
+ };
+}
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/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 8a16803fd8b..d9b7ff13d1a 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -2,7 +2,7 @@
, CoreServices ? null
, buildPackages }:
-let version = "4.27"; in
+let version = "4.28"; in
stdenv.mkDerivation {
pname = "nspr";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd";
+ sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3";
};
patches = [
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index a504aae6a98..e378cd5554c 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.55";
+ version = "3.56";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw";
+ sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
new file mode 100644
index 00000000000..a84c3518c4a
--- /dev/null
+++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
@@ -0,0 +1,24 @@
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules
+, qtbase
+}:
+
+mkDerivation rec {
+ pname = "plasma-wayland-protocols";
+ version = "1.1.1";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+ sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg=";
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [ qtbase ];
+
+ meta = {
+ description = "Plasma Wayland Protocols";
+ license = lib.licenses.lgpl21Plus;
+ platforms = qtbase.meta.platforms;
+ };
+}
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index 77f4e1b9053..06de3f7c569 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "qca-qt5";
- version = "2.2.1";
+ version = "2.3.1";
src = fetchurl {
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
- sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
+ sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks=";
};
buildInputs = [ openssl qtbase ];
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index a4c12793abb..4d7507220b5 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -8,7 +8,7 @@
darwin, libiconv,
dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
- libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
+ libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng,
libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
zlib,
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
harfbuzz icu
# Image formats
- libjpeg libpng libtiff
+ libjpeg libpng
(if compareVersion "5.9.0" < 0 then pcre16 else pcre2)
]
++ (
diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
index 1a7726070be..9c80507b7c7 100644
--- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
@@ -1,6 +1,7 @@
-{ qtModule, qtbase }:
+{ qtModule, qtbase, libtiff }:
qtModule {
name = "qtimageformats";
qtInputs = [ qtbase ];
+ propagatedBuildInputs = [ libtiff ];
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 40b2d6837c5..049b0349a4f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -79,7 +79,7 @@ qtModule {
''
# Patch library paths in Chromium sources
+ optionalString (!stdenv.isDarwin) ''
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index ae3392aeb12..48ed6cf4680 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -84,9 +84,11 @@ stdenv.mkDerivation rec {
"-DENABLE_SHARED=ON"
"-DHIGH_BIT_DEPTH=OFF"
"-DENABLE_HDR10_PLUS=OFF"
+ ] ++ stdenv.lib.optionals is64bit [
"-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
"-DLINKED_10BIT=ON"
"-DLINKED_12BIT=ON"
+ ] ++ [
(mkFlag cliSupport "ENABLE_CLI")
] ++ cmakeFlagsAll;
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index bb14f562d70..f9c91c3a8a6 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -691,6 +691,74 @@ lua-messagepack = buildLuarocksPackage {
license.fullName = "MIT/X11";
};
};
+lua-resty-http = buildLuarocksPackage {
+ pname = "lua-resty-http";
+ version = "0.15-0";
+
+ src = fetchurl {
+ url = mirror://luarocks/lua-resty-http-0.15-0.src.rock;
+ sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz";
+ };
+ disabled = (luaOlder "5.1");
+ propagatedBuildInputs = [ lua ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/ledgetech/lua-resty-http";
+ description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
+ license.fullName = "2-clause BSD";
+ };
+};
+lua-resty-jwt = buildLuarocksPackage {
+ pname = "lua-resty-jwt";
+ version = "0.2.2-0";
+
+ src = fetchurl {
+ url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock;
+ sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa";
+ };
+ disabled = (luaOlder "5.1");
+ propagatedBuildInputs = [ lua ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/cdbattags/lua-resty-jwt";
+ description = "JWT for ngx_lua and LuaJIT.";
+ license.fullName = "Apache License Version 2";
+ };
+};
+lua-resty-openidc = buildLuarocksPackage {
+ pname = "lua-resty-openidc";
+ version = "1.7.2-1";
+
+ src = fetchurl {
+ url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock;
+ sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7";
+ };
+ disabled = (luaOlder "5.1");
+ propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/zmartzone/lua-resty-openidc";
+ description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
+ license.fullName = "Apache 2.0";
+ };
+};
+lua-resty-session = buildLuarocksPackage {
+ pname = "lua-resty-session";
+ version = "3.6-1";
+
+ src = fetchurl {
+ url = mirror://luarocks/lua-resty-session-3.6-1.src.rock;
+ sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i";
+ };
+ disabled = (luaOlder "5.1");
+ propagatedBuildInputs = [ lua ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/bungle/lua-resty-session";
+ description = "Session Library for OpenResty – Flexible and Secure";
+ license.fullName = "BSD";
+ };
+};
lua-term = buildLuarocksPackage {
pname = "lua-term";
version = "0.7-1";
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/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index 71c044a8cc1..e178e066a38 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -4,11 +4,11 @@ buildDunePackage rec {
minimumOCamlVersion = "4.08";
pname = "mirage-crypto";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
- sha256 = "1w09wllls4rp1abq0awffxf69dn0xciy6hsqz413ing5r151wjxr";
+ sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk";
};
useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix
index 64168716399..528ea68d985 100644
--- a/pkgs/development/ocaml-modules/mirage-stack/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix
@@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "mirage-stack";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz";
- sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq";
+ sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb";
};
propagatedBuildInputs = [ mirage-protocols ];
diff --git a/pkgs/development/ocaml-modules/posix/base.nix b/pkgs/development/ocaml-modules/posix/base.nix
new file mode 100644
index 00000000000..a6fe690ebcc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/posix/base.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, fetchFromGitHub
+, ctypes, integers
+}:
+
+buildDunePackage rec {
+ pname = "posix-base";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-posix";
+ rev = "v${version}";
+ sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b";
+ };
+
+ useDune2 = true;
+
+ propagatedBuildInputs = [ ctypes integers ];
+
+ meta = {
+ homepage = "https://www.liquidsoap.info/ocaml-posix/";
+ description = "Base module for the posix bindings";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix
new file mode 100644
index 00000000000..69a469bbece
--- /dev/null
+++ b/pkgs/development/ocaml-modules/posix/socket.nix
@@ -0,0 +1,16 @@
+{ lib, buildDunePackage, posix-base }:
+
+buildDunePackage {
+ pname = "posix-socket";
+
+ inherit (posix-base) version src useDune2;
+
+ propagatedBuildInputs = [ posix-base ];
+
+ doCheck = true;
+
+ meta = posix-base.meta // {
+ description = "Bindings for posix sockets";
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/posix/types.nix b/pkgs/development/ocaml-modules/posix/types.nix
new file mode 100644
index 00000000000..2512fe892c1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/posix/types.nix
@@ -0,0 +1,15 @@
+{ lib, buildDunePackage, posix-base }:
+
+buildDunePackage {
+ pname = "posix-types";
+
+ inherit (posix-base) version src useDune2;
+
+ minimumOCamlVersion = "4.03";
+
+ propagatedBuildInputs = [ posix-base ];
+
+ meta = posix-base.meta // {
+ description = "Bindings for the types defined in ";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix
new file mode 100644
index 00000000000..463bfbc79f9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/webbrowser/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
+, astring, bos, cmdliner, rresult
+}:
+
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-webbrowser-${version}";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
+ sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
+ };
+
+ nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
+ buildInputs = [];
+ propagatedBuildInputs = [ astring bos cmdliner rresult ];
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = {
+ description = "Open and reload URIs in browsers from OCaml";
+ homepage = "https://erratique.ch/software/webbrowser";
+ license = stdenv.lib.licenses.isc;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
new file mode 100644
index 00000000000..5d960b5e92e
--- /dev/null
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python
+, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
+, brotli, fontmath, mutatormath, booleanoperations
+, ufoprocessor, ufonormalizer, psautohint
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "afdko";
+ version = "3.5.0";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [
+ booleanoperations
+ fonttools
+ lxml # fonttools[lxml], defcon[lxml] extra
+ fs # fonttools[ufo] extra
+ unicodedata2 # fonttools[unicode] extra
+ brotlipy # fonttools[woff] extra
+ zopfli # fonttools[woff] extra
+ fontpens
+ brotli
+ defcon
+ fontmath
+ mutatormath
+ ufoprocessor
+ ufonormalizer
+ psautohint
+ ];
+
+ # tests are broken on non x86_64
+ # https://github.com/adobe-type-tools/afdko/issues/1163
+ # https://github.com/adobe-type-tools/afdko/issues/1216
+ doCheck = stdenv.isx86_64;
+ checkInputs = [ pytest ];
+ checkPhase = ''
+ PATH="$PATH:$out/bin" py.test
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Adobe Font Development Kit for OpenType";
+ homepage = "https://adobe-type-tools.github.io/afdko/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 596579f8148..5d4b9bcb5e2 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -20,11 +20,13 @@ buildPythonPackage rec {
cython
];
+ propagatedBuildInputs = [
+ numpy
+ ];
+
checkInputs = [
- cython
hypothesis
- numpy
pytest
];
diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix
new file mode 100644
index 00000000000..c747df90f5a
--- /dev/null
+++ b/pkgs/development/python-modules/booleanoperations/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonPackage, fetchPypi
+, fonttools, fs, pyclipper, defcon, fontpens
+, setuptools_scm, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "booleanOperations";
+ version = "0.9.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc";
+ extension = "zip";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [
+ fonttools
+ fs
+ pyclipper
+ defcon
+ fontpens
+ ];
+
+ checkInputs = [ pytest ];
+
+ meta = with lib; {
+ description = "Boolean operations on paths";
+ homepage = "https://github.com/typemytype/booleanOperations";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index 920fc68e1bb..e8d2731eb55 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -3,6 +3,7 @@
, fetchPypi
, mock
, jsonpickle
+, mmh3
, ordered-set
, numpy
, pytestCheckHook
@@ -24,14 +25,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- disabledTests = [
- # skipped tests require murmur module
- "test_prep_str_murmur3_64bit"
- "test_prep_str_murmur3_128bit"
- ];
-
propagatedBuildInputs = [
jsonpickle
+ mmh3
ordered-set
];
diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
new file mode 100644
index 00000000000..25c59029992
--- /dev/null
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, fonttools
+, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens
+}:
+
+buildPythonPackage rec {
+ pname = "defcon";
+ version = "0.7.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr";
+ extension = "zip";
+ };
+
+ propagatedBuildInputs = [
+ fonttools
+ ];
+
+ checkInputs = [
+ pytest
+ pytestrunner
+ lxml
+ fs
+ unicodedata2
+ fontpens
+ ];
+
+ meta = with lib; {
+ description = "A set of UFO based objects for use in font editing applications";
+ homepage = "https://github.com/robotools/defcon";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
deleted file mode 100644
index b38962f4efa..00000000000
--- a/pkgs/development/python-modules/django/1_11.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl, substituteAll,
- geos, gdal, pytz,
- withGdal ? false
-}:
-
-buildPythonPackage rec {
- pname = "Django";
- version = "1.11.28";
-
- src = fetchurl {
- url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
- sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k";
- };
-
- patches = stdenv.lib.optionals withGdal [
- (substituteAll {
- src = ./1.10-gis-libs.template.patch;
- geos = geos;
- gdal = gdal;
- extension = stdenv.hostPlatform.extensions.sharedLibrary;
- })
- ];
-
- propagatedBuildInputs = [ pytz ];
-
- # too complicated to setup
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "A high-level Python Web framework";
- homepage = "https://www.djangoproject.com/";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index aff7eb0a00c..de0354f786c 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, Mako, decorator
+, pytest, pytestcov, mock, Mako, decorator, stevedore
}:
buildPythonPackage rec {
@@ -26,7 +26,7 @@ buildPythonPackage rec {
checkInputs = [ pytest pytestcov mock Mako ];
- propagatedBuildInputs = [ decorator ];
+ propagatedBuildInputs = [ decorator stevedore ];
meta = with stdenv.lib; {
description = "A caching front-end based on the Dogpile lock";
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/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix
new file mode 100644
index 00000000000..7a23abdd037
--- /dev/null
+++ b/pkgs/development/python-modules/fontmath/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi
+, fonttools
+, pytest, pytestrunner
+}:
+
+buildPythonPackage rec {
+ pname = "fontMath";
+ version = "0.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss";
+ extension = "zip";
+ };
+
+ propagatedBuildInputs = [ fonttools ];
+ checkInputs = [ pytest pytestrunner ];
+
+ meta = with lib; {
+ description = "A collection of objects that implement fast font, glyph, etc. math";
+ homepage = "https://github.com/robotools/fontMath/";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
new file mode 100644
index 00000000000..dd341fef8b3
--- /dev/null
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchPypi, python
+, fonttools, lxml, fs, unicodedata2
+, defcon, fontpens, fontmath, booleanoperations
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "fontParts";
+ version = "0.9.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0hwzdppmrrw1xz49x36h6mcsrwya1f3zpqrc206y73j4pbn7fh0k";
+ extension = "zip";
+ };
+
+ propagatedBuildInputs = [
+ booleanoperations
+ fonttools
+ unicodedata2 # fonttools[unicode] extra
+ lxml # fonttools[lxml] extra
+ fs # fonttools[ufo] extra
+ defcon
+ fontpens # defcon[pens] extra
+ fontmath
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} Lib/fontParts/fontshell/test.py
+ '';
+ checkInputs = [ pytest ];
+
+ meta = with lib; {
+ description = "An API for interacting with the parts of fonts during the font development process.";
+ homepage = "https://github.com/robotools/fontParts";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix
new file mode 100644
index 00000000000..02adb3b0642
--- /dev/null
+++ b/pkgs/development/python-modules/fontpens/default.nix
@@ -0,0 +1,38 @@
+{ lib, buildPythonPackage, fetchPypi, fonttools }:
+
+buildPythonPackage rec {
+ pname = "fontPens";
+ version = "0.2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6";
+ extension = "zip";
+ };
+
+ propagatedBuildInputs = [ fonttools ];
+
+ # can't run normal tests due to circular dependency with fontParts
+ doCheck = false;
+ pythonImportsCheck = [ "fontPens" ] ++ (builtins.map (s: "fontPens." + s) [
+ "angledMarginPen"
+ "digestPointPen"
+ "flattenPen"
+ "guessSmoothPointPen"
+ "marginPen"
+ "penTools"
+ "printPen"
+ "printPointPen"
+ "recordingPointPen"
+ "thresholdPen"
+ "thresholdPointPen"
+ "transformPointPen"
+ ]);
+
+ meta = with lib; {
+ description = "A collection of classes implementing the pen protocol for manipulating glyphs";
+ homepage = "https://github.com/robotools/fontPens";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 9fe285a8e69..a1433d08bd0 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -1,38 +1,70 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, isPy27
-, numpy
+, fetchFromGitHub
+, pythonOlder
+, brotlipy
+, zopfli
+, fs
+, lxml
+, scipy
+, munkres
+, unicodedata2
+, sympy
+, matplotlib
+, reportlab
, pytest
-, pytestrunner
+, pytest-randomly
, glibcLocales
}:
buildPythonPackage rec {
pname = "fonttools";
- version = "4.13.0";
- disabled = isPy27;
+ version = "4.14.0";
+ disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "63987cd374c39a75146748f8be8637634221e53fef15cdf76f17777676d8545a";
- extension = "zip";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in";
};
- buildInputs = [
- numpy
- ];
-
+ # all dependencies are optional, but
+ # we run the checks with them
checkInputs = [
pytest
- pytestrunner
+ pytest-randomly
glibcLocales
+ # etree extra
+ lxml
+ # ufo extra
+ fs
+ # woff extra
+ brotlipy
+ zopfli
+ # unicode extra
+ unicodedata2
+ # interpolatable extra
+ scipy
+ munkres
+ # symfont
+ sympy
+ # varLib
+ matplotlib
+ # pens
+ reportlab
];
preCheck = ''
export LC_ALL="en_US.UTF-8"
'';
+ # avoid timing issues with timestamps in subset_test.py and ttx_test.py
+ checkPhase = ''
+ pytest Tests fontTools \
+ -k 'not ttcompile_timestamp_calcs and not recalc_timestamp'
+ '';
+
meta = {
homepage = "https://github.com/fonttools/fonttools";
description = "A library to manipulate font files from Python";
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/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix
index 42e45d162ba..45178377026 100644
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/pkgs/development/python-modules/jinja2/default.nix
@@ -3,7 +3,9 @@
, isPy3k
, fetchPypi
, pytest
-, markupsafe }:
+, markupsafe
+, setuptools
+}:
buildPythonPackage rec {
pname = "Jinja2";
@@ -15,7 +17,7 @@ buildPythonPackage rec {
};
checkInputs = [ pytest ];
- propagatedBuildInputs = [ markupsafe ];
+ propagatedBuildInputs = [ markupsafe setuptools ];
# Multiple tests run out of stack space on 32bit systems with python2.
# See https://github.com/pallets/jinja/issues/1158
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/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 73c8485ae7a..560cd4383b1 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "kombu";
- version = "5.0.0";
+ version = "4.6.11";
src = fetchPypi {
inherit pname version;
- sha256 = "7c949fe33573a971f06c8836ca025390088f3747533b78438f9a57344a142b59";
+ sha256 = "ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix
new file mode 100644
index 00000000000..c1320eef04c
--- /dev/null
+++ b/pkgs/development/python-modules/lml/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "lml";
+ version = "0.0.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8=";
+ };
+
+ checkInputs = [
+ nose
+ mock
+ ];
+
+ checkPhase = "nosetests";
+
+ meta = {
+ description = "Load me later. A lazy plugin management system for Python";
+ homepage = "http://lml.readthedocs.io/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ jtojnar ];
+ };
+}
diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix
index 7bea2b04bbd..e87146f6fbc 100644
--- a/pkgs/development/python-modules/ludios_wpull/default.nix
+++ b/pkgs/development/python-modules/ludios_wpull/default.nix
@@ -8,15 +8,16 @@
, lxml
, namedlist
, sqlalchemy
-, tornado_4
+, tornado
, Yapsy
+, pythonAtLeast
}:
buildPythonPackage rec {
pname = "ludios_wpull";
version = "3.0.7";
- disabled = !isPy3k;
+ disabled = (!isPy3k) || (pythonAtLeast "3.8");
src = fetchFromGitHub {
rev = version;
@@ -25,7 +26,7 @@ buildPythonPackage rec {
sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
};
- propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ];
+ propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ];
# Test suite has tests that fail on all platforms
doCheck = false;
@@ -35,5 +36,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ludios/wpull";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ivan ];
+ broken = lib.versions.major tornado.version != "4";
};
}
diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix
new file mode 100644
index 00000000000..f9c1cf6839f
--- /dev/null
+++ b/pkgs/development/python-modules/mathlibtools/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, PyGithub, GitPython, toml, click, tqdm,
+ paramiko, networkx, pydot, pyyaml }:
+
+buildPythonPackage rec {
+ pname = "mathlibtools";
+ version = "0.0.10";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36";
+ };
+
+ propagatedBuildInputs = [
+ PyGithub GitPython toml click tqdm paramiko networkx pydot pyyaml
+ ];
+
+ # requires internet access
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = "https://github.com/leanprover-community/mathlib-tools";
+ description = "leanproject is a supporting tool for Lean's mathlib";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ gebner ];
+ };
+}
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/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix
new file mode 100644
index 00000000000..8ac24188003
--- /dev/null
+++ b/pkgs/development/python-modules/mmh3/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+}:
+
+buildPythonPackage rec {
+ pname = "mmh3";
+ version = "2.5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq";
+ };
+
+ pythonImportsCheck = [ "mmh3" ];
+
+ meta = with lib; {
+ description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions";
+ homepage = "https://pypi.org/project/mmh3/";
+ license = licenses.cc0;
+ maintainers = [ maintainers.danieldk ];
+ };
+}
diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix
new file mode 100644
index 00000000000..9336dbf354a
--- /dev/null
+++ b/pkgs/development/python-modules/mutatormath/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi
+, defcon, fontmath
+, unicodedata2, fs
+}:
+
+buildPythonPackage rec {
+ pname = "MutatorMath";
+ version = "3.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1";
+ extension = "zip";
+ };
+
+ propagatedBuildInputs = [ fontmath unicodedata2 defcon ];
+ checkInputs = [ unicodedata2 fs ];
+
+ meta = with lib; {
+ description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters";
+ homepage = "https://github.com/LettError/MutatorMath";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 6ee4d937cfb..67873f929ad 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -15,17 +15,13 @@
buildPythonPackage rec {
pname = "nix-prefetch-github";
- version = "2.4";
+ version = "3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E=";
+ sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA=";
};
- # The tests for this package require nix and network access. That's
- # why we cannot execute them inside the building process.
- doCheck = false;
-
propagatedBuildInputs = [
attrs
click
@@ -34,6 +30,9 @@ buildPythonPackage rec {
];
checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ];
+ checkPhase = ''
+ pytest -m 'not network'
+ '';
# latest version of isort will cause tests to fail
# ignore tests which are impure
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index e3e23fa8e88..1aef55e8211 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.12.7";
+ version = "8.12.8";
src = fetchPypi {
inherit pname version;
- sha256 = "652c418f8e97c8438f227a524ddf8d7d325c4a47e4924ce865b827c24ec3194d";
+ sha256 = "3a8b8f7b60ea00b83ca588b5ca57e48d9a3c223aa42f1a3d5fa88566424216c3";
};
meta = {
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index 939eeafd9b9..bb2a20cf62f 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -1,10 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy27
, pythonOlder
-, funcsigs
, setuptools_scm
+, importlib-metadata
+, packaging
# Check Inputs
, pytestCheckHook
, numpy
@@ -24,9 +24,10 @@ buildPythonPackage rec {
disabled = pythonOlder "3.6";
- propagatedBuildInputs = [
- setuptools_scm
- ] ++ lib.optional isPy27 funcsigs;
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [ packaging ]
+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
# Test suite explicitly requires pytest
checkInputs = [
diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix
new file mode 100644
index 00000000000..0f89069c7d8
--- /dev/null
+++ b/pkgs/development/python-modules/psautohint/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+, fonttools, lxml, fs
+, setuptools_scm
+, pytest, pytestcov, pytest_xdist, pytest-randomly
+}:
+
+buildPythonPackage rec {
+ pname = "psautohint";
+ version = "2.1.0";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "adobe-type-tools";
+ repo = pname;
+ sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r";
+ rev = "v${version}";
+ fetchSubmodules = true; # data dir for tests
+ };
+
+ postPatch = ''
+ echo '#define PSAUTOHINT_VERSION "${version}"' > libpsautohint/src/version.h
+ sed -i '/use_scm_version/,+3d' setup.py
+ sed -i '/setup(/a \ version="${version}",' setup.py
+ '';
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [ fonttools lxml fs ];
+
+ checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ];
+ checkPhase = "pytest tests";
+
+ meta = with lib; {
+ description = "Script to normalize the XML and other data inside of a UFO";
+ homepage = "https://github.com/adobe-type-tools/psautohint";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix
new file mode 100644
index 00000000000..d7e92f09784
--- /dev/null
+++ b/pkgs/development/python-modules/pure-eval/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }:
+
+buildPythonPackage rec {
+ pname = "pure_eval";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "alexmojaki";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8";
+ };
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ buildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ toml ];
+
+ checkInputs = [ pytest ];
+
+ meta = with lib; {
+ description = "Safely evaluate AST nodes without side effects";
+ homepage = "http://github.com/alexmojaki/pure_eval";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gebner ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix
new file mode 100644
index 00000000000..8a788402b49
--- /dev/null
+++ b/pkgs/development/python-modules/pyexcel-io/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, lml
+}:
+
+buildPythonPackage rec {
+ pname = "pyexcel-io";
+ version = "0.5.20";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk=";
+ };
+
+ propagatedBuildInputs = [
+ lml
+ ];
+
+ # Tests depend on stuff that depends on this.
+ doCheck = false;
+
+ pythonImportsCheck = [ "pyexcel_io" ];
+
+ meta = {
+ description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
+ homepage = "http://docs.pyexcel.org/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ jtojnar ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix
new file mode 100644
index 00000000000..9e5b32ea867
--- /dev/null
+++ b/pkgs/development/python-modules/pyexcel-ods/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyexcel-io
+, odfpy
+, nose
+, pyexcel
+, pyexcel-xls
+, psutil
+}:
+
+buildPythonPackage rec {
+ pname = "pyexcel-ods";
+ version = "0.5.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM=";
+ };
+
+ propagatedBuildInputs = [
+ pyexcel-io
+ odfpy
+ ];
+
+ checkInputs = [
+ nose
+ pyexcel
+ pyexcel-xls
+ psutil
+ ];
+
+ checkPhase = "nosetests";
+
+ meta = {
+ description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
+ homepage = "http://docs.pyexcel.org/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ jtojnar ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
new file mode 100644
index 00000000000..2dd4533c2a9
--- /dev/null
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyexcel-io
+, xlrd
+, xlwt
+, nose
+, pyexcel
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "pyexcel-xls";
+ version = "0.5.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU=";
+ };
+
+ propagatedBuildInputs = [
+ pyexcel-io
+ xlrd
+ xlwt
+ ];
+
+ checkInputs = [
+ nose
+ pyexcel
+ mock
+ ];
+
+ checkPhase = "nosetests";
+
+ meta = {
+ description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
+ homepage = "http://docs.pyexcel.org/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ jtojnar ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
new file mode 100644
index 00000000000..71219c32ae5
--- /dev/null
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, lml
+, pyexcel-io
+, texttable
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "pyexcel";
+ version = "0.6.4";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8=";
+ };
+
+ propagatedBuildInputs = [
+ lml
+ pyexcel-io
+ texttable
+ ];
+
+ checkInputs = [
+ nose
+ ];
+
+ # Tests depend on pyexcel-xls & co. causing circular dependency.
+ # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt
+ doCheck = false;
+
+ pythonImportsCheck = [ "pyexcel" ];
+
+ checkPhase = "nosetests";
+
+ meta = {
+ description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
+ homepage = "http://docs.pyexcel.org/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ jtojnar ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix
index cf6b67c548b..98bb6360ce5 100644
--- a/pkgs/development/python-modules/pyipp/default.nix
+++ b/pkgs/development/python-modules/pyipp/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "pyipp";
- version = "0.10.1";
+ version = "0.11.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "ctalkington";
repo = "python-ipp";
rev = version;
- sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr";
+ sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index f9d07be5796..6d8b828fb95 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "pyside2";
- version = "5.14.2";
+ version = "5.15.0";
src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
- sha256 = "1cwjpv8qmjksi7cj4naw54h2afphw44chrf1pmfjamyyj8vz6ykw";
+ sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi";
};
patches = [
diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix
new file mode 100644
index 00000000000..c4523ac728c
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, factory_boy, faker, numpy
+, pytest, pytest_xdist
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-randomly";
+ version = "3.4.1";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z";
+ };
+
+ propagatedBuildInputs = [ numpy factory_boy faker ];
+
+ checkInputs = [ pytest pytest_xdist ];
+
+ # test warnings are fixed on an unreleased version:
+ # https://github.com/pytest-dev/pytest-randomly/pull/281
+ checkPhase = "pytest -p no:randomly";
+
+ meta = with lib; {
+ description = "Pytest plugin to randomly order tests and control random.seed";
+ homepage = "https://github.com/pytest-dev/pytest-randomly";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix
new file mode 100644
index 00000000000..b1b662e95b3
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch/bin.nix
@@ -0,0 +1,68 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, isPy37
+, isPy38
+, python
+, nvidia_x11
+, addOpenGLRunpath
+, future
+, numpy
+, patchelf
+, pyyaml
+, requests
+}:
+
+let
+ pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
+ platform = if stdenv.isDarwin then "darwin" else "linux";
+ srcs = import ./binary-hashes.nix;
+ unsupported = throw "Unsupported system";
+in buildPythonPackage {
+ pname = "pytorch";
+ # Don't forget to update pytorch to the same version.
+ version = "1.6.0";
+
+ format = "wheel";
+
+ disabled = !(isPy37 || isPy38);
+
+ src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
+
+ nativeBuildInputs = [
+ addOpenGLRunpath
+ patchelf
+ ];
+
+ propagatedBuildInputs = [
+ future
+ numpy
+ pyyaml
+ requests
+ ];
+
+ postInstall = ''
+ # ONNX conversion
+ rm -rf $out/bin
+ '';
+
+ postFixup = let
+ rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
+ in ''
+ find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ echo "setting rpath for $lib..."
+ patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib"
+ addOpenGLRunpath "$lib"
+ done
+ '';
+
+ pythonImportsCheck = [ "torch" ];
+
+ meta = with stdenv.lib; {
+ description = "Open source, prototype-to-production deep learning platform";
+ homepage = "https://pytorch.org/";
+ license = licenses.unfree; # Includes CUDA and Intel MKL.
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix
new file mode 100644
index 00000000000..481dc6825c7
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -0,0 +1,10 @@
+{
+ x86_64-linux-37 = {
+ url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl";
+ sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7";
+ };
+ x86_64-linux-38 = {
+ url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl";
+ sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk";
+ };
+}
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 0aea3b38b5a..9bdead706d7 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -4,7 +4,7 @@
openMPISupport ? false, openmpi ? null,
buildDocs ? false,
cudaArchList ? null,
- numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil,
+ numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil,
linkFarm, symlinkJoin,
# virtual pkg that consistently instantiates blas across nixpkgs
@@ -104,8 +104,10 @@ let
"LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ";
in buildPythonPackage rec {
- version = "1.6.0";
pname = "pytorch";
+ # Don't forget to update pytorch-bin to the same version.
+ version = "1.6.0";
+
disabled = !isPy3k;
outputs = [
@@ -159,9 +161,9 @@ in buildPythonPackage rec {
USE_MKL = blas.implementation == "mkl";
- # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note
- # that this was renamed to dnnl and then renamed again to oneDNN upstream, but
- # pytorch still calls it by the old name mkldnn.
+ # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for
+ # it by default. PyTorch currently uses its own vendored version
+ # of oneDNN through Intel iDeep.
USE_MKLDNN = mklDnnSupport;
USE_MKLDNN_CBLAS = mklDnnSupport;
@@ -210,7 +212,7 @@ in buildPythonPackage rec {
ninja
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
- buildInputs = [ blas blas.provider oneDNN ]
+ buildInputs = [ blas blas.provider ]
++ lib.optionals cudaSupport [ cudnn magma nccl ]
++ lib.optionals stdenv.isLinux [ numactl ];
diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix
index c0a401a1b2a..aabf9cd5de5 100644
--- a/pkgs/development/python-modules/pyudev/default.nix
+++ b/pkgs/development/python-modules/pyudev/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace src/pyudev/_ctypeslib/utils.py \
- --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'"
+ --replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'"
'';
checkInputs = [ pytest mock hypothesis docutils ];
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index ca6a19220d5..a1bf4d53018 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "qtconsole";
- version = "4.7.5";
+ version = "4.7.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754";
+ sha256 = "6c24397c19a49a5cf69582c931db4b0f6b00a78530a2bfd122936f2ebfae2fef";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
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/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index b0d06b014c7..66ca024b2bb 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }:
+{ stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }:
buildPythonPackage rec {
pname = "rq";
- version = "1.5.0";
+ version = "1.5.1";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "370fc800903c226b898a10174e069a23077b74b22297b4b20e925ca82fcd9471";
+ src = fetchFromGitHub {
+ owner = "rq";
+ repo = "rq";
+ rev = "v${version}";
+ sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004";
};
# test require a running redis rerver, which is something we can't do yet
diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix
new file mode 100644
index 00000000000..d29e89db846
--- /dev/null
+++ b/pkgs/development/python-modules/samsungctl/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchPypi
+, websocket_client
+}:
+
+buildPythonPackage rec {
+ pname = "samsungctl";
+ version = "0.7.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g";
+ };
+
+ propagatedBuildInputs = [
+ websocket_client
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "samsungctl" ];
+
+ meta = with lib; {
+ description = "Remote control Samsung televisions via a TCP/IP connection";
+ homepage = "https://github.com/Ape/samsungctl";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
new file mode 100644
index 00000000000..b41935c5825
--- /dev/null
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, requests
+, websocket_client
+}:
+
+buildPythonPackage rec {
+ pname = "samsungtvws";
+ version = "1.5.3";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n";
+ };
+
+ patchPhase = ''
+ substituteInPlace setup.py --replace "websocket-client==" "websocket-client>="
+ '';
+
+ propagatedBuildInputs = [
+ websocket_client
+ requests
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "samsungtvws" ];
+
+ meta = with lib; {
+ description = "Samsung Smart TV WS API wrapper";
+ homepage = "https://github.com/xchwarze/samsung-tv-ws-api";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index f99527d070a..8aa61748af8 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -19,6 +19,9 @@
, urllib3
, trytond
, werkzeug
+, executing
+, pure-eval
+, asttokens
}:
buildPythonPackage rec {
@@ -30,7 +33,8 @@ buildPythonPackage rec {
sha256 = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334";
};
- checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond ]
+ checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
+ executing pure-eval asttokens ]
++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ];
propagatedBuildInputs = [ urllib3 certifi ];
diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix
index 1ff38f0a6df..fde5733a864 100644
--- a/pkgs/development/python-modules/splinter/default.nix
+++ b/pkgs/development/python-modules/splinter/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "splinter";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356";
+ sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db";
};
propagatedBuildInputs = [ selenium ];
diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix
index 8be197e5ca5..b7df857533a 100644
--- a/pkgs/development/python-modules/tldextract/default.nix
+++ b/pkgs/development/python-modules/tldextract/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage, setuptools_scm
, requests, requests-file, idna, pytest
, responses
}:
@@ -14,6 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ requests requests-file idna ];
checkInputs = [ pytest responses ];
+ nativeBuildInputs = [ setuptools_scm ];
meta = {
homepage = "https://github.com/john-kurkowski/tldextract";
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 7d749ea4a9b..f9a2dfa6af3 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.7.14";
+ version = "3.8.4";
src = fetchPypi {
inherit pname version;
- sha256 = "bd3d88fc179d6dfd6d47f63dec4bb8da204c070e78cb2b483f86b33886bf627b";
+ sha256 = "50d2e74f2047a50d097a394fb11b12443f764dfc7145140d5029f7019dea6d4d";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix
new file mode 100644
index 00000000000..70c9061d366
--- /dev/null
+++ b/pkgs/development/python-modules/ufonormalizer/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "ufonormalizer";
+ version = "0.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0nv80x7l7sya5wzyfk9ss93r6bjzjljpkw4k8gibxp1rqrzkdms4";
+ extension = "zip";
+ };
+
+ meta = with lib; {
+ description = "Script to normalize the XML and other data inside of a UFO";
+ homepage = "https://github.com/unified-font-object/ufoNormalizer";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix
new file mode 100644
index 00000000000..db5b1400fe4
--- /dev/null
+++ b/pkgs/development/python-modules/ufoprocessor/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildPythonPackage, fetchPypi
+, defcon, fonttools, lxml, fs
+, mutatormath, fontmath, fontparts
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+ pname = "ufoProcessor";
+ version = "1.9.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s";
+ extension = "zip";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [
+ defcon
+ lxml
+ fonttools
+ fs
+ fontmath
+ fontparts
+ mutatormath
+ ];
+
+ meta = with lib; {
+ description = "Read, write and generate UFOs with designspace data";
+ homepage = "https://github.com/LettError/ufoProcessor";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
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/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix
new file mode 100644
index 00000000000..e36f0f7b03c
--- /dev/null
+++ b/pkgs/development/python-modules/unicodedata2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+
+buildPythonPackage rec {
+ pname = "unicodedata2";
+ version = "13.0.0-2";
+
+ src = fetchFromGitHub {
+ owner = "mikekap";
+ repo = pname;
+ rev = version;
+ sha256 = "0p9brbiwyg98q52y0gfyps52xv57fwqfpq0mn18p1xc1imip3h2b";
+ };
+
+ checkInputs = [ pytest ];
+ checkPhase = "pytest tests";
+
+ meta = with lib; {
+ description = "";
+ homepage = "http://github.com/mikekap/unicodedata2";
+ license = licenses.asl20;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix
new file mode 100644
index 00000000000..58b7d43f3d2
--- /dev/null
+++ b/pkgs/development/python-modules/zopfli/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+ pname = "zopfli";
+ version = "0.1.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd";
+ extension = "zip";
+ };
+
+ checkInputs = [ pytest ];
+
+ meta = with lib; {
+ description = "cPython bindings for zopfli";
+ homepage = "https://github.com/obp/py-zopfli";
+ license = licenses.asl20;
+ maintainers = [ maintainers.sternenseemann ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index be9645453e3..559a4c191b6 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
- version = "3.18.1";
+ version = "3.18.2";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
- sha256 = "0215srmc9l7ygwdpfms8yx0wbd96qgz2d58ykmdiarvysf5k7qy0";
+ sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx";
};
patches = [
@@ -37,12 +37,6 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch
- # TODO: Remove this patch for a regression once CMake 3.18.2 is out:
- (fetchpatch { # PCH: Avoid Apple-specific architecture flags on other platforms
- url = "https://gitlab.kitware.com/cmake/cmake/-/commit/70ce1ad64a04a244bb1c03753da0752c61fc3a37.patch";
- sha256 = "0jcdgv48j0dd4nlhyy3j0s3h6bcbrq2yg1mdhpgfqrb2y3p91fky";
- })
-
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ];
@@ -116,8 +110,17 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
meta = with lib; {
- homepage = "http://www.cmake.org/";
+ homepage = "https://cmake.org/";
+ changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/"
+ + "release/${lib.versions.majorMinor version}.html";
description = "Cross-Platform Makefile Generator";
+ longDescription = ''
+ CMake is an open-source, cross-platform family of tools designed to
+ build, test and package software. CMake is used to control the software
+ compilation process using simple platform and compiler independent
+ configuration files, and generate native makefiles and workspaces that
+ can be used in the compiler environment of your choice.
+ '';
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
maintainers = with maintainers; [ ttuegel lnl7 ];
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/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix
new file mode 100644
index 00000000000..1c81a4145d2
--- /dev/null
+++ b/pkgs/development/tools/dot-http/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dot-http";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "bayne";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml";
+ };
+
+ cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ libiconv Security
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Text-based scriptable HTTP client";
+ homepage = "https://github.com/bayne/dot-http";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mredaelli ];
+ };
+}
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/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
index 9fdaca52ca8..52cc1b2d5c5 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "objconv";
- version = "2.51";
+ version = "2.52";
src = fetchurl {
# Versioned archive of objconv sources maintained by orivej.
url = "https://archive.org/download/objconv/${pname}-${version}.zip";
- sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs";
+ sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 307e123bf77..ffd2a78f509 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper
+{ stdenv, lib, fetchurl, buildEnv, makeWrapper
, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
, libnotify}:
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc
- ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0
+ ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index ab16d951151..4eedc003272 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper
+{ stdenv, lib, fetchurl, buildEnv, makeWrapper
, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
- ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0
+ ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
libpath="$out/share/nwjs/lib/"
for f in "$libpath"/*.so; do
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/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 51af3acdacd..b91acdca688 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -55,13 +55,16 @@ in rustPlatform.buildRustPackage {
# needed for the tests
rm -rf test/fixtures/grammars
ln -s ${grammars} test/fixtures/grammars
+
+ # These functions do not appear in the source code
+ sed -i /_ts_query_context/d lib/binding_web/exports.json
+ sed -i /___assert_fail/d lib/binding_web/exports.json
'';
# Compile web assembly with emscripten. The --debug flag prevents us from
# minifying the JavaScript; passing it allows us to side-step more Node
# JS dependencies for installation.
preBuild = ''
- HOME=/tmp
bash ./script/build-wasm --debug
'';
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 620bce7a0ff..ce731309882 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, desktop-file-utils
, fetchurl
, fetchpatch
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook
gnome3.adwaita-icon-theme
];
- buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ];
+ buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ];
mesonFlags = [
"-Dsystemdunitdir=lib/systemd/system"
diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix
new file mode 100644
index 00000000000..dafcd1ded2f
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-embed/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib
+, rustPlatform, fetchFromGitHub
+, libusb1, pkg-config, rustfmt }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-embed";
+ version = "0.8.0";
+
+ src = fetchFromGitHub {
+ owner = "probe-rs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35";
+ };
+
+ cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8";
+
+ nativeBuildInputs = [ pkg-config rustfmt ];
+ buildInputs = [ libusb1 ];
+
+ meta = with lib; {
+ description = "A cargo extension for working with microcontrollers.";
+ homepage = "http://probe.rs/";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ fooker ];
+ };
+}
diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix
new file mode 100644
index 00000000000..d4844de21a0
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-flash/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib
+, rustPlatform, fetchFromGitHub
+, libusb1, pkg-config, rustfmt }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-flash";
+ version = "0.8.0";
+
+ src = fetchFromGitHub {
+ owner = "probe-rs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0";
+ };
+
+ cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90";
+
+ nativeBuildInputs = [ pkg-config rustfmt ];
+ buildInputs = [ libusb1 ];
+
+ meta = with lib; {
+ description = "A cargo extension for working with microcontrollers.";
+ homepage = "http://probe.rs/";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ fooker ];
+ };
+}
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..a1e9f7971f4 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.4";
- 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 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq";
+ };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
- cargoSha256 = "16ygkh8sbb37nfc41shxg9nh2mbszyschbqrrr1gr7xzf1z36ipp";
+ cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix
new file mode 100644
index 00000000000..0ee2359c841
--- /dev/null
+++ b/pkgs/development/tools/so/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "so";
+ version = "0.4.2";
+
+ src = fetchFromGitHub {
+ owner = "samtay";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck";
+ };
+
+ cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ libiconv Security
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A TUI interface to the StackExchange network";
+ homepage = "https://github.com/samtay/so";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mredaelli ];
+ };
+}
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/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 036e824393a..e11a5e18058 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }:
+{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "cypress";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nss gtk2 alsaLib gnome2.GConf gtk3 unzip
];
- runtimeDependencies = [ udev.lib ];
+ runtimeDependencies = [ (lib.getLib udev) ];
installPhase = ''
mkdir -p $out/bin $out/opt/cypress
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 3a0583628f0..9430ebd2ef1 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "1j5ajasng380p5a7nkk9ag5zp9ybwfz7b2z42lyk1wfg0pcd6j0r";
+ sha256 = "0vdz3irhc2pxn5zh0c6frbz7pb8vr06kldxa204xwyl7fl770w3g";
fetchSubmodules = true;
};
- cargoSha256 = "0ba7afk4n7k170cqwy0gjc53vz6bjc176s9w1wln6yfhh55fyw6x";
+ cargoSha256 = "1ch7vxnhs69paykrglim0ixaw73lzlmrglqhjp8f4xafvdk7n2ks";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
index 2fd88235a8e..f6baca6fb01 100644
--- a/pkgs/development/web/deno/deps.nix
+++ b/pkgs/development/web/deno/deps.nix
@@ -2,11 +2,11 @@
{}:
rec {
rustyV8Lib = {
- version = "0.8.1";
+ version = "0.9.1";
sha256s = {
- x86_64-linux = "0nwssdbwscwkh2w9zhlvaj562z19g5icg2yi00fyw8glws69cd6p";
- aarch64-linux = "0mwd4ix511dzxpah1p2c47a1qhvff0d3kyilc3yra99fa1s0gyxy";
- x86_64-darwin = "04s4x0n85rxnncy4jsl1ak3rdgb4a3lhqg8h53mvvjmsazsj1q70";
+ x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash";
+ aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx";
+ x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk";
};
};
}
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/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 4f7d1cb3750..91b841f6c51 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -4,24 +4,27 @@
stdenv.mkDerivation rec {
pname = "gemrb";
- version = "0.8.6";
+ version = "0.8.7";
src = fetchFromGitHub {
- owner = "gemrb";
- repo = "gemrb";
- rev = "v${version}";
- sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4";
+ owner = "gemrb";
+ repo = "gemrb";
+ rev = "v${version}";
+ sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb";
};
- # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
+ # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl
+ # reqs) optional
buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
nativeBuildInputs = [ cmake ];
- enableParallelBuilding = true;
-
+ # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader
+ # error on execution when enabled.
cmakeFlags = [
"-DLAYOUT=opt"
+ # "-DOPENGL_BACKEND=GLES"
+ # "-DOpenGL_GL_PREFERENCE=GLVND"
];
meta = with stdenv.lib; {
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/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index dd8d396a356..ac2c787d3ff 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "klavaro";
- version = "3.10";
+ version = "3.11";
src = fetchurl {
url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
- sha256 = "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95";
+ sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w";
};
nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index c3bca18a9a4..2d01ea62261 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
+{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
let beat = package : extraArgs : buildGoPackage (rec {
name = "${package}-${version}";
@@ -46,7 +46,7 @@ in {
journal entries from Linuxes with systemd.
'';
buildInputs = [ systemd.dev ];
- postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
+ postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
'';
};
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index 61c89339fe7..465051d3726 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
+{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
let beat = package : extraArgs : buildGoPackage (rec {
name = "${package}-${version}";
@@ -45,7 +45,7 @@ in {
journal entries from Linuxes with systemd.
'';
buildInputs = [ systemd.dev ];
- postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
+ postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
'';
};
diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix
index a033229c589..c7fecf08072 100644
--- a/pkgs/misc/vscode-extensions/updateSettings.nix
+++ b/pkgs/misc/vscode-extensions/updateSettings.nix
@@ -16,7 +16,7 @@ let
updateVSCodeSettingsCmd = ''
(
- echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...'
+ echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...'
oldSettings=$(cat ${vscodeSettingsFile})
echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile}
)'';
@@ -25,10 +25,10 @@ let
fileName = builtins.baseNameOf vscodeSettingsFile;
symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting
'' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" '';
-in
+in
writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}''
- (lib.optionalString (settings != {})
+ (lib.optionalString (settings != {})
(if createIfDoesNotExists then ''
[ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd}
${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd}
diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/misc/vscode-extensions/vscodeEnv.nix
index 6e4bb7b3ea8..7c58a4bdfb3 100644
--- a/pkgs/misc/vscode-extensions/vscodeEnv.nix
+++ b/pkgs/misc/vscode-extensions/vscodeEnv.nix
@@ -21,13 +21,13 @@
, user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir''
# if file exists will use it and import the extensions in it into this dervation else will use empty extensions list
# this file will be created/updated by vscodeExts2nix when vscode exists
-, mutableExtensionsFile
+, mutableExtensionsFile
}:
-let
+let
mutableExtensionsFilePath = toString mutableExtensionsFile;
- mutableExtensions = if builtins.pathExists mutableExtensionsFile
+ mutableExtensions = if builtins.pathExists mutableExtensionsFile
then import mutableExtensionsFilePath else [];
- vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
+ vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
inherit lib writeShellScriptBin extensionsFromVscodeMarketplace;
vscodeDefault = vscode;
}
@@ -63,19 +63,19 @@ let
symlinkFromUserSetting = (user-data-dir != "");
};
- vscodeExts2nix = import ./vscodeExts2nix.nix {
+ vscodeExts2nix = import ./vscodeExts2nix.nix {
inherit lib writeShellScriptBin;
vscodeDefault = vscodeWithConfiguration;
}
{
extensionsToIgnore = nixExtensions;
- extensions = mutableExtensions;
+ extensions = mutableExtensions;
};
code = writeShellScriptBin "code" ''
${updateSettingsCmd}/bin/vscodeNixUpdate-settings
${updateLaunchCmd}/bin/vscodeNixUpdate-launch
${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings
- ${vscodeWithConfiguration}/bin/code --wait "$@"
+ ${vscodeWithConfiguration}/bin/code --wait "$@"
echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...'
${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath}
'';
diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix
index d7e586cab6e..19a9edbf1af 100644
--- a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix
+++ b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix
@@ -1,5 +1,5 @@
with import {};
-callPackage (import ./vscodeEnv.nix) {
+callPackage (import ./vscodeEnv.nix) {
extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace;
vscodeDefault = vscode;
} {
@@ -9,4 +9,3 @@ callPackage (import ./vscodeEnv.nix) {
t = "test";
};
}
-
diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
index afd176b4c5e..58ad5866c93 100644
--- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
+++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
@@ -1,24 +1,24 @@
-# based on the passed vscode will stdout a nix expression with the installed vscode extensions
+# based on the passed vscode will stdout a nix expression with the installed vscode extensions
{ lib
, vscodeDefault
, writeShellScriptBin
}:
##User input
-{ vscode ? vscodeDefault
+{ vscode ? vscodeDefault
, extensionsToIgnore ? []
# will use those extensions to get sha256 if still exists when executed.
-, extensions ? []
+, extensions ? []
}:
-let
+let
mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix;
in
writeShellScriptBin "vscodeExts2nix" ''
- echo '['
+ echo '['
for line in $(${vscode}/bin/code --list-extensions --show-versions \
${lib.optionalString (extensionsToIgnore != []) ''
- | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)'
+ | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)'
''}
) ; do
[[ $line =~ ([^.]*)\.([^@]*)@(.*) ]]
diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
index f15d14c7441..e20c631f8c0 100644
--- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
+++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
@@ -1,22 +1,22 @@
# wrapper over vscode to control extensions per project (extensions folder will be created in execution path)
-{ lib
-, writeShellScriptBin
-, extensionsFromVscodeMarketplace
+{ lib
+, writeShellScriptBin
+, extensionsFromVscodeMarketplace
, vscodeDefault
}:
## User input
-{ vscode ? vscodeDefault
+{ vscode ? vscodeDefault
# extensions to be symlinked into the project's extensions folder
-, nixExtensions ? []
+, nixExtensions ? []
# extensions to be copied into the project's extensions folder
-, mutableExtensions ? []
-, vscodeExtsFolderName ? ".vscode-exts"
+, mutableExtensions ? []
+, vscodeExtsFolderName ? ".vscode-exts"
, user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"''
}:
-let
+let
nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions;
mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions;
- mutableExtsPaths = lib.forEach mutExtsDrvs ( e:
+ mutableExtsPaths = lib.forEach mutExtsDrvs ( e:
{
origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}'';
target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
@@ -39,16 +39,16 @@ let
cp -a ${ePath.origin} ${ePath.target}
chmod -R u+rwx ${ePath.target}
fi
- '') mutableExtsPaths}
+ '') mutableExtsPaths}
'';
in
writeShellScriptBin "code" ''
- if ! [[ "$@" =~ "--list-extension" ]]; then
- mkdir -p "${vscodeExtsFolderName}"
+ if ! [[ "$@" =~ "--list-extension" ]]; then
+ mkdir -p "${vscodeExtsFolderName}"
${rmExtensions}
${cpExtensions}
fi
- ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${
+ ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${
lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }''
} "$@"
''
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/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 0783fb79296..66edb34d244 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -167,6 +167,11 @@ let
# Needs a different set of modules than po/make-images.
inherit installedTestsPython;
})
+
+ (fetchpatch {
+ url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch";
+ sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk";
+ })
];
postPatch = ''
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index 1086e5ece04..000400e4cdf 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -34,10 +34,6 @@ buildGoModule rec {
make install
'';
- preFixup = ''
- remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so
- '';
-
meta = with stdenv.lib; {
description =
"A high-level tool for the management of Linux filesystem encryption";
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 824eb1a6966..060d747e763 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,22 +1,22 @@
{
"4.14": {
- "name": "linux-hardened-4.14.194.a.patch",
- "sha256": "07z3lr3mbm6c95d7fra2qp071n1c45f9241cl19zs63g00avi11p",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.194.a/linux-hardened-4.14.194.a.patch"
+ "name": "linux-hardened-4.14.195.a.patch",
+ "sha256": "1a1g9q750gbnkcycqnzafb22f7250ck8dvzx6jqkz669wdg2pd7z",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.195.a/linux-hardened-4.14.195.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.141.a.patch",
- "sha256": "0yiqkkp17pf9r6nakpnqhvmf8awpzp5n27cmh15ril7vn1y71sxw",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.141.a/linux-hardened-4.19.141.a.patch"
+ "name": "linux-hardened-4.19.142.a.patch",
+ "sha256": "1gwvacr23lp8qryfhnqn89pn9ly9d8c42rirvkz5psfmvnm7vxbn",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.142.a/linux-hardened-4.19.142.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.60.a.patch",
- "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.60.a/linux-hardened-5.4.60.a.patch"
+ "name": "linux-hardened-5.4.61.a.patch",
+ "sha256": "1sgysrkycca860m2h7vrnfkplbsari6blcrkbsn285s5d0fsicnc",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.61.a/linux-hardened-5.4.61.a.patch"
},
"5.7": {
- "name": "linux-hardened-5.7.17.a.patch",
- "sha256": "181b473y0hkw076hsndw6nfynr2yhcaypj48iqnk25hzcj40nnaz",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.17.a/linux-hardened-5.7.17.a.patch"
+ "name": "linux-hardened-5.7.19.a.patch",
+ "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix
index 187bb0dd6bb..4f721d8b0e4 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.7.18";
+ version = "5.7.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0p54icpxacrx8k09qam2hx22azh9xz9fzyif2z73qagk3syz5pd4";
+ sha256 = "1rwzp51ddlkdzanj6i8jqj5yh0njpzn7ly4r8nnzwkdfp5465721";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix
index 5d545f184f3..59acda122aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.8.4";
+ version = "5.8.5";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "15hyz92wsk6fxqr1rq0k77qw76jka2igpc9xviwa0j4a5qrr43fv";
+ sha256 = "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx";
};
} // (args.argsOverride or {}))
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/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index a1a37db9dd6..135187c9a10 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "AMD Processor microcode patch";
- homepage = "http://www.amd64.org/support/microcode.html";
+ homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;
};
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index d62ade04e63..63091e9875f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -19,6 +19,9 @@
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
libsOnly ? false
+, # don't include the bundled 32-bit libraries on 64-bit platforms,
+ # even if it’s in downloaded binary
+ disable32Bit ? false
}:
with stdenv.lib;
@@ -30,7 +33,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin
let
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
- i686bundled = versionAtLeast version "391";
+ i686bundled = versionAtLeast version "391" && !disable32Bit;
libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11
pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ];
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index b1770a4d618..59a7125aad6 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -4,7 +4,7 @@
} :
let
- version = "30.0";
+ version = "31.0";
in stdenv.mkDerivation {
pname = "rdma-core";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
- sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12";
+ sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl";
};
nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];
diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index ab04ea91644..390e7f9f09b 100644
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,4 +1,4 @@
-From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001
+From 54fb14592fc41752c3cd26552c974dd1ad4b9e73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Tue, 8 Jan 2013 15:46:30 +0100
Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices
@@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...)
1 file changed, 4 deletions(-)
diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index c34b606216..3ab8c1c3fe 100644
+index 1c60eec587..b2486da130 100644
--- a/rules.d/99-systemd.rules.in
+++ b/rules.d/99-systemd.rules.in
@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd"
@@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index c52a13c9a41..9bb69092ca4 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -1,4 +1,4 @@
-From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001
+From d52880eeae09aaacd308430499f55810157b1a6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Fri, 12 Apr 2013 13:16:57 +0200
Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store
@@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126
2 files changed, 4 insertions(+)
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index b19127be09..f9adca1100 100644
+index 806dda8475..0220741c91 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644
|| path_equal(path, "/usr")
#endif
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index e96593a5938..5ee54f39b74 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -1,4 +1,4 @@
-From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001
+From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Wed, 16 Apr 2014 10:59:28 +0200
Subject: [PATCH 03/18] Fix NixOS containers
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
1 file changed, 2 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 51d0c2a75b..4d3451ff3b 100644
+index 3b9493f232..0117a9939d 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) {
+@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@@ -21,7 +21,7 @@ index 51d0c2a75b..4d3451ff3b 100644
const char *p, *q;
if (arg_pivot_root_new)
-@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) {
+@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) {
r = -EINVAL;
goto finish;
}
@@ -30,5 +30,5 @@ index 51d0c2a75b..4d3451ff3b 100644
} else {
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
index 4b2c059afd5..cdef28ad68e 100644
--- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
@@ -1,4 +1,4 @@
-From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001
+From caa8dcfa87cf2e46a7a1cce9c16f929916cf9186 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Thu, 1 May 2014 14:10:10 +0200
Subject: [PATCH 04/18] Look for fsck in the right place
@@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644
cmdline[i++] = "-T";
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
index a8f3f0e21fd..95dd17531ab 100644
--- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
@@ -1,4 +1,4 @@
-From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001
+From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Fri, 19 Dec 2014 14:46:17 +0100
Subject: [PATCH 05/18] Add some NixOS-specific unit directories
@@ -10,51 +10,36 @@ persistent, mutable units (used for Dysnomia).
Also, remove /usr and /lib as these don't exist on NixOS.
---
- src/core/systemd.pc.in | 4 ++--
- src/shared/path-lookup.c | 18 +++++-------------
- 2 files changed, 7 insertions(+), 15 deletions(-)
+ src/basic/path-lookup.c | 20 +++++---------------
+ src/core/systemd.pc.in | 5 +++--
+ 2 files changed, 8 insertions(+), 17 deletions(-)
-diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index 8331832c7a..bedb97115d 100644
---- a/src/core/systemd.pc.in
-+++ b/src/core/systemd.pc.in
-@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user
- systemduserpresetdir=${prefix}/lib/systemd/user-preset
- systemdsystemconfdir=${sysconfdir}/systemd/system
- systemduserconfdir=${sysconfdir}/systemd/user
--systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system
--systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
-+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
-+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
- systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators
- systemdusergeneratordir=${prefix}/lib/systemd/user-generators
- systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir}
-diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index 48e0eec09a..a9d38f16d0 100644
---- a/src/shared/path-lookup.c
-+++ b/src/shared/path-lookup.c
-@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
+diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
+index 52968dee34..bba2eb09b8 100644
+--- a/src/basic/path-lookup.c
++++ b/src/basic/path-lookup.c
+@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
}
static const char* const user_data_unit_paths[] = {
- "/usr/local/lib/systemd/user",
- "/usr/local/share/systemd/user",
- USER_DATA_UNIT_PATH,
+ USER_DATA_UNIT_DIR,
- "/usr/lib/systemd/user",
- "/usr/share/systemd/user",
NULL
};
static const char* const user_config_unit_paths[] = {
- USER_CONFIG_UNIT_PATH,
+ USER_CONFIG_UNIT_DIR,
"/etc/systemd/user",
+ "/etc/systemd-mutable/user",
NULL
};
-@@ -604,15 +601,14 @@ int lookup_paths_init(
+@@ -616,15 +613,14 @@ int lookup_paths_init(
persistent_config,
- SYSTEM_CONFIG_UNIT_PATH,
+ SYSTEM_CONFIG_UNIT_DIR,
"/etc/systemd/system",
+ "/etc/systemd-mutable/system",
+ "/nix/var/nix/profiles/default/lib/systemd/system",
@@ -70,9 +55,9 @@ index 48e0eec09a..a9d38f16d0 100644
STRV_IFNOTNULL(generator_late));
break;
-@@ -628,14 +624,12 @@ int lookup_paths_init(
+@@ -640,14 +636,12 @@ int lookup_paths_init(
persistent_config,
- USER_CONFIG_UNIT_PATH,
+ USER_CONFIG_UNIT_DIR,
"/etc/systemd/user",
+ "/etc/systemd-mutable/user",
+ "/nix/var/nix/profiles/default/lib/systemd/user",
@@ -82,26 +67,58 @@ index 48e0eec09a..a9d38f16d0 100644
- "/usr/local/share/systemd/user",
- "/usr/share/systemd/user",
- "/usr/local/lib/systemd/user",
- USER_DATA_UNIT_PATH,
+ USER_DATA_UNIT_DIR,
- "/usr/lib/systemd/user",
STRV_IFNOTNULL(generator_late));
break;
-@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) {
- case UNIT_FILE_SYSTEM:
- return strv_new("/run/systemd/system-generators",
- "/etc/systemd/system-generators",
-- "/usr/local/lib/systemd/system-generators",
- SYSTEM_GENERATOR_PATH);
+@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) {
+ case UNIT_FILE_SYSTEM:
+ add = strv_new("/run/systemd/system-generators",
+ "/etc/systemd/system-generators",
+- "/usr/local/lib/systemd/system-generators",
+ SYSTEM_GENERATOR_DIR);
+ break;
- case UNIT_FILE_GLOBAL:
- case UNIT_FILE_USER:
- return strv_new("/run/systemd/user-generators",
- "/etc/systemd/user-generators",
-- "/usr/local/lib/systemd/user-generators",
- USER_GENERATOR_PATH);
+@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) {
+ case UNIT_FILE_USER:
+ add = strv_new("/run/systemd/user-generators",
+ "/etc/systemd/user-generators",
+- "/usr/local/lib/systemd/user-generators",
+ USER_GENERATOR_DIR);
+ break;
- default:
+@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) {
+ if (is_system)
+ add = strv_new("/run/systemd/system-environment-generators",
+ "/etc/systemd/system-environment-generators",
+- "/usr/local/lib/systemd/system-environment-generators",
+ SYSTEM_ENV_GENERATOR_DIR);
+ else
+ add = strv_new("/run/systemd/user-environment-generators",
+ "/etc/systemd/user-environment-generators",
+- "/usr/local/lib/systemd/user-environment-generators",
+ USER_ENV_GENERATOR_DIR);
+
+ if (!add)
+diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
+index 8424837824..b1c541bc52 100644
+--- a/src/core/systemd.pc.in
++++ b/src/core/systemd.pc.in
+@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir}
+ systemd_user_conf_dir=${sysconfdir}/systemd/user
+ systemduserconfdir=${systemd_user_conf_dir}
+
+-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system
++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
+ systemdsystemunitpath=${systemd_system_unit_path}
+
+-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user
++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
++
+ systemduserunitpath=${systemd_user_unit_path}
+
+ systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
index ac3d3b0bd6f..3e519e7fe73 100644
--- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -1,4 +1,4 @@
-From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001
+From 1a3de021d9b8da060a77af6e26d2b61bafefda74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Mon, 11 May 2015 15:39:38 +0200
Subject: [PATCH 06/18] Get rid of a useless message in user sessions
@@ -13,10 +13,10 @@ in containers.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index c306183555..3db39fa435 100644
+index 2c09def06f..c70540e1a3 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
-@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) {
+@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) {
}
assert(other);
@@ -27,5 +27,5 @@ index c306183555..3db39fa435 100644
/* A unit we need to run is gone. Sniff. Let's stop this. */
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL);
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
index cef3280aba8..b63a051ae07 100644
--- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -1,20 +1,20 @@
-From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001
+From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001
From: Gabriel Ebner
Date: Sun, 6 Dec 2015 14:26:36 +0100
Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
change system settings.
---
- src/hostname/hostnamed.c | 9 +++++++++
+ src/hostname/hostnamed.c | 6 ++++++
src/locale/localed.c | 9 +++++++++
src/timedate/timedated.c | 10 ++++++++++
- 3 files changed, 28 insertions(+)
+ 3 files changed, 25 insertions(+)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 21f6471495..8c5af7619f 100644
+index 7f6607a527..b5a9388916 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
-@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
if (r < 0)
return r;
@@ -23,8 +23,8 @@ index 21f6471495..8c5af7619f 100644
+
name = empty_to_null(name);
- if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME]))
-@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+ context_read_etc_hostname(c);
+@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
if (r < 0)
return r;
@@ -33,12 +33,12 @@ index 21f6471495..8c5af7619f 100644
+
name = empty_to_null(name);
- if (streq_ptr(name, c->data[prop]))
+ context_read_machine_info(c);
diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 09f16d25f4..c1cb87cef1 100644
+index 715ce5cac7..014f7dcf6c 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
-@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
+@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
if (r < 0)
return r;
@@ -46,9 +46,9 @@ index 09f16d25f4..c1cb87cef1 100644
+ "Changing system settings via systemd is not supported on NixOS.");
+
/* If single locale without variable name is provided, then we assume it is LANG=. */
- if (strv_length(l) == 1 && !strchr(*l, '=')) {
- if (!locale_is_valid(*l))
-@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
+ if (strv_length(l) == 1 && !strchr(l[0], '=')) {
+ if (!locale_is_valid(l[0]))
+@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
if (r < 0)
return r;
@@ -58,7 +58,7 @@ index 09f16d25f4..c1cb87cef1 100644
keymap = empty_to_null(keymap);
keymap_toggle = empty_to_null(keymap_toggle);
-@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
+@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
if (r < 0)
return r;
@@ -69,10 +69,10 @@ index 09f16d25f4..c1cb87cef1 100644
model = empty_to_null(model);
variant = empty_to_null(variant);
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 5e2fb50d83..63865f557c 100644
+index c467b85477..3e78b2f575 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
-@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
+@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
if (r < 0)
return r;
@@ -83,7 +83,7 @@ index 5e2fb50d83..63865f557c 100644
if (!timezone_is_valid(z, LOG_DEBUG))
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
-@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
+@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
if (r < 0)
return r;
@@ -93,7 +93,7 @@ index 5e2fb50d83..63865f557c 100644
if (lrtc == c->local_rtc)
return sd_bus_reply_method_return(m, NULL);
-@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
+@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
if (r < 0)
return r;
@@ -104,5 +104,5 @@ index 5e2fb50d83..63865f557c 100644
if (r < 0)
return r;
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
index 36d82e22f8c..63bd03fcf38 100644
--- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
@@ -1,4 +1,4 @@
-From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001
+From 1e40be83eca9a831509ae764081c2252934478c3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Thu, 7 Jul 2016 02:47:13 +0300
Subject: [PATCH 08/18] Fix hwdb paths
@@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644
_public_ int sd_hwdb_new(sd_hwdb **ret) {
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 8b5c807e4a8..dcdc0cd7ea0 100644
--- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -1,4 +1,4 @@
-From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001
+From 5e235e1f720f37fc5581b40c9a13d365368e74a8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Tue, 11 Oct 2016 13:12:08 +0300
Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo
@@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644
Etc/UTC. The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 105584e2e7..5238f69931 100644
+index 15cc1b8851..d0abde5933 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
-@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) {
+@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) {
n_allocated = 2;
n_zones = 1;
@@ -47,7 +47,7 @@ index 105584e2e7..5238f69931 100644
if (f) {
for (;;) {
_cleanup_free_ char *line = NULL;
-@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) {
+@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return false;
@@ -56,7 +56,7 @@ index 105584e2e7..5238f69931 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0) {
-@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) {
+@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* returns EINVAL if not a symlink */
@@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644
return -EINVAL;
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index 901fbf0815..b57bdd8fbe 100644
+index a3f442518e..feff49e280 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
-@@ -431,7 +431,7 @@ static int process_timezone(void) {
+@@ -459,7 +459,7 @@ static int process_timezone(void) {
if (isempty(arg_timezone))
return 0;
@@ -79,10 +79,10 @@ index 901fbf0815..b57bdd8fbe 100644
(void) mkdir_parents(etc_localtime, 0755);
if (symlink(e, etc_localtime) < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 4d3451ff3b..1adb91335c 100644
+index 0117a9939d..d86445b40f 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
+@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
static const char *timezone_from_path(const char *path) {
return PATH_STARTSWITH_SET(
path,
@@ -94,10 +94,10 @@ index 4d3451ff3b..1adb91335c 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 63865f557c..8021a8b753 100644
+index 3e78b2f575..de5477a08f 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
-@@ -264,7 +264,7 @@ static int context_read_data(Context *c) {
+@@ -269,7 +269,7 @@ static int context_read_data(Context *c) {
r = get_timezone(&t);
if (r == -EINVAL)
@@ -106,7 +106,7 @@ index 63865f557c..8021a8b753 100644
else if (r < 0)
log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
-@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) {
+@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) {
if (isempty(c->zone) || streq(c->zone, "UTC")) {
@@ -115,7 +115,7 @@ index 63865f557c..8021a8b753 100644
if (unlink("/etc/localtime") < 0 && errno != ENOENT)
return -errno;
-@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) {
+@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) {
return 0;
}
@@ -128,5 +128,5 @@ index 63865f557c..8021a8b753 100644
return -ENOMEM;
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
index b18ffb40166..50c2a1174df 100644
--- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -1,4 +1,4 @@
-From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001
+From 141d1d7acf5f018df86f0a5f7fbe49a8e928fd73 Mon Sep 17 00:00:00 2001
From: Imuli
Date: Wed, 19 Oct 2016 08:46:47 -0400
Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-*
@@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 6f2d37d222..7aa2310d48 100644
+index e0664de826..c521f33a2a 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
-@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
+@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
} state = NONE, look_for;
int r;
@@ -23,5 +23,5 @@ index 6f2d37d222..7aa2310d48 100644
return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
index bc9efaed23e..8ad310984ed 100644
--- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
+++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
@@ -1,4 +1,4 @@
-From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001
+From db3946f465c0066fb1775a92c1fcc6450134904d Mon Sep 17 00:00:00 2001
From: Franz Pletz
Date: Sun, 11 Feb 2018 04:37:44 +0100
Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
@@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
-index c09115e06a..62eba4186c 100644
+index dbbddb68e2..bbeb23223d 100644
--- a/meson.build
+++ b/meson.build
-@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2',
+@@ -3369,9 +3369,6 @@ install_data('LICENSE.GPL2',
'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
install_dir : docdir)
@@ -20,7 +20,7 @@ index c09115e06a..62eba4186c 100644
-
############################################################
- meson_check_help = find_program('tools/meson-check-help.sh')
+ check_help = find_program('tools/check-help.sh')
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
index 5d67ce0ca31..0844f85763b 100644
--- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
+++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
@@ -1,4 +1,4 @@
-From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001
+From 245af064c4d315d868cc12201b3663f61702cce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
Date: Mon, 26 Feb 2018 14:25:57 +0000
Subject: [PATCH 12/18] Install default configuration into $out/share/factory
@@ -31,10 +31,10 @@ store again, while having executables looking up files in /etc.
17 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
-index 4df6dabf89..02d8d69095 100644
+index 5c77387a26..6404bc01ba 100644
--- a/hwdb.d/meson.build
+++ b/hwdb.d/meson.build
-@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1
+@@ -43,7 +43,7 @@ if conf.get('ENABLE_HWDB') == 1
install_dir : udevhwdbdir)
meson.add_install_script('sh', '-c',
@@ -44,10 +44,10 @@ index 4df6dabf89..02d8d69095 100644
meson.add_install_script('sh', '-c',
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
diff --git a/meson.build b/meson.build
-index 62eba4186c..b0b2edbb5a 100644
+index bbeb23223d..1a9c56fad2 100644
--- a/meson.build
+++ b/meson.build
-@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
+@@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')
kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')
factorydir = join_paths(datadir, 'factory')
@@ -57,7 +57,7 @@ index 62eba4186c..b0b2edbb5a 100644
bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
testsdir = join_paths(prefixdir, 'lib/systemd/tests')
systemdstatedir = join_paths(localstatedir, 'lib/systemd')
-@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1
+@@ -2651,7 +2654,7 @@ if conf.get('ENABLE_BINFMT') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format(binfmtdir))
meson.add_install_script('sh', '-c',
@@ -66,16 +66,16 @@ index 62eba4186c..b0b2edbb5a 100644
endif
if conf.get('ENABLE_REPART') == 1
-@@ -2612,7 +2615,7 @@ executable('systemd-sleep',
- install_dir : rootlibexecdir)
+@@ -2767,7 +2770,7 @@ executable(
+ install_dir : rootlibexecdir)
install_data('src/sleep/sleep.conf',
- install_dir : pkgsysconfdir)
+ install_dir : factorypkgconfdir)
- exe = executable('systemd-sysctl',
- 'src/sysctl/sysctl.c',
-@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1
+ public_programs += executable(
+ 'systemd-sysctl',
+@@ -3101,7 +3104,7 @@ if conf.get('HAVE_KMOD') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format(modulesloaddir))
meson.add_install_script('sh', '-c',
@@ -83,8 +83,8 @@ index 62eba4186c..b0b2edbb5a 100644
+ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d')))
endif
- exe = executable('systemd-nspawn',
-@@ -3167,7 +3170,7 @@ install_subdir('factory/etc',
+ public_programs += executable(
+@@ -3352,7 +3355,7 @@ install_subdir('factory/etc',
install_dir : factorydir)
install_data('xorg/50-systemd-user.sh',
@@ -94,10 +94,10 @@ index 62eba4186c..b0b2edbb5a 100644
install_dir : modprobedir)
install_data('LICENSE.GPL2',
diff --git a/network/meson.build b/network/meson.build
-index 544dcf4387..1828c50863 100644
+index 99a650eac3..8105a4e48d 100644
--- a/network/meson.build
+++ b/network/meson.build
-@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1
+@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1
install_dir : networkdir)
meson.add_install_script('sh', '-c',
@@ -107,10 +107,10 @@ index 544dcf4387..1828c50863 100644
install_data('99-default.link',
diff --git a/src/core/meson.build b/src/core/meson.build
-index 3586838f59..02ddf1a123 100644
+index fa95108523..60ee0e31c1 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
-@@ -179,8 +179,8 @@ libcore = static_library(
+@@ -183,8 +183,8 @@ libcore = static_library(
systemd_sources = files('main.c')
in_files = [['macros.systemd', rpmmacrosdir],
@@ -121,7 +121,7 @@ index 3586838f59..02ddf1a123 100644
['systemd.pc', pkgconfigdatadir],
['triggers.systemd', '']]
-@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
+@@ -216,6 +216,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
@@ -180,15 +180,16 @@ index 5796f77cac..75d975c260 100644
if get_option('create-log-dirs')
meson.add_install_script(
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
-index 261c3aaae4..dbc5e23513 100644
+index 9ae342dfba..65df666337 100644
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
-@@ -11,4 +11,4 @@ install_data('00-entry-directory.install',
- install_dir : kernelinstalldir)
+@@ -14,5 +14,5 @@ if want_kernel_install
+ install_dir : kernelinstalldir)
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d')))
+ meson.add_install_script('sh', '-c',
+- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d')))
+ endif
diff --git a/src/login/meson.build b/src/login/meson.build
index 0a7d3d5440..ff90149c1c 100644
--- a/src/login/meson.build
@@ -203,10 +204,10 @@ index 0a7d3d5440..ff90149c1c 100644
install_data('org.freedesktop.login1.conf',
install_dir : dbuspolicydir)
diff --git a/src/network/meson.build b/src/network/meson.build
-index c1c02cfda1..1bfa79a03b 100644
+index b3a88d9910..be56d1e9d7 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
-@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1
+@@ -229,7 +229,7 @@ if conf.get('ENABLE_NETWORKD') == 1
endif
install_data('networkd.conf',
@@ -227,10 +228,10 @@ index adbac24b54..e9dc88dfa2 100644
+ install_dir : factorypkgconfdir)
endif
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
-index c4d8d4e5d9..f550c289a5 100644
+index 92b67b6333..ac5b9a0b0a 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
-@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1
+@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1
output : 'resolved.conf',
configuration : substs)
install_data(resolved_conf,
@@ -253,10 +254,10 @@ index e5c118c8db..19235df9ca 100644
install_dir : dbuspolicydir)
install_data('org.freedesktop.timesync1.service',
diff --git a/src/udev/meson.build b/src/udev/meson.build
-index 173b10be50..82638cf5a9 100644
+index aa23b07090..ad004d803a 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
-@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'],
+@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'],
endforeach
install_data('udev.conf',
@@ -265,7 +266,7 @@ index 173b10be50..82638cf5a9 100644
configure_file(
input : 'udev.pc.in',
-@@ -196,7 +196,7 @@ configure_file(
+@@ -195,7 +195,7 @@ configure_file(
install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)
meson.add_install_script('sh', '-c',
@@ -285,10 +286,10 @@ index 3f072e3db7..bd9f843eba 100644
- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
+ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d')))
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
-index e77f46d06b..04d2ef621d 100644
+index 0a9582d8b9..3c56ca7d83 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
-@@ -57,5 +57,5 @@ endforeach
+@@ -58,5 +58,5 @@ endforeach
if enable_tmpfiles
meson.add_install_script(
'sh', '-c',
@@ -296,7 +297,7 @@ index e77f46d06b..04d2ef621d 100644
+ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d')))
endif
diff --git a/units/meson.build b/units/meson.build
-index ea91f0cc9e..8622054ca5 100644
+index aa2ed115ea..12e2925226 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf',
@@ -309,5 +310,5 @@ index ea91f0cc9e..8622054ca5 100644
join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
index 11d2dc26e38..a15220fd3f9 100644
--- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
@@ -1,4 +1,4 @@
-From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001
+From bfaa53731ffe984c93c5321099d1341b5059f029 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold
Date: Fri, 2 Nov 2018 21:15:42 +0100
Subject: [PATCH 13/18] inherit systemd environment when calling generators.
@@ -16,10 +16,10 @@ executables that are being called from managers.
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 4412e7a849..b799eeca95 100644
+index 41e0d73736..d02de06f09 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
-@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) {
+@@ -4095,9 +4095,14 @@ static int manager_run_generators(Manager *m) {
argv[4] = NULL;
RUN_WITH_UMASK(0022)
@@ -38,5 +38,5 @@ index 4412e7a849..b799eeca95 100644
finish:
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch
index 06b00b82cb9..dca7b5591d2 100644
--- a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch
@@ -1,4 +1,4 @@
-From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001
+From d8b93ef32f3b95a6ce6548a8ad1504a485ffbe81 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold
Date: Thu, 9 May 2019 11:15:22 +0200
Subject: [PATCH 14/18] add rootprefix to lookup dir paths
@@ -34,5 +34,5 @@ index 970654a1ad..bb261040f8 100644
#define CONF_PATHS(n) \
CONF_PATHS_USR(n) \
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 6431b56ea3e..1bd9e23d25c 100644
--- a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -1,4 +1,4 @@
-From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001
+From b3bc0aa899c51d19edfb53af2b00dde64123ab06 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Thu, 25 Jul 2019 20:45:55 +0300
Subject: [PATCH 15/18] systemd-shutdown: execute scripts in
@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index 523040b57c..561d91c94c 100644
+index 06c9710c6e..dadcc3117d 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
-@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) {
+@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) {
_cleanup_free_ char *cgroup = NULL;
char *arguments[3], *watchdog_device;
int cmd, r, umount_log_level = LOG_INFO;
@@ -23,5 +23,5 @@ index 523040b57c..561d91c94c 100644
/* The log target defaults to console, but the original systemd process will pass its log target in through a
* command line argument, which will override this default. Also, ensure we'll never log to the journal or
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index c27d1a10d58..d99c7ecc96c 100644
--- a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -1,4 +1,4 @@
-From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001
+From 2679210f4ce804713bf1d244ac0fb8ac7b9b1e5f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Thu, 25 Jul 2019 20:46:58 +0300
Subject: [PATCH 16/18] systemd-sleep: execute scripts in
@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index fbfddc0262..d2530b9421 100644
+index 7029352ca5..6d9c636872 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
-@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) {
+@@ -182,6 +182,7 @@ static int execute(char **modes, char **states) {
};
static const char* const dirs[] = {
SYSTEM_SLEEP_PATH,
@@ -22,5 +22,5 @@ index fbfddc0262..d2530b9421 100644
};
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
index 9fae2d5767c..f45e4edd8e8 100644
--- a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
+++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
@@ -1,4 +1,4 @@
-From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001
+From 561b0cc9a1faed5729d6f701304a65c2968394ec Mon Sep 17 00:00:00 2001
From: Florian Klink
Date: Sat, 7 Mar 2020 22:40:27 +0100
Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty
@@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644
[Service]
Type=oneshot
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 321817dad6f..a964aeede76 100644
--- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -1,4 +1,4 @@
-From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001
+From 0d9d7c03054babdbd1fa5f6f266b56e8c96e9ba5 Mon Sep 17 00:00:00 2001
From: Florian Klink
Date: Sun, 8 Mar 2020 01:05:54 +0100
Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
@@ -29,5 +29,5 @@ index 30031fca8e..d97145539a 100644
#if HAVE_SPLIT_USR
# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
--
-2.26.2
+2.27.0
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index c0163dcafe6..54060b156f2 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -17,34 +17,24 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}:
-let gnupg-minimal = gnupg.override {
- enableMinimal = true;
- guiSupport = false;
- pcsclite = null;
- sqlite = null;
- pinentry = null;
- adns = null;
- gnutls = null;
- libusb1 = null;
- openldap = null;
- readline = null;
- zlib = null;
- bzip2 = null;
-};
-
+let
+ version = "246";
in stdenv.mkDerivation {
- version = "245.7";
+ inherit version;
pname = "systemd";
- # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
- # Also fresh patches should be cherry-picked from that tree to our current one.
+ # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
+ # This has proven to be less error-prone than the previous systemd fork.
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd-stable";
- rev = "1e6233ed07f7af08550fffa7a885cac1ac67a2c3";
- sha256 = "1hd5kc3mm7mg4i7hhi82wg4cpg4fpi2k6hzjq9sv07pkn2lw390w";
+ rev = "v${version}";
+ sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw";
};
+ # If these need to be regenerated, `git am path/to/00*.patch` them into a
+ # systemd worktree, rebase to the more recent systemd version, and export the
+ # patches again via `git format-patch v${version}`.
patches = [
./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -77,7 +67,7 @@ in stdenv.mkDerivation {
"find_program('${stdenv.cc.bintools.targetPrefix}objcopy'"
'';
- outputs = [ "out" "lib" "man" "dev" ];
+ outputs = [ "out" "man" "dev" ];
nativeBuildInputs =
[ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
@@ -107,7 +97,6 @@ in stdenv.mkDerivation {
"-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
"-Dpamconfdir=${placeholder "out"}/etc/pam.d"
"-Drootprefix=${placeholder "out"}"
- "-Drootlibdir=${placeholder "lib"}/lib"
"-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig"
"-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig"
"-Dloadkeys-path=${kbd}/bin/loadkeys"
@@ -215,7 +204,7 @@ in stdenv.mkDerivation {
# absolute paths to gpg & tar
substituteInPlace src/import/pull-common.c \
- --replace '"gpg"' '"${gnupg-minimal}/bin/gpg"'
+ --replace '"gpg"' '"${gnupg}/bin/gpg"'
for file in src/import/{{export,import,pull}-tar,import-common}.c; do
substituteInPlace $file \
--replace '"tar"' '"${gnutar}/bin/tar"'
@@ -276,38 +265,10 @@ in stdenv.mkDerivation {
# "kernel-install" shouldn't be used on NixOS.
find $out -name "*kernel-install*" -exec rm {} \;
-
- # Keep only libudev and libsystemd in the lib output.
- mkdir -p $out/lib
- mv $lib/lib/security $lib/lib/libnss* $out/lib/
''; # */
enableParallelBuilding = true;
- # On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib
- # output. The result of that is a dependency cycle between $out and $lib.
- # Thus nix (rightfully) marks the build as failed. That reference originates
- # from an array of strings (catalog_file_dirs) in systemd
- # (src/src/journal/catalog.{c,h}). The only consumer (as of v242) of the
- # symbol is the main function of journalctl. Still libsystemd.so contains
- # the VALUE but not the symbol. Systemd seems to be properly using function
- # & data sections together with the linker flags to garbage collect unused
- # sections (-Wl,--gc-sections). For unknown reasons those flags do not
- # eliminate the unused string constants, in this case on aarch64-linux. The
- # hacky way is to just remove the reference after we finished compiling.
- # Since it can not be used (there is no symbol to actually refer to it) there
- # should not be any harm. It is a bit odd and I really do not like starting
- # these kind of hacks but there doesn't seem to be a straight forward way at
- # this point in time.
- # The reference will be replaced by the same reference the usual nukeRefs
- # tooling uses. The standard tooling can not / should not be uesd since it
- # is a bit too excessive and could potentially do us some (more) harm.
- postFixup = ''
- nukedRef=$(echo $out | sed -e "s,$NIX_STORE/[^-]*-\(.*\),$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-\1,")
- cat $lib/lib/libsystemd.so | perl -pe "s|$out/lib/systemd/catalog|$nukedRef/lib/systemd/catalog|" > $lib/lib/libsystemd.so.tmp
- mv $lib/lib/libsystemd.so.tmp $(readlink -f $lib/lib/libsystemd.so)
- '';
-
# The interface version prevents NixOS from switching to an
# incompatible systemd at runtime. (Switching across reboots is
# fine, of course.) It should be increased whenever systemd changes
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 56b36d4f368..27e26b13a53 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -42,25 +42,27 @@ let
inherit rev sha256;
};
- patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches;
+ patches = extraPatches;
postPatch = optionalString buildKernel ''
patchShebangs scripts
# The arrays must remain the same length, so we repeat a flag that is
# already part of the command and therefore has no effect.
- substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \
- --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"'
+ substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \
+ --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \
+ --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"'
'' + optionalString buildUser ''
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \
--replace "/bin/mount" "${utillinux}/bin/mount"
- substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${
+ substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${
# We don't *need* python support, but we set it like this to minimize closure size:
# If it's disabled by default, no need to enable it, even if we have python enabled
# And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure
nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; })
}/bin/exportfs"
substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
- substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d"
+ substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \
+ --replace "/etc/default" "$out/etc/default"
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
@@ -79,6 +81,13 @@ let
substituteInPlace ./etc/systemd/system/Makefile.am \
--replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)'
+ ${optionalString isUnstable ''
+ substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \
+ --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d"
+ substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \
+ --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d"
+ ''}
+
substituteInPlace ./etc/systemd/system/zfs-share.service.in \
--replace "/bin/rm " "${coreutils}/bin/rm "
@@ -190,6 +199,7 @@ in {
version = "0.8.4";
sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp";
+ extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ];
};
zfsUnstable = common {
@@ -197,9 +207,9 @@ in {
# incompatibleKernelVersion = "4.19";
# this package should point to a version / git revision compatible with the latest kernel release
- version = "0.8.4";
+ version = "2.0.0-rc1";
- sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp";
+ sha256 = "0d1m5zwgqzfwbscvb60zvzkjgl5nkbvas22vjsyci3xygz0qwjsb";
isUnstable = true;
};
}
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 6a602883b35..d546b07148b 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -5,14 +5,13 @@
let inherit (stdenv.lib) optional optionals; in
-# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "2.9.5";
+ version = "2.9.6";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76";
+ sha256 = "bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix
new file mode 100644
index 00000000000..343b3d2b19d
--- /dev/null
+++ b/pkgs/servers/gonic/default.nix
@@ -0,0 +1,59 @@
+{ lib, buildGoPackage, fetchFromGitHub
+, pkg-config, taglib, alsaLib
+
+# Disable on-the-fly transcoding,
+# removing the dependency on ffmpeg.
+# The server will (as of 0.11.0) gracefully fall back
+# to the original file, but if transcoding is configured
+# that takes a while. So best to disable all transcoding
+# in the configuration if you disable transcodingSupport.
+, transcodingSupport ? true, ffmpeg
+
+# udpater
+, writers, vgo2nix }:
+
+assert transcodingSupport -> ffmpeg != null;
+
+let
+ # update these, then run `updateScript` to update dependencies
+ version = "0.11.0";
+ rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea";
+ sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9";
+
+ src = fetchFromGitHub {
+ owner = "sentriz";
+ repo = "gonic";
+ inherit rev sha256;
+ };
+
+in
+buildGoPackage {
+ pname = "gonic-${version}";
+ inherit version src;
+ goPackagePath = "go.senan.xyz/gonic";
+ goDeps = ./deps.nix;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ taglib alsaLib ];
+
+ postPatch = lib.optionalString transcodingSupport ''
+ substituteInPlace \
+ server/encode/encode.go \
+ --replace \
+ 'ffmpegPath = "/usr/bin/ffmpeg"' \
+ 'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \
+ '';
+
+ passthru.updateScript = writers.writeDash "update-gonic" ''
+ ${vgo2nix}/bin/vgo2nix \
+ -dir ${src} \
+ -outfile ${lib.escapeShellArg (toString ./deps.nix)}
+ '';
+
+ meta = {
+ homepage = "https://github.com/sentriz/gonic";
+ description = "Music streaming server / subsonic server API implementation";
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ Profpatsch ];
+ };
+}
diff --git a/pkgs/servers/gonic/deps.nix b/pkgs/servers/gonic/deps.nix
new file mode 100644
index 00000000000..71b2f83a0e0
--- /dev/null
+++ b/pkgs/servers/gonic/deps.nix
@@ -0,0 +1,795 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/googleapis/google-cloud-go";
+ rev = "v0.33.1";
+ sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v";
+ };
+ }
+ {
+ goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
+ fetch = {
+ type = "git";
+ url = "https://dmitri.shuralyov.com/gpu/mtl";
+ rev = "666a987793e9";
+ sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/xgb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/xgb";
+ rev = "27f122750802";
+ sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/goutils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/goutils";
+ rev = "v1.1.0";
+ sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "v1.5.0";
+ sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/sprig";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/sprig";
+ rev = "v2.22.0";
+ sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd";
+ };
+ }
+ {
+ goPackagePath = "github.com/OneOfOne/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/OneOfOne/xxhash";
+ rev = "v1.2.2";
+ sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
+ };
+ }
+ {
+ goPackagePath = "github.com/cespare/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cespare/xxhash";
+ rev = "v1.1.0";
+ sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
+ };
+ }
+ {
+ goPackagePath = "github.com/d4l3k/messagediff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/d4l3k/messagediff";
+ rev = "7e0a312ae40b";
+ sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/denisenkom/go-mssqldb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/denisenkom/go-mssqldb";
+ rev = "732737034ffd";
+ sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf";
+ };
+ }
+ {
+ goPackagePath = "github.com/disintegration/imaging";
+ fetch = {
+ type = "git";
+ url = "https://github.com/disintegration/imaging";
+ rev = "v1.6.2";
+ sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5";
+ };
+ }
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "v1.0.0";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/erikstmartin/go-testdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/erikstmartin/go-testdb";
+ rev = "8d10e4a1bae5";
+ sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq";
+ };
+ }
+ {
+ goPackagePath = "github.com/faiface/beep";
+ fetch = {
+ type = "git";
+ url = "https://github.com/faiface/beep";
+ rev = "v1.0.2";
+ sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv";
+ };
+ }
+ {
+ goPackagePath = "github.com/gdamore/encoding";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gdamore/encoding";
+ rev = "v1.0.0";
+ sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
+ };
+ }
+ {
+ goPackagePath = "github.com/gdamore/tcell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gdamore/tcell";
+ rev = "v1.1.1";
+ sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-audio/audio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-audio/audio";
+ rev = "v1.0.0";
+ sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-audio/riff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-audio/riff";
+ rev = "v1.0.0";
+ sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-audio/wav";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-audio/wav";
+ rev = "v1.0.0";
+ sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-gl/glfw";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-gl/glfw";
+ rev = "6f7a984d4dc4";
+ sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "v1.5.0";
+ sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+ };
+ }
+ {
+ goPackagePath = "github.com/gofrs/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gofrs/uuid";
+ rev = "v3.2.0";
+ sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang-sql/civil";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang-sql/civil";
+ rev = "cb61b32ac6fe";
+ sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.2.0";
+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.2.0";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "v1.1.1";
+ sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
+ };
+ }
+ {
+ goPackagePath = "github.com/gopherjs/gopherjs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherjs";
+ rev = "0210a2f0f73c";
+ sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j";
+ };
+ }
+ {
+ goPackagePath = "github.com/gopherjs/gopherwasm";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherwasm";
+ rev = "v1.0.0";
+ sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/context";
+ rev = "v1.1.1";
+ sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/mux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/mux";
+ rev = "v1.7.4";
+ sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/securecookie";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/securecookie";
+ rev = "v1.1.1";
+ sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/sessions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/sessions";
+ rev = "v1.2.0";
+ sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1";
+ };
+ }
+ {
+ goPackagePath = "github.com/hajimehoshi/go-mp3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hajimehoshi/go-mp3";
+ rev = "v0.2.1";
+ sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg";
+ };
+ }
+ {
+ goPackagePath = "github.com/hajimehoshi/oto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hajimehoshi/oto";
+ rev = "v0.6.1";
+ sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h";
+ };
+ }
+ {
+ goPackagePath = "github.com/huandu/xstrings";
+ fetch = {
+ type = "git";
+ url = "https://github.com/huandu/xstrings";
+ rev = "v1.3.1";
+ sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy";
+ };
+ }
+ {
+ goPackagePath = "github.com/icza/bitio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/icza/bitio";
+ rev = "v1.0.0";
+ sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w";
+ };
+ }
+ {
+ goPackagePath = "github.com/icza/mighty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/icza/mighty";
+ rev = "cfd07d671de6";
+ sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "v0.3.9";
+ sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90";
+ };
+ }
+ {
+ goPackagePath = "github.com/jfreymuth/oggvorbis";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jfreymuth/oggvorbis";
+ rev = "v1.0.0";
+ sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a";
+ };
+ }
+ {
+ goPackagePath = "github.com/jfreymuth/vorbis";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jfreymuth/vorbis";
+ rev = "v1.0.0";
+ sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/gorm";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/gorm";
+ rev = "v1.9.12";
+ sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/inflection";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/inflection";
+ rev = "v1.0.0";
+ sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/now";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/now";
+ rev = "v1.0.1";
+ sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p";
+ };
+ }
+ {
+ goPackagePath = "github.com/joho/godotenv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/joho/godotenv";
+ rev = "v1.3.0";
+ sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
+ };
+ }
+ {
+ goPackagePath = "github.com/josephburnett/jd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/josephburnett/jd";
+ rev = "aa1a7c66b42f";
+ sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c";
+ };
+ }
+ {
+ goPackagePath = "github.com/karrick/godirwalk";
+ fetch = {
+ type = "git";
+ url = "https://github.com/karrick/godirwalk";
+ rev = "v1.15.6";
+ sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+ {
+ goPackagePath = "github.com/lib/pq";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lib/pq";
+ rev = "v1.3.0";
+ sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw";
+ };
+ }
+ {
+ goPackagePath = "github.com/lucasb-eyer/go-colorful";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lucasb-eyer/go-colorful";
+ rev = "12d3b2882a08";
+ sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "v0.0.4";
+ sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-sqlite3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-sqlite3";
+ rev = "v2.0.3";
+ sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv";
+ };
+ }
+ {
+ goPackagePath = "github.com/mewkiz/flac";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mewkiz/flac";
+ rev = "v1.0.6";
+ sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mewkiz/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mewkiz/pkg";
+ rev = "f6b5e26764c3";
+ sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/copystructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/copystructure";
+ rev = "v1.0.0";
+ sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-wordwrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-wordwrap";
+ rev = "v1.0.0";
+ sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/reflectwalk";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/reflectwalk";
+ rev = "v1.0.1";
+ sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx";
+ };
+ }
+ {
+ goPackagePath = "github.com/nicksellen/audiotags";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nicksellen/audiotags";
+ rev = "94015fa599bd";
+ sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j";
+ };
+ }
+ {
+ goPackagePath = "github.com/oklog/run";
+ fetch = {
+ type = "git";
+ url = "https://github.com/oklog/run";
+ rev = "v1.1.0";
+ sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk";
+ };
+ }
+ {
+ goPackagePath = "github.com/oxtoacart/bpool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/oxtoacart/bpool";
+ rev = "03653db5a59c";
+ sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "v1.6.0";
+ sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterbourgon/ff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/peterbourgon/ff";
+ rev = "v1.7.0";
+ sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.9.1";
+ sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/rainycape/unidecode";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rainycape/unidecode";
+ rev = "cb7f23ec59be";
+ sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5";
+ };
+ }
+ {
+ goPackagePath = "github.com/spaolacci/murmur3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spaolacci/murmur3";
+ rev = "f09979ecbc72";
+ sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.0";
+ sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "github.com/wader/gormstore";
+ fetch = {
+ type = "git";
+ url = "https://github.com/wader/gormstore";
+ rev = "65a111a20c23";
+ sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "06a226fb4e37";
+ sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "00229845015e";
+ sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/image";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/image";
+ rev = "33d19683fad8";
+ sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/mobile";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/mobile";
+ rev = "4c31acba0007";
+ sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/mod";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/mod";
+ rev = "331c550502dd";
+ sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "3b0461eec859";
+ sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "fe76b779f299";
+ sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "b753a1ba74fa";
+ sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/xerrors";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/xerrors";
+ rev = "1b5146add898";
+ sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.4.0";
+ sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1";
+ rev = "v1.3.0";
+ sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/gormigrate.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/gormigrate.v1";
+ rev = "v1.6.0";
+ sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.4";
+ sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
+ };
+ }
+]
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 922755db1fb..4a6989989ae 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,11 +2,11 @@
# Do not edit!
{
- version = "0.114.3";
+ version = "0.114.4";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"accuweather" = ps: with ps; [ ]; # missing inputs: accuweather
- "acer_projector" = ps: with ps; [ pyserial];
+ "acer_projector" = ps: with ps; [ pyserial ];
"acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse
"actiontec" = ps: with ps; [ ];
"adguard" = ps: with ps; [ ]; # missing inputs: adguardhome
@@ -15,39 +15,39 @@
"agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py
"air_quality" = ps: with ps; [ ];
"airly" = ps: with ps; [ ]; # missing inputs: airly
- "airvisual" = ps: with ps; [ pyairvisual];
+ "airvisual" = ps: with ps; [ pyairvisual ];
"aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect
"alarm_control_panel" = ps: with ps; [ ];
"alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext
"alert" = ps: with ps; [ ];
- "alexa" = ps: with ps; [ aiohttp-cors];
- "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond
+ "alexa" = ps: with ps; [ aiohttp-cors ];
+ "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond
"alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage
- "amazon_polly" = ps: with ps; [ boto3];
- "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate
+ "amazon_polly" = ps: with ps; [ boto3 ];
+ "ambiclimate" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ambiclimate
"ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient
- "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest
+ "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest
"ampio" = ps: with ps; [ ]; # missing inputs: asmog
"android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
"androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
"anthemav" = ps: with ps; [ ]; # missing inputs: anthemav
- "apache_kafka" = ps: with ps; [ aiokafka];
+ "apache_kafka" = ps: with ps; [ aiokafka ];
"apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
- "api" = ps: with ps; [ aiohttp-cors];
+ "api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ]; # missing inputs: apns2
- "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf];
- "apprise" = ps: with ps; [ apprise];
+ "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ];
+ "apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy
"aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
"aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc
"arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
"arduino" = ps: with ps; [ ]; # missing inputs: PyMata
"arest" = ps: with ps; [ ];
- "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo
+ "arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo
"arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg
- "aruba" = ps: with ps; [ pexpect];
- "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt];
+ "aruba" = ps: with ps; [ pexpect ];
+ "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
"asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
"asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt
@@ -57,17 +57,17 @@
"august" = ps: with ps; [ ]; # missing inputs: py-august
"aurora" = ps: with ps; [ ];
"aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
- "auth" = ps: with ps; [ aiohttp-cors];
- "automation" = ps: with ps; [ aiohttp-cors];
+ "auth" = ps: with ps; [ aiohttp-cors ];
+ "automation" = ps: with ps; [ aiohttp-cors ];
"avea" = ps: with ps; [ ]; # missing inputs: avea
"avion" = ps: with ps; [ ]; # missing inputs: avion
- "avri" = ps: with ps; [ pycountry]; # missing inputs: avri-api
+ "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api
"awair" = ps: with ps; [ ]; # missing inputs: python_awair
"aws" = ps: with ps; [ ]; # missing inputs: aiobotocore
- "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis
+ "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis
"azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops
"azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub
- "azure_service_bus" = ps: with ps; [ azure-servicebus];
+ "azure_service_bus" = ps: with ps; [ azure-servicebus ];
"baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip
"bayesian" = ps: with ps; [ ];
"bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
@@ -80,22 +80,22 @@
"blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird
"blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi
"blink" = ps: with ps; [ ]; # missing inputs: blinkpy
- "blinksticklight" = ps: with ps; [ BlinkStick];
+ "blinksticklight" = ps: with ps; [ BlinkStick ];
"blinkt" = ps: with ps; [ ]; # missing inputs: blinkt
"blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api
"bloomsky" = ps: with ps; [ ];
- "bluesound" = ps: with ps; [ xmltodict];
+ "bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
- "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez
+ "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
"bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
"bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
"bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
"bond" = ps: with ps; [ ]; # missing inputs: bond-api
- "braviatv" = ps: with ps; [ bravia-tv];
- "broadlink" = ps: with ps; [ broadlink];
- "brother" = ps: with ps; [ brother];
+ "braviatv" = ps: with ps; [ bravia-tv ];
+ "broadlink" = ps: with ps; [ broadlink ];
+ "brother" = ps: with ps; [ brother ];
"brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
"browser" = ps: with ps; [ ];
"brunt" = ps: with ps; [ ]; # missing inputs: brunt
@@ -103,15 +103,15 @@
"bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist
"bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist
"buienradar" = ps: with ps; [ ]; # missing inputs: buienradar
- "caldav" = ps: with ps; [ caldav];
- "calendar" = ps: with ps; [ aiohttp-cors];
- "camera" = ps: with ps; [ aiohttp-cors];
- "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary
- "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf];
+ "caldav" = ps: with ps; [ caldav ];
+ "calendar" = ps: with ps; [ aiohttp-cors ];
+ "camera" = ps: with ps; [ aiohttp-cors ];
+ "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary
+ "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf ];
"cert_expiry" = ps: with ps; [ ];
"channels" = ps: with ps; [ ]; # missing inputs: pychannels
"circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
- "cisco_ios" = ps: with ps; [ pexpect];
+ "cisco_ios" = ps: with ps; [ pexpect ];
"cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress
"cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk
"citybikes" = ps: with ps; [ ];
@@ -120,44 +120,44 @@
"clicksend" = ps: with ps; [ ];
"clicksend_tts" = ps: with ps; [ ];
"climate" = ps: with ps; [ ];
- "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa];
+ "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ];
"cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns
"cmus" = ps: with ps; [ ]; # missing inputs: pycmus
"co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
"coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
- "coinmarketcap" = ps: with ps; [ coinmarketcap];
+ "coinmarketcap" = ps: with ps; [ coinmarketcap ];
"comed_hourly_pricing" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect
"command_line" = ps: with ps; [ ];
"concord232" = ps: with ps; [ ]; # missing inputs: concord232
- "config" = ps: with ps; [ aiohttp-cors];
+ "config" = ps: with ps; [ aiohttp-cors ];
"configurator" = ps: with ps; [ ];
"control4" = ps: with ps; [ ]; # missing inputs: pyControl4
- "conversation" = ps: with ps; [ aiohttp-cors];
+ "conversation" = ps: with ps; [ aiohttp-cors ];
"coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet
"coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus
"counter" = ps: with ps; [ ];
"cover" = ps: with ps; [ ];
"cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
- "cpuspeed" = ps: with ps; [ py-cpuinfo];
+ "cpuspeed" = ps: with ps; [ py-cpuinfo ];
"crimereports" = ps: with ps; [ ]; # missing inputs: crimereports
- "cups" = ps: with ps; [ pycups];
+ "cups" = ps: with ps; [ pycups ];
"currencylayer" = ps: with ps; [ ];
"daikin" = ps: with ps; [ ]; # missing inputs: pydaikin
"danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair
- "darksky" = ps: with ps; [ python-forecastio];
- "datadog" = ps: with ps; [ datadog];
+ "darksky" = ps: with ps; [ python-forecastio ];
+ "datadog" = ps: with ps; [ datadog ];
"ddwrt" = ps: with ps; [ ];
- "debugpy" = ps: with ps; [ debugpy];
+ "debugpy" = ps: with ps; [ debugpy ];
"deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
- "decora" = ps: with ps; [ bluepy]; # missing inputs: decora
+ "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
- "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend
+ "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend
"delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
- "deluge" = ps: with ps; [ deluge-client];
- "demo" = ps: with ps; [ aiohttp-cors];
+ "deluge" = ps: with ps; [ deluge-client ];
+ "demo" = ps: with ps; [ aiohttp-cors ];
"denon" = ps: with ps; [ ];
- "denonavr" = ps: with ps; [ denonavr getmac];
+ "denonavr" = ps: with ps; [ denonavr getmac ];
"derivative" = ps: with ps; [ ];
"deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene
"device_automation" = ps: with ps; [ ];
@@ -166,40 +166,40 @@
"devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api
"dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom
"dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
- "dialogflow" = ps: with ps; [ aiohttp-cors];
- "digital_ocean" = ps: with ps; [ digital-ocean];
+ "dialogflow" = ps: with ps; [ aiohttp-cors ];
+ "digital_ocean" = ps: with ps; [ digital-ocean ];
"digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
"directv" = ps: with ps; [ ]; # missing inputs: directv
- "discogs" = ps: with ps; [ discogs_client];
- "discord" = ps: with ps; [ discordpy];
- "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf];
- "dlib_face_detect" = ps: with ps; [ face_recognition];
- "dlib_face_identify" = ps: with ps; [ face_recognition];
+ "discogs" = ps: with ps; [ discogs_client ];
+ "discord" = ps: with ps; [ discordpy ];
+ "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ];
+ "dlib_face_detect" = ps: with ps; [ face_recognition ];
+ "dlib_face_identify" = ps: with ps; [ face_recognition ];
"dlink" = ps: with ps; [ ]; # missing inputs: pyW215
- "dlna_dmr" = ps: with ps; [ async-upnp-client];
- "dnsip" = ps: with ps; [ aiodns];
- "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi
- "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods
- "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy
+ "dlna_dmr" = ps: with ps; [ async-upnp-client ];
+ "dnsip" = ps: with ps; [ aiodns ];
+ "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi
+ "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods
+ "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy
"dovado" = ps: with ps; [ ]; # missing inputs: dovado
"downloader" = ps: with ps; [ ];
"dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser
- "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt];
+ "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"dte_energy_bridge" = ps: with ps; [ ];
"dublin_bus_transport" = ps: with ps; [ ];
"duckdns" = ps: with ps; [ ];
"dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd
- "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict];
+ "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict ];
"dweet" = ps: with ps; [ ]; # missing inputs: dweepy
"dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
- "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool
+ "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool
"ebox" = ps: with ps; [ ]; # missing inputs: pyebox
"ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
"ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface
"ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api
"econet" = ps: with ps; [ ]; # missing inputs: pyeconet
"ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
- "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan]
+ "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan]
"edimax" = ps: with ps; [ ]; # missing inputs: pyedimax
"edl21" = ps: with ps; [ ]; # missing inputs: pysml
"ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
@@ -213,9 +213,9 @@
"emby" = ps: with ps; [ ]; # missing inputs: pyemby
"emoncms" = ps: with ps; [ ];
"emoncms_history" = ps: with ps; [ ];
- "emulated_hue" = ps: with ps; [ aiohttp-cors];
+ "emulated_hue" = ps: with ps; [ aiohttp-cors ];
"emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku
- "enigma2" = ps: with ps; [ openwebifpy];
+ "enigma2" = ps: with ps; [ openwebifpy ];
"enocean" = ps: with ps; [ ]; # missing inputs: enocean
"enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader
"entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient
@@ -225,8 +225,8 @@
"ephember" = ps: with ps; [ ]; # missing inputs: pyephember
"epson" = ps: with ps; [ ]; # missing inputs: epson-projector
"epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter
- "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt
- "esphome" = ps: with ps; [ aioesphomeapi];
+ "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt
+ "esphome" = ps: with ps; [ aioesphomeapi ];
"essent" = ps: with ps; [ ]; # missing inputs: PyEssent
"etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
"eufy" = ps: with ps; [ ]; # missing inputs: lakeside
@@ -240,17 +240,17 @@
"fan" = ps: with ps; [ ];
"fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom
"feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant
- "ffmpeg" = ps: with ps; [ ha-ffmpeg];
- "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg];
- "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg];
+ "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
+ "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
+ "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
"fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3
"fido" = ps: with ps; [ ]; # missing inputs: pyfido
"file" = ps: with ps; [ ];
"filesize" = ps: with ps; [ ];
- "filter" = ps: with ps; [ aiohttp-cors sqlalchemy];
- "fints" = ps: with ps; [ fints];
+ "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+ "fints" = ps: with ps; [ fints ];
"firmata" = ps: with ps; [ ]; # missing inputs: pymata-express
- "fitbit" = ps: with ps; [ aiohttp-cors fitbit];
+ "fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
"fixer" = ps: with ps; [ ]; # missing inputs: fixerio
"fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist
"flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus
@@ -260,23 +260,23 @@
"flume" = ps: with ps; [ ]; # missing inputs: pyflume
"flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou
"flux" = ps: with ps; [ ];
- "flux_led" = ps: with ps; [ flux-led];
+ "flux_led" = ps: with ps; [ flux-led ];
"folder" = ps: with ps; [ ];
- "folder_watcher" = ps: with ps; [ watchdog];
+ "folder_watcher" = ps: with ps; [ watchdog ];
"foobot" = ps: with ps; [ ]; # missing inputs: foobot_async
"forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
"fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi
"foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
- "foursquare" = ps: with ps; [ aiohttp-cors];
+ "foursquare" = ps: with ps; [ aiohttp-cors ];
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
- "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox
+ "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: aiofreepybox
"freedns" = ps: with ps; [ ];
- "fritz" = ps: with ps; [ fritzconnection];
- "fritzbox" = ps: with ps; [ pyfritzhome];
- "fritzbox_callmonitor" = ps: with ps; [ fritzconnection];
- "fritzbox_netmonitor" = ps: with ps; [ fritzconnection];
+ "fritz" = ps: with ps; [ fritzconnection ];
+ "fritzbox" = ps: with ps; [ pyfritzhome ];
+ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
+ "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
"fronius" = ps: with ps; [ ]; # missing inputs: pyfronius
- "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "frontend" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend
"frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
"futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip
"garadget" = ps: with ps; [ ];
@@ -290,29 +290,29 @@
"geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client
"geo_location" = ps: with ps; [ ];
"geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client
- "geofency" = ps: with ps; [ aiohttp-cors];
+ "geofency" = ps: with ps; [ aiohttp-cors ];
"geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes
"geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano
"gios" = ps: with ps; [ ]; # missing inputs: gios
- "github" = ps: with ps; [ PyGithub];
- "gitlab_ci" = ps: with ps; [ python-gitlab];
+ "github" = ps: with ps; [ PyGithub ];
+ "gitlab_ci" = ps: with ps; [ python-gitlab ];
"gitter" = ps: with ps; [ ]; # missing inputs: gitterpy
"glances" = ps: with ps; [ ]; # missing inputs: glances_api
"gntp" = ps: with ps; [ ]; # missing inputs: gntp
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
"gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
- "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client];
- "google_assistant" = ps: with ps; [ aiohttp-cors];
- "google_cloud" = ps: with ps; [ google_cloud_texttospeech];
+ "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
+ "google_assistant" = ps: with ps; [ aiohttp-cors ];
+ "google_cloud" = ps: with ps; [ google_cloud_texttospeech ];
"google_domains" = ps: with ps; [ ];
"google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib
- "google_pubsub" = ps: with ps; [ google_cloud_pubsub];
- "google_translate" = ps: with ps; [ gtts-token];
+ "google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
+ "google_translate" = ps: with ps; [ gtts-token ];
"google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps
"google_wifi" = ps: with ps; [ ];
- "gpmdp" = ps: with ps; [ websocket_client];
+ "gpmdp" = ps: with ps; [ websocket_client ];
"gpsd" = ps: with ps; [ ]; # missing inputs: gps3
- "gpslogger" = ps: with ps; [ aiohttp-cors];
+ "gpslogger" = ps: with ps; [ aiohttp-cors ];
"graphite" = ps: with ps; [ ];
"greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
"greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
@@ -325,8 +325,8 @@
"habitica" = ps: with ps; [ ]; # missing inputs: habitipy
"hangouts" = ps: with ps; [ ]; # missing inputs: hangups
"harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
- "harmony" = ps: with ps; [ aioharmony];
- "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "harmony" = ps: with ps; [ aioharmony ];
+ "hassio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend
"haveibeenpwned" = ps: with ps; [ ];
"hddtemp" = ps: with ps; [ ];
"hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC
@@ -336,27 +336,27 @@
"hikvision" = ps: with ps; [ ]; # missing inputs: pyhik
"hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision
"hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1
- "history" = ps: with ps; [ aiohttp-cors sqlalchemy];
- "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy];
+ "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+ "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ];
"hitron_coda" = ps: with ps; [ ];
"hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
- "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect
+ "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect
"homeassistant" = ps: with ps; [ ];
- "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash
- "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP]
- "homematic" = ps: with ps; [ pyhomematic];
+ "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash
+ "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit[IP]
+ "homematic" = ps: with ps; [ pyhomematic ];
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
"homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
"honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort
"horizon" = ps: with ps; [ ]; # missing inputs: horimote
"hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo
- "html5" = ps: with ps; [ aiohttp-cors pywebpush];
- "http" = ps: with ps; [ aiohttp-cors];
+ "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
+ "http" = ps: with ps; [ aiohttp-cors ];
"htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
- "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize
+ "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize
"huawei_router" = ps: with ps; [ ];
- "hue" = ps: with ps; [ aiohue];
+ "hue" = ps: with ps; [ aiohue ];
"humidifier" = ps: with ps; [ ];
"hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
"hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
@@ -365,17 +365,17 @@
"ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
- "icloud" = ps: with ps; [ pyicloud];
+ "icloud" = ps: with ps; [ pyicloud ];
"idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
- "ifttt" = ps: with ps; [ aiohttp-cors pyfttt];
+ "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
"iglo" = ps: with ps; [ ]; # missing inputs: iglo
"ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client
- "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk
- "image_processing" = ps: with ps; [ aiohttp-cors];
+ "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk
+ "image_processing" = ps: with ps; [ aiohttp-cors ];
"imap" = ps: with ps; [ ]; # missing inputs: aioimaplib
"imap_email_content" = ps: with ps; [ ];
"incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client
- "influxdb" = ps: with ps; [ influxdb-client influxdb];
+ "influxdb" = ps: with ps; [ influxdb-client influxdb ];
"input_boolean" = ps: with ps; [ ];
"input_datetime" = ps: with ps; [ ];
"input_number" = ps: with ps; [ ];
@@ -383,15 +383,15 @@
"input_text" = ps: with ps; [ ];
"insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon
"integration" = ps: with ps; [ ];
- "intent" = ps: with ps; [ aiohttp-cors];
+ "intent" = ps: with ps; [ aiohttp-cors ];
"intent_script" = ps: with ps; [ ];
"intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome
- "ios" = ps: with ps; [ aiohttp-cors zeroconf];
+ "ios" = ps: with ps; [ aiohttp-cors zeroconf ];
"iota" = ps: with ps; [ ]; # missing inputs: pyota
"iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
"ipma" = ps: with ps; [ ]; # missing inputs: pyipma
- "ipp" = ps: with ps; [ pyipp];
- "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia
+ "ipp" = ps: with ps; [ pyipp ];
+ "iqvia" = ps: with ps; [ numpy ]; # missing inputs: pyiqvia
"irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail
"islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator
"iss" = ps: with ps; [ ]; # missing inputs: pyiss
@@ -406,92 +406,92 @@
"kankun" = ps: with ps; [ ];
"keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact
"keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client
- "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef
+ "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef
"keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput
- "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify
+ "keyboard_remote" = ps: with ps; [ evdev ]; # missing inputs: aionotify
"kira" = ps: with ps; [ ]; # missing inputs: pykira
"kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client
"knx" = ps: with ps; [ ]; # missing inputs: xknx
- "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket];
- "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected
+ "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
+ "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
"kwb" = ps: with ps; [ ]; # missing inputs: pykwb
"lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse
"lametric" = ps: with ps; [ ]; # missing inputs: lmnotify
"lannouncer" = ps: with ps; [ ];
- "lastfm" = ps: with ps; [ pylast];
+ "lastfm" = ps: with ps; [ pylast ];
"launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches
"lcn" = ps: with ps; [ ]; # missing inputs: pypck
"lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant
"lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal
"life360" = ps: with ps; [ ]; # missing inputs: life360
- "lifx" = ps: with ps; [ aiolifx aiolifx-effects];
+ "lifx" = ps: with ps; [ aiolifx aiolifx-effects ];
"lifx_cloud" = ps: with ps; [ ];
"lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights
"light" = ps: with ps; [ ];
"lightwave" = ps: with ps; [ ]; # missing inputs: lightwave
- "limitlessled" = ps: with ps; [ limitlessled];
+ "limitlessled" = ps: with ps; [ limitlessled ];
"linksys_smart" = ps: with ps; [ ];
- "linode" = ps: with ps; [ linode-api];
- "linux_battery" = ps: with ps; [ batinfo];
+ "linode" = ps: with ps; [ linode-api ];
+ "linux_battery" = ps: with ps; [ batinfo ];
"lirc" = ps: with ps; [ ]; # missing inputs: python-lirc
"litejet" = ps: with ps; [ ]; # missing inputs: pylitejet
"llamalab_automate" = ps: with ps; [ ];
"local_file" = ps: with ps; [ ];
"local_ip" = ps: with ps; [ ];
- "locative" = ps: with ps; [ aiohttp-cors];
+ "locative" = ps: with ps; [ aiohttp-cors ];
"lock" = ps: with ps; [ ];
- "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
+ "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; # missing inputs: home-assistant-frontend
"logentries" = ps: with ps; [ ];
"logger" = ps: with ps; [ ];
- "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle
+ "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle
"london_air" = ps: with ps; [ ];
"london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status
"loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy
"lovelace" = ps: with ps; [ ];
- "luci" = ps: with ps; [ openwrt-luci-rpc];
- "luftdaten" = ps: with ps; [ luftdaten];
+ "luci" = ps: with ps; [ openwrt-luci-rpc ];
+ "luftdaten" = ps: with ps; [ luftdaten ];
"lupusec" = ps: with ps; [ ]; # missing inputs: lupupy
"lutron" = ps: with ps; [ ]; # missing inputs: pylutron
"lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta
"lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12
"lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides
"magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed
- "mailbox" = ps: with ps; [ aiohttp-cors];
- "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner
+ "mailbox" = ps: with ps; [ aiohttp-cors ];
+ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner
"manual" = ps: with ps; [ ];
- "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt];
- "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
+ "map" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend
"marytts" = ps: with ps; [ ]; # missing inputs: speak2mary
"mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py
- "matrix" = ps: with ps; [ matrix-client];
+ "matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api
"mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx
- "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light];
- "media_player" = ps: with ps; [ aiohttp-cors];
+ "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
+ "media_player" = ps: with ps; [ aiohttp-cors ];
"mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom
"melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud
"melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate
- "meraki" = ps: with ps; [ aiohttp-cors];
+ "meraki" = ps: with ps; [ aiohttp-cors ];
"message_bird" = ps: with ps; [ ]; # missing inputs: messagebird
- "met" = ps: with ps; [ pymetno];
+ "met" = ps: with ps; [ pymetno ];
"meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api
"meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi
"metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
"mfi" = ps: with ps; [ ]; # missing inputs: mficlient
"mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor
"microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts
- "microsoft_face" = ps: with ps; [ aiohttp-cors];
- "microsoft_face_detect" = ps: with ps; [ aiohttp-cors];
- "microsoft_face_identify" = ps: with ps; [ aiohttp-cors];
- "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora
+ "microsoft_face" = ps: with ps; [ aiohttp-cors ];
+ "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ];
+ "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ];
+ "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora
"mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros
"mill" = ps: with ps; [ ]; # missing inputs: millheater
"min_max" = ps: with ps; [ ];
- "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus
- "minio" = ps: with ps; [ minio];
+ "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus
+ "minio" = ps: with ps; [ minio ];
"mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt
"mjpeg" = ps: with ps; [ ];
- "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa];
+ "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa ];
"mochad" = ps: with ps; [ ]; # missing inputs: pymochad
"modbus" = ps: with ps; [ ]; # missing inputs: pymodbus
"modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem
@@ -499,34 +499,34 @@
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
"moon" = ps: with ps; [ ];
"mpchc" = ps: with ps; [ ];
- "mpd" = ps: with ps; [ mpd2];
- "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt];
- "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt];
- "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt];
- "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt];
- "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt];
+ "mpd" = ps: with ps; [ mpd2 ];
+ "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
+ "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ];
+ "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ];
+ "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ];
+ "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"msteams" = ps: with ps; [ ]; # missing inputs: pymsteams
- "mvglive" = ps: with ps; [ PyMVGLive];
+ "mvglive" = ps: with ps; [ PyMVGLive ];
"mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
"myq" = ps: with ps; [ ]; # missing inputs: pymyq
- "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: pymysensors
- "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom
+ "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors
+ "mystrom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: python-mystrom
"mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns
"n26" = ps: with ps; [ ]; # missing inputs: n26
"nad" = ps: with ps; [ ]; # missing inputs: nad_receiver
- "namecheapdns" = ps: with ps; [ defusedxml];
- "nanoleaf" = ps: with ps; [ pynanoleaf];
- "neato" = ps: with ps; [ pybotvac];
+ "namecheapdns" = ps: with ps; [ defusedxml ];
+ "nanoleaf" = ps: with ps; [ pynanoleaf ];
+ "neato" = ps: with ps; [ pybotvac ];
"nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
"nello" = ps: with ps; [ ]; # missing inputs: pynello
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
"nest" = ps: with ps; [ ]; # missing inputs: python-nest
- "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo];
+ "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ];
"netdata" = ps: with ps; [ ]; # missing inputs: netdata
"netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
"netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
- "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio
+ "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio
"neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio
"nexia" = ps: with ps; [ ]; # missing inputs: nexia
"nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext
@@ -535,11 +535,11 @@
"niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control
"nilu" = ps: with ps; [ ]; # missing inputs: niluclient
"nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2
- "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap
+ "nmap_tracker" = ps: with ps; [ getmac ]; # missing inputs: python-nmap
"nmbs" = ps: with ps; [ ]; # missing inputs: pyrail
"no_ip" = ps: with ps; [ ];
"noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa
- "norway_air" = ps: with ps; [ pymetno];
+ "norway_air" = ps: with ps; [ pymetno ];
"notify" = ps: with ps; [ ];
"notify_events" = ps: with ps; [ ]; # missing inputs: notify-events
"notion" = ps: with ps; [ ]; # missing inputs: aionotion
@@ -555,17 +555,17 @@
"nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
"oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
"obihai" = ps: with ps; [ ]; # missing inputs: pyobihai
- "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf];
+ "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ];
"oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
- "ohmconnect" = ps: with ps; [ defusedxml];
+ "ohmconnect" = ps: with ps; [ defusedxml ];
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
- "onboarding" = ps: with ps; [ aiohttp-cors];
+ "onboarding" = ps: with ps; [ aiohttp-cors ];
"onewire" = ps: with ps; [ ]; # missing inputs: pyownet
- "onkyo" = ps: with ps; [ onkyo-eiscp];
- "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async
+ "onkyo" = ps: with ps; [ onkyo-eiscp ];
+ "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async
"openalpr_cloud" = ps: with ps; [ ];
"openalpr_local" = ps: with ps; [ ];
- "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless
+ "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless
"openerz" = ps: with ps; [ ]; # missing inputs: openerz-api
"openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi
"openexchangerates" = ps: with ps; [ ];
@@ -576,22 +576,22 @@
"opensky" = ps: with ps; [ ];
"opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw
"openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv
- "openweathermap" = ps: with ps; [ pyowm];
+ "openweathermap" = ps: with ps; [ pyowm ];
"opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense
"opple" = ps: with ps; [ ]; # missing inputs: pyoppleio
"orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO
"oru" = ps: with ps; [ ]; # missing inputs: oru
"orvibo" = ps: with ps; [ ]; # missing inputs: orvibo
"osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
- "otp" = ps: with ps; [ pyotp];
+ "otp" = ps: with ps; [ pyotp ];
"ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy
- "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt];
- "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt
+ "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ];
+ "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
- "pandora" = ps: with ps; [ pexpect];
- "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
- "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "pandora" = ps: with ps; [ pexpect ];
+ "panel_custom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend
+ "panel_iframe" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend
"pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a
"pencom" = ps: with ps; [ ]; # missing inputs: pencompy
"persistent_notification" = ps: with ps; [ ];
@@ -605,41 +605,41 @@
"ping" = ps: with ps; [ ];
"pioneer" = ps: with ps; [ ];
"pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2
- "plaato" = ps: with ps; [ aiohttp-cors];
- "plant" = ps: with ps; [ sqlalchemy];
- "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos];
+ "plaato" = ps: with ps; [ aiohttp-cors ];
+ "plant" = ps: with ps; [ sqlalchemy ];
+ "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
"plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
- "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint
+ "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
"poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
"prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
- "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client];
+ "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
"prowl" = ps: with ps; [ ];
"proximity" = ps: with ps; [ ];
"proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer
- "proxy" = ps: with ps; [ pillow];
+ "proxy" = ps: with ps; [ pillow ];
"ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen
"ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd
- "pulseaudio_loopback" = ps: with ps; [ pulsectl];
- "push" = ps: with ps; [ aiohttp-cors];
- "pushbullet" = ps: with ps; [ pushbullet];
- "pushover" = ps: with ps; [ pushover-complete];
+ "pulseaudio_loopback" = ps: with ps; [ pulsectl ];
+ "push" = ps: with ps; [ aiohttp-cors ];
+ "pushbullet" = ps: with ps; [ pushbullet ];
+ "pushover" = ps: with ps; [ pushover-complete ];
"pushsafer" = ps: with ps; [ ];
- "pvoutput" = ps: with ps; [ jsonpath xmltodict];
+ "pvoutput" = ps: with ps; [ jsonpath xmltodict ];
"pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc
"pyload" = ps: with ps; [ ];
- "python_script" = ps: with ps; [ restrictedpython];
+ "python_script" = ps: with ps; [ restrictedpython ];
"qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent
"qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client
"qnap" = ps: with ps; [ ]; # missing inputs: qnapstats
- "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar
+ "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar
"quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
"qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro
"qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
- "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: rachiopy
+ "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy
"radarr" = ps: with ps; [ ];
"radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm
"rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird
@@ -650,66 +650,66 @@
"raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi
"raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
"recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste
- "recorder" = ps: with ps; [ sqlalchemy];
+ "recorder" = ps: with ps; [ sqlalchemy ];
"recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
- "reddit" = ps: with ps; [ praw];
+ "reddit" = ps: with ps; [ praw ];
"rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl
- "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI
+ "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI
"remote" = ps: with ps; [ ];
"remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero
"repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier
- "rest" = ps: with ps; [ jsonpath xmltodict];
+ "rest" = ps: with ps; [ jsonpath xmltodict ];
"rest_command" = ps: with ps; [ ];
"rflink" = ps: with ps; [ ]; # missing inputs: rflink
"rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx
- "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell
+ "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell
"ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
- "rmvtransport" = ps: with ps; [ PyRMVtransport];
+ "rmvtransport" = ps: with ps; [ PyRMVtransport ];
"rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
"roku" = ps: with ps; [ ]; # missing inputs: rokuecp
"roomba" = ps: with ps; [ ]; # missing inputs: roombapy
- "route53" = ps: with ps; [ boto3];
+ "route53" = ps: with ps; [ boto3 ];
"rova" = ps: with ps; [ ]; # missing inputs: rova
"rpi_camera" = ps: with ps; [ ];
"rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO
"rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled
"rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio
"rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf
- "rss_feed_template" = ps: with ps; [ aiohttp-cors];
+ "rss_feed_template" = ps: with ps; [ aiohttp-cors ];
"rtorrent" = ps: with ps; [ ];
"russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
"russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
- "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd
- "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend
+ "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd
+ "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: home-assistant-frontend
"saj" = ps: with ps; [ ]; # missing inputs: pysaj
"salt" = ps: with ps; [ ]; # missing inputs: saltbox
- "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket]
+ "samsungtv" = ps: with ps; [ samsungctl samsungtvws ];
"satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
"scene" = ps: with ps; [ ];
"schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
- "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict];
+ "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ];
"script" = ps: with ps; [ ];
"scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
- "search" = ps: with ps; [ aiohttp-cors];
- "season" = ps: with ps; [ ephem];
+ "search" = ps: with ps; [ aiohttp-cors ];
+ "season" = ps: with ps; [ ephem ];
"sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid
"sense" = ps: with ps; [ ]; # missing inputs: sense_energy
"sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
"sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
"sensor" = ps: with ps; [ ];
- "sentry" = ps: with ps; [ sentry-sdk];
- "serial" = ps: with ps; [ pyserial-asyncio];
+ "sentry" = ps: with ps; [ sentry-sdk ];
+ "serial" = ps: with ps; [ pyserial-asyncio ];
"serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor
"sesame" = ps: with ps; [ ]; # missing inputs: pysesame2
- "seven_segments" = ps: with ps; [ pillow];
+ "seven_segments" = ps: with ps; [ pillow ];
"seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track
"shell_command" = ps: with ps; [ ];
- "shiftr" = ps: with ps; [ paho-mqtt];
- "shodan" = ps: with ps; [ shodan];
- "shopping_list" = ps: with ps; [ aiohttp-cors];
+ "shiftr" = ps: with ps; [ paho-mqtt ];
+ "shodan" = ps: with ps; [ shodan ];
+ "shopping_list" = ps: with ps; [ aiohttp-cors ];
"sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
"sigfox" = ps: with ps; [ ];
- "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound
+ "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound
"signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
"simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
"simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
@@ -723,51 +723,51 @@
"sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api
"sma" = ps: with ps; [ ]; # missing inputs: pysma
- "smappee" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmappee
+ "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
- "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: pysmartapp pysmartthings
+ "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
"smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
"sms" = ps: with ps; [ ]; # missing inputs: python-gammu
"smtp" = ps: with ps; [ ];
- "snapcast" = ps: with ps; [ snapcast];
- "snips" = ps: with ps; [ aiohttp-cors paho-mqtt];
- "snmp" = ps: with ps; [ pysnmp];
+ "snapcast" = ps: with ps; [ snapcast ];
+ "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ];
+ "snmp" = ps: with ps; [ pysnmp ];
"sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
"socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient
- "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge
+ "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
"solax" = ps: with ps; [ ]; # missing inputs: solax
"soma" = ps: with ps; [ ]; # missing inputs: pysoma
- "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy
+ "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy
"somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy
"sonarr" = ps: with ps; [ ]; # missing inputs: sonarr
"songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
- "sonos" = ps: with ps; [ pysonos];
+ "sonos" = ps: with ps; [ pysonos ];
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
- "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf];
- "spaceapi" = ps: with ps; [ aiohttp-cors];
+ "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ];
+ "spaceapi" = ps: with ps; [ aiohttp-cors ];
"spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
- "speedtestdotnet" = ps: with ps; [ speedtest-cli];
+ "speedtestdotnet" = ps: with ps; [ speedtest-cli ];
"spider" = ps: with ps; [ ]; # missing inputs: spiderpy
"splunk" = ps: with ps; [ ];
"spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime
- "spotify" = ps: with ps; [ aiohttp-cors spotipy];
- "sql" = ps: with ps; [ sqlalchemy];
+ "spotify" = ps: with ps; [ aiohttp-cors spotipy ];
+ "sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox
- "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf];
+ "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ];
"starline" = ps: with ps; [ ]; # missing inputs: starline
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
- "startca" = ps: with ps; [ xmltodict];
- "statistics" = ps: with ps; [ sqlalchemy];
- "statsd" = ps: with ps; [ statsd];
+ "startca" = ps: with ps; [ xmltodict ];
+ "statistics" = ps: with ps; [ sqlalchemy ];
+ "statsd" = ps: with ps; [ statsd ];
"steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
"stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron
"stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
- "stream" = ps: with ps; [ aiohttp-cors av];
+ "stream" = ps: with ps; [ aiohttp-cors av ];
"streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater
- "stt" = ps: with ps; [ aiohttp-cors];
+ "stt" = ps: with ps; [ aiohttp-cors ];
"suez_water" = ps: with ps; [ ]; # missing inputs: pysuez
"sun" = ps: with ps; [ ];
"supervisord" = ps: with ps; [ ];
@@ -786,9 +786,9 @@
"synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
"syslog" = ps: with ps; [ ];
- "system_health" = ps: with ps; [ aiohttp-cors];
- "system_log" = ps: with ps; [ aiohttp-cors];
- "systemmonitor" = ps: with ps; [ psutil];
+ "system_health" = ps: with ps; [ aiohttp-cors ];
+ "system_log" = ps: with ps; [ aiohttp-cors ];
+ "systemmonitor" = ps: with ps; [ psutil ];
"tado" = ps: with ps; [ ]; # missing inputs: python-tado
"tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api
"tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
@@ -796,19 +796,19 @@
"tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
"tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
"tcp" = ps: with ps; [ ];
- "ted5000" = ps: with ps; [ xmltodict];
+ "ted5000" = ps: with ps; [ xmltodict ];
"teksavvy" = ps: with ps; [ ];
- "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot];
- "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot];
+ "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
+ "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
"tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive
"tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py
"telnet" = ps: with ps; [ ];
"temper" = ps: with ps; [ ]; # missing inputs: temperusb
"template" = ps: with ps; [ ];
- "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim
+ "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim
"tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy
"tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
- "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke
+ "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke
"thethingsnetwork" = ps: with ps; [ ];
"thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak
"thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner
@@ -821,51 +821,51 @@
"timer" = ps: with ps; [ ];
"tmb" = ps: with ps; [ ]; # missing inputs: tmb
"tod" = ps: with ps; [ ];
- "todoist" = ps: with ps; [ todoist];
+ "todoist" = ps: with ps; [ todoist ];
"tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2
"tomato" = ps: with ps; [ ];
- "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: toonapi
- "torque" = ps: with ps; [ aiohttp-cors];
+ "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: toonapi
+ "torque" = ps: with ps; [ aiohttp-cors ];
"totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client
"touchline" = ps: with ps; [ ]; # missing inputs: pytouchline
- "tplink" = ps: with ps; [ pyhs100];
+ "tplink" = ps: with ps; [ pyhs100 ];
"tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
- "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar
+ "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar
"trackr" = ps: with ps; [ ]; # missing inputs: pytrackr
"tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async]
"trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket
"trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket
- "transmission" = ps: with ps; [ transmissionrpc];
+ "transmission" = ps: with ps; [ transmissionrpc ];
"transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW
"travisci" = ps: with ps; [ ]; # missing inputs: TravisPy
- "trend" = ps: with ps; [ numpy];
- "tts" = ps: with ps; [ aiohttp-cors mutagen];
+ "trend" = ps: with ps; [ numpy ];
+ "tts" = ps: with ps; [ aiohttp-cors mutagen ];
"tuya" = ps: with ps; [ ]; # missing inputs: tuyaha
"twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu
- "twilio" = ps: with ps; [ aiohttp-cors twilio];
- "twilio_call" = ps: with ps; [ aiohttp-cors twilio];
- "twilio_sms" = ps: with ps; [ aiohttp-cors twilio];
+ "twilio" = ps: with ps; [ aiohttp-cors twilio ];
+ "twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
+ "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
"twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client
"twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI
"ubee" = ps: with ps; [ ]; # missing inputs: pyubee
"ubus" = ps: with ps; [ ];
"ue_smart_radio" = ps: with ps; [ ];
"uk_transport" = ps: with ps; [ ];
- "unifi" = ps: with ps; [ aiounifi];
- "unifi_direct" = ps: with ps; [ pexpect];
+ "unifi" = ps: with ps; [ aiounifi ];
+ "unifi_direct" = ps: with ps; [ pexpect ];
"unifiled" = ps: with ps; [ ]; # missing inputs: unifiled
"universal" = ps: with ps; [ ];
"upb" = ps: with ps; [ ]; # missing inputs: upb_lib
"upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box
"upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api
- "updater" = ps: with ps; [ distro];
- "upnp" = ps: with ps; [ async-upnp-client];
+ "updater" = ps: with ps; [ distro ];
+ "upnp" = ps: with ps; [ async-upnp-client ];
"uptime" = ps: with ps; [ ];
"uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
"uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus
"usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client
"utility_meter" = ps: with ps; [ ];
- "uvc" = ps: with ps; [ uvcclient];
+ "uvc" = ps: with ps; [ uvcclient ];
"vacuum" = ps: with ps; [ ];
"vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api
"vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
@@ -873,43 +873,43 @@
"velux" = ps: with ps; [ ]; # missing inputs: pyvlx
"venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch
"vera" = ps: with ps; [ ]; # missing inputs: pyvera
- "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure
+ "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure
"versasense" = ps: with ps; [ ]; # missing inputs: pyversasense
- "version" = ps: with ps; [ pyhaversion];
+ "version" = ps: with ps; [ pyhaversion ];
"vesync" = ps: with ps; [ ]; # missing inputs: pyvesync
"viaggiatreno" = ps: with ps; [ ];
"vicare" = ps: with ps; [ ]; # missing inputs: PyViCare
"vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client
"vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek
"vizio" = ps: with ps; [ ]; # missing inputs: pyvizio
- "vlc" = ps: with ps; [ python-vlc];
+ "vlc" = ps: with ps; [ python-vlc ];
"vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc
"voicerss" = ps: with ps; [ ];
"volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler
"volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio
"volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall
- "vultr" = ps: with ps; [ vultr];
+ "vultr" = ps: with ps; [ vultr ];
"w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32
- "wake_on_lan" = ps: with ps; [ wakeonlan];
+ "wake_on_lan" = ps: with ps; [ wakeonlan ];
"waqi" = ps: with ps; [ ]; # missing inputs: waqiasync
"water_heater" = ps: with ps; [ ];
"waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace
"watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf
"watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson
- "waze_travel_time" = ps: with ps; [ WazeRouteCalculator];
+ "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ];
"weather" = ps: with ps; [ ];
- "webhook" = ps: with ps; [ aiohttp-cors];
+ "webhook" = ps: with ps; [ aiohttp-cors ];
"webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv
- "websocket_api" = ps: with ps; [ aiohttp-cors];
+ "websocket_api" = ps: with ps; [ aiohttp-cors ];
"wemo" = ps: with ps; [ ]; # missing inputs: pywemo
"whois" = ps: with ps; [ ]; # missing inputs: python-whois
"wiffi" = ps: with ps; [ ]; # missing inputs: wiffi
- "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink
+ "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink
"wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy
- "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api
+ "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api
"wled" = ps: with ps; [ ]; # missing inputs: wled
"wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset
- "workday" = ps: with ps; [ holidays];
+ "workday" = ps: with ps; [ holidays ];
"worldclock" = ps: with ps; [ ];
"worldtidesinfo" = ps: with ps; [ ];
"worxlandroid" = ps: with ps; [ ];
@@ -920,33 +920,33 @@
"xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi
"xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
- "xiaomi" = ps: with ps; [ ha-ffmpeg];
- "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway
- "xiaomi_miio" = ps: with ps; [ construct python-miio];
+ "xiaomi" = ps: with ps; [ ha-ffmpeg ];
+ "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway
+ "xiaomi_miio" = ps: with ps; [ construct python-miio ];
"xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv
- "xmpp" = ps: with ps; [ slixmpp];
+ "xmpp" = ps: with ps; [ slixmpp ];
"xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client
"yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient
- "yamaha" = ps: with ps; [ rxv];
+ "yamaha" = ps: with ps; [ rxv ];
"yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast
"yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps
"yandextts" = ps: with ps; [ ];
- "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight
+ "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: yeelight
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
"yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
- "yi" = ps: with ps; [ aioftp ha-ffmpeg];
- "yr" = ps: with ps; [ xmltodict];
+ "yi" = ps: with ps; [ aioftp ha-ffmpeg ];
+ "yr" = ps: with ps; [ xmltodict ];
"zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix
"zamg" = ps: with ps; [ ];
"zengge" = ps: with ps; [ ]; # missing inputs: zengge
- "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf];
+ "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
"zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
- "zestimate" = ps: with ps; [ xmltodict];
- "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy];
+ "zestimate" = ps: with ps; [ xmltodict ];
+ "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ];
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
"zone" = ps: with ps; [ ];
- "zoneminder" = ps: with ps; [ zm-py];
- "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher];
+ "zoneminder" = ps: with ps; [ zm-py ];
+ "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
};
}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 3301db1756f..8f4d65066d0 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -75,7 +75,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.114.3";
+ hassVersion = "0.114.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "1fn93vac9vi1wcbq8z9pc2cdvfdkkxpam2qhv5ni14wrmnjc4305";
+ sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7";
};
postPatch = ''
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 3c6d0c4bcab..4fa4b8a48ee 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -113,6 +113,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
# instead of python-3.6-python-mpd2 inside Nixpkgs
if req.startswith("python-") or req.startswith("python_"):
names.append(req[len("python-") :])
+ # Add name variant without extra_require, e.g. samsungctl
+ # instead of samsungctl[websocket]
+ if req.endswith("]"):
+ names.append(req[:req.find("[")])
for name in names:
# treat "-" and "_" equally
name = re.sub("[-_]", "[-_]", name)
@@ -173,9 +177,10 @@ def main() -> None:
f.write(" components = {\n")
for component, deps in build_inputs.items():
available, missing = deps
- f.write(f' "{component}" = ps: with ps; [ ')
- f.write(" ".join(available))
- f.write("];")
+ f.write(f' "{component}" = ps: with ps; [')
+ if available:
+ f.write(" " + " ".join(available))
+ f.write(" ];")
if len(missing) > 0:
f.write(f" # missing inputs: {' '.join(missing)}")
f.write("\n")
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/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index e6ecf5681f5..4e5c74c2a60 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
buildGoPackage rec {
version = "1.6.0";
@@ -25,7 +25,7 @@ buildGoPackage rec {
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/promtail \
- --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
+ --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 506d334a921..c66373e9298 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
, systemd, withSystemdSupport ? true }:
with stdenv.lib;
@@ -44,7 +44,7 @@ buildGoPackage rec {
postInstall = optionalString withSystemdSupport ''
wrapProgram $out/bin/postfix_exporter \
- --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
+ --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
'';
passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; };
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/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix
index 24e25f0c137..ecb7fdd4888 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/pkgs/servers/tegola/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "tegola";
- version = "0.11.2";
+ version = "0.12.0";
goPackagePath = "github.com/go-spatial/tegola";
@@ -10,9 +10,11 @@ buildGoPackage rec {
owner = "go-spatial";
repo = pname;
rev = "v${version}";
- sha256 = "0xrjs0py08q9i31rl0cxi6idncrrgqwcspqks3c5vd9i65yqc6fv";
+ sha256 = "1bm791cis6bqgvhkk6n03kdxh0y9fdkhsx4rgmv7pm3zzdd7b17r";
};
+ buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];
+
meta = with stdenv.lib; {
homepage = "https://www.tegola.io/";
description = "Mapbox Vector Tile server";
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 5d6a8a6065b..f73ec422e06 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -4,21 +4,31 @@
, glibcLocales
, coreutils
, git
+, fetchpatch
}:
python3Packages.buildPythonApplication rec {
pname = "xonsh";
- version = "0.9.19";
+ version = "0.9.20";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
- sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64";
+ sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p";
};
LC_ALL = "en_US.UTF-8";
+
+ patches = [
+ # Fix vox tests. Remove with the next release
+ (fetchpatch {
+ url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch";
+ sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h";
+ })
+ ];
+
postPatch = ''
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index b70d62ffb10..fc87a3a2b31 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,23 +4,16 @@
{ stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
- version = "2020-08-24";
+ version = "2020-08-28";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
- rev = "cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa";
- sha256 = "0af37smv0bqw37bng2halzgszf8y3m2sxahdff54m16asm0py2cr";
+ rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7";
+ sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai";
};
- patches = [(fetchpatch {
- # TODO: remove once https://github.com/ohmyzsh/ohmyzsh/pull/9210 is merged
- name = "0001-pygmalion-use-pure-zsh-instead-of-perl.patch";
- url = "https://github.com/flokli/ohmyzsh/commit/299b48ce422957c0f5ca06cd5ccade55e0a08d87.patch";
- sha256 = "1cxj3c9bbcqd8zj9fccn117n2rzhx6krzbl4db059g2vsycadwmi";
- })];
-
installPhase = ''
outdir=$out/share/oh-my-zsh
template=templates/zshrc.zsh-template
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index 4517077ac46..4b2d88cdf27 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, nixosTests }:
buildGoModule rec {
pname = "lego";
@@ -27,4 +27,6 @@ buildGoModule rec {
homepage = "https://go-acme.github.io/lego/";
maintainers = teams.acme.members;
};
+
+ passthru.tests.lego = nixosTests.acme;
}
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 2e8ff96d41a..2a71556961e 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
- version = "4.4";
+ version = "4.5";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h";
+ sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr";
};
postPatch = ''
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 35d65b5e657..83b69b12fea 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
pyyaml
pyzmq
requests
- tornado_4
+ tornado
] ++ extraInputs;
patches = [ ./fix-libcrypto-loading.patch ];
diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index e2cfa806f95..0c6e9dc0ab2 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -1,19 +1,19 @@
{ lib
-, pythonPackages
+, python3Packages
, salt
}:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "salt-pepper";
version = "0.7.5";
- src = pythonPackages.fetchPypi {
+ src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w";
};
- buildInputs = with pythonPackages; [ setuptools setuptools_scm salt ];
- checkInputs = with pythonPackages; [
- pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado_4
+ buildInputs = with python3Packages; [ setuptools setuptools_scm salt ];
+ checkInputs = with python3Packages; [
+ pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado
];
meta = with lib; {
@@ -21,5 +21,6 @@ pythonPackages.buildPythonApplication rec {
homepage = "https://github.com/saltstack/pepper";
maintainers = [ maintainers.pierrer ];
license = licenses.asl20;
+ broken = true; # ModuleNotFoundError: No module named 'pytestsalt'
};
}
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index a439bbf41b1..1f379feece4 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }:
+{ stdenv, fetchurl
+, attr, e2fsprogs
+, curl, librsync, libthreadar
+, gpgme, libgcrypt, openssl
+, bzip2, lzo, xz, zlib
+}:
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.6.9";
+ version = "2.6.10";
pname = "dar";
src = fetchurl {
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
- sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v";
+ sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n";
};
- buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
- ++ optionals stdenv.isLinux [ attr e2fsprogs ];
+ outputs = [ "out" "dev" ];
+
+ buildInputs = [
+ curl librsync libthreadar
+ gpgme libgcrypt openssl
+ bzip2 lzo xz zlib
+ ] ++ optionals stdenv.isLinux [ attr e2fsprogs ];
configureFlags = [
"--disable-birthtime"
@@ -23,7 +33,8 @@ stdenv.mkDerivation rec {
];
postInstall = ''
- rm -r "$out"/share/dar # Disable html help
+ # Disable html help
+ rm -r "$out"/share/dar
'';
enableParallelBuilding = true;
@@ -33,6 +44,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://dar.linux.free.fr";
description = "Disk ARchiver, allows backing up files into indexed archives";
+ maintainers = with maintainers; [ izorkin ];
license = licenses.gpl2;
platforms = platforms.unix;
};
diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix
index 81e16ad005b..e69823ab45d 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/pkgs/tools/backup/grab-site/default.nix
@@ -1,6 +1,14 @@
-{ stdenv, python3Packages, fetchFromGitHub }:
+{ stdenv, python37, fetchFromGitHub }:
-python3Packages.buildPythonApplication rec {
+let
+ python = python37.override {
+ self = python;
+ packageOverrides = self: super: {
+ tornado = super.tornado_4;
+ };
+ };
+
+in with python.pkgs; buildPythonApplication rec {
version = "2.1.19";
name = "grab-site-${version}";
@@ -11,7 +19,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4";
};
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = [
click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet
];
diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix
new file mode 100644
index 00000000000..3f6105ca507
--- /dev/null
+++ b/pkgs/tools/compression/bzip2/1_1.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, fetchFromGitLab
+, meson
+, python3
+, ninja
+}:
+
+stdenv.mkDerivation rec {
+ pname = "bzip2-unstable";
+ version = "2020-08-11";
+
+ src = fetchFromGitLab {
+ owner = "federicomenaquintero";
+ repo = "bzip2";
+ rev = "15255b553e7c095fb7a26d4dc5819a11352ebba1";
+ sha256 = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs=";
+ };
+
+ postPatch = ''
+ patchShebangs install_links.py
+ '';
+
+ nativeBuildInputs = [
+ meson
+ python3
+ ninja
+ ];
+
+ outputs = [ "bin" "dev" "out" "man" ];
+
+ mesonFlags = [
+ "-Ddocs=disabled"
+ ];
+
+ strictDeps = true;
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "High-quality data compression program";
+ license = licenses.bsdOriginal;
+ platforms = platforms.all;
+ maintainers = [];
+ };
+}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index b05abd72bac..6ba29cb98d4 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -30,7 +30,7 @@ buildPythonApplication rec {
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
sed -i -e '/find_library/,/find_library/ {
- c libudev = "${systemd.lib}/lib/libudev.so.1"
+ c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1"
}' blivet/pyudev.py
'';
diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
index ffed57e6345..36525e6fa3c 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
- substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id
- substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id
+ substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id
+ substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id
sed -i -re '
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/tools/misc/bashcards/default.nix
index ecaabb43c14..3e91b9741c6 100644
--- a/pkgs/tools/misc/bashcards/default.nix
+++ b/pkgs/tools/misc/bashcards/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bashcards";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "rpearce";
repo = pname;
rev = "v${version}";
- sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl";
+ sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid";
};
dontBuild = true;
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/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index 34405ccc7be..6389d41cdfe 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -6,6 +6,7 @@
, makeWrapper
, udev
, stdenv
+, lib
, wrapGAppsHook
}:
let
@@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
'';
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
];
postFixup = ''
diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix
index 73dcbd3bc3c..415c55fb611 100644
--- a/pkgs/tools/misc/lsd/default.nix
+++ b/pkgs/tools/misc/lsd/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lsd";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "Peltoche";
repo = pname;
rev = version;
- sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai";
+ sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj";
};
- cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr";
+ cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 568afb50403..fd1bfc7f8c7 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -39,13 +39,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
- version = "2020.4";
+ version = "2020.5";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
- sha256 = "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n";
+ sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb";
};
patches = [
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/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix
new file mode 100644
index 00000000000..312b402ae66
--- /dev/null
+++ b/pkgs/tools/misc/somafm-cli/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchFromGitHub
+, makeWrapper
+, curl
+, jq
+, mpv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "somafm-cli";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "rockymadden";
+ repo = "somafm-cli";
+ rev = "v${version}";
+ sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ install -m0755 -D src/somafm $out/bin/somafm
+ wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}";
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Listen to SomaFM in your terminal via pure bash";
+ homepage = "https://github.com/rockymadden/somafm-cli";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index a1e6f57ce3d..90c3c696526 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, lib, fetchurl, makeWrapper
, dpkg, patchelf
, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
, libXdamage, expat }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
- ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
for binary in StarUML Brackets-node; do
${patchelf}/bin/patchelf \
diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix
index 82c9db90432..ea03f8878b2 100644
--- a/pkgs/tools/networking/circus/default.nix
+++ b/pkgs/tools/networking/circus/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, python3Packages }:
+{ stdenv, python3 }:
let
- inherit (python3Packages) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock;
+ python = python3.override {
+ self = python;
+ packageOverrides = self: super: {
+ tornado = super.tornado_4;
+ };
+ };
+
+ inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado mock six;
in
buildPythonApplication rec {
@@ -23,7 +30,7 @@ buildPythonApplication rec {
doCheck = false; # weird error
- propagatedBuildInputs = [ iowait psutil pyzmq tornado_4 ];
+ propagatedBuildInputs = [ iowait psutil pyzmq tornado six ];
meta = with stdenv.lib; {
description = "A process and socket manager";
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index c3d07ddca95..c8119209692 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -65,7 +65,7 @@ in buildGoPackage rec {
wrapProgram "$out/bin/agent" \
--set PYTHONPATH "$out/${python.sitePackages}" \
- --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib
+ --prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/tools/networking/toss/default.nix
new file mode 100644
index 00000000000..9752dcc4f64
--- /dev/null
+++ b/pkgs/tools/networking/toss/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "toss";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "zerotier";
+ repo = pname;
+ rev = version;
+ sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r";
+ };
+ preInstall = "export DESTDIR=$out/bin";
+ meta = with stdenv.lib;
+ src.meta // {
+ description = "Dead simple LAN file transfers from the command line";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ ehmry ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index c3e4c637109..a9f0d7e77d6 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
- version = "1.0.20200820";
+ version = "1.0.20200827";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
- sha256 = "138pf23x39xm68pa4ks3g76axphl8pz5jw4fyi54wi7rvxclybc7";
+ sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 39b34bf153d..0e2cec68520 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- version = "1.12.0";
+ version = "1.12.1";
pname = "librepo";
outputs = [ "out" "dev" "py" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "rpm-software-management";
repo = "librepo";
rev = version;
- sha256 = "070zgay0cbw6jrkcfp4qql9f9ydd41ilwk39xdrp939b23gp112d";
+ sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix
new file mode 100644
index 00000000000..0ef3602c597
--- /dev/null
+++ b/pkgs/tools/package-management/nix-template/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "nix-template";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "jonringer";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig";
+ };
+
+ cargoSha256 = "13y3b60xnry71999kygvkr29gkyjss3ga3rzb43ajah4qp90rsqs";
+
+ meta = with lib; {
+ description = "Make creating nix expressions easy";
+ homepage = "https://github.com/jonringer/nix-template/";
+ changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}";
+ license = licenses.cc0;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 05036770316..2acf5d194e0 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -195,14 +195,14 @@ in rec {
});
nixUnstable = lib.lowPrio (callPackage common rec {
- name = "nix-2.4${suffix}";
- suffix = "pre20200721_ff314f1";
+ name = "nix-3.0${suffix}";
+ suffix = "pre20200829_f156513";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940";
- hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0=";
+ rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87";
+ hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro=";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 922546009fc..935f6553f9c 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -8,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
- sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli";
+ sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l";
};
makeWrapperArgs = [
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index 4e087ee631e..d383a00a7f2 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -6,6 +6,7 @@
, makeDesktopItem
, makeWrapper
, stdenv
+, lib
, udev
, wrapGAppsHook
}:
@@ -72,7 +73,7 @@ let
'';
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
];
postFixup = ''
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
index b4c2bef2cf4..62311a41da3 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/pkgs/tools/security/encryptr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
+{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr
, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin
mv -v $out/bin/encryptr{-bin,}
cp -v lib* $out/lib
- ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
+ ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath $out/lib:${rpath} \
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/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix
index 14f2059cf5c..191b4f35150 100644
--- a/pkgs/tools/security/kbs2/default.nix
+++ b/pkgs/tools/security/kbs2/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
- sha256 = "1zp4gpbqhivmp7lpm10xb6ahx1z7nsijz7pi5i0bndv0y9mr609p";
+ sha256 = "1hjcx651nqj1plxw4i2nv72zc0igd8pl31dy2zwm5yyky6dl7qla";
};
- cargoSha256 = "1inqz4whqw9mb3m22kv44f255m3cjr66pc5ncdw2rgpy3zjh4p3z";
+ cargoSha256 = "11fw097r4mim3rgb0db7naqlf3ws0bavqdd4z84mpdg6714dga0n";
nativeBuildInputs = [ installShellFiles ]
++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
@@ -27,6 +27,8 @@ rustPlatform.buildRustPackage rec {
checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ];
postInstall = ''
+ mkdir -p $out/share/kbs2
+ cp -r contrib/ $out/share/kbs2
for shell in bash fish zsh; do
$out/bin/kbs2 --completions $shell > kbs2.$shell
installShellCompletion kbs2.$shell
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index aabe1fcebbd..20c1bb8f7f1 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev
+{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev
, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
, runtimeShell, gsettings-desktop-schemas }:
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
];
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
libappindicator-gtk3
];
diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix
new file mode 100644
index 00000000000..2a2e8c7ec6c
--- /dev/null
+++ b/pkgs/tools/security/rustscan/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, nmap
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rustscan";
+ version = "1.8.0";
+
+ src = fetchFromGitHub {
+ owner = "RustScan";
+ repo = pname;
+ rev = "${version}";
+ sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay";
+ };
+
+ cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8";
+
+ postPatch = ''
+ substituteInPlace src/main.rs \
+ --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")'
+ '';
+
+ checkFlags = [
+ "--skip=infer_ulimit_lowering_no_panic"
+ "--skip=google_dns_runs"
+ "--skip=parse_correct_ips_or_hosts"
+ ];
+
+ meta = with lib; {
+ description = "Faster Nmap Scanning with Rust";
+ homepage = "https://github.com/RustScan/RustScan";
+ license = licenses.gpl3Only;
+ maintainers = [ maintainers.SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index c9adf5377e2..2d86894808c 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -1,23 +1,32 @@
-{ lib, fetchurl, stdenv, ncurses,
-IOKit, python3 }:
+{ lib, fetchFromGitHub, stdenv, autoreconfHook
+, ncurses, IOKit, python3
+, fetchpatch
+}:
stdenv.mkDerivation rec {
pname = "htop";
- version = "2.2.0";
+ version = "3.0.0";
- src = fetchurl {
- url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz";
- sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
+ src = fetchFromGitHub {
+ owner = "htop-dev";
+ repo = pname;
+ rev = version;
+ sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4";
};
- nativeBuildInputs = [ python3 ];
- buildInputs =
- [ ncurses ] ++
- lib.optionals stdenv.isDarwin [ IOKit ];
+ patches = [
+ # Never use glyphs for checkmarks. Issue - https://github.com/htop-dev/htop/issues/29
+ # Remove with the next release.
+ (fetchpatch {
+ url = "https://github.com/htop-dev/htop/commit/96074058278829facb86f6f4de099d56a00a0c0e.patch";
+ sha256 = "1rnfvjfsvfgr1s7kzr1hk6nwik6shcq4mg6dlbgdq0f2fz0cnazk";
+ })
+ ];
- prePatch = ''
- patchShebangs scripts/MakeHeader.py
- '';
+ nativeBuildInputs = [ autoreconfHook python3 ];
+
+ buildInputs = [ ncurses
+ ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; {
description = "An interactive process viewer for Linux";
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/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix
index aa7a8598d66..017066a2c22 100644
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
- version = "0.7.3";
+ version = "0.7.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
- sha512 = "14mx22aqr9cmin4cyhrclhm0hly1i21j2dmsikfp1c87wl2kpn9xgxnix5r0iqh5dwjxdh591rfh21xjp0l11m0nl5wkpnn7wmq7g6b";
+ sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0";
};
nativeBuildInputs = [ which ];
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 fe9cb77d5e9..363d2aa84b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -985,6 +985,10 @@ in
dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };
+ dot-http = callPackage ../development/tools/dot-http {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
doona = callPackage ../tools/security/doona { };
ecdsautils = callPackage ../tools/security/ecdsautils { };
@@ -1183,6 +1187,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;
@@ -2236,6 +2241,8 @@ in
nix-direnv = callPackage ../tools/misc/nix-direnv { };
+ nix-template = callPackage ../tools/package-management/nix-template { };
+
nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;
noteshrink = callPackage ../tools/misc/noteshrink { };
@@ -2268,6 +2275,8 @@ in
obinskit = callPackage ../applications/misc/obinskit {};
+ odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
+
pastel = callPackage ../applications/misc/pastel {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -2570,6 +2579,8 @@ in
bzip2 = callPackage ../tools/compression/bzip2 { };
+ bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };
+
cabextract = callPackage ../tools/archivers/cabextract { };
cadaver = callPackage ../tools/networking/cadaver {
@@ -3369,14 +3380,8 @@ in
cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
- emscriptenVersion = "1.39.1";
-
emscripten = callPackage ../development/compilers/emscripten { };
- emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { });
-
- emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp;
-
emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; };
@@ -4583,7 +4588,7 @@ in
isync = callPackage ../tools/networking/isync { };
- itm-tools = callPackage ../development/tools/misc/itm-tools { };
+ itm-tools = callPackage ../development/tools/misc/itm-tools { };
ix = callPackage ../tools/misc/ix { };
@@ -4884,6 +4889,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 { };
@@ -6704,6 +6714,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
+ rustscan = callPackage ../tools/security/rustscan { };
+
rw = callPackage ../tools/misc/rw { };
rxp = callPackage ../tools/text/xml/rxp { };
@@ -6804,6 +6816,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 { };
@@ -6982,6 +6996,10 @@ in
snort = callPackage ../applications/networking/ids/snort { };
+ so = callPackage ../development/tools/so {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
soapui = callPackage ../applications/networking/soapui { };
sshguard = callPackage ../tools/security/sshguard {};
@@ -7378,6 +7396,8 @@ in
torsocks = callPackage ../tools/security/tor/torsocks.nix { };
+ toss = callPackage ../tools/networking/toss { };
+
tox-node = callPackage ../tools/networking/tox-node { };
toxvpn = callPackage ../tools/networking/toxvpn { };
@@ -8113,6 +8133,7 @@ in
inherit (yarn2nix-moretea)
yarn2nix
mkYarnPackage
+ mkYarnModules
fixup_yarn_lock;
yasr = callPackage ../applications/audio/yasr { };
@@ -9234,6 +9255,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 {
@@ -9563,7 +9586,9 @@ in
cargo-deny = callPackage ../development/tools/rust/cargo-deny {
inherit (darwin.apple_sdk.frameworks) Security;
};
+ cargo-embed = callPackage ../development/tools/rust/cargo-embed { };
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
+ cargo-flash = callPackage ../development/tools/rust/cargo-flash { };
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -12515,9 +12540,7 @@ in
gperftools = callPackage ../development/libraries/gperftools { };
- grab-site = callPackage ../tools/backup/grab-site {
- python3Packages = python37Packages;
- };
+ grab-site = callPackage ../tools/backup/grab-site { };
grib-api = callPackage ../development/libraries/grib-api { };
@@ -13961,6 +13984,8 @@ in
libtheora = callPackage ../development/libraries/libtheora { };
+ libthreadar = callPackage ../development/libraries/libthreadar { };
+
libtiff = callPackage ../development/libraries/libtiff { };
libtiger = callPackage ../development/libraries/libtiger { };
@@ -14816,7 +14841,7 @@ in
inherit (kdeFrameworks.override { libsForQt5 = self; })
attica baloo bluez-qt kactivities kactivities-stats
karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig
- kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support
+ kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support
kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons
khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews
kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications
@@ -15658,7 +15683,6 @@ in
webkitgtk = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzzFull;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
- stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947
};
websocketpp = callPackage ../development/libraries/websocket++ { };
@@ -15674,6 +15698,8 @@ in
wt3
wt4;
+ wxformbuilder = callPackage ../development/tools/wxformbuilder { };
+
wxGTK = wxGTK28;
wxGTK30 = wxGTK30-gtk2;
@@ -18294,8 +18320,25 @@ in
sysstat = callPackage ../os-specific/linux/sysstat { };
systemd = callPackage ../os-specific/linux/systemd {
- utillinux = utillinuxMinimal; # break the cyclic dependency
+ # break some cyclic dependencies
+ utillinux = utillinuxMinimal;
+ # provide a super minimal gnupg used for systemd-machined
+ gnupg = callPackage ../tools/security/gnupg/22.nix {
+ enableMinimal = true;
+ guiSupport = false;
+ pcsclite = null;
+ sqlite = null;
+ pinentry = null;
+ adns = null;
+ gnutls = null;
+ libusb1 = null;
+ openldap = null;
+ readline = null;
+ zlib = null;
+ bzip2 = null;
+ };
};
+
udev = systemd; # TODO: move to aliases.nix
systemd-wait = callPackage ../os-specific/linux/systemd-wait { };
@@ -19233,6 +19276,8 @@ in
vegeta = callPackage ../tools/networking/vegeta { };
+ venta = callPackage ../data/themes/venta { };
+
victor-mono = callPackage ../data/fonts/victor-mono { };
vimix-gtk-themes = callPackage ../data/themes/vimix {};
@@ -20329,6 +20374,8 @@ in
gopher = callPackage ../applications/networking/gopher/gopher { };
+ gophernotes = callPackage ../applications/editors/gophernotes { };
+
goxel = callPackage ../applications/graphics/goxel { };
gpa = callPackage ../applications/misc/gpa { };
@@ -20708,6 +20755,8 @@ in
gollum = callPackage ../applications/misc/gollum { };
+ gonic = callPackage ../servers/gonic { };
+
googleearth = callPackage ../applications/misc/googleearth { };
google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
@@ -20970,6 +21019,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 { };
@@ -21877,6 +21928,8 @@ in
nixos-shell = callPackage ../tools/virtualization/nixos-shell {};
+ noaa-apt = callPackage ../applications/radio/noaa-apt { };
+
node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };
ninjas2 = callPackage ../applications/audio/ninjas2 {};
@@ -21929,6 +21982,8 @@ in
planner = callPackage ../applications/office/planner { };
+ plasma-wayland-protocols = libsForQt5.callPackage ../development/libraries/plasma-wayland-protocols { };
+
playonlinux = callPackage ../applications/misc/playonlinux {
stdenv = stdenv_32bit;
};
@@ -23325,6 +23380,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 {
@@ -24673,13 +24730,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 {};
@@ -25387,6 +25444,8 @@ in
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
systemsettings user-manager xdg-desktop-portal-kde;
+ plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { };
+
kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { };
krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { };
@@ -25604,6 +25663,8 @@ in
snpeff = callPackage ../applications/science/biology/snpeff { };
+ somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { };
+
somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { };
sortmerna = callPackage ../applications/science/biology/sortmerna { };
@@ -25945,6 +26006,7 @@ in
lean2 = callPackage ../applications/science/logic/lean2 {};
lean3 = lean;
elan = callPackage ../applications/science/logic/elan {};
+ mathlibtools = with python3Packages; toPythonApplication mathlibtools;
leo2 = callPackage ../applications/science/logic/leo2 {
ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;};
@@ -27520,7 +27582,7 @@ in
sequeler = callPackage ../applications/misc/sequeler { };
sequelpro = callPackage ../applications/misc/sequelpro {};
-
+
snowsql = callPackage ../applications/misc/snowsql {};
sidequest = callPackage ../applications/misc/sidequest {};
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a9bea0a60f6..32bb7d33786 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 { };
@@ -750,6 +754,12 @@ let
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
+ posix-base = callPackage ../development/ocaml-modules/posix/base.nix { };
+
+ posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { };
+
+ posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };
+
ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
@@ -951,6 +961,8 @@ let
wasm = callPackage ../development/ocaml-modules/wasm { };
+ webbrowser = callPackage ../development/ocaml-modules/webbrowser { };
+
webmachine = callPackage ../development/ocaml-modules/webmachine { };
wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
@@ -991,7 +1003,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/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2f5fffe5f9c..c85ca5a3c5a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12875,10 +12875,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
- version = "8.55";
+ version = "8.58";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz";
- sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x";
+ url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.58.tar.gz";
+ sha256 = "0543m2g1pjm06b0yr4cffw70ki76762ria65zvrjccc2zk69pwvy";
};
meta = {
homepage = "https://mojolicious.org";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7324a36ae0..72fd49c64f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -158,6 +158,8 @@ in {
aenum = callPackage ../development/python-modules/aenum { };
+ afdko = callPackage ../development/python-modules/afdko { };
+
affinity = callPackage ../development/python-modules/affinity { };
agate = callPackage ../development/python-modules/agate { };
@@ -992,6 +994,8 @@ in {
matchpy = callPackage ../development/python-modules/matchpy { };
+ mathlibtools = callPackage ../development/python-modules/mathlibtools {};
+
maxminddb = callPackage ../development/python-modules/maxminddb { };
mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py;
@@ -1164,6 +1168,8 @@ in {
pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { };
+ pure-eval = callPackage ../development/python-modules/pure-eval {};
+
purl = callPackage ../development/python-modules/purl { };
pyclipper = callPackage ../development/python-modules/pyclipper { };
@@ -1719,6 +1725,10 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security;
};
+ ufonormalizer = callPackage ../development/python-modules/ufonormalizer { };
+
+ ufoprocessor = callPackage ../development/python-modules/ufoprocessor { };
+
unifi = callPackage ../development/python-modules/unifi { };
uvcclient = callPackage ../development/python-modules/uvcclient { };
@@ -2087,6 +2097,8 @@ in {
boltztrap2 = callPackage ../development/python-modules/boltztrap2 { };
+ booleanoperations = callPackage ../development/python-modules/booleanoperations { };
+
boolean-py = callPackage ../development/python-modules/boolean-py { };
bumps = callPackage ../development/python-modules/bumps {};
@@ -2206,6 +2218,8 @@ in {
debian = callPackage ../development/python-modules/debian {};
+ defcon = callPackage ../development/python-modules/defcon { };
+
defusedxml = callPackage ../development/python-modules/defusedxml {};
dodgy = callPackage ../development/python-modules/dodgy { };
@@ -2746,6 +2760,8 @@ in {
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
+ pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
+
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
@@ -2894,9 +2910,7 @@ in {
# Alias that we should deprecate
dateutil = self.python-dateutil;
- debugpy = callPackage ../development/python-modules/debugpy {
- django = if isPy27 then self.django_1_11 else self.django;
- };
+ debugpy = callPackage ../development/python-modules/debugpy { };
decorator = callPackage ../development/python-modules/decorator { };
@@ -3702,6 +3716,10 @@ in {
samplerate = callPackage ../development/python-modules/samplerate { };
+ samsungctl = callPackage ../development/python-modules/samsungctl { };
+
+ samsungtvws = callPackage ../development/python-modules/samsungtvws { };
+
screeninfo = callPackage ../development/python-modules/screeninfo { };
ssdeep = callPackage ../development/python-modules/ssdeep { };
@@ -3756,10 +3774,6 @@ in {
django_lts = self.django_2_2;
- django_1_11 = callPackage ../development/python-modules/django/1_11.nix {
- gdal = self.gdal;
- };
-
django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
django-allauth = callPackage ../development/python-modules/django-allauth { };
@@ -4086,6 +4100,10 @@ in {
cudaSupport = pkgs.config.cudaSupport or false;
};
+ pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix {
+ inherit (pkgs.linuxPackages) nvidia_x11;
+ };
+
pyro-ppl = callPackage ../development/python-modules/pyro-ppl {};
opt-einsum = if isPy27 then
@@ -4136,6 +4154,12 @@ in {
inherit python;
}));
+ fontpens = callPackage ../development/python-modules/fontpens { };
+
+ fontmath = callPackage ../development/python-modules/fontmath { };
+
+ fontparts = callPackage ../development/python-modules/fontparts { };
+
fonttools = callPackage ../development/python-modules/fonttools { };
foolscap = callPackage ../development/python-modules/foolscap { };
@@ -4544,6 +4568,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;
};
@@ -4693,6 +4719,8 @@ in {
inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules
};
+ lml = callPackage ../development/python-modules/lml { };
+
locustio = callPackage ../development/python-modules/locustio { };
llvmlite = callPackage ../development/python-modules/llvmlite {
@@ -4932,6 +4960,8 @@ in {
else
callPackage ../development/python-modules/mutagen { };
+ mutatormath = callPackage ../development/python-modules/mutatormath { };
+
muttils = callPackage ../development/python-modules/muttils { };
mygpoclient = callPackage ../development/python-modules/mygpoclient { };
@@ -5476,6 +5506,8 @@ in {
protobuf = pkgs.protobuf;
};
+ psautohint = callPackage ../development/python-modules/psautohint { };
+
psd-tools = callPackage ../development/python-modules/psd-tools { };
psutil = callPackage ../development/python-modules/psutil { };
@@ -5574,6 +5606,14 @@ in {
pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; };
+ pyexcel = callPackage ../development/python-modules/pyexcel { };
+
+ pyexcel-io = callPackage ../development/python-modules/pyexcel-io { };
+
+ pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { };
+
+ pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { };
+
pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
pyext = callPackage ../development/python-modules/pyext { };
@@ -6809,6 +6849,8 @@ in {
unicodecsv = callPackage ../development/python-modules/unicodecsv { };
+ unicodedata2 = callPackage ../development/python-modules/unicodedata2 { };
+
unicode-slugify = callPackage ../development/python-modules/unicode-slugify { };
unidiff = callPackage ../development/python-modules/unidiff { };
@@ -6926,6 +6968,8 @@ in {
zope_interface = callPackage ../development/python-modules/zope_interface { };
+ zopfli = callPackage ../development/python-modules/zopfli { };
+
hgsvn = callPackage ../development/python-modules/hgsvn { };
cliapp = callPackage ../development/python-modules/cliapp { };
@@ -6937,8 +6981,12 @@ in {
else
callPackage ../development/python-modules/tornado/5.nix { };
+ # Used by circus and grab-site, 2020-08-29
tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };
+ # Used by luigi, 2020-08-29
+ tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
+
tokenlib = callPackage ../development/python-modules/tokenlib { };
tunigo = callPackage ../development/python-modules/tunigo { };
@@ -6991,7 +7039,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 {};
@@ -7613,6 +7663,8 @@ in {
ftfy = callPackage ../development/python-modules/ftfy { };
+ mmh3 = callPackage ../development/python-modules/mmh3 { };
+
murmurhash = callPackage ../development/python-modules/murmurhash { };
pkuseg = callPackage ../development/python-modules/pkuseg { };
@@ -7851,7 +7903,7 @@ in {
rxv = callPackage ../development/python-modules/rxv { };
userpath = callPackage ../development/python-modules/userpath { };
-
+
pooch = callPackage ../development/python-modules/pooch {};
});