From 948de104de09cc27184d97aed2fe3b758133cc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 1 Apr 2020 03:54:21 +0200 Subject: [PATCH 001/214] stage-1-init: add boot.persistence option This option allows replacing the tmpfs mounted on / by the live CD's init script with a physical device Since nixOS symlinks everything there's no trouble at all. That enables the user to easily use a nixOS live CD as a portable installation. Note that due to some limitations in how the store is mounted currently only the non-store things are persisted. --- nixos/modules/system/boot/stage-1-init.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 607aec87f01..54e3a691b2f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -144,6 +144,14 @@ for o in $(cat /proc/cmdline); do set -- $(IFS==; echo $o) stage2Init=$2 ;; + boot.persistence=*) + set -- $(IFS==; echo $o) + persistence=$2 + ;; + boot.persistence.opt=*) + set -- $(IFS==; echo $o) + persistence_opt=$2 + ;; boot.trace|debugtrace) # Show each command. set -x @@ -534,6 +542,14 @@ while read -u 3 mountPoint; do continue fi + if [ "$mountPoint" = / ] && [ "$device" = tmpfs ] && [ ! -z "$persistence" ]; then + echo persistence... + waitDevice "$persistence" + echo enabling persistence... + mountFS "$persistence" "$mountPoint" "$persistence_opt" "auto" + continue + fi + mountFS "$device" "$mountPoint" "$options" "$fsType" done From c86837edae32914b28bb28dbfc74a9d3bfba4546 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 6 Jul 2020 18:59:13 +0200 Subject: [PATCH 002/214] dwm-status: 1.7.0 -> 1.7.1 --- pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 176c2a0ddff..c7c72b4d402 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "1a3dpawxgi8d2a6w5jzvzm5q13rvqd656ris8mz77gj6f8qp7ddl"; + sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "12b6fdhj13axhwf854n071dpiycg73g4kvl7igk1qn7l3gqwsfqn"; + cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" From b98ad8de37f5c0d5438afd4f894ebf6d1df625ab Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Tue, 7 Jul 2020 15:01:49 +0200 Subject: [PATCH 003/214] busybox: Add a default udhcpc dispatcher script The udhcpc binary which currently ships as part of the busybox derivation will by default search for a dispatcher script at the location /usr/share/udhcpc/default.script. This commit includes a working default script with udhcpc and updates the location where udhcpc searches for this script. The script was taken the script from the udhcpc package in debian buster. The only changes from that script is to make it use paths from the nix store and remove the run-time check for /sbin/resolvconf. --- pkgs/os-specific/linux/busybox/default.nix | 9 +++ pkgs/os-specific/linux/busybox/default.script | 66 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100755 pkgs/os-specific/linux/busybox/default.script diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 430066831b8..a63ea958b61 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { # Bump from 4KB, much faster I/O CONFIG_FEATURE_COPYBUF_KB 64 + # Set the path for the udhcpc script + CONFIG_UDHCPC_DEFAULT_SCRIPT "$out/share/default.script" + ${extraConfig} CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}" ${libcConfig} @@ -94,6 +97,12 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") ''; + postInstall = '' + mkdir $out/share + substituteAll ${./default.script} $out/share/default.script + chmod +x $out/share/default.script + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/pkgs/os-specific/linux/busybox/default.script b/pkgs/os-specific/linux/busybox/default.script new file mode 100755 index 00000000000..298616e6527 --- /dev/null +++ b/pkgs/os-specific/linux/busybox/default.script @@ -0,0 +1,66 @@ +#!@bash@/bin/sh +# Busybox udhcpc dispatcher script. +# Copyright (C) 2009 by Axel Beckert. +# Copyright (C) 2014 by Michael Tokarev. +# +# Based on the busybox example scripts and the old udhcp source +# package default.* scripts. + +RESOLV_CONF="/etc/resolv.conf" + +log() { + @out@/bin/logger -t "udhcpc[$PPID]" -p daemon.$1 "$interface: $2" +} + +case $1 in + bound|renew) + + # Configure new IP address. + # Do it unconditionally even if the address hasn't changed, + # to also set subnet, broadcast, mtu, ... + @out@/bin/ifconfig $interface ${mtu:+mtu $mtu} \ + $ip netmask $subnet ${broadcast:+broadcast $broadcast} + + # get current ("old") routes (after setting new IP) + crouter=$(@out@/bin/ip -4 route show dev $interface | + @out@/bin/awk '$1 == "default" { print $3; }') + router="${router%% *}" # linux kernel supports only one (default) route + if [ ".$router" != ".$crouter" ]; then + # reset just default routes + @out@/bin/ip -4 route flush exact 0.0.0.0/0 dev $interface + fi + if [ -n "$router" ]; then + # special case for /32 subnets: use onlink keyword + [ ".$subnet" = .255.255.255.255 ] \ + && onlink=onlink || onlink= + @out@/bin/ip -4 route add default via $router dev $interface $onlink + fi + + # Update resolver configuration file + [ -n "$domain" ] && R="domain $domain" || R="" + for i in $dns; do + R="$R +nameserver $i" + done + + echo "$R" > "$RESOLV_CONF" + + log info "$1: IP=$ip/$subnet router=$router domain=\"$domain\" dns=\"$dns\" lease=$lease" + ;; + + deconfig) + @out@/bin/ip link set $interface up + @out@/bin/ip -4 addr flush dev $interface + @out@/bin/ip -4 route flush dev $interface + log notice "deconfigured" + ;; + + leasefail | nak) + log err "configuration failed: $1: $message" + ;; + + *) + echo "$0: Unknown udhcpc command: $1" >&2 + exit 1 + ;; +esac From 0c07d013795ea050de127a759d176d1286a80acf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 13:46:06 +0000 Subject: [PATCH 004/214] termius: 5.10.1 -> 6.1.1 --- pkgs/applications/networking/termius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index a890aefe8cd..2019e1c2b81 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "5.10.1"; + version = "6.1.1"; src = fetchurl { url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; - sha256 = "04zh0zzyp906lf6mz3xzxybn2a55rv3vvrj0m12gnrb8kjb3pk5s"; + sha256 = "1z3ry9jjiyqn41h38hyrx27c2cz8j39qa6i6f0f79p6pqfv93p70"; }; desktopItem = makeDesktopItem { From 00e56c1d535cb9dd4857b538b4844b537052ecf9 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 17 Jul 2020 13:46:55 -0400 Subject: [PATCH 005/214] mattermost: 5.15.0 -> 5.25.0 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 6327921aaac..520d28715d5 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.15.0"; + version = "5.25.0"; mattermost-server = buildGoPackage rec { pname = "mattermost-server"; @@ -11,7 +11,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "1bh53h0bmpc1qmnbpsmwkfrvj66z18m7b1xg7pqikid57ssqxjx9"; + sha256 = "002mbpgsk988pfjla84ngixq4jmgjgr3gj3h874y1njgz8xq0d92"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -29,7 +29,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "13xmc2y4pp0b0svzaf4v7ynx6rxcvznx3vqmlrpiil414s69xv45"; + sha256 = "08sp4idms7qyafk59plfzk380r72bphqa3ka648v25wh5h3293pn"; }; installPhase = '' From 8c56afb0422d9dc5eb05588be3d62290c7be489f Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 18 Jul 2020 12:00:00 +0000 Subject: [PATCH 006/214] linux: enable io cost and io latency block group controller They are enabled by default on Arch. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3c1b33bada1..e80e29aad3d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -91,6 +91,8 @@ let scheduler = { IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_CGROUP = yes; # required by CFQ" + BLK_CGROUP_IOLATENCY = whenAtLeast "4.19" yes; + BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes; BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes; From 10aa776340cccc35071e09dc883dbd944aaadeba Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Jul 2020 10:50:41 -0500 Subject: [PATCH 007/214] ios-deploy: move out of nodePackages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This doesn’t need nodePackages to work, so we can move it to pkgs/os-specific/darwin. Note that it still requires xcodebuild to work. --- pkgs/development/node-packages/default.nix | 11 ------ .../node-packages/node-packages.json | 1 - .../os-specific/darwin/ios-deploy/default.nix | 35 +++++++++++++++++++ pkgs/top-level/darwin-packages.nix | 2 ++ 4 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 pkgs/os-specific/darwin/ios-deploy/default.nix diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 2ceef0f477f..d35691f7470 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -43,17 +43,6 @@ let name = "bitwarden-cli-${drv.version}"; }); - ios-deploy = super.ios-deploy.override (drv: { - nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; - preRebuild = '' - LD=$CC - tmp=$(mktemp -d) - ln -s /usr/bin/xcodebuild $tmp - export PATH="$PATH:$tmp" - ''; - meta.platforms = [ pkgs.lib.platforms.darwin ]; - }); - fast-cli = super."fast-cli-1.x".override { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 29dc8755edf..32477288c1e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -90,7 +90,6 @@ , "indium" , "insect" , "ionic" -, "ios-deploy" , { "iosevka-build-deps": "../../data/fonts/iosevka" } , "jake" , "javascript-typescript-langserver" diff --git a/pkgs/os-specific/darwin/ios-deploy/default.nix b/pkgs/os-specific/darwin/ios-deploy/default.nix new file mode 100644 index 00000000000..6567093700d --- /dev/null +++ b/pkgs/os-specific/darwin/ios-deploy/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, rsync, fetchFromGitHub }: + +# Note this is impure, using system XCode to build ios-deploy. We +# should have a special flag for users to enable this. + +let version = "1.11.0"; +in stdenvNoCC.mkDerivation { + pname = "ios-deploy"; + inherit version; + src = fetchFromGitHub { + owner = "ios-control"; + repo = "ios-deploy"; + rev = version; + sha256 = "0hqwikdrcnslx4kkw9b0n7n443gzn2gbrw15pp2fnkcw5s0698sc"; + }; + nativeBuildInputs = [ rsync ]; + buildPhase = '' + LD=$CC + tmp=$(mktemp -d) + ln -s /usr/bin/xcodebuild $tmp + export PATH="$PATH:$tmp" + xcodebuild -configuration Release SYMROOT=build OBJROOT=$tmp + ''; + checkPhase = '' + xcodebuild test -scheme ios-deploy-tests -configuration Release SYMROOT=build + ''; + installPhase = '' + install -D build/Release/ios-deploy $out/bin/ios-deploy + ''; + meta = { + platforms = lib.platforms.darwin; + description = "Install and debug iOS apps from the command line. Designed to work on un-jailbroken devices"; + license = lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9423aa30725..02184a5685e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -86,4 +86,6 @@ in libtapi = callPackage ../os-specific/darwin/libtapi {}; + ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; + }) From 0e29fcdfefe49037e62657cad4ed24d69afc84ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 24 Jul 2020 12:45:37 +0200 Subject: [PATCH 008/214] liblinear: 2.30 -> 2.40 Also improve the derivation a bit: - Use fetchFromGitHub in place of fetchurl. - Replace buildPhase by buildFlags. - Create multiple outputs. - Replace mkdir/cp by install. --- .../libraries/liblinear/default.nix | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index af09b1241de..09f3aacca63 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,35 +1,37 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, fixDarwinDylibNames }: -stdenv.mkDerivation rec { +let + soVersion = "4"; +in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.30"; + version = "2.40"; - src = fetchurl { - url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748"; + src = fetchFromGitHub { + owner = "cjlin1"; + repo = "liblinear"; + rev = "v${builtins.replaceStrings ["."] [""] version}"; + sha256 = "041fby9vc7nvj0gls5zd9mhw7yqazm530bmln38mfz7wd06z1d6b"; }; - buildPhase = '' - make - make lib - ''; + outputs = [ "bin" "dev" "out" ]; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + + buildFlags = [ "lib" "predict" "train" ]; installPhase = '' - mkdir -p $out/lib $out/bin $out/include ${if stdenv.isDarwin then '' - cp liblinear.so.3 $out/lib/liblinear.3.dylib - ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib + install -D liblinear.so.${soVersion} $out/lib/liblinear.${soVersion}.dylib + ln -s $out/lib/liblinear.${soVersion}.dylib $out/lib/liblinear.dylib '' else '' - cp liblinear.so.3 $out/lib/liblinear.so.3 - ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so + install -Dt $out/lib liblinear.so.${soVersion} + ln -s $out/lib/liblinear.so.${soVersion} $out/lib/liblinear.so ''} - cp train $out/bin/liblinear-train - cp predict $out/bin/liblinear-predict - cp linear.h $out/include + install -D train $bin/bin/liblinear-train + install -D predict $bin/bin/liblinear-predict + install -Dm444 -t $dev/include linear.h ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; - meta = with stdenv.lib; { description = "A library for large linear classification"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; From b955ca84bbf7d1cfae3e7f8b04d026ca085d28d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Jul 2020 10:05:51 -0300 Subject: [PATCH 009/214] theme-obsidian2: 2.12 -> 2.13 --- pkgs/data/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 3fb3af9436e..79c27a8c6e9 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "1srl6wm6fjdc5pi9fjl5nghn4q40hn5jcxxl8qjvz8lkczylynnb"; + sha256 = "1chbz1cbkbfzk8835x1dywk38d7wjh90myajgk5f7v2zgnvbya23"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From d34955d47c36a7d49c4ddd2272734665392bdafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 27 Jul 2020 10:25:11 -0300 Subject: [PATCH 010/214] matcha-gtk-theme: 2020-06-18 -> 2020-07-27 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 5edc2990c02..69b1908b812 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-06-18"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1hgwlzyfxl8yw93r0vsnvi51a4k5bn5qw1axhldy5l928qhmd5x7"; + sha256 = "09kzxd92zqissk0bk3aw06hsa05riq88xvwhlxfw2agig13cfrhw"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 8a2175ba2925bd61ea4a933ff2d190a45ba54c72 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Fri, 24 Jul 2020 21:56:25 +0300 Subject: [PATCH 011/214] python3Packages.pyphotonfile: init at 0.2.1 --- .../python-modules/pyphotonfile/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pyphotonfile/default.nix diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix new file mode 100644 index 00000000000..dd8d643f6bb --- /dev/null +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, numpy +}: +let + version = "0.2.1"; +in +buildPythonPackage { + pname = "pyphotonfile"; + inherit version; + propagatedBuildInputs = [ pillow numpy ]; + + src = fetchFromGitHub { + owner = "fookatchu"; + repo = "pyphotonfile"; + rev = "v${version}"; + sha256 = "1hh1fcn7q3kyk2413pjs18xnxvzrchrisbpj2cd59jrdp0qzgv2s"; + }; + + meta = with lib; { + maintainers = [ maintainers.cab404 ]; + license = licenses.gpl3Plus; + description = "Library for reading and writing files for the Anycubic Photon 3D-Printer"; + homepage = "https://github.com/fookatchu/pyphotonfile"; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d644092758a..a6441a7524a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1106,6 +1106,8 @@ in { pyperf = callPackage ../development/python-modules/pyperf { }; + pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + pefile = callPackage ../development/python-modules/pefile { }; perfplot = callPackage ../development/python-modules/perfplot { }; From 6c169418afc31755667aae70562d4f33ca57cad6 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Sat, 25 Jul 2020 03:00:26 +0300 Subject: [PATCH 012/214] sl1-to-photon: init at 0.1.3 --- .../misc/sl1-to-photon/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/sl1-to-photon/default.nix diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix new file mode 100644 index 00000000000..a8a0bfb1e10 --- /dev/null +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pillow +, pyside2 +, numpy +, pyphotonfile +, shiboken2 +, which +}: +let + version = "0.1.3"; +in + buildPythonApplication rec { + pname = "sl1-to-photon"; + inherit version; + + src = fetchFromGitHub { + owner = "fookatchu"; + repo = "SL1toPhoton"; + rev = "v${version}"; + sha256 = "1hmb74rcky3nax4lxn7pw6lcd5a66fdbwrm11c84zb31xb51bakw"; + }; + + propagatedBuildInputs = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; + + format = "other"; + + installPhase = '' + install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} + sed -i '1i#!/usr/bin/env python' $out/bin/${pname} + ''; + + meta = with lib; { + maintainers = [ maintainers.cab404 ]; + license = licenses.gpl3Plus; + description = "Tool for converting Slic3r PE's SL1 files to Photon files for the Anycubic Photon 3D-Printer"; + homepage = "https://github.com/fookatchu/SL1toPhoton"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 868639586be..b204d1794f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3060,6 +3060,8 @@ in doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; + slade = callPackage ../applications/misc/slade { wxGTK = wxGTK30; }; From 196fff603350f234b776e0a193bc13ae32e73f53 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 23:47:51 +0900 Subject: [PATCH 013/214] thunderbird-bin: copy thunderbird-bin -> thunderbird-bin-68 --- .../mailreaders/thunderbird-bin/68.nix | 183 ++++++ .../thunderbird-bin/68_sources.nix | 615 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 800 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix new file mode 100644 index 00000000000..e643954fea0 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -0,0 +1,183 @@ +# This pakcage is keeped until Thunderbird 78 supports OpenPGP. +# https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/ +{ stdenv, fetchurl, config, makeWrapper +, alsaLib +, at-spi2-atk +, atk +, cairo +, cups +, curl +, dbus-glib +, dbus +, fontconfig +, freetype +, gdk-pixbuf +, glib +, glibc +, gtk2 +, gtk3 +, kerberos +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXinerama +, libXrender +, libXt +, libxcb +, libcanberra +, gnome3 +, libGLU, libGL +, nspr +, nss +, pango +, writeScript +, xidel +, coreutils +, gnused +, gnugrep +, gnupg +, runtimeShell +}: + +# imports `version` and `sources` +with (import ./68_sources.nix); + +let + arch = if stdenv.hostPlatform.system == "i686-linux" + then "linux-i686" + else "linux-x86_64"; + + isPrefixOf = prefix: string: + builtins.substring 0 (builtins.stringLength prefix) string == prefix; + + sourceMatches = locale: source: + (isPrefixOf source.locale locale) && source.arch == arch; + + systemLocale = config.i18n.defaultLocale or "en-US"; + + defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + + source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + + name = "thunderbird-bin-${version}"; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; + inherit (source) sha512; + }; + + phases = "unpackPhase installPhase"; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.cc.cc + alsaLib + at-spi2-atk + atk + cairo + cups + curl + dbus-glib + dbus + fontconfig + freetype + gdk-pixbuf + glib + glibc + gtk2 + gtk3 + kerberos + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libxcb + libcanberra + libGLU libGL + nspr + nss + pango + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + stdenv.cc.cc + ]; + + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = + '' + mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" + cp -r * "$prefix/usr/lib/thunderbird-bin-${version}" + + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" + + for executable in \ + thunderbird crashreporter thunderbird-bin plugin-container updater + do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/thunderbird-bin-${version}/$executable" + done + + find . -executable -type f -exec \ + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/thunderbird-bin-${version}/{}" \; + + # Create a desktop item. + mkdir -p $out/share/applications + cat > $out/share/applications/thunderbird.desktop < Date: Wed, 15 Jul 2020 15:12:22 +0900 Subject: [PATCH 014/214] thunderbird-bin: 68.9.0 -> 78.0 --- .../mailreaders/thunderbird-bin/default.nix | 2 +- .../thunderbird-bin/release_sources.nix | 540 ++++++++++-------- 2 files changed, 296 insertions(+), 246 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ba13d666ad9..8cdd27653e2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; - inherit (source) sha512; + inherit (source) sha256; }; phases = "unpackPhase installPhase"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3a8f6f4b809..4da6a221b3e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,665 @@ { - version = "68.10.0"; + version = "78.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ar/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/af/thunderbird-78.0.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha256 = "6ff0f696c6caef049d0489085e7b9c3f7240e242c23aef9a36905c67bcbdef33"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ar/thunderbird-78.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2f49abd71f7542042ef2823cd420e225bb1015684dc258fd7e8eb1104ac9865957b0e6c975043e3611d4d884c085ad670ce21af8c8cab1da80f08aa302078059"; + sha256 = "54b09003901703c2820b20534d403cfbe0b59d7dfb5962cd370049795552e88e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ast/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ast/thunderbird-78.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "91043afae8c2f31f6d2aa5b7f6c7f874150c7f8ef0ef7401132b12822bbdde8c7d7f24022f3f5d0cec262100a2b8791f440a55f0ed00c30acb9429290aa290f5"; + sha256 = "98c159c6ece97f113614107a1ba351901cc4f816d165f6fb2b3ceee7c5fbed6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/be/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/be/thunderbird-78.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6167bd7fe2d980af40a0d5594e67dfc262bb7ab5fb76ea07c919136d967505e84b4d27448d883a31323db7aafd33b4222cff63d27d10ec914354ba4264736459"; + sha256 = "abc376f1525e53aa734d00a8a52d30ba2c95fe0f2d053c54e019eecd35191f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/bg/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/bg/thunderbird-78.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "885c5ee186933eac265ed530f9b8b3cabc934e1ff4efc50b10381f8e53ddc39fe385e21e22041d93ef987e031ec41c2b98e898bcceacec004542bcaa35d0ccca"; + sha256 = "a53deb5c4d83719e380b69a41f3a80e634c8d251a1724e1d49e5ad8ac5da1aca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/br/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/br/thunderbird-78.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e5c31ab8b32f9f0bd72a03207d4c9a2ca75d0c5f28e497456850bf92f75020784258725942079e52f6b38c0740e7d2ec80ef24bd88aca9fe35e9386f65cf7c1a"; + sha256 = "8424ab87bfb1c1622d244961896bf4109fac2a38bccfbc6facfc7ce723a6ef06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ca/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ca/thunderbird-78.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2d727f09dd202291cbb908c2e7805ecc7ec29302bb2481b63a5df1f43c29c39d1ae26bcf3b5dea550619391a96982d3d2bb831548a9a2331e986345c64b4b6b4"; + sha256 = "8283ed7294338be053900ea85e4d9e26ed5ef5a53d419298ddb4d4b0cfd3a8fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cak/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cak/thunderbird-78.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "1e74db72b4bc0ca3db90b9ae678dea551293dd54eb5cc5e5c124c51e61ef0d4cb074769bf807ba2d680db10f6086bb3bbcf5d082e815bff10fb8c6ae14c5a72a"; + sha256 = "10cca56df7a22ea31fcc3f2fdcc4cea8344727183ca4d7cc1f6d78cd881879d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cs/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cs/thunderbird-78.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9c89e7328879f82cec0e2c5f7efb2711242cb3f36a4ccf6a014c6ed589f0e02748c997ea98909d546ca33478022bc9143987710945eed1e191517d1348f8a064"; + sha256 = "fa476dde45d9f3796e71ed26126ef99569f92344d9c5754dd154df2b79513312"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cy/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cy/thunderbird-78.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "46e234560ac4a9e7c5b54816bde0f22f2677b6ea117ce5c528260222e940b5e47b12d8b08b24d2ee9bcfc4dd72168faa036207c88f5bc573051fd7eea2281fd0"; + sha256 = "319919e66b178aaa86f74717aaf7a7dc54c53c4d400fc0f54d3ff0a4bcb5ea3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/da/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/da/thunderbird-78.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8ef4fb0210a21df0be22e1866859ac316890cc90e6b157e0cad2725d59360b06db068aa000627ffa750c05cdc8314cb564c32476dcea3975bb63f66b20873059"; + sha256 = "9a3eb38c50fb9c1a1fe58899c304884c2a3e295a278feb40296a48f845f4a8e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/de/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/de/thunderbird-78.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b3c7673728c8af318c0c8e0c3af8e1b7ba457bfd2c5a67bf3df4df6c3c990970d45e1a0884c03aa0a3d973efb12983afea40de55c8831d2b254acfb742c71478"; + sha256 = "260dd2a5227225168327dca79f44ddba7bef4a1a0411a731a192163b36a217a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/dsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/dsb/thunderbird-78.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "adeba633f288fff864e7247e36b4d7f49046a3901de0e4f93f12ada6fef275578b494441d01e820400045d5f7d64048684554934be678d1b7259910a162a4ed8"; + sha256 = "559bdb00b7741897c245d367c5147503e580d446b2a6b90e83af2ac9b64ecdd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/el/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/el/thunderbird-78.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6ed60a3cb194de3e2bcffbdf1d0c89460b2c2416878f348c913aaaff911f43e9a624a8de87d46df366c8bd608c47f6a6de8b90fec9c0c82e38afe860ca760f65"; + sha256 = "2f8fdf4aa2347cafa43c1b7e7c7cb6a358878e8470b45d04634566efc089e1a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-GB/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-CA/thunderbird-78.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha256 = "e3921e80a168544f41c39d0281ea32a4660fee8146a7a0b85292f360186ad876"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-GB/thunderbird-78.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a09f578de9b8f23c9b24123092abecedc70e5b48c9c15089505ca049258621f14d8a4f02c8154f7d2c729ed002814af17e08bf211708fc59e5345c92cb259fa2"; + sha256 = "a1c2c9f9e7a14ad0abf83d7b268c47e0ef13d4bd3966adedd0ad46bcd4c7f8c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-US/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-US/thunderbird-78.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3f7d4c844185b0be0ee3354130112ecc034f06cc2335681998e210b79537df7365f251b005387f319b0a2d2dd6a6337fd6287a007fd54ac03c39315c42893dfe"; + sha256 = "57384c634f511c249c3618adcbbd9d2c0fa2a711c2af145d3a390d0950b94209"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-AR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-AR/thunderbird-78.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a028429230c625b0dcb9e200b2e21c6d4db8e96a93313881701b5965dc25db31a0992d4d6da6072a6ed73eb5891d15ac71f19f343172796db82d6e98355baa75"; + sha256 = "e727f4a725f5e389d99d929fa6792863c74e57e23452e3be1a88a3852c83f7ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-ES/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-ES/thunderbird-78.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "58afe4eb60993bae1271fa03a45ce13611a1d83e4defc1f237ed47b243785881c8309f5fa8a5257fa5b343e2dec7595c8ba6143faa63f49749453ad229ee8102"; + sha256 = "2fac6c47b544fa7b663126f137e4850f5bbe1da115a845b99353454ae0c175a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/et/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/et/thunderbird-78.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "402c33c3fd7194a3f5c0d6afb81f639fd4a0cfebdaa61043858938fb5b2690844ec2fabfe9f73d41f45c26d56adcb121234fb1baa76b2455c87863dd79cf065d"; + sha256 = "e3bf4000c8e5d04ddd9bf0a86dfd8aff02304b5d86c55f649fa43deb3ab9809b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/eu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/eu/thunderbird-78.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ace87496370c17b663971365da8c1f88000b76247aba2a6fd5d29a31b5d4b02bf9b56e101c477d48553ca56416e73209aff7f729ea2b8c044e33b9307009321f"; + sha256 = "3c6249fc0d2707b9472ef5b3876fefc3cbafca617ca27037ad8e98706d509eb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fa/thunderbird-78.0.tar.bz2"; + locale = "fa"; + arch = "linux-x86_64"; + sha256 = "7e2edcf08b456f53d8274d17e1bcbd9efb997f74b164224d3e153d64ac7fe60e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fi/thunderbird-78.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "775c937de9d9ed49ec70850a1d8ccbe22c964e12a932c52d3dc360425643f2be5487857caa811556e341d94bc62ed9b8dba5e94039c2cff6de50bdf16e364c89"; + sha256 = "1f6cc927ec2e21a67e61c7d09d93f846d5c1bb1ef54644b618ed806a4541170e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fr/thunderbird-78.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1ac4d3e23f71bedf77a8d2dd4fe8d02fbd1083977a8892d2c6db394a9d345bcff73a916f34a078ddd0850e8ac1bb0486aec06d6e36875eafcac0dab08bdedde1"; + sha256 = "f471719cecaca31e5a940bb82908648703a37b74f647d7c1c434f8db339ef974"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fy-NL/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fy-NL/thunderbird-78.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b62676e5302cc265a6ee65de7a31585bade7bfd51395bd56257f733fc9a6f4c391e5318aad3b48441464e5d8bcbe3606cca1edcd6fca6517b205814b9e39b635"; + sha256 = "405daca824b721680f77e3ad8936246825d132c11da4ec2277a022f899ee2ce7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ga-IE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ga-IE/thunderbird-78.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "81ba90087282fdfcd15a534e9065fdd94a859dedd6a85dc9da94de4af698eef6b31a19d3a007eaa27e08944682c9f6108a0d0991f1e394451da881018e5cc70c"; + sha256 = "899127ff4f98f922e405844df1162e66d484443e5a84bb6c575cc28658b52649"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gd/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gd/thunderbird-78.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1db39cc3ea8990ec8d9ff214d554bf95a6f2699e3f1bf625180b7f84ebc3284e1eec8e2cfdcf87b3a31b466ef2f84dd0a56d771078f4cb06962a28531ee085d8"; + sha256 = "183f757b4d70b999064f8a8e495bbe9a6a9783d939811bd93181c9cbf61dc880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gl/thunderbird-78.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "dbaa3cd2341d8ad4834b9db4982b731fbcb1125398cc4a7ce6a9cbc44db7218a165392781e144b68618781ed8d26216f11e1bf172ce4ba9b18515cce0feb9bf4"; + sha256 = "58130045fbcdbcd10541ea6c2d13b95455af8e5fb9893a80d999b79d814eaf17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/he/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/he/thunderbird-78.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "547795f844b60b347a10abc8e609f7d311b63ae4cf76b2b0cb0b0605f597ec0e1c7ec3347042161a4b15201f816f99c391851004de9a957754aca6f50a055d7d"; + sha256 = "719ce3b7d4e3841a7092e658f43a8960d68d82ebad6b6dc43d12708a07054a8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hr/thunderbird-78.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6c72a46406396578c329b1ba1c47a46c124f22fb5c47eb1f16af7672e4269bb84f62ac4c1d9b61a5e8e46eaa4c91e5169b59e9908ad61606b243ed21ce31d859"; + sha256 = "49f9f0c18ad45a73361520a055f02b6b8da22419c37c8423dab64ab13f253834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hsb/thunderbird-78.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e06eeaceffa7b39810faf42640f22b8edef8ad501530f1602a7b13265f5a9b34a1d9304a19a514e3beff2b3c7e8ba92c72aaae6b34cede15e6fa59125344c026"; + sha256 = "7abc5362bc14853c7a9d93c84f1d04dd5d4f0ebdd7c71c782b83e8f56d716516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hu/thunderbird-78.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9ab3e1b47a3120b74adb1f0f0ec657443578203f4c7f7e00804ef61bfeb2c7cd36721256943e8c86e0a62f90c1576e16a9051b33dc9a0006cb7fcf55bc90fc0c"; + sha256 = "5bb475dc366e9cae5e9e1422bb4f7e1eb1b605dd5e5193ccc253dffc11c4a0aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hy-AM/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hy-AM/thunderbird-78.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "614da904a59666d5e67852296eb22ea0ee0d137764ba9fc4f60edee2f547b91659147d14849ca83927671e94b32847f748f97df4bcd93569d46f3cfb0f8f372d"; + sha256 = "c42d6cc12203ac812b5794234ccbd38ea83114844234868cb02004a82e8307ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/id/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/id/thunderbird-78.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "13e01f8fe23f10d24b4399da8540c2afdeb762b1068f10984945c0920882b67bdef48f0f26180786a8d944ca1ea601e3c51bbf6f0cb64697fca0c0b0acb08b84"; + sha256 = "13e4bf8bb6356966d44e4049e2e90f96b097e6a2ec2c54fd39cbf74e45dc4d3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/is/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/is/thunderbird-78.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "176492bbf4ac3b2bb4367848f1283c7dbb805b5bfe6c71cab6c8893578f1d0ca1b9edcbc1e736748d04f2d0ca78f4d6edb21671b78379e26d41d9c43e8727075"; + sha256 = "bdf740e2545ad41de9920a213afd6a476f261a15746ffb201461b3d2e0dcf06f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/it/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/it/thunderbird-78.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "41d10acbb84fde6556530253ecb5926ba4b5d81a38349a00281a7273669cf37245640f789dae7363c4e1a0224127885fae3dac701926dab6e4512df723d39548"; + sha256 = "cd66931d6cff87b16d637340d82d459cac1878fbefdbdb201cf7ed561dc0f6dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ja/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ja/thunderbird-78.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8124ccd221818d37d6d22f204baaf34bd87e7907c50ab380a3a1bf252432b41caa71dc3ba2b575903bfd255f16b702cc89d91903f494437547a7b8fa16469cbf"; + sha256 = "10da3af84f726a9aad3dc5c8ca24136831c136cc2e52f6573b27695f33f48a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ka/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ka/thunderbird-78.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "464a9e0aebda0fa6412665e4cf2d6f590d44636bc395f8a03f96ffa7e8f5423e51499bd801f9ffb65c0c931960b761d00df3ac8f391b2157ab411ad49c7054b2"; + sha256 = "575f382c4f155f93a6cbd5a81fdb988196e2a95d0b8896af454a3cc5e3048d3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kab/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kab/thunderbird-78.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d99305c424e0475ed2c1890e2c5cc96d1e4925d329948c33ac0183e3affadd960266e76e380c4fbc017e24538428439888d96f49d73468f9f6162dcb51a358f1"; + sha256 = "bffa3681eb858a55c18b5f396bd08464eeeeda1328ec65a7c67fe4d7c7805757"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kk/thunderbird-78.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9398172a5d2f902256b2b36df5f936a39e5f2d253ee4ee566109f67a49f2e2bd4239b92802475b459d79acb5af7e4839f6f5f0a5db1c7da10fa35873c470003d"; + sha256 = "866191e1d87c0b00f4bb5f2eaa0e1f66719a7ca68a175d1b30ed9a5735005705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ko/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ko/thunderbird-78.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "80e7f9929a197ea4b431376f168fcfaf42718b1744bbf0bddf8672346ff08e65c35af5816a21effaac6794d9e55009885037007e87a05571e1d7eaaf7c86f30c"; + sha256 = "f66f91f0e0b04344db0e5cbe8d48721448c775ba8f4ac69ceb1d848b7e07cda0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/lt/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/lt/thunderbird-78.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "74ca7346f87b078cb9f598e79278ee39498b09370be5517a3893dc4bc2d5efe81f9b9076b27891be0c8d170802a02ac67dabeffa022fe222e95b73455b40ff34"; + sha256 = "2294425187c5e5404af6cbca9b495902fb9bc05354eb6e3866b1e8366ea64e2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ms/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ms/thunderbird-78.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "90c71d0b3f598c21026441dd5b34efca7276f34153ffacd327f09d2c78296c9dbc2ae9eb8e1f7635b8e3cafed15f07cc3c19254405de2e6c9e1fd4300b844876"; + sha256 = "f21e85113e0f63d57f91c61e2830f1a9e721138cc00269d2fcc521d1c74666ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nb-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nb-NO/thunderbird-78.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "08da0c8a887c820d246559bb7c1394282a68f2971ba2f2943084ebf3cafdd2580477ef5a9ca06c1e5aac353287276aa88aab8346beb95addfa95d5014cd4974a"; + sha256 = "5b7982cf136c4d6120ffc7e40c65ddbb3495392181e38141ed80e3a67aeb1038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nl/thunderbird-78.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "f846e221c2bf3cebd93961e6af10c24215b698cb8318c6446224f5de5b533e887e76818b6b902adc839a3f7c5ec24e9b13aae63b5d601d6716643f64aa29b7da"; + sha256 = "d9619e1ca19ef4c75eae31de3dcb6cc23146c4d1b98046473a3ebcfb3a610c52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nn-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nn-NO/thunderbird-78.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c33a600e2d64c94cdda74f2a94fc54f05133cc543c795dee70909b00b92eb5a48b183600f328f45fc8c9bdabb59f455a4875e68e6e62ce4f6309cfc0aed24fc0"; + sha256 = "e9d2a6955fb98c0dc492a5cb16977a1fc7cad778650dd601934bbc9f543b112e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pa-IN/thunderbird-78.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha256 = "a3279bd605960f37ddc071b0f3d91726a9d911a311c13e9418013c5a1f7a5089"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pl/thunderbird-78.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "555b0fb0c4117521f020f7d9846b19dd18ccbec585cd89282384e0a311dd5bbedab84101bd55064c7ae20ecd811c70f31948da26befcb12abe0937ed2736b9b1"; + sha256 = "b22737a3a5b7c5ff3d8d22fd338490b0aff9016049bd7bf6cf6b25f15a027935"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-BR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-BR/thunderbird-78.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a51b74e5d9394ee2ebc26149e1e01766b9c4cde5815fcd915bbc5307095a851e6242fb007c8e93027ea0a77b3074679041c65a1996528435f30f7f17b06959a6"; + sha256 = "a6a18c8988db47d8163c79c465995aa0d3cd42da97bf2347b5be4d26e09e4628"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-PT/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-PT/thunderbird-78.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "4912989c47a3c021a28ed56629e308d2326a07ec99dc00b624889a10013f36445fbfe11a8cdde7ff4f69c965b0d2221c61c246933cc313df9f63ae3ec65db891"; + sha256 = "8717f41a166cf8e271086987196be9b88f585a70c30119ec15199291bea1819f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/rm/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/rm/thunderbird-78.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "70298a29589b928748d32adcf83b12c006d23cd3a171af1eb790eaa34eae4b1a8e97056fc71f9a795a9b9e07f5d8e2a9f4ffc475eaa4b06b9390976fd6359668"; + sha256 = "02b1131751a82c66341e58b757c1f4e438e5ef8fa44a58b904790c0a5ec66b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ro/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ro/thunderbird-78.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "7c36cefeec21820b90a8acc09856aaedf4cf94215cae71daa8142a1d166de79dd0114495b92d954f978d1be88c06ad5fa269fb33ae0b307ca05f3d7ae90844d5"; + sha256 = "b7d82398f43112b5b9ab1907643cd8c39012246a1e9b74b3c4e37487df7d5bb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ru/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ru/thunderbird-78.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "b7dbd077b0271818ba33d8651fc60e371f9a89771020113ce2a0785c2d228b90d219fcf944e6ee2645fd683fbc1d597529382c4b808ee4cf81f7123e1de9d583"; + sha256 = "155c7f4e678f6f3b91c07f2aa1313c08305a2c3166c199a9d8575d58c7448ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/si/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/si/thunderbird-78.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b9217a815c7f042bb33e0ea2ef9129e8ef1c825af315d0cddb6c0760bc87f1b8932b6f7cca747d50a29a55ac66a21d8113febc360e5f963566399a38e3b5a2a2"; + sha256 = "1af756f61e5c57c0d6018b3efc0072e55d7344c3a9fd343686bfb16773551503"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sk/thunderbird-78.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "494ffad5906f35f9b3141fb06f6900e0d82553c16c8f3d99b50d6718643cac21fbd6a205af146df54125c009f190285281b09bb42996505a2fc120dd85bde882"; + sha256 = "b06bc92b4ffdfe25a5003f3662ae168600a6ae8855b60353ad68de6a24067d4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sl/thunderbird-78.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d34836dbf915e4d5157a1f8760dae8d8659ceda2ceb594d737da7384139f245915f01a0b025585c117762f2d3261dffdf1c7efa5c2e1f920fe5a350d85406015"; + sha256 = "19cc8710f257c229c4700b0a9deab471b1114a21f6cde0838f6a23e29faad6b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sq/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sq/thunderbird-78.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "909aa9e820cb984459deae17b80488db09718eb428e32a35ecb1723fa3c8d7ed974f6cb17a07db8e642cdb51b885291a3fca518542372fe2c2b3360553b3527b"; + sha256 = "13c8c4893947a8178066ce7a767eea21e78b1989c94be4d573f03f98e7f43011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sr/thunderbird-78.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aa39d12ff81a371722609a4ec401021512f651c4f592159f8ef9bcfcb641b55a8f6ccea970b4d8375cb326e0cfd5fa18097ee3131e7546c53b1e29d14058622f"; + sha256 = "68939bdf7b57320dfb608d6487b877baf0d801ef3aaf0da48becd87beb41aa89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sv-SE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sv-SE/thunderbird-78.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3f373131df39c343579ddd851e8c5eef3147650a5c75a5fc3ce84c2e1a694494cd6e3ab12b3cf86018880384f02ca38a54fcca8cc04f3074699fb89c4ded78e0"; + sha256 = "36689c205cd7a6f212a5971fcc226631937232173f84cd0a2c40a87f95de001c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/tr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/th/thunderbird-78.0.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha256 = "392267ae08739866f14d2ddf0a853a47d18b2c99856bad369b567e7360d2aff9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/tr/thunderbird-78.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2c91ad17ddad9db19ff2eb47ff7a10253febd30faee710301dcb96ed0472f81153de5d7d906b3dc706d39ff058eefcdb9210ac274469fcc02a39cdbb99a126f0"; + sha256 = "15f45f9794ab34f79951a3b9ef990f25788c45eccd65dd1aab565d2908965c66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uk/thunderbird-78.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d98a132e14a5921b6a75a8fe7cf3c1aaf22e83c4c8252dcbd5aa0434b98a7d9d88711b68cc470e6007027e6e588cf9ea00dd78a2d97b48b975adef1cd059e79d"; + sha256 = "e9b1765f80620ca7ac534c91656345ecc3218ef8a606b2a8f48f3fc1c170cbc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uz/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uz/thunderbird-78.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dac94504203e7862608333f1f84134d7afe0e1f534eec9b91ec48a850e0143b625f4be311c2e6e716a16c941d3c2f5dd2101abfae205c802749ca95428b7e754"; + sha256 = "ed2258512e980e3c72b9130b2f5f839dbbff1df05aa5cb948f4519681491ca34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/vi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/vi/thunderbird-78.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "684626eb432e89e85b9d3270198ee20470e675ea7294222755b5b588db7e318c20fd8d2fc9a0c95374e8ed53e792ab0e24e826709aa619fbab059a77e6341213"; + sha256 = "fa23f6d7c4b64776df71b5015743e8dd475cfa2a329370a92d36210711e0fd41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-CN/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-CN/thunderbird-78.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8a25fd27a555b18bc41ae31f024e80adc1b06de064bf2391c1db5510869af8c145780a01a26f6cb465d2c6b53f4ceeb924657eefeb95f7ae2ac584ddfc4a56d2"; + sha256 = "741bfc0c297a8dc9b5b4348f26886a12c75a81af11b0a6090094e6e21348e6f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-TW/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-TW/thunderbird-78.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8f202b1a79ae831bf5a28356a06213586bb2c0f4410516a8121c73a8902d0ce7e54f8e6fd7d2c74b300c9692eb3ad4a9b9290cc93ce3205f73842d93a46cb77c"; + sha256 = "cd4296eacde34b302c794beeaff0eb46bdf0f12c67aba98172133529506897af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ar/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/af/thunderbird-78.0.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha256 = "300da8f92fff4e596e5d5604002fbb5732bda61d6f54c7f79a20e2fc268a7ce2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ar/thunderbird-78.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "868f092cc144611611133f50be9317161cb34ba2d0012d238789f2d1124b547c52d2aa02d4daa090322e327a4652808cc882835195f02bbea8e67818d22ca8da"; + sha256 = "e382faafeff426536f355e2a711dbfad7d86de3619a4d3a60868ecd8e9593b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ast/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ast/thunderbird-78.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bb077167ec58446aaaaaa7439e04332946d62cc6a35ff00bdda20a03eccf80b09bce70524c3b3351fe0b821dda0762cd666c66b00314751301a67d635c2d37e5"; + sha256 = "45c3c612f072277e9dd83fbe22bd4cf9018d481a35ea25334d12f6826c879915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/be/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/be/thunderbird-78.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a8ec19464c57509ccea6f83305d441aa9c61ddf0bfe2af172df24f67d7abaf2e568eeabfdfea9e0a843d42ff9c6d2610b1e1e5c060ccb50bce4045b47586f204"; + sha256 = "6e9fc38265fb9185915c9447ffb2d38e4e024446039704c8d45b91e152a38f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/bg/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/bg/thunderbird-78.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9c8ef811f0bf04066f3c55e4b02107450d88a1774417ee503027423917bdf16ab9b102eb0f7f4c777ee60039998f8391164f1719bb8abc4d79774664041fa6c1"; + sha256 = "cc041a49ac017568b815a5e03a37031a6a17c25110b77d37bdb96c4d53d869d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/br/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/br/thunderbird-78.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e94fa2e49fca5bd6e6f1139adb86604482deeb1160cc8fe348a1cfab2bb19c8ba694ca5743ed6e5da81c9789521e8b6018db4ecc68ec91c8a277916c6a553521"; + sha256 = "3cd798a70f493ac5a75895be3db025bb3793836e21550c3ddea6b27f7dcf6d7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ca/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ca/thunderbird-78.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4dc73850268e885b9791b29573f35704d730e9a9ac833265f47413eadb2e3d359b8b56405ebfa58816b8b2ba390077c14f17a769fec94870652147d2a2915243"; + sha256 = "553ea37490cf180bbb1f0ebcd23d87e82456797ab9f5604ee862227b0854ef12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cak/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cak/thunderbird-78.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "569d8b373efc412180cf01ad9333a1b2f05687f3b8cfc4286c81c9309681d390d9ccc2767248e36db7931e2b941dce6ca209a00e7ba5dbebea6d40c710dc2cdd"; + sha256 = "307e3234abbcee8a4aeeb46d1b8bb02c8642f1a2140dae9a2d6295bb32548742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cs/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cs/thunderbird-78.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e87eebe5c3486b02f46784209019b5f5dbfbeb36be8914604416c194bfebda2827861172019ca33bf754bc86ad91327ce5e29ecabcc77390d84be80c2f682e29"; + sha256 = "a08537b88425e2b813aed80b94d763d3c31ed9aeecf5b3b8e358c08233997ce5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cy/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cy/thunderbird-78.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e97bde29c976e200f418b2ec150969459e4e17872184dfef548b08e16286f948259d2fc84d0d07965a5dedae8d5e3268c3a6ac0794cb0c3a739ffc86b2a6f748"; + sha256 = "36b75de4d73075026f256c6502caeebd35a89ca567cbc9fd6db461608b922be1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/da/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/da/thunderbird-78.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7bfbeb6e8bb427e7e3aee31e897d025e338a4c4da59eb2700b52dd08cd53efaf6dfe1d33e456572c0203fe6927bc069ff297288cc47dec2ef9835e047a5d2938"; + sha256 = "7b81b6b22888c298cba1dba3c9786249ccb0aeba8b93d998a268e33ca249c7cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/de/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/de/thunderbird-78.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "15da351e919e0b931dfe48f77b9eeeaec40e94c973de507560c62a86e2b106f7d4afa7602186829fad2984f9964ad23792ca88bd5b94976972bc103f0560ee4d"; + sha256 = "e5fa962eb83d4cc7dc2de5a2080a0d06fff4bb3b6e30c53dc979d7bfad8542f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/dsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/dsb/thunderbird-78.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1b8c1b12b8d7979a0ce45db282bc2a3b933bda3711c07097533a8a04b38edae3f0bd00298cbd485954ab09fa57b10aca5238e8a7bf4e23ea80ebed2dba1d73e2"; + sha256 = "3745a7966cb96c79b49e0f8431d8b1e90cd5f01d7ce57eeb4ab3e5f80ddea26b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/el/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/el/thunderbird-78.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "67c5dad2a95ff1b8b3ab2ebcb0c1c4af87c5325e22d43c24f4f1c0df9ac328b43b0b25247408c8c95cb5f98b9396a1714b0cb39cd2e43ecd04b28f8bd1dc43ab"; + sha256 = "037a51d7e44360a9748420ff584790abca6285d4bab8ee84414cfa602ec4c6aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-GB/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-CA/thunderbird-78.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha256 = "a12288cf187b5e3075a23e420bc58ae90370c224b0c73b8706ef52c34705d6d3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-GB/thunderbird-78.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c9feebac54a357470523029377699fc9c0bca08e4705374dd1b8756cc8461237426cded2d9ee994b7ee529c60d50a555e4e1c2d9ec71ceccb7fccc651e35058c"; + sha256 = "dc3637519c9b40260217e5302dcf4174a66298f98b478d1a6caebe154b9b549f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-US/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-US/thunderbird-78.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9280a58b42f93b38f4c9ab26b8b6c2956ccb135ae959c61799cd3ce3b3419c9642f86418ac53e9c4f69e0430508c0619db4cf856a28d233a8d319e262755f4a4"; + sha256 = "8e425ac9e0ac12d6142ef7a397dee969c87aa27fe21010a88d76a91f034328e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-AR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-AR/thunderbird-78.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9c17d648a2ed9c2b6dc7d403436dc9aad91e10e63579e26e4dafe3d5b3a15633167c87b67924026882a03f1aab05673566a0c5f0d84efb656b6b3d7d4b812e5e"; + sha256 = "4da82ae1bed1ac257b878e5f8de6be6490131f15ee9db44de4aa10202a790e5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-ES/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-ES/thunderbird-78.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d22ba4fbd7e8d22f70950b61354b99ffa6bb1c298504f8f05297cbc20f0c89a9d657c74ab367480906cbc4b699df6c603d6f6b936ccdb4213e178f3eb153a314"; + sha256 = "706ae91e5d36cc85f35833d5508ab7f3d0b8505491b5a86ca4447139b532b929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/et/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/et/thunderbird-78.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "107fa0cd997edeba0a88d365c52fe48ea0d355ca8bf8723f5bf2ad4a930711e8fcdad27b457d309a5d4dfc0f29f6988f2b04f153b83384484ed397261c07db7d"; + sha256 = "f74858d4b770245f3fa1d4f9ceebd274524dee73320fd4bdeb0e251a5d11c253"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/eu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/eu/thunderbird-78.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ba50b4fed2d682f1c46699f72d86b219a1bb398b1b2180cdfd246bf4eaffd61e34e24222bcd82ebcc68b9cfa9f98f56fe859cc6d5bd744a7223e7264d6d4f261"; + sha256 = "aa02f9fb911a61da3183df79dc4d3760a5d6a259305da72932ff962cfe390d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fa/thunderbird-78.0.tar.bz2"; + locale = "fa"; + arch = "linux-i686"; + sha256 = "6b41612ea00a38e8bd4d1a796cbf5e3bb6d413cebcb473bcf9c5bde0d074cbfd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fi/thunderbird-78.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "6f4fde19af18845d50f591940786402233bb77f518f1f8f9cda727bd458e21669f692681cc691617a0ce05f8516383ce38b7b51445e3937ff8c1868e84a92ae0"; + sha256 = "f64e3e2e266478c36c50cc19a161dd9496db6f668f2078bc182c1ddeedf3410c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fr/thunderbird-78.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7e9dc42478dae325a51f44781048a55fea3e2bedcbf663c534510404e59dfa10216dfc0df4efd40e0bf1f4fea3abdc9867b6c6b33f199e406ab07d68b68acfe5"; + sha256 = "eae396eae122ba4bc965fd8036264bf8bf88f52944558c7c1c0891a4254d04ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fy-NL/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fy-NL/thunderbird-78.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1b665dce92e8c1de000063f1a12192a2fa5aff2c65db9aa6769ca16604e7e97a602baad9761110124c65dc479fdbce7640020701fb280b3c62e5c78368fb496f"; + sha256 = "3163461706339a7bc34b8d7b83005b2ca962f6b6830b9da32c58aa7613c4efc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ga-IE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ga-IE/thunderbird-78.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "42faafcbe85ab995b549bf072942dcc2e87780099b3bcb2974ca3eff6acade40be7bd8ded5cb0db6a02bfdc255c60e252061a767543b2215719a1fc2600fdd81"; + sha256 = "e2d1d31528e7b2773e898202adc2fefc3fac38843792d6ad57e093d3de6ee4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gd/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gd/thunderbird-78.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e1455ef926d71ecfdad24ebcf4b3de59d04611bf641ba381534bd1b94c2f7b730687cf2e8412e6910d37e402b58f32588482089f4d12308a7b9cf6af82b66e97"; + sha256 = "429160e98e24545f7890372eae1f2ef732b3a7ecd6529fde4ca247fbe251475a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gl/thunderbird-78.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "344d619a5437d0efe2e522680849dd809b07c3aa9cf2831610aaf7ce28e81f16782a4a8174c01cc339914e02a23cb3ce603d04dd0dca8eb4f547e0d0e780d8f6"; + sha256 = "215c0f6f3409200db5c25cf26c2f305917cc7b9b10b734d22be2bea7d4b34443"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/he/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/he/thunderbird-78.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "c081d81f3c1a61d2922bdad144a97c8568326e97fe29909d4319ca9019d9bd466dccabc6f2069eadafaa6bf6bb5bd50e8cf0c070dd992cc095411dd909b43f06"; + sha256 = "9b13364552d3afdc4fbdd2683d70b32b3f3c91633528c8b3684c7d9060431818"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hr/thunderbird-78.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "2c142b9bed17fc1fef3e4339f0477d3f469923083a37ec3b2dc3d4690a44ee34d5a23faa37876cec2f3bcd02c1048ec343f16bd02a1771296e77cf3f63ca787e"; + sha256 = "92a043ec615e0f92ff301df498023a31e5a32fdbcb01be0e95ee91917ad88112"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hsb/thunderbird-78.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fcbcc78b1d5620c27b7cfb7ee88463dc81664f5eba679a81920ac6923b0e3f05bc70b99ba7268017b59219872921e76860a113fbba757cebf942641ba0591517"; + sha256 = "a73b9619b2da033be6913c4342fe23886a9ba6710a65496878490e3f6c016901"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hu/thunderbird-78.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d59024db516156a89cbcc0148a5bf85059ac2393f41709e224f109abca6fea693b822d7c4a3ce5e360435c8700010aaeb4b26ef9e163827bcc8b6cf1761d3781"; + sha256 = "b1e938c785946d91e5759cc5f34d75fbbbf421b4f8b5dbe1eee9158fc277198d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hy-AM/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hy-AM/thunderbird-78.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "17876cefb335375b7884080315690fef116983b7559421f86ad0ef787bdfdf5aed283d84114cc1c1d3cb3119d735f50e975f94ead6fcab6046c207d4c1a8fc8b"; + sha256 = "7ad07de9dc366057b004893f3d77900dcd4cb6532127a60b07b343752b96ef96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/id/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/id/thunderbird-78.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0c74ca260ffee635cd556c0710a13ed091a1f2eb63a1b1ac2a745ea0e86d42b52b08b00f648c406356e1e170c77242d43d9a4d2b2f0bb1fb26d4dc83b4179a8c"; + sha256 = "51b239fc75b2b0769faab37ba8c03973dc9a275eb8730193100f5d3cfd5b1621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/is/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/is/thunderbird-78.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "97fdf5fa7dd6fade8ec7efc179f6a65bda90cfb285341e3e98b9b2ab70ba91ebc8c47bf8948189d4c181566c9ed950fbd0fb6b4d4cd96b2e3329c0085e32771c"; + sha256 = "69299e2873cd042e64146faa329f72039c079645014270acf08a2a0357a7025e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/it/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/it/thunderbird-78.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3d42b5a8c55519accb3246c5a7f50def9d854ccaffa0e34b20e6e2f51cc07a787a9ab0c0b205e28b40d9ec4f55f1176f391ff9156076327f8a4416a9ff6ea8ae"; + sha256 = "dfc2f83084ea80483a258e2ef879bcdd31256c55920f2d86fa170dd0ba432091"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ja/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ja/thunderbird-78.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bf90c9c27abac84ef91a2fe3ceea142ac7041c10d41a0e5a2ee31742f9f64b2b24a331af769e8ae93c7b09bf8645dc4d274524281fbfe69a908fd22aaac7c2d8"; + sha256 = "7b1cbca9399856b3c413e7277617c808b3f670c6470e3c243c6fde9aa035d563"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ka/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ka/thunderbird-78.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8e2fb192c6776ad702ea7aaa9bc9dd31b20c1c66e2ce4dd91aa10eda5528172680740e28f8a7bab52a7c6eae92578822669d6ad068bbc85a04d97c91a4b7e08b"; + sha256 = "2ab93932f7e567b3e9ebae4fd4c1d032917c656408b5b74cfd51f0e35bf14af6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kab/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kab/thunderbird-78.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "10b9418db83b328353afb73b7630add081309cc0b55fac8aec38f6e09036968082d3d12386efb6b4347b33977998bbd906501adc45a8c8d27dfd0f8d98288bde"; + sha256 = "c6bf87d821095326487e4822e6c373b4c5ec9ebd9dfcee511c4b85031ae7caa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kk/thunderbird-78.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7dcfb10ce402c90452815523d5672a1cd60201b33b997c5b769341e904f4840ff57685eab61dc3073f789bf042453f3d144e54bec32afae2dd65367a0f1768a1"; + sha256 = "06cd2284afca05ebfb16ebabd128d66f8a45751fc7a5c1f4ef39a2753dc8e88c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ko/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ko/thunderbird-78.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "fddcd08f00cc4f3de59993c8c917e20e77918d87e2c23e989e8e8aaf78c6130f42e546acc17eb6f8c9a24550c596ad201d63f325e7ba078a6c791fc94589e0a5"; + sha256 = "bbbb6e7c1c444168ab9b7c3797ca1bffa3c885980e2f215c914780a1ae5d1871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/lt/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/lt/thunderbird-78.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ab221093a0df2876f558ff2e0df090b95872281e1cae8ac23c9753dadd6305608c6e7ec5104d491ca3a3f1c1ebd830b8094080ce99bba49b19b46e617238cc87"; + sha256 = "b64e1a057623a85841137b7aae1832d4757766ac1d37452453a0130582043474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ms/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ms/thunderbird-78.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ce6b0e1ba8a1a1bbfd4d2e265a45430c2d931530d13eff67fea4179c4a8e2a204ff35103c921073bc33c3e2a8f8f3f55fb91b3218cab9718df76da696ed09750"; + sha256 = "eaeb81daf522f0282d57c5b77f54b736c9a723c3a2ad0ddbc2501683cd3dff63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nb-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nb-NO/thunderbird-78.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "07e73fd67e0c1974c5e5b90d74e555b75820b66ae9bca0470b6d291e848e5f28fea680cf09c2167dd56b0765ae0e3682b5f2ab7f33cc5b059e60252236dc24cd"; + sha256 = "5db8562f43efcfff4f950c1e2f6837d8ceb9e73543e7c7dd75e695709defbc61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nl/thunderbird-78.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a24ed7d30e53058653c0de6b96867fa9621118fa43e109940502eea798a5c7b8688c65bf08d765f3c6dc6e8ab0dabfef98ae005e00c465f847454b384953276f"; + sha256 = "77ea8f460f82d05369ff110b85c4b995623caa7b62e38ebb5d8e0f7ecbfeabd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nn-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nn-NO/thunderbird-78.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4bddbdd0a2353f8c43e65cbce5974911809cf28c3d7ce521d662d782f8858b469575857688a5c674f6d028acd55869c062edf9f55dfa3d387fab8fb60f6f2fad"; + sha256 = "83d2439498fca42c3b4095515c9359f89500bd11029fa58ba19e6058d3b696dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pa-IN/thunderbird-78.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha256 = "805947c3014c660ec66d5382dce6a733efe196b45b445a7d2467e209ce889727"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pl/thunderbird-78.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "953d9e547eb343a0d7f96f501bb87ece71e2f860f8517fb13b76301c7b3e77d7f572a8106fdd43c2b390654457e43703b22566bd3159ace962af2eb1f8bc6ca8"; + sha256 = "a7eade7fc0b68361e0a8d6a1cde62d7253f938dc0e93fda56d0ed296304b162f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-BR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-BR/thunderbird-78.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b3807897100857c33768478c9dec57024f968a83188b51bd2708b7caf7c53edb39b15cc8dfb5f73ca937c298fa83551edf82d7f43c065bc2fc25467a02343d20"; + sha256 = "7e5a89cc9460ef65f1b5141d7bbbfd39f2d38aac599b50c8f57b39ff2218f7db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-PT/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-PT/thunderbird-78.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "e50bf636697714fc4dfd04e1a8d6d7d87239553f01064bb566e218395a2e5d9b16ef22c01509f18f9f562b75eb19a2616d8c7f8a4d212a9a445b1eece17527f7"; + sha256 = "809945bd2390457d2ffc1f232e120aa68c0e8232a69d14b6cd1207ed4fc62bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/rm/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/rm/thunderbird-78.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "1480eb4c77d88fc461000f423179e5bc693b2f25abe5c6384f4c98494f698c620fdd53e65d75ebd17ce9546c5fb00ef8f40bfffd9b31114417cd10262569a54d"; + sha256 = "82849eb2a8db39d99cc1fb514d0a4a78c1380fa5ad75434d0969860b5fa0c5f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ro/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ro/thunderbird-78.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d9cfc8f03d75f3a58fe103c34eb0fdcb3530f0ebc68c0acae7fe1b783bf11c0585e266556d16fa3db174aaafcc319cef9cfa363361cad7b1053a504101b13880"; + sha256 = "c9abc67c0612e3da4d9519d93cd87718898e6465f8275cae9edd7127f3e9c964"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ru/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ru/thunderbird-78.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d67f550615eb195b80f7338708b7ecf7455203f86aff1682f2e8e654d019fb49c6468eb1c099f7fc78797b97d41c9f42aff5498f27b6cb458f049fd8b6aa3d4e"; + sha256 = "77c7e1f174c5540bc683ae71653392e24dd70737f6a6f9298c746cdbbb1f2e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/si/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/si/thunderbird-78.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6dd9d78a9f2ef4ed28a95e83e76e9779d02c950ba906ca14d8fac0bf7300ad2d7d5ad9cfa3973cc8c861011dc8f1c58a6ea5909206443cd2f24bf5bcfe8c5673"; + sha256 = "d45b2a6492fd732652ac4d160b74f612261c33dee7f8f7c21bb1a8e0d45d72a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sk/thunderbird-78.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ba40286898a7722533f8a65e1e9bb494bc28212d2fe21c820f64b1a8bcaad6d0ca1d7a870d5289792a79a6c4851931236b13c1ba07b812b591b3d4c6004ff78d"; + sha256 = "cb4e2492618d70b67b2deb803ed5d02a2851dbdad26098c305c804017d27290e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sl/thunderbird-78.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bc8e926583e92f4cfe3081a1bb618d7c5fbe9e1f93af378040a72820b820a38915ff1c74deb6069bbaf2957adc536b78faf1df853e8ff6390a9396d909ee040e"; + sha256 = "b731685c0de6ba0350259f84a2b4c597849459bbe5cd632796a09370d2697ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sq/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sq/thunderbird-78.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "084bce04b0d83ab24682d04f4c788d61a2a6bfe0777f44f4c9a07d8fd7fef4251464e9a0e523f4e111bd5323ceb398fa09ae3391295047beac3157ce9d2e8905"; + sha256 = "4c2013d3b64cceec11bbf58cfd3dd306653410ffde95ffdc649c3ffd2390e542"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sr/thunderbird-78.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "544ed1f0cb8beeac3ac1b2ed02078c3acc5961d6fe4c3f0722b1a36208740226053236453a215e564371453cc5acb541a6f307d594524081a5f4c96aa077c21f"; + sha256 = "ad0fbf13c2e0aea8b5ba97516d0ec53bf2fd4868155e66df5297cc95a27246db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sv-SE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sv-SE/thunderbird-78.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "806ea4d93a8cb3e5dba8cbc59dd25adbb19e048306124ffebbf1b2a56d49f236d9a79d0e14b5fc0c15537c266a85408ce1a5568e8e6e4417dd94f1b98d9bf36e"; + sha256 = "4af730894f076b9a48afd5a202f7e78a11f050a11e5e2011726370e1b14ce70f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/tr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/th/thunderbird-78.0.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha256 = "901c62b2adabd67d98314a18782638c8f7e9f55d8ebcb0686b2c7355696f71f8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/tr/thunderbird-78.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "cf30e9ebaf5770437415377c9a13d66b44a7de7c85bec9b980d9e2e059db7f3756f2c3a888ebf9185c59451e2473440fe2c1ff28a979e066225719effecb1c38"; + sha256 = "ac7794552303525a4b72dac166624c06b7392fbdb063144a793a39d4ad6fbac0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uk/thunderbird-78.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a7f5f6b0f1bc849a3a48a30edc8e408eec0c5e544bb4444a8ade969b1fe7ef1fb9d26a0fea3d4d31bf88eb67570e895fb5d916b9ac88c2a8455abcec60d56ca0"; + sha256 = "890373ce0813c7cd4cf8eec39af6a362d1e88c4bf967ccb3482b7dbb806dd228"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uz/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uz/thunderbird-78.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "716e1c0a7b9b0ea33d1464930b68f3f817ce3310bee9000199f9e6bdc4d0d68dc6098665423ada94d7ede600cb0c965adcbb413068adf1415cbc048a7f847ebf"; + sha256 = "0153af7da918e0b3a9d50e2970f946dcc3ca2ba0b92782f82917153a2fb850b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/vi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/vi/thunderbird-78.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1667ab35ed705e739c5192246444eda912ec86a153dd1fc3ed83a5ed61d47d5849270492015198cca82827720bc019fa561e710df5fa77a758864e6cfb09d4aa"; + sha256 = "55ba1938bc0b894f92bb17435b0bbf19e15da8163dfcfb377b87db02aff8e564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-CN/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-CN/thunderbird-78.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4ef6c9933ce8671442aa86f804085b4ce9a73aa4f8cd598b7d41a844be37d54cbd8a2dc39d6ab97f160856435475093f3240f960a206e53d327a4b2e47fac45d"; + sha256 = "921619f82d094b35d74dd54071191ce00487aeb90190e2d2b6f229610e016878"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-TW/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-TW/thunderbird-78.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ab19d7c1114835a380e035dafc2e30849e8084cdac9175eb5eb3a9fde81d49cb710d9dce21652780a35011d139e070c0f61840275aa8d0e99252bfa5a8aa1735"; + sha256 = "28a03fc23a2961bdb1ea3cf1fa08be57302627071f4dc096eb9aca58124e5058"; } ]; } From a62d988aeba98dfeb9d6ff7c989bf15db54dee10 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 23:39:25 +0900 Subject: [PATCH 015/214] thunderbird: copy thunderbird -> thunderbird-68 --- .../networking/mailreaders/thunderbird/68.nix | 343 ++++++++++++++++++ .../thunderbird/no-buildconfig-68.patch | 35 ++ pkgs/top-level/all-packages.nix | 7 + 3 files changed, 385 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/68.nix create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix new file mode 100644 index 00000000000..28632e9d173 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -0,0 +1,343 @@ +# This pakcage is keeped until Thunderbird 78 supports OpenPGP. +# https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/ +{ autoconf213 +, bzip2 +, cargo +, common-updater-scripts +, coreutils +, curl +, dbus +, dbus-glib +, fetchurl +, file +, fontconfig +, freetype +, glib +, gnugrep +, gnused +, icu +, jemalloc +, lib +, libGL +, libGLU +, libevent +, libjpeg +, libnotify +, libpng +, libstartup_notification +, libvpx +, libwebp +, llvmPackages +, m4 +, makeDesktopItem +, nasm +, nodejs +, nspr +, nss +, pango +, perl +, pkgconfig +, python2 +, python3 +, runtimeShell +, rust-cbindgen +, rustc +, sqlite +, stdenv +, systemd +, unzip +, which +, writeScript +, xidel +, xorg +, yasm +, zip +, zlib + +, debugBuild ? false + +, alsaSupport ? stdenv.isLinux, alsaLib +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio +, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook +, waylandSupport ? true +, libxkbcommon, calendarSupport ? true + +, # If you want the resulting program to call itself "Thunderbird" instead +# of "Earlybird" or whatever, enable this option. However, those +# binaries may not be distributed without permission from the +# Mozilla Foundation, see +# http://www.mozilla.org/foundation/trademarks/. +enableOfficialBranding ? false +}: + +assert waylandSupport -> gtk3Support == true; + +stdenv.mkDerivation rec { + pname = "thunderbird"; + version = "68.10.0"; + + src = fetchurl { + url = + "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = + "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; + }; + + nativeBuildInputs = [ + autoconf213 + cargo + gnused + llvmPackages.llvm + m4 + nasm + nodejs + perl + pkgconfig + python2 + python3 + rust-cbindgen + rustc + which + yasm + ] ++ lib.optional gtk3Support wrapGAppsHook; + + buildInputs = [ + bzip2 + dbus + dbus-glib + file + fontconfig + freetype + glib + gtk2 + icu + jemalloc + libGL + libGLU + libevent + libjpeg + libnotify + libpng + libstartup_notification + libvpx + libwebp + nspr + nss + pango + perl + sqlite + unzip + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcursor + xorg.libXext + xorg.libXft + xorg.libXi + xorg.libXrender + xorg.libXt + xorg.pixman + xorg.xorgproto + zip + zlib + ] ++ lib.optional alsaSupport alsaLib + ++ lib.optional gtk3Support gtk3 + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional waylandSupport libxkbcommon; + + NIX_CFLAGS_COMPILE =[ + "-I${glib.dev}/include/gio-unix-2.0" + "-I${nss.dev}/include/nss" + ]; + + patches = [ + ./no-buildconfig-68.patch + ]; + + postPatch = '' + rm -rf obj-x86_64-pc-linux-gnu + ''; + + hardeningDisable = [ "format" ]; + + preConfigure = '' + # remove distributed configuration files + rm -f configure + rm -f js/src/configure + rm -f .mozconfig* + + configureScript="$(realpath ./mach) configure" + # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 + unset AS + + export MOZCONFIG=$(pwd)/mozconfig + + # Set C flags for Rust's bindgen program. Unlike ordinary C + # compilation, bindgen does not invoke $CC directly. Instead it + # uses LLVM's libclang. To make sure all necessary flags are + # included we need to look in a few places. + # TODO: generalize this process for other use-cases. + + BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + $(< ${stdenv.cc}/nix-support/cc-cflags) \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ + ${ + lib.optionalString stdenv.cc.isClang + "-idirafter ${stdenv.cc.cc}/lib/clang/${ + lib.getVersion stdenv.cc.cc + }/include" + } \ + ${ + lib.optionalString stdenv.cc.isGNU + "-isystem ${stdenv.cc.cc}/include/c++/${ + lib.getVersion stdenv.cc.cc + } -isystem ${stdenv.cc.cc}/include/c++/${ + lib.getVersion stdenv.cc.cc + }/${stdenv.hostPlatform.config}" + } \ + $NIX_CFLAGS_COMPILE" + + echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG + ''; + + configureFlags = let + toolkitSlug = if gtk3Support then + "3${lib.optionalString waylandSupport "-wayland"}" + else + "2"; + toolkitValue = "cairo-gtk${toolkitSlug}"; + in [ + "--enable-application=comm/mail" + + "--with-system-bz2" + "--with-system-icu" + "--with-system-jpeg" + "--with-system-libevent" + "--with-system-nspr" + "--with-system-nss" + "--with-system-png" # needs APNG support + "--with-system-icu" + "--with-system-zlib" + "--with-system-webp" + "--with-system-libvpx" + + "--enable-rust-simd" + "--enable-crashreporter" + "--enable-default-toolkit=${toolkitValue}" + "--enable-js-shell" + "--enable-necko-wifi" + "--enable-startup-notification" + "--enable-system-ffi" + "--enable-system-pixman" + "--enable-system-sqlite" + + "--disable-gconf" + "--disable-tests" + "--disable-updater" + "--enable-jemalloc" + ] ++ (if debugBuild then [ + "--enable-debug" + "--enable-profiling" + ] else [ + "--disable-debug" + "--enable-release" + "--disable-debug-symbols" + "--enable-optimize" + "--enable-strip" + ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ] ++ lib.optional alsaSupport "--enable-alsa" + ++ lib.optional calendarSupport "--enable-calendar" + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optional pulseaudioSupport "--enable-pulseaudio"; + + enableParallelBuilding = true; + + postConfigure = '' + cd obj-* + ''; + + makeFlags = lib.optionals enableOfficialBranding [ + "MOZILLA_OFFICIAL=1" + "BUILD_OFFICIAL=1" + ]; + + doCheck = false; + + postInstall = let + desktopItem = makeDesktopItem { + categories = lib.concatStringsSep ";" [ "Application" "Network" ]; + desktopName = "Thunderbird"; + genericName = "Mail Reader"; + name = "thunderbird"; + exec = "thunderbird %U"; + icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; + mimeType = lib.concatStringsSep ";" [ + # Email + "x-scheme-handler/mailto" + "message/rfc822" + # Feeds + "x-scheme-handler/feed" + "application/rss+xml" + "application/x-extension-rss" + # Newsgroups + "x-scheme-handler/news" + "x-scheme-handler/snews" + "x-scheme-handler/nntp" + ]; + }; + in '' + # TODO: Move to a dev output? + rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl + + ${desktopItem.buildCommand} + ''; + + preFixup = '' + # Needed to find Mozilla runtime + gappsWrapperArgs+=( + --argv0 "$out/bin/thunderbird" + --set MOZ_APP_LAUNCHER thunderbird + # https://github.com/NixOS/nixpkgs/pull/61980 + --set SNAP_NAME "thunderbird" + --set MOZ_LEGACY_PROFILES 1 + --set MOZ_ALLOW_DOWNGRADE 1 + ) + ''; + + # FIXME: The XUL portion of this can probably be removed as soon as we + # 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 + ''; + + doInstallCheck = true; + installCheckPhase = '' + "$out/bin/thunderbird" --version + ''; + + disallowedRequisites = [ + stdenv.cc + ]; + + passthru.updateScript = import ./../../browsers/firefox/update.nix { + attrPath = "thunderbird"; + baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + inherit writeScript lib common-updater-scripts xidel coreutils gnused + gnugrep curl runtimeShell; + }; + + meta = with stdenv.lib; { + description = "A full-featured e-mail client"; + homepage = "https://www.thunderbird.net"; + maintainers = with maintainers; [ + eelco + lovesegfault + pierron + ]; + platforms = platforms.linux; + license = licenses.mpl20; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch new file mode 100644 index 00000000000..fe3a93ebda7 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch @@ -0,0 +1,35 @@ +diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp +--- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 ++++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 +@@ -32,8 +32,6 @@ + {"about", "chrome://global/content/aboutAbout.xhtml", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xul", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn +--- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 ++++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 +@@ -39,7 +39,6 @@ + content/global/plugins.css + content/global/browser-child.js + content/global/browser-content.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -117,9 +117,7 @@ + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul + +-* content/messenger/buildconfig.html (content/buildconfig.html) + content/messenger/buildconfig.css (content/buildconfig.css) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html + % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css + + # L10n resources and overrides. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82396c1f9e3..3c931a5c832 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22789,6 +22789,13 @@ in nss = nss_3_44; # 68.x won't build with newest nss anymore (like firefox-esr-68) }; + thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { + inherit (rustPackages_1_44) cargo rustc; + libpng = libpng_apng; + nss = nss_3_44; + gtk3Support = true; + }; + thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; From 7ae6e51bd496bb3ed46078e0322256e2fef7517a Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Mon, 27 Jul 2020 20:24:32 -0400 Subject: [PATCH 016/214] gplates: 2.0.0 -> 2.2.0, unbreak --- .../science/misc/gplates/boostfix.patch | 612 ------------------ .../science/misc/gplates/default.nix | 23 +- 2 files changed, 12 insertions(+), 623 deletions(-) delete mode 100644 pkgs/applications/science/misc/gplates/boostfix.patch diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/pkgs/applications/science/misc/gplates/boostfix.patch deleted file mode 100644 index e429600b709..00000000000 --- a/pkgs/applications/science/misc/gplates/boostfix.patch +++ /dev/null @@ -1,612 +0,0 @@ ---- a/src/app-logic/ApplicationState.h -+++ b/src/app-logic/ApplicationState.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "FeatureCollectionFileState.h" - #include "Layer.h" - #include "LayerTaskRegistry.h" -@@ -48,6 +49,7 @@ - #include "model/ModelInterface.h" - #include "model/types.h" - #include "model/WeakReferenceCallback.h" -+#endif - - //////////////////////////////////////////////////////////////////////////////////////////////// - // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers ---- a/src/app-logic/CoRegistrationLayerTask.h -+++ b/src/app-logic/CoRegistrationLayerTask.h -@@ -32,11 +32,13 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "CoRegistrationLayerParams.h" - #include "CoRegistrationLayerProxy.h" - #include "LayerTask.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - namespace GPlatesAppLogic - { ---- a/src/app-logic/RasterLayerTask.h -+++ b/src/app-logic/RasterLayerTask.h -@@ -32,11 +32,13 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "RasterLayerParams.h" - #include "RasterLayerProxy.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructGraph.h -+++ b/src/app-logic/ReconstructGraph.h -@@ -46,6 +46,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "FeatureCollectionFileState.h" - #include "Layer.h" - #include "Reconstruction.h" -@@ -53,6 +54,7 @@ - - #include "model/FeatureCollectionHandle.h" - #include "model/WeakReferenceCallback.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructLayerTask.h -+++ b/src/app-logic/ReconstructLayerTask.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "ReconstructLayerProxy.h" - #include "ReconstructLayerParams.h" -@@ -42,6 +43,7 @@ - #include "maths/types.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructScalarCoverageLayerParams.h -+++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h -@@ -30,6 +30,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerParams.h" - #include "ReconstructScalarCoverageLayerProxy.h" - #include "ReconstructScalarCoverageParams.h" -@@ -38,6 +39,7 @@ - #include "property-values/ValueObjectType.h" - - #include "utils/SubjectObserverToken.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructScalarCoverageLayerTask.h -+++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h -@@ -30,12 +30,14 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "ReconstructScalarCoverageLayerParams.h" - #include "ReconstructScalarCoverageLayerProxy.h" - #include "ScalarCoverageFeatureProperties.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/TopologyNetworkResolverLayerTask.h -+++ b/src/app-logic/TopologyNetworkResolverLayerTask.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerParams.h" - #include "LayerTask.h" - #include "ReconstructLayerProxy.h" -@@ -41,6 +42,7 @@ - #include "TopologyNetworkResolverLayerProxy.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/VelocityFieldCalculatorLayerTask.h -+++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h -@@ -32,9 +32,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "VelocityFieldCalculatorLayerParams.h" - #include "VelocityFieldCalculatorLayerProxy.h" -+#endif - - #include "model/FeatureCollectionHandle.h" - ---- a/src/data-mining/CoRegConfigurationTable.h -+++ b/src/data-mining/CoRegConfigurationTable.h -@@ -28,6 +28,7 @@ - - #include - #include -+#ifndef Q_MOC_RUN - #include - - #include "CoRegFilter.h" -@@ -44,6 +45,7 @@ - #include "scribe/Transcribe.h" - #include "scribe/TranscribeContext.h" - -+#endif - - namespace GPlatesDataMining - { ---- a/src/gui/CommandServer.h -+++ b/src/gui/CommandServer.h -@@ -38,9 +38,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" - - #include "presentation/ViewState.h" -+#endif - - namespace GPlatesGui - { ---- a/src/gui/FeatureTableModel.h -+++ b/src/gui/FeatureTableModel.h -@@ -32,8 +32,10 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "app-logic/Layer.h" - #include "app-logic/ReconstructionGeometry.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/gui/TopologyTools.h -+++ b/src/gui/TopologyTools.h -@@ -35,6 +35,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "TopologySectionsContainer.h" - - #include "app-logic/Layer.h" -@@ -64,6 +65,7 @@ - #include "utils/UnicodeStringUtils.h" - - #include "view-operations/RenderedGeometryCollection.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/opengl/GLVisualLayers.h -+++ b/src/opengl/GLVisualLayers.h -@@ -35,6 +35,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "GLAgeGridMaskSource.h" - #include "GLContext.h" - #include "GLLight.h" -@@ -79,6 +80,7 @@ - - #include "view-operations/RenderedGeometry.h" - #include "view-operations/ScalarField3DRenderParameters.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/presentation/VisualLayer.h -+++ b/src/presentation/VisualLayer.h -@@ -32,6 +32,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "VisualLayerParams.h" - #include "VisualLayerType.h" - -@@ -42,6 +43,7 @@ - #include "model/FeatureCollectionHandle.h" - - #include "view-operations/RenderedGeometryCollection.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/presentation/VisualLayers.h -+++ b/src/presentation/VisualLayers.h -@@ -34,6 +34,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "VisualLayer.h" - - #include "app-logic/FeatureCollectionFileState.h" -@@ -42,6 +43,7 @@ - #include "gui/Symbol.h" - - #include "view-operations/RenderedGeometryCollection.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h -+++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h -@@ -39,6 +39,7 @@ - #include "GPlatesDialog.h" - #include "InformationDialog.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/AssignPlateIds.h" - - #include "file-io/File.h" -@@ -47,6 +48,7 @@ - #include "model/ModelInterface.h" - - #include "presentation/VisualLayer.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h -+++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h -@@ -38,6 +38,7 @@ - - #include "OpenDirectoryDialog.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" - #include "app-logic/Layer.h" - #include "app-logic/LayerInputChannelName.h" -@@ -45,6 +46,7 @@ - - #include "data-mining/CheckAttrTypeVisitor.h" - #include "data-mining/CoRegConfigurationTable.h" -+#endif - - #include "global/PointerTraits.h" - ---- a/src/qt-widgets/CoRegistrationOptionsWidget.h -+++ b/src/qt-widgets/CoRegistrationOptionsWidget.h -@@ -31,6 +31,7 @@ - #include "CoRegistrationLayerConfigurationDialog.h" - #include "CoRegistrationOptionsWidgetUi.h" - #include "LayerOptionsWidget.h" -+#ifndef Q_MOC_RUN - #include "CoRegistrationResultTableDialog.h" - - #include "app-logic/CoRegistrationLayerTask.h" -@@ -41,7 +42,7 @@ - #include "file-io/File.h" - - #include "presentation/VisualLayer.h" -- -+#endif - - namespace GPlatesAppLogic - { ---- a/src/qt-widgets/CoRegistrationResultTableDialog.h -+++ b/src/qt-widgets/CoRegistrationResultTableDialog.h -@@ -36,6 +36,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "CoRegistrationResultTableDialogUi.h" - #include "SaveFileDialog.h" - -@@ -43,6 +44,7 @@ - #include "data-mining/OpaqueDataToQString.h" - - #include "presentation/VisualLayer.h" -+#endif - - namespace GPlatesPresentation - { ---- a/src/qt-widgets/DrawStyleDialog.h -+++ b/src/qt-widgets/DrawStyleDialog.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "DrawStyleDialogUi.h" - #include "GPlatesDialog.h" - #include "PythonArgumentWidget.h" -@@ -41,6 +42,7 @@ - #include "gui/PythonConfiguration.h" - - #include "presentation/Application.h" -+#endif - - namespace GPlatesAppLogic - { ---- a/src/qt-widgets/EditTableActionWidget.h -+++ b/src/qt-widgets/EditTableActionWidget.h -@@ -27,8 +27,11 @@ - #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H - - #include -+ -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" - #include "EditTableActionWidgetUi.h" -+#endif - - namespace GPlatesQtWidgets - { ---- a/src/qt-widgets/GlobeCanvas.h -+++ b/src/qt-widgets/GlobeCanvas.h -@@ -41,6 +41,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "gui/ColourScheme.h" - #include "gui/Globe.h" - #include "gui/ViewportZoom.h" -@@ -58,6 +59,7 @@ - #include "qt-widgets/SceneView.h" - - #include "view-operations/RenderedGeometryFactory.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/LogDialog.h -+++ b/src/qt-widgets/LogDialog.h -@@ -34,7 +34,9 @@ - #include "GPlatesDialog.h" - #include "LogDialogUi.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/MapCanvas.h -+++ b/src/qt-widgets/MapCanvas.h -@@ -39,6 +39,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "gui/ColourScheme.h" - #include "gui/Map.h" - #include "gui/TextOverlay.h" -@@ -47,6 +48,7 @@ - #include "opengl/GLMatrix.h" - #include "opengl/GLOffScreenContext.h" - #include "opengl/GLVisualLayers.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/MapView.h -+++ b/src/qt-widgets/MapView.h -@@ -36,6 +36,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "gui/ColourScheme.h" - - #include "maths/LatLonPoint.h" -@@ -44,6 +45,7 @@ - #include "opengl/GLVisualLayers.h" - - #include "qt-widgets/SceneView.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/MergeReconstructionLayersDialog.h -+++ b/src/qt-widgets/MergeReconstructionLayersDialog.h -@@ -33,7 +33,9 @@ - - #include "MergeReconstructionLayersDialogUi.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/Layer.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/RasterLayerOptionsWidget.h -+++ b/src/qt-widgets/RasterLayerOptionsWidget.h -@@ -31,6 +31,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RasterLayerOptionsWidgetUi.h" - - #include "LayerOptionsWidget.h" -@@ -40,6 +41,7 @@ - - #include "gui/BuiltinColourPaletteType.h" - #include "gui/RasterColourPalette.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h -+++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h -@@ -28,6 +28,7 @@ - - #include - -+#ifndef Q_MOC_RUN - #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h" - - #include "LayerOptionsWidget.h" -@@ -37,6 +38,7 @@ - - #include "gui/BuiltinColourPaletteType.h" - #include "gui/RasterColourPalette.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h -+++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h -@@ -30,6 +30,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "ScalarField3DLayerOptionsWidgetUi.h" - - #include "LayerOptionsWidget.h" -@@ -41,6 +42,7 @@ - #include "gui/RasterColourPalette.h" - - #include "view-operations/ScalarField3DRenderParameters.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/TotalReconstructionPolesDialog.h -+++ b/src/qt-widgets/TotalReconstructionPolesDialog.h -@@ -32,12 +32,14 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "TotalReconstructionPolesDialogUi.h" - - #include "GPlatesDialog.h" - #include "SaveFileDialog.h" - - #include "presentation/VisualLayer.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/VisualLayersComboBox.h -+++ b/src/qt-widgets/VisualLayersComboBox.h -@@ -32,8 +32,10 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "presentation/VisualLayer.h" - #include "presentation/VisualLayerType.h" -+#endif - - - namespace GPlatesPresentation ---- a/src/qt-widgets/VisualLayerWidget.h -+++ b/src/qt-widgets/VisualLayerWidget.h -@@ -36,11 +36,13 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "VisualLayerWidgetUi.h" - - #include "app-logic/Layer.h" - - #include "gui/Colour.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/view-operations/InternalGeometryBuilder.h -+++ b/src/view-operations/InternalGeometryBuilder.h -@@ -30,9 +30,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "maths/GeometryOnSphere.h" - #include "maths/GeometryType.h" - #include "maths/PointOnSphere.h" -+#endif - - namespace GPlatesViewOperations - { ---- a/src/view-operations/RenderedGeometryCollection.h -+++ b/src/view-operations/RenderedGeometryCollection.h -@@ -39,7 +39,9 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RenderedGeometryLayer.h" -+#endif - - namespace GPlatesViewOperations - { ---- a/src/view-operations/RenderedGeometryFactory.h -+++ b/src/view-operations/RenderedGeometryFactory.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RenderedGeometry.h" - #include "RenderedColouredEdgeSurfaceMesh.h" - #include "RenderedColouredTriangleSurfaceMesh.h" -@@ -62,6 +63,7 @@ - #include "property-values/TextContent.h" - - #include "view-operations/ScalarField3DRenderParameters.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/view-operations/RenderedGeometryLayer.h -+++ b/src/view-operations/RenderedGeometryLayer.h -@@ -35,10 +35,12 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RenderedGeometry.h" - - #include "maths/CubeQuadTreeLocation.h" - -+#endif - - namespace GPlatesMaths - { diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 9b510d432fb..0b135bf985f 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal_1_11, cgal -, proj, boost, cmake, python2, doxygen, graphviz, gmp }: +{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal +, proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }: stdenv.mkDerivation rec { pname = "gplates"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2"; - sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw"; + sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; }; - patches = [ - ./boostfix.patch + buildInputs = [ + qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2 + doxygen graphviz gmp mpfr + (boost.override { + enablePython = true; + python = python2; + }) ]; - buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal_1_11 cgal proj boost cmake python2 - doxygen graphviz gmp - ]; + NIX_CFLAGS_LINK="-ldl -lpthread -lutil"; meta = with stdenv.lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; homepage = https://www.gplates.org; license = licenses.gpl2; platforms = platforms.all; - broken = true; }; } From 4d0077adddd3efb1602677c60f5f54430705fd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jul 2020 15:28:29 +0100 Subject: [PATCH 017/214] tlp: use structured config to fix cpu governor Previously this module just disabled them. Now tlp merges system defaults in --- nixos/modules/services/hardware/tlp.nix | 59 ++++++++++++++++++------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 3962d7b1598..4230f2edd27 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -8,12 +8,8 @@ let mkTlpConfig = tlpConfig: generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault { mkValueString = val: - if isInt val then toString val - else if isString val then val - else if true == val then "1" - else if false == val then "0" - else if isList val then "\"" + (concatStringsSep " " val) + "\"" - else err "invalid value provided to mkTlpConfig:" (toString val); + if isList val then "\"" + (toString val) + "\"" + else toString val; } "="; } tlpConfig; in @@ -27,10 +23,24 @@ in description = "Whether to enable the TLP power management daemon."; }; + settings = mkOption {type = with types; attrsOf (oneOf [bool int float str (listOf str)]); + default = {}; + example = { + SATA_LINKPWR_ON_BAT = "med_power_with_dipm"; + USB_BLACKLIST_PHONE = 1; + }; + description = '' + Options passed to TLP. See https://linrunner.de/tlp for all supported options.. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional configuration variables for TLP"; + description = '' + Verbatim additional configuration variables for TLP. + DEPRECATED: use services.tlp.config instead. + ''; }; }; }; @@ -39,8 +49,20 @@ in config = mkIf cfg.enable { boot.kernelModules = [ "msr" ]; + warnings = optional (cfg.extraConfig != "") '' + Using config.services.tlp.extraConfig is deprecated and will become unsupported in a future release. Use config.services.tlp.settings instead. + ''; + + assertions = [{ + assertion = cfg.enable -> config.powerManagement.scsiLinkPolicy == null; + message = '' + `services.tlp.enable` and `config.powerManagement.scsiLinkPolicy` cannot be set both. + Set `services.tlp.settings.SATA_LINKPWR_ON_AC` and `services.tlp.settings.SATA_LINKPWR_ON_BAT` instead. + ''; + }]; + environment.etc = { - "tlp.conf".text = cfg.extraConfig; + "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig; } // optionalAttrs enableRDW { "NetworkManager/dispatcher.d/99tlp-rdw-nm".source = "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm"; @@ -48,18 +70,25 @@ in environment.systemPackages = [ tlp ]; - # FIXME: When the config is parametrized we need to move these into a - # conditional on the relevant options being enabled. - powerManagement = { - scsiLinkPolicy = null; - cpuFreqGovernor = null; - cpufreq.max = null; - cpufreq.min = null; + + services.tlp.settings = let + cfg = config.powerManagement; + maybeDefault = val: lib.mkIf (val != null) (lib.mkDefault val); + in { + CPU_SCALING_GOVERNOR_ON_AC = maybeDefault cfg.cpuFreqGovernor; + CPU_SCALING_GOVERNOR_ON_BAT = maybeDefault cfg.cpuFreqGovernor; + CPU_SCALING_MIN_FREQ_ON_AC = maybeDefault cfg.cpufreq.min; + CPU_SCALING_MAX_FREQ_ON_AC = maybeDefault cfg.cpufreq.max; + CPU_SCALING_MIN_FREQ_ON_BAT = maybeDefault cfg.cpufreq.min; + CPU_SCALING_MAX_FREQ_ON_BAT = maybeDefault cfg.cpufreq.max; }; services.udev.packages = [ tlp ]; systemd = { + # use native tlp instead because it can also differentiate between AC/BAT + services.cpufreq.enable = false; + packages = [ tlp ]; # XXX: These must always be disabled/masked according to [1]. # From 179b74c2167fee8cbd70977dc746179db735ac41 Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Tue, 28 Jul 2020 22:59:51 +0200 Subject: [PATCH 018/214] maintainers: add TethysSvensson --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/os-specific/linux/busybox/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 726478fc747..e2a89e176e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7868,6 +7868,12 @@ githubId = 26417242; name = "Mikolaj Galkowski"; }; + TethysSvensson = { + email = "freaken@freaken.dk"; + github = "TethysSvensson"; + githubId = 4294434; + name = "Tethys Svensson"; + }; teto = { email = "mcoudron@hotmail.com"; github = "teto"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a63ea958b61..67d5ab18e2f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ TethysSvensson ]; platforms = platforms.linux; priority = 10; }; From ec80ae25506e8972d8965b7d6a7df234267dd094 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 28 Jul 2020 16:42:35 -0500 Subject: [PATCH 019/214] undmg: 1.0.3 -> 1.0.5 --- pkgs/tools/archivers/undmg/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 79b861de485..3641893cf74 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, zlib, bzip2 }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.5"; pname = "undmg"; src = fetchFromGitHub { owner = "matthewbauer"; repo = "undmg"; rev = "v${version}"; - sha256 = "1pxqw92h2w75d4jwiihwnkhnsfk09cddh3flgrqwh9r3ry14fgbb"; - + sha256 = "0yz5fniaa5z33d8bdzgr263957r1c9l99237y2p8k0hdid207la1"; }; buildInputs = [ zlib bzip2 ]; From dcc963bd2d13a02b1f86d811a1835748aec49cbd Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Wed, 29 Jul 2020 00:24:19 +0200 Subject: [PATCH 020/214] busybox: Download and patch the dispatcher script from upstream --- pkgs/os-specific/linux/busybox/default.nix | 19 ++++-- pkgs/os-specific/linux/busybox/default.script | 66 ------------------- 2 files changed, 15 insertions(+), 70 deletions(-) delete mode 100755 pkgs/os-specific/linux/busybox/default.script diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 67d5ab18e2f..f1b008b2103 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -31,6 +31,14 @@ let CONFIG_FEATURE_UTMP n CONFIG_FEATURE_WTMP n ''; + + debianName = "busybox_1.30.1-5"; + debianTarball = fetchTarball { + url = "http://deb.debian.org/debian/pool/main/b/busybox/${debianName}.debian.tar.xz"; + sha256 = "03m4rvs2pd0hj0mdkdm3r4m1gh0bgwr0cvnqds297xnkfi5s01nx"; + }; + debianDispatcherScript = "${debianTarball}/tree/udhcpc/etc/udhcpc/default.script"; + outDispatchPath = "$out/default.script"; in stdenv.mkDerivation rec { @@ -81,7 +89,7 @@ stdenv.mkDerivation rec { CONFIG_FEATURE_COPYBUF_KB 64 # Set the path for the udhcpc script - CONFIG_UDHCPC_DEFAULT_SCRIPT "$out/share/default.script" + CONFIG_UDHCPC_DEFAULT_SCRIPT "${outDispatchPath}" ${extraConfig} CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}" @@ -98,9 +106,12 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir $out/share - substituteAll ${./default.script} $out/share/default.script - chmod +x $out/share/default.script + sed -e ' + 1 a busybox() { '$out'/bin/busybox "$@"; }\ + logger() { '$out'/bin/logger "$@"; }\ + ' ${debianDispatcherScript} > ${outDispatchPath} + chmod 555 ${outDispatchPath} + PATH=$out/bin patchShebangs ${outDispatchPath} ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/os-specific/linux/busybox/default.script b/pkgs/os-specific/linux/busybox/default.script deleted file mode 100755 index 298616e6527..00000000000 --- a/pkgs/os-specific/linux/busybox/default.script +++ /dev/null @@ -1,66 +0,0 @@ -#!@bash@/bin/sh -# Busybox udhcpc dispatcher script. -# Copyright (C) 2009 by Axel Beckert. -# Copyright (C) 2014 by Michael Tokarev. -# -# Based on the busybox example scripts and the old udhcp source -# package default.* scripts. - -RESOLV_CONF="/etc/resolv.conf" - -log() { - @out@/bin/logger -t "udhcpc[$PPID]" -p daemon.$1 "$interface: $2" -} - -case $1 in - bound|renew) - - # Configure new IP address. - # Do it unconditionally even if the address hasn't changed, - # to also set subnet, broadcast, mtu, ... - @out@/bin/ifconfig $interface ${mtu:+mtu $mtu} \ - $ip netmask $subnet ${broadcast:+broadcast $broadcast} - - # get current ("old") routes (after setting new IP) - crouter=$(@out@/bin/ip -4 route show dev $interface | - @out@/bin/awk '$1 == "default" { print $3; }') - router="${router%% *}" # linux kernel supports only one (default) route - if [ ".$router" != ".$crouter" ]; then - # reset just default routes - @out@/bin/ip -4 route flush exact 0.0.0.0/0 dev $interface - fi - if [ -n "$router" ]; then - # special case for /32 subnets: use onlink keyword - [ ".$subnet" = .255.255.255.255 ] \ - && onlink=onlink || onlink= - @out@/bin/ip -4 route add default via $router dev $interface $onlink - fi - - # Update resolver configuration file - [ -n "$domain" ] && R="domain $domain" || R="" - for i in $dns; do - R="$R -nameserver $i" - done - - echo "$R" > "$RESOLV_CONF" - - log info "$1: IP=$ip/$subnet router=$router domain=\"$domain\" dns=\"$dns\" lease=$lease" - ;; - - deconfig) - @out@/bin/ip link set $interface up - @out@/bin/ip -4 addr flush dev $interface - @out@/bin/ip -4 route flush dev $interface - log notice "deconfigured" - ;; - - leasefail | nak) - log err "configuration failed: $1: $message" - ;; - - *) - echo "$0: Unknown udhcpc command: $1" >&2 - exit 1 - ;; -esac From 0d7bdd6d8e14fa9153bdb68a467b45673f1019c8 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 21 Jul 2020 01:08:34 +0000 Subject: [PATCH 021/214] hydra-unstable: 2020-06-23 -> 2020-07-28 This fixes the build: config.status: creating hydra-config.h config.status: executing depfiles commands config.status: executing libtool commands config.status: executing executable-scripts commands building build flags: -j8 -l8 SHELL=/nix/store/c4wxsn4jays9j31y5z9f83nr2cp7l4pa-bash-4.4-p23/bin/bash make all-recursive make[1]: Entering directory '/build/source' Making all in src make[2]: Entering directory '/build/source/src' Making all in hydra-evaluator make[3]: Entering directory '/build/source/src/hydra-evaluator' g++ -DHAVE_CONFIG_H -I. -I../.. -std=c++17 -I/nix/store/2xhb4hlskn33pbyph36v4wxcan56dnrw-boehm-gc-8.0.4-dev/include -I/nix/store/5rjgsqjdm71cflfb68q7m771a1rqcsk3-nix-2.4pre20200719_a79b6dd-dev/include/nix -Wall -I ../libhydra -Wno-deprecated-declarations -g -O2 -std=c++17 -include nix/config.h -c -o hydra_evaluator-hydra-evaluator.o `test -f 'hydra-evaluator.cc' || echo './'`hydra-evaluator.cc hydra-evaluator.cc:27:27: error: template argument 1 is invalid 27 | std::unique_ptr config; | ^ hydra-evaluator.cc:27:27: error: template argument 2 is invalid hydra-evaluator.cc: In constructor 'Evaluator::Evaluator()': hydra-evaluator.cc:61:56: error: base operand of '->' is not a pointer 61 | , maxEvals(std::max((size_t) 1, (size_t) config->getIntOption("max_concurrent_evals", 4))) | ^~ hydra-evaluator.cc:60:44: error: invalid user-defined conversion from 'std::_MakeUniq::__single_object' {aka 'std::unique_ptr >'} to 'int' [-fpermissive] 60 | : config(std::make_unique<::Config>()) | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ In file included from /nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/memory:80, from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/binarystring.hxx:17, from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/binarystring:4, from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/pqxx:3, from ../libhydra/db.hh:3, from hydra-evaluator.cc:1: /nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/bits/unique_ptr.h:374:16: note: candidate is: 'std::unique_ptr<_Tp, _Dp>::operator bool() const [with _Tp = Config; _Dp = std::default_delete]' 374 | explicit operator bool() const noexcept | ^~~~~~~~ /nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/bits/unique_ptr.h:374:16: note: return type 'bool' of explicit conversion function cannot be converted to 'int' with a qualification conversion make[3]: *** [Makefile:440: hydra_evaluator-hydra-evaluator.o] Error 1 make[3]: Leaving directory '/build/source/src/hydra-evaluator' make[2]: *** [Makefile:360: all-recursive] Error 1 make[2]: Leaving directory '/build/source/src' make[1]: *** [Makefile:414: all-recursive] Error 1 make[1]: Leaving directory '/build/source' make: *** [Makefile:344: all] Error 2 builder for '/nix/store/g967cc3j6rc3nnpx2s4klpr03ig9zzyp-hydra-2020-06-23.drv' failed with exit code 2 --- pkgs/development/tools/misc/hydra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 680e10d662a..9f260121df2 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -24,12 +24,12 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-06-23"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "bb32aafa4a9b027c799e29b1bcf68727e3fc5f5b"; - sha256 = "0kl9h70akwxpik3xf4dbbh7cyqn06023kshfvi14mygdlb84djgx"; + rev = "858eb41fab0c8e2a885dc95f629eac8d56c7449c"; + sha256 = "17j0prprasdg0vvl2w8z99jwxzrjjr60gjgnky3k8ha399fm32pa"; }; nix = nixFlakes; From 148138e9de76eccbc7fb30c61914574e8188267b Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 22:54:14 -0400 Subject: [PATCH 022/214] vend: init at unstable-2020-06-04 This is used to provide alternate vendoring for go. --- pkgs/development/tools/vend/default.nix | 26 +++++++++++++++++++ pkgs/development/tools/vend/remove_tidy.patch | 13 ++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/vend/default.nix create mode 100644 pkgs/development/tools/vend/remove_tidy.patch diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix new file mode 100644 index 00000000000..13aa8aeb6ad --- /dev/null +++ b/pkgs/development/tools/vend/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "vend"; + version = "unstable-2020-06-04"; + + patches = [./remove_tidy.patch]; + + # A permanent fork from master is maintained to avoid non deterministic go tidy + src = fetchFromGitHub { + owner = "c00w"; + repo = "vend"; + rev = "24fdebfdb2c3cc0516321a9cf33a3fd81c209c04"; + sha256 = "112p9dz9by2h2m3jha2bv1bvzn2a86bpg1wphgmf9gksjpwy835l"; + }; + + vendorSha256 = null; + + meta = with stdenv.lib; { + homepage = "https://github.com/c00w/vend"; + description = "A utility which vendors go code including c dependencies"; + maintainers = with maintainers; [ c00w ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/vend/remove_tidy.patch b/pkgs/development/tools/vend/remove_tidy.patch new file mode 100644 index 00000000000..d5db74a1bd7 --- /dev/null +++ b/pkgs/development/tools/vend/remove_tidy.patch @@ -0,0 +1,13 @@ +diff --git a/cli/cmd.go b/cli/cmd.go +index c766559..3a133fd 100644 +--- a/cli/cmd.go ++++ b/cli/cmd.go +@@ -12,7 +12,7 @@ import ( + // UpdateModule makes sure the module is updated ready to vendor the + // dependencies. + func UpdateModule() { +- var commands = []string{"tidy", "download", "vendor"} ++ var commands = []string{"download", "vendor"} + + for _, command := range commands { + cmd := exec.Command("go", "mod", command) From 95be7b25be151b6186eb1f8641458f175cc45e84 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 22:54:39 -0400 Subject: [PATCH 023/214] go-modules: Add useVend flag to go-modules --- doc/languages-frameworks/go.xml | 5 +++++ pkgs/development/go-modules/generic/default.nix | 15 +++++++++++++-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index ff39276f640..28fe9d0b5a5 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -64,6 +64,11 @@ pet = buildGoModule rec { subPackages limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. + + + runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. + + diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index a478871bd9a..68a4fe8dd6a 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, cacert, git, lib, removeReferencesTo, stdenv }: +{ go, cacert, git, lib, removeReferencesTo, stdenv, vend }: { name ? "${args'.pname}-${args'.version}" , src @@ -20,6 +20,9 @@ , vendorSha256 # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false +# Whether to run the vend tool to regenerate the vendor directory. +# This is useful if any dependency contain C files. +, runVend ? false , modSha256 ? null @@ -48,6 +51,8 @@ let deleteFlag = if deleteVendor then "true" else "false"; + vendCommand = if runVend then "${vend}/bin/vend" else "false"; + go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = { name = "${name}-go-modules"; @@ -87,7 +92,13 @@ let echo "vendor folder exists, please set 'vendorSha256=null;' or 'deleteVendor=true;' in your expression" exit 10 fi - go mod vendor + + if [ ${vendCommand} != "false" ]; then + echo running vend to rewrite vendor folder + ${vendCommand} + else + go mod vendor + fi mkdir -p vendor runHook postBuild diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4871dc63da..bfca83c59de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7419,6 +7419,8 @@ in vcstool = callPackage ../development/tools/vcstool { }; + vend = callPackage ../development/tools/vend { }; + verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog {}; From 658b4d7ce536599d104c907cf8b68fe67b01550d Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 15 Jul 2020 15:12:54 +0900 Subject: [PATCH 024/214] thunderbird: 68.9.0 -> 78.0 - Updated the version and the source hash. - Removed unsupported options. - Updated the patch. - Tweaked dependencies; 78 requires newer versions. --- .../mailreaders/thunderbird/default.nix | 9 ++----- .../thunderbird/no-buildconfig.patch | 25 ++++++++++--------- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6cb27055ddb..e161b5bf5b0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.10.0"; + version = "78.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; + "0l5cgd95lxwny365x85pih71z7b9zgmix3wc8916k1xj5p46szr20ylf7b20gwwl7kajm4mrxjdldzmfvc9qzdyss76za5r76c25wwr"; }; nativeBuildInputs = [ @@ -206,14 +206,12 @@ stdenv.mkDerivation rec { in [ "--enable-application=comm/mail" - "--with-system-bz2" "--with-system-icu" "--with-system-jpeg" "--with-system-libevent" "--with-system-nspr" "--with-system-nss" "--with-system-png" # needs APNG support - "--with-system-icu" "--with-system-zlib" "--with-system-webp" "--with-system-libvpx" @@ -223,12 +221,9 @@ stdenv.mkDerivation rec { "--enable-default-toolkit=${toolkitValue}" "--enable-js-shell" "--enable-necko-wifi" - "--enable-startup-notification" "--enable-system-ffi" "--enable-system-pixman" - "--enable-system-sqlite" - "--disable-gconf" "--disable-tests" "--disable-updater" "--enable-jemalloc" diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index fe3a93ebda7..efbddd3fba8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,31 +1,32 @@ diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp ---- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 -+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -32,8 +32,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -63,8 +63,6 @@ + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", nsIAboutModule::ALLOW_SCRIPT}, - {"buildconfig", "chrome://global/content/buildconfig.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 -+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 -@@ -39,7 +39,6 @@ - content/global/plugins.css +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -35,7 +35,6 @@ + content/global/plugins.js content/global/browser-child.js content/global/browser-content.js -* content/global/buildconfig.html content/global/buildconfig.css content/global/contentAreaUtils.js content/global/datepicker.xhtml +diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn --- a/comm/mail/base/jar.mn +++ b/comm/mail/base/jar.mn -@@ -117,9 +117,7 @@ +@@ -119,9 +119,7 @@ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml -* content/messenger/buildconfig.html (content/buildconfig.html) content/messenger/buildconfig.css (content/buildconfig.css) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c931a5c832..3fe84f562c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22785,8 +22785,9 @@ in thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; + icu = icu67; + libvpx = libvpx_1_8; gtk3Support = true; - nss = nss_3_44; # 68.x won't build with newest nss anymore (like firefox-esr-68) }; thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { From c9f781e75396267c2d8d418f0e859fcef294a62d Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 24 Jul 2020 12:13:24 +0900 Subject: [PATCH 025/214] thunderbird-bin: 78.0 -> 78.0.1 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 4da6a221b3e..6eee907db17 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.0"; + version = "78.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/af/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/af/thunderbird-78.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6ff0f696c6caef049d0489085e7b9c3f7240e242c23aef9a36905c67bcbdef33"; + sha256 = "2050aae67c7058ea8991adbfc8c0533c2df2baccf4b5f9d42c794a914c8b893a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ar/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ar/thunderbird-78.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "54b09003901703c2820b20534d403cfbe0b59d7dfb5962cd370049795552e88e"; + sha256 = "1fc387ed18cae62280795729ce61a04942e319fb1162d54740ed6b3b73198987"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ast/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ast/thunderbird-78.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "98c159c6ece97f113614107a1ba351901cc4f816d165f6fb2b3ceee7c5fbed6c"; + sha256 = "cfedbfe2c96814fef42c8e2e4b5aba9f9add0e3c70a2c01ff7528d878a6ab659"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/be/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/be/thunderbird-78.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "abc376f1525e53aa734d00a8a52d30ba2c95fe0f2d053c54e019eecd35191f47"; + sha256 = "e1d6ec9ca197d2fe5312b9b0e403e3ee2ee32be05b2d329ff0b21d9c42ba77a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/bg/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/bg/thunderbird-78.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a53deb5c4d83719e380b69a41f3a80e634c8d251a1724e1d49e5ad8ac5da1aca"; + sha256 = "9b8b5322b6808185fcaa9614b7def311ccaf14b0939447a538b8b13fdd7ffcec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/br/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/br/thunderbird-78.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8424ab87bfb1c1622d244961896bf4109fac2a38bccfbc6facfc7ce723a6ef06"; + sha256 = "1f8429ba0563ab22cb1c30e15ee80d42864f01b0713e37448059335b8f1cdee9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ca/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ca/thunderbird-78.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8283ed7294338be053900ea85e4d9e26ed5ef5a53d419298ddb4d4b0cfd3a8fd"; + sha256 = "bdee4855e082b473f0434f5a16aa704eadc3ed4b0c186b42aaf5aa600f29d066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cak/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cak/thunderbird-78.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "10cca56df7a22ea31fcc3f2fdcc4cea8344727183ca4d7cc1f6d78cd881879d4"; + sha256 = "9d6188ecacf4b76a91c2f4a8cbabf194eba05ffca54b79b3e0ee44919540e353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cs/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cs/thunderbird-78.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "fa476dde45d9f3796e71ed26126ef99569f92344d9c5754dd154df2b79513312"; + sha256 = "edc391204cfc8c1eb1c93fca5f2ec67708c76fa4a1b972defd55f1645ccb3c56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cy/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cy/thunderbird-78.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "319919e66b178aaa86f74717aaf7a7dc54c53c4d400fc0f54d3ff0a4bcb5ea3f"; + sha256 = "e179d9c7252b2915e84d2cb0e1c0c1b9568374bbe65348456e4dedf2f883023e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/da/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/da/thunderbird-78.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "9a3eb38c50fb9c1a1fe58899c304884c2a3e295a278feb40296a48f845f4a8e9"; + sha256 = "53b9e2107a1bc89132e7a3e1d08d4acebff872c19a639100ef1c0ebb4c3d0b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/de/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/de/thunderbird-78.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "260dd2a5227225168327dca79f44ddba7bef4a1a0411a731a192163b36a217a6"; + sha256 = "03bed4f7360142dcaa1824ce5deae519a9ba00f43427fbef78246036de159466"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/dsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/dsb/thunderbird-78.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "559bdb00b7741897c245d367c5147503e580d446b2a6b90e83af2ac9b64ecdd0"; + sha256 = "50217d664170eaf71da7a5111337583aad4a181dfd32eb3686f7a31ec6fdf4be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/el/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/el/thunderbird-78.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2f8fdf4aa2347cafa43c1b7e7c7cb6a358878e8470b45d04634566efc089e1a8"; + sha256 = "b6d1f45955cdd99d097b955e6c2fd017afbfdaa8d0b505d231548acea5d31e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-CA/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-CA/thunderbird-78.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e3921e80a168544f41c39d0281ea32a4660fee8146a7a0b85292f360186ad876"; + sha256 = "f1f9c597816f4a3b30561c186c0944e6fc0fd47616292002d858341a0c6ef5a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-GB/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-GB/thunderbird-78.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a1c2c9f9e7a14ad0abf83d7b268c47e0ef13d4bd3966adedd0ad46bcd4c7f8c6"; + sha256 = "a771190706f3bb163a7962bf4767b9177c324cc3bdc28470375a4ea26022881b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-US/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-US/thunderbird-78.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "57384c634f511c249c3618adcbbd9d2c0fa2a711c2af145d3a390d0950b94209"; + sha256 = "428af66882e1abd047491c6a4a317eda6095191bd0ab81308d162c4a3c8d227e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-AR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-AR/thunderbird-78.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e727f4a725f5e389d99d929fa6792863c74e57e23452e3be1a88a3852c83f7ed"; + sha256 = "b1fae29c0caa3f2c5cfdea0ee169fa4f080027fd4e0347db6546f335bd7b6759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-ES/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-ES/thunderbird-78.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2fac6c47b544fa7b663126f137e4850f5bbe1da115a845b99353454ae0c175a0"; + sha256 = "58c1a11820860e2efe3f38b889962f794e56de4e2d1d94855e10bab1fc4d21af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/et/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/et/thunderbird-78.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e3bf4000c8e5d04ddd9bf0a86dfd8aff02304b5d86c55f649fa43deb3ab9809b"; + sha256 = "71fac7d3c3e74bff029b5432f8caaa76abdd19d38a64ba6192d371c97a09e353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/eu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/eu/thunderbird-78.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3c6249fc0d2707b9472ef5b3876fefc3cbafca617ca27037ad8e98706d509eb5"; + sha256 = "60492decef4b40d8a24e6c04ae0494b178a47a4782388eca7c3e2c2b7b0823ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fa/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fa/thunderbird-78.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7e2edcf08b456f53d8274d17e1bcbd9efb997f74b164224d3e153d64ac7fe60e"; + sha256 = "d3bf790906b9b3c016cce51aeb1671c9d80f28d3c959073bfab0c14dc952d85b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fi/thunderbird-78.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1f6cc927ec2e21a67e61c7d09d93f846d5c1bb1ef54644b618ed806a4541170e"; + sha256 = "7e6c77c994027e8e941a498d8dcc6e82911cd4b6e3a61c78206fe7bc114ae006"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fr/thunderbird-78.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f471719cecaca31e5a940bb82908648703a37b74f647d7c1c434f8db339ef974"; + sha256 = "d4e073368df92a81eae6b3480f3d06d461aab18841a0ed64d7f8d1c5b4623168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fy-NL/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fy-NL/thunderbird-78.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "405daca824b721680f77e3ad8936246825d132c11da4ec2277a022f899ee2ce7"; + sha256 = "41e161d7447b64438652210d9091517b42edcf9b011f01c8c1ceb87539acd295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ga-IE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ga-IE/thunderbird-78.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "899127ff4f98f922e405844df1162e66d484443e5a84bb6c575cc28658b52649"; + sha256 = "a3f1b487d585ed66089b051a01b8b4da6edea684d2bdca94570dcb7cb283c8ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gd/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gd/thunderbird-78.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "183f757b4d70b999064f8a8e495bbe9a6a9783d939811bd93181c9cbf61dc880"; + sha256 = "ebcedbf87577cffae7ba8ed83e9b9f981fd205e178701084cd2f813e30a8adee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gl/thunderbird-78.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "58130045fbcdbcd10541ea6c2d13b95455af8e5fb9893a80d999b79d814eaf17"; + sha256 = "ffdfe4c9c22ac161e801d44599fe507c1ab9d7a8f46181cf1cdce023bccc4161"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/he/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/he/thunderbird-78.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "719ce3b7d4e3841a7092e658f43a8960d68d82ebad6b6dc43d12708a07054a8f"; + sha256 = "cad855f0c469056e1830d2f08be9c42ee348a5ccf74015585451161a0d7fb432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hr/thunderbird-78.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49f9f0c18ad45a73361520a055f02b6b8da22419c37c8423dab64ab13f253834"; + sha256 = "86b80d641ac0e5f7ffbfca3a5539cc1422d67a6b36cefaef9d92d03284955648"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hsb/thunderbird-78.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7abc5362bc14853c7a9d93c84f1d04dd5d4f0ebdd7c71c782b83e8f56d716516"; + sha256 = "062f55ebb24178c604527173511277115cdb49a7bc416f9824359cc700686a7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hu/thunderbird-78.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5bb475dc366e9cae5e9e1422bb4f7e1eb1b605dd5e5193ccc253dffc11c4a0aa"; + sha256 = "281479c1f791cea5c5b64ec103ade785844470d0d803d6298d1f1ec505d7eba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hy-AM/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hy-AM/thunderbird-78.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c42d6cc12203ac812b5794234ccbd38ea83114844234868cb02004a82e8307ec"; + sha256 = "cb436991d7bb7705c29fa8b51a6d4c2910689b58210002a3370820917955dd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/id/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/id/thunderbird-78.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "13e4bf8bb6356966d44e4049e2e90f96b097e6a2ec2c54fd39cbf74e45dc4d3e"; + sha256 = "325319f3d1791c9aa91522c1c6f90aa72d511ad774a190d60a0dfcaf85cce934"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/is/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/is/thunderbird-78.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "bdf740e2545ad41de9920a213afd6a476f261a15746ffb201461b3d2e0dcf06f"; + sha256 = "e61096339f49ef5c1ba457e448f80a306c7f9058f280acaade9945d57209af1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/it/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/it/thunderbird-78.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cd66931d6cff87b16d637340d82d459cac1878fbefdbdb201cf7ed561dc0f6dc"; + sha256 = "daad0be2b8e9419d47a6ae2fd3b30002d206451f9f8f8a0dfa04199175024647"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ja/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ja/thunderbird-78.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "10da3af84f726a9aad3dc5c8ca24136831c136cc2e52f6573b27695f33f48a1b"; + sha256 = "ae8093def67bdde2086d568a2837f427e62f41e0d6ed80d9a64919467e7442e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ka/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ka/thunderbird-78.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "575f382c4f155f93a6cbd5a81fdb988196e2a95d0b8896af454a3cc5e3048d3d"; + sha256 = "57a1406e4e4d70b5fc23f356aa21a55abddaa3401127f279f58f3f73e6756987"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kab/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kab/thunderbird-78.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "bffa3681eb858a55c18b5f396bd08464eeeeda1328ec65a7c67fe4d7c7805757"; + sha256 = "86041ae0c0bd55923256ed64c0ed23f5c3913ed4892dba58d2c064049deecb4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kk/thunderbird-78.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "866191e1d87c0b00f4bb5f2eaa0e1f66719a7ca68a175d1b30ed9a5735005705"; + sha256 = "715626b9f4ffdd68ac9b689dbc48cf47d37d93f128e61d999c5dd14219d1bda8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ko/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ko/thunderbird-78.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f66f91f0e0b04344db0e5cbe8d48721448c775ba8f4ac69ceb1d848b7e07cda0"; + sha256 = "d470fd22fe9e185db70090cf5124697dc9b7015768181748d8976a04cde09239"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/lt/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/lt/thunderbird-78.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2294425187c5e5404af6cbca9b495902fb9bc05354eb6e3866b1e8366ea64e2d"; + sha256 = "ebd83f3fdf84aea2021fb318671bda5a08a8480b61eff689544566d7c3b4dc5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ms/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ms/thunderbird-78.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f21e85113e0f63d57f91c61e2830f1a9e721138cc00269d2fcc521d1c74666ff"; + sha256 = "0a1c461603c60e16ca911fc3bcca0d5d1b6ac29a1a5a63524decb360a960e047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nb-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nb-NO/thunderbird-78.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5b7982cf136c4d6120ffc7e40c65ddbb3495392181e38141ed80e3a67aeb1038"; + sha256 = "89ef517fe3d97a95306b34212c96e83a3afbd5fa5d9c3c3ca3b019c8b742d422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nl/thunderbird-78.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d9619e1ca19ef4c75eae31de3dcb6cc23146c4d1b98046473a3ebcfb3a610c52"; + sha256 = "1c0632de4a2a13fcebd6bf3dadcc6a19125f37b8b54d16a9b8fe57fcde6d84ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nn-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nn-NO/thunderbird-78.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e9d2a6955fb98c0dc492a5cb16977a1fc7cad778650dd601934bbc9f543b112e"; + sha256 = "684cfbc77db1f16ed8f271ce1f2700e6d6e486da47cb961bc09b53bda79e773d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pa-IN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pa-IN/thunderbird-78.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a3279bd605960f37ddc071b0f3d91726a9d911a311c13e9418013c5a1f7a5089"; + sha256 = "140010e3f1db608d1978f02fd28c0d9305dd4cfc2666b1689eca5e8b7aa64bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pl/thunderbird-78.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b22737a3a5b7c5ff3d8d22fd338490b0aff9016049bd7bf6cf6b25f15a027935"; + sha256 = "1bcb8a7d3936f22286fc6c1a5b0ed492cb345a22406eafedbe439c6737c7c422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-BR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-BR/thunderbird-78.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a6a18c8988db47d8163c79c465995aa0d3cd42da97bf2347b5be4d26e09e4628"; + sha256 = "41b8f99c1f73f16bd4ce4dbd76dea58209487c033a42b02412b237f98bf32903"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-PT/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-PT/thunderbird-78.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8717f41a166cf8e271086987196be9b88f585a70c30119ec15199291bea1819f"; + sha256 = "864524017e892942d31212acabd4b4b6425153b53cc622df728540d9b65237bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/rm/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/rm/thunderbird-78.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "02b1131751a82c66341e58b757c1f4e438e5ef8fa44a58b904790c0a5ec66b44"; + sha256 = "7933777df1f87786842e9615528e3aef3ae0a78ed4089dc5b8472f2d7b7d7b53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ro/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ro/thunderbird-78.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b7d82398f43112b5b9ab1907643cd8c39012246a1e9b74b3c4e37487df7d5bb1"; + sha256 = "59a2f5b81c777cfb705ec93c395d78b7d73a98cc632efcd980490817ddde06ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ru/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ru/thunderbird-78.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "155c7f4e678f6f3b91c07f2aa1313c08305a2c3166c199a9d8575d58c7448ffe"; + sha256 = "0954dd904e87505aa849db172351684c477f80395baf46b7ada5bcc6e0614c2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/si/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/si/thunderbird-78.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1af756f61e5c57c0d6018b3efc0072e55d7344c3a9fd343686bfb16773551503"; + sha256 = "c8d9c1384f98e8664e73e3b3790dc99aff51c9188116d6dfe8b88a238f09e524"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sk/thunderbird-78.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b06bc92b4ffdfe25a5003f3662ae168600a6ae8855b60353ad68de6a24067d4d"; + sha256 = "651932961b463312ed8757a26714383d34b5296620e0f957417c0d853e591d9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sl/thunderbird-78.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "19cc8710f257c229c4700b0a9deab471b1114a21f6cde0838f6a23e29faad6b1"; + sha256 = "073fc40fbdb1d45b0df5e8984216422e1b79f5740537d9deb11b05b11e9a6622"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sq/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sq/thunderbird-78.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "13c8c4893947a8178066ce7a767eea21e78b1989c94be4d573f03f98e7f43011"; + sha256 = "05cab7f922d15f839c73b8405bb1e2785e7f327a0f155595a40936b792852ad4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sr/thunderbird-78.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "68939bdf7b57320dfb608d6487b877baf0d801ef3aaf0da48becd87beb41aa89"; + sha256 = "26fd9a66bcc583acecaaaec732cefdc4909923fd5ca478f1c9705bf7ad787eff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sv-SE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sv-SE/thunderbird-78.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "36689c205cd7a6f212a5971fcc226631937232173f84cd0a2c40a87f95de001c"; + sha256 = "610a21baa667f8dce1e9cbd18dbf582af6a9a0c61e574dd509a2121536407e8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/th/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/th/thunderbird-78.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "392267ae08739866f14d2ddf0a853a47d18b2c99856bad369b567e7360d2aff9"; + sha256 = "520745d3bf636919963a014baa565efbc14a4d5e6d77ba8e1d0cd6b5a8b370cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/tr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/tr/thunderbird-78.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "15f45f9794ab34f79951a3b9ef990f25788c45eccd65dd1aab565d2908965c66"; + sha256 = "91ede7f8e4520586e35b0fefe616477dd9773c047b03c2c92b8264bcdf1131c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uk/thunderbird-78.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e9b1765f80620ca7ac534c91656345ecc3218ef8a606b2a8f48f3fc1c170cbc2"; + sha256 = "46bda6c807fb26e1ba698590912c9f427648e37f26b791697562d912249c519f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uz/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uz/thunderbird-78.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ed2258512e980e3c72b9130b2f5f839dbbff1df05aa5cb948f4519681491ca34"; + sha256 = "2029d7023605baf17c138031977bb2f36ddbacac605d00e93967b366c22df4ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/vi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/vi/thunderbird-78.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fa23f6d7c4b64776df71b5015743e8dd475cfa2a329370a92d36210711e0fd41"; + sha256 = "d345f774c89b276a5393b17522d5c7d60f8c661594334e0e6bb8ee06fa134a11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-CN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-CN/thunderbird-78.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "741bfc0c297a8dc9b5b4348f26886a12c75a81af11b0a6090094e6e21348e6f2"; + sha256 = "931d29a118de6eb1a73da6d36f919b2b98112b15e15ede6171b39c2b1f85b8b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-TW/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-TW/thunderbird-78.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cd4296eacde34b302c794beeaff0eb46bdf0f12c67aba98172133529506897af"; + sha256 = "59b7484654101e016819b998c903ac43bf43427a16d288f90cb1ec47efc2c61f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/af/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/af/thunderbird-78.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "300da8f92fff4e596e5d5604002fbb5732bda61d6f54c7f79a20e2fc268a7ce2"; + sha256 = "5fa7d8defeececcbf3794845695b3c4ff84e4269a26f3eaf709fb67e8549f164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ar/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ar/thunderbird-78.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e382faafeff426536f355e2a711dbfad7d86de3619a4d3a60868ecd8e9593b40"; + sha256 = "946887ca372e60fbe401c60d5a2758e49b3e771837d1c4e77073e6f7c569aa8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ast/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ast/thunderbird-78.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "45c3c612f072277e9dd83fbe22bd4cf9018d481a35ea25334d12f6826c879915"; + sha256 = "596e5665341f5c2d4551f216e8935bfc4c390666d01464b8c289386a2fd7c168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/be/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/be/thunderbird-78.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6e9fc38265fb9185915c9447ffb2d38e4e024446039704c8d45b91e152a38f86"; + sha256 = "e95af9c6be7a8e30b1589a9fe9b7568876dfa920f2d01d3e6c0f0e2ff4f34ea1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/bg/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/bg/thunderbird-78.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cc041a49ac017568b815a5e03a37031a6a17c25110b77d37bdb96c4d53d869d0"; + sha256 = "3c509d3861074c2a5d2da2f0d7f2d3d19a132745dae3ccbbb259e60419b70895"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/br/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/br/thunderbird-78.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3cd798a70f493ac5a75895be3db025bb3793836e21550c3ddea6b27f7dcf6d7e"; + sha256 = "9dd7e920583f0a3bd0eda01d569142f81f91061ee64703d43685ad277651f13f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ca/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ca/thunderbird-78.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "553ea37490cf180bbb1f0ebcd23d87e82456797ab9f5604ee862227b0854ef12"; + sha256 = "34026e985a3ee383104e4882d2e9b3025f84b7b36bb9c13233cd56c20b86d2ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cak/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cak/thunderbird-78.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "307e3234abbcee8a4aeeb46d1b8bb02c8642f1a2140dae9a2d6295bb32548742"; + sha256 = "c513f2bca776ac47ad40a656ad40eed682c1e1f37d3f8a41686868b10301d700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cs/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cs/thunderbird-78.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a08537b88425e2b813aed80b94d763d3c31ed9aeecf5b3b8e358c08233997ce5"; + sha256 = "499148f0871bab7ed8012cde000942815529cfe59d6dfe4a861a937f5bc861d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cy/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cy/thunderbird-78.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "36b75de4d73075026f256c6502caeebd35a89ca567cbc9fd6db461608b922be1"; + sha256 = "12e468d45538b0bf2f699bfdc7cc8f294852394175c57a7720ee217dcdd662ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/da/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/da/thunderbird-78.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7b81b6b22888c298cba1dba3c9786249ccb0aeba8b93d998a268e33ca249c7cb"; + sha256 = "e49296cbddfc1a5d27f0b85c9ae16c6fae12aea3fa386c458dc436964214944f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/de/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/de/thunderbird-78.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e5fa962eb83d4cc7dc2de5a2080a0d06fff4bb3b6e30c53dc979d7bfad8542f5"; + sha256 = "548c2d3dec0270e859a56e7d85ae08840ba6e1b858f1651e484f197d08840c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/dsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/dsb/thunderbird-78.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3745a7966cb96c79b49e0f8431d8b1e90cd5f01d7ce57eeb4ab3e5f80ddea26b"; + sha256 = "c130c0adc523580cf771c3a16cc0805563bd4a7f3b0990109972698b4d77f1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/el/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/el/thunderbird-78.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "037a51d7e44360a9748420ff584790abca6285d4bab8ee84414cfa602ec4c6aa"; + sha256 = "9c2b18946cde4e962191442587a7935658217bea530caa89f25f35c9f6c95034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-CA/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-CA/thunderbird-78.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a12288cf187b5e3075a23e420bc58ae90370c224b0c73b8706ef52c34705d6d3"; + sha256 = "3b1a6e1bcc6619221ba29df1af414d2ffe8fa935ec098e95210ba59b5c518239"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-GB/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-GB/thunderbird-78.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "dc3637519c9b40260217e5302dcf4174a66298f98b478d1a6caebe154b9b549f"; + sha256 = "7fc649ebd174fa6b534b075758ab6895c4c9a78b9bbbc06f135c26f7db24c282"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-US/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-US/thunderbird-78.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8e425ac9e0ac12d6142ef7a397dee969c87aa27fe21010a88d76a91f034328e8"; + sha256 = "b2a3bab7cde73523f8a516541170cf701db45e15bd46fbd3c200dfa056d0252e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-AR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-AR/thunderbird-78.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4da82ae1bed1ac257b878e5f8de6be6490131f15ee9db44de4aa10202a790e5d"; + sha256 = "af7d15f1776476ef7ea421bb91af9ab1dbffb0369fa12b9054478197b0d902b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-ES/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-ES/thunderbird-78.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "706ae91e5d36cc85f35833d5508ab7f3d0b8505491b5a86ca4447139b532b929"; + sha256 = "4ef89f9997094ff1c57ca7c630ee15fe443e214fb3c8b40253cebf8a83e9e5e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/et/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/et/thunderbird-78.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f74858d4b770245f3fa1d4f9ceebd274524dee73320fd4bdeb0e251a5d11c253"; + sha256 = "f70280ce83fcb31a73a5e7230a3e6ab7abaa776c969cc4d98953bee4529dfac1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/eu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/eu/thunderbird-78.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "aa02f9fb911a61da3183df79dc4d3760a5d6a259305da72932ff962cfe390d48"; + sha256 = "f34516a026d2adbab2cd3730d034abf326113f96f90bbee3889fb0e7cb1b41ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fa/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fa/thunderbird-78.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6b41612ea00a38e8bd4d1a796cbf5e3bb6d413cebcb473bcf9c5bde0d074cbfd"; + sha256 = "d004a5e3c3dcd5d2fcb204e9fafa943d1bf6ad1e6cf11aee88796a4f0149e44e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fi/thunderbird-78.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f64e3e2e266478c36c50cc19a161dd9496db6f668f2078bc182c1ddeedf3410c"; + sha256 = "b740e866a690e6a6ecd0e910f63822f546389d297f9c923f38983b5f78be255c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fr/thunderbird-78.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "eae396eae122ba4bc965fd8036264bf8bf88f52944558c7c1c0891a4254d04ee"; + sha256 = "eab1bdf57527a2fbe4f7de0a3314eba9966df5a2bb9a998c32a73fa372a7f85e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fy-NL/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fy-NL/thunderbird-78.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3163461706339a7bc34b8d7b83005b2ca962f6b6830b9da32c58aa7613c4efc4"; + sha256 = "bdd5b279a134e305002b87fb6b708e54132158d111b99bb100efbf2dcbcaa606"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ga-IE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ga-IE/thunderbird-78.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e2d1d31528e7b2773e898202adc2fefc3fac38843792d6ad57e093d3de6ee4c7"; + sha256 = "f76ad9888686fb09c33d2fc1f92849adf9102c265b302640d50f4b63803ab416"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gd/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gd/thunderbird-78.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "429160e98e24545f7890372eae1f2ef732b3a7ecd6529fde4ca247fbe251475a"; + sha256 = "54abde7a6b6f6864bd260b1d31dddf1d578b9f9c2b9f928c2bdcbaa141d14163"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gl/thunderbird-78.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "215c0f6f3409200db5c25cf26c2f305917cc7b9b10b734d22be2bea7d4b34443"; + sha256 = "6d10c320adb9880ce31404034a501f3d349227d851120c2ada5c4edd6b7f4fe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/he/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/he/thunderbird-78.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9b13364552d3afdc4fbdd2683d70b32b3f3c91633528c8b3684c7d9060431818"; + sha256 = "d635c4b9203d03b9bd78b81e507074ba5e6b8c4b066ea996f32d353b557250a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hr/thunderbird-78.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "92a043ec615e0f92ff301df498023a31e5a32fdbcb01be0e95ee91917ad88112"; + sha256 = "0a50d18b9c53ac5d325aa343cf7114307e90d98e2392f0474ea469508c329cb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hsb/thunderbird-78.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a73b9619b2da033be6913c4342fe23886a9ba6710a65496878490e3f6c016901"; + sha256 = "34b1f83011ea6297e11d55a126f8fc8c87fd560e2144a4e64f4b377177ddd0c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hu/thunderbird-78.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b1e938c785946d91e5759cc5f34d75fbbbf421b4f8b5dbe1eee9158fc277198d"; + sha256 = "6a4f2e4f026efabe45f45bdf691c84e1c393ab223aee045ec8e21092158cc4f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hy-AM/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hy-AM/thunderbird-78.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7ad07de9dc366057b004893f3d77900dcd4cb6532127a60b07b343752b96ef96"; + sha256 = "dd8762372b789ee7bb6d11994f8216cfb9fcf493d6dd27c3b292f29675e9559a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/id/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/id/thunderbird-78.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "51b239fc75b2b0769faab37ba8c03973dc9a275eb8730193100f5d3cfd5b1621"; + sha256 = "cb811617137d3b57160e64af7b901329b0b6df46f0525ceed04de9a5aaab8bf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/is/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/is/thunderbird-78.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "69299e2873cd042e64146faa329f72039c079645014270acf08a2a0357a7025e"; + sha256 = "e0d7e51f390aa0af3dbbb2505fdc6eb5a3560c97b031fb67e14bd4af57868bbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/it/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/it/thunderbird-78.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "dfc2f83084ea80483a258e2ef879bcdd31256c55920f2d86fa170dd0ba432091"; + sha256 = "9c88972bd6ee1ab726e16a6eaba32aa78e3d8475506d3394254337eedc47a9fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ja/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ja/thunderbird-78.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7b1cbca9399856b3c413e7277617c808b3f670c6470e3c243c6fde9aa035d563"; + sha256 = "0fad6c18b92fcec16684bd9905dd0a3b6bcbdf8c2bfd6d271baea48849a0fa8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ka/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ka/thunderbird-78.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2ab93932f7e567b3e9ebae4fd4c1d032917c656408b5b74cfd51f0e35bf14af6"; + sha256 = "75c454ca20ea0667caab5223c55a210f68165fc72b1493fc8afc76881cfa823c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kab/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kab/thunderbird-78.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6bf87d821095326487e4822e6c373b4c5ec9ebd9dfcee511c4b85031ae7caa2"; + sha256 = "8a928f4b5fa7d0374e361a47857c85a34d271d2cbbc760332a6e588e3361fa62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kk/thunderbird-78.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "06cd2284afca05ebfb16ebabd128d66f8a45751fc7a5c1f4ef39a2753dc8e88c"; + sha256 = "18b851bc36799910965c3eb14a8c9a57f29dde91c570e25a8f7f172a8bea7771"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ko/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ko/thunderbird-78.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bbbb6e7c1c444168ab9b7c3797ca1bffa3c885980e2f215c914780a1ae5d1871"; + sha256 = "108142a8cbd48dfe07626f4672178a35c5f253c84efcb924c7bd4c1531f6ab38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/lt/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/lt/thunderbird-78.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b64e1a057623a85841137b7aae1832d4757766ac1d37452453a0130582043474"; + sha256 = "5c65eb6b01e8fe82db99390ae889870cad107d4307e02b04d5f9390eee81f098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ms/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ms/thunderbird-78.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "eaeb81daf522f0282d57c5b77f54b736c9a723c3a2ad0ddbc2501683cd3dff63"; + sha256 = "78ce19d598b2fa59ecea9d6fd4e67e93b2ba00b2e9569579f687700486e80c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nb-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nb-NO/thunderbird-78.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5db8562f43efcfff4f950c1e2f6837d8ceb9e73543e7c7dd75e695709defbc61"; + sha256 = "e8a1f9f4666a3ee423c5541c61fccfe448989d0d7d4840dd36bbc0826cb96537"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nl/thunderbird-78.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "77ea8f460f82d05369ff110b85c4b995623caa7b62e38ebb5d8e0f7ecbfeabd6"; + sha256 = "f9292bdc80157d2e2076b7be81af66813aeabc722356c3e514ae18638720192b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nn-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nn-NO/thunderbird-78.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "83d2439498fca42c3b4095515c9359f89500bd11029fa58ba19e6058d3b696dc"; + sha256 = "956b0c99d47845c9b0a1c7d101f576e5b4a7a514893da938d36616db9f5bfce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pa-IN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pa-IN/thunderbird-78.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "805947c3014c660ec66d5382dce6a733efe196b45b445a7d2467e209ce889727"; + sha256 = "50cdbca944f98eef40479a9070b58729f7f743bda55925c74b6410c163ac784f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pl/thunderbird-78.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a7eade7fc0b68361e0a8d6a1cde62d7253f938dc0e93fda56d0ed296304b162f"; + sha256 = "fe2de7bba7b057022e02f040bb65ddfababb39999fcc573e65cd2bc0c848cf41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-BR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-BR/thunderbird-78.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7e5a89cc9460ef65f1b5141d7bbbfd39f2d38aac599b50c8f57b39ff2218f7db"; + sha256 = "6b219f0cb715f2d5a3fa72f34b079b401d850f571a9b2ad21c97871a5b83b9af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-PT/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-PT/thunderbird-78.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "809945bd2390457d2ffc1f232e120aa68c0e8232a69d14b6cd1207ed4fc62bae"; + sha256 = "deca0d48ba8bb002444c3649514a2d7e39a698c75382ab53df080ff2c484eee4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/rm/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/rm/thunderbird-78.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "82849eb2a8db39d99cc1fb514d0a4a78c1380fa5ad75434d0969860b5fa0c5f3"; + sha256 = "3799e8dbdf5edd6be276ce4634418c1bbc52862a5366d43460e1bf727f11c27d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ro/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ro/thunderbird-78.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c9abc67c0612e3da4d9519d93cd87718898e6465f8275cae9edd7127f3e9c964"; + sha256 = "a599d873eeb1ecff1c7df37ff89b9e71527192d65c3b0e593d87b0c68bc28062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ru/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ru/thunderbird-78.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "77c7e1f174c5540bc683ae71653392e24dd70737f6a6f9298c746cdbbb1f2e3d"; + sha256 = "b488c44be9c1acd9715f9b872e61f1c8f4a0cedcdda6d291f8ad165013b5f06b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/si/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/si/thunderbird-78.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d45b2a6492fd732652ac4d160b74f612261c33dee7f8f7c21bb1a8e0d45d72a1"; + sha256 = "b60c002886df2ab941fb5c445d6b33d31de8a2d9feb15523c2af561da7ab09d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sk/thunderbird-78.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cb4e2492618d70b67b2deb803ed5d02a2851dbdad26098c305c804017d27290e"; + sha256 = "0c59cc63c01ddf7564331a6a9f2ba89c5ab263c227f517c9fa066a3c7f8e8a55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sl/thunderbird-78.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b731685c0de6ba0350259f84a2b4c597849459bbe5cd632796a09370d2697ab0"; + sha256 = "2039f31a243f43553c893232d79a27cbc249bf73f083ed05b2914333dea6c5bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sq/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sq/thunderbird-78.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4c2013d3b64cceec11bbf58cfd3dd306653410ffde95ffdc649c3ffd2390e542"; + sha256 = "f46914a1a18d989c385f29cd34f95f409f5d56d601b279d8106aa8f224a61c26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sr/thunderbird-78.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ad0fbf13c2e0aea8b5ba97516d0ec53bf2fd4868155e66df5297cc95a27246db"; + sha256 = "a72776da8c85de9f970f1a55ef2f56d2e9fd3fd73b7e6d39761ab6bca7066980"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sv-SE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sv-SE/thunderbird-78.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4af730894f076b9a48afd5a202f7e78a11f050a11e5e2011726370e1b14ce70f"; + sha256 = "466378b9542c4a8550fc6e7143fe56e04e5ae15a20bc6ddec5da4eea231fb928"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/th/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/th/thunderbird-78.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "901c62b2adabd67d98314a18782638c8f7e9f55d8ebcb0686b2c7355696f71f8"; + sha256 = "7943c3257f4ef6a842008b0fd6171f87e99043263ccaf4666850ccebec28725f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/tr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/tr/thunderbird-78.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ac7794552303525a4b72dac166624c06b7392fbdb063144a793a39d4ad6fbac0"; + sha256 = "a5120107b8fc5418c49d70cf61730ea2b8e833d21d8e6b797d64d2637803709b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uk/thunderbird-78.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "890373ce0813c7cd4cf8eec39af6a362d1e88c4bf967ccb3482b7dbb806dd228"; + sha256 = "a85b53cd72b313e49ab439f9b1900c4e8f7610be085d757bda4123f5e9293cd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uz/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uz/thunderbird-78.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0153af7da918e0b3a9d50e2970f946dcc3ca2ba0b92782f82917153a2fb850b5"; + sha256 = "7dcce5d00f6e83b756f3b83067fcf78d00240cb540815e3e63d40302272d5e4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/vi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/vi/thunderbird-78.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "55ba1938bc0b894f92bb17435b0bbf19e15da8163dfcfb377b87db02aff8e564"; + sha256 = "4b94684748f81444d8a8beeac54053673bb4705b6284f8b5d86a5f03fb9a2ce8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-CN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-CN/thunderbird-78.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "921619f82d094b35d74dd54071191ce00487aeb90190e2d2b6f229610e016878"; + sha256 = "346222badaa7b34a7e21f28045c68be815d187a5d34432446b7ffb8b959fea0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-TW/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-TW/thunderbird-78.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "28a03fc23a2961bdb1ea3cf1fa08be57302627071f4dc096eb9aca58124e5058"; + sha256 = "deecd348a6c260bc50b1e112966d736ee4bc211a1f42f791f37b10a69f7c1c2a"; } ]; } From 5e20f9ceafa6f45d05589fafcfea068e9fc99764 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 24 Jul 2020 12:14:00 +0900 Subject: [PATCH 026/214] thunderbird: 78.0 -> 78.0.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e161b5bf5b0..eb55976e2e9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.0"; + version = "78.0.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0l5cgd95lxwny365x85pih71z7b9zgmix3wc8916k1xj5p46szr20ylf7b20gwwl7kajm4mrxjdldzmfvc9qzdyss76za5r76c25wwr"; + "1lh0rsibkd3m6fk4mp07payn5srambslqqlsqkg6mc11rbaim0b4m5256iq670r614nb8w61yc8d0khhpyqgrvlxd4zgdv6s3n17d7w"; }; nativeBuildInputs = [ From 379d9782346942469035d2b011f266f4816da32e Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 23:55:51 +0900 Subject: [PATCH 027/214] thunderbird: make 68 as the default --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe84f562c6..91c4474dc87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22782,7 +22782,7 @@ in thonny = callPackage ../applications/editors/thonny { }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { + thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; icu = icu67; @@ -22790,7 +22790,7 @@ in gtk3Support = true; }; - thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; nss = nss_3_44; @@ -22799,9 +22799,9 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; + thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; - thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; ticpp = callPackage ../development/libraries/ticpp { }; From cfaa4602676cebaff93b4cec53d9f529b37de73f Mon Sep 17 00:00:00 2001 From: Sam Hofius Date: Wed, 29 Jul 2020 00:50:37 -0400 Subject: [PATCH 028/214] keybase-gui: 5.4.2 -> 5.5.1 --- pkgs/tools/security/keybase/gui.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index b745b63ca9d..aabe1fcebbd 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,17 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20200424214931.7b0bbf1e3c"; + versionSuffix = "20200527202541.39ca0071e5"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.4.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.5.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { + url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "06iksmrr959mlzxc3nwd70apmvhij1xarxvvflys5qa31vravizs"; + sha256 = "1n54a86491aqazqa4rgljbji638nj83ciibqxq46sa2m1php9dfd"; }; nativeBuildInputs = [ From 70ba31727b8e6ac8fa7183be0f3f7772ae344a50 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 Jul 2020 13:05:46 -0500 Subject: [PATCH 029/214] spleen: 1.8.0 -> 1.8.1 https://github.com/fcambus/spleen/blob/1.8.1/ChangeLog --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index ace317bf35c..bfc47b70075 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.8.0"; + version = "1.8.1"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "0vaawnav4k2gpwsgxn5rmkd8wyxnwsrbd0ksp749sb7rwfd3nphc"; + sha256 = "0m70gz1ywrhw8xfff9bgx1wv52z9fibdsmjcwhjhpd826zbz05w8"; meta = with lib; { description = "Monospaced bitmap fonts"; From f46c07bbbdbe030cf67034ec6169ba887d119ce2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 26 May 2020 17:15:55 -0500 Subject: [PATCH 030/214] bloaty: 1.0 -> 1.1 --- pkgs/development/tools/bloaty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 8d3472a4a38..28df0aaa696 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; pname = "bloaty"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; rev = "v${version}"; - sha256 = "0fck83zyh9bwlwdk3fkhv3337g9nii6rzf96gyghmnrsp9rzxs3l"; + sha256 = "1556gb8gb8jwf5mwxppcqz3mp269b5jhd51kj341iqkbn27zzngk"; fetchSubmodules = true; }; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/bloaty"; license = licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.dtzWill ]; + maintainers = with maintainers; [ dtzWill ]; }; } From 8565fc75a1c141dc55c17ef64eaa2910e72b2d04 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 29 Jul 2020 01:16:58 -0500 Subject: [PATCH 031/214] powertop: 2.10 -> 2.13 https://01.org/powertop/downloads/powertop-v2.13 https://01.org/powertop/downloads/powertop-v2.12 --- pkgs/os-specific/linux/powertop/default.nix | 11 ++++------- .../linux/powertop/fix-vertical-scrolling.patch | 13 ------------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index bcac7ab63c0..4bf318d743e 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powertop"; - version = "2.10"; + version = "2.13"; src = fetchurl { - url = "https://01.org/sites/default/files/downloads/${pname}-v${version}.tar.gz"; - sha256 = "0xaazqccyd42v2q532dxx40nqhb9sfsa6cyx8641rl57mfg4bdyk"; + url = "https://01.org/sites/default/files/downloads/${pname}-${version}.tar.gz"; + sha256 = "0y1ixw8v17fdb1ima0zshrd0rh4zxdh10r93nrrvq6d4lhn9jpx6"; }; outputs = [ "out" "man" ]; @@ -20,10 +20,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; } - ) ++ [ - # Fix vertical scrolling, see: https://lists.01.org/pipermail/powertop/2019-March/002046.html - ./fix-vertical-scrolling.patch - ]; + ); postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" diff --git a/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch b/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch deleted file mode 100644 index b9b3fdbaf34..00000000000 --- a/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/display.cpp b/src/display.cpp -index 07227c5..7b3a7a2 100644 ---- a/src/display.cpp -+++ b/src/display.cpp -@@ -244,7 +244,7 @@ void cursor_down(void) - w = tab_windows[tab_names[current_tab]]; - if (w) { - if (w->ypad_pos < 1000) { -- if (tab_names[current_tab] == "Tunables" || "WakeUp") { -+ if (tab_names[current_tab] == "Tunables" || tab_names[current_tab] == "WakeUp") { - if ((w->cursor_pos + 7) >= LINES) { - prefresh(w->win, ++w->ypad_pos, w->xpad_pos, - 1, 0, LINES - 3, COLS - 1); From b657c899d6fd5a09c3619302a20b63683a66f0f2 Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Wed, 29 Jul 2020 10:33:58 +0200 Subject: [PATCH 032/214] busybox: Use fetchzip instead of fetchTarball to get the dispatcher script --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index f1b008b2103..60b4a582d52 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl +{ stdenv, lib, buildPackages, fetchurl, fetchzip , enableStatic ? false , enableMinimal ? false # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: @@ -33,7 +33,7 @@ let ''; debianName = "busybox_1.30.1-5"; - debianTarball = fetchTarball { + debianTarball = fetchzip { url = "http://deb.debian.org/debian/pool/main/b/busybox/${debianName}.debian.tar.xz"; sha256 = "03m4rvs2pd0hj0mdkdm3r4m1gh0bgwr0cvnqds297xnkfi5s01nx"; }; From 966d74e87059bb27a8ccba9527c08548d80f1ee0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Jul 2020 04:20:00 -0500 Subject: [PATCH 033/214] caddy2: 2.0.0 -> 2.1.1 --- pkgs/servers/caddy/v2.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index c4f12e58b0f..1ed6fcd2d52 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.0.0"; + version = "2.1.1"; subPackages = [ "cmd/caddy" ]; @@ -10,9 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; + sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; }; - vendorSha256 = "004hpjxpp18f71vy5v5ky0g07a8d5xh5qwl5b4bbx34hpf8yxs81"; + + vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; From 0f23e0b661d26199118f18d65cca9ab1d2f1c64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Wed, 29 Jul 2020 11:45:08 +0200 Subject: [PATCH 034/214] istioctl: bundle charts Fixes #94163 --- .../applications/networking/cluster/istioctl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 90ce1d82f49..60dc2119ac5 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata }: buildGoModule rec { pname = "istioctl"; @@ -12,6 +12,13 @@ buildGoModule rec { }; vendorSha256 = "15l9z2a8p46jvmkl0vvm6s196mlics0qgmpm3yq3bn6cqnybdsij"; + nativeBuildInputs = [ go-bindata ]; + + preBuild = '' + patchShebangs operator/scripts + operator/scripts/create_assets_gen.sh + ''; + subPackages = [ "istioctl/cmd/istioctl" ]; meta = with lib; { From 76856fc3334edfc59c3b9652b92f1dbaea3de1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Wed, 29 Jul 2020 13:50:59 +0200 Subject: [PATCH 035/214] istioctl: bundle release metadata This is required for `istioctl version` to return the correct info, and for `istioctl install` to default to the correct Docker images. --- .../networking/cluster/istioctl/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 60dc2119ac5..e4197a50ef1 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -14,11 +14,22 @@ buildGoModule rec { nativeBuildInputs = [ go-bindata ]; + # Bundle charts preBuild = '' patchShebangs operator/scripts operator/scripts/create_assets_gen.sh ''; + # Bundle release metadata + buildFlagsArray = let + attrs = [ + "istio.io/pkg/version.buildVersion=${version}" + "istio.io/pkg/version.buildStatus=Nix" + "istio.io/pkg/version.buildTag=${version}" + "istio.io/pkg/version.buildHub=docker.io/istio" + ]; + in ["-ldflags=${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + subPackages = [ "istioctl/cmd/istioctl" ]; meta = with lib; { From c2618fc055b2ab28fb465fb43af31a3e8fee7cb8 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Tue, 28 Jul 2020 21:39:00 -0500 Subject: [PATCH 036/214] cfssl: 1.3.2 -> 1.4.1 --- pkgs/tools/security/cfssl/default.nix | 59 +++++++++++++++++++-------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 6d4238de700..eabb38406da 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,34 +1,59 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +let + # Embed static files in the built-in webserver + rice = buildGoModule rec { + name = "rice"; + src = fetchFromGitHub { + owner = "GeertJohan"; + repo = "go.rice"; + rev = "v1.0.0"; + sha256 = "0m1pkqnx9glf3mlx5jdaby9yxccbl02jpjgpi4m7x1hb4s2gn6vx"; + }; + vendorSha256 = "0cb5phyl2zm1xnkhvisv0lzgknsi93yzmpayg30w7jc6z4icwnw7"; + subPackages = [ "rice" ]; + }; +in +buildGoModule rec { pname = "cfssl"; - version = "1.3.2"; - - goPackagePath = "github.com/cloudflare/cfssl"; + version = "1.4.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; - rev = version; - sha256 = "0j2gz2vl2pf7ir7sc7jrwmjnr67hk4qhxw09cjx132jbk337jc9x"; + rev = "v${version}"; + sha256 = "07qacg95mbh94fv64y577zyr4vk986syf8h5l8lbcmpr0zcfk0pd"; }; - # The following patch ensures that the auth-key decoder doesn't break, - # if the auth-key file contains leading or trailing whitespaces. - # https://github.com/cloudflare/cfssl/pull/923 is merged - # remove patch when it becomes part of a release. - patches = [ - (fetchpatch { - url = "https://github.com/cloudflare/cfssl/commit/7e13f60773c96644db9dd8d342d42fe3a4d26f36.patch"; - sha256 = "1z2v2i8yj7qpj8zj5f2q739nhrr9s59jwzfzk52wfgssl4vv5mn5"; - }) + subPackages = [ + "cmd/cfssl" + "cmd/cfssljson" + "cmd/cfssl-bundle" + "cmd/cfssl-certinfo" + "cmd/cfssl-newkey" + "cmd/cfssl-scan" + "cmd/multirootca" + "cmd/mkbundle" ]; + vendorSha256 = null; + + preBuild = '' + pushd cli/serve + ${rice}/bin/rice embed-go + popd + ''; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/cloudflare/cfssl/cli/version.version=v${version} + ''; + meta = with stdenv.lib; { homepage = "https://cfssl.org/"; description = "Cloudflare's PKI and TLS toolkit"; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm ]; - platforms = platforms.all; }; } From afb46594a4bf90b9c0823a1007b248f836e295da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 29 Jul 2020 21:13:07 +0000 Subject: [PATCH 037/214] python37Packages.ftfy: 5.7 -> 5.8 --- pkgs/development/python-modules/ftfy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index bb421d746d4..0f0dd3e76c4 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.7"; + version = "5.8"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1j143kfpnskksfzs0pnr37kwph6m7c71p8gdldv26x2b7arwiyb7"; + sha256 = "081p5z20dirrf1i3nshylc31qd5mbxibjc7gzj8x4isbiizpdisi"; }; propagatedBuildInputs = [ From 04dabea4a909d466f19d471f81c04060d3bfcbf7 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 22:54:55 -0400 Subject: [PATCH 038/214] go-ethereum: use vend to simplify package --- pkgs/applications/blockchains/go-ethereum.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 421acfef6ba..0edeccf4003 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -11,21 +11,8 @@ buildGoModule rec { sha256 = "0nkzwmrzk0m9662cr18h5i54v07mw8v3fh0csvqx8n50z5fcvb7b"; }; - usb = fetchFromGitHub { - owner = "karalabe"; - repo = "usb"; - rev = "911d15fe12a9c411cf5d0dd5635231c759399bed"; - sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; - }; - - vendorSha256 = "13wh6r9zi5qw72xkbzy3mcgn7lv9l981x4lniypjbnkwhq2dj5iz"; - - overrideModAttrs = (_: { - postBuild = '' - cp -r --reflink=auto ${usb}/libusb vendor/github.com/karalabe/usb - cp -r --reflink=auto ${usb}/hidapi vendor/github.com/karalabe/usb - ''; - }); + runVend = true; + vendorSha256 = "1744df059bjksvih4653nnvb4kb1xvzdhypd0nnz36m1wrihqssv"; subPackages = [ "cmd/abidump" From 68248a9d1377951815b75e8695d07d81193eff18 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 22:56:24 -0400 Subject: [PATCH 039/214] hugo: use vend to simplify package --- pkgs/applications/misc/hugo/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 3f0f8946c29..b08d2fe7914 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -11,21 +11,8 @@ buildGoModule rec { sha256 = "0rikr4yrjvmrv8smvr8jdbcjqwf61y369wn875iywrj63pyr74r9"; }; - golibsass = fetchFromGitHub { - owner = "bep"; - repo = "golibsass"; - rev = "8a04397f0baba474190a9f58019ff499ec43057a"; - sha256 = "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"; - }; - - overrideModAttrs = (_: { - postBuild = '' - rm -rf vendor/github.com/bep/golibsass/ - cp -r --reflink=auto ${golibsass} vendor/github.com/bep/golibsass - ''; - }); - - vendorSha256 = "031k8bvca1pb1naw922vg5h95gnwp76dii1cjcs0b1qj93isdibk"; + vendorSha256 = "17xn6bdy942g6nx5xky41ixmd5kaz68chj3rb02ibpyraamx04nm"; + runVend = true; buildFlags = [ "-tags" "extended" ]; From 298c6a7df84703271386e6738de471993d2c7406 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 22:56:51 -0400 Subject: [PATCH 040/214] blockbook: use vend to simplify package --- pkgs/servers/blockbook/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 96feac60026..224b1490121 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -23,7 +23,8 @@ buildGoModule rec { sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; }; - vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; + runVend = true; + vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b"; nativeBuildInputs = [ packr pkg-config ]; @@ -36,20 +37,6 @@ buildGoModule rec { -X github.com/trezor/blockbook/common.buildDate=unknown ''; - goethereum = fetchFromGitHub { - owner = "ethereum"; - repo = "go-ethereum"; - rev = "v1.8.20"; - sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0"; - }; - - overrideModAttrs = (_: { - postBuild = '' - rm -r vendor/github.com/ethereum/go-ethereum - cp -r --reflink=auto ${goethereum} vendor/github.com/ethereum/go-ethereum - ''; - }); - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' From 4561583acfc6c68ee723c530f89292c2449364c7 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 22:57:19 -0400 Subject: [PATCH 041/214] saml2aws: use vend to simplify package --- pkgs/tools/security/saml2aws/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 144ac3a95c8..d34e9e5da10 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -11,20 +11,8 @@ buildGoModule rec { sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; }; - hid = fetchFromGitHub { - owner = "karalabe"; - repo = "hid"; - rev = "9c14560f9ee858c43f40b5cd01392b167aacf4e8"; - sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; - }; - - vendorSha256 = "0f81nrg8v3xh2hcx7g77p3ahr4gyj042bwr1knf2phpahgz9n9rn"; - overrideModAttrs = (_: { - postBuild = '' - cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid - cp -r --reflink=auto ${hid}/hidapi vendor/github.com/karalabe/hid - ''; - }); + runVend = true; + vendorSha256 = "1kzihyx44sx6php4z58fzy6c3g0y713939yzxpgk3n03snn2x8sf"; subPackages = [ "." "cmd/saml2aws" ]; @@ -39,4 +27,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; -} \ No newline at end of file +} From 3e921959232883ec6d3a8bb00e8112364e1dc917 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 22 Jul 2020 12:34:48 -0400 Subject: [PATCH 042/214] aerc: update to use runvend --- .../networking/mailreaders/aerc/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 34adb18c4ce..12b6d8118db 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -13,21 +13,8 @@ buildGoModule rec { sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk"; }; - libvterm = fetchFromGitHub { - owner = "ddevault"; - repo = "go-libvterm"; - rev = "b7d861da381071e5d3701e428528d1bfe276e78f"; - sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6"; - }; - - vendorSha256 = "1rqn36510m0yb7k4bvq2hgirr3z8a2h5xa7cq5mb84xsmhvf0g69"; - - overrideModAttrs = (_: { - postBuild = '' - cp -r --reflink=auto ${libvterm}/libvterm vendor/github.com/ddevault/go-libvterm - cp -r --reflink=auto ${libvterm}/encoding vendor/github.com/ddevault/go-libvterm - ''; - }); + runVend = true; + vendorSha256 = "0avdvbhv1jlisiicpi5vshz28a2p2fgnlrag9zngzglcrbhdd1rn"; nativeBuildInputs = [ scdoc From 96908e43411c3146365de71e006303c5d70a76e3 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 22 Jul 2020 12:35:01 -0400 Subject: [PATCH 043/214] mautrix-whatsapp: update to use runVend --- pkgs/servers/mautrix-whatsapp/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 8b4d9ea5539..73db7b96b33 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -13,19 +13,8 @@ buildGoModule rec { buildInputs = [ olm ]; - vendorSha256 = "0ixfawfavv5r1d01d4gmj87vf5vv6p3f7kv4rkhfv48ys0j0437a"; - - overrideModAttrs = _: { - postBuild = '' - rm -r vendor/github.com/chai2010/webp - cp -r --reflink=auto ${fetchFromGitHub { - owner = "chai2010"; - repo = "webp"; - rev = "3da79ec3d682694d42bfd211db18fc1343c07cd7"; - sha256 = "0gh3g52vz8na153mjmxkl80g3dvrcjw77xpjs1c02vagpj9jyw46"; - }} vendor/github.com/chai2010/webp - ''; - }; + vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6"; + runVend = true; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; From b9f742f541199e9d8bae2aa43fd164c191dec92b Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 Jul 2020 03:02:58 +0300 Subject: [PATCH 044/214] maintainer: add artturin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 69bebcd91d5..da38be3dae8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -833,6 +833,12 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + artturin = { + email = "artturin@artturin.com"; + github = "artturin"; + githubId = 56650223; + name = "Artturi N"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; From 1f67443319e231ea70d1a5d7e4b8b0e0b67ea4d9 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 29 Jul 2020 21:54:49 -0700 Subject: [PATCH 045/214] cmake-language-server: fix test error on macOS This should fix Hydra's Darwin test failures for this package. See https://github.com/regen100/cmake-language-server/pull/24 --- pkgs/development/tools/cmake-language-server/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index a01c0372ded..4dc1375df04 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonApplication, fetchFromGitHub , poetry, pygls, pyparsing , cmake, pytest, pytest-datadir +, fetchpatch }: buildPythonApplication rec { @@ -15,6 +16,12 @@ buildPythonApplication rec { sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837"; }; + # can be removed after v0.1.2 + patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://github.com/regen100/cmake-language-server/pull/24.patch"; + sha256 = "1id8wpmyc7djyqasb5g9z9i3jipcdb4sirn4cpx2v8xmdn9khdnz"; + }); + postPatch = '' substituteInPlace pyproject.toml \ --replace 'pygls = "^0.8.1"' 'pygls = "^0.9.0"' From 46ea069d9eea2e9a00240ece3658736e84304ba2 Mon Sep 17 00:00:00 2001 From: Michael Faille Date: Thu, 30 Jul 2020 02:03:13 -0400 Subject: [PATCH 046/214] dhall: init at 1.0.8 on all packages --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8344ae40319..09080cf38a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9631,6 +9631,8 @@ in dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; dhallPackages = callPackages ./dhall-packages.nix { }; From 2598f0e60718eb7b2b1716dded6a12c442b23f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 30 Jul 2020 10:26:41 +0200 Subject: [PATCH 047/214] oneDNN: disable tests to avoid illegal instructions oneDNN tests fail on some Hydra builders because they do not support SSE 4.2. Unfortunately, oneDNN does not seem to work without SSE 4.2, see issues #93692 and #93747. --- pkgs/development/libraries/oneDNN/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 80daf83de83..865a0ab7724 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -18,21 +18,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; - - cmakeFlags = [ - # oneDNN compiles with -msse4.1 by default, but not all x86_64 - # CPUs support SSE 4.1. - "-DDNNL_ARCH_OPT_FLAGS=" - ]; + # Tests fail on some Hydra builders, because they do not support SSE4.2. + doCheck = false; # The test driver doesn't add an RPath to the build libdir preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src - '' + lib.optionalString stdenv.isx86_64 '' - # Use baseline SIMD in case CPU features get misdetected. - export DNNL_MAX_CPU_ISA=SSE41 ''; # The cmake install gets tripped up and installs a nix tree into $out, in From 79246a95c40f7cda3f4bca716456b9c475448d48 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Jul 2020 04:20:00 -0500 Subject: [PATCH 048/214] prometheus: 2.19.2 -> 2.19.3 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index d4622a21f6c..0b17f7801b6 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.19.2"; + version = "2.19.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "119csghjmw4lphpnnhaxwimmir5bn455g92rb40j3y9pyv0hlfsh"; + sha256 = "0dlvhbxahdq0x0qa0gv1rc4y5dp6lx44w280rbm9279nv1nplffh"; }; webui = mkYarnPackage { From a4a58ef4c7b079d66a3d9ba5e7366bfc0948fe18 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 30 Jul 2020 14:55:26 +0200 Subject: [PATCH 049/214] jc: 1.11.8 -> 1.13.1 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 027ae8000b9..ae1cc51eab1 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.8"; + version = "1.13.1"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0rkckbgm04ql4r48wjgljfiqvsz36n99yqcpcyna8lvlm8h4nmwa"; + sha256 = "1q5s81izfvxlifa0kzj2qih03d4d0gf7jxkilrcv40rsag5jfb16"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From 0e760d874f0c7ac9b9a834b98513958987982ad1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jul 2020 13:18:53 +0000 Subject: [PATCH 050/214] enlightenment.terminology: 1.7.0 -> 1.8.0 --- pkgs/desktops/enlightenment/terminology.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 3eff9292cb6..72aab761754 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "11qan2k6w94cglysh95yxkbv6hw9x15ri927hkiy3k0hbmpbrxc8"; + sha256 = "0pvn8mdzxlx7181xdha32fbr0w8xl7hsnb3hfxr5099g841v1xf6"; }; nativeBuildInputs = [ From 9f86685cc76991e983bf126a37e3f7f319247ba8 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 30 Jul 2020 16:20:50 +0200 Subject: [PATCH 051/214] dockerTools: fix permissions on /nix/store --- pkgs/build-support/docker/stream_layered_image.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 8ffd336fce4..ffb6ba0ade4 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -74,6 +74,10 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): ti.gname = "root" return filter(ti) + def nix_root(ti): + ti.mode = 0o0555 # r-xr-xr-x + return ti + def dir(path): ti = tarfile.TarInfo(path) ti.type = tarfile.DIRTYPE @@ -84,8 +88,8 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): # these directories first when building layer tarballs. But # we don't need them on the customisation layer. if add_nix: - tar.addfile(apply_filters(dir("/nix"))) - tar.addfile(apply_filters(dir("/nix/store"))) + tar.addfile(apply_filters(nix_root(dir("/nix")))) + tar.addfile(apply_filters(nix_root(dir("/nix/store")))) for path in paths: path = pathlib.Path(path) From 406509dcae055cf2cedc17168e07eef273cf41ed Mon Sep 17 00:00:00 2001 From: Dominic Delabruere Date: Tue, 28 Jul 2020 16:21:44 -0400 Subject: [PATCH 052/214] inform6: init at 6.34-6.12.2 nixpkgs already has Inform 7, which is a lovely design system for creating interactive fiction (text adventures) using a natural language compiler and a rich IDE. However, underlying Inform 7 is a C-like language, Inform 6, which has a much simpler toolchain and its own compiler and standard libraries, which I have packaged for nix here. --- maintainers/maintainer-list.nix | 6 ++++ .../development/compilers/inform6/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/compilers/inform6/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e5be38377e..7aee506906f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1918,6 +1918,12 @@ githubId = 14032; name = "Daniel Brockman"; }; + ddelabru = { + email = "ddelabru@redhat.com"; + github = "ddelabru"; + githubId = 39909293; + name = "Dominic Delabruere"; + }; dduan = { email = "daniel@duan.ca"; github = "dduan"; diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix new file mode 100644 index 00000000000..1d339a2b14b --- /dev/null +++ b/pkgs/development/compilers/inform6/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "inform6"; + version = "6.34-6.12.2"; + + src = fetchurl { + url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; + sha256 = "c149f143f2c29a4cb071e578afef8097647cc9e823f7fcfab518ac321d9d259f"; + }; + + buildInputs = [ perl ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Interactive fiction compiler and libraries"; + longDescription = '' + Inform 6 is a C-like programming language for writing interactive fiction + (text adventure) games. + ''; + homepage = "https://gitlab.com/DavidGriffith/inform6unix"; + changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS"; + license = licenses.artistic2; + maintainers = with stdenv.lib.maintainers; [ ddelabru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fe2683ab6..6477b275432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4370,6 +4370,8 @@ in inetutils = callPackage ../tools/networking/inetutils { }; + inform6 = callPackage ../development/compilers/inform6 { }; + inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; From 835d36186d369edd2d84eab76cf81f685abfdfe1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Jul 2020 16:38:51 +0200 Subject: [PATCH 053/214] matrix-synapse: 1.17.0 -> 1.18.0 https://github.com/matrix-org/synapse/releases/tag/v1.18.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 8dccb7a3129..ed9c9b801b0 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.17.0"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "16hc82qhzb5maxp6f4xqarcv93sa6pg7i585vg97khgy6ryp3m7p"; + sha256 = "0bqacma2ip0l053rfvxznbixs2rmb2dawqi2jq2zbqk5jqxhpaxi"; }; patches = [ From 4dcc08ba58446b0446738c8cf63d8204dbb6a104 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jul 2020 15:01:15 +0000 Subject: [PATCH 054/214] tmuxp: 1.5.4 -> 1.5.5 --- pkgs/tools/misc/tmuxp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 94cdcf56893..5a14981ef26 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.4"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "13qnacqlcih731wfrsalbff1g81inkh6sypvabg5gi7gd7mha49p"; + sha256 = "1jbziyqggbfd5m884lg00h0zi99c6cvjxkl4jzr34c4affr295yd"; }; postPatch = '' From 851c1d5a6bab3576ffe5a2b4e5168fdb7b7672c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Jul 2020 19:06:17 +0200 Subject: [PATCH 055/214] qutebrowser: 1.13.0 -> 1.13.1 (#94226) --- .../networking/browsers/qutebrowser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 5af14805bd8..0e3e7205e1f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -11,12 +11,12 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = let - version = "2.3.200"; + version = "2.4.456"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1fpxsw0hzahccyng08acvc7g0gk29j2x701p6w6fg1718mvcrm1q"; + sha256 = "02hpy96pi06gdq2s7n56ycm34d6d3gf8ly22y366np5vpwmc29rx"; stripRoot = false; }; @@ -30,12 +30,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.13.0"; + version = "1.13.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1xq0a0mcssc1ss4fvhhwr75dhlh3nr9w46i2gmqczzh5cynk1sfk"; + sha256 = "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8"; }; # Needs tox From 526c85966461ddca08897db85a181b4b9d7c1e11 Mon Sep 17 00:00:00 2001 From: Louis Tim Larsen Date: Sun, 26 Jul 2020 14:43:19 +0200 Subject: [PATCH 056/214] libhdhomerun: git -> 20200521 --- .../libraries/libhdhomerun/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index bcab7faa412..cdc9e4270b5 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libhdhomerun-1efbcb"; +stdenv.mkDerivation rec { + pname = "libhdhomerun"; + version = "20200521"; - src = fetchgit { - url = "git://github.com/Silicondust/libhdhomerun.git"; - rev = "1efbcb2b87b17a82f2b3d873d1c9cc1c6a3a9b77"; - sha256 = "11iyrfs98xb50n9iqnwfphmmnn5w3mq2l9cjjpf8qp29cvs33cgy"; + src = fetchurl { + url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; + sha256 = "0s0683bwyd10n3r2sanlyd07ii3fmi3vl9w9a2rwlpcclzq3h456"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -23,10 +23,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; - homepage = "https://github.com/Silicondust/libhdhomerun"; - repositories.git = "https://github.com/Silicondust/libhdhomerun.git"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.silicondust.com/support/linux"; + license = licenses.lgpl21Only; + platforms = platforms.unix; maintainers = [ maintainers.titanous ]; }; } From c8f1df041f5801f79c3441398f20cb4c71bc5e90 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 30 Jul 2020 17:06:30 +0200 Subject: [PATCH 057/214] =?UTF-8?q?kitty:=200.18.1=20=E2=86=92=200.18.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the newly introduced test_multiprocessing_spawn, we need to set PATH to include the freshly built kitty binary, since it uses kitty_exe() to determine the path to the binary which it uses to spawn worker processes. --- pkgs/applications/misc/kitty/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 85e9795a036..18191750123 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.18.1"; + version = "0.18.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1g4mfgygyl143k0k6d3cb8b2l05ahiamlcqs1iqi66pc73cax4z6"; + sha256 = "0x6h8g017mbpjkpkb1y8asyfdc48bgjzmj5gachsp5cf5jcqwir2"; }; buildInputs = [ @@ -85,9 +85,15 @@ buildPythonApplication rec { checkInputs = [ pillow ]; - checkPhase = '' - ${python.interpreter} test.py - ''; + checkPhase = + let buildBinPath = + if stdenv.isDarwin + then "kitty.app/Contents/MacOS" + else "linux-package/bin"; + in + '' + env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py + ''; installPhase = '' runHook preInstall From 41f959293bd13b2bfdd0c8a0e4833348b31ca563 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Jul 2020 19:17:01 +0200 Subject: [PATCH 058/214] linuxPackages.wireguard: 1.0.20200712 -> 1.0.20200729 https://lists.zx2c4.com/pipermail/wireguard/2020-July/005720.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b20da16f7c8..fa578372876 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200712"; + version = "1.0.20200729"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "04f8hh6rz6ibavvga5z2mjpccnkacj1h24y3vj2kpya132qpavfr"; + sha256 = "0fk2i65q8pk11n46a31017059aan7hbbx0xv6d2c9d80dzrw5a36"; }; hardeningDisable = [ "pic" ]; From 1e98e895fa2cddaa8542954d53b8d75a903e684d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 1 May 2020 16:50:28 +0200 Subject: [PATCH 059/214] nixos/steam: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/steam.nix | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/programs/steam.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 585cef9b42e..08a5f32c4c9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -156,6 +156,7 @@ ./programs/ssmtp.nix ./programs/sysdig.nix ./programs/systemtap.nix + ./programs/steam.nix ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix new file mode 100644 index 00000000000..3c919c47a0c --- /dev/null +++ b/nixos/modules/programs/steam.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.steam; +in { + options.programs.steam.enable = mkEnableOption "steam"; + + config = mkIf cfg.enable { + hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932 + enable = true; + driSupport32Bit = true; + }; + + # optionally enable 32bit pulseaudio support if pulseaudio is enabled + hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable; + + hardware.steam-hardware.enable = true; + + environment.systemPackages = [ pkgs.steam ]; + }; + + meta.maintainers = with maintainers; [ mkg20001 ]; +} From bee2b91b7f3d33b5b5f5963753a364ef99a037fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 12 Jul 2020 19:45:12 +0200 Subject: [PATCH 060/214] doc/steam: add docs about new steam module --- doc/builders/packages/steam.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/builders/packages/steam.xml b/doc/builders/packages/steam.xml index 8dfede59ac1..59673328bac 100644 --- a/doc/builders/packages/steam.xml +++ b/doc/builders/packages/steam.xml @@ -45,13 +45,7 @@ How to play - For 64-bit systems it's important to have -hardware.opengl.driSupport32Bit = true; - in your /etc/nixos/configuration.nix. You'll also need -hardware.pulseaudio.support32Bit = true; - if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add -hardware.steam-hardware.enable = true; - to your configuration. + Use programs.steam.enable = true; if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr. From 2d63269e0d2d44d0ac3ddc14c40c88686f8b2cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 12 Jul 2020 20:09:34 +0200 Subject: [PATCH 061/214] doc/rl-2009: document new steam module in release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7da1f502378..c7b3190a5da 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -130,6 +130,11 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; This will make container tools like Podman work as non-root users out of the box. + + + The various documented workarounds to use steam have been converted to a module. programs.steam.enable enables steam, controller support and the workarounds. + + From 1bb1b6708708be99be95604fc2e225b327941724 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Thu, 30 Jul 2020 18:32:42 +0000 Subject: [PATCH 062/214] graylog: 3.3.2 -> 3.3.3 Bumps Graylog and integrations plugins to 3.3.3 which fixes CVE-2020-15813 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- pkgs/tools/misc/graylog/plugins.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 6b2059cafdf..2785255092b 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0mw0nwj6i681bfsp3psjq377bha2qskkw955pp9h1p8xdyy8cx32"; + sha256 = "1yc2rirbdydirs1kph60acz06ciqnjbf115p3q4vhh15l84lg3sg"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index ec6c16f5313..15d11b0bf08 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -64,10 +64,10 @@ in { enterprise-integrations = glPlugin rec { name = "graylog-enterprise-integrations-${version}"; pluginName = "graylog-plugin-enterprise-integrations"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; - sha256 = "0la91f5hfakrp5d37q3r1z15zzya9vmwgp8gf5ifkh6fasa811ll"; + sha256 = "14b8whgvx8lzil09gjjxhps5syw3slwbh3gswrgc9kh1sqmdhl85"; }; installPhase = '' mkdir -p $out/bin @@ -96,10 +96,10 @@ in { integrations = glPlugin rec { name = "graylog-integrations-${version}"; pluginName = "graylog-plugin-integrations"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; - sha256 = "1k90q50p4ly9d8fj0riyb1xw0bd6f8wm2xmkr71908j2v0jaskpq"; + sha256 = "1zf97q8xm81z6q2s7c3nwvpl1m6pc6w7zjm4hmd7ds1br6pg4bdh"; }; installPhase = '' mkdir -p $out/bin From 6b806a20977232175bdaf0753e5dd432428bf9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 3 Apr 2020 00:53:34 +0200 Subject: [PATCH 063/214] isolyzer: init at 1.3.0 Co-authored-by: worldofpeace --- pkgs/tools/cd-dvd/isolyzer/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/cd-dvd/isolyzer/default.nix diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix new file mode 100644 index 00000000000..1fd704d90f1 --- /dev/null +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "isolyzer"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "KBNLresearch"; + repo = pname; + rev = version; + sha256 = "1fysm05cz0z54apn1p889xhbgjnfwax6fngi05yij5qp2zxqghf9"; + }; + + propagatedBuildInputs = with python3.pkgs; [ setuptools six ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/KBNLresearch/isolyzer"; + description = "Verify size of ISO 9660 image against Volume Descriptor fields"; + license = licenses.asl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bbbb74c2b7..0fbc29bdc14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2401,6 +2401,8 @@ in cemu = qt5.callPackage ../applications/science/math/cemu { }; + isolyzer = callPackage ../tools/cd-dvd/isolyzer { }; + isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { }; mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; From 70be15c91bb830d389cb77560a16ee471a145bff Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Thu, 30 Jul 2020 19:16:12 +0000 Subject: [PATCH 064/214] doc/rl-2009: Add warning on Graylog changes in version 3.3.3 --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7da1f502378..ed4e71234b9 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -556,6 +556,12 @@ services.bitcoind."example-mainnet" = { + + + Graylog introduced a change in the LDAP server certificate validation behaviour for version 3.3.3 which might break existing setups. + When updating Graylog from a version before 3.3.3 make sure to check the Graylog release info for information on how to avoid the issue. + + From f51ada1387677d2f3d02930ef3a0ae89fb1c6576 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 30 Jul 2020 21:29:29 +0200 Subject: [PATCH 065/214] xandikos: 0.2.2 -> 0.2.3 --- pkgs/servers/xandikos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index f10c5dc1d1f..9bb4ebc8677 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "1b75r3ipjmk48nvc99zib8gc8xpsb3m0ssg7k0am3zmryi7i19h7"; + sha256 = "1x0bylmdizirvlcn6ryd43lffpmlq0cklj3jz956scmxgq4p6wby"; }; propagatedBuildInputs = with python3Packages; [ From 6dce0bb299ae2d78b20a7d54ddf964e7d2cea10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 30 Jul 2020 21:38:39 +0100 Subject: [PATCH 066/214] Revert "actions/editorconfig: disable until we can combine this with ofborg (#88608)" This reverts commit 1ccf44204bb15d6e4fd6155a971e3a6fbf95e8ac. --- .github/workflows/editorconfig.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/editorconfig.yml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml new file mode 100644 index 00000000000..9e8a1bd97db --- /dev/null +++ b/.github/workflows/editorconfig.yml @@ -0,0 +1,22 @@ +name: actions + +on: + pull_request: + branches: + - master + +jobs: + editorconfig: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: technote-space/get-diff-action@v1.2.8 + - name: editorconfig check + env: + VERSION: "2.0.4" + OS: "linux" + ARCH: "amd64" + run: | + curl -sSf -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz && \ + tar xzf ec-$OS-$ARCH.tar.gz && \ + ./bin/ec-$OS-$ARCH -disable-indentation ${{ env.GIT_DIFF }} From 39910f445ef626ecd0dbb04d0b4bb590449753c0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Jul 2020 22:58:19 +0200 Subject: [PATCH 067/214] packer: 1.6.0 -> 1.6.1 https://github.com/hashicorp/packer/releases/tag/v1.6.1 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 382fda72a4c..2cfe95152a3 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.0"; + version = "1.6.1"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0qddljg330i7059kvij84pjzz67g6qh1w2zcmsj6rv58ix8xsfx7"; + sha256 = "0jm8950rk0cdf84z0yxm8ic3pm353cgmxr1akn6kq1bwg2w0vsrq"; }; meta = with stdenv.lib; { From cc8369c461221705ecd0baba606e131c3f9445cd Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Thu, 30 Jul 2020 13:12:33 -0700 Subject: [PATCH 068/214] why3: 1.2.1 -> 1.3.1 Important: keeping why3 at 1.2.1 precludes framac 21.+ from having WP plugin enabled, which is arguably a very important plugin. --- .../science/logic/why3/configure.patch | 11 ----------- pkgs/applications/science/logic/why3/default.nix | 15 +++------------ 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/science/logic/why3/configure.patch diff --git a/pkgs/applications/science/logic/why3/configure.patch b/pkgs/applications/science/logic/why3/configure.patch deleted file mode 100644 index 3eebf3cf165..00000000000 --- a/pkgs/applications/science/logic/why3/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -4029,7 +4029,6 @@ fi - - if test "$USEOCAMLFIND" = yes; then - OCAMLFINDLIB=$(ocamlfind printconf stdlib) -- OCAMLFIND=$(which ocamlfind) - if test "$OCAMLFINDLIB" != "$OCAMLLIB"; then - USEOCAMLFIND=no; - echo "but your ocamlfind is not compatible with your ocamlc:" diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index cd44dadcedc..b9bd2172bb1 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz"; - sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647"; + url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz"; + sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv"; }; buildInputs = with ocamlPackages; [ @@ -29,15 +29,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - # Remove unnecessary call to which - patches = [ ./configure.patch - # Compatibility with js_of_ocaml 3.5 - (fetchpatch { - url = "https://gitlab.inria.fr/why3/why3/commit/269ab313382fe3e64ef224813937314748bf7cf0.diff"; - sha256 = "0i92wdnbh8pihvl93ac0ma1m5g95jgqqqj4kw6qqvbbjjqdgvzwa"; - }) - ]; - postPatch = '' substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx ''; From 2b49e8451495939e70ef07eb37905c0bd4006dd4 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 28 Jul 2020 23:32:56 -0700 Subject: [PATCH 069/214] tvheadend: include dtv scan tables --- pkgs/servers/tvheadend/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index f97935a4ce3..f4c3270bf3d 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,10 +1,22 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python -, which, zlib }: +, v4l-utils, which, zlib }: let version = "4.2.8"; + dtv-scan-tables = stdenv.mkDerivation { + pname = "dtv-scan-tables"; + version = "2020-05-18"; + src = fetchFromGitHub { + owner = "tvheadend"; + repo = "dtv-scan-tables"; + rev = "e3138a506a064f6dfd0639d69f383e8e576609da"; + sha256 = "19ac9ds3rfc2xrqcywsbd1iwcpv7vmql7gp01iikxkzcgm2g2b6w"; + }; + nativeBuildInputs = [ v4l-utils ]; + installFlags = [ "DATADIR=$(out)" ]; + }; in stdenv.mkDerivation { pname = "tvheadend"; inherit version; @@ -28,7 +40,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; # disable dvbscan, as having it enabled causes a network download which - # cannot happen during build. + # cannot happen during build. We now include the dtv-scan-tables ourselves configureFlags = [ "--disable-dvbscan" "--disable-bintray_cache" @@ -45,6 +57,9 @@ in stdenv.mkDerivation { substituteInPlace src/config.c \ --replace /usr/bin/tar ${gnutar}/bin/tar + substituteInPlace src/input/mpegts/scanfile.c \ + --replace /usr/share/dvb ${dtv-scan-tables}/dvbv5 + # the version detection script `support/version` reads this file if it # exists, so let's just use that echo ${version} > rpm/version From 4e8f32012384ff45db26f8402fb398d700829eb5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Jul 2020 23:27:10 +0200 Subject: [PATCH 070/214] wasm-bindgen-cli: 0.2.65 -> 0.2.67 https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.67 https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.66 --- .../tools/wasm-bindgen-cli/Cargo.lock | 130 +++++++++--------- .../tools/wasm-bindgen-cli/default.nix | 6 +- 2 files changed, 71 insertions(+), 65 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index 690b1998e2b..eed61d4ec14 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -9,9 +9,9 @@ dependencies = [ [[package]] name = "adler32" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" +checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" [[package]] name = "arrayref" @@ -57,9 +57,9 @@ checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" [[package]] name = "askama" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7acc25b09d27eaec97794c58d8483a227f2adc98b762f915745525d8781dba0" +checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12" dependencies = [ "askama_derive", "askama_escape", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f7dc4c28f064af8bbba24867ec6c3165c645635cb1306bca4c0f991ce8b15a9" +checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881" dependencies = [ "askama_shared", "proc-macro2", @@ -86,9 +86,9 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" [[package]] name = "askama_shared" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b64d552e0dc2837d5c27276e80521cf864f42c079e476b3035a196566fcee59" +checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5" dependencies = [ "askama_escape", "humansize", @@ -357,9 +357,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0447a642435be046540f042950d874a4907f9fee28c0513a0beb3ba89f91eb7" +checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78" dependencies = [ "curl-sys", "libc", @@ -372,9 +372,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.32+curl-7.70.0" +version = "0.4.33+curl-7.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834425a2f22fdd621434196965bf99fbfd9eaed96348488e27b7ac40736c560b" +checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337" dependencies = [ "cc", "libc", @@ -493,9 +493,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695" +checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b" dependencies = [ "cfg-if", "libc", @@ -505,9 +505,9 @@ dependencies = [ [[package]] name = "float-cmp" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d" +checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ "num-traits 0.2.12", ] @@ -797,7 +797,7 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.42" +version = "0.3.44" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -826,9 +826,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.72" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701" +checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" [[package]] name = "libz-sys" @@ -1042,9 +1042,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.10.1+1.1.1g" +version = "111.10.2+1.1.1g" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375f12316ddf0762f7cf1e2890a0a857954b96851b47b5af7fc06940c9e12f83" +checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" dependencies = [ "cc", ] @@ -1125,18 +1125,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" +checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" +checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" dependencies = [ "proc-macro2", "quote", @@ -1175,9 +1175,9 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" [[package]] name = "predicates" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030" +checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a" dependencies = [ "difference", "float-cmp", @@ -1230,9 +1230,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.16" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" +checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" [[package]] name = "proc-macro-nested" @@ -1242,9 +1242,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" dependencies = [ "unicode-xid", ] @@ -1668,9 +1668,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" dependencies = [ "itoa", "ryu", @@ -1751,9 +1751,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.34" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b" +checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" dependencies = [ "proc-macro2", "quote", @@ -1899,9 +1899,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trybuild" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe777c4e2060f44d83892be1189f96200be8ed3d99569d5c2d5ee26e62c0ea9" +checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8" dependencies = [ "glob", "lazy_static", @@ -2030,7 +2030,7 @@ dependencies = [ "log 0.4.11", "rayon", "walrus-macro", - "wasmparser", + "wasmparser 0.59.0", ] [[package]] @@ -2053,7 +2053,7 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasm-bindgen" -version = "0.2.65" +version = "0.2.67" dependencies = [ "cfg-if", "js-sys", @@ -2069,7 +2069,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.65" +version = "0.2.67" dependencies = [ "bumpalo", "lazy_static", @@ -2090,7 +2090,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "assert_cmd", @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "base64 0.9.3", @@ -2140,7 +2140,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "rayon", @@ -2152,7 +2152,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.15" +version = "0.4.17" dependencies = [ "cfg-if", "futures-channel-preview", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.65" +version = "0.2.67" dependencies = [ "quote", "trybuild", @@ -2175,7 +2175,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.65" +version = "0.2.67" dependencies = [ "proc-macro2", "quote", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "rayon", @@ -2207,11 +2207,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.65" +version = "0.2.67" [[package]] name = "wasm-bindgen-test" -version = "0.3.15" +version = "0.3.17" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2237,7 +2237,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.15" +version = "0.3.17" dependencies = [ "proc-macro2", "quote", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "walrus", @@ -2254,7 +2254,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "walrus", @@ -2262,7 +2262,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "log 0.4.11", @@ -2274,7 +2274,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.65" +version = "0.2.67" dependencies = [ "anyhow", "env_logger", @@ -2322,13 +2322,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" [[package]] -name = "wasmprinter" -version = "0.2.6" +name = "wasmparser" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334551eb8b0b1be16cf366a54ce9b541ac32a96e9b51e67ebbae1696f108f112" +checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f" + +[[package]] +name = "wasmprinter" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.60.2", ] [[package]] @@ -2351,7 +2357,7 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.42" +version = "0.3.44" dependencies = [ "js-sys", "wasm-bindgen", @@ -2505,7 +2511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c11d93d925420e7872b226c4161849c32be38385ccab026b88df99d8ddc6ba6" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.59.0", "wit-parser", "wit-schema-version", ] diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 97a48a37005..0863905e932 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.65"; + version = "0.2.67"; src = let @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "0qfz5x2hmfxz0kjc1biki0748d4qi8ws0b4bx9y2fs8dgbnppkzf"; + sha256 = "0qx178aicbn59b150j5r78zya5n0yljvw4c4lhvg8x4cpfshjb5j"; }; in runCommand "source" { } '' cp -R ${tarball} $out @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "1rjf4f8hm4vqjcdhi7s5az8p5633dg425m8hh32kakq1ar06pfvj"; + cargoSha256 = "0chpw6syqxn824cbkdjx1s26vmajx511gc4mp9y64vy7b7asba6x"; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { From d3b02e845ee4f6d59b82c8625a90ea87fe52cd4f Mon Sep 17 00:00:00 2001 From: William Roe Date: Sun, 26 Jul 2020 15:20:23 +0100 Subject: [PATCH 071/214] hikari: 2.0.4 -> 2.1.1 --- pkgs/applications/window-managers/hikari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 16271864afa..1e8f7ecd987 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.0.4"; + version = "2.1.1"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "0arm2zmiqf63a7a3nwcqf88lsk79n0ycdqqgz0c2wafvdxl23v3d"; + sha256 = "0m9akxk5kwbdi04wch4xfaahl7h3k7c6a67yjmdzqxh3bqwa8igj"; }; nativeBuildInputs = [ pkgconfig bmake ]; From 5bd5e2c1b3e5b8931c043d9ee3c7a7c5ab618798 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jul 2020 23:12:25 +0000 Subject: [PATCH 072/214] delve: 1.4.1 -> 1.5.0 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index b990fe10b05..892ee6dd329 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.4.1"; + version = "1.5.0"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "007bc69r26w0sv6v9mbjdnmnkahpfk5998isx81ma7cinqdhi1cj"; + sha256 = "0m7fryclrj0qzqzcjn0xc9vl43srijyfahfkqdbm59xgpws67anp"; }; meta = with stdenv.lib; { From ebcf0679c440a42bba1f4b053b89f2c4cd07ca3b Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 31 Jul 2020 08:27:58 +0900 Subject: [PATCH 073/214] thunderbird-bin: 78.0.1 -> 78.1.0 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 6eee907db17..6302e7239f9 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.0.1"; + version = "78.1.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/af/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/af/thunderbird-78.1.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2050aae67c7058ea8991adbfc8c0533c2df2baccf4b5f9d42c794a914c8b893a"; + sha256 = "6e98afba5a93cd7ce496838974022d7c61c0188f32ab0504d9cecd6ee3e20360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ar/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ar/thunderbird-78.1.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1fc387ed18cae62280795729ce61a04942e319fb1162d54740ed6b3b73198987"; + sha256 = "129ce719947a59c647ab28ceddad28a2ce1e06c63839bcd5b43b084b80c2bdca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ast/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ast/thunderbird-78.1.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cfedbfe2c96814fef42c8e2e4b5aba9f9add0e3c70a2c01ff7528d878a6ab659"; + sha256 = "0baf79a7d38c5a3728cba78510efbd4735e1c4e4d23ab574533d590a7d523ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/be/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/be/thunderbird-78.1.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1d6ec9ca197d2fe5312b9b0e403e3ee2ee32be05b2d329ff0b21d9c42ba77a6"; + sha256 = "870ca1c07897b8df1e2985165cb0802a5cf1fe87886e0aca5f46d0d8b1e6acf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/bg/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/bg/thunderbird-78.1.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9b8b5322b6808185fcaa9614b7def311ccaf14b0939447a538b8b13fdd7ffcec"; + sha256 = "bd2bb102a09132afa0a4110522fa7dd98ae3b0ddf9b28a97d21070880212f391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/br/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/br/thunderbird-78.1.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1f8429ba0563ab22cb1c30e15ee80d42864f01b0713e37448059335b8f1cdee9"; + sha256 = "cee91b71a6735e9c71a705e0c7a8a97d5acb733efac1d8bf8ddcd31a62fa439f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ca/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ca/thunderbird-78.1.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bdee4855e082b473f0434f5a16aa704eadc3ed4b0c186b42aaf5aa600f29d066"; + sha256 = "257d027850fc31fa5e5f4b0fc4dd2205db2b9fe04dd5b8c0f34453df11eacd4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cak/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/cak/thunderbird-78.1.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9d6188ecacf4b76a91c2f4a8cbabf194eba05ffca54b79b3e0ee44919540e353"; + sha256 = "405d409fad9a42a8c58196ac390dcccae100da950d9225f03b5755842642af47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cs/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/cs/thunderbird-78.1.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "edc391204cfc8c1eb1c93fca5f2ec67708c76fa4a1b972defd55f1645ccb3c56"; + sha256 = "fb554ed67ea40a31a296b37f95428f4fa9f81532c8048ec3b4563b91fbb989af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cy/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/cy/thunderbird-78.1.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e179d9c7252b2915e84d2cb0e1c0c1b9568374bbe65348456e4dedf2f883023e"; + sha256 = "f74999b180cf8f32e634afd68340cdb8fb40c064fb1b78d4c4b2666a9bfe7121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/da/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/da/thunderbird-78.1.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "53b9e2107a1bc89132e7a3e1d08d4acebff872c19a639100ef1c0ebb4c3d0b2c"; + sha256 = "feea7e8ba58473d9f0159152aad4748827c88d3b575ebd5bfab18f3c08e1add3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/de/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/de/thunderbird-78.1.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "03bed4f7360142dcaa1824ce5deae519a9ba00f43427fbef78246036de159466"; + sha256 = "4b067335dee19144898485c711eec865b4d0fd0be0ff95d6532f6a7c62b2651d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/dsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/dsb/thunderbird-78.1.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "50217d664170eaf71da7a5111337583aad4a181dfd32eb3686f7a31ec6fdf4be"; + sha256 = "349db67666bbda6c269c7b55e376cb3740e3b3eb7a4e6f0fcf44037dc7fe822b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/el/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/el/thunderbird-78.1.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b6d1f45955cdd99d097b955e6c2fd017afbfdaa8d0b505d231548acea5d31e74"; + sha256 = "40bd9509793e81a2601ea0746f6e27a65a364d95d7772eeb71c5eab24f31fbae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-CA/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/en-CA/thunderbird-78.1.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f1f9c597816f4a3b30561c186c0944e6fc0fd47616292002d858341a0c6ef5a0"; + sha256 = "55acc02d61ed7a2b0ef2262346ff27afbcf836b03cb14dc67fb8cbc26bb5d6ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-GB/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/en-GB/thunderbird-78.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a771190706f3bb163a7962bf4767b9177c324cc3bdc28470375a4ea26022881b"; + sha256 = "f18cba25a9ab2b10f1f464163c904f7b1ec1afa5b79728c9b1fc1497971edca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-US/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/en-US/thunderbird-78.1.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "428af66882e1abd047491c6a4a317eda6095191bd0ab81308d162c4a3c8d227e"; + sha256 = "0768e00b6a7737bd4ce5dac4d3afc331e8d1dd5307bccd130d9581347c6ea35c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-AR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/es-AR/thunderbird-78.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b1fae29c0caa3f2c5cfdea0ee169fa4f080027fd4e0347db6546f335bd7b6759"; + sha256 = "106b8a385e8f4bbd4fcbae08620fc621f69a3920b04300305ebc000b7007b512"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-ES/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/es-ES/thunderbird-78.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "58c1a11820860e2efe3f38b889962f794e56de4e2d1d94855e10bab1fc4d21af"; + sha256 = "02a67358ed38587bdb67c5faa67d989cafda448441dfa60bcb56587d10a052b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/et/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/et/thunderbird-78.1.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "71fac7d3c3e74bff029b5432f8caaa76abdd19d38a64ba6192d371c97a09e353"; + sha256 = "649bbbc89da5fb44f118be6c8f8a142e00aac26e50d7aa5217937d8356a8745b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/eu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/eu/thunderbird-78.1.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "60492decef4b40d8a24e6c04ae0494b178a47a4782388eca7c3e2c2b7b0823ec"; + sha256 = "4884b806aa36ef0d1f11cd876594d94614cd9a95a1dc8b072dea57f9b1664106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fa/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fa/thunderbird-78.1.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d3bf790906b9b3c016cce51aeb1671c9d80f28d3c959073bfab0c14dc952d85b"; + sha256 = "a8e8de1f187a103a9bea2d0bc4ad8359f80d2eb0f5148d0c93f3351e1e8efff6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fi/thunderbird-78.1.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7e6c77c994027e8e941a498d8dcc6e82911cd4b6e3a61c78206fe7bc114ae006"; + sha256 = "4c7fd4083382830646486390efec548a6875f41fa373d1c35b83f1e7b1890352"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fr/thunderbird-78.1.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d4e073368df92a81eae6b3480f3d06d461aab18841a0ed64d7f8d1c5b4623168"; + sha256 = "3574bafabec4266fee05552a1be248af63531d6ca1993d8c8d61e0dc472a0786"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fy-NL/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fy-NL/thunderbird-78.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "41e161d7447b64438652210d9091517b42edcf9b011f01c8c1ceb87539acd295"; + sha256 = "688346105eac2d51505f147c2baa74ac5a16915f2440e0e08d666eb77c702c3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ga-IE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ga-IE/thunderbird-78.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "a3f1b487d585ed66089b051a01b8b4da6edea684d2bdca94570dcb7cb283c8ba"; + sha256 = "aa75c3c00bded7ea7a8fb9043b24e264aed02598152e60a3a2d6644433e3f6b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gd/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/gd/thunderbird-78.1.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ebcedbf87577cffae7ba8ed83e9b9f981fd205e178701084cd2f813e30a8adee"; + sha256 = "7eae8fc579878437ee25f988189c49a7d7121f66230d1f60e496d575f518497c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/gl/thunderbird-78.1.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ffdfe4c9c22ac161e801d44599fe507c1ab9d7a8f46181cf1cdce023bccc4161"; + sha256 = "c2ccf567d2c4ac7598204a2a129678730ef2dc1d84ed3c547b569de3455723b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/he/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/he/thunderbird-78.1.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cad855f0c469056e1830d2f08be9c42ee348a5ccf74015585451161a0d7fb432"; + sha256 = "aec6e559b34d539161a3367e434773f6016978f3e837431d27737a935d156fe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hr/thunderbird-78.1.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "86b80d641ac0e5f7ffbfca3a5539cc1422d67a6b36cefaef9d92d03284955648"; + sha256 = "37b478337cc9918cb386471000c5cc90d2f5de3023a67431b418781cac1d4cac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hsb/thunderbird-78.1.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "062f55ebb24178c604527173511277115cdb49a7bc416f9824359cc700686a7d"; + sha256 = "6d08be19b9aaa9a0f11bf23aab8cf42c1e04288882d860ad45a625a9ad2d8ea5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hu/thunderbird-78.1.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "281479c1f791cea5c5b64ec103ade785844470d0d803d6298d1f1ec505d7eba8"; + sha256 = "ff2b7d098e466cd6a9508f3d85e599de544eb8e3cf0cda15d5278fc61efab22d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hy-AM/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hy-AM/thunderbird-78.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "cb436991d7bb7705c29fa8b51a6d4c2910689b58210002a3370820917955dd93"; + sha256 = "2d53c3979a54981dc38c0db892b00b042cc6316972c42cffa6ff9409ad7753d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/id/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/id/thunderbird-78.1.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "325319f3d1791c9aa91522c1c6f90aa72d511ad774a190d60a0dfcaf85cce934"; + sha256 = "d599ca640aadf1d6441e16f47c39553cc58d3676a5638f613ffadc0b26983831"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/is/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/is/thunderbird-78.1.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e61096339f49ef5c1ba457e448f80a306c7f9058f280acaade9945d57209af1a"; + sha256 = "004c1b4b00f3ab32e8e39fdbe8c8900cc4d36d716e81eb92cb49c7e0c105954b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/it/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/it/thunderbird-78.1.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "daad0be2b8e9419d47a6ae2fd3b30002d206451f9f8f8a0dfa04199175024647"; + sha256 = "8818951a98306959571060a673093397e6f337c5edb08d91c7202b2dd46a96ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ja/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ja/thunderbird-78.1.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ae8093def67bdde2086d568a2837f427e62f41e0d6ed80d9a64919467e7442e2"; + sha256 = "f30ab0ece47a1bb9220f414f12158ae264261456728c2debb2acfd9860dcceaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ka/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ka/thunderbird-78.1.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "57a1406e4e4d70b5fc23f356aa21a55abddaa3401127f279f58f3f73e6756987"; + sha256 = "ef3bfc1a4afb1f7cab9188848d789778e36ad2c376daaf5245611fade7c758f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kab/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/kab/thunderbird-78.1.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "86041ae0c0bd55923256ed64c0ed23f5c3913ed4892dba58d2c064049deecb4c"; + sha256 = "a1240d9ff2ef510cc039f3e29c571eaac738caea1a737d872931923fe1f9adc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/kk/thunderbird-78.1.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "715626b9f4ffdd68ac9b689dbc48cf47d37d93f128e61d999c5dd14219d1bda8"; + sha256 = "ed991b239aeac8c0b8e92ae59acb1cb949357514326e7377c2b028a0c9bf8be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ko/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ko/thunderbird-78.1.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d470fd22fe9e185db70090cf5124697dc9b7015768181748d8976a04cde09239"; + sha256 = "dbbd6291a1253c125cd6b1757c1f8a0a7bdbd8e611032db0d5d2efb5f6efd232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/lt/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/lt/thunderbird-78.1.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ebd83f3fdf84aea2021fb318671bda5a08a8480b61eff689544566d7c3b4dc5f"; + sha256 = "86b3a09435b20c398572a9d261d2b64c7f25346ac1977fcdddd78340a36a7774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ms/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ms/thunderbird-78.1.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0a1c461603c60e16ca911fc3bcca0d5d1b6ac29a1a5a63524decb360a960e047"; + sha256 = "4cead9cf204b460230eb35174898741fabefcec7d6a08bda13f67484400a61dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nb-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/nb-NO/thunderbird-78.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "89ef517fe3d97a95306b34212c96e83a3afbd5fa5d9c3c3ca3b019c8b742d422"; + sha256 = "2f955e1436e78a2abf8395aeab59917001ea3affe763f12412247e48809867a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/nl/thunderbird-78.1.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1c0632de4a2a13fcebd6bf3dadcc6a19125f37b8b54d16a9b8fe57fcde6d84ee"; + sha256 = "246b0dc99ae05a9fc559c3d587f4ebf501a6bc264494960cb6295f7b8ee5d12c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nn-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/nn-NO/thunderbird-78.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "684cfbc77db1f16ed8f271ce1f2700e6d6e486da47cb961bc09b53bda79e773d"; + sha256 = "9d6b8c48bf483860cbba470fdf221fae906fdf1b1b3762055ee2dad841d266b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pa-IN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pa-IN/thunderbird-78.1.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "140010e3f1db608d1978f02fd28c0d9305dd4cfc2666b1689eca5e8b7aa64bae"; + sha256 = "3a62c8d1909353efdf67c758e49a5e938508fa8d433d887fd47faa768fbc4015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pl/thunderbird-78.1.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1bcb8a7d3936f22286fc6c1a5b0ed492cb345a22406eafedbe439c6737c7c422"; + sha256 = "d20f0e0c1b60efc5b549a347ea6055b5ab659e47ef0b28ceda91b03066c89606"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-BR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pt-BR/thunderbird-78.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "41b8f99c1f73f16bd4ce4dbd76dea58209487c033a42b02412b237f98bf32903"; + sha256 = "ad633496d5183a99251128321810842623de0c4aa4f8895e23df756cbca6a4bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-PT/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pt-PT/thunderbird-78.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "864524017e892942d31212acabd4b4b6425153b53cc622df728540d9b65237bf"; + sha256 = "e1ed2749803c255e16f7c5bc8e264adbe53381b33c15d7ec7995cf048a86260c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/rm/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/rm/thunderbird-78.1.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7933777df1f87786842e9615528e3aef3ae0a78ed4089dc5b8472f2d7b7d7b53"; + sha256 = "e07c2f7600965d46a6db1bbc5082897f0a9d3b1d66555c388c9dca9b02bcc057"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ro/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ro/thunderbird-78.1.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "59a2f5b81c777cfb705ec93c395d78b7d73a98cc632efcd980490817ddde06ae"; + sha256 = "2b34d996f2130b3738bc2b2cc8f784ad9e62b207722c7038e1469929c174aaeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ru/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ru/thunderbird-78.1.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0954dd904e87505aa849db172351684c477f80395baf46b7ada5bcc6e0614c2a"; + sha256 = "3cdb2afc48e70a6f27022fb672eed016ab5aede684d2791b4771e764f64befaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/si/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/si/thunderbird-78.1.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c8d9c1384f98e8664e73e3b3790dc99aff51c9188116d6dfe8b88a238f09e524"; + sha256 = "6207418917124e654283592fcbf8c05bdb47369486ac3f4cfa63376ce5c4f780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sk/thunderbird-78.1.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "651932961b463312ed8757a26714383d34b5296620e0f957417c0d853e591d9a"; + sha256 = "e5551cda807e0c490fc3c6fb8c0ca3c2b75f2093984537f862d1cd3b9cf1f080"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sl/thunderbird-78.1.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "073fc40fbdb1d45b0df5e8984216422e1b79f5740537d9deb11b05b11e9a6622"; + sha256 = "d43ff3688f641d07dc6bc4b9b6a5045ee64f76b94c8a90fabab76ccb3682990a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sq/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sq/thunderbird-78.1.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "05cab7f922d15f839c73b8405bb1e2785e7f327a0f155595a40936b792852ad4"; + sha256 = "08ea55f8bb49ad16d0ef16b1a95c9cb5657690e811608f147c93f79171dc6b9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sr/thunderbird-78.1.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "26fd9a66bcc583acecaaaec732cefdc4909923fd5ca478f1c9705bf7ad787eff"; + sha256 = "a9a1a33b195ef2c18da5a18ecbe09cd5dfc9c48aaf445937642a9df1cc2694c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sv-SE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sv-SE/thunderbird-78.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "610a21baa667f8dce1e9cbd18dbf582af6a9a0c61e574dd509a2121536407e8d"; + sha256 = "9f7994ec48a0b70ce6ce33092b4d5252c2cf180f2589a46fc85009503671fb56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/th/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/th/thunderbird-78.1.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "520745d3bf636919963a014baa565efbc14a4d5e6d77ba8e1d0cd6b5a8b370cc"; + sha256 = "d1ffeae4472df5483c8f55beab128456f3176b07e11444ca48f651a582b8d80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/tr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/tr/thunderbird-78.1.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "91ede7f8e4520586e35b0fefe616477dd9773c047b03c2c92b8264bcdf1131c3"; + sha256 = "79fa59071ceb5f643759cd4e9161325f3717a099607407844ed58e854c680eb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/uk/thunderbird-78.1.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "46bda6c807fb26e1ba698590912c9f427648e37f26b791697562d912249c519f"; + sha256 = "f41e9756c31a5d2047d7beb8f8f4d3a3f09d6b72d8ef8b375c8f0ce16ff25409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uz/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/uz/thunderbird-78.1.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2029d7023605baf17c138031977bb2f36ddbacac605d00e93967b366c22df4ed"; + sha256 = "9748985b628e76b75f15814b6d48641319716bdff8c3947c346b01be27e16854"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/vi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/vi/thunderbird-78.1.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d345f774c89b276a5393b17522d5c7d60f8c661594334e0e6bb8ee06fa134a11"; + sha256 = "cba83119c8e36f76d4697acd689e1f94effdb980e7738853cf27f6633a48c187"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-CN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/zh-CN/thunderbird-78.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "931d29a118de6eb1a73da6d36f919b2b98112b15e15ede6171b39c2b1f85b8b3"; + sha256 = "f06c5cbefd99d2da20b1bb64518c29907f746740d30f79d4b7d59ee286690194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-TW/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/zh-TW/thunderbird-78.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "59b7484654101e016819b998c903ac43bf43427a16d288f90cb1ec47efc2c61f"; + sha256 = "82cfbf08584867e6d36d357e67ea6abe2ab3e2747de014bd747ed169065b0f07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/af/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/af/thunderbird-78.1.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5fa7d8defeececcbf3794845695b3c4ff84e4269a26f3eaf709fb67e8549f164"; + sha256 = "ecd85c75ce2935f776dabfd42402342526cc9f7050c6f444219618cdfd12930b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ar/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ar/thunderbird-78.1.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "946887ca372e60fbe401c60d5a2758e49b3e771837d1c4e77073e6f7c569aa8f"; + sha256 = "1ad1466a524f505abe1a80fd6dc4ddeb4441a26ce6f63c07b9bd8c0cd27f75d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ast/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ast/thunderbird-78.1.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "596e5665341f5c2d4551f216e8935bfc4c390666d01464b8c289386a2fd7c168"; + sha256 = "5683300f0c423c5ea2c62cea619d0f894d7ef5d4e46f952f67ba56863350c829"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/be/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/be/thunderbird-78.1.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e95af9c6be7a8e30b1589a9fe9b7568876dfa920f2d01d3e6c0f0e2ff4f34ea1"; + sha256 = "882463c8e120438c418a540da6d7ad324eb071f400d1abfea43c04d7a8e978d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/bg/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/bg/thunderbird-78.1.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3c509d3861074c2a5d2da2f0d7f2d3d19a132745dae3ccbbb259e60419b70895"; + sha256 = "1ead6033fc9a7bfd504890a453ccbcad34a5421f6a33e2a382cdbd0ccd15c60c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/br/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/br/thunderbird-78.1.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9dd7e920583f0a3bd0eda01d569142f81f91061ee64703d43685ad277651f13f"; + sha256 = "4aaa832ef4a2cba04d03c2ce8f956bd38bbd88c0c5732db02b73ac6d1097c55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ca/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ca/thunderbird-78.1.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "34026e985a3ee383104e4882d2e9b3025f84b7b36bb9c13233cd56c20b86d2ac"; + sha256 = "a237f035c3b7c6281096accb036f35d6c2b421ca9bc4144240ccbe44f30092af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cak/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/cak/thunderbird-78.1.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c513f2bca776ac47ad40a656ad40eed682c1e1f37d3f8a41686868b10301d700"; + sha256 = "c92a7700e7ff6184ecfb1f36615d1a6f68a5b534eacc3417233602d290ec3c2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cs/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/cs/thunderbird-78.1.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "499148f0871bab7ed8012cde000942815529cfe59d6dfe4a861a937f5bc861d4"; + sha256 = "7417c763b5a4c680d136c2f0f2e62276b4c616a1442282ee9e979bbd56748886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cy/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/cy/thunderbird-78.1.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "12e468d45538b0bf2f699bfdc7cc8f294852394175c57a7720ee217dcdd662ca"; + sha256 = "0099ae95225562e2376a9ae7b5416b82b43d62e5e3c1672ac9a404c4fd4afc3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/da/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/da/thunderbird-78.1.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e49296cbddfc1a5d27f0b85c9ae16c6fae12aea3fa386c458dc436964214944f"; + sha256 = "f58de0e53576831b345e38c30fbd0809f8fbf06aaeb8072ff24c6bc3254844ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/de/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/de/thunderbird-78.1.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "548c2d3dec0270e859a56e7d85ae08840ba6e1b858f1651e484f197d08840c98"; + sha256 = "4ec7d297c251a6af2bc94f69b1416819173e5a067e751dbb44b2b4d78a8866a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/dsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/dsb/thunderbird-78.1.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c130c0adc523580cf771c3a16cc0805563bd4a7f3b0990109972698b4d77f1fe"; + sha256 = "642a8a455fd5baee6443c5db7e971d41c9576e5c930913f1ab04d5c611a85e2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/el/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/el/thunderbird-78.1.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9c2b18946cde4e962191442587a7935658217bea530caa89f25f35c9f6c95034"; + sha256 = "e0040116779db8e0a48ceadbadc78f29ba6f7a30b287f631606e8e710605af62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-CA/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/en-CA/thunderbird-78.1.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3b1a6e1bcc6619221ba29df1af414d2ffe8fa935ec098e95210ba59b5c518239"; + sha256 = "d020ee801bee8a6384e3da9dfcff135d62dc523f2d0e183417508214fbcf8384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-GB/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/en-GB/thunderbird-78.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7fc649ebd174fa6b534b075758ab6895c4c9a78b9bbbc06f135c26f7db24c282"; + sha256 = "31124523570c294f1615af0f3fcedb91f2509d7446c93760c063383b70faac11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-US/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/en-US/thunderbird-78.1.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b2a3bab7cde73523f8a516541170cf701db45e15bd46fbd3c200dfa056d0252e"; + sha256 = "242bf4bacb3d99fc79845f3c5a27e317f1ce9878b124c41b2d9fcbec54460fd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-AR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/es-AR/thunderbird-78.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "af7d15f1776476ef7ea421bb91af9ab1dbffb0369fa12b9054478197b0d902b7"; + sha256 = "178819d715fe526a086d6abf392e2b2ea5d7b8a803199b02cb0005561219f886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-ES/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/es-ES/thunderbird-78.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4ef89f9997094ff1c57ca7c630ee15fe443e214fb3c8b40253cebf8a83e9e5e0"; + sha256 = "88fd17b25de55a567c0e6eecce7edd5657d8f4bf6fa1c8e5c6221b53b6dd21ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/et/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/et/thunderbird-78.1.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f70280ce83fcb31a73a5e7230a3e6ab7abaa776c969cc4d98953bee4529dfac1"; + sha256 = "eaec9c4c0b80d69ba8215e44f64d3bcfc392b5fce47f1a154a8d973ac60991f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/eu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/eu/thunderbird-78.1.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f34516a026d2adbab2cd3730d034abf326113f96f90bbee3889fb0e7cb1b41ba"; + sha256 = "cea1fe6066c348d27b1de6645f7250e03c9beb22a545a4dac3e50dc1af983013"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fa/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fa/thunderbird-78.1.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d004a5e3c3dcd5d2fcb204e9fafa943d1bf6ad1e6cf11aee88796a4f0149e44e"; + sha256 = "01976fc28112097ff160c6adeaffed75b6f998eeba8cbb14328127738972144d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fi/thunderbird-78.1.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b740e866a690e6a6ecd0e910f63822f546389d297f9c923f38983b5f78be255c"; + sha256 = "9f7406c2cd4f11c93d3515691c228940c7b1514df56ec2c8630a7a2e94e2ecaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fr/thunderbird-78.1.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "eab1bdf57527a2fbe4f7de0a3314eba9966df5a2bb9a998c32a73fa372a7f85e"; + sha256 = "46fa514a8a041d9ad6a84333bd6f815cea1ee2c69ef37b17e68f944d93400e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fy-NL/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fy-NL/thunderbird-78.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "bdd5b279a134e305002b87fb6b708e54132158d111b99bb100efbf2dcbcaa606"; + sha256 = "33a5b2f524666b3e5add090ac552d72c3c20f81b97982bcaf2e7939fb3ad5c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ga-IE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ga-IE/thunderbird-78.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f76ad9888686fb09c33d2fc1f92849adf9102c265b302640d50f4b63803ab416"; + sha256 = "331d44093ef699538b72aa2abc12ac0aa5eed8a2c0ddcb48b2550820b418fffb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gd/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/gd/thunderbird-78.1.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "54abde7a6b6f6864bd260b1d31dddf1d578b9f9c2b9f928c2bdcbaa141d14163"; + sha256 = "0d31fb4fc586e4e0f307335144f4e52b6bd8e1f2cef1707143715d4ba5d7143a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/gl/thunderbird-78.1.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6d10c320adb9880ce31404034a501f3d349227d851120c2ada5c4edd6b7f4fe9"; + sha256 = "66c9159758d4639e2334e0ed37145a9b3fb51a53ae15919c956f6ab59ac431a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/he/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/he/thunderbird-78.1.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d635c4b9203d03b9bd78b81e507074ba5e6b8c4b066ea996f32d353b557250a6"; + sha256 = "927b657eea49b18a5bae6e23c0614178a33a90db1e6a4bb8e62978be2e5b165e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hr/thunderbird-78.1.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0a50d18b9c53ac5d325aa343cf7114307e90d98e2392f0474ea469508c329cb9"; + sha256 = "7c76abbc7fe94d910002a0786d18973a1fce553a36bbc26123fffdf8bb63b1c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hsb/thunderbird-78.1.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "34b1f83011ea6297e11d55a126f8fc8c87fd560e2144a4e64f4b377177ddd0c7"; + sha256 = "a34c51c6059effdc861bf1892b9ae2f7f88f7b06344dc73d1c0d02da919c2883"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hu/thunderbird-78.1.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6a4f2e4f026efabe45f45bdf691c84e1c393ab223aee045ec8e21092158cc4f7"; + sha256 = "acdc7d7423570b707bba3941bef2c1654d51c9e1e23d263561e1d9393b2e3e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hy-AM/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hy-AM/thunderbird-78.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "dd8762372b789ee7bb6d11994f8216cfb9fcf493d6dd27c3b292f29675e9559a"; + sha256 = "c3bb6b743016d39c6ee5e7e3776e7617bb1d6d3a32c0ce04fc7e0a962cf4fc30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/id/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/id/thunderbird-78.1.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cb811617137d3b57160e64af7b901329b0b6df46f0525ceed04de9a5aaab8bf1"; + sha256 = "125562d267d38c3f4a5cfb9d747dc3c16634ab82cdeecfe18352c5cc85bd37ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/is/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/is/thunderbird-78.1.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e0d7e51f390aa0af3dbbb2505fdc6eb5a3560c97b031fb67e14bd4af57868bbf"; + sha256 = "f2028467188c85d34108a5a72ab01921cb51cd65bd821780cf264351e72f78ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/it/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/it/thunderbird-78.1.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9c88972bd6ee1ab726e16a6eaba32aa78e3d8475506d3394254337eedc47a9fb"; + sha256 = "06663b6d3800c4175ff8c16309174a323cc1a000b140e944d73e74ebeac2c08b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ja/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ja/thunderbird-78.1.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0fad6c18b92fcec16684bd9905dd0a3b6bcbdf8c2bfd6d271baea48849a0fa8e"; + sha256 = "90e9dd8d19552e286f0b88252f64de5de9b9798b1122c48470de4795ae833b9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ka/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ka/thunderbird-78.1.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "75c454ca20ea0667caab5223c55a210f68165fc72b1493fc8afc76881cfa823c"; + sha256 = "0998d6b871bdde86830d061bef1e6aa93ad7840ea5c705db05b6d6475246c324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kab/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/kab/thunderbird-78.1.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8a928f4b5fa7d0374e361a47857c85a34d271d2cbbc760332a6e588e3361fa62"; + sha256 = "88bd997d123541041594f16496baced969c06335079fb7d08473a09cb001a8fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/kk/thunderbird-78.1.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "18b851bc36799910965c3eb14a8c9a57f29dde91c570e25a8f7f172a8bea7771"; + sha256 = "56bc7376e0a7dcc1e6ca45b41de2769f887ed647320531895f6b3aee99b05592"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ko/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ko/thunderbird-78.1.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "108142a8cbd48dfe07626f4672178a35c5f253c84efcb924c7bd4c1531f6ab38"; + sha256 = "6bbc9f93dcc3c78d17806933020b45a6145e6df3ea0a155492500bcb500f0a31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/lt/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/lt/thunderbird-78.1.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5c65eb6b01e8fe82db99390ae889870cad107d4307e02b04d5f9390eee81f098"; + sha256 = "49e2cbd0d86578f74623ab0c72f551a48d3835a583a5b7269303ab920f14b9c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ms/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ms/thunderbird-78.1.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "78ce19d598b2fa59ecea9d6fd4e67e93b2ba00b2e9569579f687700486e80c24"; + sha256 = "53306a0a9a149fbc7d1e24c24c8ca3ea154ad766be23dc70aeb3bf90ef1bc5b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nb-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/nb-NO/thunderbird-78.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e8a1f9f4666a3ee423c5541c61fccfe448989d0d7d4840dd36bbc0826cb96537"; + sha256 = "fa2b3f9de332a40df46b32f4ab5451fb16fa400454b2269543c08f8ee156b52e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/nl/thunderbird-78.1.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f9292bdc80157d2e2076b7be81af66813aeabc722356c3e514ae18638720192b"; + sha256 = "4439bfa046cea7d823e12f837625fda5ce1953ded9f0af9dec252d9d58dae04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nn-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/nn-NO/thunderbird-78.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "956b0c99d47845c9b0a1c7d101f576e5b4a7a514893da938d36616db9f5bfce9"; + sha256 = "3a9fc65618790837bb6d998c5ef6ec01019db8240b01c904a61c463bf17b848d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pa-IN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pa-IN/thunderbird-78.1.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "50cdbca944f98eef40479a9070b58729f7f743bda55925c74b6410c163ac784f"; + sha256 = "b433e58bb809a2f47cfc82848db5145cd92280725ce3b5d1bfafdc0e5f616076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pl/thunderbird-78.1.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fe2de7bba7b057022e02f040bb65ddfababb39999fcc573e65cd2bc0c848cf41"; + sha256 = "9ec00ac58795a5e7947a9effa2646081d4fdeed801f7e91ed651d2b457317774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-BR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pt-BR/thunderbird-78.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6b219f0cb715f2d5a3fa72f34b079b401d850f571a9b2ad21c97871a5b83b9af"; + sha256 = "fe187123f5c9b472de5154e126a1d736e1eae0d88fe11f5ca1c771006f37202f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-PT/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pt-PT/thunderbird-78.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "deca0d48ba8bb002444c3649514a2d7e39a698c75382ab53df080ff2c484eee4"; + sha256 = "6a09eab3e662f093ec5428c3d5b0dabd5ef8ca8a734f92bb52088a545dd5707c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/rm/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/rm/thunderbird-78.1.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3799e8dbdf5edd6be276ce4634418c1bbc52862a5366d43460e1bf727f11c27d"; + sha256 = "87f96161f0d415ed24abd2bf7d88ffcadf327910b23c285a4fa7126612011cb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ro/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ro/thunderbird-78.1.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a599d873eeb1ecff1c7df37ff89b9e71527192d65c3b0e593d87b0c68bc28062"; + sha256 = "6b6f0125a4354320abf34333353cf52a30ebaa764d1ae17b1fa48e7d1ad53b52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ru/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ru/thunderbird-78.1.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b488c44be9c1acd9715f9b872e61f1c8f4a0cedcdda6d291f8ad165013b5f06b"; + sha256 = "3d3c72390d333abd6710b0653f8c95e0283b50580cc6aad3e7c38a90c369cb9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/si/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/si/thunderbird-78.1.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b60c002886df2ab941fb5c445d6b33d31de8a2d9feb15523c2af561da7ab09d9"; + sha256 = "f436f26b6baa8cbcbd407133c099669c45bea518202a34d7538260bd76fc7b19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sk/thunderbird-78.1.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0c59cc63c01ddf7564331a6a9f2ba89c5ab263c227f517c9fa066a3c7f8e8a55"; + sha256 = "ab89336f29fdda1525e827f4f4419b2eb0137279717511ca3de32f221d5335fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sl/thunderbird-78.1.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2039f31a243f43553c893232d79a27cbc249bf73f083ed05b2914333dea6c5bb"; + sha256 = "fb43a4f2b360774a1c7e337a38bf9388cc1e453b987b7d8ac38e2dde255ae3f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sq/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sq/thunderbird-78.1.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f46914a1a18d989c385f29cd34f95f409f5d56d601b279d8106aa8f224a61c26"; + sha256 = "1029c843c2ff06842dca2af05054d60b87927674b36f6c6890118143f5aeadec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sr/thunderbird-78.1.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a72776da8c85de9f970f1a55ef2f56d2e9fd3fd73b7e6d39761ab6bca7066980"; + sha256 = "e20f00961f70dec27c306c9442315a4e5061840604650ec62123d1cc74a3006b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sv-SE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sv-SE/thunderbird-78.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "466378b9542c4a8550fc6e7143fe56e04e5ae15a20bc6ddec5da4eea231fb928"; + sha256 = "1e2d290254f610e1dd8c4d8037e9aaad3abee6d7b7373471e53ff698b736af83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/th/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/th/thunderbird-78.1.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7943c3257f4ef6a842008b0fd6171f87e99043263ccaf4666850ccebec28725f"; + sha256 = "1a80c2986f7f69228c1ae6f2829d3502154ccc9e92ea8bdb2530b82b3a933349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/tr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/tr/thunderbird-78.1.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a5120107b8fc5418c49d70cf61730ea2b8e833d21d8e6b797d64d2637803709b"; + sha256 = "136a7cd134f8782537a8063da75fca86340597da5832dc87468b9a353aba0b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/uk/thunderbird-78.1.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a85b53cd72b313e49ab439f9b1900c4e8f7610be085d757bda4123f5e9293cd8"; + sha256 = "ad0ebfd63617b7807fcb658744650a95c5a8a03328d152f64c48f8ed46a5825a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uz/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/uz/thunderbird-78.1.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "7dcce5d00f6e83b756f3b83067fcf78d00240cb540815e3e63d40302272d5e4c"; + sha256 = "4af26e15a2e1afb84ce9ff0024286b31b6f77b6810897906d7139ffa884ca623"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/vi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/vi/thunderbird-78.1.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4b94684748f81444d8a8beeac54053673bb4705b6284f8b5d86a5f03fb9a2ce8"; + sha256 = "4695f995cbf7e62eab32aa17a8c9b5cd01c7ccc16e50911436e940b0ff1a28bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-CN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/zh-CN/thunderbird-78.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "346222badaa7b34a7e21f28045c68be815d187a5d34432446b7ffb8b959fea0e"; + sha256 = "d70c7e9667240f2fc9f705a66be84c2decb691af581e73bf2637f97b08f3f14d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-TW/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/zh-TW/thunderbird-78.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "deecd348a6c260bc50b1e112966d736ee4bc211a1f42f791f37b10a69f7c1c2a"; + sha256 = "1359fc351ef156bbc00a134de4f7dc878fa1bfa77a461ac289f90dc7f870ecd4"; } ]; } From a1f1297f45c7c53023747a9806f36ed152342901 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 31 Jul 2020 08:33:18 +0900 Subject: [PATCH 074/214] thunderbird: fix update script --- .../applications/networking/mailreaders/thunderbird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index eb55976e2e9..09faec5feb2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -316,7 +316,7 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = import ./../../browsers/firefox/update.nix { - attrPath = "thunderbird"; + attrPath = "thunderbird-78"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell; From 60977e8d88ad1a4e566eb746ca2019e3afaac633 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 31 Jul 2020 08:33:33 +0900 Subject: [PATCH 075/214] thunderbird: 78.0.1 -> 78.1.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 09faec5feb2..c68a4036391 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.0.1"; + version = "78.1.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1lh0rsibkd3m6fk4mp07payn5srambslqqlsqkg6mc11rbaim0b4m5256iq670r614nb8w61yc8d0khhpyqgrvlxd4zgdv6s3n17d7w"; + "2m1gqq11k5cql5f49mwrfjk06rm2r24lf9l0hrvj569gqxckyh8wdch3dn339x3yn5fhxqlw0l770p2ssr2kkllv3yy20qqzjqgfpgh"; }; nativeBuildInputs = [ From 250885d0caed9ab910e801d7a3c21d6f83d4cdae Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:48:19 -0400 Subject: [PATCH 076/214] nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without distributedBuilds, you can’t use buildMachines flag. Fixes #56593 --- nixos/modules/services/misc/nix-daemon.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0b3d7f3f03c..8441b063e96 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -439,6 +439,13 @@ 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/" ]; From 5885473a7aa89d58ddab4b20e357a34fa3e73667 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 01:16:19 +0000 Subject: [PATCH 077/214] googler: 4.1 -> 4.2 --- pkgs/applications/misc/googler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index fba36f5e8ac..58cddc1484e 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "googler"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "04d7n2l159s7c9xzvyvbnbii1k3zdbajagpx09x1l692cwjbvpxw"; + sha256 = "0c480wzc7q4pks1f6mnayr580c73jhzshliz4hgznzc7zwcdf41w"; }; propagatedBuildInputs = [ python ]; From 67b6e5639126ab6e8ec5d2b303aa9736a626b609 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 30 Jul 2020 21:38:24 -0500 Subject: [PATCH 078/214] nixos/nix-daemon.nix: fix nix.distributedBuilds assertion --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 971ecdf48e1..924a007efc6 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -502,7 +502,7 @@ in assertions = [ { - assertion = (!config.nix.distributedBuilds) && config.nix.buildMachines != []; + assertion = config.nix.distributedBuilds || config.nix.buildMachines == []; message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines"; } ]; From db3a38fbedf99432d5b90971e5e19cdb24f591a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 02:49:21 +0000 Subject: [PATCH 079/214] kubetail: 1.6.10 -> 1.6.12 --- pkgs/applications/networking/cluster/kubetail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 114c5f5af15..7e6a66eea50 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.10"; + version = "1.6.12"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "0bg872n9fs6pl03rmjny9sgby718yznx9jwi5rx3hi4km3ha9j0b"; + sha256 = "0hayfd7yvdhd2klfmhvl04hfqk0nfsimjyg3kbq8c5dbgbpz05nd"; }; installPhase = '' From a1f1f066551833d2c845469b7343baba001a1315 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 02:45:00 +0000 Subject: [PATCH 080/214] kubeseal: 0.12.4 -> 0.12.5 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index c739be76324..7af4f787a86 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "1abm63fb40zky5i97wm6h8ifmdf6i71ws9y7217hv2rnja37f4zd"; + sha256 = "135ls3ngdz43qx6a49faczs2vdmccalsgak2hg0rairpy2jxym37"; }; vendorSha256 = null; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} \ No newline at end of file +} From 3c5750d1cd521cf768aa2ba4d7a396d473be751b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 13:58:04 +1000 Subject: [PATCH 081/214] buildGoModule packages: editorconfig fixes --- pkgs/applications/editors/glow/default.nix | 2 +- pkgs/applications/graphics/pdfcpu/default.nix | 2 +- pkgs/applications/misc/archiver/default.nix | 2 +- pkgs/applications/misc/exercism/default.nix | 2 +- pkgs/applications/misc/geoipupdate/default.nix | 2 +- pkgs/applications/misc/gomatrix/default.nix | 2 +- pkgs/applications/misc/sampler/default.nix | 2 +- pkgs/applications/misc/terminal-parrot/default.nix | 2 +- pkgs/applications/misc/todoist/default.nix | 2 +- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- pkgs/applications/networking/cluster/atlantis/default.nix | 2 +- .../networking/cluster/docker-machine/hyperkit.nix | 2 +- .../applications/networking/cluster/docker-machine/kvm2.nix | 2 +- pkgs/applications/networking/cluster/fluxctl/default.nix | 2 +- .../networking/cluster/hetzner-kube/default.nix | 2 +- pkgs/applications/networking/cluster/kube3d/default.nix | 2 +- pkgs/applications/networking/cluster/kubeseal/default.nix | 2 +- pkgs/applications/networking/cluster/kubespy/default.nix | 4 ++-- pkgs/applications/networking/cluster/kubeval/default.nix | 2 +- pkgs/applications/networking/cluster/linkerd/default.nix | 2 +- pkgs/applications/networking/cluster/prow/default.nix | 2 +- .../cluster/terraform-providers/elasticsearch/default.nix | 2 +- .../networking/cluster/terraform-providers/lxd/default.nix | 2 +- pkgs/applications/networking/cluster/terragrunt/default.nix | 2 +- pkgs/applications/networking/gmailctl/default.nix | 2 +- pkgs/applications/networking/hydroxide/default.nix | 2 +- pkgs/applications/networking/ipfs-cluster/default.nix | 2 +- .../applications/networking/mailreaders/hasmail/default.nix | 2 +- pkgs/applications/networking/p2p/magnetico/default.nix | 2 +- pkgs/applications/networking/websocketd/default.nix | 2 +- .../version-management/git-and-tools/ghq/default.nix | 2 +- .../version-management/git-and-tools/git-bug/default.nix | 2 +- .../version-management/git-and-tools/lab/default.nix | 2 +- .../version-management/git-and-tools/lefthook/default.nix | 2 +- pkgs/applications/version-management/sourcehut/builds.nix | 2 +- pkgs/applications/version-management/sourcehut/git.nix | 2 +- pkgs/applications/virtualization/firectl/default.nix | 2 +- pkgs/applications/virtualization/gvisor/containerd-shim.nix | 2 +- pkgs/development/compilers/tinygo/default.nix | 2 +- pkgs/development/interpreters/joker/default.nix | 2 +- pkgs/development/libraries/packr/default.nix | 2 +- pkgs/development/libraries/protolock/default.nix | 2 +- pkgs/development/tools/azcopy/default.nix | 2 +- .../tools/continuous-integration/drone-cli/default.nix | 2 +- .../tools/continuous-integration/drone/default.nix | 2 +- pkgs/development/tools/database/dbmate/default.nix | 2 +- pkgs/development/tools/dive/default.nix | 2 +- pkgs/development/tools/go-protobuf/default.nix | 2 +- pkgs/development/tools/go-tools/default.nix | 2 +- pkgs/development/tools/godef/default.nix | 2 +- pkgs/development/tools/gofumpt/default.nix | 2 +- pkgs/development/tools/gomodifytags/default.nix | 2 +- pkgs/development/tools/gopkgs/default.nix | 2 +- pkgs/development/tools/gotestsum/default.nix | 2 +- pkgs/development/tools/gotools/default.nix | 2 +- pkgs/development/tools/kcli/default.nix | 2 +- pkgs/development/tools/kubeprompt/default.nix | 2 +- pkgs/development/tools/misc/go-license-detector/default.nix | 2 +- pkgs/development/tools/misc/mkcert/default.nix | 2 +- pkgs/development/tools/misc/terracognita/default.nix | 2 +- pkgs/development/tools/mod/default.nix | 2 +- pkgs/development/tools/packet-cli/default.nix | 2 +- pkgs/development/tools/pet/default.nix | 2 +- pkgs/development/tools/proto-contrib/default.nix | 2 +- pkgs/development/tools/protoc-gen-doc/default.nix | 2 +- pkgs/development/tools/reftools/default.nix | 2 +- pkgs/development/tools/renderizer/default.nix | 2 +- pkgs/development/tools/richgo/default.nix | 2 +- pkgs/development/tools/run/default.nix | 2 +- pkgs/development/web/flyctl/default.nix | 2 +- pkgs/development/web/minify/default.nix | 2 +- pkgs/servers/caddy/default.nix | 2 +- pkgs/servers/dns/coredns/default.nix | 2 +- pkgs/servers/echoip/default.nix | 2 +- pkgs/servers/gortr/default.nix | 2 +- pkgs/servers/hasura/cli.nix | 2 +- pkgs/servers/matterbridge/default.nix | 2 +- pkgs/servers/minio/default.nix | 2 +- pkgs/servers/monitoring/mtail/default.nix | 2 +- pkgs/servers/monitoring/sensu-go/default.nix | 2 +- pkgs/servers/monitoring/telegraf/default.nix | 2 +- pkgs/servers/monitoring/thanos/default.nix | 2 +- pkgs/servers/nosql/influxdb/default.nix | 2 +- pkgs/servers/sql/dolt/default.nix | 2 +- pkgs/servers/traefik/default.nix | 2 +- pkgs/servers/web-apps/shiori/default.nix | 2 +- pkgs/shells/zsh/antibody/default.nix | 2 +- pkgs/shells/zsh/zsh-history/default.nix | 2 +- pkgs/tools/admin/aws-vault/default.nix | 2 +- pkgs/tools/admin/berglas/default.nix | 2 +- pkgs/tools/admin/certigo/default.nix | 2 +- pkgs/tools/admin/clair/default.nix | 2 +- pkgs/tools/admin/iamy/default.nix | 2 +- pkgs/tools/audio/mpd-mpris/default.nix | 2 +- pkgs/tools/backup/wal-g/default.nix | 2 +- pkgs/tools/misc/3mux/default.nix | 2 +- pkgs/tools/misc/chezmoi/default.nix | 2 +- pkgs/tools/misc/clipman/default.nix | 2 +- pkgs/tools/misc/docui/default.nix | 2 +- pkgs/tools/misc/gotify-cli/default.nix | 2 +- pkgs/tools/misc/libgen-cli/default.nix | 2 +- pkgs/tools/misc/mutagen/default.nix | 2 +- pkgs/tools/misc/neo-cowsay/default.nix | 2 +- pkgs/tools/misc/pg_flame/default.nix | 2 +- pkgs/tools/misc/pgcenter/default.nix | 2 +- pkgs/tools/misc/pgmetrics/default.nix | 2 +- pkgs/tools/misc/powerline-go/default.nix | 2 +- pkgs/tools/misc/up/default.nix | 2 +- pkgs/tools/networking/cassowary/default.nix | 2 +- pkgs/tools/networking/curlie/default.nix | 2 +- pkgs/tools/networking/dnsproxy/default.nix | 2 +- pkgs/tools/networking/frp/default.nix | 2 +- pkgs/tools/networking/hey/default.nix | 2 +- pkgs/tools/networking/minio-client/default.nix | 2 +- pkgs/tools/networking/nebula/default.nix | 2 +- pkgs/tools/networking/obfs4/default.nix | 2 +- pkgs/tools/networking/pixiecore/default.nix | 2 +- pkgs/tools/networking/shadowfox/default.nix | 2 +- pkgs/tools/networking/termshark/default.nix | 2 +- pkgs/tools/networking/v2ray/generic.nix | 2 +- pkgs/tools/networking/yggdrasil/default.nix | 2 +- pkgs/tools/package-management/mynewt-newt/default.nix | 2 +- pkgs/tools/package-management/nfpm/default.nix | 2 +- pkgs/tools/security/bettercap/default.nix | 2 +- pkgs/tools/security/browserpass/default.nix | 2 +- pkgs/tools/security/gobuster/default.nix | 2 +- pkgs/tools/security/gopass/default.nix | 2 +- pkgs/tools/security/saml2aws/default.nix | 2 +- pkgs/tools/security/sops/default.nix | 2 +- pkgs/tools/system/ctop/default.nix | 2 +- pkgs/tools/system/gotop/default.nix | 2 +- pkgs/tools/system/jump/default.nix | 2 +- pkgs/tools/text/gjo/default.nix | 2 +- 133 files changed, 136 insertions(+), 136 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index fd1e61463f8..c6f5a23235a 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ ehmry filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index c03f5f8ed89..e6037c6fce3 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 0e345b1e273..8602282dd6b 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index d983458a7ce..991123bf60b 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.rbasso ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 2b0fc88ccf9..9f4220c59ee 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix index 0cf6c966093..77d63a93ae4 100644 --- a/pkgs/applications/misc/gomatrix/default.nix +++ b/pkgs/applications/misc/gomatrix/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ skykanin ]; homepage = "https://github.com/GeertJohan/gomatrix"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index a1f4c8f41bc..f2f6c5854f0 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ uvnikita ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index accaf62c60e..a283f744929 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = [ maintainers.heel ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index b3b3561227f..e7ba56f6f25 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 40949890505..834503484a0 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -25,16 +25,16 @@ buildGoModule rec { -X github.com/argoproj/argo-cd/common.gitCommit=${commit} -X github.com/argoproj/argo-cd/common.gitTreeState=clean ''; - + # run packr to embed assets preBuild = '' packr ''; - + meta = with lib; { description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes"; homepage = "https://github.com/argoproj/argo"; license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 19a62c1dc17..3cab2a9cedf 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ jpotier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 83c03671bf7..71996e43a9b 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ atkinschang ]; platforms = platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 2e2115b4b71..4092a5b5d3b 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 45480e8c30f..97557fa9895 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 98edd849bac..2c17f411474 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -25,4 +25,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ eliasp ]; platforms = lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index a65ac2ec98b..12d74121dc8 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -39,4 +39,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index c739be76324..0ed6d38f534 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index 6b08f43589c..17f66881ad6 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -10,9 +10,9 @@ buildGoModule rec { repo = "kubespy"; sha256 = "1p0qmn6458pa9la6zkvyrkgs2rhzfwsk9m3rk5fkmcfbh7b031r8"; }; - + vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq"; - + # TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed. # postInstall = '' # for shell in bash zsh; do diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 10d75435e42..f537b238ae8 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ johanot nicknovitski ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 331cef0444c..ac3143ae668 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -21,4 +21,4 @@ buildGoModule { license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 4ad685418d3..94924822b14 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 6afa63c4a52..4a3d0bc16b3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ basvandijk ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index 69d93ac1c75..217dacc0ef7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ gila ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index d65e15373b3..56fda026192 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -30,4 +30,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index a9b9436a211..1be44cbb250 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = [ maintainers.doronbehar ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 318867922c4..cdccdddbf38 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index ee9e368a659..261e1e718a5 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ jglukasik ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index b02788e6772..90c6c6b6e40 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -38,4 +38,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 1dcf42b7ece..4dc5503e4ec 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -30,4 +30,4 @@ buildGoModule rec { badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 17f42b5ece4..37e13ffa40a 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.bjornfor ]; license = licenses.bsd2; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 288116ce2c7..ad128e9f027 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -29,4 +29,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 0903af7499a..d89d21623ea 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -35,4 +35,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ royneary ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index eaab2e6c505..91ce7e3fba8 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -31,4 +31,4 @@ buildGoModule rec { maintainers = with maintainers; [ marsam dtzWill ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index d86fca1a6d4..728c24f5861 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rencire ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 1bf78c548ee..735a4c8f230 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -57,4 +57,4 @@ in buildPythonPackage rec { license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 992b889c831..2b882176321 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -79,4 +79,4 @@ in buildPythonPackage rec { license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 47ae4637b57..9877527034a 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix index 97623511222..e191ad2ef6c 100644 --- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -33,4 +33,4 @@ buildGoModule rec { maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index b3176cac78a..5d9ee3b7ced 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v"; }; - + overrideModAttrs = (_: { patches = []; preBuild = '' diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index efe670f9767..2eeaa6f2e51 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -26,4 +26,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ andrestylianos ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index ec2de274ccb..30276bdaf9a 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -53,4 +53,4 @@ in symlinkJoin{ name = "packr"; paths = [p1 p2]; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index 2bdaa3ab7b6..d917541bcba 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ groodt ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index bfc3f57909c..d89c7f1e001 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index bbd2c2f1935..126e2005046 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -25,4 +25,4 @@ in buildGoModule rec { license = licenses.asl20; description = "Command line client for the Drone continuous integration server."; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 0b31cc381a8..b9598f4c6d0 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 00babb3c824..329d92a9fa5 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.manveru ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index b48d7425b14..d2d01004923 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ marsam spacekookie ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 62a75026920..e1bd62e7dec 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.bsd3; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 8362d1db02c..c3d7e8ac903 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rvolosatovs kalbasit ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index a1dfac9b79b..3fb4fcaa84b 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; license = stdenv.lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index adb2ef463f7..67b7e1e9230 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index e90844167dd..bf8c67979dc 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index c1773333b5d..d90f688ae35 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index fc9fdee0b39..45be855a661 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ endocrimes ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index a7858474a42..922bb369d2d 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -47,4 +47,4 @@ buildGoModule rec { # Do not copy this without a good reason for enabling # In this case tools is heavily coupled with go itself and embeds paths. allowGoReference = true; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index fece8c17cea..61b4fa4888a 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ cswank ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index bac22169edf..b0fb0261404 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ jlesquembre ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 22b85a1fa33..8eba3f612a1 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ dtzWill ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 218473aee78..6a8e76815cb 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 6141b0b9997..6d7e10f4609 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 839594f4cc8..6593430ff4b 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index 546b441db4b..40561671c59 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index d37c529ecf9..fde668e8e45 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 90253ed5704..2bd1ed08101 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 5579d006e97..30457543213 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -27,4 +27,4 @@ buildGoModule { license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 7f8d1be1a52..02e448918b2 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 877fdeea8f2..d3f010f1916 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = with maintainers; [ yurrriq ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 4fc4d4abc61..03b0af119b7 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 518cc3e2557..f769ab1ebe2 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ rawkode filalex77 ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2437962191e..bab57353e6d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -27,4 +27,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ aaronjanse ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index b813e87b543..26e73e55346 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 415f8537185..5a106d2923e 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -33,4 +33,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 47b6c61dd39..13aedc34025 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index 18952d01c91..840d7a2d4e6 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -25,4 +25,4 @@ buildGoModule { license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 5874c3320a1..84ecc01eb42 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index a4d8d147fda..d5815c3662b 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -30,4 +30,4 @@ buildGoModule rec { inherit (hasura-graphql-engine.meta) license homepage maintainers; description = "Hasura GraphQL Engine CLI"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index ee58671a854..b26e7ea9827 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 9f9796b3a5e..74293be7438 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -28,4 +28,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 5e51750a795..2fceee9d56a 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -27,4 +27,4 @@ buildGoModule rec { homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index c71a07c9e8e..345e1fa97b0 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -66,4 +66,4 @@ in pname = "sensu-go-agent"; subPackages = [ "cmd/sensu-agent" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 7b284ac122a..dbc0b4b4c59 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -31,4 +31,4 @@ buildGoModule rec { homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 9970fab8ed2..2da3a8dc873 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ basvandijk ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 4bddd77248a..6059499c55c 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 265f78af895..18c9a767cdf 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ danbst ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 7b21ed5951c..29804065c31 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index dbea567b7e1..d6fdb9d25b3 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ minijackson ]; }; -} \ No newline at end of file +} diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index dc63c308bcc..baceb6fdb8c 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} \ No newline at end of file +} diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 47f590a78f2..778e19f1bd4 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -33,4 +33,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 0216660e1ec..0a10dde389a 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index ecafb139782..db135fa2792 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 86873d90514..4c524886a52 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 77e0638d0d3..6e033d2b36b 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 8e79959ba37..58de0c1506a 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 3c736258cbb..650bfd14a70 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -29,4 +29,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 2f2541c41cb..c989a91fa82 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -31,4 +31,4 @@ buildGoModule rec { description = "An archival restoration tool for PostgreSQL"; maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 81ca4d94628..79d31b60d5b 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { # TODO: fix modules build on darwin broken = stdenv.isDarwin; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 6ff736167be..c909c6ee0f7 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 5146e25da50..149e3b920e3 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -27,4 +27,4 @@ buildGoModule rec { description = "A simple clipboard manager for Wayland"; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index f3f89d0a667..031a2e88369 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index cd50271a2e6..55603128f4e 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -23,4 +23,4 @@ buildGoModule rec { description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index 51e390f6c0c..e2a92213402 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -36,4 +36,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ zaninime ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 1271c494851..0ae3be0d3f1 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index e50960d063c..920f0667d25 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = with licenses; [artistic1 /* or */ gpl3]; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index 6fe2e814fa4..718d6a2a2d2 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 89f1e606e63..1dd674ba702 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 9323ea0b9e4..44194314d77 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 33ab2bbc729..d889eb1cc16 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index f0f9cf4cee8..0b4d2cbcbe9 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index e76a505fe9d..5cc34703828 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index cb1cf8d97fa..334202f7f8b 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8c98f316aae..4bb639bdf23 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 588f8a8c1cb..b6b1d58e6e0 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index 8ed6ecbbf26..d92f761928b 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 4e81321dc62..477f621e90f 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -24,4 +24,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 69fc3e7a8b0..0a8005a184c 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -40,4 +40,4 @@ buildGoModule rec { platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 784c6d5c638..6843103afa1 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -18,4 +18,4 @@ buildGoModule rec { repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index 60d2a0986b1..d4a421dd892 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index f4cc57c9c8b..fdfc32a8e97 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 7933cad687a..eb0ef2f2fa2 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -31,4 +31,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/v2ray/generic.nix b/pkgs/tools/networking/v2ray/generic.nix index a6b98c4ee88..48a5cb77ac9 100644 --- a/pkgs/tools/networking/v2ray/generic.nix +++ b/pkgs/tools/networking/v2ray/generic.nix @@ -47,4 +47,4 @@ in runCommand "v2ray-${version}" { makeWrapper "$file" "$out/bin/$(basename "$file")" \ --set-default V2RAY_LOCATION_ASSET ${assetsDrv} done -'' \ No newline at end of file +'' diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 438d620d2b5..7eec15ad93b 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ ehmry gazally lassulus ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index ce155b72fc3..39fcc00fe22 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 17fa6fad83a..7fc87534c1d 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index b6cec239f1e..97b38359f66 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ y0no ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 2dd03bc465d..fdb40b566e7 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -51,4 +51,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index 8b808551149..c7366d02ac8 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ pamplemousse ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 6b9042e5691..a174f8edbae 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -61,4 +61,4 @@ buildGoModule rec { well, providing a stellar user experience and a sane, simple interface. ''; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 144ac3a95c8..a12ed233ca2 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -39,4 +39,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 74f455af6ab..3010c37a010 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 1c46caaf932..2a6d3253bf8 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ apeyroux marsam ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 0d8deb11b9e..9503153ea78 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index fe0138783d3..b61bcbf4d88 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index 74a5c87a760..fcca9aace2f 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} \ No newline at end of file +} From afd895debbd40d1d12d2d5de86cc43c1568ec1b4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 14:07:43 +1000 Subject: [PATCH 082/214] buildGoPackage packages: editorconfig fixes --- pkgs/applications/blockchains/quorum.nix | 2 +- pkgs/development/tools/go-repo-root/default.nix | 2 +- pkgs/development/tools/golint/default.nix | 2 +- pkgs/development/tools/gotags/default.nix | 2 +- pkgs/development/tools/leaps/default.nix | 3 +-- pkgs/development/web/shopify-themekit/default.nix | 2 +- pkgs/servers/cayley/default.nix | 2 +- pkgs/servers/mesos-dns/default.nix | 2 +- pkgs/servers/skydns/default.nix | 2 +- pkgs/servers/trickster/trickster.nix | 2 +- pkgs/tools/misc/gawp/default.nix | 2 +- pkgs/tools/misc/ical2org/default.nix | 2 +- pkgs/tools/misc/upower-notify/default.nix | 2 +- pkgs/tools/networking/s3gof3r/default.nix | 2 +- pkgs/tools/virtualization/govc/default.nix | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index f745860f661..5a525dec999 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildGoPackage, git, which }: - + buildGoPackage rec { pname = "quorum"; version = "2.5.0"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 7fcec1937c7..3392a19b636 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "go-repo-root"; version = "20140911-${stdenv.lib.strings.substring 0 7 rev}"; rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; - + goPackagePath = "github.com/cstrahan/go-repo-root"; src = fetchgit { diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index b0b53f7699c..da8d5fb286b 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "lint"; version = "20181026-${stdenv.lib.strings.substring 0 7 rev}"; rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; - + goPackagePath = "golang.org/x/lint"; excludedPackages = "testdata"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 881ae7e24d4..5499a22ec01 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "gotags"; version = "20150803-${stdenv.lib.strings.substring 0 7 rev}"; rev = "be986a34e20634775ac73e11a5b55916085c48e7"; - + goPackagePath = "github.com/jstemmer/gotags"; src = fetchgit { diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 569ad6eb3cf..bb8673d4d56 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; goDeps = ./deps.nix; - + meta = { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; @@ -23,4 +23,3 @@ buildGoPackage rec { platforms = stdenv.lib.platforms.unix; }; } - diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index b8bc3deaca1..7f55232edb7 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -22,4 +22,4 @@ buildGoPackage rec { maintainers = with maintainers; [ maintainers."1000101" ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index c62a28e41bd..0d89d2f1165 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { -ldflags= -X=main.Version=${version} ''; - + meta = { homepage = "https://cayley.io/"; description = "A graph database inspired by Freebase and Knowledge Graph"; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 8430f2d61e8..e26b13bb25a 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "mesos-dns"; version = "0.1.2"; rev = "v${version}"; - + goPackagePath = "github.com/mesosphere/mesos-dns"; # Avoid including the benchmarking test helper in the output: diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 2fc67008b89..176b41a1fe2 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "skydns"; version = "2.5.3a"; rev = version; - + goPackagePath = "github.com/skynetservices/skydns"; src = fetchFromGitHub { diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index 3c03193e770..15c163d16f1 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -24,4 +24,4 @@ buildGoPackage rec { maintainers = with maintainers; [ maintainers."1000101" ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 865ce3c440d..2856dd48559 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "gawp"; version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; - + goPackagePath = "github.com/martingallagher/gawp"; src = fetchgit { diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 095336b7df5..ffdb4e93f58 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -23,5 +23,5 @@ buildGoPackage rec { maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; }; - + } diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 607cb47ed4e..2258f31fd31 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { pname = "upower-notify"; version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; - + goPackagePath = "github.com/omeid/upower-notify"; src = fetchgit { diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index d53d60333ba..0930be914cf 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "s3gof3r"; version = "20151109-${stdenv.lib.strings.substring 0 7 rev}"; rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445"; - + goPackagePath = "github.com/rlmcpherson/s3gof3r"; src = fetchgit { diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 08999aca97b..30cf09d2942 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildGoPackage }: - + buildGoPackage rec { pname = "govc"; version = "0.23.1"; From 7d58c271b8ac0070e1a783f31c01682254a4c813 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 14:08:19 +1000 Subject: [PATCH 083/214] buildRustPackage packages: editorconfig fixes --- pkgs/applications/misc/rsclock/default.nix | 3 +-- pkgs/development/tools/rq/default.nix | 2 +- pkgs/servers/sozu/default.nix | 2 +- pkgs/tools/misc/heatseeker/default.nix | 2 +- pkgs/tools/networking/tdns-cli/default.nix | 2 +- pkgs/tools/nix/nixpkgs-fmt/default.nix | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 4f63ed057b7..b508a73de1d 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - + cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; meta = with stdenv.lib; { @@ -21,4 +21,3 @@ rustPlatform.buildRustPackage rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 89ba58ea5f5..edd24a8aaa2 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; - buildInputs = [ llvmPackages.clang-unwrapped v8 ] + buildInputs = [ llvmPackages.clang-unwrapped v8 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; configurePhase = '' diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index f7feda5e916..1e808358705 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -19,4 +19,4 @@ rustPlatform.buildRustPackage rec { license = licenses.agpl3; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index e0b8c02a08e..207788ed61d 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple # as a substitution, and this works since we have the path to coreutils stty. patchPhase = '' - substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" + substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" ''; # some tests require a tty, this variable turns them off for Travis CI, diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 20bc456eea8..681109712ab 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "tdns-cli"; version = "0.0.5"; - + src = fetchFromGitHub { owner = "rotty"; repo = name; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 53e70ad7bd7..432f13d86f4 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; }; - + cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; meta = with lib; { From 86082feb3327164c9c76974a9c6819da1e44a5be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 04:39:37 +0000 Subject: [PATCH 084/214] moosefs: 3.0.113 -> 3.0.114 --- pkgs/tools/filesystems/moosefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 8ceb3d7c0aa..df3dd661d75 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.113"; + version = "3.0.114"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0h3dhj6lznbkvmkr21w58avl9fa4pgj73fv0lkzcagksyyh5l0n9"; + sha256 = "0bilrzzlg599xy21cm7r0xb2sanngr74j3z03xgybcm10kl97i7j"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From bf195e388b863a5aaea6ac99684ddf95456eb637 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jul 2020 00:00:00 -0500 Subject: [PATCH 085/214] go-tools: 2020.1.4 -> 2020.1.5 https://github.com/dominikh/go-tools/releases/tag/2020.1.5 --- pkgs/development/tools/go-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index c3d7e8ac903..58643c893f0 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.4"; + version = "2020.1.5"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "182j3zzx1bj4j4jiamqn49v9nd3vcrx727f7i9zgcrgmiscvw3mh"; + sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za"; }; vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; From e4980d99d2a7859288747944087d9ff30ad27c59 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jul 2020 00:00:00 -0500 Subject: [PATCH 086/214] googler: install completions --- pkgs/applications/misc/googler/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 58cddc1484e..de93dc6f43e 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ stdenv, fetchFromGitHub, python, installShellFiles }: stdenv.mkDerivation rec { pname = "googler"; @@ -11,15 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0c480wzc7q4pks1f6mnayr580c73jhzshliz4hgznzc7zwcdf41w"; }; - propagatedBuildInputs = [ python ]; + buildInputs = [ python ]; + + nativeBuildInputs = [ installShellFiles ]; makeFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + installShellCompletion --bash --name googler.bash auto-completion/bash/googler-completion.bash + installShellCompletion --fish auto-completion/fish/googler.fish + installShellCompletion --zsh auto-completion/zsh/_googler + ''; + meta = with stdenv.lib; { homepage = "https://github.com/jarun/googler"; description = "Google Search, Google Site Search, Google News from the terminal"; license = licenses.gpl3; maintainers = with maintainers; [ koral filalex77 ]; - platforms = platforms.unix; + platforms = python.meta.platforms; }; } From 65ef6035cce6cf97aec5af1d18b063b7e9d2d70e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 05:01:15 +0000 Subject: [PATCH 087/214] mutagen: 0.11.5 -> 0.11.6 --- pkgs/tools/misc/mutagen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 1271c494851..c2ce1f12bc8 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "0z2bf412zfap91ygp7v06vif87d1cxj2jlc0jvfv7fm61801piij"; + sha256 = "0gn0ra2fbnggp82h910hz34b2l5fk7f0p9dk7zl50wxrkydfzrk3"; }; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; From e2f49f7db822032598c22f5dca4a4f989695b9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Jul 2020 06:02:16 +0100 Subject: [PATCH 088/214] dependabot: automatically update github actions --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..5ace4600a1f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From b3d71cd63dc6ee60894d8d061b9551b57cb5cd33 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:06:53 +1000 Subject: [PATCH 089/214] doc/*: editorconfig fixes --- doc/builders/packages/urxvt.xml | 2 +- doc/languages-frameworks/beam.xml | 2 +- doc/languages-frameworks/emscripten.section.md | 17 ++++++++--------- doc/languages-frameworks/go.xml | 2 +- doc/languages-frameworks/rust.section.md | 2 +- doc/old/cross.txt | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/doc/builders/packages/urxvt.xml b/doc/builders/packages/urxvt.xml index f85680cecc4..135cc82a0b5 100644 --- a/doc/builders/packages/urxvt.xml +++ b/doc/builders/packages/urxvt.xml @@ -50,7 +50,7 @@ map (p: p.name) pkgs.rxvt-unicode.plugins In addition to plugins the options extraDeps and perlDeps can be used to install extra packages. - extraDeps can be used, for example, to provide + extraDeps can be used, for example, to provide xsel (a clipboard manager) to the clipboard plugin, without installing it globally: rxvt-unicode.override { configure = { availablePlugins, ... }: { diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 278535237c2..1d307e1d6dc 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -68,7 +68,7 @@ How to Install BEAM Packages - BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. + BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path beamPackages.rebar3: diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index 80e1094809a..3663f962d5f 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -21,11 +21,11 @@ Modes of use of `emscripten`: * **Declarative usage**: This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`. - * build and install all packages: - * `nix-env -iA emscriptenPackages` - - * dev-shell for zlib implementation hacking: - * `nix-shell -A emscriptenPackages.zlib` + * build and install all packages: + * `nix-env -iA emscriptenPackages` + + * dev-shell for zlib implementation hacking: + * `nix-shell -A emscriptenPackages.zlib` ## Imperative usage @@ -90,7 +90,7 @@ See the `zlib` example: libz.so.${old.version} -I . -o example.js echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js + ${pkgs.nodejs}/bin/node ./example.js set +x if [ $? -ne 0 ]; then @@ -112,7 +112,7 @@ See the `zlib` example: ### Usage 2: pkgs.buildEmscriptenPackage -This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. +This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. xmlmirror = pkgs.buildEmscriptenPackage rec { name = "xmlmirror"; @@ -163,7 +163,7 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel checkPhase = '' ''; - }; + }; ### Declarative debugging @@ -182,4 +182,3 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from. If in trouble, ask the maintainers. - diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index ff39276f640..64c3615bfb7 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -72,7 +72,7 @@ pet = buildGoModule rec { When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. - If you'd like to not have to update this field on dependency changes, + If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;' diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index ec418c56335..419d7da19f8 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -79,7 +79,7 @@ pkgs.rustPlatform.buildRustPackage { When using `buildRustPackage`, the `checkPhase` is enabled by default and runs `cargo test` on the package to build. To make sure that we don't compile the -sources twice and to actually test the artifacts that will be used at runtime, +sources twice and to actually test the artifacts that will be used at runtime, the tests will be ran in the `release` mode by default. However, in some cases the test-suite of a package doesn't work properly in the diff --git a/doc/old/cross.txt b/doc/old/cross.txt index 9dd5b4c9993..064ca8d37b0 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -220,7 +220,7 @@ fi preConfigure=preConfigure preConfigure() { - + # Determine the frontends to build. langs="c" if test -n "$langCC"; then @@ -262,7 +262,7 @@ postInstall() { #if test -z "$profiledCompiler"; then #makeFlags="bootstrap" -#else +#else #makeFlags="profiledbootstrap" #fi From c8500de47b5062a59e2f15712dfe5c7315ecfc32 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:07:33 +1000 Subject: [PATCH 090/214] lib/*: editorconfig fixes --- lib/tests/modules/define-option-dependently.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tests/modules/define-option-dependently.nix b/lib/tests/modules/define-option-dependently.nix index 6abce29366a..ad85f99a919 100644 --- a/lib/tests/modules/define-option-dependently.nix +++ b/lib/tests/modules/define-option-dependently.nix @@ -7,7 +7,7 @@ # Always defined, but the value depends on the presence of an option. config = { value = if options ? enable then 360 else 7; - } + } # Only define if possible. // lib.optionalAttrs (options ? enable) { enable = true; From eca0b098492586506ec12a1848d8a16ee7a834be Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:07:53 +1000 Subject: [PATCH 091/214] maintainers/*: editorconfig fixes --- maintainers/scripts/rebuild-amount.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh index 1a54cada8af..ca89e08073e 100755 --- a/maintainers/scripts/rebuild-amount.sh +++ b/maintainers/scripts/rebuild-amount.sh @@ -60,7 +60,7 @@ nixexpr() { "darwin-tested" "unstable" "stdenvBootstrapTools" "moduleSystem" "lib-tests" # these just confuse the output ]; - + in tweak (builtins.removeAttrs hydraJobs blacklist) EONIX @@ -124,4 +124,3 @@ if [ -n "$optPrint" ]; then echo cat "$newlist" fi - From b6ce3db981c3aa3d2950460ca4c5a1a8c0e9c567 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:08:54 +1000 Subject: [PATCH 092/214] nixos/doc/*: editorconfig fixes --- nixos/doc/manual/man-nixos-build-vms.xml | 6 +++--- nixos/doc/manual/man-nixos-enter.xml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index d114261f53b..fa7c8c0c6d7 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -13,15 +13,15 @@ - nixos-build-vms + nixos-build-vms - + - + diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index fe560d3efdd..c32e1c7f8ca 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -13,21 +13,21 @@ - nixos-enter + nixos-enter root - + system - + @@ -40,13 +40,13 @@ - + - + From aa0fa84e500d808a6424b44683a50c093a965253 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 05:37:56 +0000 Subject: [PATCH 093/214] build(deps): bump technote-space/get-diff-action from v1.2.8 to v2.0.2 Bumps [technote-space/get-diff-action](https://github.com/technote-space/get-diff-action) from v1.2.8 to v2.0.2. - [Release notes](https://github.com/technote-space/get-diff-action/releases) - [Changelog](https://github.com/technote-space/get-diff-action/blob/master/.releasegarc) - [Commits](https://github.com/technote-space/get-diff-action/compare/v1.2.8...8641dcd991ed365c2647f8ee3f31c39bc03f5312) Signed-off-by: dependabot[bot] --- .github/workflows/editorconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 9e8a1bd97db..70959b42aa1 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v1.2.8 + - uses: technote-space/get-diff-action@v2.0.2 - name: editorconfig check env: VERSION: "2.0.4" From ab1f69b099d71158336b3151256d3fc5f85673da Mon Sep 17 00:00:00 2001 From: David Arnold Date: Wed, 29 Jul 2020 10:13:01 -0500 Subject: [PATCH 094/214] init: go-rice at 1.0.0 --- pkgs/tools/misc/go.rice/default.nix | 25 +++++++++++++++++++++++++ pkgs/tools/security/cfssl/default.nix | 20 ++++---------------- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 pkgs/tools/misc/go.rice/default.nix diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix new file mode 100644 index 00000000000..3f5f4782477 --- /dev/null +++ b/pkgs/tools/misc/go.rice/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go.rice"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "GeertJohan"; + repo = "go.rice"; + rev = "v${version}"; + sha256 = "0m1pkqnx9glf3mlx5jdaby9yxccbl02jpjgpi4m7x1hb4s2gn6vx"; + }; + + vendorSha256 = "0cb5phyl2zm1xnkhvisv0lzgknsi93yzmpayg30w7jc6z4icwnw7"; + + subPackages = [ "." "rice" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/GeertJohan/go.rice"; + description = "A Go package that makes working with resources such as html, js, css, images, templates very easy."; + license = licenses.bsd2; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index eabb38406da..669110b9179 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,19 +1,5 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, go-rice }: -let - # Embed static files in the built-in webserver - rice = buildGoModule rec { - name = "rice"; - src = fetchFromGitHub { - owner = "GeertJohan"; - repo = "go.rice"; - rev = "v1.0.0"; - sha256 = "0m1pkqnx9glf3mlx5jdaby9yxccbl02jpjgpi4m7x1hb4s2gn6vx"; - }; - vendorSha256 = "0cb5phyl2zm1xnkhvisv0lzgknsi93yzmpayg30w7jc6z4icwnw7"; - subPackages = [ "rice" ]; - }; -in buildGoModule rec { pname = "cfssl"; version = "1.4.1"; @@ -38,9 +24,11 @@ buildGoModule rec { vendorSha256 = null; + nativeBuildInputs = [ go-rice ]; + preBuild = '' pushd cli/serve - ${rice}/bin/rice embed-go + rice embed-go popd ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4871dc63da..b2975b482db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1911,6 +1911,8 @@ in gdrive = callPackage ../applications/networking/gdrive { }; + go-rice = callPackage ../tools/misc/go.rice {}; + go-2fa = callPackage ../tools/security/2fa {}; go-dependency-manager = callPackage ../development/tools/gdm { }; @@ -7344,7 +7346,7 @@ in uget = callPackage ../tools/networking/uget { }; uget-integrator = callPackage ../tools/networking/uget-integrator { }; - + ugrep = callPackage ../tools/text/ugrep { }; uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; From 13164f7352bc803b4ed3d7317e0415886b3a86a8 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 31 Jul 2020 02:05:04 -0400 Subject: [PATCH 095/214] ndi: 4.5.1 -> 4.5.3 --- pkgs/development/libraries/ndi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index ec39bbd6593..c0e1816c0e1 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.5.1"; + fullVersion = "4.5.3"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "04l57cfc88cdqa9015h5g1csr7xfjxp75x8qz8bsqk1dizp9ir6r"; + sha256 = "0w9f4a4a3xzg0nvmvrlda1wwkyi0m5aqvk07immmwgg7f1z1sqj5"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: From 5d21f4c1d59e24329e6c64792c57487c497c48e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 08:21:05 +0200 Subject: [PATCH 096/214] lzfse: enable Darwin build - Enable Darwin build, since Darwin is supported. - Replace the revision by the corresponding Git tag. --- pkgs/tools/compression/lzfse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 72560c1d9ae..0a335b3602f 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lzfse"; - version = "2017-03-08"; + version = "1.0"; src = fetchFromGitHub { owner = "lzfse"; repo = "lzfse"; - rev = "88e2d27"; + rev = "lzfse-${version}"; sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { LZFSE is a Lempel-Ziv style data compression algorithm using Finite State Entropy coding. It targets similar compression rates at higher compression and decompression speed compared to deflate using zlib. ''; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From dd19f2d851ca443229070dc7f9d931a17df983ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 08:50:43 +0200 Subject: [PATCH 097/214] python3Packages.ftfy: remove outdated comment about version 4 vs 5 --- pkgs/development/python-modules/ftfy/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 0f0dd3e76c4..a781230a919 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -10,13 +10,8 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.8"; - # ftfy v5 only supports python3. Since at the moment the only - # packages that use ftfy are spacy and textacy which both support - # python 2 and 3, they have pinned ftfy to the v4 branch. - # I propose to stick to v4 until another package requires v5. - # At that point we can make a ftfy_v4 package. + disabled = !isPy3k; src = fetchPypi { From cccd2f0d2c48db3a6ca0f3ab297d0eccf28c59ba Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 30 Jul 2020 23:54:27 -0700 Subject: [PATCH 098/214] Use specific commit patch --- pkgs/development/tools/cmake-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 4dc1375df04..628bb31fbe9 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -18,8 +18,8 @@ buildPythonApplication rec { # can be removed after v0.1.2 patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch { - url = "https://github.com/regen100/cmake-language-server/pull/24.patch"; - sha256 = "1id8wpmyc7djyqasb5g9z9i3jipcdb4sirn4cpx2v8xmdn9khdnz"; + url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch"; + sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0"; }); postPatch = '' From 1d582978bc86f4abdb379348d6a134a5649b20e4 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 21 Feb 2020 10:31:27 +0100 Subject: [PATCH 099/214] vimPlugins.vim-dirvish-git: init at 2018-09-14 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2a1ce4a7110..155fa7d4080 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4524,6 +4524,17 @@ let meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; + vim-dirvish-git = buildVimPluginFrom2Nix { + pname = "vim-dirvish-git"; + version = "2018-09-14"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-dirvish-git"; + rev = "423bbb5e532fe0f14677d18e6dff05c91c4ad2e0"; + sha256 = "0fzyk5ylg4p2dl2hyx3y2kz395mgckfd2j0s7z0l1lrn87mh4ral"; + }; + }; + vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; version = "2020-04-19"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8b3eb8ccc1a..b38fe085099 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -227,6 +227,7 @@ konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor +kristijanhusak/vim-dirvish-git kristijanhusak/vim-hybrid-material kshenoy/vim-signature lambdalisue/vim-gista From 720efe2d1b53bc70214e44bfd0edfbf873a06539 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 12 Apr 2020 16:00:42 +0200 Subject: [PATCH 100/214] vimPlugins.i3config-vim: init at 2020-03-28 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 155fa7d4080..01998615fa2 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1785,6 +1785,17 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + i3config-vim = buildVimPluginFrom2Nix { + pname = "i3config-vim"; + version = "2020-03-28"; + src = fetchFromGitHub { + owner = "mboughaba"; + repo = "i3config.vim"; + rev = "c3fe1a901392ee11721e08d2a0d2886a7f8b8e83"; + sha256 = "1cygyn7p0x2smqsjxly5xbsdnrjnq5kj1a0a8qg356j0l112j7z2"; + }; + }; + iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; version = "2020-07-12"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b38fe085099..ffb62e1dfec 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -287,6 +287,7 @@ matze/vim-move maximbaz/lightline-ale MaxMEllon/vim-jsx-pretty mbbill/undotree +mboughaba/i3config.vim megaannum/forms megaannum/self mengelbrecht/lightline-bufferline From 350764aa2035e39b7ab465859506c867f53e7100 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 8 Jun 2020 12:08:14 +0200 Subject: [PATCH 101/214] vimPlugins.vim-vsnip: init at 2020-06-04 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 01998615fa2..5444b9b6254 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6912,6 +6912,18 @@ let meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; + vim-vsnip = buildVimPluginFrom2Nix { + pname = "vim-vsnip"; + version = "2020-06-04"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "vim-vsnip"; + rev = "c95bb8bc2ff05e2261488497c050d63786c11a16"; + sha256 = "0vp98v3wcsmicpa4lzfg3v6scr67wfj36aj1qxwdkx7ahyc6c75g"; + }; + meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; + }; + vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; version = "2019-08-03"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ffb62e1dfec..dff9af6fbcd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -144,6 +144,7 @@ henrik/vim-indexed-search HerringtonDarkholme/yats.vim honza/vim-snippets hotwatermorning/auto-git-diff +hrsh7th/vim-vsnip hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker From 2abec1ecd5d12826ee390a54e2efce6a3b9644e9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 8 Jun 2020 12:16:19 +0200 Subject: [PATCH 102/214] vimPlugins.vim-vsnip-integ: init at 2020-06-04 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5444b9b6254..926d754eb4a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6924,6 +6924,18 @@ let meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; + vim-vsnip-integ = buildVimPluginFrom2Nix { + pname = "vim-vsnip-integ"; + version = "2020-06-04"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "vim-vsnip-integ"; + rev = "5ac40adc26c9b3638395f04ccfc1c4c40f82a423"; + sha256 = "0q59s8rfrj2rswifhx11f201myi2nk5jc93qr25qh3wchy0pbpr3"; + }; + meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; + }; + vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; version = "2019-08-03"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dff9af6fbcd..1653bf0814b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -145,6 +145,7 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hotwatermorning/auto-git-diff hrsh7th/vim-vsnip +hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker From 1e2703cd9c39ab9a800130aeddd65af53ba42419 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 30 Jul 2020 23:15:18 +0200 Subject: [PATCH 103/214] vimPlugins.diagnostic-nvim: init at 2020-07-25 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 926d754eb4a..3ea03d45394 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1338,6 +1338,18 @@ let meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; + diagnostic-nvim = buildVimPluginFrom2Nix { + pname = "diagnostic-nvim"; + version = "2020-07-25"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "diagnostic-nvim"; + rev = "03670688e70fc65eff70abb3cefe1a086ee95bf8"; + sha256 = "02nci7n9lpz1axpwzpv34r6720iycfh43n1910ryhm4f7cxs2x61"; + }; + meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; version = "2019-04-30"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1653bf0814b..fe323e6f8f6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -388,6 +388,7 @@ ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 nvim-lua/completion-nvim +nvim-lua/diagnostic-nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter octol/vim-cpp-enhanced-highlight From b0b724f8730c1ee47fc7490911912406fbfa622b Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 30 Jul 2020 23:16:53 +0200 Subject: [PATCH 104/214] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 500 ++++++++++++++-------------- 1 file changed, 251 insertions(+), 249 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3ea03d45394..ec6f38d736b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-04-06"; + version = "2020-07-26"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "3643fa185ebe3bf35cf690a4b3b90d36e36405b0"; - sha256 = "09lpg223l1s8zpsmbg1r18cnr7r3np32nsv185qgcv889mlildqn"; + rev = "3c92e212a05eb254849a597d8d002abf69699aa0"; + sha256 = "0m3kinhzjk0cky372j1kw6hhy14khshkh9jbw35a5q18c4xvy4pq"; }; meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-07-15"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "54aeeec97ff14197a8ede31493035b4fefb44a2f"; - sha256 = "0nrkf66bb91p04173790h90wm5k5kya43wcv9rg37033d8rs9jv7"; + rev = "e03e24c091c601a821379d259191583b39bcf23e"; + sha256 = "1pwshkvwwidnqkxirrixhkldx0pry1rrhplc9nl73h7qy2qmllq4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -185,12 +185,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-03-26"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "4ad0ce02b8efa3c6e014e224a34b67b927d31c88"; - sha256 = "0crg0gph8wmb412yvknh6ic42i3p5hd8c736rv61v52b2g0dgwxm"; + rev = "2da6a641a8b30eba20ab6d1890a1b5c93c082cb2"; + sha256 = "1lxfxmga9mjq7vn63rm9hvyny0f137wk2kprshl93hdnvx8hjqmr"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-07-12"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "e022467f359e6589d51cf43637fce7c31b4baa0f"; - sha256 = "0gga3hrwx2skkkmcc5lz8jgn8q87gkh29fz24clvx1k16l2gc98p"; + rev = "0f4a877a901cc04c226cdf1aad98948fb6ee47b8"; + sha256 = "06kjsmjk8vg7gamg1647injw7a5m12571hjwvvfsamjvdbfhr3nm"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -401,24 +401,24 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-06-30"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "806b44b3d223ae8e24134eaa3b5cffd210300b98"; - sha256 = "0rabc8ck1mkn0xxryzy27nq7ncqbhm6zhlg1vab8gyfm35l2zr9v"; + rev = "7657fba23cacc7e05168e70e8e6ccfafd437fdce"; + sha256 = "1zzmhc70yf8nc7jkq5414rs5sd9cafxcgpqw9xbpkbhawjx4hknj"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-07-17"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "691870e1bc0e868bdf872855f07b4aa9a81b3414"; - sha256 = "1qg5zqqk4py6mlzv4bbwv4w8sn8jj5ayqn4ia0k1vpaidspxrhl1"; + rev = "c438e3a3f2f2560ac3347e91ff8462f400a1a869"; + sha256 = "1lh80kxbg59hbkdd87isnyan6rs4fhz7k8y3nh540j86sa42hm7z"; }; meta.homepage = "https://github.com/neoclide/coc-git/"; }; @@ -449,12 +449,12 @@ let coc-html = buildVimPluginFrom2Nix { pname = "coc-html"; - version = "2020-06-24"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-html"; - rev = "c841e3bd11d76cf0806d21f32c9cac5c9afa35e9"; - sha256 = "1xail08fb7hd43d03l79ynrp0bmcbk2hdcyk3mxl3fkizw9pd9dy"; + rev = "36aaa65d5ee7d998727776739d03affcc26bbe5b"; + sha256 = "07vb9jgy9bpq5k1gymr2ys8smafcrybf0nmpkfsq8scqxsydnnq9"; }; meta.homepage = "https://github.com/neoclide/coc-html/"; }; @@ -509,24 +509,24 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2020-04-28"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "aaa16caf94c50e7c301cb3848e988639cf0599a3"; - sha256 = "1m8i8r7fl1csnx6f4mrbaf7ncng8yyfnprqax0zyiryc5i4nqjbg"; + rev = "bf352d6befd23804897a08b50fa6edcea676a7b3"; + sha256 = "0r8sbw4pgaay2zjh2rv1x926hs8jixznanc2dxjvicjnmgbg1nmn"; }; meta.homepage = "https://github.com/neoclide/coc-lists/"; }; coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-07-15"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "af657d38eb3fccf3ffe4b45f6c73a7c5b38a8f1d"; - sha256 = "175f205jdr9yfrilj8bl8rls1n63ck5wjv327zi9vb44algifkfh"; + rev = "b2fdfbe5e1588ebab5f6965734684bbead25aafd"; + sha256 = "0k7s6dq72rlahqbvs5w83xhg5n2cf248yv4q9654vlck9k6hdvjc"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -557,12 +557,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2020-07-09"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "6705200e02810d2cbaccd30880e3b9edb3af2bf1"; - sha256 = "11p2f1vs3mssg39ywrf6b0ks34qzfsv0f53r2gag12j6g1x11vsz"; + rev = "4857302b60bb0c9db20fa8db71b0eac4696c9254"; + sha256 = "114yn1sc457jc9jp5hvw3k0dvm0i9bcn6v2dqvb9dgwskq78ca7f"; }; meta.homepage = "https://github.com/neoclide/coc-prettier/"; }; @@ -605,12 +605,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-07-16"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "590a3105e6704d8842aacb6ea283711859d0cea2"; - sha256 = "1jp384g4n845436jxqmsbcng6szrb6jb93ijc8r8qwayvjmrxnnv"; + rev = "23d5b46ff6e459d246d6f194ab3df97f5db2f41d"; + sha256 = "1gvm61jfnyk8mmsncknmnb9mhkz52fl8gnisj856x9phn8fq5cf9"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -713,12 +713,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-07-14"; + version = "2020-07-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "6d73216417ae85f9cdf82aec494ab78043e9ca42"; - sha256 = "0sg46bvmqpqi8bfxywvx0a6pln9q60j70dylhk4102dxgk9cc1kq"; + rev = "2d6d066afbe909f499d636be753792580b592c19"; + sha256 = "0kk9ml8ik0n8cd5zwzg23swlzwpzzg3hf7n2maqv3j6nl92w4k31"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; @@ -737,12 +737,12 @@ let coc-vimtex = buildVimPluginFrom2Nix { pname = "coc-vimtex"; - version = "2020-03-27"; + version = "2020-07-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vimtex"; - rev = "0a4f8ee29afc4e1dcfdc8846f116a1db32fa9867"; - sha256 = "0z9kxm40kr8a5sa06vkg7xaai2n54y21xfkrsx774zzdkcrrkizk"; + rev = "4c88459c1ccf0c0e1935b73f216d974a3c89f4e5"; + sha256 = "0gk38r8060linhbcsqfhv7bxggz4fqi4chsfpxf6b0rnmca851pa"; }; meta.homepage = "https://github.com/neoclide/coc-vimtex/"; }; @@ -785,24 +785,24 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-07-17"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d033fbfe526be910ea0be61e1ae1c220937bc17f"; - sha256 = "0wf72ww5dcbpsycfm866ajfbz8h04z19q55nns2163x0ql6vyj5m"; + rev = "a699f24ac8f5305e77b11ae5508065abffcc79bc"; + sha256 = "0c3ddi7gnbyn2irsqcf7qdxq6z7cqg96b8hk6k7m185n26nb4iys"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; colorizer = buildVimPluginFrom2Nix { pname = "colorizer"; - version = "2020-06-21"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "colorizer"; - rev = "bafd4e98462a4ddeb275d02fa1448b4349e2e50f"; - sha256 = "0j4x8vf3dj2v3jjjxqyhahrbfm99mgqryq2srnik0wbz7v1br2lh"; + rev = "1ddc68adbf45331158c61507a55fcc918bb61654"; + sha256 = "16zrpgnlb3v4yvpycq9spivs97vzv18m3jc47rl0hgpjdf6vhkxx"; }; meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; @@ -846,12 +846,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-07-17"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "895a12fe62f65688299086e1db4e3a364de6ba96"; - sha256 = "1nyyky6ac1jxg7fybpvbm49q12mkvd568c451q8qa4sd23fnbx0k"; + rev = "b3d8cd0ce39bc646d8edb2d0d16dafc60de659dd"; + sha256 = "0l1vpiy4lanwfq9jjxw2j1j2z9cj7rzdpks098y0w09ri28vkldx"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -882,12 +882,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-07-17"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "95ae79d91365d6078a9f5b6ce235b685906aa55e"; - sha256 = "1w6170fwda4wvn7rpcjll2389hibz2fr6ckjf4qcs6hqlvcrjl8b"; + rev = "7a657308f3e985ddc47d3f3ab383b4eaa4c24e16"; + sha256 = "1z2z13vkp881q561cdggycng0m89m13f658z0qrn0cbxlyid7aai"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1014,48 +1014,48 @@ let defx-git = buildVimPluginFrom2Nix { pname = "defx-git"; - version = "2020-01-18"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-git"; - rev = "b5d0b842064ddb7a7af0e790f4648cb1909ed43f"; - sha256 = "0i8vi6zhnv088qc3f3wa5h4b17xnpvmr603srhg44zx2clcjblnr"; + rev = "96fbc0de0e02edef9054dd8f33efbad9fc1fe6e6"; + sha256 = "1n4ls3lz1syhmm17v4zf009ic8a61pxyym42f032a5f46h31mvb2"; }; meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; defx-icons = buildVimPluginFrom2Nix { pname = "defx-icons"; - version = "2020-02-10"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-icons"; - rev = "2e4df3b6302da537ac7df28fbc0e0991c6c1aa0e"; - sha256 = "0wkn02z75pvfl0xrhgq80sw0qfidjg5s0zm5mij632pq3dm7axiq"; + rev = "e150053498e6583ec95513e44ceb122209a86831"; + sha256 = "1yw44ima60jq05p0m0mpxsybr53655w98kg2d6srsqswd8ivcapl"; }; meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-07-18"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "a31779723d35f4980d8e69e9d56a0e8fcec42d6b"; - sha256 = "00fy01mj3c65nam5dajr130jnnvq4fynws8516dwq4x9hdlqn9j8"; + rev = "4469568bef6571a4d0fda0b48c8c80e082a8e08d"; + sha256 = "05gaw1d3sw44kh0lz4nphkfha2x2my094wwkx3hxjw18abxr4qqf"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; delimitMate = buildVimPluginFrom2Nix { pname = "delimitMate"; - version = "2017-06-19"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "Raimondi"; repo = "delimitMate"; - rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c"; - sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn"; + rev = "16687aec24d803bc76cae2d7bfe2b73b1cdda4ef"; + sha256 = "067bj6if0jyqy1x3hqjdc2d4jrgldz1ffppb4l9ih06m03zdqkjd"; }; meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; @@ -1074,24 +1074,24 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-03-02"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; - sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; + rev = "70c0befcc3562240a681215acef580ab9b608537"; + sha256 = "15xvals2fvdc2yxw239ch5c69a811g957rlzgpzda22lvl3dbm28"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-07-15"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "15f05df993c526c271d7cc3994403d305e6b4b92"; - sha256 = "1sy5klszn8d9cb7qrqmnxvyr5nf197jrfv7z4mchpwx53k84dy15"; + rev = "ee43e5b08009072b46a17905d2ccfcb15f79224d"; + sha256 = "1vqzi9rxlb5flgy0yc4lh9q0fvhl3b1a4xi1dganz46wnwyv2r24"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1316,12 +1316,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-07-16"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "99dee7d326cfed77d5e46dc6107325c7529ad639"; - sha256 = "13hx8q25n0f5cal9fb67rhpblnirz0gqkl7nyglzgrqgyafgrn02"; + rev = "3ebad687ee8da04ff184e3fc878a2f2a5a90a6a1"; + sha256 = "031gj7h0biak950p2d0pyn41jc76rrxw0pvdnk5dkqfcw3af6rrw"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1474,12 +1474,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2020-03-09"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061"; - sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg"; + rev = "aaf7b252301d03100ba3923c17d026562a0b17b8"; + sha256 = "10ij80x2drmk3jr5c7pm9k3jrci9qb26gmqagpxpmiv1is9sdx0a"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1595,12 +1595,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-06-21"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "2bf85d25e203a536edb2c072c0d41b29e8e4cc1b"; - sha256 = "0dj6nw7rgc4679vqqmls8f59r3ax1ys4lrq4dq1gby3yk8z7lcy9"; + rev = "2115caeba1b55040bfdb1b8c38a836ad4e0b7669"; + sha256 = "0rx4dcsdl4kcxs5w66qpamdh5m6hvd3p6v46wqqij79b3ji3yjw3"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1655,12 +1655,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2020-06-08"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "0c79022b267f10305cd2d0d3e978c77bcb67b617"; - sha256 = "1657622w60g2xqxalvxjhx9blcppxy69kgn170jb65902x2bav7p"; + rev = "dd9bef92c6e51ec1e26dfca46f81fe3b6b997a51"; + sha256 = "07whrk46v2f10pb4xjz9g5iz43vr8q8mibcnns52qxgp0wg7iid6"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1806,16 +1806,17 @@ let rev = "c3fe1a901392ee11721e08d2a0d2886a7f8b8e83"; sha256 = "1cygyn7p0x2smqsjxly5xbsdnrjnq5kj1a0a8qg356j0l112j7z2"; }; + meta.homepage = "https://github.com/mboughaba/i3config.vim/"; }; iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-07-12"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "a356b3eaccf0a5f0dc9468b76271a46cc090e040"; - sha256 = "0kwpbygg1rfgn4rsbhpqi75ydl78csklk07kx0r95481qa7509wc"; + rev = "203d56849325fb0420587c9951859a755798aea3"; + sha256 = "16calikypw9gyb4vzybwqgl329v6wpqj05z6m2ajbr027fksxfjr"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -2003,12 +2004,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-06-06"; + version = "2020-07-24"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "f0fab9a2df5223815f7dc46f44f69566aa9e51d1"; - sha256 = "145wxlv5rifk93lvai17625r1c94lnbi8rnda0vidr0dhhgcl7v7"; + rev = "55de0682851c1065f67665a205b19d707d2e0d3b"; + sha256 = "1b2pib00nz21582lm1km1wqdl0dazv7bg3jdgqy17n3pd6bsi11l"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2099,12 +2100,12 @@ let lexima-vim = buildVimPluginFrom2Nix { pname = "lexima-vim"; - version = "2020-07-01"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "de17b1ec4009017b08d108e495c2d8d209074ad0"; - sha256 = "0ks2nyg2pvvyd3lrlhdbbf3ix48zdh839d65hglk34xl59hmnx1y"; + rev = "a0c465054ab1965353c8c3946955b3c15592d098"; + sha256 = "1vyps74zx4iy3lalxpfhrlm8h56zwd7cdnsaqza00l6m1ayj0w3r"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -2255,12 +2256,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2020-03-05"; + version = "2020-07-26"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e"; - sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra"; + rev = "7d49f7b473db732878091f2f8c68bc47b015559b"; + sha256 = "112pspa730pvwiv0hbzn9z6i3zpn25p8g45wf67kj2084wiqkkx3"; }; meta.homepage = "https://github.com/ncm2/ncm2/"; }; @@ -2351,12 +2352,12 @@ let ncm2-neoinclude = buildVimPluginFrom2Nix { pname = "ncm2-neoinclude"; - version = "2020-01-09"; + version = "2020-07-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-neoinclude"; - rev = "068ea09b8afa3f8bc97d34d2e96ee824e57816f7"; - sha256 = "1s3l83g5j57xjszajdm3l98g4jkcqkxa3i249ms18000s2wmfrlj"; + rev = "081f48c735c5f51849ec14e6a266b5400bf94b62"; + sha256 = "0xsvj8ng9blhwl8fxscm3iflppvf7p7kpl3hxh0z14xhdy3nynyi"; }; meta.homepage = "https://github.com/ncm2/ncm2-neoinclude/"; }; @@ -2387,12 +2388,12 @@ let ncm2-syntax = buildVimPluginFrom2Nix { pname = "ncm2-syntax"; - version = "2018-12-11"; + version = "2020-07-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-syntax"; - rev = "7cd3857001a219be4bc7593b7378034b462415e4"; - sha256 = "0l36qvsclhg8vr1ix1kpdl0kh739gp6b7s03f18vf9f0aj0im6w2"; + rev = "d41d60b22175822c14f497378a05398e3eca2517"; + sha256 = "065sflxr6sp491ifvcf7bzvpn5c47qc0mr091v2p2k73lp9jx2s2"; }; meta.homepage = "https://github.com/ncm2/ncm2-syntax/"; }; @@ -2435,12 +2436,12 @@ let ncm2-vim = buildVimPluginFrom2Nix { pname = "ncm2-vim"; - version = "2018-08-15"; + version = "2020-07-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-vim"; - rev = "4ee5d3e8b5710890cb5da7875790bdd5a8b3ca07"; - sha256 = "0m4rs2bs0j74l7gqyzcdhprvvx2n7hw64bbls877av6kix4azr31"; + rev = "876ad5f30d1e296a4ab425a0e22a8162876ac48b"; + sha256 = "19b2xl5cvy3pk14r3k02149whdrcgisnqv2rzm5bic4w23532ad2"; }; meta.homepage = "https://github.com/ncm2/ncm2-vim/"; }; @@ -2519,12 +2520,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-07-16"; + version = "2020-07-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "166ab5d9084d4beccd5bebbe407dbef621d96171"; - sha256 = "0lkll3ayxi311qh9ywjwymy02h66vvdz71i0apbjwlqs5ar10rwp"; + rev = "751baf4c8e16ffb800a179a229950036cf08ce61"; + sha256 = "1rljhh48bzx84n3411awsdjzw859li0gkrkmvbg72vwsyq73bpxk"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2567,12 +2568,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-06-22"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "40494577a44c6c7cc03e70e4bb6b4e27cbd8e417"; - sha256 = "1jiva2s4bvp98kwjprk2qh47avz4nqawsl93118cwh01ys9hhdah"; + rev = "06f8fdc40262f5f6b0cec19f0e572f0477ecc022"; + sha256 = "0mdf0qpnly4y7fh02zdpx59gvvj33nd5p90cc5620y6qfld0y13y"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2603,24 +2604,24 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-06-30"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "f6596a893fc7aafa4c100feb325c2fe0a25d38ad"; - sha256 = "1qvb90688khm5czwdagm0x6zp59zlcisn9ha0n9q3jz98y088agx"; + rev = "1132ce9e9d697a3ea70bf1610ce475188ffb4963"; + sha256 = "0vfg130k2lwakxsbjcwmwdphf762jf4p07j7vcqr1hpyncx5gami"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2019-11-14"; + version = "2020-07-21"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "53383395befafce802c902c21b54847074454491"; - sha256 = "064qi6zv2hrzn91pvr31b9zj2q0k9vbkk5csdhw5y52q26p1gakq"; + rev = "a076c5828182afe03109ead9ca6863d3d0bd47f3"; + sha256 = "0h3ak79kw26wpiw4q9vgjmdp5vdrnhqimlayfjixbqmq4p7nldcj"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2639,12 +2640,12 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2019-12-11"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "1829c6e426f829edea46660d0db08d4488010fcd"; - sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6"; + rev = "0d86f6565a6193cdf017ac4f79e52fed04d5c0fb"; + sha256 = "02n1n3hb3bn5x9na05crhwmdmk66wyjx8i01fsyazlpv32v1wfsy"; }; meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; @@ -2663,12 +2664,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-07-17"; + version = "2020-07-24"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "e571d3e95b610fc4435e01524bb594d642f5db79"; - sha256 = "1jlzwwx2p3hhadabxwhv6yaivn488vnaysxirf57w39n9wp4886c"; + rev = "4a32dd0be35621dc8d4b73836f58434ff3e73124"; + sha256 = "0cgib0afmm0v1lwqbkrmyw0s7z69g4qz2lcijrp7h3vd5ljzkqjl"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2687,12 +2688,12 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-07-11"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "ihsanturk"; repo = "neuron.vim"; - rev = "13a538fc9141d9f567a11dffcf0796fc87770b5b"; - sha256 = "1jbdwy44zx3fvz1dfzzclzxmfzg69ibqsl5cw5dxaqqm3wick8rp"; + rev = "b7b208934c6a5d2949168a80d6ffcc67b53995a3"; + sha256 = "01favdpjba3d4fd9a1ypiv0vfv2dmb21z43baj5kl69nfpzva794"; }; meta.homepage = "https://github.com/ihsanturk/neuron.vim/"; }; @@ -2807,12 +2808,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-07-17"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dee2dd65ee1ab86a9249cc54a5f577a6dbf8a98a"; - sha256 = "1d0a9sb7px48zvn798dcxap8lm34ildkslc5fiyj2a6cfrgxc772"; + rev = "5202b7b0986b2a4be8b14e02010fd7390575d775"; + sha256 = "1fya0fxpas21i38x93gjhr7p6jy78gzajsxs11xmc2r5xcj0n9q8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3431,12 +3432,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-07-09"; + version = "2020-07-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "c72cacf35e24aaf7cf3ca3e619655d24f52e370f"; - sha256 = "19a1cbdyp09862jrzpvwi8ph911ylmvizdc6k3il9inmznby0ly2"; + rev = "46efa9796716fe645d43f6018de3e06296978c7b"; + sha256 = "126a9v4j217g1kflfabqx0bz02k0xkwqfagzhk51n7drh2r2m7k6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3492,12 +3493,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-07-05"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "63b74a7473ec01548298284c210fee0a78a6156d"; - sha256 = "1xp63bfb9ln80gz4jsp4gjk9ckhlkzxmfi5sb72vvlsravw5g3v7"; + rev = "83837a6e86ca8f8795a68dff0242d79065bd170d"; + sha256 = "1bpsq6vhisk47xka41a4ybdvww26fldvv4dd4rnb4wwln3c9m551"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3540,12 +3541,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-06-24"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "d7063c7484f0f99bfa182b02defef7f412a9289c"; - sha256 = "0awh6p7nc9hggiazhvvaw2hhfml76yl7856ssx8ym6r2vbzqw82v"; + rev = "3fe9d8e13b7a9e82ae612c8a12b35a3c6653e9da"; + sha256 = "0s4s20x5a2nb35fcvs4mbr5vql8diwc8bmbi6qa7vq2clvkf6smg"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3817,12 +3818,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-07-09"; + version = "2020-07-19"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "922e2ba1ee6ec23e8daa8814c7819adeda98ea1b"; - sha256 = "0c0pvj0br1y7nzxqkw63vx80wizzh335plk0xnzlk4yxfq33m7sc"; + rev = "b64b22affafca7d3831a20949115b91031d596ec"; + sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -4069,12 +4070,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-07-17"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "7fc51f69521eb9d1acb5f01ddd929e2cdf5d31fa"; - sha256 = "1l468bzxl6frg77nn8jd8sij28k66xr69afflf2manzgn7c6srb3"; + rev = "2a027e992d44e47ea3f176692fe948d3145eab54"; + sha256 = "0k427xhwdjljy716w06kgdkkrfygv3hw7r0j8l8yvymasq1lz6hn"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4141,12 +4142,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-06-30"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "99f4a4159876ade1c5cfde60cdc3768f439dd702"; - sha256 = "0xmcswr6lgh26ldn7wrhp1pcfmf45r4n7sb2aa38wmdss14x0vb6"; + rev = "273ccae26d6b5ab10bb48479c0ff5971018e3c5a"; + sha256 = "07fldl6fsi3ns2zx4va69g01gb5mdsva8qpyjmryhn08l2qz0c40"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -4297,12 +4298,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-06-08"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "90335990808167d910671a625f3ee9de9aac1058"; - sha256 = "1rq0ivynsq35h5kpzpd963bgkbx9lb26wlxrb2l8xha0zzzsmhpz"; + rev = "a43392a7c4d73b91835e7bd993889646c8a907fd"; + sha256 = "1b850c36xgydn2ibdxzqprzsi65hz9sfhvcj69zm3rqbh47hqi98"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4441,12 +4442,12 @@ let vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; - version = "2020-05-20"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "jjo"; repo = "vim-cue"; - rev = "9b26fb250d473f949fc90cabe70efff316a90248"; - sha256 = "0aybj1xxi860cn7wzg13z50f16kdsyhba0z7qwchps4fr24xkjms"; + rev = "339edaf79ff1287ce6a23baaa421e68463cf1a2e"; + sha256 = "0jr30plym17fdg90smb7g35yi9iz9b7s4md6cxj83zg4vj2hyjh1"; }; meta.homepage = "https://github.com/jjo/vim-cue/"; }; @@ -4501,12 +4502,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-07-05"; + version = "2020-07-24"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "028673dc93a978225c897b4913dd21b48dc35a7e"; - sha256 = "034nna0vaxbizg4d4pqw9qmn691fz707dxga82n9m9id1hz9wi0b"; + rev = "6bd3ae1dbab89b24bab160d52f90b3c8b0d005bb"; + sha256 = "083q77ys4jlwcqs58hzg8c4lrwfiss91limq2gw7yjngsfihkn9l"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4549,13 +4550,14 @@ let vim-dirvish-git = buildVimPluginFrom2Nix { pname = "vim-dirvish-git"; - version = "2018-09-14"; + version = "2020-06-04"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dirvish-git"; - rev = "423bbb5e532fe0f14677d18e6dff05c91c4ad2e0"; - sha256 = "0fzyk5ylg4p2dl2hyx3y2kz395mgckfd2j0s7z0l1lrn87mh4ral"; + rev = "8a3a8b88ed0815500c2912658fe0de7583ee1d45"; + sha256 = "1z8a718kam2r87kimhayxndjbmpgk0mgwrc5v52bid584xml584k"; }; + meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; }; vim-dispatch = buildVimPluginFrom2Nix { @@ -4812,12 +4814,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-07-02"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "e3fec03b10444ecd3d73342ab6db1a433cc72522"; - sha256 = "0vv2hdi8an8a56848nnghbx35p9na8m54r2n2x2l5yaq84vnk30d"; + rev = "66d05edf291e9f9ce1003fad849c5d6a46c029ac"; + sha256 = "1dsfn41fhpjc1aznd0g4b70adkqmp1ww47107g1f9w6hbwgcy4cj"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4860,12 +4862,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-06-27"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1da7c133b109cd329060174a104e325e4d6bcc82"; - sha256 = "0yla2m8k6mqhr8sr4s1pgh2l2dzn9kpk0955f0r0pccirfj7c9pk"; + rev = "9b6a24b13166feee0cc83e2cc40e2ddb31bcc2a1"; + sha256 = "0rs1v863d5kxz2mn6xgkj06jsjdlrbfp0srp2z52qrc4pqlxkf81"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4920,12 +4922,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-06-25"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "c27bfab8c51e77419ee0c4a9c4e3ba359dbc2ad4"; - sha256 = "0m4wrg2j6mdxqfv4d6sw4qcaffk0748spzqvwid5wpzrjvwg2ydp"; + rev = "62ff20f9797fcf11f132f8aab4e882807d0e2593"; + sha256 = "0aiay9mjvqj21620kzsbv14gcxw17i4wgibxkn115cba33yzpm2r"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4956,12 +4958,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-07-18"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "124b73da9ab34c48c3a67763c9326c272763b5ee"; - sha256 = "1d7jqisjqzi2mwqy3cz996lplf3vz7zbwjdpqzgw0z5q6ywgax85"; + rev = "ef23d90b84231759a992adf79b0dcd72844c1f84"; + sha256 = "107nx7xgh416s5sr4ljwpmvqiysyy7gvgv79hsndlnqw5vmbdv75"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5292,12 +5294,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2020-04-23"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "3ebc63c4b79eec08eb81bdddc8f4c7cfe9cb702f"; - sha256 = "0dwgqnjcnnyvmrplbxkzmfyrm0rgd4z5kgx5989c528gp0dwhaja"; + rev = "80cf31797a85012b7408701073d743a45a3fbf36"; + sha256 = "19ci5n8rkf4wf4ivqj2mjig4m6phvy14k0zplkbafccaadnc0k21"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -5353,12 +5355,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-06-27"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "1aaa33774783630e21426ad1ffd7a389be59abd0"; - sha256 = "1d3lf1khshwp1gd0wn3jvm35qg3siz5pmbixqysz2hi130b2c3sq"; + rev = "ed31c776d1da96ed8d950aef5ffba3f767f2acb4"; + sha256 = "1qp5n04igirkqzqh7vfw0jnb31p36h356nc4n1kzna4zyqndzk9s"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5557,12 +5559,12 @@ let vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-06-13"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "5c49c44be62e595d3d1d81a15259cd1bfc722825"; - sha256 = "0nr7hbwpwzzzxinpjfdlaia3ys6vrw10i3wbjhr41iga6gkg6w2v"; + rev = "f2abdd19ade1db8de6ab10930ffe2df4dbb5274e"; + sha256 = "0rn792hryjsz677wik1sqgscllvmpvzxv2p6gacdvsr9pn800nhn"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5653,12 +5655,12 @@ let vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2020-07-13"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "b244c7e709ee735ac0f81ce50ec269c66a88ed87"; - sha256 = "0qwzmy318c1nwda53yfdin5h06xym2adjkhxfy1sw4xlhw71i2gl"; + rev = "1460aa915c521864c926aa51fe20bf6bb8eaa065"; + sha256 = "0sbdd1z8nlwpac1n4234pnczavxr1kazvj86xp4a8aa7vggdm9xa"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -5677,24 +5679,24 @@ let vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2020-05-19"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "ec93676024590327263e8138443614ec4da8c9bc"; - sha256 = "09rcs435nh74p5dwdw8k1mv1w2lni4y098dg99j6dh6859lc3hw8"; + rev = "6456718e1d30b42c04b920c5413ca44f68f08759"; + sha256 = "0dmap8hjk6a0127fkab1pp5cllmijhqx80ijasngg11kxl0wzl32"; }; meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2020-05-06"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "046fc0664b953ab17153da379df0b9fd34b85ec1"; - sha256 = "0np83qa95cfg1059r4iaf31sfhs86241jzkmw026gdja9s30q3m1"; + rev = "f6b24082b1d22932cb834673c37aa936b6f4f6da"; + sha256 = "1xr7g5wxfdd2rzdr94p2sasfm6zyha2rhjr3rx5mnpbcik7l3j61"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -5869,12 +5871,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-07-18"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "9be2bbeb826ce8b7827ee37326ac90e221c83736"; - sha256 = "1bprfbsccp7v9maq1vm50d1zx835psaccw3yf726v10a7n8pvm58"; + rev = "049ece9fa8f21afaa62215865afac22daa6fd30f"; + sha256 = "0wjrbp06ffh9ficd22lcijrc99n72b7gbg5lqpms9r0442fb88kq"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -5893,12 +5895,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2020-01-31"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "0d1129e5cf1b0e3a90e923c3b5f40133bf153f7c"; - sha256 = "162l2p8md8lfyfjxzlmlz5ky5kvvr6wjmdk8r8lk6ygpkl2b51f7"; + rev = "6fb2021592ecbfd1b519647dd7242d818d77227a"; + sha256 = "043khhd1rd8cihxkzma5bhg7pbp87iizrn04lfmnygj5s0qg0dwf"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -5953,12 +5955,12 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2019-12-13"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "09458527601fdb2fbd174317bdddfb34e4c64e79"; - sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2"; + rev = "dad5a3626ab68039f2676c46e7a1635e0669cc63"; + sha256 = "1s1vxzqc5gvch2rfibn7ksmxj81gscfzg0bpvnq34jp430adzdc7"; }; meta.homepage = "https://github.com/reedes/vim-pencil/"; }; @@ -5989,12 +5991,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-07-06"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "c31903639623c5be2431ac86b31ce77e54eb345f"; - sha256 = "1adqzbnz9sjwv6sw1fgpd1jnlr7rff235caxygb3w26xzmfighyw"; + rev = "b2133cf2ec935c55de0c3a306a6b7dc3546226da"; + sha256 = "09xmrbbbchpfqliddi24yn4b63akxidscvjzwi01ilb0s9xnxz24"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6013,12 +6015,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-07-06"; + version = "2020-07-26"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "9c3c0bc082e0d58d15dc6f24d8a335931417e2f0"; - sha256 = "0pdfq512qh54zj24iwihr30xb8dxw67ix2yj0sb88qy07phab8k2"; + rev = "56121b4e27cb48efb17be55a969b2f0d725266f8"; + sha256 = "1zirax1iss5mgqllwmc4kybycn73alcqgnnx296vgjw8d1b0qpc3"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6133,12 +6135,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-05-16"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "3041ad7f0b3f9122d4f00bda2f3bb554bf89105c"; - sha256 = "1ncfw4inb6rdlrayvijy7769wyppiihmazmfcjdx5g42mycfxg0y"; + rev = "3f49e05fb6072d6b7bc7fe20d0356cf15ef3b9de"; + sha256 = "02kyp6l6m1nybfqx3d88yi34isrid355wiln6cskvxz2hpx532g8"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -6181,12 +6183,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-04-17"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "d64f3e04df9914e784508019a1a1f291cbb40bd4"; - sha256 = "1vwydkjm5h12kcnqmg2cv1cqf9hmhmyy2lx5lj3g0g6ra27yfjnw"; + rev = "be83e5bcbe30888b88359fc875ade9c54562411d"; + sha256 = "1qz3fqixl25x8b70y6kw9lgjxciv9bbzqx9dimvypmhqwx09pnjb"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -6205,12 +6207,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-07-18"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "c13aa57ed4f822dc4f035597afa55f3fd54f96fa"; - sha256 = "16iyjggjfqkvbc1frlyswq96614wwb322h2dyxhyw0dpv7x841g7"; + rev = "3e4a8c5bfa3631516cc2b79672fe958455bfb098"; + sha256 = "0ai3yjfzb8jnc132q8543zn7w37lhbss3s21pmsfza7lx1vp088h"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -6229,12 +6231,12 @@ let vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2020-07-18"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "bb5a3270ed010e0fe3343945c8d1f6c814341d72"; - sha256 = "1sd8ni2plj93jjcyavrnkdz3iwnkz9p0mci329gn8jm0jxn3qbwy"; + rev = "f0bb324395bf6e00ec17fc7af60d2ccb8d494595"; + sha256 = "19fqpccvawh2wjkzgp64jijq4nnhirmgvrrycxzcx7lj612mbpmc"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -6433,12 +6435,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-07-16"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "bf94550e930e1b79cd27c04b9bb2c5aa32ee8a0e"; - sha256 = "075faj7hy5914bzh693rhph1z39q1k1i5fcbp6wrs9yf1g1x98fj"; + rev = "ab824142634fb0e9dc8a455356a15730f48361f0"; + sha256 = "1fvr03a46x3nq8cafxqb95a97c5x0cynvcz8hw8x0j8gml6x86bz"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6589,12 +6591,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-05-06"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "640400908075c50704e127448175d3ede6bba2e9"; - sha256 = "0gbj324wwgai1kprn78srq3cvldpi6hx9gsr5kk2sn2yxq32xp3y"; + rev = "5c489b57e8bc34f2a4bf58c28fadbb021dcc1a4f"; + sha256 = "0na5xbmggvrvs5wv9m5nfs1kkdvgm36zmbvmymmcf8kfqv5dxh5p"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -6650,12 +6652,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-07-15"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "0b3c5d7adf7892c018d2d97177f9d2d445ec92ff"; - sha256 = "1k41l4747zv6i89068p0gh1qbn4hd2qpd5qnk8g13dg5ryhsq6fc"; + rev = "260b4f0ccbca78aff50b9d0ba0945ce92e07e1d6"; + sha256 = "084ivslydffayz9f1vglb9fnds4yakj6anrnvbwcyj27kcg1s7c5"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6734,24 +6736,24 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-03-08"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "2d10aee9c9982f4f5974e88351934759c69640e7"; - sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai"; + rev = "47bc9855d7c2b1452d8a0abda91bda35837f8552"; + sha256 = "083k1v9gmmmhmll61kywgd1cn1l2qkfk6sqjjkcv6az01rkrm521"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; vim-tmux = buildVimPluginFrom2Nix { pname = "vim-tmux"; - version = "2019-03-22"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux"; - rev = "4e77341a2f8b9b7e41e81e9debbcecaea5987c85"; - sha256 = "16fgc0lx1jr8zbayanf5w677ssiw5xb8vwfaca295c8xlk760c3m"; + rev = "7e7680fb1bb05bca1c800213b265f45433ed1e33"; + sha256 = "19al4a4g8wfz43am32ncz8dg58wxhzn30p7r4n1780pv8hzkdrsb"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; @@ -6902,12 +6904,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-06-28"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d7a75cf6284d6706c77b18f86b0ce0afcddec965"; - sha256 = "0j7hdh58hizg14806r6vsq81sfy2yvqrn934xxb1hw3rzirhsjjj"; + rev = "a1dca9d03a5f235363c0d0dea5818dc320b649d6"; + sha256 = "0wh00hv1hwvbzqqws1xr4hv5c9llxkqbq2fbkprvizix1s6jvm7q"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6926,24 +6928,24 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-06-04"; + version = "2020-07-28"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "c95bb8bc2ff05e2261488497c050d63786c11a16"; - sha256 = "0vp98v3wcsmicpa4lzfg3v6scr67wfj36aj1qxwdkx7ahyc6c75g"; + rev = "fa8586f6f9ccff07cbe68642b51c95740c25019e"; + sha256 = "02ki9jdjvan2vnbk2r6fdj3q80q7a8iw5ymm10348qjyhwf7m0q1"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-06-04"; + version = "2020-07-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "5ac40adc26c9b3638395f04ccfc1c4c40f82a423"; - sha256 = "0q59s8rfrj2rswifhx11f201myi2nk5jc93qr25qh3wchy0pbpr3"; + rev = "b3188a81a753a5274809a99c1550d7c981560b1b"; + sha256 = "03cqz9rnv9fwjygrr3iflcbcvr0mjdjx0l32cdr9lkaddavlwqkz"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -7178,12 +7180,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-07-16"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7552bb5494d2305bed0adee3fbf695d1b11a331c"; - sha256 = "0p3fhpn96r2344wry9zl318iyk40y3xqmdrgi1wba5f8zglyz9fp"; + rev = "bcd722ccfaf736154b583b59852c3488d8eb22d5"; + sha256 = "0zvddfqyc2r14xbv77nxbx3lvhfcqb7ylbyjip86kz7i8aj984lx"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7346,12 +7348,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-07-16"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "920ac02981644d637ab89a40d7a80d70b413521e"; - sha256 = "0ysk9xdyvvhkdjm22sg4m0f6gl4b938x2m38c44sp3rzgryz93s7"; + rev = "4d76c5391b7975bd6dd09c0562c0fd4d78e14fa0"; + sha256 = "1ql5gwdnsf9y56ijphspfi3sbjgfj1594728xyw6l432mddgqx99"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7359,12 +7361,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-07-15"; + version = "2020-07-21"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "321700e848595af129d5d75afac92d0060d3cdf9"; - sha256 = "17kfnh1pp7ldbj7rhfsfvrbl0ny50bm3y6h9ih23r76cws2097zf"; + rev = "d3db1cb3a9b83cd8e7370a2af36c82f28f2c0ddf"; + sha256 = "15zxpqvamz4vaib9z2yl9ksgq4aynkfg79zsj3gf3c5q368gz7li"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7408,12 +7410,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-07-14"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "09fa2d8be89d05ecb394a19138372de27675a7cd"; - sha256 = "1kg02li4bjkdra1vfw25qc370xyh70m0q9l5klx2a0hmhnh2jl8j"; + rev = "079985534a5f2795bfaf549f276d4a1c213bfcb1"; + sha256 = "173yx5nv9pnjm1qxcfkgbf4yfbjyifqjn5qvk8ibdvdxrhyvbrdn"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; From 898eddeffd32288d413b2701f4154aecf2fa8778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 09:04:38 +0200 Subject: [PATCH 105/214] python3Packages.mecab-python3: 0.996.5 -> 1.0.1 --- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index cbc8084c232..dc712340554 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "0.996.5"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "e7f09caf136903ce908b8b001ffc178d6caa129c1550d47d8f7f733a213749a8"; + sha256 = "0246wxfk8v1js75nv8jl15cwpf4rvv4xndi4gbzjrrqbsgj2fvfm"; }; nativeBuildInputs = [ From 1673bc9c180c769d1c492eac625fed907980b13a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 07:25:13 +0000 Subject: [PATCH 106/214] pueue: 0.6.1 -> 0.7.1 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 1294ca6dcf4..f5c237da440 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "0x8slqxpnk4pis834g11wzp8fqsxwhdf0xnssz1pkkww4dqzali0"; + sha256 = "1ksks8c35q9aq5vnjxh480vqjyaa8c1fz1fb465vngnlyw762b22"; }; - cargoSha256 = "0r110zlzpzg0j5cq9zg0kk46qigp6bzd0kzmpx3ddvhblhxvq5m5"; + cargoSha256 = "0v1h4jhrzfb55zmpnbq18188rdvx7a7lvnjqh0w7cy90kvxssian"; nativeBuildInputs = [ installShellFiles ]; From 661949ba623e7b839027178bf8d9c8b3af4b7968 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 17:31:15 +1000 Subject: [PATCH 107/214] .editorconfig: add c, h, key, ovpn --- .editorconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.editorconfig b/.editorconfig index a4a872ed5c8..a32d8056f16 100644 --- a/.editorconfig +++ b/.editorconfig @@ -43,6 +43,14 @@ indent_style = space # Disable file types or individual files # some of these files may be auto-generated and/or require significant changes +[*.{c,h}] +insert_final_newline = unset +trim_trailing_whitespace = unset + +[*.{key,ovpn}] +insert_final_newline = unset +end_of_line = unset + [*.lock] indent_size = unset From 2f2954ccb17dd034b148baf0c31066f521641c55 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 17 Jul 2020 17:19:26 -0700 Subject: [PATCH 108/214] pythonPackages.backoff: init at 1.10.0 --- .../python-modules/backoff/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/backoff/default.nix diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix new file mode 100644 index 00000000000..fd92351c4d8 --- /dev/null +++ b/pkgs/development/python-modules/backoff/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, }: + +buildPythonPackage rec { + pname = "backoff"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "litl"; + repo = pname; + rev = "v${version}"; + sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0"; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + + checkInputs = [ pytestCheckHook pytest-asyncio ]; + + meta = with lib; { + description = "Function decoration for backoff and retry"; + homepage = "https://github.com/litl/backoff"; + license = licenses.mit; + maintainers = with maintainers; [ chkno ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61ee091dab0..cc2fe7db558 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1957,6 +1957,8 @@ in { backcall = callPackage ../development/python-modules/backcall { }; + backoff = callPackage ../development/python-modules/backoff { }; + backports_abc = callPackage ../development/python-modules/backports_abc { }; backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; From b80231a43abae58dd98c0543f7a5ade56df7f64d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jul 2020 17:57:59 +0000 Subject: [PATCH 109/214] i3-gaps: 4.18.1 -> 4.18.2 --- pkgs/applications/window-managers/i3/gaps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 7be037ca833..fa1c97c14c1 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,11 +3,11 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18.1"; + version = "4.18.2"; src = fetchurl { url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; - sha256 = "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k"; + sha256 = "0lz08wf4b0yprzqsmymn94kiyg885dcwmh0p64v2rnf52s165g2g"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; From afaf5d5d43bcb45b87b1f802adc83b03841c0f6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Jul 2020 07:23:07 +0000 Subject: [PATCH 110/214] conky: 1.11.5 -> 1.11.6 --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 14f17da55a7..ee67140cd86 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "1a75ss48mn9pknrxy33dh5rdgm67a5kpddsyqfhlcn1761kfzzyp"; + sha256 = "0y2g66fjqp2hdk0y1h4ijxhnv34j16gizvxpmbigwh4n6zijcm6v"; }; postPatch = '' From 2e30f681414a2a6dafecc01073e230d0bf2d69be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 29 Jul 2020 17:23:11 +0000 Subject: [PATCH 111/214] python27Packages.openapi-spec-validator: 0.2.8 -> 0.2.9 --- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 5e3806934d0..02f51bc3e66 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "1kav0jlgdpgwx4am09ja7cr8s1g8h8a7j8mcfy1cfjr8fficg2g4"; + sha256 = "1jw59mmd3n1d5zihdqz2a3j2axxf3m34lqp1190fw8rlndlilf3r"; }; propagatedBuildInputs = [ jsonschema pyyaml six setuptools ] From 31a9392d73ab8af89b62ffc67da87af21db1a6f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Jul 2020 11:53:06 +0000 Subject: [PATCH 112/214] ytcc: 1.8.3 -> 1.8.4 --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index f5086e15436..dc38648c369 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "0993vqbsqcnxgv5l3il432i4sqzp8ns69rnsgww872vpb4bp3cg8"; + sha256 = "11gwpqmq611j07pjscch28jsrfgyzy69ph2w1miz3arqmxz7dqjp"; }; nativeBuildInputs = [ gettext ]; From a993bd8eb78abeb713bd6ec3927c648cb3aab6fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Jul 2020 19:54:53 +0000 Subject: [PATCH 113/214] oprofile: 1.3.0 -> 1.4.0 --- pkgs/development/tools/profiling/oprofile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 6e6cb9fc4cf..ca346cd1f14 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -8,11 +8,11 @@ assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-1.3.0"; + name = "oprofile-1.4.0"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "1rj76vvkhpfn9k04s7jhb813ximfcwd9h5gh18pr4fgcw6yxiplm"; + sha256 = "04m46ni0ryk4sqmzd6mahwzp7iwhwqzfbmfi42fki261sycnz83v"; }; postPatch = '' From 54e20c23611d67ad96edd5d62f1cd32e9114e8ca Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Mon, 20 Jul 2020 11:35:16 -0400 Subject: [PATCH 114/214] pythonPackages.gdbgui: 0.13.2.0 -> 0.13.2.1 - add eventlet to propagatedBuildInputs - add homepage - add gevent-websocket to propagatedBuildInputs Without gevent-websocket, this message is printed on start: "WARNING - WebSocket transport not available. Install gevent-websocket for improved performance." - Add gevent-websocket to propagatedBuildInputs to suppress the error message and supposedly improve performance --- pkgs/development/tools/misc/gdbgui/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index d5f8cfa173b..ecbfc2ae756 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -8,11 +8,13 @@ , pygdbmi , pygments , gevent +, gevent-websocket +, eventlet , }: buildPythonApplication rec { pname = "gdbgui"; - version = "0.13.2.0"; + version = "0.13.2.1"; buildInputs = [ gdb ]; propagatedBuildInputs = [ @@ -22,11 +24,13 @@ buildPythonApplication rec { pygdbmi pygments gevent + gevent-websocket + eventlet ]; src = fetchPypi { inherit pname version; - sha256 = "0m1fnwafzrpk77yj3p26vszlz11cv4g2lj38kymk1ilcifh4gqw0"; + sha256 = "0zn5wi47m8pn4amx574ryyhqvhynipxzyxbx0878ap6g36vh6l1h"; }; postPatch = '' @@ -45,6 +49,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A browser-based frontend for GDB"; + homepage = "https://www.gdbgui.com/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ yrashk ]; From 4ceed2d0d40a89dab65fc44e7ae32ebe823adf96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Jul 2020 08:52:09 +0000 Subject: [PATCH 115/214] rgbds: 0.4.0 -> 0.4.1 --- pkgs/development/compilers/rgbds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 6fc21a0ffd1..d1a9a7742a8 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7"; + sha256 = "05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; From cec5aa3be931a13e837ac0ca1a6d0649cf573d33 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jul 2020 04:44:59 +0000 Subject: [PATCH 116/214] python27Packages.Theano: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/Theano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 88aee76fe5b..cc2b681e415 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -47,13 +47,13 @@ let in buildPythonPackage rec { pname = "Theano"; - version = "1.0.4"; + version = "1.0.5"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchPypi { inherit pname version; - sha256 = "35c9bbef56b61ffa299265a42a4e8f8cb5a07b2997dabaef0f8830b397086913"; + sha256 = "129f43ww2a6badfdr6b88kzjzz2b0wk0dwkvwb55z6dsagfkk53f"; }; postPatch = '' From 7b629e24a45e8960eb6561e50ace681db46286fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Jul 2020 10:53:43 +0000 Subject: [PATCH 117/214] randoop: 4.2.3 -> 4.2.4 --- pkgs/development/tools/analysis/randoop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 54c990ee058..0e57509d9f7 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.3"; + version = "4.2.4"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0apmwbh761b02z8i4s3d270ms0c1fw98d10rpczngrs2jz37s2m9"; + sha256 = "1p6l5xzz7cbhrk5wy3906llhnwk0l8nck53pvi0l57kz7bdnag5w"; }; buildInputs = [ unzip ]; From 440fb942e02992b12ee7e184e8dc401b189b9b65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Jul 2020 17:43:36 +0000 Subject: [PATCH 118/214] dgraph: 20.03.3 -> 20.03.4 --- pkgs/servers/dgraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index de62b6e6a43..d7ecd3d501f 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.03.3"; + version = "20.03.4"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0z2zc0mf7ndf3cpzi1js396s1yxpgfjaj9jacifsi8v6i6r0c6cz"; + sha256 = "1i098wimzwna62q4wp8ipx8qjrmhrdv48kklm1jdi2sfiz18c9sc"; }; - vendorSha256 = "1nz4yr3y4dr9l09hcsp8x3zhbww9kz0av1ax4192f5zxpw1q275s"; + vendorSha256 = "0n442nsa2whwb22dl0cjxspl8dc00rqv29zivcw9liwdzara81bw"; nativeBuildInputs = [ installShellFiles ]; From bac4f8ae18501007dbad0a004669c7015df53607 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 18 Jul 2020 03:14:03 +0000 Subject: [PATCH 119/214] python27Packages.argcomplete: 1.11.1 -> 1.12.0 --- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index b34b878a839..bd57b7b28a3 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.11.1"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0h1przxffrhqvi46k40pzjsvdrq4zc3sl1pc96kkigqppq0vdrss"; + sha256 = "0p19rkvh28klkkd1c6y78h6vb9b9cnlyr7qrshkxghfjkz85xgig"; }; doCheck = false; # meant to be ran with interactive interpreter From fb4535c4c1725e0881bf36d47f627eb39b3dbe35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 18 Jul 2020 01:39:31 +0000 Subject: [PATCH 120/214] python27Packages.chart-studio: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 0eed42dc286..6679f13b119 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "1.0.0"; + version = "1.1.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "${pname}-v${version}"; - sha256 = "14lyqbjdffnlnkzlfnn60k7yxjd99vx3hfcs23apsiyinzipjlbf"; + sha256 = "1q3j3ih5k0jhr8ilwffkfxp1nifpnjnx7862bzhxfg4d386hfg4i"; }; sourceRoot = "source/packages/python/chart-studio"; From 7be461544a96b2ada1211ab190afd8cbdba32685 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Jul 2020 13:32:48 +0000 Subject: [PATCH 121/214] muse: 3.1.0 -> 3.1.1 --- pkgs/applications/audio/muse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 87f86306b48..6ba29226b58 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "muse-sequencer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; rev = "muse_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq"; + sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"; }; sourceRoot = "source/muse3"; From 2920f932601f2fa3b06bf5d943462c30b33b8715 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 29 Jul 2020 13:28:54 +0000 Subject: [PATCH 122/214] python27Packages.colorlog: 4.1.0 -> 4.2.1 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index aa39588f313..a7a04c1f605 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.1.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1lpk8zmfv8vz090h5d0hzb4n39wgasxdd3x3bpn3v1x1n9dfzaih"; + sha256 = "066i7904vc7814gqnlprksf0ikz2dmviw93r2mr7sf53qci5irbm"; }; checkInputs = [ pytest ]; From fa06748f244437c540e718a9e583dc4e6d7225e6 Mon Sep 17 00:00:00 2001 From: Michael Faille Date: Thu, 30 Jul 2020 01:10:26 -0400 Subject: [PATCH 123/214] =?UTF-8?q?lmms:=201.2.1=20->=C2=A01.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/lmms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index c243e9beb23..b01c4055e40 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "lmms"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "08k2nfj0rw9mahr7pr90n79wviqmjmflrgcljc6y3x30v84wbp26"; + sha256 = "006hwv1pbh3y5whsxkjk20hsbgwkzr4dawz43afq1gil69y7xpda"; fetchSubmodules = true; }; From 9f67493bc440549baea911c744d2b64b4d3e63a7 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 29 Jul 2020 21:40:21 -0700 Subject: [PATCH 124/214] discord-canary: 0.0.104 -> 0.0.105 --- .../networking/instant-messengers/discord/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index bc76949e80a..a79065a0f8a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,20 +17,20 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.19"; + version = "0.0.20"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0wixmm16qsmgbr0l9144vl5pc3s2p4jqhl7cnc6kmgy1y4ig56ib"; + sha256 = "0wn2qdv0a4n59xl451y7fcq11klp2g63qwx40qkshllvnf5lzzsx"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.104"; + version = "0.0.105"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "17np1hqqygjlbmlln0d1ba2qlbjykwj156w5dw7g4lg77kfxicfk"; + sha256 = "1jc2zr8q33ras5mkifg19kcxpb84vsqx01rj66w62hsjw1nsbidg"; }; }; }.${branch} From 7bec3a3ccae682927156fb49f2c60f6d04be6aea Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 30 Jul 2020 10:45:40 +0100 Subject: [PATCH 125/214] nano: 4.9.3 -> 5.0 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index e2f041d0fd5..13a0e797adc 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.9.3"; + version = "5.0"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1d2i3wvsq5lvpxxinq51dcvd58xx7j0d0c2csz9hgvd06gq3hd3f"; + sha256 = "0dmagj4p1llb1a2w0iwdrqbd9cgp0bda4s18vwh6y1ndd6z983bw"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From f5db415e2f75f09048f98b96cee1a6e0d48c3a5d Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 30 Jul 2020 17:18:41 +0200 Subject: [PATCH 126/214] nixos/tests/dockerTools: add test for running non-root containers with buildLayeredImage Co-authored-by: Robert Hensing --- nixos/tests/docker-tools.nix | 10 +++++++ pkgs/build-support/docker/examples.nix | 36 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 5ce67695de4..2543801ae8b 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -79,6 +79,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker rmi ${examples.nix.imageName}", ) + with subtest( + "Ensure (layered) nix store has correct permissions " + "and that the container starts when its process does not have uid 0" + ): + docker.succeed( + "docker load --input='${examples.bashLayeredWithUser}'", + "docker run -u somebody --rm ${examples.bashLayeredWithUser.imageName} ${pkgs.bash}/bin/bash -c 'test 555 == $(stat --format=%a /nix) && test 555 == $(stat --format=%a /nix/store)'", + "docker rmi ${examples.bashLayeredWithUser.imageName}", + ) + with subtest("The nix binary symlinks are intact"): docker.succeed( "docker load --input='${examples.nix}'", diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 0d907c2d64b..bc107471762 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -382,4 +382,40 @@ rec { contents = pkgs.bashInteractive; }; + # buildLayeredImage with non-root user + bashLayeredWithUser = + let + nonRootShadowSetup = { user, uid, gid ? uid }: with pkgs; [ + ( + writeTextDir "etc/shadow" '' + root:!x::::::: + ${user}:!::::::: + '' + ) + ( + writeTextDir "etc/passwd" '' + root:x:0:0::/root:${runtimeShell} + ${user}:x:${toString uid}:${toString gid}::/home/${user}: + '' + ) + ( + writeTextDir "etc/group" '' + root:x:0: + ${user}:x:${toString gid}: + '' + ) + ( + writeTextDir "etc/gshadow" '' + root:x:: + ${user}:x:: + '' + ) + ]; + in + pkgs.dockerTools.buildLayeredImage { + name = "bash-layered-with-user"; + tag = "latest"; + contents = [ pkgs.bash pkgs.coreutils (nonRootShadowSetup { uid = 999; user = "somebody"; }) ]; + }; + } From a6be13831aeb3a1eb53bfbb5fb62a63eea552bee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 31 Jul 2020 01:00:08 -0700 Subject: [PATCH 127/214] python2Packages.statsmodels: disable py27, abandoned ``` Processing ./statsmodels-0.11.1-cp27-cp27mu-linux_x86_64.whl ERROR: Package 'statsmodels' requires a different Python: 2.7.18 not in '>=3.5' ``` --- pkgs/development/python-modules/statsmodels/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 697bb624fe7..ba6d0b64f54 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "statsmodels"; version = "0.11.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; From c29cae297301507fe57a4158dbf43aabb6fd90a7 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Fri, 31 Jul 2020 10:40:03 +0200 Subject: [PATCH 128/214] wofi: 1.1.2 -> 1.2.1 --- pkgs/applications/misc/wofi/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index d466384e66c..69ec8fffaa1 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,27 +2,17 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.1.2"; + version = "1.2.1"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn"; + sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; - # Fixes icon bug on NixOS. - # Will need to be removed on next release - # see https://todo.sr.ht/~scoopta/wofi/54 - patches = [ - (fetchpatch { - url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49"; - sha256 = "1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb"; - }) - ]; - postInstall = '' installManPage man/wofi* ''; From b0edcfd09bbf9e8571704cf5df8d68956c79af44 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 31 Jul 2020 11:19:08 +0300 Subject: [PATCH 129/214] gnomeExtensions.gsconnect: 38 -> 39 --- pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 625b06d7405..53f8d9e79a0 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "38"; + version = "39"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "1z5wn3n1sqc2xdxiq0g3dkga7srz5ak41qdyjsh9pzb5x93dxzi5"; + sha256 = "0d2wypf36p95v756arf06gfilpb48gp55i1xbqnqvcd10n3q4zc2"; }; patches = [ From 1ebdab2240fb8ca37e5c218535a500cdefd112d9 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Fri, 31 Jul 2020 10:59:50 +0200 Subject: [PATCH 130/214] pop-gtk: 2020-04-22 -> 2020-06-30 --- pkgs/data/themes/pop-gtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 244240dde9f..feb2ddebb39 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-04-22"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "b3f98dfd61cfff81f69cdc7f57bce7a9efaa36f4"; - sha256 = "0vhcc694x33sgcpbqkrc5bycbd7017k4iii0mjjxgd22jd5lzgkb"; + rev = "8c31be9f9257375bf7a049069cb4ecbac7d281a1"; + sha256 = "16dxxazpllcxlbiblynqq4b65wfn9k1jab8dl69l819v73z303ky"; }; nativeBuildInputs = [ From 03812ea8065e16b7c60204f69d9f26fb268e74bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 09:28:41 +0000 Subject: [PATCH 131/214] shattered-pixel-dungeon: 0.8.1 -> 0.8.1a --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 4f11665c9a0..2861c9effd9 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -9,13 +9,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.1"; + version = "0.8.1a"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1n459xdvqf974hs91xfq5fdj29s4w5w83dg3m2vp7gqmrmm2jykf"; + sha256 = "0cfrcjvnn2j4p7zbz252qbn2jacgwhzaja8lqvif0x1vszyl41v7"; }; postPatch = '' From 7676d04fc53bedb47f3469e1cc4d58956c7f4e59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 09:37:42 +0000 Subject: [PATCH 132/214] simplenote: 1.19.0 -> 1.20.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7cc5bc6eb7f..52aa215987b 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.19.0"; + version = "1.20.0"; sha256 = { - x86_64-linux = "1bvg8xlf2y9nz7dzs5jkr5b48hwmvhvb6m4ia1fyvnqqq46nz9wb"; + x86_64-linux = "0fzv8nbac5bnxvm2p7p4jsjvfrzk3h9j57zjmwvsi2dq6l80d2n7"; }.${system} or throwSystem; meta = with stdenv.lib; { From e5b3655ae00036c846718ad29d9042e5aaece278 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 09:42:34 +0000 Subject: [PATCH 133/214] skaffold: 1.12.0 -> 1.12.1 --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index b94217d20a4..398f524af08 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.12.0"; + version = "1.12.1"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "12m2yqlngxvyyiqa58fmdwi752bz3mkk8fi312dvakr5kysnvn1l"; + sha256 = "1mk4mn9h44v2xs65jjslmi03j3bixg0fkn396hmxp718w68850lz"; }; nativeBuildInputs = [ installShellFiles ]; From 98c1bcf392cee94705be22ea875a9ab2da9bb048 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 10:49:50 +0000 Subject: [PATCH 134/214] taskell: 1.9.3 -> 1.9.4 --- pkgs/applications/misc/taskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index e8f1c711d27..2a083f45731 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.9.3"; - sha256 = "1xh18884xkhcln4blglzi0faag4ydhxxsk9hj6llb81kcsxlsi89"; + version = "1.9.4"; + sha256 = "0k8s1f0c99fz6jmqi6jqscsfxrrijnnpyw4jcj8zxpdf0sc07gca"; in (haskellPackages.mkDerivation { pname = "taskell"; From 229ac0080feb58b5268a7457374db27ae75f339b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 11:09:07 +0000 Subject: [PATCH 135/214] terracognita: 0.5.0 -> 0.5.1 --- pkgs/development/tools/misc/terracognita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 6141b0b9997..42afb1d7dd9 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terracognita"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "0s6k78n94q13crdlgxb5c8qn708nbzn6nmhkil4s23f0qdskcah2"; + sha256 = "1z0vf3x46w3glwvq185hgmfkg7xfq31c7d3yjhh8qkwbhkx4bga4"; }; vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; From b8d60df8dda15962ac77b6c0f61ade4efc8519c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 11:16:03 +0000 Subject: [PATCH 136/214] terraform-ls: 0.4.0 -> 0.5.4 --- pkgs/development/tools/misc/terraform-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index f2c8a6c4cdd..2a8f9ef40bd 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.4.0"; + version = "0.5.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "105wk7lzsjl5qa1qnb40msj3wh4awqykkynj5fs0a7nzbcbrpxsj"; + sha256 = "05cij0qh1czxnms4zjyycidx84brsmlqw1c6fpk5yv58g3v8d3v7"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; From 8684be2f546ae1845c8c6403f8786ac6a65a29e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 11:20:56 +0000 Subject: [PATCH 137/214] tfsec: 0.23.2 -> 0.24.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 00800eb1852..72815750f21 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.23.2"; + version = "0.24.1"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "15rfr4mfawbsa0ja9ishxp4inhch8dgzayl6p0qsnad24g7v4ygq"; + sha256 = "10sl3gpjvgjigkb0v35w96xm414widh0ygb6pnzgyz1ph8ilm86p"; }; goPackagePath = "github.com/liamg/tfsec"; From 7e0017bae2ec57ed6504e5558e65463c6cae4564 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 11:26:47 +0000 Subject: [PATCH 138/214] thanos: 0.13.0 -> 0.14.0 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 9970fab8ed2..2a7656d88c3 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "03a964myry84ig8akim6vs6izl15hdpf5ggg4z5179ydbmvnq3lq"; + sha256 = "1y3jaj1sxbn9m1c2rihjw229qx4q35l8l70xiny34qhmpzp6y00p"; }; - vendorSha256 = "1jpw7k76li4dlfhhzy175198921zrdm09nnhqpmh7p80z252n936"; + vendorSha256 = "0ixriy5i1qc8hnslmiyd3qfw1g14zlmcslqwn2a9fpk7h0hwinba"; subPackages = "cmd/thanos"; From f153d9f8556014d2066a298f30aa1552a4ae9744 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 30 Jul 2020 19:46:17 +0200 Subject: [PATCH 139/214] mimetic: patch for aarch64 --- .../development/libraries/mimetic/default.nix | 2 ++ .../libraries/mimetic/narrowing.patch | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/mimetic/narrowing.patch diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 06b6653f4e7..0147a297305 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; + patches = stdenv.lib.optional stdenv.isAarch64 ./narrowing.patch; + meta = with stdenv.lib; { description = "MIME handling library"; homepage = "http://www.codesink.org/mimetic_mime_library.html"; diff --git a/pkgs/development/libraries/mimetic/narrowing.patch b/pkgs/development/libraries/mimetic/narrowing.patch new file mode 100644 index 00000000000..676e29376c7 --- /dev/null +++ b/pkgs/development/libraries/mimetic/narrowing.patch @@ -0,0 +1,32 @@ +diff -ru a/mimetic/codec/base64.cxx b/mimetic/codec/base64.cxx +--- a/mimetic/codec/base64.cxx 2014-06-17 10:12:00.000000000 +0200 ++++ b/mimetic/codec/base64.cxx 2020-07-30 20:54:10.212742011 +0200 +@@ -14,19 +14,19 @@ + "0123456789+/="; + + const char Base64::sDecTable[] = { +- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +- -1,-1,-1,62,-1,-1,-1,63,52,53, +- 54,55,56,57,58,59,60,61,-1,-1, +- -1, eq_sign, -1,-1,-1, 0, 1, 2, 3, 4, ++ 255,255,255,255,255,255,255,255,255,255, ++ 255,255,255,255,255,255,255,255,255,255, ++ 255,255,255,255,255,255,255,255,255,255, ++ 255,255,255,255,255,255,255,255,255,255, ++ 255,255,255,62,255,255,255,63,52,53, ++ 54,55,56,57,58,59,60,61,255,255, ++ 255, eq_sign, 255,255,255, 0, 1, 2, 3, 4, + 5, 6, 7, 8, 9,10,11,12,13,14, + 15,16,17,18,19,20,21,22,23,24, +- 25,-1,-1,-1,-1,-1,-1,26,27,28, ++ 25,255,255,255,255,255,255,26,27,28, + 29,30,31,32,33,34,35,36,37,38, + 39,40,41,42,43,44,45,46,47,48, +- 49,50,51,-1 ++ 49,50,51,255 + }; + + const int Base64::sDecTableSz = sizeof(Base64::sDecTable) / sizeof(char); From 7f1281f646f69c278910a41870cc95dbdece40d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 12:04:40 +0000 Subject: [PATCH 140/214] topgrade: 5.1.0 -> 5.3.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index af3b126614a..e527194148e 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "5.1.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0cnzla5x4y4j658zihlnrghry4c3695gi0marwygh7vcfxqh0vlh"; + sha256 = "1rksd6bbnxaq8rfr5kabcl6xr6paqs0zg57xvn3vzpnnf41g1m3v"; }; - cargoSha256 = "16y71dd775knkq04x6qjs6zf3b9z12vz5xhqm18sl2bm3sbsq4pc"; + cargoSha256 = "190sbp8j265iyxvl3rqs5q4wp6wk5c82f2yb46yhdmlm410zck47"; buildInputs = lib.optional stdenv.isDarwin Foundation; From f68c979ac271ca866e3ce163164fac44eeef7356 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 10:56:29 +0000 Subject: [PATCH 141/214] telegraf: 1.14.5 -> 1.15.1 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index dbc0b4b4c59..3b957f28c7a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.5"; + version = "1.15.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "1rnrg1q0dylr62cfkzspp47w818cja3hs6bbarcksmp0s23rq6lz"; + sha256 = "0chi1ip7h7vplsyjvsfm9zbxjfdmgk17r16j70i9492dwln9frhj"; }; - vendorSha256 = "1mjlakf88fa75qldkz62aja0wn0m6xqfr45vjy0lwpi0adc0fz70"; + vendorSha256 = "02cfmky0zbhfwnr7c902k79az9pcywha9x7vsm82r2qqdhx1h9kz"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} From 698b478eba44a4def9bbafd781077d2c420bb8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Jul 2020 13:27:51 +0100 Subject: [PATCH 142/214] telegraf: use runVend this is needed on macOS to build gopsutils: https://github.com/shirou/gopsutil/issues/491 --- pkgs/servers/monitoring/telegraf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 3b957f28c7a..d8743a54bd0 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { sha256 = "0chi1ip7h7vplsyjvsfm9zbxjfdmgk17r16j70i9492dwln9frhj"; }; - vendorSha256 = "02cfmky0zbhfwnr7c902k79az9pcywha9x7vsm82r2qqdhx1h9kz"; + runVend = true; + vendorSha256 = "0c2sayg49b2rq3fnrbf741b6zy8byhwxlnxkhf5160gzqn6jy2rw"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} From 774e1e183117b535eff13db3467f1d8f2098f63a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 12:35:11 +0000 Subject: [PATCH 143/214] tunnelto: 0.1.11 -> 0.1.12 --- pkgs/tools/networking/tunnelto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 30e6c937451..c0dce98c444 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "138917pgcgdqm4iy20qhifswlgxszjlrg6aygwrm64k1w6h5ndbl"; + sha256 = "1vvb619cq3n88y2s8lncwcyrhb5s4gpjfiyia91pilcpnfdb04y2"; }; - cargoSha256 = "1vgd01gda5k7pb14za4isfgxpdmv0nq8wgy2cbgmlcrk5q2p25wp"; + cargoSha256 = "0k0ig3dynj46kh8g7d6bljcaalmp40pvdbhbjmlxrmwnjq6bhzcq"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] From 897efe18e9c0b62f2f4964b50db54e6be889c4ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 12:46:30 +0000 Subject: [PATCH 144/214] ugrep: 2.4.1 -> 2.5.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 9702cc92835..95399006dbb 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "16nr7zq4l2si9pfckfinbqnv94hw51z2qcbygc9x81jbjlvg3003"; + sha256 = "0aps4srdss71p6riixcdk50f2484bmq6p2kg95gcb8wbcv3ad3c9"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; From 43e1e283c6819f261848ece9189dbee9139a050f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 31 Jul 2020 09:05:29 -0400 Subject: [PATCH 145/214] linux/hardened/patches/4.14: 4.14.189.a -> 4.14.190.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ee9fdd79b95..08ee2288f22 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.189.a.patch", - "sha256": "1i6lhw1mb2hqqg5b7cpsc6i2nffh0hgfv16i2d6lgjhgw8h6w26v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.189.a/linux-hardened-4.14.189.a.patch" + "name": "linux-hardened-4.14.190.a.patch", + "sha256": "0lk0y2nlld4av8xjcsrqla30bflvvkzjz007s47y9hwbdrbn23pp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.190.a/linux-hardened-4.14.190.a.patch" }, "4.19": { "name": "linux-hardened-4.19.134.a.patch", From fca98b5da89ef4ef61edd872e3462e7d77fc9b6b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 31 Jul 2020 09:05:34 -0400 Subject: [PATCH 146/214] linux/hardened/patches/4.19: 4.19.134.a -> 4.19.135.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 08ee2288f22..3a113ecab5f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.190.a/linux-hardened-4.14.190.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.134.a.patch", - "sha256": "0yq7s0lf79ijdsa64yr2869fwlij8jy167mbqh6mj356wyybxcg2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.134.a/linux-hardened-4.19.134.a.patch" + "name": "linux-hardened-4.19.135.a.patch", + "sha256": "1x8fl5imcy7ws3pvispv4g3x88dddb3ah57kib78kk5pqi4w20y8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.135.a/linux-hardened-4.19.135.a.patch" }, "5.4": { "name": "linux-hardened-5.4.53.a.patch", From 4c789190beb43feade639ee5f5656e31446e471e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 31 Jul 2020 09:05:36 -0400 Subject: [PATCH 147/214] linux/hardened/patches/5.4: 5.4.53.a -> 5.4.54.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3a113ecab5f..a035e8601a3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.135.a/linux-hardened-4.19.135.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.53.a.patch", - "sha256": "0fmcym3r280a8adyqicix6ri622k02sqf16ic3myldfic2qs4syv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.53.a/linux-hardened-5.4.53.a.patch" + "name": "linux-hardened-5.4.54.a.patch", + "sha256": "16h3iiqf6z8v6bbymxrp36w15qil5lfr6y48vwh99dx1yyrgdyzp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.54.a/linux-hardened-5.4.54.a.patch" }, "5.6": { "name": "linux-hardened-5.6.19.a.patch", From c55d161ca2f601de28d7797aef71d1e34401c7a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 31 Jul 2020 09:05:44 -0400 Subject: [PATCH 148/214] linux/hardened/patches/5.7: 5.7.10.a -> 5.7.11.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a035e8601a3..4481efef588 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.10.a.patch", - "sha256": "04a1sxdmh7r22vk5xkfj70rd4qjshvyx6w9zjryl9h4ffd338340", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.10.a/linux-hardened-5.7.10.a.patch" + "name": "linux-hardened-5.7.11.a.patch", + "sha256": "0vamaqrcs8nq8pjgq86lrxq0cdkr5kp4vydp8z2sr27q7ninnrla", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.11.a/linux-hardened-5.7.11.a.patch" } } From 0645303fb88142956cfb2b59b38aedf45eaac574 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 31 Jul 2020 09:06:33 -0400 Subject: [PATCH 149/214] oh-my-zsh: 2020-07-23 -> 2020-07-30 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 79aaa185500..1f22099e901 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-07-23"; + version = "2020-07-30"; pname = "oh-my-zsh"; - rev = "95218372402afc9aeafc89c0984310387ce79599"; + rev = "8755c5f101f801738dd249c7685dcf30dd03a7b2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0fgxq2d6lajk5fjbr9vwhhnw58gbk6yhbc49pcj563lwk2kc4d9f"; + sha256 = "0z6bcv91xxfnaj42n7yzlx0wv14f87wws0n5cciy2g4yd3kyzmkq"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 3f922834b8ed953738aa27c3ad855c8731539d2c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 20 May 2020 17:59:23 +0530 Subject: [PATCH 150/214] nixos/lib/make-disk-image.nix: abritary format input Pass unrecognized format types as the output file extension to qemu-img. The motivation is support for "vdi" output. --- nixos/lib/make-disk-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 4806fe9dbac..8aa606a56af 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -71,7 +71,7 @@ let format' = format; in let vdi = "vdi"; vpc = "vhd"; raw = "img"; - }.${format}; + }.${format} or format; rootPartition = { # switch-case legacy = "1"; From 67458351536ca8a3cb207fff32f4000f340a3d80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 14:02:25 +0000 Subject: [PATCH 151/214] batsignal: 1.0.0 -> 1.1.2 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 62434982968..56c508eaca9 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = "${version}"; - sha256 = "wy7YhgKfz07u0bp7rWpze+KmSdooOkmU7giaBX3wWkY="; + sha256 = "0ss5dw7wpqsf96dig6r7x4fhf6brmjdy54jyyf5nk1h9kzw4d69r"; }; buildInputs = [ libnotify glib ]; From 5891c750eddb81f822c664d0da9007e6b6cd331b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 16:07:37 +0000 Subject: [PATCH 152/214] blender: 2.83.1 -> 2.83.3 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 232ab1b2df0..45df3547545 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.1"; + version = "2.83.3"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23"; + sha256 = "18m27abp4j3xv48dr6ddr2mqcvx2vkjffr487z90059yv9k0yh2p"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From 124a8fda347781ab426d679c7e7de3026f6ef7ca Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 1 Aug 2020 00:08:09 +0800 Subject: [PATCH 153/214] cargo-expand: 0.6.4 -> 1.0.0 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 8dd09a2deef..93121a11eea 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.6.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0a00sw6r8z6pyqqa6f5c7czxjnjdx3kz1bacy790nsngvz17l30h"; + sha256 = "0bdv6h3mzmv46pdyvwl0v0bg719dlsxlx378ws6vgi1cga24g37i"; }; - cargoSha256 = "0x92yh9pl30h4k53269dgnryb6z8nfl2mfx3wpcp3ph5na2knwpj"; + cargoSha256 = "0qpihfgfqxw5fyhn124c5lbfaxr717bqf8mrbagh3vdgvk75j0qz"; meta = with lib; { description = From 4d1970923c744cd8cfed99910cc2f41c3ee9bfe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 22 Jul 2020 10:51:04 +0200 Subject: [PATCH 154/214] resilio-sync: 2.7.1 -> 2.7.2 Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log --- pkgs/applications/networking/resilio-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index cdc2f5e1478..fe75268c0ec 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm"; - i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i"; + x86_64-linux = "0gar5lzv1v4yqmypwqsjnfb64vffzn8mw9vnjr733fgf1pmr57hf"; + i686-linux = "1bws7r86h1vysjkhyvp2zk8yvxazmlczvhjlcayldskwq48iyv6w"; }.${stdenv.hostPlatform.system}; }; From 256dbf698028f7c0fe2f7907cd3c4fcc3401af22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Jul 2020 17:28:31 +0100 Subject: [PATCH 155/214] temporary delete github actions We are currently seeing a lot of misterious github actions failures. They might be linked to our github actions: https://github.com/nixos/nixpkgs/actions --- .github/workflows/editorconfig.yml | 22 --------------------- .github/workflows/wait-ofborg.yml | 31 ------------------------------ 2 files changed, 53 deletions(-) delete mode 100644 .github/workflows/editorconfig.yml delete mode 100644 .github/workflows/wait-ofborg.yml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml deleted file mode 100644 index 70959b42aa1..00000000000 --- a/.github/workflows/editorconfig.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: actions - -on: - pull_request: - branches: - - master - -jobs: - editorconfig: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v2.0.2 - - name: editorconfig check - env: - VERSION: "2.0.4" - OS: "linux" - ARCH: "amd64" - run: | - curl -sSf -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz && \ - tar xzf ec-$OS-$ARCH.tar.gz && \ - ./bin/ec-$OS-$ARCH -disable-indentation ${{ env.GIT_DIFF }} diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml deleted file mode 100644 index 35c58b2e912..00000000000 --- a/.github/workflows/wait-ofborg.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: "Wait for ofborg" -on: - pull_request: -jobs: - tests: - runs-on: ubuntu-latest - steps: - - name: Wait for ofborg CI - run: | - # wait for ~30min... - # ..in future a better fix would be to make ofborg mark CI as pending right away. - for i in $(seq 360); do - res=$(curl --silent \ - -H "Accept: application/vnd.github.antiope-preview+json" \ - -H "Authorization: token ${GITHUB_TOKEN}" \ - "https://api.github.com/repos/NixOS/nixpkgs/commits/${COMMIT}/check-runs" | \ - jq ".check_runs | map(.app) | map(.id) | contains([${OFBORG_APP_ID}])") - if [[ "$res" == "true" ]]; then - exit 0 - fi - sleep 5 - echo "." - done - echo "Timeout!" - exit 1 - # ofborg is not checking forks. - if: github.repository_owner == 'NixOS' - env: - GITHUB_TOKEN: ${{ github.token }} - COMMIT: ${{ github.event.pull_request.head.sha }} - OFBORG_APP_ID: 20500 From 4681807395f85827ecf6961a9e99bd1f02de622f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Jul 2020 17:34:37 +0100 Subject: [PATCH 156/214] Revert "temporary delete github actions" This reverts commit 256dbf698028f7c0fe2f7907cd3c4fcc3401af22. This did not solve the github action failures --- .github/workflows/editorconfig.yml | 22 +++++++++++++++++++++ .github/workflows/wait-ofborg.yml | 31 ++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/workflows/editorconfig.yml create mode 100644 .github/workflows/wait-ofborg.yml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml new file mode 100644 index 00000000000..70959b42aa1 --- /dev/null +++ b/.github/workflows/editorconfig.yml @@ -0,0 +1,22 @@ +name: actions + +on: + pull_request: + branches: + - master + +jobs: + editorconfig: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: technote-space/get-diff-action@v2.0.2 + - name: editorconfig check + env: + VERSION: "2.0.4" + OS: "linux" + ARCH: "amd64" + run: | + curl -sSf -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz && \ + tar xzf ec-$OS-$ARCH.tar.gz && \ + ./bin/ec-$OS-$ARCH -disable-indentation ${{ env.GIT_DIFF }} diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml new file mode 100644 index 00000000000..35c58b2e912 --- /dev/null +++ b/.github/workflows/wait-ofborg.yml @@ -0,0 +1,31 @@ +name: "Wait for ofborg" +on: + pull_request: +jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Wait for ofborg CI + run: | + # wait for ~30min... + # ..in future a better fix would be to make ofborg mark CI as pending right away. + for i in $(seq 360); do + res=$(curl --silent \ + -H "Accept: application/vnd.github.antiope-preview+json" \ + -H "Authorization: token ${GITHUB_TOKEN}" \ + "https://api.github.com/repos/NixOS/nixpkgs/commits/${COMMIT}/check-runs" | \ + jq ".check_runs | map(.app) | map(.id) | contains([${OFBORG_APP_ID}])") + if [[ "$res" == "true" ]]; then + exit 0 + fi + sleep 5 + echo "." + done + echo "Timeout!" + exit 1 + # ofborg is not checking forks. + if: github.repository_owner == 'NixOS' + env: + GITHUB_TOKEN: ${{ github.token }} + COMMIT: ${{ github.event.pull_request.head.sha }} + OFBORG_APP_ID: 20500 From 28c06140bef0753bc6c1855facae52ff4c5820d9 Mon Sep 17 00:00:00 2001 From: Tina Bu Date: Fri, 31 Jul 2020 09:41:39 -0700 Subject: [PATCH 157/214] pythonPackages.qds_sdk: 1.12.0 -> 1.15.2 --- pkgs/development/python-modules/qds_sdk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix index 7b4cfa501dd..56b3f36c367 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/pkgs/development/python-modules/qds_sdk/default.nix @@ -11,29 +11,29 @@ buildPythonPackage rec { pname = "qds_sdk"; - version = "1.12.0"; + version = "1.15.2"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "qubole"; repo = "qds-sdk-py"; rev = "V${version}"; - sha256 = "18xhvlcfki8llv7fw2r5yfk20zds3gr78b4klwm9mkvhlhwds9rx"; + sha256 = "0xxg9s0y6fz7vb1kab4q93q7ryi71z8x6q9qspm6s506yr3mc67l"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ boto inflection requests - six - urllib3 + six + urllib3 ]; checkInputs = [ pytest mock ]; checkPhase = '' py.test --disable-pytest-warnings tests ''; - + meta = with lib; { description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API"; homepage = "https://github.com/qubole/qds-sdk-py"; From dde584b3c7f12b7a5562eb5726b9070d6ce45019 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 27 Jul 2020 12:41:38 -0500 Subject: [PATCH 158/214] maintainers: add KarlJoad --- maintainers/maintainer-list.nix | 6 ++++++ .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 240ed312e52..e36ef49760f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4151,6 +4151,12 @@ github = "karantan"; githubId = 7062631; }; + KarlJoad = { + email = "karl@hallsby.com"; + github = "KarlJoad"; + githubId = 34152449; + name = "Karl Hallsby"; + }; karolchmist = { email = "info+nix@chmist.com"; name = "karolchmist"; 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 4b8a1238c01..87886462a65 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -404,7 +404,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames srcs; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap ]; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap KarlJoad ]; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From 1970c2dbd0c6fd20f87e88b1882617d20f0a515f Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 27 Jul 2020 12:41:49 -0500 Subject: [PATCH 159/214] tor-browser-bundle-bin: 9.5 -> 9.5.3 Squashed commits: 1. tor-browser-bundle-bin: 9.5 -> 9.5.1 2. tor-browser-bundle-bin: 9.5.1 -> 9.5.3 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 87886462a65..21a34539b86 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"; + version = "9.5.3"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "0l4fz2zkgwv2qniia4nv53a4pd79hfbgb66jn68r44diails1z08"; + sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1h4awhyaiws68s727pq9r32xqg2878dl2df4kbc2nmllwrl2fxq3"; + sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b"; }; }; in From 85f6da6eed93e0ab5650016b44c8ec90bef8b518 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 19 May 2020 03:39:54 +0300 Subject: [PATCH 160/214] wrapNeovim: Rewrite Cleanups: - Removed unneeded neovim.meta.description reset. - Remove unnecessary -x checks in `postBuild`. - Use a ${placeholder "out"} if needed. Changes: - Switch to symlinkJoin, so e.g manpages link to the environment (#87929). - Use nvim-node from $out/bin/ just like all other providers. - Compute all arguments to makeWrapper in pure Nix "before" `postBuild`. - Prevent double wrapping in case `configure != {}` and rplugin.vim needs to be generated. Co-authored-by: Silvan Mosberger --- pkgs/applications/editors/neovim/wrapper.nix | 117 +++++++++++++------ 1 file changed, 82 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index c7d5f764978..716ec8d06ae 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper +{ stdenv, symlinkJoin, lib, makeWrapper , vimUtils , bundlerEnv, ruby , nodejs @@ -55,44 +55,95 @@ let binPath = makeBinPath (optionals withRuby [rubyEnv] ++ optionals withNodeJs [nodejs]); + # Mapping a boolean argument to a key that tells us whether to add or not to + # add to nvim's 'embedded rc' this: + # + # let g:_host_prog=$out/bin/nvim- + # + # Or this: + # + # let g:loaded_${prog}_provider=1 + # + # While the later tells nvim that this provider is not available + # + hostprog_check_table = { + node = withNodeJs; + python = withPython; + python3 = withPython3; + ruby = withRuby; + }; + ## Here we calculate all of the arguments to the 1st call of `makeWrapper` + # We start with the executable itself NOTE we call this variable "initial" + # because if configure != {} we need to call makeWrapper twice, in order to + # avoid double wrapping, see comment near finalMakeWrapperArgs + initialMakeWrapperArgs = + let + flags = lib.concatLists (lib.mapAttrsToList ( + prog: + withProg: + [ + "--cmd" + (if withProg then + "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" + else + "let g:loaded_${prog}_provider=1" + ) + ] + ) hostprog_check_table); + in [ + "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" + "--argv0" "$0" + "--add-flags" (lib.escapeShellArgs flags) + ] ++ lib.optionals withRuby [ + "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] ++ lib.optionals (binPath != "") [ + "--suffix" "PATH" ":" binPath + ]; + # If configure != {}, we can't generate the rplugin.vim file with e.g + # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in + # the wrapper. That's why only when configure != {} (tested both here and + # when postBuild is evaluated), we call makeWrapper once to generate a + # wrapper with most arguments we need, excluding those that cause problems to + # generate rplugin.vim, but still required for the final wrapper. + finalMakeWrapperArgs = initialMakeWrapperArgs + # this relies on a patched neovim, see + # https://github.com/neovim/neovim/issues/9413 + ++ lib.optionals (configure != {}) [ + "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" + "--add-flags" "-u ${vimUtils.vimrcFile configure}" + ] + ; in - stdenv.mkDerivation { + symlinkJoin { name = "neovim-${stdenv.lib.getVersion neovim}"; - buildCommand = let bin="${neovim}/bin/nvim"; in '' - if [ ! -x "${bin}" ] - then - echo "cannot find executable file \`${bin}'" - exit 1 - fi - - makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \ - "$out/bin/nvim" --add-flags " \ - --cmd \"${if withNodeJs then "let g:node_host_prog='${nodePackages.neovim}/bin/neovim-node-host'" else "let g:loaded_node_provider=1"}\" \ - --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \ - --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \ - --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ - --suffix PATH : ${binPath} \ - ${optionalString withRuby '' --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } - '' - + optionalString (!stdenv.isDarwin) '' - # copy icon and patch the original neovim.desktop file - mkdir -p $out/share/{applications,pixmaps} - ln -s ${neovim}/share/pixmaps/nvim.png $out/share/pixmaps/nvim.png + postBuild = '' + # Remove the symlinks created by symlinkJoin which we need to perform + # extra actions upon + rm $out/share/applications/nvim.desktop $out/bin/nvim + makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim' '' + optionalString withPython '' makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH - '' + optionalString withPython3 '' + '' + + optionalString withPython3 '' makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH - '' + optionalString withRuby '' + '' + + optionalString withRuby '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' + optionalString vimAlias '' + '' + + optionalString withNodeJs '' + ln -s ${nodePackages.neovim}/bin/neovim-node $out/bin/nvim-node + '' + + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim - '' + optionalString viAlias '' + '' + + optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi - '' + optionalString (configure != {}) '' + '' + + optionalString (configure != {}) '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim # Some plugins assume that the home directory is accessible for @@ -119,22 +170,18 @@ let echo -e "\nGenerating rplugin.vim failed!" exit 1 fi - unset NVIM_RPLUGIN_MANIFEST - - # this relies on a patched neovim, see - # https://github.com/neovim/neovim/issues/9413 - wrapProgram $out/bin/nvim \ - --set NVIM_SYSTEM_RPLUGIN_MANIFEST $out/rplugin.vim \ - --add-flags "-u ${vimUtils.vimrcFile configure}" ${extraMakeWrapperArgs} + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${extraMakeWrapperArgs} ''; + paths = [ neovim ]; + preferLocalBuild = true; buildInputs = [makeWrapper]; passthru = { unwrapped = neovim; }; meta = neovim.meta // { - description = neovim.meta.description; + # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package priority = (neovim.meta.priority or 0) - 1; From 21b77ce12aab959949ff2e95c9e3bc15da0b87e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jul 2020 07:23:20 +0000 Subject: [PATCH 161/214] python37Packages.opt-einsum: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/opt-einsum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 6bf0e451f04..2ded1dfc196 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "opt_einsum"; src = fetchPypi { inherit version pname; - sha256 = "165r7rsl5j94kna4q3vsaq71z23lgxd9b20dgb6abrlas6c6mdw3"; + sha256 = "0jb5lia0q742d1713jk33vlj41y61sf52j6pgk7pvhxvfxglgxjr"; }; propagatedBuildInputs = [ numpy ]; From 30a97cf45cdc1ae460bae17bb43d426b071246f6 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Sat, 21 Mar 2020 17:22:19 +0100 Subject: [PATCH 162/214] plexamp: init at 3.0.3 Desktop file does not work. --- pkgs/applications/audio/plexamp/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/plexamp/default.nix diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix new file mode 100644 index 00000000000..98cc1065bdb --- /dev/null +++ b/pkgs/applications/audio/plexamp/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchurl, appimageTools, pkgs }: + +let + pname = "plexamp"; + version = "3.0.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; + sha256 = "1rh608kcpdx04p2w2nl94b9p96i37sij5shjhgvak041s64wbpg5"; + name="${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 { + inherit name src; + + multiPkgs = null; # no 32bit needed + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop + install -m 444 -D ${appimageContents}/plexamp.png \ + $out/plexamp.png + substituteInPlace $out/share/applications/plexamp.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A beautiful Plex music player for audiophiles, curators, and hipsters."; + homepage = "https://plexamp.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ killercup ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2f7078893e..d2ec2f55737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22007,6 +22007,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + plexamp = callPackage ../applications/audio/plexamp { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; From 5821103b06d02df629a6dcaf6ae74132e5c10185 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Tue, 21 Jul 2020 13:52:14 +0200 Subject: [PATCH 163/214] plexamp: 3.0.3 -> 3.1.1 Co-authored-by: Andrew Fontaine --- pkgs/applications/audio/plexamp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 98cc1065bdb..baa1f741ca8 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.0.3"; + version = "3.1.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "1rh608kcpdx04p2w2nl94b9p96i37sij5shjhgvak041s64wbpg5"; + sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; name="${pname}-${version}.AppImage"; }; From cda0a60c08fe6dd0dd46605bc6616839b0670a5b Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Thu, 23 Jul 2020 09:13:40 +0200 Subject: [PATCH 164/214] plexamp: fix icon Co-authored-by: Andrew Fontaine --- pkgs/applications/audio/plexamp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index baa1f741ca8..caa703f59ce 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -24,7 +24,7 @@ in appimageTools.wrapType2 { ln -s $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ - $out/plexamp.png + $out/share/icons/hicolor/512x512/apps/plexamp.png substituteInPlace $out/share/applications/plexamp.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; From c67ba72dd837320da7078df6fe354e4639cdf76c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 29 Jul 2020 08:07:35 +0200 Subject: [PATCH 165/214] python3Packages.pytorch: 1.5.1 -> 1.6.0 Changelog: https://github.com/pytorch/pytorch/releases/tag/v1.6.0 --- pkgs/development/python-modules/pytorch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index efe6400fcbd..4eabaf26f77 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -104,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.5.1"; + version = "1.6.0"; pname = "pytorch"; disabled = !isPy3k; @@ -119,7 +119,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1xjbn4hi96m7xslv3p2jc6qcsng0fx3w1m6isqfah81piljf8wng"; + sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz"; }; patches = lib.optionals stdenv.isAarch64 [ @@ -129,7 +129,7 @@ in buildPythonPackage rec { # Fix from: # https://github.com/pytorch/pytorch/pull/40584 # - # This patch can be removed with the next major version (1.6.0). + # This patch can be removed with the next major version (1.7.0). (fetchpatch { name = "qnnpack-neon-fix.patch"; url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff"; From 7d293e769f019c4bd953d72528d0c876cc7b5975 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 18:06:04 +0000 Subject: [PATCH 166/214] broot: 0.18.1 -> 0.19.3 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 354c4b4ddf4..0ee7c93bb98 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.18.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0lmcjc08902h4mi6qx3x2v1xa4w980xvmbrbfm59lis856whaqww"; + sha256 = "0w03dqm9m2d41ldmjv529azpbp28jjmv21apwf6rlxh59wqgicgb"; }; - cargoSha256 = "1bgrm6a7p7xl95ljk87g4bxv1insl14yxc895yszr0my3ksmpzqh"; + cargoSha256 = "1rmhlqq5a7rfsk4m0yzl9smq33xhb5ixw11knz96ih23a53yafsc"; nativeBuildInputs = [ installShellFiles ]; From 97e899d1547db1e8e4c084838460a582148f8129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 20:34:37 +0200 Subject: [PATCH 167/214] liblinear: 2.40 -> 2.41 According the website: Version 2.41 released on July 29, 2020 (some bug fixes of version 2.40). --- pkgs/development/libraries/liblinear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 09f3aacca63..86d306d0a07 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "4"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.40"; + version = "2.41"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "041fby9vc7nvj0gls5zd9mhw7yqazm530bmln38mfz7wd06z1d6b"; + sha256 = "1mykrzka2wxnvvjh21hisabs5fsxqzdhkxw9m08h24c58vfiwsd8"; }; outputs = [ "bin" "dev" "out" ]; From 870081decf593efb0eac0299a7213aac87fc5b66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 18:52:25 +0000 Subject: [PATCH 168/214] cheat: 4.0.0 -> 4.0.2 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 42b03774749..3cc51c83616 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0j9w2rm8imb15njj7334xl6w0fgjvfqnrfvdq4zfsrwzl67ds86l"; + sha256 = "06dqwjyk7pmfxvkscn06sc307pxvyjqc6myighfsh3f5x83pg1nc"; }; subPackages = [ "cmd/cheat" ]; From e9c36545a7d2f451d0d21f517ca8e8b291247f84 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 31 Jul 2020 20:41:04 +0200 Subject: [PATCH 169/214] tig: Don't install the broken ZSH completion There are some Nixpkgs specific issues that we could fix but due to changes in Git it currently isn't possible to source git-completion.bash from ZSH (at least not how tig-completion.bash expects it). Upstream issue: https://github.com/jonas/tig/issues/940 For the meantime it seems best to simply not install it anymore so that the fallback implementation from ZSH can be used (more inaccurate as the git-log completion is reused but it is helpful to complete remotes, branches, tags, etc. and doesn't emit an error to the console). --- .../version-management/git-and-tools/tig/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index cb03a9b42a2..9415c0eecf1 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -34,13 +34,14 @@ stdenv.mkDerivation rec { # fixes tig-completion __git-complete dependency sed -i '1s;^;source ${git}/share/bash-completion/completions/git\n;' contrib/tig-completion.bash - substituteInPlace contrib/tig-completion.zsh \ - --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/share/bash-completion/completions/tig" - install -D contrib/tig-completion.bash $out/share/bash-completion/completions/tig - install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig cp contrib/vim.tigrc $out/etc/ + # Note: Until https://github.com/jonas/tig/issues/940 is resolved it is best + # not to install the ZSH completion so that the fallback implemenation from + # ZSH can be used (Completion/Unix/Command/_git: "_tig () { _git-log }"): + #install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig + wrapProgram $out/bin/tig \ --prefix PATH ':' "${git}/bin" ''; From 3fd9a0c69283b2e00e96c3df6c94311c67f7edad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 17:28:10 +0200 Subject: [PATCH 170/214] LTS Haskell 16.7 --- .../configuration-hackage2nix.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b0cce0cc690..daf0041f1c3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -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.6 + # LTS Haskell 16.7 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -262,7 +262,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.3 - - aura ==3.1.5 + - aura ==3.1.6 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 @@ -430,7 +430,7 @@ default-package-overrides: - chimera ==0.3.1.0 - chiphunk ==0.1.2.1 - choice ==0.2.2 - - chronologique ==0.3.1.1 + - chronologique ==0.3.1.3 - chronos ==1.1.1 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 @@ -912,7 +912,7 @@ default-package-overrides: - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4 - ghc-typelits-extra ==0.4 - - ghc-typelits-knownnat ==0.7.2 + - ghc-typelits-knownnat ==0.7.3 - ghc-typelits-natnormalise ==0.7.2 - ghc-typelits-presburger ==0.3.0.1 - ghost-buster ==0.1.1.0 @@ -1135,7 +1135,7 @@ default-package-overrides: - http-client-openssl ==0.3.1.0 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - - http-common ==0.8.2.0 + - http-common ==0.8.2.1 - http-conduit ==2.3.7.3 - http-date ==0.0.8 - http-directory ==0.1.8 @@ -1338,7 +1338,7 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 - - lifted-async ==0.10.1.1 + - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 - lift-generics ==0.1.3 - line ==4.0.1 @@ -1397,6 +1397,7 @@ default-package-overrides: - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 + - matrix-as-xyz ==0.1.1.3 - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 - maximal-cliques ==0.1.1 @@ -1754,7 +1755,7 @@ default-package-overrides: - profunctors ==5.5.2 - projectroot ==0.2.0.1 - project-template ==0.2.1.0 - - prometheus-client ==1.0.0.1 + - prometheus-client ==1.0.1 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 @@ -2096,7 +2097,7 @@ default-package-overrides: - stratosphere ==0.53.0 - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 - - streaming-commons ==0.2.2.0 + - streaming-commons ==0.2.2.1 - streamly ==0.7.2 - streamly-bytestring ==0.1.2 - streams ==3.3 From 327f4bb361e32825b212d475991a7fcb7c455fe3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jul 2020 02:30:36 +0200 Subject: [PATCH 171/214] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-12-g1b02e1b from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/edb0920a8dbbd592d67a781d0b905728515ab623. --- .../haskell-modules/hackage-packages.nix | 2319 ++++++++++++----- 1 file changed, 1661 insertions(+), 658 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c320df264ae..48b675d8dca 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2250,6 +2250,24 @@ self: { broken = true; }) {}; + "C-structs" = callPackage + ({ mkDerivation, base, doctest, Glob, HUnit, QuickCheck + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "C-structs"; + version = "0.1.0.1"; + sha256 = "0b3mqp20am2yn7jbgxxg08rds1c5mxx827app23hrhsl4ysslfkg"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base doctest Glob HUnit QuickCheck template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "C-Structs implementation for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "CBOR" = callPackage ({ mkDerivation, base, binary, binary-bits, bytestring , data-binary-ieee754, doctest, QuickCheck, test-framework @@ -13134,6 +13152,8 @@ self: { pname = "MapWith"; version = "0.1.0.0"; sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v"; + revision = "1"; + editedCabalFile = "1zkpqgxh2d1zg087766vixw5j9xh9i9z4vdp5gv87xzhc4ig9qbs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -16931,8 +16951,8 @@ self: { }: mkDerivation { pname = "Rattus"; - version = "0.1.1.0"; - sha256 = "1f7dv71bamszjfsdva88iwiy85pb1gpn6i016dndzzydlxsrrvsz"; + version = "0.2"; + sha256 = "0mz6hwg4barn8iszi01lwrkx4i322r5a738kw7sd9mrmdlzd0fh9"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc simple-affine-space @@ -20230,7 +20250,8 @@ self: { ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Unixutils" = callPackage @@ -20930,12 +20951,12 @@ self: { platforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_8_5_0" = callPackage + "Win32_2_9_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.8.5.0"; - sha256 = "1hvbb9zwp84y5s5hxz7a3g3xqlgcbwrlhhxdprj5qqhkizzb3vai"; + version = "2.9.0.0"; + sha256 = "1m9v1qimqi19siy1a7mzb52f3jdj5zs81085nybnyj7yk9988s1p"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; @@ -24088,15 +24109,18 @@ self: { }) {}; "aeson-deriving" = callPackage - ({ mkDerivation, aeson, base, hedgehog, text, unordered-containers + ({ mkDerivation, aeson, base, hedgehog, regex-tdfa, text + , unordered-containers }: mkDerivation { pname = "aeson-deriving"; - version = "0.1.0.0"; - sha256 = "18zdncbvhlpa5v6yvsj30fyrh44hchaps8jjh93z6ji08cb6wdni"; - libraryHaskellDepends = [ aeson base text unordered-containers ]; + version = "0.1.1.1"; + sha256 = "1yqiw8imp30gv3jij4f724yi8mmf6w8fn84kmq9r7yjn7scfz4dj"; + libraryHaskellDepends = [ + aeson base regex-tdfa text unordered-containers + ]; testHaskellDepends = [ - aeson base hedgehog text unordered-containers + aeson base hedgehog regex-tdfa text unordered-containers ]; description = "data types for compositional, type-directed serialization"; license = stdenv.lib.licenses.mit; @@ -25741,6 +25765,21 @@ self: { broken = true; }) {}; + "algebra-driven-design" = callPackage + ({ mkDerivation, base, containers, file-embed, JuicyPixels, mtl + , QuickCheck, quickspec + }: + mkDerivation { + pname = "algebra-driven-design"; + version = "0.1.0.1"; + sha256 = "0jydvrmrz6kvrbk8hv0mb01g67j0bdxi519s7blwf3gfkxfjvyyv"; + libraryHaskellDepends = [ + base containers file-embed JuicyPixels mtl QuickCheck quickspec + ]; + description = "Companion library for the book Algebra-Driven Design by Sandy Maguire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "algebra-sql" = callPackage ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base , bytestring, containers, Decimal, dlist, errors, fgl, filepath @@ -31202,8 +31241,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.8.1.0"; - sha256 = "1mnp33c8dghgmn62czyrbmw86czhznbhb75ac1ps1is1p1ik6mih"; + version = "0.8.2.0"; + sha256 = "0bhf20b5h095d5a6955hk43k7z4ypkiivq755a21y7nc83l8q5x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34072,27 +34111,27 @@ self: { }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Cabal - , cli-setup, composition-prelude, containers, cpphs, dependency - , dhall, directory, file-embed, filepath, http-client - , http-client-tls, language-ats, libarchive, lzma, microlens, mtl - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, temporary, text, unix, unix-compat + ({ mkDerivation, ansi-wl-pprint, archive-libarchive, archive-sig + , base, binary, bytestring, Cabal, cli-setup, composition-prelude + , containers, cpphs, dependency, dhall, directory, file-embed + , filepath, http-client, http-client-tls, language-ats, lzma + , microlens, mtl, optparse-applicative, parallel-io, process, shake + , shake-ats, shake-c, shake-ext, temporary, text, unix, unix-compat , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.0"; - sha256 = "0ky17b8s4rg42gr2wwarvlgf0r0zgllrxqcdramsiyh8w9zgmc71"; + version = "3.5.0.1"; + sha256 = "09vv8cmag4189sv0nv213vhxp4pak5swk3gi4pnl777lmm0qgxxh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring Cabal composition-prelude - containers dependency dhall directory file-embed filepath - http-client http-client-tls libarchive lzma microlens mtl - parallel-io process shake shake-ats shake-c shake-ext text unix - unix-compat zip-archive zlib + ansi-wl-pprint archive-libarchive archive-sig base binary + bytestring Cabal composition-prelude containers dependency dhall + directory file-embed filepath http-client http-client-tls lzma + microlens mtl parallel-io process shake shake-ats shake-c shake-ext + text unix unix-compat zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -34685,42 +34724,6 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring - , containers, filepath, hashable, http-client, http-client-tls - , http-types, language-bash, megaparsec, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions - }: - mkDerivation { - pname = "aura"; - version = "3.1.5"; - sha256 = "17xihg6gifg47vmskp5wk3x485y3qc3ky769hh7nnrw138nhvkgn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson algebraic-graphs aur base bytestring containers filepath - hashable http-client http-types language-bash megaparsec - network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions - ]; - executableHaskellDepends = [ - aeson aur base bytestring containers http-client http-client-tls - megaparsec optparse-applicative prettyprinter - prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions - ]; - testHaskellDepends = [ - base bytestring containers megaparsec rio tasty tasty-hunit text - versions - ]; - description = "A secure package manager for Arch Linux and the AUR"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aura_3_1_6" = callPackage ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring , containers, filepath, hashable, http-client, http-client-tls , http-types, language-bash, megaparsec, network-uri @@ -36405,8 +36408,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "2.0.0"; - sha256 = "1ymapbsx3gzkxmaikxnsszdgcnyks535msf0ydbq99v54jvbb2yz"; + version = "2.1.0"; + sha256 = "0zrblqyq7zm2zya20zaxvcgb489y2kywns72kxyp6ymi2sax586g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36421,14 +36424,14 @@ self: { executableHaskellDepends = [ aeson base binary bytestring containers directory extensible-effects filepath hspec hspec-expectations lens - neat-interpolation optparse-applicative QuickCheck shake text - unordered-containers vector yaml + neat-interpolation optparse-applicative process QuickCheck shake + text unordered-containers vector yaml ]; testHaskellDepends = [ aeson base binary bytestring containers directory extensible-effects filepath hspec hspec-expectations lens - neat-interpolation optparse-applicative QuickCheck shake text - unordered-containers vector yaml + neat-interpolation optparse-applicative process QuickCheck shake + text unordered-containers vector yaml ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; @@ -37333,6 +37336,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base16-lens_0_1_3_0" = callPackage + ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest + , doctest, lens, text, text-short + }: + mkDerivation { + pname = "base16-lens"; + version = "0.1.3.0"; + sha256 = "1612v5lj99szshz7vm3mr5p4xxcrga1xxcfm9q9zzpnyd5z5vkn2"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base16 bytestring lens text text-short + ]; + testHaskellDepends = [ base doctest lens ]; + description = "Optics for the Base16 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base32" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, memory , random-bytestring, tasty, tasty-hunit, text @@ -39736,14 +39757,17 @@ self: { }) {}; "binary-io" = callPackage - ({ mkDerivation, async, base, binary, bytestring, deque, hspec - , process, stm + ({ mkDerivation, async, base, binary, bytestring, concurrency + , deque, exceptions, hspec, process, stm, transformers }: mkDerivation { pname = "binary-io"; - version = "0.3.0"; - sha256 = "1jc362y8ql983fhgcwb8sxgqjnhqd3xis2igcl9dv0zvqmi5jpv6"; - libraryHaskellDepends = [ base binary bytestring deque process ]; + version = "0.4.0"; + sha256 = "0yqxrzkria4bycc23ywc6cz12n15cr3lmmcphamwr0ngdgn1lf9i"; + libraryHaskellDepends = [ + base binary bytestring concurrency deque exceptions process + transformers + ]; testHaskellDepends = [ async base binary bytestring hspec process stm ]; @@ -42064,6 +42088,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bitset-word8_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hspec, hspec-discover, QuickCheck, template-haskell + , th-lift-instances, vector + }: + mkDerivation { + pname = "bitset-word8"; + version = "0.1.1.2"; + sha256 = "06axklmjzwq2s9s3p5m5z0isl4smxhs8hij7zm9c7pd5hj7xhipj"; + libraryHaskellDepends = [ + base containers template-haskell th-lift-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck template-haskell th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq template-haskell + th-lift-instances vector + ]; + description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib , bindings-gobject, gtk2, pango @@ -44951,19 +45000,19 @@ self: { "brok" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, classy-prelude - , connection, directory, file-embed, http-client, http-client-tls - , http-conduit, tasty, tasty-discover, tasty-expected-failure - , tasty-hunit, template-haskell, text, time + , connection, containers, directory, file-embed, http-client + , http-client-tls, http-conduit, tasty, tasty-discover + , tasty-expected-failure, tasty-hunit, template-haskell, text, time }: mkDerivation { pname = "brok"; - version = "1.0.0"; - sha256 = "07zi88xsacacqw6mg87ipic5y72vjpn9mx789bk9gk4jvd69z7x1"; + version = "1.1.0"; + sha256 = "0y8gppdyhwwlpw3d0kii2varqd25lxq3813xnjm632h4942l76xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal attoparsec base classy-prelude connection directory - file-embed http-client http-client-tls http-conduit + ansi-terminal attoparsec base classy-prelude connection containers + directory file-embed http-client http-client-tls http-conduit template-haskell text time ]; executableHaskellDepends = [ base classy-prelude file-embed ]; @@ -45946,15 +45995,15 @@ self: { }) {}; "bustle" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers, dbus - , directory, filepath, gio, glib, gtk3, HUnit, mtl, pango, pcap - , process, QuickCheck, system-glib, test-framework - , test-framework-hunit, text, time + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , directory, filepath, gio, gio-unix, glib, gtk3, HUnit, libpcap + , mtl, pango, process, QuickCheck, system-glib, test-framework + , test-framework-hunit, text, time, transformers }: mkDerivation { pname = "bustle"; - version = "0.7.5"; - sha256 = "0r0ng67b2q9ww0adv1fdrpmgmdyjqv6ksd9g6kkn9cjwnaascq3p"; + version = "0.8.0"; + sha256 = "0g2p4s3z0xqng8bhcqml6dvvshmn8xlyhqz77jdcvcvxm7cykcrg"; configureFlags = [ "-f-hgettext" ]; isLibrary = false; isExecutable = true; @@ -45962,16 +46011,23 @@ self: { setupHaskellDepends = [ base Cabal directory filepath process ]; libraryPkgconfigDepends = [ system-glib ]; executableHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gio glib - gtk3 mtl pango pcap process text time + base bytestring cairo containers directory filepath gio glib gtk3 + mtl pango process text time transformers ]; + executableSystemDepends = [ libpcap ]; testHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gtk3 HUnit - mtl pango pcap QuickCheck test-framework test-framework-hunit text + base bytestring cairo containers directory filepath glib gtk3 HUnit + mtl pango QuickCheck test-framework test-framework-hunit text + transformers ]; + testSystemDepends = [ libpcap ]; + testPkgconfigDepends = [ gio-unix ]; description = "Draw sequence diagrams of D-Bus traffic"; license = stdenv.lib.licenses.lgpl21Plus; - }) {system-glib = pkgs.glib;}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {gio-unix = null; inherit (pkgs) libpcap; + system-glib = pkgs.glib;}; "butcher" = callPackage ({ mkDerivation, base, bifunctors, containers, deque, extra, free @@ -46112,21 +46168,27 @@ self: { }) {}; "byline" = callPackage - ({ mkDerivation, ansi-terminal, base, colour, containers - , exceptions, haskeline, mtl, terminfo-hs, text, transformers + ({ mkDerivation, ansi-terminal, base, colour, exceptions, free + , haskeline, mtl, relude, tasty, tasty-hunit, terminfo-hs, text }: mkDerivation { pname = "byline"; - version = "0.4.0.0"; - sha256 = "1q8xb5b194ywm1sacxx47yhicww3m9hpffidgpj6l79fjqivgv09"; + version = "1.0.0.0"; + sha256 = "1jwjdjiraq37pr2ysc9h5qqlma6j7rd2dkip2y2f6bx07d1v7fpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base colour containers exceptions haskeline mtl - terminfo-hs text transformers + ansi-terminal base colour exceptions free haskeline mtl relude + terminfo-hs text + ]; + testHaskellDepends = [ + ansi-terminal base colour exceptions free haskeline mtl relude + tasty tasty-hunit terminfo-hs text ]; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytable" = callPackage @@ -46222,8 +46284,6 @@ self: { ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bytedump" = callPackage @@ -46359,8 +46419,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.6.0"; - sha256 = "0idkkmmw5n8dv7hx236s1543n0k6gsj9s0yk6fggbaqydlsxn641"; + version = "0.3.7.0"; + sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -48986,8 +49046,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.18.0"; - sha256 = "146p8w9ydamzfzp55w6zh9rawsgnsayc755wjqfa7vhjfa6dqmfq"; + version = "0.1.19.2"; + sha256 = "14vw42zsyzcdi5nmgfl2mi4zxqbkvmd525ybsx324qj3cp3k8mn6"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -50529,6 +50589,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-generic" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, data-default + , text, unordered-containers, vector + }: + mkDerivation { + pname = "cassava-generic"; + version = "0.1.0.1"; + sha256 = "0xm2ba4wmx5dbd83zpdyld65ga87fb9ja7hd33y5kba1zbw486g8"; + libraryHaskellDepends = [ + aeson base bytestring cassava data-default text + unordered-containers vector + ]; + description = "Cassave instances for functor-like datatypes like `Either String a`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cassava-megaparsec" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec , megaparsec, unordered-containers, vector @@ -52909,22 +52985,6 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, aeson, base, bytestring, hourglass, hspec - , QuickCheck, text, time, vector - }: - mkDerivation { - pname = "chronologique"; - version = "0.3.1.1"; - sha256 = "05ly96mdm4nxmn7yz04wq9kgzlq8biaaaxs1mvsc3f8wgcpbqf65"; - libraryHaskellDepends = [ aeson base hourglass text time vector ]; - testHaskellDepends = [ - aeson base bytestring hourglass hspec QuickCheck vector - ]; - description = "Time to manipulate time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "chronologique_0_3_1_3" = callPackage ({ mkDerivation, aeson, base, bytestring, hourglass, hspec , QuickCheck, text, time, vector }: @@ -52938,7 +52998,6 @@ self: { ]; description = "Time to manipulate time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chronos" = callPackage @@ -53940,6 +53999,35 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-ghc_1_2_4" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable + , haskeline, integer-gmp, lens, mtl, primitive, process, reflection + , split, template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.2.4"; + sha256 = "1xzpz0bkdfvhkk496q4zr7f6ix23dgg6w5r14j5gxy4jb8f8bxln"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory filepath ghc + ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens + mtl primitive process reflection split template-haskell text time + transformers uniplate unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary , bytestring, clash-prelude, concurrent-supply, containers @@ -53976,6 +54064,44 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-lib_1_2_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary + , bytestring, clash-prelude, concurrent-supply, containers + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, prettyprinter, primitive, process + , reducers, tasty, tasty-hunit, template-haskell, temporary + , terminal-size, text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.2.4"; + sha256 = "147cahsid3l6ff8d96ndzli1v79i9lbmad0bkmy0s5vcbgp90q7c"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base binary bytestring clash-prelude + concurrent-supply containers data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers prettyprinter primitive process + reducers template-haskell temporary terminal-size text text-show + time transformers trifecta unordered-containers utf8-string vector + vector-binary-instances + ]; + testHaskellDepends = [ + base clash-prelude concurrent-supply containers data-default + deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty + tasty-hunit template-haskell text transformers unordered-containers + ]; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -54029,6 +54155,44 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-prelude_1_2_4" = callPackage + ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal + , cabal-doctest, constraints, containers, criterion + , data-binary-ieee754, data-default-class, deepseq, doctest + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp + , interpolate, lens, QuickCheck, quickcheck-classes-base + , recursion-schemes, reflection, singletons, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-show + , th-abstraction, th-lift, th-orphans, time, transformers + , type-errors, uniplate, vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.2.4"; + sha256 = "1yizprs6i4y2vyhjj6pvpd5xmdbxyqjwclk6saaws0g3xv008ffg"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base bifunctors binary bytestring constraints containers + data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base doctest ghc-typelits-knownnat hint quickcheck-classes-base + tasty tasty-hunit tasty-quickcheck template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -58158,8 +58322,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.7.2.0"; - sha256 = "18rdrp8j2vjg6yp2zxiw10wsq8r5gjz0jywzxc13nd4g3l5a2wcm"; + version = "0.7.3.0"; + sha256 = "0wb15vq95kf6jigfy0n3jampnx8xmkxmh2lnxgfsc8zac9hwls55"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -58184,8 +58348,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.7.2.0"; - sha256 = "1xdl5phr1yj5m2rdb9jv71l71apbx6j94qvcs0932dz7xjgb8llr"; + version = "0.7.3.0"; + sha256 = "0g0i8zwky1ygniyxpvgl1r78b4qak1mx1wpy2pj815zrd43x1y60"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -58202,8 +58366,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.7.2.0"; - sha256 = "091s9gi1q7h6rq4xyfgs08p3z0afqslwwnmpa6qvqjy1im991n35"; + version = "0.7.3.0"; + sha256 = "07zbs89cqm7b78jfh2lwma3spsklc6wq0f58g14p27wgm253xkwp"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl @@ -58224,8 +58388,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.7.2.0"; - sha256 = "0620ix1zyixrlxgcc6yh7zj4ypz69xddf41bf7spyxf9zxdllwli"; + version = "0.7.3.0"; + sha256 = "1402ay8gxqp1fh2ija9ry5g366p5vx64ikmfal9hr2c42c2kmcf9"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -58242,8 +58406,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.2.0"; - sha256 = "11rc4bzqhfhrhs3ap08pzywx7qsmprs4cin7az036kp09b790frv"; + version = "0.7.3.0"; + sha256 = "0b9h0z4v0268qgcwq53p59nkwbbg77dqm9snr4zif71xhmlfscpx"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -58266,8 +58430,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.2.0"; - sha256 = "0l2h6m527xakr20gj6vqnaagcw66bqchvs8yn4qbsli67kmm5br7"; + version = "0.7.3.0"; + sha256 = "1gzmksq2dfywird7gyjc95v3spgxsab3jbakg5il2fmkx35cc1za"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -61104,6 +61268,21 @@ self: { broken = true; }) {}; + "context" = callPackage + ({ mkDerivation, async, base, containers, ghc-prim, hspec + , hspec-discover + }: + mkDerivation { + pname = "context"; + version = "0.1.0.0"; + sha256 = "17w0narhg25ls1rs2xp8x0yxh5jhw52b0c3zgi9ivn99j7c8qrhd"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ async base ghc-prim hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Thread-indexed, nested contexts"; + license = stdenv.lib.licenses.mit; + }) {}; + "context-free-art" = callPackage ({ mkDerivation, base, bifunctors, blaze-markup, blaze-svg , directory, HUnit, random, text, text-show @@ -61152,6 +61331,37 @@ self: { broken = true; }) {}; + "context-http-client" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, context + , hspec, hspec-discover, http-client, http-types, stm, wai, warp + }: + mkDerivation { + pname = "context-http-client"; + version = "0.1.0.0"; + sha256 = "0ad917jnzqd2idzh6a5j9nvjf2pg7l968vmn38cxgh9hfq3yhwm7"; + libraryHaskellDepends = [ base context http-client ]; + testHaskellDepends = [ + async base bytestring case-insensitive context hspec http-client + http-types stm wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "Modify HTTP requests/responses using context"; + license = stdenv.lib.licenses.mit; + }) {}; + + "context-resource" = callPackage + ({ mkDerivation, async, base, context, hspec, hspec-discover }: + mkDerivation { + pname = "context-resource"; + version = "0.1.0.0"; + sha256 = "0695m9hnx8grfmyy7mzd6n3426qc18sh14hy6glhr5nwj9c4k4c2"; + libraryHaskellDepends = [ base context ]; + testHaskellDepends = [ async base context hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Thread-safe, pool-compatible resource provider"; + license = stdenv.lib.licenses.mit; + }) {}; + "context-stack" = callPackage ({ mkDerivation, base, classy-prelude, mtl, unordered-containers }: mkDerivation { @@ -61167,6 +61377,24 @@ self: { broken = true; }) {}; + "context-wai-middleware" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, context + , hspec, hspec-discover, http-client, http-types, stm, wai, warp + }: + mkDerivation { + pname = "context-wai-middleware"; + version = "0.1.0.0"; + sha256 = "0bisqsngccddkamf60qyk4h9w4w80ppks51i4p9bl39kmf7hd65l"; + libraryHaskellDepends = [ base context wai ]; + testHaskellDepends = [ + async base bytestring case-insensitive context hspec http-client + http-types stm wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "Add request-specific (or not!) context to your WAI applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "contiguous" = callPackage ({ mkDerivation, base, deepseq, primitive, primitive-unlifted , QuickCheck, quickcheck-classes, quickcheck-instances, random @@ -62059,6 +62287,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-data_0_2_1_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.7"; + sha256 = "19fcbp6ccwggpv1lm1z03m3innk9agiwbz03whiivr3zg2gzcglh"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + prettyprinter-ansi-terminal scientific text unordered-containers + vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -62097,6 +62344,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-program_0_2_4_4" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, prettyprinter-ansi-terminal + , safe-exceptions, stm, template-haskell, terminal-size, text + , text-short, transformers, unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.4.4"; + sha256 = "1mkhwfw4h5q2dly1gm082k3s9jsq2wb0xksfa6xv8ghvxpvypvck"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + prettyprinter-ansi-terminal safe-exceptions stm template-haskell + terminal-size text text-short transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable , prettyprinter, prettyprinter-ansi-terminal, template-haskell @@ -62114,6 +62383,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-text_0_2_3_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable + , prettyprinter, prettyprinter-ansi-terminal, template-haskell + , text, text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.2.3.5"; + sha256 = "085w21vh5rgl1pc7731ih47gh8gszjj0xfgkr3acy0r9rbh33m9c"; + libraryHaskellDepends = [ + base bytestring deepseq fingertree hashable prettyprinter + prettyprinter-ansi-terminal template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -64441,25 +64728,27 @@ self: { }) {}; "cryptol" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, base-compat - , blaze-html, bytestring, containers, criterion, cryptohash-sha1 - , deepseq, directory, filepath, gitrev, GraphSCC, happy, haskeline - , heredoc, monad-control, monadLib, mtl, panic, pretty, process - , random, sbv, simple-smt, strict, text, tf-random, time - , transformers, transformers-base + ({ mkDerivation, alex, ansi-terminal, array, async, base + , base-compat, blaze-html, bv-sized, bytestring, containers + , criterion, cryptohash-sha1, deepseq, directory, exceptions + , filepath, gitrev, GraphSCC, happy, haskeline, heredoc, libBF + , monad-control, monadLib, mtl, panic, parameterized-utils, pretty + , process, random, sbv, simple-smt, strict, text, tf-random, time + , transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.8.0"; - sha256 = "1fqhk7glh1y0a1f0iwdzrljh9k7v06pn0ybhlcs51ph9vs4byqdh"; + version = "2.9.0"; + sha256 = "0bxx4pslmyjaqhskbi95a67fmpjhnbmgcys68xzs2y8ndjnz9jrb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base base-compat bytestring containers cryptohash-sha1 - deepseq directory filepath gitrev GraphSCC heredoc monad-control - monadLib mtl panic pretty process random sbv simple-smt strict text - tf-random time transformers-base + array async base base-compat bv-sized bytestring containers + cryptohash-sha1 deepseq directory exceptions filepath gitrev + GraphSCC heredoc libBF monad-control monadLib mtl panic + parameterized-utils pretty process random sbv simple-smt strict + text tf-random time transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -65767,8 +66056,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "1.2.0"; - sha256 = "0p7h3g1b5qxrvggrbnaskx6f5ywd0v0yv5gqbl1yc560dzv323qx"; + version = "1.3.0"; + sha256 = "1pvqz44panx6xp0zw2wip0hz66gsjz569d0n6gayr4sj8scskasp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75619,8 +75908,8 @@ self: { ({ mkDerivation, base, dobutokO-frequency }: mkDerivation { pname = "dobutokO-effects"; - version = "0.12.0.0"; - sha256 = "1x14wybv1r0da3hjwv3ya5byvy5ah819c2b3yyrsx0y4i3vhc8a4"; + version = "0.13.0.0"; + sha256 = "10xpr7nqhx1djsgcgfr40v7axkl8a0fxx16vrpvr7h525ygyibp5"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = stdenv.lib.licenses.mit; @@ -75641,8 +75930,8 @@ self: { ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.5.0.0"; - sha256 = "0nahsy5jhvg2q3zvalfr0p0pbjhschsvvly3hi59rp593p2n82hg"; + version = "0.7.0.0"; + sha256 = "0c2838dn34hwh9z0j1qhz276zf7zypr0gq25ym4m6wzpni14scj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; @@ -76336,15 +76625,14 @@ self: { }) {}; "dom-lt" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq }: + ({ mkDerivation, array, base, containers, criterion, deepseq, HUnit + }: mkDerivation { pname = "dom-lt"; - version = "0.2.0"; - sha256 = "15jf1csnqwd56izw5zk6kbp2kk6y0zkgm9ddbwrk0k3ngmdqzkli"; - revision = "1"; - editedCabalFile = "1rkjm9ssi7j2klf11b8w1wlw3hg4ybcfxdi2klik6lm5mpb52x7w"; + version = "0.2.1"; + sha256 = "16pf0lzzg0wwk5q44ybbc2hbrjs5hzsai0ssm836xiywsqwp61a7"; libraryHaskellDepends = [ array base containers ]; - testHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; @@ -79364,8 +79652,8 @@ self: { }: mkDerivation { pname = "effet"; - version = "0.1.0.0"; - sha256 = "0ykyrirm2ncsaaak2q1p71zy15qw3wjkppnzfmzyas1jxpwvgi2v"; + version = "0.2.0.0"; + sha256 = "1fh6pyjalrns01sg1rnz2h462xgcmnj6xfg6xg61cdb4zh5i9gpp"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base @@ -79661,6 +79949,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "either-result" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hspec + , hspec-discover + }: + mkDerivation { + pname = "either-result"; + version = "0.1.2.0"; + sha256 = "1ch6m0bimbkq73xchhfczssl6pzszkrhcgbcccbzi752r4vps31s"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "‘Result a’ is a wrapper of ‘Either String a’"; + license = stdenv.lib.licenses.asl20; + }) {}; + "either-unwrap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -80660,15 +80963,15 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.2.2"; - sha256 = "19fj65klv8pyan6n6i0mzcwpsprkhvxirh82hdmr3b3y2zaw10h6"; + version = "0.3.0"; + sha256 = "15qnsbbfmyyxmhzs5ly84w4yficcmnl3v49wjqhr86836l770rbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring elynx-tools optparse-applicative slynx tlynx ]; description = "Validate and (optionally) redo ELynx analyses"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -80681,20 +80984,33 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.2.2"; - sha256 = "1w7wxha82xaanfnzyn8ygfpxmk7lalfvzwr157crz8nm59ai4c05"; + version = "0.3.0"; + sha256 = "0w889wjyj4g8yr4ysvh2v1jnsf6bpdri8pj9klslnrpmk4b7x14n"; libraryHaskellDepends = [ base bytestring containers elynx-seq elynx-tools elynx-tree hmatrix integration math-functions megaparsec mwc-random parallel primitive statistics vector ]; testHaskellDepends = [ - base bytestring containers elynx-tools elynx-tree hmatrix hspec - hspec-megaparsec integration math-functions megaparsec mwc-random - parallel primitive statistics vector + base containers elynx-tools elynx-tree hmatrix hspec + hspec-megaparsec mwc-random vector ]; description = "Simulate molecular sequences along trees"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "elynx-nexus" = callPackage + ({ mkDerivation, base, bytestring, hspec, megaparsec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.3.0"; + sha256 = "00aikdx89b0x9zw78srp5qmx564myn9dhwy1k6nq9b411cxsfz0v"; + libraryHaskellDepends = [ base bytestring megaparsec ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -80706,19 +81022,17 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.2.2"; - sha256 = "1m09indy34zgx16m2rnmwjf9fvrhi8qcdxpfz7myjl2hxbp8hz1j"; + version = "0.3.0"; + sha256 = "0y7raavskrxgqmfsszm3f177hsjwnf69302vq3k7anj4fzqydvcn"; libraryHaskellDepends = [ aeson base bytestring containers elynx-tools matrices megaparsec mwc-random parallel primitive vector vector-th-unbox word8 ]; testHaskellDepends = [ - aeson base bytestring containers elynx-tools hspec hspec-megaparsec - matrices megaparsec mwc-random parallel primitive vector - vector-th-unbox word8 + base bytestring elynx-tools hspec hspec-megaparsec matrices vector ]; description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -80733,8 +81047,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.2.2"; - sha256 = "0gdnfyag704yfvrakc7d0adh3mb9r1kf1v8cpdrspaxxr77brw9q"; + version = "0.3.0"; + sha256 = "1ba9vcmzf7kwm8h493m2n9naq1pzhsddd8mv3mp8vb30jgg75vhj"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring containers cryptohash-sha256 deepseq directory fast-logger hmatrix matrices @@ -80743,36 +81057,35 @@ self: { transformers transformers-base vector zlib ]; description = "Tools for ELynx"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "elynx-tree" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , elynx-tools, hspec, hspec-megaparsec, math-functions, megaparsec - , mwc-random, primitive, QuickCheck, quickcheck-instances - , statistics + ({ mkDerivation, aeson, base, bytestring, comonad, containers + , criterion, deepseq, elynx-nexus, elynx-tools, hspec + , hspec-megaparsec, math-functions, megaparsec, mwc-random + , primitive, QuickCheck, statistics, vector }: mkDerivation { pname = "elynx-tree"; - version = "0.2.2"; - sha256 = "00c7rli9vfi1crz9plpc5xgh960ba245kisxihbx54vqlc94b5hj"; + version = "0.3.0"; + sha256 = "10z7fm5ir91vh3j39kf2ylx02i4fvnwxzk7x9bfpp6f26cr0mfcb"; libraryHaskellDepends = [ - base bytestring containers elynx-tools math-functions megaparsec - mwc-random primitive statistics + aeson base bytestring comonad containers deepseq elynx-nexus + elynx-tools math-functions megaparsec mwc-random primitive + statistics vector ]; testHaskellDepends = [ base bytestring containers elynx-tools hspec hspec-megaparsec - math-functions megaparsec mwc-random primitive QuickCheck - quickcheck-instances statistics + megaparsec QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring containers criterion elynx-tools math-functions - megaparsec mwc-random primitive statistics + base bytestring containers criterion elynx-tools ]; description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -85664,7 +85977,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_7_0" = callPackage + "fakedata_0_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover , random, string-random, template-haskell, text, time @@ -85672,8 +85985,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.7.0"; - sha256 = "0vzc2jyhan1igc7ffvch0zzsdnsyn5l857a5kr0zbsmri76sb59c"; + version = "0.7.1"; + sha256 = "1fbrfndwamwdnklbmyldhn45qxyyc61akbwvw0bmf645l0mkpn12"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -85696,6 +86009,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fakedata-parser" = callPackage + ({ mkDerivation, attoparsec, base, hspec, text }: + mkDerivation { + pname = "fakedata-parser"; + version = "0.1.0.0"; + sha256 = "0rf4mr9977p70vsinr3iga6l5wzkxnkxd52j4jmdmrk5b6i3flcp"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ attoparsec base hspec text ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fakefs" = callPackage ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }: mkDerivation { @@ -88225,6 +88549,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable_0_1_4_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "filtrable"; + version = "0.1.4.0"; + sha256 = "11jas9w611pslc3hanybsdwrh4292zvgigng8y4cv7gm0j908xng"; + libraryHaskellDepends = [ base transformers ]; + description = "Class of filtrable containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fin" = callPackage ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing , QuickCheck, tagged @@ -88778,13 +89114,13 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "2.2.0"; - sha256 = "0nwl9gxaxjdvgr0ji7r0hh9z43s473rb69dgb3p8ab3kdc3mld11"; + version = "2.3.0"; + sha256 = "1ysz764i24l30cclw5zzwkk78di8i9qh136abwlpcxyyw4zy2n6d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers cpphs deepseq directory filepath haskell-src-exts - pretty process split text time uniplate + mtl pretty process split text time uniplate ]; testHaskellDepends = [ base containers cpphs deepseq directory filepath haskell-src-exts @@ -94023,6 +94359,8 @@ self: { pname = "fused-effects-th"; version = "0.1.0.0"; sha256 = "05apm97hlk1k0h6px5sf25gwb6wnrg5za3z8r64rcxmzcfhd10c9"; + revision = "1"; + editedCabalFile = "00zyzq1xz78vbnygayvc78i023xqib0k2p0qvxzx4d2908l36g6f"; libraryHaskellDepends = [ base fused-effects template-haskell ]; testHaskellDepends = [ base fused-effects tasty tasty-hunit template-haskell @@ -94092,8 +94430,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.16.2"; - sha256 = "06kiig31z5c2sgpqisbf2dx3ipbglq49ga7w3sx1p89wakzkqyi5"; + version = "0.16.3"; + sha256 = "0y9g7nldcx2y7h3gb652i5r3lfvbriaqfqs2gnxym1r9w9kki0si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98387,8 +98725,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.2"; - sha256 = "1wdippdn029rpd1v3mk470gyp8v13d2bna8p8q6cn7q7nhm1dhhc"; + version = "0.7.3"; + sha256 = "1vz2qjgdv5hv7zrq0hm9f4ly0q3bl1cz2spcqrdpdzhivfff651g"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -99580,15 +99918,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "gi-gobject_2_0_23" = callPackage + "gi-gobject_2_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.23"; - sha256 = "15wkma8akcy50c2xiiwlc4zm5k1v4vnrk3mhn3bbz1rdfbdhvr9v"; + version = "2.0.24"; + sha256 = "1i19s7pcs3gnhhyif8y3j7hngmdzfqbgaw52j8dvrz7w11fbx9sj"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base @@ -100010,24 +100348,24 @@ self: { "gi-harfbuzz" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, harfbuzz, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers + , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-harfbuzz"; - version = "0.0.2"; - sha256 = "15l5iwnj9awd04626mqagd4rldxi2byr53gvqqnlxljbskb7ch2m"; + version = "0.0.3"; + sha256 = "1rapwaf8rz18rsai54lq9wcccf9j0ihcafvwhrzvgl17fjqcfqaz"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ harfbuzz ]; + libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) harfbuzz;}; + }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -100370,8 +100708,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.8"; - sha256 = "1zgzxx5v0cc0z9xq1nkbqixa7r0m0m00gzvdypxqddlpzvrxn63c"; + version = "3.0.9"; + sha256 = "1cy1nzld3220rg0f1gzr5cw756s5vm9las8p8xyqhjmk3awy0cbp"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi ]; @@ -102259,25 +102597,25 @@ self: { ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL - , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , regex-tdfa, semigroupoids, split, stm, template-haskell, text - , time, transformers, unix, unordered-containers, vector, vty + , HUnit, irc-core, kan-extensions, lens, mwc-random, network + , process, psqueues, regex-tdfa, semigroupoids, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.35"; - sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f"; - revision = "1"; - editedCabalFile = "14kgfgqyfw5vcm77n5iljxw5n28iclc1hpvi44x4vhrnmfpmq62v"; + version = "2.36"; + sha256 = "0s136d0nnw0vs198kzana10ybnka4mx0jyqdf1wsz5m9a4y3cnvj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable - hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues regex-tdfa semigroupoids split stm template-haskell text - time transformers unix unordered-containers vector vty + hookup HsOpenSSL irc-core kan-extensions lens mwc-random network + process psqueues regex-tdfa semigroupoids split stm + template-haskell text time transformers unix unordered-containers + vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -106999,24 +107337,25 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations - , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck - , raw-strings-qq, scientific, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, base, conduit, containers, exceptions + , hspec, hspec-expectations, hspec-megaparsec, megaparsec + , parser-combinators, QuickCheck, raw-strings-qq, scientific, text + , transformers, unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.8.0.0"; - sha256 = "08xi2q8jzk78a62q5qbi8i2d2kq0qcn0dzdx1haq2c4qjsf09798"; + version = "0.9.0.0"; + sha256 = "1lyzrnbf1w3j60wwi8cwbh1hxzvsw8vn9aymy1qzxgjgmi2wx94g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec parser-combinators scientific text - transformers unordered-containers vector + aeson base conduit containers exceptions hspec-expectations + megaparsec parser-combinators scientific text transformers + unordered-containers ]; testHaskellDepends = [ - aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec parser-combinators QuickCheck raw-strings-qq scientific - text transformers unordered-containers vector + aeson base conduit containers exceptions hspec hspec-expectations + hspec-megaparsec megaparsec parser-combinators QuickCheck + raw-strings-qq scientific text transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -110429,16 +110768,17 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring , base64-bytestring, binary, bytestring, containers - , cryptohash-sha256, deepseq, directory, ed25519 - , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit - , lukko, mtl, network, network-uri, old-locale, parsec, pretty - , process, random, split, stm, tar, template-haskell, text, time - , transformers, unix, xml, zlib + , cryptohash-sha256, deepseq, directory, doctest, ed25519 + , extensible-exceptions, filepath, ghc-prim, hashable, hspec + , hspec-discover, HTTP, lukko, mtl, network, network-uri + , old-locale, parsec, pretty, process, QuickCheck, random, split + , stm, tar, template-haskell, text, time, transformers, unix, xml + , zlib }: mkDerivation { pname = "hackport"; - version = "0.6.5"; - sha256 = "1869fkrcapnvvzgqwfaivjgcmbmmg53l335qgb6fw672g4bhkc2x"; + version = "0.6.6"; + sha256 = "0cdwcrk8cqfbfi2kg074zmiq3j5fv3790inwc4hxwhrhv34hz437"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110449,12 +110789,13 @@ self: { stm tar template-haskell text time transformers unix xml zlib ]; testHaskellDepends = [ - array base binary bytestring containers deepseq directory - extensible-exceptions filepath HUnit parsec pretty process split - text time transformers unix xml + array base binary bytestring containers deepseq directory doctest + extensible-exceptions filepath hspec mtl parsec pretty process + QuickCheck split template-haskell text time transformers unix xml ]; + testToolDepends = [ hspec-discover ]; description = "Hackage and Portage integration tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -111655,8 +111996,8 @@ self: { }: mkDerivation { pname = "hal"; - version = "0.4.2"; - sha256 = "0z12a4avydwcld5rwzb5fvffz6dpqqc4h04i43f9nih8dr19zpdp"; + version = "0.4.3"; + sha256 = "0iqyayya1j3l1jrb2i68shn4zgrqf63pv3l9v29s0chn3gyyij1r"; libraryHaskellDepends = [ aeson base bytestring containers envy exceptions http-conduit http-types mtl text time @@ -113675,8 +114016,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.1.4.0"; - sha256 = "1w57jw8b3hiqhl372zc5fj30lgvh9nywhg70fqpz4jlm86a2bjqw"; + version = "0.2.0.0"; + sha256 = "1khdlkf2n6x3rck9sc7jir08mx7n7dv9p25j80g27q6a1nm0pq91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114965,7 +115306,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - "haskell-gi_0_24_2" = callPackage + "haskell-gi_0_24_3" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -114973,8 +115314,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.24.2"; - sha256 = "1m7zcmqr9alq6bbq04szxwypvhxv54ns1f2gw9af7k4pv5mwn2p9"; + version = "0.24.3"; + sha256 = "1bzbb0hbk0hz265rbh4dsypwiqxcjn0gy0sql287bm57rj0mvnn0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -115000,12 +115341,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_1" = callPackage + "haskell-gi-base_0_24_2" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.1"; - sha256 = "0d777sqi1wjhgw1avsp7b1ps2irblvpr0bpnzbw1ybv3yhb49zmr"; + version = "0.24.2"; + sha256 = "0qjbbfxlx4gqnyfnjpr4ray7fih8alsa2bxb5imkckhrzfx4xmq0"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -117410,8 +117751,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.37.0"; - sha256 = "1ig2968p7b6zncazsqn258c4zz0j12sxka8g64nav7581d1sbfg4"; + version = "0.37.3"; + sha256 = "1gkgznvx0y30568l2rs0px2pfyzn9sbzqv9vnd5ps5ib33yb853s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117452,8 +117793,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.37.0"; - sha256 = "1qgn75mqp8xq33hn3y0myycwp4y5j6l3g3y8pj0hhyiwn7brsjbw"; + version = "0.37.3"; + sha256 = "1wz0nwm4izsxaxij9s4vfjdlcqp1jca16g2phdn3k2dp35kyfymi"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -118525,8 +118866,6 @@ self: { ]; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-notifications" = callPackage @@ -123073,22 +123412,23 @@ self: { "hgeometry" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-clist, deepseq, dlist, doctest, doctest-discover, fingertree - , fixed-vector, hgeometry-combinatorial, hspec, lens, linear - , MonadRandom, mtl, primitive, QuickCheck, quickcheck-instances - , reflection, semigroupoids, semigroups, template-haskell, text - , vector, vector-builder, vinyl, yaml + , fixed-vector, hashable, hgeometry-combinatorial, hspec, lens + , linear, MonadRandom, mtl, primitive, QuickCheck + , quickcheck-instances, random, reflection, semigroupoids + , semigroups, template-haskell, text, vector, vector-builder, vinyl + , yaml }: mkDerivation { pname = "hgeometry"; - version = "0.10.0.0"; - sha256 = "01kf7cmjdr2s172xj25i9vyjpfd0wayh0bjgccxqqy886kxrkhfw"; + version = "0.11.0.0"; + sha256 = "1vbj26j06byz9x0c03q5k7fijl31hsi7x9f5wfr2w9g96d7zl3ls"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-clist deepseq - dlist fingertree fixed-vector hgeometry-combinatorial hspec lens - linear MonadRandom mtl primitive QuickCheck quickcheck-instances - reflection semigroupoids semigroups template-haskell text vector - vector-builder vinyl yaml + dlist fingertree fixed-vector hashable hgeometry-combinatorial + hspec lens linear MonadRandom mtl primitive QuickCheck + quickcheck-instances random reflection semigroupoids semigroups + template-haskell text vector vector-builder vinyl yaml ]; testHaskellDepends = [ base doctest doctest-discover QuickCheck ]; description = "Geometric Algorithms, Data structures, and Data types"; @@ -123098,22 +123438,23 @@ self: { "hgeometry-combinatorial" = callPackage ({ mkDerivation, aeson, approximate-equality, base, bifunctors , bytestring, containers, contravariant, data-clist, deepseq - , directory, dlist, doctest, filepath, fingertree, hspec - , hspec-discover, lens, linear, MonadRandom, mtl, QuickCheck - , quickcheck-instances, random, reflection, semigroupoids - , semigroups, singletons, template-haskell, text, vector - , vector-builder, vinyl, yaml + , directory, dlist, doctest, filepath, fingertree, hashable, hspec + , hspec-discover, lens, linear, MonadRandom, mtl, primitive + , QuickCheck, quickcheck-instances, random, reflection + , semigroupoids, semigroups, singletons, template-haskell, text + , vector, vector-builder, vinyl, yaml }: mkDerivation { pname = "hgeometry-combinatorial"; - version = "0.10.0.0"; - sha256 = "0v168wxnzkmylh8gzxzrq0sfq5y2xn3i8r6kqnahc14x1c1jzzk1"; + version = "0.11.0.0"; + sha256 = "0qhb4aflqcjjm1qnhq7xsd086pk09gnq7q503ys4kzr8j0knc2j5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring containers contravariant - data-clist deepseq dlist fingertree lens MonadRandom mtl QuickCheck - quickcheck-instances reflection semigroupoids semigroups - template-haskell text vector vector-builder vinyl yaml + data-clist deepseq dlist fingertree hashable lens linear + MonadRandom mtl primitive QuickCheck quickcheck-instances random + reflection semigroupoids semigroups template-haskell text vector + vector-builder vinyl yaml ]; testHaskellDepends = [ approximate-equality base bytestring containers data-clist @@ -123136,8 +123477,8 @@ self: { }: mkDerivation { pname = "hgeometry-ipe"; - version = "0.10.0.0"; - sha256 = "1802yl65sy489s7pk58cd92qvzvdnw9z3ms6jr8wcrs6ipfqsa60"; + version = "0.11.0.0"; + sha256 = "0h78rsxc281wxmg27zxzzak0k15mv61i146gzafihrdg9hpbw1lk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring colour containers data-clist @@ -123362,8 +123703,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.2.4"; - sha256 = "1mmnz6vipl42p2raxn26hjlcrjhrk3xfbvzyxhjl5ciybgi6dc3w"; + version = "0.2.5"; + sha256 = "06ikaxxa70x71w4rq7a9rcp4mj12d8wlwzfdxnrapg9x9yr3py85"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -125286,6 +125627,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hkgr_0_2_6_1" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cabal + , simple-cmd, simple-cmd-args, xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.2.6.1"; + sha256 = "0hq059l3byw3vcxw56z341q56xnb86kdqj5vnn16v29ql677xm26"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base directory extra filepath simple-cabal simple-cmd + simple-cmd-args xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -127928,10 +128289,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.3.1.0"; - sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y"; - revision = "1"; - editedCabalFile = "0r92s1dz7bzm2p5wpdqfkmpgzfh3xgyan82b4rkpmq8m888z74w9"; + version = "0.4"; + sha256 = "0zfplby1lkbdr3s6icv1p4vii77a2sb3mx0ylp9pjg7f3ic9lw8i"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -130088,8 +130447,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "hs-gchart"; - version = "0.4.1"; - sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459"; + version = "0.4.2"; + sha256 = "1kky6fr7s4v3hpnabp95crrd6fd67rq49sbdpjbm4n5gbyby110q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl ]; description = "Haskell wrapper for the Google Chart API"; @@ -135518,8 +135877,8 @@ self: { }: mkDerivation { pname = "http-common"; - version = "0.8.2.0"; - sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"; + version = "0.8.2.1"; + sha256 = "1pzi1h9qb6mpzkmv1bfa54vfzrp5jcdlbwj1i7qiricrwhqxh3dk"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive directory mtl network text transformers unordered-containers @@ -136171,6 +136530,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-streams_0_8_7_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, blaze-builder, bytestring, case-insensitive + , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations + , http-common, HUnit, io-streams, lifted-base, mtl, network + , network-uri, openssl-streams, snap-core, snap-server + , system-fileio, system-filepath, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.7.2"; + sha256 = "1q0lp8hkzfc0srci9y794q5cqkih50r3iw2c32wbx8h502jcvv1q"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive directory HsOpenSSL http-common io-streams mtl + network network-uri openssl-streams text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams snap-core snap-server + system-fileio system-filepath text transformers + unordered-containers + ]; + description = "An HTTP client using io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -137881,13 +138272,13 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, hspec-discover, monad-loops, random, rdkafka, text + , either, hspec, hspec-discover, monad-loops, rdkafka, text , transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "3.1.1"; - sha256 = "109ld374fzrnin94s12ig5hhimjbnh643nbbgp7zdxjpr1qmjcz6"; + version = "3.1.2"; + sha256 = "1yqzh9cvs9yr88wa0r26izd35hg2vfzqvzxbx0l6c1apgc3m7hd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137896,8 +138287,7 @@ self: { librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bifunctors bytestring containers either hspec monad-loops - random text transformers + base bifunctors bytestring containers either hspec monad-loops text ]; testToolDepends = [ hspec-discover ]; description = "Kafka bindings for Haskell"; @@ -138049,6 +138439,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -143248,6 +143640,8 @@ self: { doHaddock = false; description = "A GHC Core plugin for intensional datatype refinement checking"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "interact" = callPackage @@ -144015,6 +144409,17 @@ self: { broken = true; }) {}; + "involutive-semigroups" = callPackage + ({ mkDerivation, base, bytestring, containers, text, vector }: + mkDerivation { + pname = "involutive-semigroups"; + version = "0.1.0.0"; + sha256 = "1nms6w5b8apdz9xlwdqyj9n4m0b192simxg9zl7pv8zkyklyb3aw"; + libraryHaskellDepends = [ base bytestring containers text vector ]; + description = "Semigroups with involution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "io-capture" = callPackage ({ mkDerivation, base, bytestring, hspec, hspec-core , streaming-bytestring, unix @@ -144339,8 +144744,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ip-quoter" = callPackage @@ -144743,10 +145146,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.7.2"; - sha256 = "1gpd28lxhqj2xj75nyyififn9434imvm0vqvx7zdw44fvg75lqyq"; - revision = "1"; - editedCabalFile = "1xkvy5igrx4ri8gmmwzxs2mq7ih57gps8a592ya6bv1crrm45cy2"; + version = "2.8"; + sha256 = "1msn18qxvwywwkqz2mv6d5awk29w3f3jqjdjw7dwvk5k25llmc3l"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -145058,6 +145459,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "isbn_1_1_0_1" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "isbn"; + version = "1.1.0.1"; + sha256 = "0s7b06a0d37bhb38k2my6g6brn6bywxr59kw2c103dp4y4kzrcpn"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + description = "ISBN Validation and Manipulation"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "isdicom" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck , template-haskell @@ -145996,6 +146410,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ixset-typed-binary-instance" = callPackage + ({ mkDerivation, base, binary, ixset-typed }: + mkDerivation { + pname = "ixset-typed-binary-instance"; + version = "0.1.0.0"; + sha256 = "1qa00y5cn3i2b66h87i6sfx6xx4yvgq7gk6maij5b9w4c821h4m4"; + libraryHaskellDepends = [ base binary ixset-typed ]; + description = "Binary instance for ixset-typed"; + license = stdenv.lib.licenses.mit; + }) {}; + "ixset-typed-conversions" = callPackage ({ mkDerivation, base, exceptions, hashable, ixset-typed , unordered-containers, zipper-extra @@ -146012,6 +146437,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ixset-typed-hashable-instance" = callPackage + ({ mkDerivation, base, hashable, ixset-typed }: + mkDerivation { + pname = "ixset-typed-hashable-instance"; + version = "0.1.0.1"; + sha256 = "14cd3kzhqv8w9f756drhjpmrr32i6n9sjmp9fk2gngsigaksnvnk"; + libraryHaskellDepends = [ base hashable ixset-typed ]; + description = "Hashable instance for ixset-typed"; + license = stdenv.lib.licenses.mit; + }) {}; + "ixshader" = callPackage ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec , prettyclass, singletons, template-haskell, text @@ -148585,17 +149021,17 @@ self: { "jukebox" = callPackage ({ mkDerivation, alex, array, base, containers, directory, dlist , filepath, minisat, pretty, process, symbol, transformers - , uglymemo + , uglymemo, utf8-string }: mkDerivation { pname = "jukebox"; - version = "0.4.4"; - sha256 = "0xjyyklwyzblgyakziwyh4420q1fcbqsss35dpxm592wd74wk0mw"; + version = "0.5.1"; + sha256 = "0f74mml9qpxlfxxvldz9qz89bscj7qwmc5gb42rgfgbkfin6zrdk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers directory dlist filepath minisat pretty - process symbol transformers uglymemo + process symbol transformers uglymemo utf8-string ]; libraryToolDepends = [ alex ]; executableHaskellDepends = [ base ]; @@ -152752,20 +153188,20 @@ self: { , composition-prelude, containers, cpphs, criterion, deepseq , directory, filepath, happy, haskeline, microlens, microlens-mtl , mtl, optparse-applicative, pretty-simple, prettyprinter, random - , tasty, tasty-golden, tasty-hunit, template-haskell, text + , split, tasty, tasty-golden, tasty-hunit, template-haskell, text , transformers, zstd }: mkDerivation { pname = "language-dickinson"; - version = "1.1.0.0"; - sha256 = "0hq74ijqqlmddins28m35jbyckfs27462jymc9kdjyzvmcp01fh9"; + version = "1.1.0.1"; + sha256 = "0j163whdxpzi2aklb5x7f42y61whm941x0rjls02crgmpdaj0z75"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring composition-prelude containers deepseq directory filepath microlens microlens-mtl mtl prettyprinter random - template-haskell text transformers + split template-haskell text transformers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -157306,27 +157742,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, criterion, deepseq - , HUnit, lifted-base, monad-control, mtl, tasty - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.1.1"; - sha256 = "1x02dhcih1diw2076b918r3646xw3vbzg99sqpm6iw8yd5sds20p"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base criterion deepseq ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_1_2" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -157345,7 +157760,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -158466,8 +158880,8 @@ self: { ({ mkDerivation, base, bytestring, hashable, unix }: mkDerivation { pname = "linux-inotify"; - version = "0.3.0.1"; - sha256 = "0fir9qajp1vrgr8l6q6h0w2dh4rbi8ibhnni9wl1cnkv5h7rrg1l"; + version = "0.3.0.2"; + sha256 = "1dl71xkfjlwjsmv0mqf2fpkfjl3hyzk5q1drsykg7rdblpjfbzlc"; libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; @@ -158701,28 +159115,75 @@ self: { broken = true; }) {}; + "liquid-base" = callPackage + ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: + mkDerivation { + pname = "liquid-base"; + version = "4.14.0.0"; + sha256 = "07qy1xc04wbd46cd0zgw3znczang1h1sgllxswjjimaw1wp49xh3"; + 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 + ({ mkDerivation, base, bytestring, Cabal, liquid-base + , liquidhaskell + }: + mkDerivation { + pname = "liquid-bytestring"; + version = "0.10.10.0"; + sha256 = "1fkl637zdxpsginnr0gqv68kch0dkr4yhmmmryzqy2h8fxm8gmg7"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + 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 + ({ mkDerivation, base, Cabal, containers, liquid-base + , liquidhaskell + }: + mkDerivation { + pname = "liquid-containers"; + version = "0.6.2.1"; + sha256 = "07k9sg1q5xvsab2dvikkjb9rpx9rcabs4szm5rbh1m5mqnwivr1l"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + 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 ({ mkDerivation, ansi-terminal, array, ascii-progress, async , attoparsec, base, binary, boxes, cereal, cmdargs, containers - , deepseq, directory, fgl, filepath, ghc-prim, git, hashable - , intern, mtl, nettools, ocaml, parallel, parsec, pretty, process - , stm, syb, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text - , text-format, transformers, unordered-containers, z3 + , deepseq, directory, fgl, filepath, git, hashable, intern, mtl + , nettools, ocaml, parallel, parsec, pretty, process, stm, syb + , tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.8.0.2"; - sha256 = "1x8xbcf2xc9hwfpsl1s15qkmgdhr30fff4gp09dvnwi3z4mgi2wf"; - revision = "1"; - editedCabalFile = "013q8xj4ib5llyq9wmnx98dprw2zn4rkc1jndavcjjg2cwwrw56w"; + version = "0.8.10.1"; + sha256 = "0mavpfwsm3a6cnw2p75hvjch1j0nb8qm1rflq304iz6msg9zbhsv"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array ascii-progress async attoparsec base binary boxes cereal cmdargs containers deepseq directory fgl filepath - ghc-prim hashable intern mtl parallel parsec pretty process syb - text text-format transformers unordered-containers + hashable intern mtl parallel parsec pretty process syb text + text-format transformers unordered-containers ]; executableHaskellDepends = [ base ]; executableSystemDepends = [ ocaml ]; @@ -158739,37 +159200,118 @@ self: { }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; + "liquid-ghc-prim" = callPackage + ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: + mkDerivation { + pname = "liquid-ghc-prim"; + version = "0.6.1"; + sha256 = "1zpb0izg4y98xz87ivn6rs5nfshvawrxyb5hc8jzif2p17j0aqpb"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + 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 + ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, parallel + }: + mkDerivation { + pname = "liquid-parallel"; + version = "3.2.2.0"; + sha256 = "0dg0k1lx74p3lj3vc43wypy5a3lpnww5w456ccp4xy3k83b3c4xd"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + 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"; + 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 + ({ mkDerivation, base, bytestring, Cabal, containers, liquid-base + , liquidhaskell + }: + mkDerivation { + pname = "liquid-prelude"; + version = "0.8.10.1"; + sha256 = "0pcz59spsg3x4c5553yksfqgdjlh2c33id10b6p8hnm6hyqcbjvn"; + 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 + ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: + mkDerivation { + pname = "liquid-vector"; + version = "0.12.1.2"; + sha256 = "1kpa7c5a774ixqky3msp2xnq1nl16hh95azvaxdk0bhizfi3zjy3"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + 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 - ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs - , containers, data-default, deepseq, Diff, directory, filepath - , fingertree, ghc, ghc-boot, ghc-paths, ghc-prim, githash, gitrev - , hashable, hscolour, liquid-fixpoint, mtl, optparse-applicative - , optparse-simple, parsec, pretty, process, stm, syb, tagged, tasty - , tasty-ant-xml, tasty-hunit, tasty-rerun, template-haskell + ({ mkDerivation, 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-applicative, optparse-simple, parsec, pretty, process + , split, stm, string-conv, syb, tagged, tasty, tasty-ant-xml + , tasty-golden, tasty-hunit, tasty-rerun, template-haskell , temporary, text, time, transformers, unordered-containers, vector , z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.6.2"; - sha256 = "1hqs1zfcz4fprrrcwj3j731ksldviafivk0kv2hprslmz4m1kfb2"; + version = "0.8.10.1"; + sha256 = "0xyxb0sifqgp1hl6lcydf7svw6w968hd3dgmnlly8ddpdmhsw9jm"; revision = "1"; - editedCabalFile = "14mvnjgd65n6j2zlzw0c679zvlik02cn6x8rhxm3rb1155zybjil"; + editedCabalFile = "0bg9660c5454jiimgwciimd114r81gfjdad6nzbgyhkvilfd0wad"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring cereal cmdargs containers data-default - deepseq Diff directory filepath fingertree ghc ghc-boot ghc-paths - ghc-prim githash gitrev hashable hscolour liquid-fixpoint mtl - optparse-simple parsec pretty syb template-haskell temporary text - time transformers unordered-containers vector + 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 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers directory filepath liquid-fixpoint mtl - optparse-applicative parsec process stm syb tagged tasty - tasty-ant-xml tasty-hunit tasty-rerun text transformers + base containers directory extra filepath ghc liquid-fixpoint mtl + optparse-applicative parsec process stm string-conv syb tagged + tasty tasty-ant-xml tasty-golden tasty-hunit tasty-rerun text + transformers ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; @@ -160214,16 +160756,18 @@ self: { }) {}; "locators" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptohash, hspec - , HUnit, QuickCheck + ({ mkDerivation, base, bytestring, containers, cryptonite, hspec + , HUnit, memory, QuickCheck }: mkDerivation { pname = "locators"; - version = "0.3.0.2"; - sha256 = "0bzf88cjd58rf0pp197ziy4fqs4a8bqfj44pr796gszhqggnjr95"; - libraryHaskellDepends = [ base bytestring containers cryptohash ]; + version = "0.3.0.3"; + sha256 = "1rjlgjm41mxflq4b7y7cl86mlkdlh5lgxsm40lmy1lwfcx7l2fmq"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory + ]; testHaskellDepends = [ - base bytestring containers cryptohash hspec HUnit QuickCheck + base bytestring containers cryptonite hspec HUnit QuickCheck ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.mit; @@ -161414,31 +161958,21 @@ self: { "lorentz" = callPackage ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints - , containers, data-default, filepath, first-class-families, fmt - , formatting, ghc-prim, hedgehog, HUnit, interpolate, lens, morley - , morley-prelude, mtl, named, optparse-applicative, pretty-terminal - , QuickCheck, singletons, spoon, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit-compat, template-haskell, text - , type-spec, unordered-containers, vinyl + , containers, data-default, first-class-families, fmt, interpolate + , lens, morley, morley-prelude, mtl, named, optparse-applicative + , pretty-terminal, QuickCheck, singletons, text + , unordered-containers, vinyl }: mkDerivation { pname = "lorentz"; - version = "0.4.0"; - sha256 = "1wihk6vmcnc7bcy3xayffdivkqfjjcb8zg3bdkqhnnfvccmwyckg"; + version = "0.5.0"; + sha256 = "0wvvxc49bc8cyfhhwzzhrdf3sia03d8hx2cxpjg3jab8bbxbqza1"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers - data-default first-class-families fmt formatting ghc-prim hedgehog - HUnit interpolate lens morley morley-prelude mtl named - optparse-applicative pretty-terminal QuickCheck singletons - template-haskell text unordered-containers vinyl + data-default first-class-families fmt interpolate lens morley + morley-prelude mtl named optparse-applicative pretty-terminal + QuickCheck singletons text unordered-containers vinyl ]; - testHaskellDepends = [ - base bimap bytestring constraints containers filepath - first-class-families fmt formatting hedgehog HUnit morley - morley-prelude singletons spoon tasty tasty-hedgehog - tasty-hunit-compat text type-spec unordered-containers vinyl - ]; - testToolDepends = [ tasty-discover ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161695,7 +162229,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_2" = callPackage + "lsp-test_0_11_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -161704,8 +162238,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.2"; - sha256 = "0sl2n38q9xa3hr8psjrwlw2mq63vanjdyn5vry6mp87l8vba9s8f"; + version = "0.11.0.3"; + sha256 = "065g80nbiw9lrk4rjnbksrnjc79klxxl8vxvpmcsinqmvxcynm8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164890,6 +165424,8 @@ self: { pname = "matchable"; version = "0.1.2"; sha256 = "0wrbq9pqndr9rm8iy3vmz756q77s0ih3y2is0hvv48w89hn5a4r0"; + revision = "1"; + editedCabalFile = "15gh6v6wicnl670j6knqcm1a589rdyh1drpk8ia7p4w9lhyav7vk"; libraryHaskellDepends = [ base containers hashable tagged unordered-containers vector ]; @@ -164906,10 +165442,8 @@ self: { }: mkDerivation { pname = "matchable-th"; - version = "0.1.0.0"; - sha256 = "1381zpnpzgng7iwx326bjwi1i3300a0aa0hhp1j5wr0mxad8hyr3"; - revision = "1"; - editedCabalFile = "0az3cwf4gy0vhv0zqdvqpvk3j6ckhf1h2946kklvmij7z46x17ql"; + version = "0.1.1.0"; + sha256 = "0hmdy38k1il2b0j6bkr3m4f1c8d8rvw21k3rlrd0q345xjx8y8p1"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -165208,13 +165742,23 @@ self: { }) {}; "matlab" = callPackage - ({ mkDerivation, array, base, Cabal, eng, filepath, mat, mx }: + ({ mkDerivation, array, base, Cabal, containers, eng, exceptions + , filepath, mat, mx, path, profunctors, template-haskell, text + }: mkDerivation { pname = "matlab"; - version = "0.2.0.0"; - sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x"; - libraryHaskellDepends = [ array base Cabal filepath ]; + version = "0.3.0.0"; + sha256 = "1ghvmq8izn2rhv19qm3v3cxf8c2ry7jd627d49k4479sj9brs2wb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base Cabal containers filepath path profunctors + ]; librarySystemDepends = [ eng mat mx ]; + executableHaskellDepends = [ + base exceptions filepath path template-haskell text + ]; + executableSystemDepends = [ eng mat mx ]; description = "Matlab bindings and interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165462,7 +166006,8 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mattermost-api" = callPackage @@ -165825,21 +166370,21 @@ self: { "mcmc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , directory, hspec, hspec-discover, log-domain, microlens - , mwc-random, QuickCheck, statistics, text, time, transformers - , vector, zlib + , data-default, directory, hspec, hspec-discover, log-domain + , microlens, mwc-random, QuickCheck, statistics, text, time + , transformers, vector, zlib }: mkDerivation { pname = "mcmc"; - version = "0.1.3"; - sha256 = "1rrbbnw6wi6k1p63n65a5rjr3fznzb48ksldb1w2xdbzmsa71nim"; + version = "0.2.0"; + sha256 = "1nybslnvn9g6cha19m2xhs6nba5nap572yxhgv4bjv44dmr6lvf7"; libraryHaskellDepends = [ - aeson base bytestring containers directory log-domain microlens - mwc-random statistics text time transformers vector zlib + aeson base bytestring containers data-default directory log-domain + microlens mwc-random statistics text time transformers vector zlib ]; testHaskellDepends = [ - base hspec hspec-discover log-domain mwc-random QuickCheck - statistics vector + base directory hspec hspec-discover log-domain mwc-random + QuickCheck statistics vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -169464,8 +170009,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.2"; sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; - revision = "1"; - editedCabalFile = "10dlh96l6fdbpl1slr8v022735z9zkdszd1aziid5ml3gf63ssd8"; + revision = "2"; + editedCabalFile = "0q633c7zv0liaz0a46llgy21x0snbfhl33qx9plh2sxhjvhvhmpj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -170418,8 +170963,8 @@ self: { }: mkDerivation { pname = "monad-control-identity"; - version = "0.1.0.2"; - sha256 = "0662yps3s6r3ifrjw0mqn4shzawaz4llhxn68806xc88dzgb4a3a"; + version = "0.1.0.3"; + sha256 = "0nxsyhyvp04xr7js2z8mvmh2w2b2fwv5zzkbgjagm6l51pqpam6q"; libraryHaskellDepends = [ base monad-control transformers transformers-base ]; @@ -172386,52 +172931,36 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base - , base16-bytestring, base58-bytestring, binary, bytestring - , constraints, containers, criterion, cryptonite, data-default - , directory, filepath, first-class-families, fmt, formatting, gauge - , ghc-prim, gitrev, hedgehog, hex-text, hspec, hspec-expectations - , HUnit, interpolate, lens, megaparsec, memory, morley-prelude, mtl - , named, o-clock, optparse-applicative, parser-combinators - , pretty-simple, QuickCheck, quickcheck-arbitrary-adt - , quickcheck-instances, semigroups, show-type, singletons - , statistics, syb, tasty, tasty-ant-xml, tasty-discover - , tasty-hedgehog, tasty-hspec, tasty-hunit-compat, tasty-quickcheck - , template-haskell, text, th-lift, th-lift-instances, time, timerep - , transformers-compat, unordered-containers, vector, vinyl - , wl-pprint-text + , base58-bytestring, binary, bytestring, constraints, containers + , cryptonite, data-default, first-class-families, fmt + , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens + , megaparsec, memory, morley-prelude, mtl, named + , optparse-applicative, parser-combinators, pretty-simple + , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances + , semigroups, show-type, singletons, syb, template-haskell, text + , th-lift, th-lift-instances, time, timerep, transformers-compat + , unordered-containers, vector, vinyl, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.4.0"; - sha256 = "0696bp3851plhwm9x0bq4i1j6ygkqi1m91r0m73cn2svl8b5mnmw"; + version = "1.5.0"; + sha256 = "151idw4dhdlsw9ga8q0mp3vnv520ljmkr0wm2hhhd7k0xliy177a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing aeson-pretty base base16-bytestring - base58-bytestring binary bytestring constraints containers - criterion cryptonite data-default first-class-families fmt - formatting ghc-prim gitrev hedgehog hex-text hspec - hspec-expectations HUnit interpolate lens megaparsec memory - morley-prelude mtl named o-clock optparse-applicative - parser-combinators QuickCheck quickcheck-arbitrary-adt - quickcheck-instances semigroups show-type singletons statistics syb - tasty tasty-ant-xml tasty-hedgehog tasty-hunit-compat - tasty-quickcheck template-haskell text th-lift th-lift-instances - time timerep transformers-compat unordered-containers vector vinyl + aeson aeson-casing aeson-pretty base base58-bytestring binary + bytestring constraints containers cryptonite data-default + first-class-families fmt generic-deriving gitrev hex-text + interpolate lens megaparsec memory morley-prelude mtl named + optparse-applicative parser-combinators QuickCheck + quickcheck-arbitrary-adt quickcheck-instances semigroups show-type + singletons syb template-haskell text th-lift th-lift-instances time + timerep transformers-compat unordered-containers vector vinyl wl-pprint-text ]; executableHaskellDepends = [ - base fmt morley-prelude named optparse-applicative pretty-simple - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - fmt formatting hedgehog hex-text hspec hspec-expectations HUnit - lens megaparsec morley-prelude singletons syb tasty tasty-hedgehog - tasty-hspec tasty-hunit-compat text unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge megaparsec morley-prelude + aeson base bytestring fmt haskeline megaparsec morley-prelude named + optparse-applicative pretty-simple text vinyl ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -174407,6 +174936,8 @@ self: { testHaskellDepends = [ base cryptonite doctest hedgehog ]; description = "Self-identifying hashes, implementation of "; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multihash-serialise" = callPackage @@ -175631,6 +176162,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random_0_15_0_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, gauge, math-functions + , mersenne-random, primitive, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, time, vector + }: + mkDerivation { + pname = "mwc-random"; + version = "0.15.0.0"; + sha256 = "1hyqyakm9kbrbgr247n72rp90hcrwhak2p90bldkd2himmfaskxk"; + libraryHaskellDepends = [ + base math-functions primitive random time vector + ]; + testHaskellDepends = [ + base bytestring doctest primitive QuickCheck random tasty + tasty-hunit tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base gauge mersenne-random random vector + ]; + doCheck = false; + description = "Fast, high quality pseudo random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random-accelerate" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -179905,8 +180461,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.3.0"; - sha256 = "1vp869aq7qi62bj02m11mg3hg1jz8qg3i67r945rhhjg9qzkn5ax"; + version = "0.5.4.1"; + sha256 = "153dswxwzai2fgn7k164zm1j2n144rncjyxj1k76mg9bqggplahs"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -180744,14 +181300,16 @@ self: { }) {}; "noli" = callPackage - ({ mkDerivation, base, cmark, directory, lucid, regex-compat, text + ({ mkDerivation, aeson, base, bytestring, cmark, directory + , frontmatter, lucid, regex-compat, text, yaml }: mkDerivation { pname = "noli"; - version = "0.1.0.3"; - sha256 = "1zyihhvr1aag9kzp9j3ksvp8imv1d2waab5grcnf5gdmnfcdchg8"; + version = "0.1.1.0"; + sha256 = "043rjr7p8jj33bkrl3mz7qbzl1az0v8acmbbzv8a6j6cpdd8vcxr"; libraryHaskellDepends = [ - base cmark directory lucid regex-compat text + aeson base bytestring cmark directory frontmatter lucid + regex-compat text yaml ]; description = "A static site generator"; license = stdenv.lib.licenses.mit; @@ -185614,17 +186172,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_1" = callPackage + "optparse-generic_1_4_2" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative - , semigroups, system-filepath, text, time, transformers, void + , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.1"; - sha256 = "0w9hl8ncw7v7bvzli68czqabxg7h15jn8b9rmgn53dn3xyw0h68y"; + version = "1.4.2"; + sha256 = "00b46pn3mi0kbx8a2xc92hlrykl9b344sq9ljmydv4zmrrhp5yr6"; libraryHaskellDepends = [ - base bytestring Only optparse-applicative semigroups - system-filepath text time transformers void + base bytestring Only optparse-applicative system-filepath text time + transformers void ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; @@ -186633,8 +187191,8 @@ self: { }: mkDerivation { pname = "packdeps"; - version = "0.4.5"; - sha256 = "07nsnxxs5y77w0v5dxw9mqgq98s3riws5846qshlnhq4l5q73php"; + version = "0.6.0.0"; + sha256 = "10hrsshzljs6yjzgpw6kpdc4fx4xrbafwicpapcmmj1y66rj00dz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186642,7 +187200,7 @@ self: { time ]; executableHaskellDepends = [ - base Cabal containers optparse-applicative process semigroups + base Cabal containers optparse-applicative process semigroups text ]; description = "Check your cabal packages for lagging dependencies"; license = stdenv.lib.licenses.bsd3; @@ -187268,8 +187826,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.5"; - sha256 = "06zv358m9kzcmpbvl4a3bxzx46nf9g67rk12hbh9cc0crq5kyqdf"; + version = "1.6"; + sha256 = "0xx2l0xjx0baaqmdnk29knxxhwfix1wrg7zysvgilf33zsvdc5a8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -187591,22 +188149,23 @@ self: { broken = true; }) {}; - "pandoc-plot_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, directory - , filepath, githash, hashable, hspec, hspec-expectations - , lifted-async, mtl, optparse-applicative, pandoc, pandoc-types - , shakespeare, tasty, tasty-hspec, tasty-hunit, template-haskell - , text, typed-process, yaml + "pandoc-plot_0_8_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, directory, filepath, githash, hashable, hspec + , hspec-expectations, lifted-async, mtl, optparse-applicative + , pandoc, pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec + , tasty-hunit, template-haskell, text, typed-process, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "0.8.0.0"; - sha256 = "10pv918mxyiv6fcpwdybymd4xrzif5qxpqdr9qarbjz6nh90ih2s"; + version = "0.8.1.0"; + sha256 = "11mn2baqya3xm325znxcsxglv6ydd67yd69p3fvqn9m2fcg1y9fr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers directory filepath hashable lifted-async - mtl pandoc pandoc-types shakespeare text typed-process yaml + base bytestring containers data-default directory filepath hashable + lifted-async mtl pandoc pandoc-types shakespeare tagsoup text + typed-process yaml ]; executableHaskellDepends = [ base containers directory filepath githash optparse-applicative @@ -188750,8 +189309,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.0"; - sha256 = "0jfl75a1282lb50v1jw3ghmnwp1fp0fmwgj46lw87rm6vc2qlzhb"; + version = "2.1.1"; + sha256 = "18z0ykpvr7m8ffqpqwnclnyifig61n9l41w3hn39f37455z1dy39"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables lens mtl template-haskell text th-abstraction vector @@ -190045,6 +190604,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "path-binary-instance" = callPackage + ({ mkDerivation, base, binary, path }: + mkDerivation { + pname = "path-binary-instance"; + version = "0.1.0.0"; + sha256 = "1mrmp58s7f88hyq493h39c1f19r92yh2qw1diml61iwhm765j7ir"; + libraryHaskellDepends = [ base binary path ]; + description = "Binary instance for Path"; + license = stdenv.lib.licenses.mit; + }) {}; + "path-extensions" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { @@ -196782,6 +197352,19 @@ self: { broken = true; }) {}; + "polysemy-optics" = callPackage + ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: + mkDerivation { + pname = "polysemy-optics"; + version = "0.1.0.0"; + sha256 = "1ym2da08wy5pbdijrvn769w644dyma8hc010f8phqjnpkhq4j0z5"; + libraryHaskellDepends = [ base optics polysemy polysemy-zoo ]; + description = "Optics for Polysemy"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-plugin" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , ghc, ghc-tcplugins-extra, hspec, hspec-discover @@ -199329,8 +199912,8 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.7.1.0"; - sha256 = "16wc74wb6q890x1nm2d33al2vr3wc7vmpm1c5f83wfbx4w6qqmkc"; + version = "0.7.2.0"; + sha256 = "0ikgar72pc1cracqfswzajr2razv98iyanmf7vwd9nkqxkwyqkpk"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory hashable lens mtl pcre-heavy pcre-light pretty pretty-terminal @@ -199823,8 +200406,8 @@ self: { pname = "pretty-compact"; version = "3.0"; sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8"; - revision = "2"; - editedCabalFile = "04c309cdfrfwh031g8syyrwwn0lxdjj9f7d8szabscm19zwbi399"; + revision = "3"; + editedCabalFile = "08wmmcqsh7yv1h9g0kmg2w84w7b1ljw2wxz81gjg91z0ig3f3zs2"; libraryHaskellDepends = [ base base-compat containers ]; benchmarkHaskellDepends = [ aeson base base-compat bytestring criterion deepseq pretty text @@ -200172,6 +200755,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_7_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, deepseq, doctest, gauge, mtl, pgp-wordlist + , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.7.0"; + sha256 = "19z04sn0kqxgwcyfn5igjmbxw13xsb3mdhdidkb3kzswib78f6sr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers deepseq gauge mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -200185,6 +200794,25 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-ansi-terminal_1_1_2" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, containers + , deepseq, doctest, gauge, prettyprinter, QuickCheck, text + }: + mkDerivation { + pname = "prettyprinter-ansi-terminal"; + version = "1.1.2"; + sha256 = "168p5b7fzqs0g8ld26d3k78afgdx4r21dv0hw8ka2c08p4w76sz2"; + libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base base-compat containers deepseq gauge prettyprinter QuickCheck + text + ]; + description = "ANSI terminal backend for the »prettyprinter« package"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -200247,6 +200875,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-convert-ansi-wl-pprint_1_1_1" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest + , prettyprinter, prettyprinter-ansi-terminal, text + }: + mkDerivation { + pname = "prettyprinter-convert-ansi-wl-pprint"; + version = "1.1.1"; + sha256 = "0bgf2np1ymy6zsd1qacndgyipcf0bamw1wkkikaq57npbb7psc41"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ base doctest ]; + description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-graphviz" = callPackage ({ mkDerivation, base, graphviz, prettyprinter, text }: mkDerivation { @@ -200936,9 +201582,8 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.6"; - sha256 = "12qzgn9jb9hvbpbkb75ad55yhmhai945rvdbamx6zspbrjlsb9sz"; - enableSeparateDataOutput = true; + version = "0.2.7"; + sha256 = "1m494ya9yv25jdi9wm90zz8c16vq1kv73sgc6w3950020hsbfqj9"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; @@ -201871,8 +202516,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.3"; - sha256 = "1z8mar0l8kh8wd0hsv4ckgnr5ha1vsx83afg63z9pwmv5l3phj0q"; + version = "2.2.1"; + sha256 = "0wf7ayxxppdg1x1s2sjmlnnhdmlm18a90mgzg7wfvpmlb9kgvs3f"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-client-tls http-types network-uri text transformers wai warp @@ -201889,8 +202534,8 @@ self: { }: mkDerivation { pname = "prometheus-client"; - version = "1.0.0.1"; - sha256 = "0jmxmq4f3p8jlg7h5wlq0kk6z749fr4gmac5x9gim0mjjga6q0r7"; + version = "1.0.1"; + sha256 = "1gyclzl16dkq7yw84x0ppgmyav7scl4jvwq9b5ihzxy45crcdhin"; libraryHaskellDepends = [ atomic-primops base bytestring clock containers deepseq exceptions mtl stm text transformers transformers-compat utf8-string @@ -201942,8 +202587,8 @@ self: { }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "1.0.1"; - sha256 = "18816z271daza8yl6sqagv4y26f977d66s26kvjq680pykcflxwx"; + version = "1.0.1.1"; + sha256 = "0afa29ym9jvagm8n99axj2qy6m4ps6qd07k1wlyb64078yc2nqn9"; libraryHaskellDepends = [ base prometheus-client text utf8-string ]; @@ -201974,8 +202619,8 @@ self: { }: mkDerivation { pname = "prometheus-wai-middleware"; - version = "1.0.0.0"; - sha256 = "0ndzhd0ghk9l2avi5agllfj3j1smamwplsnqlg0sav8n54r7n6wv"; + version = "1.0.1.0"; + sha256 = "1srp4j7841wfc29x5x8wkykjdqzdln26s219zrq15f5vir14lpar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208174,6 +208819,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rdf_0_1_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , dlist, fgl, text, transformers + }: + mkDerivation { + pname = "rdf"; + version = "0.1.0.4"; + sha256 = "1ncvh2rkxmy3k3scrpf7zyambvr94s5hq6n2yb4h7f5yx6xzr0wk"; + libraryHaskellDepends = [ + attoparsec base bytestring deepseq dlist fgl text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Representation and Incremental Processing of RDF Data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rdf4h" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base, binary , bytestring, containers, criterion, deepseq, directory, exceptions @@ -208979,6 +209643,34 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "reanimate_0_4_1_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 + }: + mkDerivation { + pname = "reanimate"; + version = "0.4.1.0"; + sha256 = "12mql2i3433y3cj4x3rcilmvja4cnyk9y5cykw16sg30kbp1riki"; + 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 + ]; + description = "Animation library based on SVGs"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reanimate-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , double-conversion, hspec, JuicyPixels, lens, linear, mtl @@ -208999,6 +209691,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reanimate-svg_0_10_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , double-conversion, hspec, JuicyPixels, lens, linear, mtl + , scientific, svg-tree, text, transformers, vector, xml + }: + mkDerivation { + pname = "reanimate-svg"; + version = "0.10.0.0"; + sha256 = "16m1829ashjwmsammqhxkifxpgwnhvxf84w36hqr3f0g0zmhfhai"; + libraryHaskellDepends = [ + attoparsec base bytestring containers double-conversion JuicyPixels + lens linear mtl scientific text transformers vector xml + ]; + testHaskellDepends = [ + attoparsec base hspec linear scientific svg-tree + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reason-export" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck @@ -216567,6 +217280,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rpmbuild-order_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, case-insensitive + , containers, directory, extra, fgl, filepath, hspec + , optparse-applicative, process, simple-cmd-args + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.4.0"; + sha256 = "1whjid4nml07wyy9al9w63213qbd2iacwz8dsfv7a9b3vn31yd3k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal case-insensitive containers directory extra fgl filepath + process + ]; + executableHaskellDepends = [ + base bytestring directory extra fgl optparse-applicative + simple-cmd-args + ]; + testHaskellDepends = [ base hspec ]; + description = "Order RPM packages by dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rrule" = callPackage ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text , time @@ -217072,6 +217810,21 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "runhs" = callPackage + ({ mkDerivation, base, bytestring, file-embed, process, yaml }: + mkDerivation { + pname = "runhs"; + version = "1.0.0.3"; + sha256 = "019aabgxfkan0l3i8wawya84wix3qmclsx0lsc8p6hvz5fjdlx21"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring file-embed process yaml + ]; + description = "Stack wrapper for single-file Haskell programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "runmany" = callPackage ({ mkDerivation, async, base, bytestring, optparse-applicative , process, stm @@ -217425,8 +218178,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; - revision = "2"; - editedCabalFile = "0qaqvczy8v4ghx6d0hjc2hk29z02l8ya5y3ii3rr7bp47b1z8z0i"; + revision = "3"; + editedCabalFile = "12jjph25vffkj55ds468zv144qxwyrb6qmp2g1pb03732n6z9596"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -221803,8 +222556,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "seqid"; - version = "0.6.1"; - sha256 = "0gqmnckrrs85cwz2jvp2ip7a5c5qfbav4nb9d8bxax093jziz301"; + version = "0.6.2"; + sha256 = "07xxpdrr3lqqnzcxbync46c0kz3d2i7k4day630a6x6zmzpyay0i"; libraryHaskellDepends = [ base mtl transformers ]; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; @@ -221826,8 +222579,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.7.1"; - sha256 = "0yasm87kjhdq13zacpd4qa3kssalwvkipf3rz2cq1dgdgps5mxf7"; + version = "0.7.2"; + sha256 = "0dd0vxs216ri0hdkz49hzzrryil7hhqb55cc9z6ca8f337imanm8"; libraryHaskellDepends = [ base io-streams seqid ]; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -221925,7 +222678,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sequence-formats_1_5_1" = callPackage + "sequence-formats_1_5_1_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers @@ -221933,8 +222686,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.5.1"; - sha256 = "0nm6g02cn6fzhzhydmw0kwl41r9r9bqnwpk2cynlmvylghmnkmmj"; + version = "1.5.1.1"; + sha256 = "1gfss5fnv16xg6qxsazh1r7jd9qv5klpnjl6fbmk8p4n7cy5rsxx"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -222282,7 +223035,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_17" = callPackage + "servant_0_18" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, case-insensitive, deepseq, hspec, hspec-discover , http-api-data, http-media, http-types, mmorph, mtl, network-uri @@ -222291,8 +223044,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.17"; - sha256 = "0hrqwb9cin6wbwwqaw68i84ai46897ir4gy4issc6ya2qqmfq1ks"; + version = "0.18"; + sha256 = "1dcb92q8w2fim087plspf1hs2gq2hdfiaggp71jqbljhnznlf5vj"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph @@ -222841,7 +223594,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_17" = callPackage + "servant-client_0_18" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit @@ -222852,8 +223605,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.17"; - sha256 = "0161v6kfj4mm5rixw5lbm8sc2dng300xbwgdhi4d0fqxrx12kij7"; + version = "0.18"; + sha256 = "17m0cakf4apdrpq7wic9mbxcn2hd9cwh9xrcbxshabfffgkq791i"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -222895,7 +223648,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client-core_0_17" = callPackage + "servant-client-core_0_18" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec , hspec-discover, http-media, http-types, network-uri, QuickCheck @@ -222903,8 +223656,8 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.17"; - sha256 = "1xskvmdr4998hj19wvhyb5rs5x193792f1b6ia7r21qdzp9garff"; + version = "0.18"; + sha256 = "198kixjiy34z05vavs18wb2kp62pk5bzr5cl7dvhkl73alvj3rhn"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -223481,8 +224234,8 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.17"; - sha256 = "1nyp6ijb8219yfbxrq2mz59m1vfpr56rbfn9j9zmx4pcvnb903xc"; + version = "0.18"; + sha256 = "1krpmmzjc1vagcy8rdgcl3zm8zlfjf8ikicaqrqp6d95f8bz4kaz"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -223784,7 +224537,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-mock_0_8_6" = callPackage + "servant-mock_0_8_7" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , bytestring-conversion, hspec, hspec-discover, hspec-wai , http-types, QuickCheck, servant, servant-server, transformers @@ -223792,8 +224545,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.8.6"; - sha256 = "1cr5davd7ldcm2a4f33mi74rk6qlgdqg7vzzfpf8kgxrc97syrrd"; + version = "0.8.7"; + sha256 = "0j8c9wb1njrl77hp94frlnjpbk2axlkcgbcyax6s4pmf9v3c8j6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224107,8 +224860,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.9.0"; - sha256 = "042g1y4dhfbvyppy4rkd1hxmv2n84j8cja5kny12a1q05ab616yk"; + version = "0.0.10.0"; + sha256 = "072q2nxapx9p1fkcs862a9irjhlg0sfpbr72a1m9a5lrfhf9ahmc"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -224390,7 +225143,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_17" = callPackage + "servant-server_0_18" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, directory, exceptions, filepath, hspec , hspec-discover, hspec-wai, http-api-data, http-media, http-types @@ -224401,10 +225154,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.17"; - sha256 = "11y7cb8r8bzkx3fb2cd5cbazxy87n0f4wm14qdxsz2g81k262k5l"; - revision = "1"; - editedCabalFile = "1kbdga7bi7slgcskqc3sb1xwmwif52dj8gvkxcskaw0b9xbdynhs"; + version = "0.18"; + sha256 = "0knbzr6ls9p2wjn3kfggy99gxavl817xw48m53plhf2r4s4vjrw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226184,8 +226935,8 @@ self: { ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { pname = "shake-c"; - version = "0.4.3.0"; - sha256 = "1cnmwn63kx43khgy3n00sqla8pw11h7almir31zm0dzgld11znix"; + version = "0.4.5.0"; + sha256 = "1bhi4rfvhin16c4xhx50dxjhr2gfpngasv7fps9fhm6is372ln9v"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -226442,15 +227193,18 @@ self: { }) {}; "shake-plus-extended" = callPackage - ({ mkDerivation, base, comonad, extra, ixset-typed, path, rio - , shake, shake-plus, within + ({ mkDerivation, base, comonad, extra, 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.1.0.0"; - sha256 = "1c91h4hfc20b9153mysq0fflgjqiq6b0q8hhp9iyp9j2dmlq7nw4"; + version = "0.3.0.0"; + sha256 = "040g0h0a03wmwhbqn06jxwf5h0lwsiqfa1x1x9wzyw8m52f5ngn4"; libraryHaskellDepends = [ - base comonad extra ixset-typed path rio shake shake-plus within + base comonad extra 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; @@ -229843,6 +230597,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_9" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , skylighting-core + }: + mkDerivation { + pname = "skylighting"; + version = "0.9"; + sha256 = "1855k1xjh38r389zvlzga7dkc3scj65ip9frvvkagxa2ls1irfp1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -229875,6 +230647,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_9" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + , transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.9"; + sha256 = "0gljyp007pcym2b0azg0sn654kmss9xwim84xw7hxc1q8rwvdxhr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl safe text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text utf8-string + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -230395,8 +231199,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.2.2"; - sha256 = "0jja57dcalxd1qp7fj338jwbpaxm1l3ika2zyd9rv3dk2k1xn6rj"; + version = "0.3.0"; + sha256 = "18nncc771b16ngkihza9skx1n73w811sg1p2hphp5pl7vkbl4wkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230404,13 +231208,9 @@ self: { elynx-tree hmatrix megaparsec monad-logger mwc-random optparse-applicative scientific text transformers vector ]; - executableHaskellDepends = [ - async base bytestring containers elynx-seq elynx-tools hmatrix - megaparsec monad-logger mwc-random optparse-applicative scientific - text transformers vector - ]; + executableHaskellDepends = [ base elynx-seq elynx-tools ]; description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -233482,27 +234282,30 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, extra - , filepath, hspec, megaparsec, mtl, process, template-haskell - , temporary, text, type-errors-pretty, vector + ({ mkDerivation, array, base, containers, deepseq, directory, extra + , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl + , process, template-haskell, temporary, text, type-errors-pretty + , vector }: mkDerivation { pname = "souffle-haskell"; - version = "1.0.0"; - sha256 = "1n2xxdmzsxdkn28j2wrrphhsg1y0v9s5xcq114g72785lr25n48r"; + version = "1.1.0"; + sha256 = "0s8zl7f6v89m6a3yhlmji1lb8k3rfwzyyg307m3f35a9kms0988p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq directory filepath mtl process template-haskell + array base deepseq directory filepath mtl process template-haskell temporary text type-errors-pretty vector ]; executableHaskellDepends = [ - base containers deepseq directory extra filepath megaparsec mtl - process template-haskell temporary text type-errors-pretty vector + array base containers deepseq directory extra filepath megaparsec + mtl process template-haskell temporary text type-errors-pretty + vector ]; testHaskellDepends = [ - base deepseq directory filepath hspec mtl process template-haskell - temporary text type-errors-pretty vector + array base deepseq directory filepath hedgehog hspec hspec-hedgehog + mtl process template-haskell temporary text type-errors-pretty + vector ]; description = "Souffle Datalog bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -235845,6 +236648,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_2_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, gitrev, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl + , optparse-applicative, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.2.0"; + sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base filepath gitrev optparse-applicative text + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -236671,6 +237509,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "stackcollapse-ghc_0_0_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec + , hspec-golden, recursion-schemes, rosezipper, safe, text + , transformers, utf8-string + }: + mkDerivation { + pname = "stackcollapse-ghc"; + version = "0.0.1.3"; + sha256 = "05271x47b2aik2msfm9f6jsazb174p667acwyd84vs73nygpbmdk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers extra foldl recursion-schemes rosezipper + safe text transformers + ]; + testHaskellDepends = [ + base bytestring containers extra foldl hspec hspec-golden + recursion-schemes rosezipper safe text transformers utf8-string + ]; + description = "Program to fold GHC prof files into flamegraph input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -238519,15 +239381,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_55_0" = callPackage + "stratosphere_0_56_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.55.0"; - sha256 = "0fs0npxspfg3yj03dzjq1a02z3ca3s82z6v92f3cb1bkn0dsqhq2"; + version = "0.56.0"; + sha256 = "00pszcypf0ckagxx2l5ldl0m6kacr3xbmw0yxfcjh6hs34543v8n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238921,28 +239783,6 @@ self: { }) {}; "streaming-commons" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, directory - , gauge, hspec, network, process, QuickCheck, random, stm, text - , transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.2.2.0"; - sha256 = "0641z37cvd3sx5vn6irg7haa1mmyac7s1jw4bgd3f5kagmqlwrcs"; - libraryHaskellDepends = [ - array async base bytestring directory network process random stm - text transformers unix zlib - ]; - testHaskellDepends = [ - array async base bytestring deepseq hspec network QuickCheck text - unix zlib - ]; - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; - description = "Common lower-level functions needed by various streaming data libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "streaming-commons_0_2_2_1" = callPackage ({ mkDerivation, array, async, base, bytestring, deepseq, directory , gauge, hspec, network, process, QuickCheck, random, stm, text , transformers, unix, zlib @@ -238962,7 +239802,6 @@ self: { benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -239327,6 +240166,8 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {archive = null;}; "streamly-binary" = callPackage @@ -239414,8 +240255,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.0.1"; - sha256 = "0ddzvhjwar2sj69b851avcsf7g5bph2kcc0m77inxj0jbnvmhd2g"; + version = "0.0.1.1"; + sha256 = "080w7c9dgw4dixnxhvpjnii53c5sk00h18vwps973q51qhl9qa18"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -242091,8 +242932,8 @@ self: { }: mkDerivation { pname = "sweet-egison"; - version = "0.1.0.2"; - sha256 = "1arvkf3l24yvssdsnidb5jv9h11wxbxzfcjxl2z9b9djpv0qkvy1"; + version = "0.1.0.3"; + sha256 = "17xqkhlxqkmn1ayhsxl1pw3y4fqxbq4lcdaq9ispp57qd3dcvd7v"; libraryHaskellDepends = [ backtracking base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts haskell-src-meta logict template-haskell @@ -249873,25 +250714,26 @@ self: { }) {}; "themoviedb" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, http-client - , http-client-tls, http-types, mtl, tasty, tasty-hunit, text - , text-binary, time, time-locale-compat, transformers + ({ mkDerivation, aeson, base, http-client, http-client-tls + , http-types, mtl, relude, tasty, tasty-hunit, text, time }: mkDerivation { pname = "themoviedb"; - version = "1.1.5.2"; - sha256 = "0pp603wvq03m56w0y12abjqbfv712aj3k6ki69jq60l9pxj4nni4"; + version = "1.2.0.0"; + sha256 = "1dchnsk9mx2v01apj5ilnsl3w9vj6f5pkqrm9701zw7rcp7xds0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls http-types - mtl text text-binary time time-locale-compat transformers + aeson base http-client http-client-tls http-types mtl relude text + time ]; executableHaskellDepends = [ - base text time time-locale-compat transformers + aeson base http-client http-client-tls http-types mtl relude text + time ]; testHaskellDepends = [ - base bytestring tasty tasty-hunit text time + aeson base http-client http-client-tls http-types mtl relude tasty + tasty-hunit text time ]; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; @@ -250111,6 +250953,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "thread-hierarchy_0_3_0_2" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, stm }: + mkDerivation { + pname = "thread-hierarchy"; + version = "0.3.0.2"; + sha256 = "1bhx1s7xwf4gb8qjbbifwl5cq3gfc1girrmzm4vr0fj05myk9xph"; + libraryHaskellDepends = [ base containers stm ]; + testHaskellDepends = [ base containers hspec stm ]; + testToolDepends = [ hspec-discover ]; + description = "Simple Haskell thread management in hierarchical manner"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thread-local-storage" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { @@ -250142,6 +250998,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "thread-supervisor_0_1_0_1" = callPackage + ({ mkDerivation, base, clock, containers, data-default, hspec + , hspec-discover, QuickCheck, unliftio + }: + mkDerivation { + pname = "thread-supervisor"; + version = "0.1.0.1"; + sha256 = "0x10i81cvp5m5rx48mdhrxcs5rpcmbr2xrv3aq9s3lqdchy2vqzy"; + libraryHaskellDepends = [ + base clock containers data-default unliftio + ]; + testHaskellDepends = [ + base clock data-default hspec QuickCheck unliftio + ]; + testToolDepends = [ hspec-discover ]; + description = "A simplified implementation of Erlang/OTP like supervisor over thread"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -252283,8 +253159,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.2.2"; - sha256 = "0hf70zvcndjmlwbd2n2ncbl89xi2xmkr7ymq48hmdlg3vp0bdz62"; + version = "0.3.0"; + sha256 = "070r7j87s3206a5hpkhlfszpnpc7ngil88r6iq2752kijjik2x6v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252293,14 +253169,9 @@ self: { optparse-applicative parallel primitive scientific statistics text transformers vector ]; - executableHaskellDepends = [ - aeson array base bytestring comonad containers elynx-tools gnuplot - lifted-async megaparsec monad-logger mwc-random - optparse-applicative parallel primitive scientific statistics text - transformers vector - ]; + executableHaskellDepends = [ base elynx-tools ]; description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -253777,6 +254648,40 @@ self: { broken = true; }) {}; + "trade-journal" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , data-default, gmp, hedgehog, here, HUnit, lens, megaparsec, mpfr + , mtl, optparse-applicative, pretty, pretty-show, profunctors + , split, tasty, tasty-hedgehog, tasty-hunit, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "trade-journal"; + version = "0.0.1"; + sha256 = "1zmpqwrgwf26l9gwcavhgq8d9w0bc9c5sjqkr0i7d1rbiqiqf94j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cassava containers data-default lens + megaparsec mtl pretty pretty-show profunctors split text time + transformers unordered-containers vector + ]; + librarySystemDepends = [ gmp mpfr ]; + executableHaskellDepends = [ + aeson base bytestring cassava containers lens megaparsec mtl + optparse-applicative pretty-show text time transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring cassava containers hedgehog here HUnit lens + megaparsec mtl pretty-show tasty tasty-hedgehog tasty-hunit text + time transformers unordered-containers + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; + "traildb" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, directory, exceptions, Judy, primitive, profunctors @@ -253995,8 +254900,8 @@ self: { }: mkDerivation { pname = "transformers-abort"; - version = "0.6.0.1"; - sha256 = "0qd4nzrmp03mbikwmvabbygx3dv9c2v7lpp2cvrz96y9gj0a3k2a"; + version = "0.6.0.3"; + sha256 = "0svqpgwkg06k2hnhxxlx4nwn45r52azqa2gnrz8j538k75kzlglq"; libraryHaskellDepends = [ base monad-control pointed semigroupoids transformers transformers-base @@ -254220,34 +255125,37 @@ self: { }) {}; "transient-universe" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, filepath, hashable, HTTP, iproute, mtl, network - , network-info, network-uri, process, random, stm, TCache, text - , time, transformers, transient, vector, websockets + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, directory, filepath, hashable, HTTP + , iproute, mtl, network, network-info, network-uri, old-time + , process, random, stm, TCache, text, time, transformers, transient + , vector, websockets }: mkDerivation { pname = "transient-universe"; - version = "0.5.0.0"; - sha256 = "1d3bp4xjpi28ph7fa9wm49ssg53jfvlq77ka0zvrkilw1j6f8v3l"; + version = "0.6.0.1"; + sha256 = "1dhgp2z0q90pnz13s88pbg6ppwl9ic7g04ikla3hg2jh019lgb1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP iproute mtl network network-info network-uri process - random stm TCache text time transformers transient vector - websockets + aeson base base64-bytestring bytestring case-insensitive containers + directory filepath hashable HTTP iproute mtl network network-info + network-uri old-time process random stm TCache text time + transformers transient vector websockets ]; executableHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP mtl network network-info network-uri process random - stm TCache text time transformers transient vector websockets + aeson base base64-bytestring bytestring case-insensitive containers + directory filepath hashable HTTP mtl network network-info + network-uri old-time process random stm TCache text time + transformers transient vector websockets ]; testHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP mtl network network-info network-uri process random - stm TCache text time transformers transient vector websockets + aeson base base64-bytestring bytestring case-insensitive containers + directory filepath hashable HTTP mtl network network-info + network-uri old-time process random stm TCache text time + transformers transient vector websockets ]; - description = "Remote execution and map-reduce: distributed computing for Transient"; + description = "fully composable remote execution for the creation of distributed systems"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -256202,6 +257110,8 @@ self: { ]; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -257706,8 +258616,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.4.2.0"; - sha256 = "19ng2cf68v2j6csw39zxh756amq195479v883y5lgkvjzsx37dbn"; + version = "0.5.0.0"; + sha256 = "05hzcyp1lsf3dakdv3kqdl0hw6pz5mzh644d3k8lasrhrmx8l583"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -258768,8 +259678,8 @@ self: { ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { pname = "unagi-streams"; - version = "0.2.6"; - sha256 = "1mw5h7dizrh4bg1avah201chfl96lapaj3141czfs9w8hyq4lp9h"; + version = "0.2.7"; + sha256 = "11vr8zxyksqb2np6f77d9ai6xrb7fpfjbgv191h3pppcanysm4w3"; libraryHaskellDepends = [ base io-streams unagi-chan ]; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -258804,26 +259714,18 @@ self: { }) {}; "unbeliever" = callPackage - ({ mkDerivation, async, base, bytestring, chronologique, containers - , core-data, core-program, core-text, deepseq, directory - , exceptions, filepath, fingertree, fsnotify, gauge, hashable - , hourglass, hspec, megaparsec, mtl, prettyprinter - , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm - , template-haskell, terminal-size, text, text-short, transformers - , unix, unordered-containers + ({ mkDerivation, base, bytestring, core-data, core-program + , core-text, fingertree, gauge, hashable, hspec, safe-exceptions + , text, text-short }: mkDerivation { pname = "unbeliever"; - version = "0.10.0.5"; - sha256 = "1h0zy19vfhg1x671yhfsr1rbpr7c9jhbr0lxhj7cb25jm94hjajw"; + version = "0.10.0.6"; + sha256 = "08rw2krphvs2z0ic19mfwlz3fcmpnbwbpvp7ks22pasi2zy45sb2"; libraryHaskellDepends = [ base core-data core-program core-text ]; testHaskellDepends = [ - async base bytestring chronologique containers core-data - core-program core-text deepseq directory exceptions filepath - fingertree fsnotify hashable hourglass hspec megaparsec mtl - prettyprinter prettyprinter-ansi-terminal safe-exceptions - scientific stm template-haskell terminal-size text text-short - transformers unix unordered-containers + base bytestring core-data core-program core-text fingertree + hashable hspec safe-exceptions text text-short ]; benchmarkHaskellDepends = [ base bytestring core-data core-program core-text gauge text @@ -258831,6 +259733,8 @@ self: { doHaddock = false; description = "Opinionated Haskell Interoperability"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unbound" = callPackage @@ -264418,29 +265322,31 @@ self: { }) {}; "vimeta" = callPackage - ({ mkDerivation, aeson, base, byline, bytestring, containers - , directory, either, filepath, http-client, http-client-tls - , http-types, mtl, old-locale, optparse-applicative, parsec - , process, temporary, text, themoviedb, time, time-locale-compat - , transformers, xdg-basedir, yaml + ({ mkDerivation, aeson, base, byline, bytestring, directory + , exceptions, filepath, http-client, http-client-tls, http-types + , mtl, optparse-applicative, parsec, process, relude, temporary + , text, themoviedb, time, yaml }: mkDerivation { pname = "vimeta"; - version = "0.2.5.1"; - sha256 = "1v46b0215mcyhxma3ascg3paz683j8xqsf4czs8syx4amyls36qg"; - revision = "1"; - editedCabalFile = "1na8qghd918ck1pg058anbh9iy3w4x7hf72ygfwfy23hw00wn5j4"; + version = "0.3.0.0"; + sha256 = "0npz5mx9w6srz5p0is3yzgfwssakdycv8h0h38ff7q0sivq3pfnv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base byline bytestring containers directory either filepath - http-client http-client-tls http-types mtl old-locale - optparse-applicative parsec process temporary text themoviedb time - time-locale-compat transformers xdg-basedir yaml + aeson base byline bytestring directory exceptions filepath + http-client http-client-tls http-types mtl optparse-applicative + parsec process relude temporary text themoviedb time yaml + ]; + executableHaskellDepends = [ + aeson base byline bytestring directory exceptions filepath + http-client http-client-tls http-types mtl optparse-applicative + parsec process relude temporary text themoviedb time yaml ]; - executableHaskellDepends = [ base ]; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vimus" = callPackage @@ -265496,13 +266402,13 @@ self: { }: mkDerivation { pname = "wai-control"; - version = "0.1.0.1"; - sha256 = "110zv6q5ya997sn21sd5mwgj9vx73afnwxzvi0xvv198gh6wc7iq"; + version = "0.1.0.2"; + sha256 = "0ygcqxyp8mmw81rrlk20ziyghi6snrzyyqgfllbh5b6jhx6z017h"; libraryHaskellDepends = [ base monad-control-identity transformers-base wai wai-websockets websockets ]; - description = "Give wai Applications an IO-based inner monad"; + description = "Run wai Applications in IO based monads"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -268428,6 +269334,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webex-teams-api_0_2_0_1" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, hspec-discover + , http-conduit, http-types, network-uri, optparse-applicative, text + , utf8-string, wai, warp + }: + mkDerivation { + pname = "webex-teams-api"; + version = "0.2.0.1"; + sha256 = "11qivxmp0cx3jsrpbp2zdfjhjrcd960ycbr08li3d327ff2qhdsh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring data-default hspec + http-conduit http-types network-uri text wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell bindings for Webex Teams API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webex-teams-conduit" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , data-default, hspec, http-client, http-conduit, http-types @@ -268453,6 +269389,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webex-teams-conduit_0_2_0_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , data-default, hspec, hspec-discover, http-client, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp, webex-teams-api + }: + mkDerivation { + pname = "webex-teams-conduit"; + version = "0.2.0.1"; + sha256 = "0ig4krcvc256lyrqvj6g4kjklln5m7sm44c4bvbgkgr3lmrpfkr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base conduit webex-teams-api ]; + executableHaskellDepends = [ + base bytestring conduit data-default http-client + optparse-applicative text utf8-string webex-teams-api + ]; + testHaskellDepends = [ + aeson async base bytestring conduit data-default hspec http-conduit + http-types network-uri text wai warp webex-teams-api + ]; + testToolDepends = [ hspec-discover ]; + description = "Conduit wrapper of Webex Teams List API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webex-teams-pipes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, data-default , hspec, http-client, http-conduit, http-types, network-uri @@ -268478,6 +269441,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webex-teams-pipes_0_2_0_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, data-default + , hspec, hspec-discover, http-client, http-conduit, http-types + , network-uri, optparse-applicative, pipes, text, utf8-string, wai + , warp, webex-teams-api + }: + mkDerivation { + pname = "webex-teams-pipes"; + version = "0.2.0.1"; + sha256 = "094wvrnv0609gp0iya34pciw2hc5wi7fax5wjwr3n1lmwdgf7i4g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pipes webex-teams-api ]; + executableHaskellDepends = [ + base bytestring data-default http-client optparse-applicative pipes + text utf8-string webex-teams-api + ]; + testHaskellDepends = [ + aeson async base bytestring data-default hspec http-conduit + http-types network-uri pipes text wai warp webex-teams-api + ]; + testToolDepends = [ hspec-discover ]; + description = "Pipes wrapper of Webex Teams List API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webfinger-client" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , hashable, http-client, http-client-tls, http-types @@ -274762,23 +275752,19 @@ self: { }) {}; "yapb" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , directory, hashable, json, network, pretty, prettyprinter + ({ mkDerivation, base, bytestring, directory, hashable, network , process, regex-tdfa }: mkDerivation { pname = "yapb"; - version = "0.1.0"; - sha256 = "184jrkyijlp644r4zgvicy9xlrx29xmbn7jszpwp3jk5yfavm5w2"; + version = "0.1.1"; + sha256 = "1zbk2whfi09wzx9ql4dhkbg50s7v45y309avxljypg7z9i9pvx3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory hashable process regex-tdfa - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers json network pretty - prettyprinter regex-tdfa + base bytestring directory hashable network process regex-tdfa ]; + executableHaskellDepends = [ base regex-tdfa ]; testHaskellDepends = [ base ]; description = "Yet Another Parser Builder (YAPB)"; license = stdenv.lib.licenses.bsd3; @@ -279057,6 +280043,23 @@ self: { license = stdenv.lib.licenses.gpl2Plus; }) {}; + "zio" = callPackage + ({ mkDerivation, base, mtl, transformers, unexceptionalio + , unexceptionalio-trans + }: + mkDerivation { + pname = "zio"; + version = "0.1.0.0"; + sha256 = "001bkysr4n5azly7cmn7xbgw0bg00ib4yg83klz0k0b5217wg982"; + libraryHaskellDepends = [ + base mtl transformers unexceptionalio unexceptionalio-trans + ]; + testHaskellDepends = [ + base mtl transformers unexceptionalio unexceptionalio-trans + ]; + license = stdenv.lib.licenses.mpl20; + }) {}; + "zip" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory From a03145bb960f25e180c8921c9439ff1cbba923cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 20:21:45 +0200 Subject: [PATCH 172/214] hackage2nix: build the package set for the proper compiler version --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index daf0041f1c3..fed60f0a324 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.8.3 +compiler: ghc-8.8.4 core-packages: - array-0.5.4.0 From 4fe481dc4968c7cef5bc66bcedcbec9cb5b9d977 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 20:16:06 +0200 Subject: [PATCH 173/214] hackage2nix: update list of broken packages to fix evaluation --- .../configuration-hackage2nix.yaml | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fed60f0a324..b96f15c8a19 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2646,10 +2646,8 @@ package-maintainers: - streaming-wai kiwi: - glirc - - matterhorn - mattermost-api - mattermost-api-qc - - Unique psibi: - path-pieces - persistent @@ -3557,9 +3555,11 @@ broken-packages: - buster - buster-gtk - buster-network + - bustle - butter - butterflies - bv-sized + - byline - bytable - bytearray-parsing - bytebuild @@ -4668,6 +4668,7 @@ broken-packages: - elm-websocket - elynx - elynx-markov + - elynx-nexus - elynx-seq - elynx-tools - elynx-tree @@ -6620,6 +6621,7 @@ broken-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-prim-bits - hw-rankselect - hw-simd - hw-succinct @@ -6799,6 +6801,7 @@ broken-packages: - integer-pure - integreat - intel-aes + - intensional-datatys - interlude-l - InternedData - internetmarke @@ -7341,7 +7344,15 @@ broken-packages: - 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 @@ -7581,6 +7592,7 @@ broken-packages: - matrix-market - matrix-sized - matsuri + - matterhorn - maude - maxent - maxent-learner-hw @@ -7885,6 +7897,7 @@ broken-packages: - multibase - multifocal - multihash + - multihash-cryptonite - multihash-serialise - multilinear - multilinear-io @@ -8605,6 +8618,7 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy-optics - polysemy-RandomFu - polysemy-webserver - polysemy-zoo @@ -9980,6 +9994,7 @@ broken-packages: - streaming-png - streaming-process - streaming-sort + - streamly-archive - streamly-lmdb - streamproc - strelka @@ -10408,6 +10423,7 @@ broken-packages: - trackit - traction - tracy + - trade-journal - traildb - trajectory - transactional-events @@ -10488,6 +10504,7 @@ broken-packages: - turingMachine - turtle-options - tweak + - twee - tweet-hs - twentefp-eventloop-graphics - twentefp-eventloop-trees @@ -10577,6 +10594,7 @@ broken-packages: - UMM - unagi-bloomfilter - unamb-custom + - unbeliever - unbound - unbound-generics - unbound-kind-generics @@ -10600,6 +10618,7 @@ broken-packages: - uniform-io - union - union-map + - Unique - uniqueid - uniquely-represented-sets - units-attoparsec @@ -10763,6 +10782,7 @@ broken-packages: - views - vigilance - Villefort + - vimeta - vimus - vintage-basic - vinyl-gl From bf5c3d3e6dc16061bafc0773f92291a82fc563e2 Mon Sep 17 00:00:00 2001 From: ken Date: Sun, 26 Jul 2020 23:57:17 -0500 Subject: [PATCH 174/214] haskellPackages.hasql-migration unbroken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b96f15c8a19..ed636cdc33c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5904,7 +5904,6 @@ broken-packages: - hasql-dynamic-statements - hasql-generic - hasql-implicits - - hasql-migration - hasql-optparse-applicative - hasql-postgres - hasql-postgres-options From 2cc57f81ec8d5214f024b0bdd2eb8cdad4e719be Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 27 Jul 2020 10:31:43 +0200 Subject: [PATCH 175/214] haskellPackages.haskeline_0_8_0_0: add dontCheck Testsuite is trying to access executable which is part of the package being built. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8810444cce6..dc5ce78461d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1451,4 +1451,7 @@ self: super: { }; }; + # Testsuite trying to run `which haskeline-examples-Test` + haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From d834fc7d630ff6361fd006cb61c9277dc75500f8 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 27 Jul 2020 10:32:51 +0200 Subject: [PATCH 176/214] haskellPackages.zre: use repline_0_4_0_0 --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc5ce78461d..578db07300a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1454,4 +1454,11 @@ self: super: { # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_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; + }; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 907b898383b0070dd8550c95740b645418582e6a Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Wed, 29 Jul 2020 15:39:18 +0200 Subject: [PATCH 177/214] bytebuild: disable test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 578db07300a..9879c8e6fdc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -460,6 +460,9 @@ self: super: { bytestring-strict-builder = dontCheck super.bytestring-strict-builder; bytestring-tree-builder = dontCheck super.bytestring-tree-builder; + # https://github.com/byteverse/bytebuild/issues/19 + bytebuild = dontCheck super.bytebuild; + # https://github.com/ndmitchell/shake/issues/206 # https://github.com/ndmitchell/shake/issues/267 shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed636cdc33c..024a2ed132f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3562,7 +3562,6 @@ broken-packages: - byline - bytable - bytearray-parsing - - bytebuild - bytelog - bytestring-arbitrary - bytestring-builder-varword From aa66f3fd084345a66464d17809925d40568c44a0 Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Wed, 29 Jul 2020 15:44:14 +0200 Subject: [PATCH 178/214] ip: disable test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9879c8e6fdc..9e82ab9f9ec 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -463,6 +463,9 @@ self: super: { # https://github.com/byteverse/bytebuild/issues/19 bytebuild = dontCheck super.bytebuild; + # https://github.com/andrewthad/haskell-ip/issues/67 + ip = dontCheck super.ip; + # https://github.com/ndmitchell/shake/issues/206 # https://github.com/ndmitchell/shake/issues/267 shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 024a2ed132f..57c505d0c45 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6829,7 +6829,6 @@ broken-packages: - iostring - iothread - iotransaction - - ip - ip2location - ip2proxy - ipatch From 2dab5712fb566cb252987d509d1cce1dfce947ea Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 29 Jul 2020 21:18:07 +0200 Subject: [PATCH 179/214] haskellPackages.hnix: fix build for ghc-8.10 by adding repline --- .../haskell-modules/configuration-ghc-8.10.x.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 69f212dad9a..6be0c3c9b1a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -111,6 +111,10 @@ self: super: { }); # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. - hnix = generateOptparseApplicativeCompletion "hnix" super.hnix; + hnix = generateOptparseApplicativeCompletion "hnix" + (overrideCabal super.hnix (drv: { + # executable is allowed for ghc >= 8.10 and needs repline + executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; + })); } From d86e0e5207aeca052df99ecd6766fac3c1f9abc5 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 30 Jul 2020 08:58:28 +0200 Subject: [PATCH 180/214] haskellPackages.haskell-language-server+hls-ide: fix lsp-test override --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9e82ab9f9ec..873ed8dddcf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1348,7 +1348,7 @@ self: super: { })).override { # we are faster than stack here hie-bios = dontCheck self.hie-bios_0_6_1; - lsp-test = dontCheck self.lsp-test_0_11_0_2; + lsp-test = dontCheck self.lsp-test_0_11_0_3; }); haskell-language-server = (overrideCabal super.haskell-language-server @@ -1368,7 +1368,7 @@ self: super: { ghcide = self.hls-ghcide; # we are faster than stack here hie-bios = dontCheck self.hie-bios_0_6_1; - lsp-test = dontCheck self.lsp-test_0_11_0_2; + lsp-test = dontCheck self.lsp-test_0_11_0_3; }; # https://github.com/kowainik/policeman/issues/57 From 737486617c752064d800ba870d15b8bb4458d16b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 17:33:47 +0200 Subject: [PATCH 181/214] haskell-streaming-commons: drop obsolete version override --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 873ed8dddcf..31c7e319579 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1393,9 +1393,6 @@ self: super: { sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63"; }); - # The current LTS 15.x version has a bug in the test suite. - streaming-commons = self.streaming-commons_0_2_2_1; - # Version bumps have not been merged by upstream yet. # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5 dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch { From 16bd71bf8e4d81e810c65d636a68413b0cb307af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 20:59:34 +0200 Subject: [PATCH 182/214] all-cabal-hashes: update to Hackage at 2020-07-30T22:14:54Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c7528db49f1..b1b8d6ce902 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/8af27e77a015d06c7a8fe49a430fd5334a93ebf7.tar.gz"; - sha256 = "1w5cfcvliy1ly8iq42l76ai5wgfnrwxf6hw5kq6p913qhhrcn5wr"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/edb0920a8dbbd592d67a781d0b905728515ab623.tar.gz"; + sha256 = "08yvpwzw7c3xw3w970ysykj44vglqfiq057kx0axk81s68v83rcy"; } From 0e9f38426a2498a3780a18ebaa3609ee45ebf0ea Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Fri, 31 Jul 2020 21:45:35 +0200 Subject: [PATCH 183/214] bambootracker: init at 0.4.3 --- .../audio/bambootracker/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/applications/audio/bambootracker/default.nix diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix new file mode 100644 index 00000000000..c74c0ca4eff --- /dev/null +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -0,0 +1,72 @@ +{ mkDerivation +, stdenv +, fetchFromGitHub +, fetchpatch +, installShellFiles +, qmake +, qtbase +, qtmultimedia +, qttools +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? stdenv.hostPlatform.isUnix +, libjack2 +}: +let + + inherit (stdenv.lib) optional optionals; + +in +mkDerivation rec { + pname = "bambootracker"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "rerrahkr"; + repo = "BambooTracker"; + rev = "v${version}"; + sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + }; + + # Fix macOS build until new release + patches = [ + (fetchpatch { + url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; + sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; + }) + ]; + + preConfigure = "cd BambooTracker"; + + nativeBuildInputs = [ qmake qttools installShellFiles ]; + + buildInputs = [ qtbase qtmultimedia ] + ++ optional alsaSupport alsaLib + ++ optional pulseSupport libpulseaudio + ++ optional jackSupport libjack2; + + qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ] + ++ optional pulseSupport "CONFIG+=use_pulse" + ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; + + postInstall = '' + install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop + installManPage ../BambooTracker*.1 + + cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/ + + for size in 16x16 256x256; do + install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png + done + ''; + + meta = with stdenv.lib; { + description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; + homepage = "https://github.com/rerrahkr/BambooTracker"; + license = licenses.gpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2ec2f55737..b69a1aa7220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19099,6 +19099,8 @@ in azpainter = callPackage ../applications/graphics/azpainter { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + cadence = qt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; From 60be9548a4826068ef1d6220b0647dbc2f17cc4e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 31 Jul 2020 16:09:51 +0300 Subject: [PATCH 184/214] slack: 4.4.3 -> 4.7.0 (linux), 4.6.0 -> 4.8.0 (darwin) --- .../instant-messengers/slack/default.nix | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index f46a293be97..bebafe43193 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , dpkg +, undmg , makeWrapper , nodePackages , alsaLib @@ -19,10 +20,12 @@ , gnome2 , gtk3 , libappindicator-gtk3 +, libdrm , libnotify , libpulseaudio , libuuid , libxcb +, mesa , nspr , nss , pango @@ -32,21 +35,26 @@ }: let - - pname = "slack"; - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - sha256 = { - x86_64-darwin = "09daxnqxyccshkrmr7ysgjvgvgmlgd590ym68fz0l8n6ayfpkgw0"; - x86_64-linux = "00ihhsgxm441nsmav7pq4n4y9s7p2r4x5dqld160658xyqi836cq"; + pname = "slack"; + version = { + x86_64-darwin = "4.8.0"; + x86_64-linux = "4.7.0"; }.${system} or throwSystem; - version = { - x86_64-darwin = "4.6.0"; - x86_64-linux = "4.4.3"; + src = let + base = "https://downloads.slack-edge.com"; + in { + x86_64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2"; + }; + x86_64-linux = fetchurl { + url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; + sha256 = "1nwyl70caaz9k0hccfpkjli0jjc6m9zbjb3nf4bwmykpbxbzr9w3"; + }; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -58,11 +66,7 @@ let }; linux = stdenv.mkDerivation rec { - inherit pname meta version; - src = fetchurl { - url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - inherit sha256; - }; + inherit pname version src meta; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -81,10 +85,12 @@ let gnome2.GConf gtk3 libappindicator-gtk3 + libdrm libnotify libpulseaudio libuuid libxcb + mesa nspr nss pango @@ -143,21 +149,16 @@ let ''; }; - darwin = stdenv.mkDerivation rec { - inherit pname meta version; + darwin = stdenv.mkDerivation { + inherit pname version src meta; - phases = [ "installPhase" ]; + nativeBuildInputs = [ undmg ]; - src = fetchurl { - url = "https://downloads.slack-edge.com/mac_releases/Slack-${version}-macOS.dmg"; - inherit sha256; - }; + sourceRoot = "Slack.app"; installPhase = '' - /usr/bin/hdiutil mount -nobrowse -mountpoint slack-mnt $src - mkdir -p $out/Applications - cp -r ./slack-mnt/Slack.app $out/Applications - /usr/bin/hdiutil unmount slack-mnt + mkdir -p $out/Applications/Slack.app + cp -R . $out/Applications/Slack.app /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES ''; }; From 223ed16ba9c5d70ba3291426c527ee553e578bf3 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 20 Jul 2020 20:07:42 +0200 Subject: [PATCH 185/214] python3Packages.sh: 1.12.14 -> 1.13.1 Sandbox build will now succeed on Darwin and Linux Signed-off-by: Sirio Balmelli --- .../development/python-modules/sh/default.nix | 21 +++---- .../sh/disable-broken-tests-darwin.patch | 56 +++++++++---------- 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 913840110c9..de23241e379 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,28 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales, coreutils }: buildPythonPackage rec { pname = "sh"; - version = "1.12.14"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; + sha256 = "18w6wawmpzfh52s0jimwn59a7rfa7blrmg7bhwnq8siwbqhd58wp"; }; patches = [ - # Disable tests that fail on Darwin - # Some of the failures are due to Nix using GNU coreutils + # Disable tests that fail on Darwin sandbox ./disable-broken-tests-darwin.patch - # Fix tests for Python 3.7. See: https://github.com/amoffat/sh/pull/468 - (fetchpatch { - url = "https://github.com/amoffat/sh/commit/b6202f75706473f02084d819e0765056afa43664.patch"; - sha256 = "1kzxyxcc88zhgn2kmfg9yrbs4n405b2jq7qykb453l52hy10vi94"; - excludes = [ ".travis.yml" ]; - }) ]; postPatch = '' sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py + sed -i 's#/bin/sleep#${coreutils.outPath}/bin/sleep#' test.py ''; checkInputs = [ coverage lsof glibcLocales ]; @@ -33,9 +27,10 @@ buildPythonPackage rec { HOME=$(mktemp -d) ''; - meta = { + meta = with lib; { description = "Python subprocess interface"; homepage = "https://pypi.python.org/pypi/sh/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch index 6488dd1ffea..c51490ce6a4 100644 --- a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch +++ b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch @@ -1,49 +1,49 @@ -From 264f2f6a04d25156bba43524a6b172d2e99c53f4 Mon Sep 17 00:00:00 2001 -From: Ben Wolsieffer -Date: Fri, 21 Dec 2018 17:39:45 -0500 -Subject: [PATCH] Disable tests that fail on OSX. +From c596ad546fe7460b57a62799837757eb641309c1 Mon Sep 17 00:00:00 2001 +From: Sirio Balmelli +Date: Mon, 20 Jul 2020 19:51:20 +0200 +Subject: [PATCH] Disable tests that fail on Darwin (macOS) or with sandboxing -Some of the failures are due to the use of GNU ls. +Signed-off-by: Sirio Balmelli --- test.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test.py b/test.py -index 68ef40c..2f53360 100644 +index f8029c0..ba1d141 100644 --- a/test.py +++ b/test.py -@@ -352,6 +352,7 @@ exit(3) +@@ -404,6 +404,7 @@ exit(3) self.assertEqual(sed(_in="one test three", e="s/test/two/").strip(), - "one two three") + "one two three") -+ @not_osx ++ @not_macos def test_ok_code(self): from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 -@@ -498,6 +499,7 @@ while True: - self.assertEqual(out, match) +@@ -1004,6 +1005,7 @@ print(sys.argv[1]) + now = time.time() + self.assertGreater(now - start, sleep_time) - -+ @not_osx - def test_environment(self): - """ tests that environments variables that we pass into sh commands - exist in the environment, and on the sh module """ -@@ -861,6 +863,7 @@ print(sys.argv[1]) - self.assertTrue(now - start > sleep_time) - - -+ @not_osx ++ @not_macos def test_background_exception(self): from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 - p = ls("/ofawjeofj", _bg=True) # should not raise -@@ -2036,6 +2039,7 @@ else: - self.assertEqual(p, "test") + p = ls("/ofawjeofj", _bg=True, _bg_exc=False) # should not raise +@@ -1801,6 +1803,7 @@ exit(49) + p = python(py.name, _ok_code=49, _bg=True) + self.assertEqual(49, p.exit_code) ++ @not_macos + def test_cwd(self): + from sh import pwd + from os.path import realpath +@@ -2899,6 +2902,7 @@ print("hi") + python(py.name, _in=stdin) -+ @not_osx - def test_signal_exception(self): - from sh import SignalException_15 + @requires_utf8 ++ @skipUnless(False, "Does not work in sandbox") + def test_unicode_path(self): + from sh import Command -- -2.20.0 +2.27.0 From b66b16420c0214d6d2c20fb57d68dee66719862d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 21:13:49 +0000 Subject: [PATCH 186/214] ccache: 3.7.10 -> 3.7.11 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ead30a56e27..e0a6a8065b5 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,13 +2,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.10"; + version = "3.7.11"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "v${version}"; - sha256 = "0v6pvj50y18fxh2f6cx6xyg545xcpxfmrcg9bzbc6lc5acrvvjm7"; + sha256 = "03c6riz4vb0jipplk69c1j8arjjrjn676kglsrzqf8cidrh8j91c"; }; nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; From b14be7257a21f4f79e29696c9623a47b95328058 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 1 Jul 2020 20:34:23 +0200 Subject: [PATCH 187/214] python3Packages.west: init at 0.7.2 Signed-off-by: Sirio Balmelli Co-authored-by: Joh --- .../python-modules/west/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/west/default.nix diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix new file mode 100644 index 00000000000..3d4427f492d --- /dev/null +++ b/pkgs/development/python-modules/west/default.nix @@ -0,0 +1,53 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, colorama, configobj, packaging, pyyaml, pykwalify +}: + +buildPythonPackage rec { + version = "0.7.2"; + pname = "west"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "11dbzlcg48fymddqjrrs60pr7y33qjjv0y5zrfjc56gkc190gmz6"; + }; + + propagatedBuildInputs = [ + colorama + configobj + packaging + pyyaml + pykwalify + ]; + + # pypi package does not include tests (and for good reason): + # tests run under 'tox' and have west try to git clone repos (not sandboxable) + doCheck = false; + pythonImportsCheck = [ + "west" + ]; + + meta = with lib; { + homepage = "https://github.com/zephyrproject-rtos/west"; + description = "Zephyr RTOS meta tool"; + longDescription = '' + West lets you manage multiple Git repositories under a single directory using a single file, + called the west manifest file, or manifest for short. + + The manifest file is named west.yml. + You use west init to set up this directory, + then west update to fetch and/or update the repositories + named in the manifest. + + By default, west uses upstream Zephyr’s manifest file + (https://github.com/zephyrproject-rtos/zephyr/blob/master/west.yml), + but west doesn’t care if the manifest repository is a Zephyr tree or not. + + For more details, see Multiple Repository Management in the west documentation + (https://docs.zephyrproject.org/latest/guides/west/repo-tool.html). + ''; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28a98171f5a..49415518073 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7679,6 +7679,8 @@ in { pykwalify = callPackage ../development/python-modules/pykwalify { }; + west = callPackage ../development/python-modules/west { }; + wfuzz = callPackage ../development/python-modules/wfuzz { }; wget = callPackage ../development/python-modules/wget { }; From 38aa804d5bf16cdf87ba0cd100ae9cece098db44 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 1 Aug 2020 00:34:43 +0200 Subject: [PATCH 188/214] cryptpad: 3.13.0 -> 3.20.1 (#94255) --- .../web-apps/cryptpad/bower-packages.nix | 22 ++-- pkgs/servers/web-apps/cryptpad/default.nix | 3 + pkgs/servers/web-apps/cryptpad/generate.sh | 2 +- .../cryptpad/node-packages-generated.nix | 124 ++++++++++-------- .../web-apps/cryptpad/node-packages.json | 2 +- .../web-apps/cryptpad/node-packages.nix | 2 +- 6 files changed, 85 insertions(+), 70 deletions(-) diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix index 76dc26c4e08..be0c3ab72c7 100644 --- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -5,36 +5,38 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn") (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") - (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414") - (fetchbower "codemirror" "5.52.0" "^5.19.0" "0yc9qyfp7g800mgbaxc5zyy6bp5q257rj7l8i1bp0667h1wvfchp") + (fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp") + (fetchbower "codemirror" "5.56.0+components1" "^5.19.0" "0fv8rxw6dspyv4bl6p2aka57544f45527rallnhnm5scv77qnakm") (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") - (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r") + (fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz") (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh") (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") (fetchbower "chainpad-crypto" "0.2.4" "^0.2.0" "0sqqc2j0pc34ig6319n18i85j03hibqkhz3cbr70vbd8x43vfzby") - (fetchbower "chainpad-listmap" "0.8.1" "^0.8.1" "04q1mb9cr510y0xzybd51j8x16vmjb8v7jv3vik0cx7kzqf4rh0f") - (fetchbower "chainpad" "5.1.3" "^5.1.0" "1la0zrh0i1h264jacn436w85hzq3l0d4whwxd2sslja9xbwgfaa0") + (fetchbower "chainpad-listmap" "0.9.0" "^0.9.0" "173yr5a6zxq7nb3fha6f1ajv2vy0mvqwmm949ww7ihvrhh7cd0f5") + (fetchbower "chainpad" "5.2.2" "^5.2.0" "1rmh039bqk11xnnh99sqrqksr4idly75y5q4f5wyl9cg4slsqrdp") (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv") (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq") (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") - (fetchbower "bootstrap" "4.4.1" "^v4.0.0" "0a3y5s6236jjw0ppzwdysf5mn87308ndadw1rgwgwswr9cgkz2ak") + (fetchbower "bootstrap" "4.5.0" "^v4.0.0" "0cfdn6z8jwx6y8lbbq6xpkfhq2vra0i84nkj9ji2bil1fzgzi40f") (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5") (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") - (fetchbower "localforage" "1.7.3" "^1.5.2" "0q1a996j4dn246xp55zldfh07s9m9skhnf9i0g1w4ngwsnqx23rw") + (fetchbower "localforage" "1.8.1" "^1.5.2" "0ci265385racnxvn4g1n672yaxi47msw6k042nxdb5vlpf5g327j") (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") - (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x") + (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx") (fetchbower "sortablejs" "1.10.2" "^1.6.0" "10q4gyblhjy7w51clr0k9j7h722l4ybzn5535givwpmp6xagv11v") (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") - (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp") + (fetchbower "jszip" "Stuk/jszip#3.5.0" "Stuk/jszip#^3.1.5" "1ra19d82cq1hrnbw88l8c61bs12kpgxvbfiiwpfi8fhy0l8hcsvk") (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") - (fetchbower "chainpad-netflux" "0.10.3" "^0.10.0" "0k8nf34bxwr070jjn4hc7ikiysnv22mix1mdg633j67b5ca0bm30") + (fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0") + (fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0") + (fetchbower "chainpad-netflux" "0.11.2" "^0.11.0" "1dqfricbm6s8iv7w1bsx1700m5cpk5rk1f4spqv0fqyf6mdz366v") (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz") (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") ]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index 77e529f26ab..abd20d64499 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -15,6 +15,7 @@ let bowerPackages = buildBowerComponents { name = "${cryptpad.name}-bower-packages"; # this list had to be tweaked by hand: + # * add the second jquery ~2.1.0 entry # * add the second bootstrap ~3.1.1 entry generated = ./bower-packages.nix; src = cryptpad.src; @@ -48,6 +49,8 @@ let postInstall = '' out_cryptpad=$out/lib/node_modules/cryptpad + substituteInPlace $out_cryptpad/lib/workers/index.js --replace "lib/workers/db-worker" "$out_cryptpad/lib/workers/db-worker" + # add the bower components ln -sv \ ${bowerPackages}/bower_components \ diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index 2fe4099efa4..697b5a74a08 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -2,7 +2,7 @@ #! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix set -euo pipefail -node2nix --nodejs-10 \ +node2nix --nodejs-12 \ --input node-packages.json \ --output node-packages-generated.nix \ --composition node-packages.nix \ diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 1fde7673fe8..349ad59c60a 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -10,7 +10,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "array-flatten-1.1.1" = { @@ -28,7 +28,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "body-parser-1.18.3" = { @@ -55,16 +55,16 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz"; - sha512 = "1b9mfdy7p405fgwsjhv5dmy1p5mz6nzb3ss4qkj664xnq4bpz5nn42cpxzvdk3d4g8zf4p98xq4ja81kykl296rzpgrpprgw34xarkx"; + sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg=="; }; }; - "chainpad-server-4.0.5" = { + "chainpad-server-4.0.9" = { name = "chainpad-server"; packageName = "chainpad-server"; - version = "4.0.5"; + version = "4.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.5.tgz"; - sha512 = "11j36n90grxq83vpzjzff2nfcf4qkqwk6ply90sijkdcw575ql2ja9pww48inapqa3rqh3js0s4pccswyfyllnafvvrrv4xii08lwxw"; + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.9.tgz"; + sha512 = "8h1W41ktE05TM6LuXrklpW2TUxWeNyIDiRaQygKsXaA/7pyJxF7+AmPVS+xW0c31VkHjQDPiaMzPoxhcxXnIyA=="; }; }; "content-disposition-0.5.2" = { @@ -82,7 +82,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "cookie-0.3.1" = { @@ -109,7 +109,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "depd-1.1.2" = { @@ -172,7 +172,7 @@ let version = "4.16.4"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; - sha512 = "0x2wjwybkq0ridr18abnsh5hymkh9fjma63ik8za1fl7jgmmhnrxg9qi8yy9p8hci4k8385xys0y28whamrn054zvfwl57q4sxr8pcg"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; }; }; "finalhandler-1.1.1" = { @@ -181,7 +181,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; "forwarded-0.1.2" = { @@ -208,7 +208,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "05qcmykw9czycnn3r2rrlspzd4dznr4796abdqzw150j7rafnlq8n4wp4dai34swb23lfvhw8s31l1k83vpwxqddyf1k724jq4dm430"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; "gar-1.0.4" = { @@ -217,7 +217,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"; - sha512 = "3ikh31ywgrpmrh33kn82v8r5vjx0w4i1kva4gnc8rbd8dkbrps4gkgjdfab609fzhbzcbrch1cgn23s1ia1qn5cqj3vcgxjymqgv2f3"; + sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; "get-folder-size-2.0.1" = { @@ -226,16 +226,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"; - sha512 = "3679cn6gprs8s2zfs0y73r0mv6pg9295y3r70pj75wcvilm4ds2yaim9b9918ap1vp48a9773nd9nwzjg179c1d75jbncy2c3w1n8gq"; + sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "http-errors-1.6.3" = { @@ -253,7 +253,7 @@ let version = "0.4.23"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x"; + sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; }; }; "inherits-2.0.3" = { @@ -271,7 +271,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "jsonfile-4.0.0" = { @@ -334,25 +334,25 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "ms-2.0.0" = { @@ -370,7 +370,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "netflux-websocket-0.1.20" = { @@ -379,7 +379,7 @@ let version = "0.1.20"; src = fetchurl { url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz"; - sha512 = "1rdvzykqbvgkxk52k0f16vn1mzgrnxawyfnizlzqah3jv554pi7znbhlmjf5wjjabrj0k5dd7v53jzz0ncwg9vjf6j0kqi5ib1n9wdj"; + sha512 = "svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg=="; }; }; "nthen-0.1.8" = { @@ -388,7 +388,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; - sha512 = "1rn74v8zsxvg9pywjqz4gg3947flyhzz66m5vgb0rw6mffg7l3pf0xmkfgamj42yafn200qfp1s0s9ardg429fy9wafr3z1hv08479s"; + sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; }; }; "on-finished-2.3.0" = { @@ -406,7 +406,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "path-to-regexp-0.1.7" = { @@ -424,7 +424,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; "pull-stream-3.6.14" = { @@ -433,7 +433,7 @@ let version = "3.6.14"; src = fetchurl { url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz"; - sha512 = "1xjf24kjiqjzdx29ss7cqgr32vgd84b8xyd7d8n3yvwkay1jf84z2s9cpzwlmn0cq4sl26bxxpc89nnqv1630k90gaa87c7kaz9v2i8"; + sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; }; }; "qs-6.5.2" = { @@ -442,7 +442,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "range-parser-1.2.1" = { @@ -451,7 +451,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.3.3" = { @@ -460,7 +460,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; - sha512 = "27ygzjzpajjmz2bl1f7y1bla7wdw65w912r4i29x9p1r0pa5jivip658vwlkqq77n1nc619w1p52818mvihxhks4dlbc1pmbc925szm"; + sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; }; }; "safe-buffer-5.1.2" = { @@ -469,7 +469,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safer-buffer-2.1.2" = { @@ -478,7 +478,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "saferphore-0.0.1" = { @@ -496,7 +496,7 @@ let version = "0.16.2"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; "serve-static-1.13.2" = { @@ -505,7 +505,7 @@ let version = "1.13.2"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; }; }; "setprototypeof-1.1.0" = { @@ -514,7 +514,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; "sortify-1.0.4" = { @@ -532,7 +532,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; }; }; "stream-to-pull-stream-1.7.3" = { @@ -541,7 +541,7 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; - sha512 = "0dcrjpdn2j9k2zhnw5v2kp3k9vqsng8x822nchipwh4rgzb3y7y9cj3q01r9mishxrha0rc62xh6v0dbkycn3fq847d5rbbkal75hza"; + sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; }; }; "tiny-each-async-2.0.3" = { @@ -578,7 +578,16 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "ulimit-0.0.2" = { + name = "ulimit"; + packageName = "ulimit"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ulimit/-/ulimit-0.0.2.tgz"; + sha1 = "2b51f9dc8381ae4102636cec5eb338c2630588a0"; }; }; "ultron-1.1.1" = { @@ -587,7 +596,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; "universalify-0.1.2" = { @@ -596,7 +605,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "unpipe-1.0.0" = { @@ -632,20 +641,20 @@ let version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; - sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; + sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.13.0" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "3.13.0"; + version = "3.20.1"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "6b657c47ceba50c85275981f45895341370d3d66"; - sha256 = "d7b56930962fe5217d2051fb718954fd7aef96c9503e27d32148ea9b4a8dc098"; + rev = "9bc27d7d0d50d17c345bd545a45341a05293c558"; + sha256 = "4a1fc833b38b2097741500cef38c6b04f5b752c21736e95eb492c33012016332"; }; dependencies = [ sources."accepts-1.3.7" @@ -658,7 +667,7 @@ in sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" ]; }) - sources."chainpad-server-4.0.5" + sources."chainpad-server-4.0.9" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -677,7 +686,7 @@ in sources."fs-extra-7.0.1" sources."gar-1.0.4" sources."get-folder-size-2.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."http-errors-1.6.3" sources."iconv-lite-0.4.23" sources."inherits-2.0.3" @@ -689,8 +698,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."netflux-websocket-0.1.20" @@ -715,6 +724,7 @@ in sources."tiny-each-async-2.0.3" sources."tweetnacl-0.12.2" sources."type-is-1.6.18" + sources."ulimit-0.0.2" sources."ultron-1.1.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json index 3d068f6a449..07e02a1a0a2 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.13.0" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" } ] diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 3eecf3c9099..19c034aa78b 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { From be2eede6762178ce2eefc855f892a5a77355d6ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Aug 2020 00:54:07 +0200 Subject: [PATCH 189/214] home-assistant: revert back to python3.8 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b69a1aa7220..d3155f29f22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16035,9 +16035,7 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { - python3 = python37; - }; + home-assistant = callPackage ../servers/home-assistant { }; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; From 9ffc60ddeadfdd1feeaed1453d04adbabb15154c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 1 Aug 2020 01:18:22 +0200 Subject: [PATCH 190/214] perlPackages.CPANMini: init at 1.111016 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 597d5c6acda..20c23c766e2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3535,6 +3535,27 @@ let }; }; + CPANMini = buildPerlPackage { + pname = "CPAN-Mini"; + version = "1.111016"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz"; + sha256 = "5a297afc3e367ad80811464d4eb7e4dd3caff8ba499cdd2b558f6279443a7657"; + }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + propagatedBuildInputs = [ FileHomeDir LWP LWPProtocolHttps URI ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/minicpan + ''; + + meta = { + homepage = "https://github.com/rjbs/CPAN-Mini"; + description = "Create a minimal mirror of CPAN"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; version = "4.17"; From 202ce2d867924567e6f23ea1f3ca721af50c7560 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 23:35:12 +0000 Subject: [PATCH 191/214] eprover: 2.4 -> 2.5 --- pkgs/applications/science/logic/eprover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index f19d7e35c3e..a3844dc3700 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "1xn5yypy6w36amsb3kvj1srlbv6v5dl51k64cd264asz2n469dxw"; + sha256 = "0jj0zkiqpcx9xp16spkskrv3jycprz7jg1g97i67j43c4yvxylwa"; }; buildInputs = [ which ]; From 4102707f9a462e67dd31c3c8a647901d4894f9b8 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 30 Jun 2020 07:54:00 +0800 Subject: [PATCH 192/214] edukai: Init at 4.0 Add `edukai` (MOE Standard Kai Font) version 4.0 If approved, users will be able to install the Standard Chinese Kai Font provided by the Ministry of Education, Republic of China (Taiwan). --- pkgs/data/fonts/edukai/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/edukai/default.nix diff --git a/pkgs/data/fonts/edukai/default.nix b/pkgs/data/fonts/edukai/default.nix new file mode 100644 index 00000000000..d5b9e25c2eb --- /dev/null +++ b/pkgs/data/fonts/edukai/default.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "edukai"; + version = "4.0"; + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-4.0.zip"; + sha256 = "10m9srvbazvg9gc43943dc89rjzcfc8mm4lx9gb5hnplrn22zrcn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + mv *.ttf $out/share/fonts/ + ''; + + meta = { + description = + "The MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Standard Kai Font is a kai (regular srcipt) font + provided by + the Midistry of Education, Republic of China (Taiwan). + It currently includes 13,076 Chinese characters. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=47"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b93b673cce3..5b16cf22924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18296,6 +18296,8 @@ in eb-garamond = callPackage ../data/fonts/eb-garamond { }; + edukai = callPackage ../data/fonts/edukai { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; From 8ca49923c6be434fae55e6e2637c757eefdd84b5 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:49:09 +0800 Subject: [PATCH 193/214] edusong: Init at 1.0 Add `edusong` (MOE Standard Song Font) If approved, users will be able to install the Standard Chinese Song Font provided by the Ministry of Education, Republic of China (Taiwan). --- pkgs/data/fonts/edusong/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/fonts/edusong/default.nix diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/data/fonts/edusong/default.nix new file mode 100644 index 00000000000..bf7d39aa20c --- /dev/null +++ b/pkgs/data/fonts/edusong/default.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "edusong"; + version = "1.0"; # The upstream doesn't provide the version + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip"; + sha256 = "1b74wj9hdzlnrvldwlkh21sfhqxwh9qghf1k0fv66zs6n48vb0d4"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + mv *.ttf $out/share/fonts/ + ''; + + meta = { + description = + "The MOE Standard Song Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Standard Song Font is a Chinese Song font provided by + the Midistry of Education, Republic of China (Taiwan). + Song or Ming is a category of CKJ typefaces in print. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b16cf22924..1cc62762eb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18298,6 +18298,8 @@ in edukai = callPackage ../data/fonts/edukai { }; + edusong = callPackage ../data/fonts/edusong { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; From b2872b921d02b7da9d46b272d5a27cc672267528 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:25:28 +0800 Subject: [PATCH 194/214] eduli: Init at 3.0 Add `eduli` (MOE Li Font) If approved, users will be able to install the Chinese Li (clerical) Font provided by the Ministry of Education, Republic of China (Taiwan). This is probably the first font of clerical script in nixpkgs. --- pkgs/data/fonts/eduli/default.nix | 36 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/fonts/eduli/default.nix diff --git a/pkgs/data/fonts/eduli/default.nix b/pkgs/data/fonts/eduli/default.nix new file mode 100644 index 00000000000..7ff2ad4446c --- /dev/null +++ b/pkgs/data/fonts/eduli/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "eduli"; + version = "3.0"; + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; + sha256 = "0vpmm2qb429npng0aqkafwgs7cjibq8a3f7bbn9hysbm2lndwxwd"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + for name in *.ttf; do + mv "$name" "$out/share/fonts/$(echo $name | sed -r 's/(.*)\(.*\)\.ttf/\1.ttf/')" + done + ''; + + meta = { + description = + "The MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Li Font is a li (clerical srcipt) font + provided by + the Midistry of Education, Republic of China (Taiwan). + It currently includes 4,808 Chinese characters. + The clerical script (lishu) is an archaic style of Chinese calligraphy. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=49"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cc62762eb1..4536120b4c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18298,6 +18298,10 @@ in edukai = callPackage ../data/fonts/edukai { }; + eduli = callPackage ../data/fonts/eduli { }; + + moeli = eduli; + edusong = callPackage ../data/fonts/edusong { }; elliptic_curves = callPackage ../data/misc/elliptic_curves { }; From 381d8ba2db6256a34a29427e699300504e15ff8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 00:28:50 +0000 Subject: [PATCH 195/214] emplace: 0.3.5 -> 0.3.6 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 92407e63994..5d3d8e15e3e 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0l68pcln18hgvqayhdnjv70fcs2y7j3fpiyfm3kl0gpykj7l969r"; + sha256 = "15d21qv8cbzwpz2gsq1cgvxdbqm45zq2wfphhjqq77z1kay43m3f"; }; - cargoSha256 = "0j953c2h5asvr6fvklbdkk7vkdzdbp9zbzxxiic1gjv953gmw0qq"; + cargoSha256 = "0xd1b0rfrf3a6j0xkyfqz2pd0lkb6dpqyyghli9a8kh0kdfxvndj"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 0dd12066f4db7731a29c4777b0c4cb2eca132438 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 17:31:49 -0700 Subject: [PATCH 196/214] eksctl: 0.22.0 -> 0.24.0 (#94391) --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index ab309a11a6e..5bccc026c43 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1l7wcx89d7nil5lbr4x2w04lwranz0z83y892v290wv2l0xnmshj"; + sha256 = "1iybsyx2la6dcz2g3rshzky15n5qs8z57zvdvpiisfa0pnjisdm5"; }; - vendorSha256 = "0fy9m72iciz5pjf2b3323brgi15w6a9fg1m1srpaiay3md87gagg"; + vendorSha256 = "033zj6jmxypj2plqpnkkzp8iffc078y9jfq01zcjnaij1v0sb8al"; subPackages = [ "cmd/eksctl" ]; From 46273519cf41c93202ec08aaa2ddb447f2779708 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 00:36:05 +0000 Subject: [PATCH 197/214] dijo: 0.1.5 -> 0.2.2 --- pkgs/tools/misc/dijo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 5f58e800228..38386301699 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.1.5"; in +let version = "0.2.2"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "1ch320j2d66zn9mbs7xl0bkfcm2hpak6izk0yspz1gcji1l7grsc"; + sha256 = "1al2dfrfxw39m9q636h47dnypcwkhp9bw01hvy7d9b69kskb21db"; }; - cargoSha256 = "1p6apz3wd4gqp0z24ygfw8nmpkh44d000jp6x7svqzmpphnmb0ji"; + cargoSha256 = "0a2l0ynjj9wl86aawm0l0rbdkm8j3a2n0nm6ysyxamaip0q5y1ql"; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker."; From c7a8ec98987c75569f1acaeb42f07924c5aff2f5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 29 Jul 2020 18:05:43 +0700 Subject: [PATCH 198/214] Add siraben to maintainer-list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3185a8f77e2..874a0faed36 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7462,6 +7462,12 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + siraben = { + email = "bensiraphob@gmail.com"; + github = "siraben"; + githubId = 8219659; + name = "Siraphob Phipathananunth"; + }; siriobalmelli = { email = "sirio@b-ad.ch"; github = "siriobalmelli"; From a05e809205110cbf8d9c2286a8675dc5da5b9ed7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 29 Jul 2020 17:08:51 +0700 Subject: [PATCH 199/214] scas: init at 0.4.6 Suggested changes --- pkgs/development/compilers/scas/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/scas/default.nix diff --git a/pkgs/development/compilers/scas/default.nix b/pkgs/development/compilers/scas/default.nix new file mode 100644 index 00000000000..e80724c8a4c --- /dev/null +++ b/pkgs/development/compilers/scas/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, stdenv, cmake }: + + +stdenv.mkDerivation rec { + pname = "scas"; + + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "scas"; + rev = version; + sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; + }; + + nativeBuildInputs = [ cmake ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Assembler and linker for the Z80."; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4871dc63da..525afbc712f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9435,6 +9435,8 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + scas = callPackage ../development/compilers/scas { }; + metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; From f0e0df37a224f7cb77d72e0a2acd74f41693e4f4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 Jul 2020 03:03:41 +0300 Subject: [PATCH 200/214] autotiling: init at 1.1 --- pkgs/misc/autotiling/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/misc/autotiling/default.nix diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix new file mode 100644 index 00000000000..b104f359363 --- /dev/null +++ b/pkgs/misc/autotiling/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonApplication, fetchPypi, i3ipc, importlib-metadata }: + +buildPythonApplication rec { + pname = "autotiling"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0"; + }; + + propagatedBuildInputs = [ i3ipc importlib-metadata ]; + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/autotiling"; + description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; + license = licenses.gpl3Plus; + platforms= platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec10503b465..8abf4631fab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25881,6 +25881,8 @@ in attract-mode = callPackage ../misc/emulators/attract-mode { }; + autotiling = python3Packages.callPackage ../misc/autotiling { }; + beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; From 44a1778df5a57e6573bead29174eeb35114e5dc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 04:55:27 +0000 Subject: [PATCH 201/214] fping: 4.3 -> 4.4 --- pkgs/tools/networking/fping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 137bead064a..f7e1f7ce0d3 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-4.3"; + name = "fping-4.4"; src = fetchurl { url = "https://www.fping.org/dist/${name}.tar.gz"; - sha256 = "0b9ppwibc0dx2ns95m0z1b28939af1c8yvgjbhnr9f7p8bl0l14j"; + sha256 = "049dnyr6d869kwrnfhkj3afifs3219fy6hv7kmsb3irdlmjlp1cz"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; From ecca08abe1a167d197d862750c37eea50f82f803 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:04:35 +0000 Subject: [PATCH 202/214] git-quick-stats: 2.1.2 -> 2.1.3 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 587a23f6599..bd5e699b4a9 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1q0iy732smad1v25da9vmlk8r5iscjrk678pq6mda9sbmiq693r3"; + sha256 = "0j7yd5fcqdbsad6xzi2k0j4p06w9187hhpal1gqcrh3kj13sjyi3"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { From b735f8cba8e8db3cae26ccc8ae3881519578850b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:12:20 +0000 Subject: [PATCH 203/214] gitAndTools.gitui: 0.8.1 -> 0.9.1 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index ca3dcc08b33..25985ef0a23 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "0nch2p4isdv746p9pczqwram0c5f0f9l2r3fy5r12x9br0kak136"; + sha256 = "0lxpdwpxizc4bczh5cl2x2xbbdam3fakvgcbbrdh43czgjwb4ds1"; }; - cargoSha256 = "1d54afg45lw8zyanr49fklzhczadyja2fjmid22d81s2ari84slz"; + cargoSha256 = "14x0m3pq4gapgqaljxdwmr5pk9h209ls95an9xgrq0dj6apyimgx"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; From fe4fc3791b0cea2c46181a9541474720210d469a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:43:32 +0000 Subject: [PATCH 204/214] intel-gmmlib: 20.2.2 -> 20.2.3 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 7b3cb0a2528..c1e2fa5a6f6 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.2.2"; + version = "20.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1gr4xfw8a99jwir7dxqwbfs42lrap3gimwkd7mrhi8vgacvkkvhf"; + sha256 = "1gsjcsad70pxafhw0jhxdrnfqwv8ffp5sawbgylvc009jlzxh5l8"; }; nativeBuildInputs = [ cmake ]; From 945a1e96a31c01d8fd1ace9bc49faba0c8538ed1 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 31 Jul 2020 23:44:51 -0700 Subject: [PATCH 205/214] humioctl: 0.25.0 -> 0.26.0 (#94411) --- pkgs/applications/logging/humioctl/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 28bda827204..5210e10f814 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,9 +1,9 @@ { buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: let - humioCtlVersion = "0.25.0"; - sha256 = "1x8354m410nf9g167v0i1c77s5w2by7smdlyjwl89ixgdjw04ay3"; - vendorSha256 = "14bysjgvahr56hvd8walym11hh721i1q2g503n8m68wdzrrym4qy"; + humioCtlVersion = "0.26.0"; + sha256 = "1j33hmvhkb546dbi2qd5hmpcv715yg9rnpxicc1mayr9f1i2aj2i"; + vendorSha256 = "1l2wa4w43srfrkb4qrgiyzdb6bnaqvp9g3fnrln6bhrcw6jsgj4z"; in buildGoModule { name = "humioctl-${humioCtlVersion}"; pname = "humioctl"; @@ -23,7 +23,6 @@ in buildGoModule { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - mv $out/bin/cli $out/bin/humioctl $out/bin/humioctl completion bash > humioctl.bash $out/bin/humioctl completion zsh > humioctl.zsh installShellCompletion humioctl.{bash,zsh} From 0acd4d5735af10dbf272c320b7648a94c165cf92 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 00:02:30 -0700 Subject: [PATCH 206/214] dolt: 0.18.0 -> 0.18.1 (#94393) --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 18c9a767cdf..1002ab9e156 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "12kvjq3z9bggfmgci3wql4v8sh491dwp6qr768k8kwncqmp3jjvx"; + sha256 = "106n4zlrs64vx09cm365jsymaa0949k0wjb845p2lp4794r9zkf7"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1lscjp4ih5kxrbqch9164bqrp7lbsir6vg4zcczhvhh0phbcbqjs"; + vendorSha256 = "1pvf63cxwq4jj5gi2xalrsk2z1f7i53f0z6qc2p7aibwx9i1k9cz"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; From 8ea4f5dea393046ebeb2fdd31683dff23b13c352 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 29 May 2020 23:54:09 +0200 Subject: [PATCH 207/214] gem: init at 2020-03-26 --- .../audio/pd-plugins/gem/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/audio/pd-plugins/gem/default.nix diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix new file mode 100644 index 00000000000..2c0d0a24c57 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, puredata +, libGL +, libGLU +, glew +, freeglut +, libv4l +, libX11 +, file + }: + +stdenv.mkDerivation rec { + pname = "gem-unstable"; + # The patch below applies to the latest release (v0.94), but then the build + # fails. I didn't track down what changed between that version and the + # current master that fixes the build on Nix + version = "2020-03-26"; + + src = fetchFromGitHub { + owner = "umlaeute"; + repo = "Gem"; + rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599"; + sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy"; + }; + + patches = [ + # Update autoconf OpenGL/GLU/GLUT detection scripts + # https://github.com/umlaeute/Gem/pull/251 + (fetchpatch { + url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff"; + sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + file + pkg-config + ]; + + buildInputs = [ + puredata + libGL + libGLU + glew + freeglut + libv4l + libX11 + ]; + + meta = { + description = "Graphics Environment for Multimedia"; + homepage = "http://puredata.info/downloads/gem"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.raboof ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 078d5f6517d..e488bc760cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -991,6 +991,8 @@ in gams = callPackage ../tools/misc/gams (config.gams or {}); + gem = callPackage ../applications/audio/pd-plugins/gem { }; + git-fire = callPackage ../tools/misc/git-fire { }; git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; From 4d6c9d57345722b9faac3ec71999351ed662aae9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 09:15:00 +0000 Subject: [PATCH 208/214] flow: 0.128.0 -> 0.130.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ce60cf1392a..81618be7cf9 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.128.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1psplmqd1l6mxw0rbji2h73fvqhpp1zf9clzgc8khmkh0bbhc5ss"; + sha256 = "1wgf6dib6f1iwkndr2glq8zi2ssg7xvppkm9awic114i4pr88bfa"; }; installPhase = '' From cd9286194a5597e28b8bfb747418dd6af1567eb3 Mon Sep 17 00:00:00 2001 From: Kimat Boven Date: Sat, 1 Aug 2020 12:09:05 +0200 Subject: [PATCH 209/214] alacritty: 0.4.3 -> 0.5.0 --- pkgs/applications/misc/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index a1f45fc7ed1..72e00cb15a7 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "1b6fspcd8yn1857cgn1m8a828bvjspvrfc2giwsa9ai0ighcqbgl"; + sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2"; }; - cargoSha256 = "1zadnwjqk9kklj0p43azd78kgbva2zihh9wh81w4c5y0kypbchyd"; + cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria"; nativeBuildInputs = [ cmake From 4814236168bcc4fc9924465c53a96d1252ec7b6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:38:21 -0700 Subject: [PATCH 210/214] abcmidi: 2020.06.30 -> 2020.07.28 (#94349) --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 63ca4dc5e7c..f075f503ae5 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.06.30"; + version = "2020.07.28"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "0pdaf9y4ag2cdpygypf11aqa52hhj1y5f7gc8lv3aa1lplxyhi9m"; + sha256 = "05nsakvnx1jz2k9bvabpw5v3js28ng9z7n6ch58brd3qxc2p76zv"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 50fd1510b9aed53dd6cccca58353ccba6bdcec9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 13:29:55 +0000 Subject: [PATCH 211/214] jamulus: 3.5.8 -> 3.5.9 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 3984305f4bc..b8763f07b45 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0mkrlfaw85pxlacrxfhb45731i4jnn67v411lzx5kb42ncar1586"; + sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460"; }; nativeBuildInputs = [ pkg-config qmake ]; From 1353355a636d6bb2cff5d554a0c6e40861751182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 1 Aug 2020 16:27:12 +0200 Subject: [PATCH 212/214] ghc 8.8.4/8.10.1: fix PEBKAC --- pkgs/development/compilers/ghc/8.10.1.nix | 4 ++-- pkgs/development/compilers/ghc/8.8.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index bd7f17b53be..9da80fa5c20 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -68,6 +68,8 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC @@ -131,8 +133,6 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' - GhcLibWays = "v dyn" '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets '' + stdenv.lib.optionalString targetPlatform.isMusl '' diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 02f1f85839b..515ff2d646b 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -68,6 +68,8 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC @@ -131,8 +133,6 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' - GhcLibWays = "v dyn" '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets '' + stdenv.lib.optionalString targetPlatform.isMusl '' From 988b64e5e9cc9220ea2b15b2a47bf7585c2f8dbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 08:37:09 -0700 Subject: [PATCH 213/214] hashcat: 6.0.0 -> 6.1.1 (#94449) --- pkgs/tools/security/hashcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 2456f9ca18f..b156cda99ac 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "118jxk4xh55m1vhaz5h2j2385mp4p397m16g9hi4x2k0b8m0zrz8"; + sha256 = "104z63m7lqbb0sdrxhf9yi15l4a9zwf9m6zs9dbb3gf0nfxl1h9r"; }; nativeBuildInputs = [ makeWrapper ]; From 3541e8b4fbf01731580b2f26a3de41200213e6f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 25 Jul 2020 14:29:19 +0200 Subject: [PATCH 214/214] coqPackages.bignums: init at 8.12.0 for Coq 8.12 --- pkgs/development/coq-modules/bignums/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0e8cead0b31..88d7e461a31 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -25,6 +25,10 @@ let params = { rev = "V8.11.0"; sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp"; }; + "8.12" = { + rev = "V8.12.0"; + sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8"; + }; }; param = params.${coq.coq-version}; in