ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-03 11:07:44 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-05-09 11:12:29 +02:00
commit d7cca0f356
172 changed files with 5731 additions and 2970 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/haskell.section.md
View File

@ -103,8 +103,8 @@ command displays the complete list of available compilers:
$ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler
haskell.compiler.ghc8101 ghc-8.10.1
haskell.compiler.integer-simple.ghc8101 ghc-8.10.1
haskell.compiler.ghcHEAD ghc-8.11.20200403
haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403
haskell.compiler.ghcHEAD ghc-8.11.20200505
haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505
haskell.compiler.ghc822Binary ghc-8.2.2-binary
haskell.compiler.ghc844 ghc-8.4.4
haskell.compiler.ghc863Binary ghc-8.6.3-binary

24
maintainers/maintainer-list.nix
View File

@ -4019,12 +4019,6 @@
fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A";
}];
};
kjuvi = {
email = "quentin.vaucher@pm.me";
github = "kjuvi";
githubId = 17534323;
name = "Quentin Vaucher";
};
kkallio = {
email = "tierpluspluslists@gmail.com";
name = "Karn Kallio";
@ -7688,12 +7682,24 @@
githubId = 7709;
name = "Thomaz Leite";
};
thomasdesr = {
email = "git@hive.pw";
github = "thomasdesr";
githubId = 681004;
name = "Thomas Desrosiers";
};
ThomasMader = {
email = "thomas.mader@gmail.com";
github = "ThomasMader";
githubId = 678511;
name = "Thomas Mader";
};
thomasjm = {
email = "tom@codedown.io";
github = "thomasjm";
githubId = 1634990;
name = "Tom McLaughlin";
};
thoughtpolice = {
email = "aseipp@pobox.com";
github = "thoughtpolice";
@ -8349,6 +8355,12 @@
githubId = 1297598;
name = "Konrad Borowski";
};
xiorcale = {
email = "quentin.vaucher@pm.me";
github = "xiorcale";
githubId = 17534323;
name = "Quentin Vaucher";
};
xnaveira = {
email = "xnaveira@gmail.com";
github = "xnaveira";

135
nixos/lib/test-driver/log2html.xsl
View File

@ -1,135 +0,0 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method='html' encoding="UTF-8"
doctype-public="-//W3C//DTD HTML 4.01//EN"
doctype-system="http://www.w3.org/TR/html4/strict.dtd" />
<xsl:template match="logfile">
<html>
<head>
<script type="text/javascript" src="jquery.min.js"></script>
<script type="text/javascript" src="jquery-ui.min.js"></script>
<script type="text/javascript" src="treebits.js" />
<link rel="stylesheet" href="logfile.css" type="text/css" />
<title>Log File</title>
</head>
<body>
<h1>VM build log</h1>
<p>
<a href="javascript:" class="logTreeExpandAll">Expand all</a> |
<a href="javascript:" class="logTreeCollapseAll">Collapse all</a>
</p>
<ul class='toplevel'>
<xsl:for-each select='line|nest'>
<li>
<xsl:apply-templates select='.'/>
</li>
</xsl:for-each>
</ul>
<xsl:if test=".//*[@image]">
<h1>Screenshots</h1>
<ul class="vmScreenshots">
<xsl:for-each select='.//*[@image]'>
<li><a href="{@image}"><xsl:value-of select="@image" /></a></li>
</xsl:for-each>
</ul>
</xsl:if>
</body>
</html>
</xsl:template>
<xsl:template match="nest">
<!-- The tree should be collapsed by default if all children are
unimportant or if the header is unimportant. -->
<xsl:variable name="collapsed" select="not(./head[@expanded]) and count(.//*[@error]) = 0"/>
<xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
<xsl:if test="line|nest">
<a href="javascript:" class="logTreeToggle">
<xsl:choose>
<xsl:when test="$collapsed"><xsl:text>+</xsl:text></xsl:when>
<xsl:otherwise><xsl:text>-</xsl:text></xsl:otherwise>
</xsl:choose>
</a>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:apply-templates select='head'/>
<!-- Be careful to only generate <ul>s if there are <li>s, otherwise it’s malformed. -->
<xsl:if test="line|nest">
<ul class='nesting' style="{$style}">
<xsl:for-each select='line|nest'>
<!-- Is this the last line? If so, mark it as such so that it
can be rendered differently. -->
<xsl:variable name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
<li class='{$class}'>
<span class='lineconn' />
<span class='linebody'>
<xsl:apply-templates select='.'/>
</span>
</li>
</xsl:for-each>
</ul>
</xsl:if>
</xsl:template>
<xsl:template match="head|line">
<code>
<xsl:if test="@error">
<xsl:attribute name="class">errorLine</xsl:attribute>
</xsl:if>
<xsl:if test="@warning">
<xsl:attribute name="class">warningLine</xsl:attribute>
</xsl:if>
<xsl:if test="@priority = 3">
<xsl:attribute name="class">prio3</xsl:attribute>
</xsl:if>
<xsl:if test="@type = 'serial'">
<xsl:attribute name="class">serial</xsl:attribute>
</xsl:if>
<xsl:if test="@machine">
<xsl:choose>
<xsl:when test="@type = 'serial'">
<span class="machine"><xsl:value-of select="@machine"/># </span>
</xsl:when>
<xsl:otherwise>
<span class="machine"><xsl:value-of select="@machine"/>: </span>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
<xsl:choose>
<xsl:when test="@image">
<a href="{@image}"><xsl:apply-templates/></a>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates/>
</xsl:otherwise>
</xsl:choose>
</code>
</xsl:template>
<xsl:template match="storeref">
<em class='storeref'>
<span class='popup'><xsl:apply-templates/></span>
<span class='elided'>/...</span><xsl:apply-templates select='name'/><xsl:apply-templates select='path'/>
</em>
</xsl:template>
</xsl:stylesheet>

129
nixos/lib/test-driver/logfile.css
View File

@ -1,129 +0,0 @@
body {
font-family: sans-serif;
background: white;
}
h1
{
color: #005aa0;
font-size: 180%;
}
a {
text-decoration: none;
}
ul.nesting, ul.toplevel {
padding: 0;
margin: 0;
}
ul.toplevel {
list-style-type: none;
}
.line, .head {
padding-top: 0em;
}
ul.nesting li.line, ul.nesting li.lastline {
position: relative;
list-style-type: none;
}
ul.nesting li.line {
padding-left: 2.0em;
}
ul.nesting li.lastline {
padding-left: 2.1em; /* for the 0.1em border-left in .lastline > .lineconn */
}
li.line {
border-left: 0.1em solid #6185a0;
}
li.line > span.lineconn, li.lastline > span.lineconn {
position: absolute;
height: 0.65em;
left: 0em;
width: 1.5em;
border-bottom: 0.1em solid #6185a0;
}
li.lastline > span.lineconn {
border-left: 0.1em solid #6185a0;
}
em.storeref {
color: #500000;
position: relative;
width: 100%;
}
em.storeref:hover {
background-color: #eeeeee;
}
*.popup {
display: none;
/* background: url('http://losser.st-lab.cs.uu.nl/~mbravenb/menuback.png') repeat; */
background: #ffffcd;
border: solid #555555 1px;
position: absolute;
top: 0em;
left: 0em;
margin: 0;
padding: 0;
z-index: 100;
}
em.storeref:hover span.popup {
display: inline;
width: 40em;
}
.logTreeToggle {
text-decoration: none;
font-family: monospace;
font-size: larger;
}
.errorLine {
color: #ff0000;
font-weight: bold;
}
.warningLine {
color: darkorange;
font-weight: bold;
}
.prio3 {
font-style: italic;
}
code {
white-space: pre-wrap;
}
.serial {
color: #56115c;
}
.machine {
color: #002399;
font-style: italic;
}
ul.vmScreenshots {
padding-left: 1em;
}
ul.vmScreenshots li {
font-family: monospace;
list-style: square;
}

30
nixos/lib/test-driver/treebits.js
View File

@ -1,30 +0,0 @@
$(document).ready(function() {
/* When a toggle is clicked, show or hide the subtree. */
$(".logTreeToggle").click(function() {
if ($(this).siblings("ul:hidden").length != 0) {
$(this).siblings("ul").show();
$(this).text("-");
} else {
$(this).siblings("ul").hide();
$(this).text("+");
}
});
/* Implementation of the expand all link. */
$(".logTreeExpandAll").click(function() {
$(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() {
$(this).siblings("ul").show();
$(this).text("-");
});
});
/* Implementation of the collapse all link. */
$(".logTreeCollapseAll").click(function() {
$(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() {
$(this).siblings("ul").hide();
$(this).text("+");
});
});
});

18
nixos/lib/testing-python.nix
View File

@ -62,25 +62,11 @@ in rec {
requiredSystemFeatures = [ "kvm" "nixos-test" ];
buildInputs = [ libxslt ];
buildCommand =
''
mkdir -p $out/nix-support
mkdir -p $out
LOGFILE=$out/log.xml tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
# Generate a pretty-printed log.
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
ln -s ${./test-driver/logfile.css} $out/logfile.css
ln -s ${./test-driver/treebits.js} $out/treebits.js
ln -s ${jquery}/js/jquery.min.js $out/
ln -s ${jquery}/js/jquery.js $out/
ln -s ${jquery-ui}/js/jquery-ui.min.js $out/
ln -s ${jquery-ui}/js/jquery-ui.js $out/
touch $out/nix-support/hydra-build-products
echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
for i in */xchg/coverage-data; do
mkdir -p $out/coverage-data

16
nixos/lib/testing.nix
View File

@ -58,23 +58,11 @@ in rec {
requiredSystemFeatures = [ "kvm" "nixos-test" ];
buildInputs = [ libxslt ];
buildCommand =
''
mkdir -p $out/nix-support
mkdir -p $out
LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
# Generate a pretty-printed log.
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
ln -s ${./test-driver/logfile.css} $out/logfile.css
ln -s ${./test-driver/treebits.js} $out/treebits.js
ln -s ${jquery}/js/jquery.min.js $out/
ln -s ${jquery-ui}/js/jquery-ui.min.js $out/
touch $out/nix-support/hydra-build-products
echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
for i in */xchg/coverage-data; do
mkdir -p $out/coverage-data

5
nixos/modules/installer/tools/nixos-install.sh
View File

@ -87,8 +87,11 @@ if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then
fi
# A place to drop temporary stuff.
tmpdir="$(mktemp -d -p $mountPoint)"
trap "rm -rf $tmpdir" EXIT
tmpdir="$(mktemp -d)"
# store temporary files on target filesystem by default
export TMPDIR=${TMPDIR:-$tmpdir}
sub="auto?trusted=1"

2
nixos/modules/services/mail/dovecot.nix
View File

@ -407,7 +407,7 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
restartTriggers = [ cfg.configFile ];
restartTriggers = [ cfg.configFile modulesDir ];
serviceConfig = {
ExecStart = "${dovecotPkg}/sbin/dovecot -F";

4
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -37,9 +37,7 @@ let
baseService = recursiveUpdate commonEnv {
wants = [ "ipfs-init.service" ];
# NB: migration must be performed prior to pre-start, else we get the failure message!
preStart = ''
ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
'' + optionalString cfg.autoMount ''
preStart = optionalString cfg.autoMount ''
ipfs --local config Mounts.FuseAllowOther --json true
ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}

4
nixos/modules/services/web-apps/dokuwiki.nix
View File

@ -188,7 +188,7 @@ let
name = "icalevents";
# Download the plugin from the dokuwiki site
src = pkgs.fetchurl {
url = https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip;
url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip";
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
};
sourceRoot = ".";
@ -216,7 +216,7 @@ let
name = "bootstrap3";
# Download the theme from the dokuwiki site
src = pkgs.fetchurl {
url = https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip;
url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip";
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package

1
nixos/tests/all-tests.nix
View File

@ -143,6 +143,7 @@ in
initrdNetwork = handleTest ./initrd-network.nix {};
installer = handleTest ./installer.nix {};
iodine = handleTest ./iodine.nix {};
ipfs = handleTest ./ipfs.nix {};
ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {};

4
nixos/tests/dokuwiki.nix
View File

@ -5,7 +5,7 @@ let
name = "bootstrap3";
# Download the theme from the dokuwiki site
src = pkgs.fetchurl {
url = https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip;
url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip";
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
@ -20,7 +20,7 @@ let
name = "icalevents";
# Download the plugin from the dokuwiki site
src = pkgs.fetchurl {
url = https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip;
url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip";
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
};
# We need unzip to build this package

58
nixos/tests/ipfs.nix
View File

@ -1,55 +1,25 @@
import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "ipfs";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mguentner ];
};
nodes = {
adder =
{ ... }:
{
services.ipfs = {
enable = true;
defaultMode = "norouting";
gatewayAddress = "/ip4/127.0.0.1/tcp/2323";
apiAddress = "/ip4/127.0.0.1/tcp/2324";
};
networking.firewall.allowedTCPPorts = [ 4001 ];
};
getter =
{ ... }:
{
services.ipfs = {
enable = true;
defaultMode = "norouting";
autoMount = true;
};
networking.firewall.allowedTCPPorts = [ 4001 ];
};
nodes.machine = { ... }: {
services.ipfs = {
enable = true;
apiAddress = "/ip4/127.0.0.1/tcp/2324";
};
};
testScript = ''
startAll;
$adder->waitForUnit("ipfs-norouting");
$getter->waitForUnit("ipfs-norouting");
start_all()
machine.wait_for_unit("ipfs")
# wait until api is available
$adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id");
my $addrId = $adder->succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id -f=\"<id>\"");
my $addrIp = (split /[ \/]+/, $adder->succeed("ip -o -4 addr show dev eth1"))[3];
machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id")
ipfs_hash = machine.succeed(
"echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'"
)
$adder->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.Gateway | grep /ip4/127.0.0.1/tcp/2323)\" ]");
# wait until api is available
$getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
chomp($ipfsHash);
$adder->mustSucceed("[ -n \"\$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)\" ]");
$getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");
$getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");
$getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");
'';
machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
'';
})

2
nixos/tests/prometheus.nix
View File

@ -179,7 +179,7 @@ in import ./make-test-python.nix {
s3.succeed(
"mc config host add minio "
+ "http://localhost:${toString minioPort} "
+ "${s3.accessKey} ${s3.secretKey} S3v4",
+ "${s3.accessKey} ${s3.secretKey} --api s3v4",
"mc mb minio/thanos-bucket",
)

4
pkgs/applications/audio/freewheeling/default.nix
View File

@ -8,13 +8,13 @@ in
stdenv.mkDerivation rec {
pname = "freewheeling";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "free-wheeling";
repo = "freewheeling";
rev = "v${version}";
sha256 = "1gjii2kndffj9iqici4vb9zrkrdqj1hs9q43x7jv48wv9872z78r";
sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4";
};
nativeBuildInputs = [ pkgconfig autoreconfHook libtool ];

4
pkgs/applications/audio/mup/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "mup";
version = "6.7";
version = "6.8";
src = fetchurl {
url = "http://www.arkkra.com/ftp/pub/unix/mup${builtins.replaceStrings ["."] [""] version}src.tar.gz";
sha256 = "1y1qknhib1isdjsbv833w3nxzyfljkfgp1gmjwly60l55q60frpk";
sha256 = "06bv5nyl8rcibyb83zzrfdq6x6f93g3rgnv47i5gsjcaw5w6l31y";
};
nativeBuildInputs = [ autoreconfHook bison flex ghostscript groff netpbm ];

4
pkgs/applications/audio/padthv1/default.nix
View File

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "padthv1";
version = "0.9.13";
version = "0.9.14";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
sha256 = "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz";
sha256 = "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

4
pkgs/applications/audio/picard/default.nix
View File

@ -12,13 +12,13 @@ let
;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj";
sha256 = "sha256-rJbpoPjNMlw4diWjwNQ/DPo3rltvISU4kuRqBbvlBZ0=";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

2
pkgs/applications/editors/emacs-modes/emacspeak/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = https://github.com/tvraman/emacspeak/;
homepage = "https://github.com/tvraman/emacspeak/";
description = "Emacs extension that provides spoken output";
license = licenses.gpl2;
maintainers = [ dema ];

2
pkgs/applications/editors/emacs/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
./tramp-detect-wrapped-gvfsd.patch
# unbreak macOS unexec
(fetchpatch {
url = https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch;
url = "https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch";
sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw";
})
];

44
pkgs/applications/editors/jetbrains/default.nix
View File

@ -250,12 +250,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "18mbw72vgrzkvjykc23h17qxrxfvhjzhy9rxpi2asw196qalavzp"; /* updated by script */
sha256 = "0136hmknkxrsgbygxqzrq1836kg02p14hmv5mzbpp79yglhv2xml"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -263,12 +263,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "1z3asz9fp3xnmbhngar60g8rba83kx987ar67j5m8ws7cijqlzix"; /* updated by script */
sha256 = "0ivnicpn67mfyhmiwbx80pq5l2xa4g1cpp79mh7rgm2c5klmf201"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@ -276,12 +276,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.2"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "1qlpx3vfqwpyyxjsknhxvbdhyciwihhl0hkinrpdky6bza1yfgf6"; /* updated by script */
sha256 = "0v6vi6m94fwzsg5s357ymh8604zkv6q0zhyqfh9sj4ynzi7l4fyv"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@ -289,12 +289,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1rgqr7fn1sy0zbkfmrw3ll8jps345br3y4aqhynyr48mxiwi4c7s"; /* updated by script */
sha256 = "0q848swfg9mjiini5bbjdj1f0qpd1n4glxdpncjj7mbpvp7s2h5k"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@ -302,12 +302,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "0lrimmczl49azwsms56l4dg7himzr991a209r921jxa32rdjfq6x"; /* updated by script */
sha256 = "13khjc7fp28mpcdn74msdw57nzhicg32xrrvj7s7na2qd9gqz0hf"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@ -315,12 +315,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "1yvqljjv6004kw2nkpddrsgnigb56rapgs3f1pcvl20h6hj08qj8"; /* updated by script */
sha256 = "16gclbczd9czqhply0xb2ykv0bw4bgv85fihy1n2szc4rp643qdw"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@ -328,12 +328,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1ld9hh9bxirsv5rwrx7wbmfaxwvxfw7cjfjqi8l0q0n93v89z90s"; /* updated by script */
sha256 = "0p2q01yragab7c15aicpmaby075y7mpf6iavdfipi033q4gnlnki"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@ -341,12 +341,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1swd2qfhsa6i1aq7z2s183d0hif2gmk1kkw9ns4aybny0wvvnqw2"; /* updated by script */
sha256 = "1lq97aqnibvg483ww7wi8slh302gydd2kdkw6p2516rjcmm6n324"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@ -354,12 +354,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
version = "2020.1.0"; /* updated by script */
version = "2020.1.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "1allpdr7k48nvl8vbvzyn6h81jpklzaqdqivrqqyh8hy9l98w4ws"; /* updated by script */
sha256 = "0flwq61p7827f8nmldqgfpxbfl422imclksw6w97mgzqqhcbgksd"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@ -367,12 +367,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "1hk6k4f24infw9qj9mxp305nl0bxif6ymdsqg005pskvnyi8v5fi"; /* updated by script */
sha256 = "0xhx3n2xdk0k0qx7hdiyfga16hjf2j95k219wh7mh0cys20hkrg8"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@ -380,12 +380,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2020.1"; /* updated by script */
version = "2020.1.1"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "1c68li5jxsjml0macdb0s04llwwq1hni5z8vq2zdfcn5zm3xwpif"; /* updated by script */
sha256 = "0d543g06bxpw4q2p19vmvrxpbhqsvspjbs3sqnw6hxni7wcflhkg"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";

4
pkgs/applications/editors/quilter/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
version = "2.2.2";
version = "2.2.4";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1bgsbcx09ca063kdqfc7nigly99d7xgx2cbkpk1nkhr0hvkyg9l9";
sha256 = "0xmnfqqdn7p84aksb8yzs14ikgy5driylr6m4p5ffsb6i9aa0i9h";
};
nativeBuildInputs = [

42
pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch
View File

@ -1,42 +0,0 @@
# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447
# from upstream hg repository:
RegisterPNGImage(): Pass correct size value to strlcat().
diff -r 95c4711e8bee -r f30492f40f78 coders/png.c
--- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500
+++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500
@@ -6427,26 +6427,26 @@
*version='\0';
#if defined(PNG_LIBPNG_VER_STRING)
- (void) strlcat(version,"libpng ",MaxTextExtent);
- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent);
+ (void) strlcat(version,"libpng ",sizeof(version));
+ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version));
#if (PNG_LIBPNG_VER > 10005)
if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0)
{
- (void) strlcat(version,",",MaxTextExtent);
- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent);
+ (void) strlcat(version,",",sizeof(version));
+ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version));
}
#endif
#endif
#if defined(ZLIB_VERSION)
if (*version != '\0')
- (void) strlcat(version,", ",MaxTextExtent);
- (void) strlcat(version,"zlib ",MaxTextExtent);
- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent);
+ (void) strlcat(version,", ",sizeof(version));
+ (void) strlcat(version,"zlib ",sizeof(version));
+ (void) strlcat(version,ZLIB_VERSION,sizeof(version));
if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0)
{
- (void) strlcat(version,",",MaxTextExtent);
- (void) strlcat(version,zlib_version,MaxTextExtent);
+ (void) strlcat(version,",",sizeof(version));
+ (void) strlcat(version,zlib_version,sizeof(version));
}
#endif

5
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@ -4,16 +4,15 @@
stdenv.mkDerivation rec {
pname = "graphicsmagick";
version = "1.3.32";
version = "1.3.35";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq";
sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq";
};
patches = [
./disable-popen.patch
./1.3.32-darwin-png-strlcat-fix.patch
];
configureFlags = [

4
pkgs/applications/graphics/krita/default.nix
View File

@ -10,11 +10,11 @@
mkDerivation rec {
pname = "krita";
version = "4.2.7.1";
version = "4.2.9";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "1sx4j4brk71bas3cpqzk4bd8bknyl3x4fdg5pv4r7pcfd3vpq2vy";
sha256 = "0rvm9mpaq66lxyq4f09x9w6xxhgys0phza223hm5zv6kgn413xsf";
};
# *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359

14
pkgs/applications/graphics/qimgv/default.nix
View File

@ -16,25 +16,15 @@
mkDerivation rec {
pname = "qimgv";
version = "0.9";
version = "0.9.1";
src = fetchFromGitHub {
owner = "easymodo";
repo = pname;
rev = "v${version}";
sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl";
sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac";
};
patches = [
# QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only
# has Qt 5.12. This appears to be the only instance of Qt 5.12
# incompatibility, and will be fixed in the next release.
(fetchpatch {
url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch";
sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s";
})
];
nativeBuildInputs = [
cmake
pkgconfig

2
pkgs/applications/misc/appeditor/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Edit the Pantheon desktop application menu";
homepage = "https://github.com/donadigo/appeditor";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

2
pkgs/applications/misc/cipher/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple application for encoding and decoding text, designed for elementary OS";
homepage = "https://github.com/arshubham/cipher";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3Plus;
};

2
pkgs/applications/misc/formatter/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple formatter designed for elementary OS";
homepage = "https://github.com/Djaler/Formatter";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.lgpl2Plus;
};

66
pkgs/applications/misc/josm/default.nix
View File

@ -1,46 +1,50 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:
stdenv.mkDerivation rec {
{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
let
pname = "josm";
version = "16239";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
sha256 = "1nlw1rvwdfp1hhsxyjli8pylm0hb7k62sa0nqvgyiw54dz78n00c";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "1qqk4bal84wnb66jym6qrdi10ypzvdzihd4jk5rnyfl3wm5qafbi";
};
};
in
stdenv.mkDerivation {
inherit pname version;
buildInputs = [ jdk11 makeWrapper ];
dontUnpack = true;
desktopItem = makeDesktopItem {
name = "josm";
exec = "josm";
icon = "josm";
desktopName = "JOSM";
genericName = "OpenStreetMap Editor";
comment = meta.description;
categories = "Education;Geoscience;Maps;";
};
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
buildCommand = ''
mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/josm.jar
installPhase =
if stdenv.isDarwin then ''
mkdir -p $out/Applications
${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications
'' else ''
install -Dm644 ${srcs.jar} $out/share/josm/josm.jar
cp -R ${srcs.pkg}/usr/share $out
makeWrapper ${jdk11}/bin/java $out/bin/josm \
--add-flags "-jar $out/share/java/josm.jar" \
--prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications
mkdir -p $out/share/pixmaps
${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png
'';
# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
makeWrapper ${jre}/bin/java $out/bin/josm \
--add-flags "-Djosm.restart=true -Djava.net.useSystemProxies=true" \
--add-flags "-jar $out/share/josm/josm.jar" \
--prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
'';
meta = with stdenv.lib; {
description = "An extensible editor for OpenStreetMap";
homepage = "https://josm.openstreetmap.de/";
license = licenses.gpl2Plus;
maintainers = [ maintainers.rycee ];
maintainers = with maintainers; [ rycee sikmir ];
platforms = platforms.all;
};
}

6
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -45,11 +45,11 @@ let
inherit (python2.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "8.0.19";
version = "8.0.20";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw=";
sha256 = "0c0ig2fqfpli7fwb4v4iwvfh4szzj3grx8j9rbh40kllkc8v5qh6";
};
patches = [
@ -142,7 +142,7 @@ in stdenv.mkDerivation rec {
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
"-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
"-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}"
# mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8.
# mysql-workbench 8.0.20 depends on libmysqlconnectorcpp 1.1.8.
# Newer versions of connector still provide the legacy library when enabled
# but the headers are in a different location.
"-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"

20
pkgs/applications/misc/pueue/default.nix
View File

@ -1,19 +1,29 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "pueue";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
sha256 = "1v3fphx71hyv7fq09slhyzchw362swzhmhn7wmbazfdrj6fjhcki";
sha256 = "050cx9ncs1hfb14llly0wm3h5s4377s3sinmkjc52xm2z2gc7m5f";
};
cargoSha256 = "04vi9la17pabz1spfw1fzgy4c2ifnis6am5m4ck3lhccnn6j8bd3";
cargoSha256 = "1hw0y6c1ypp470cca3yw6fc7xvligy3av8hsa9bhdm5can46hyzi";
checkPhase = "cargo test -- --skip test_single_huge_payload";
nativeBuildInputs = [ installShellFiles ];
checkFlagsArray = [ "--skip=test_single_huge_payload" ];
postInstall = ''
# zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57
for shell in bash fish; do
$out/bin/pueue completions $shell .
installShellCompletion pueue.$shell
done
'';
meta = with lib; {
description = "A daemon for managing long running shell commands";

4
pkgs/applications/misc/tut/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "tut";
version = "0.0.7";
version = "0.0.8";
goPackagePath = "github.com/RasmusLindroth/tut";
goDeps = ./deps.nix;
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "1v1cvdsrxz1yj2vibx3iapw17ngfihjkr62zhxsn1msb77xyd7lb";
sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3";
};
meta = with stdenv.lib; {

2
pkgs/applications/networking/browsers/ephemeral/default.nix
View File

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The always-incognito web browser";
homepage = "https://github.com/cassidyjames/ephemeral";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

2
pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix
View File

@ -76,7 +76,7 @@ mkChromiumDerivation (base: rec {
the web. It has a minimalist user interface and provides the vast majority
of source code for Google Chrome (which has some additional features).
'';
homepage = https://github.com/Eloston/ungoogled-chromium;
homepage = "https://github.com/Eloston/ungoogled-chromium";
maintainers = with maintainers; [ squalus ];
# Overview of the maintainer roles:
# nixos-unstable:

6
pkgs/applications/networking/cloudflared/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloudflared";
version = "2020.2.1";
version = "2020.3.2";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "1wyvf4bilhiwabqgdwmnhifwc845m4g17pz7xmndzvqwmfd7riw5";
sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404";
};
modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p";
modSha256 = "1mnfp8nhbllv8msglci1hq4026rqsc1yibrh2xnwwbf2f3yqx8h0";
buildFlagsArray = "-ldflags=-X main.Version=${version}";

62
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -1,6 +1,22 @@
{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils
, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig
, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip
{ stdenv
, lib
, makeWrapper
, socat
, iptables
, iproute
, bridge-utils
, conntrack-tools
, buildGoPackage
, git
, runc
, libseccomp
, pkgconfig
, ethtool
, utillinux
, ipset
, fetchFromGitHub
, fetchurl
, fetchzip
, fetchgit
}:
@ -47,7 +63,7 @@ let
# Note: marked as apache 2.0 license
url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
sha256 = "12xafn5jivl8lqdcs25b28xrc4mf7yf1xif5np169nvvxgvmpdxp";
stripRoot=false;
stripRoot = false;
};
k3sPlugins = buildGoPackage rec {
name = "k3s-cni-plugins";
@ -153,6 +169,12 @@ let
nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ k3sBuildStage1 k3sPlugins runc ];
# k3s appends a suffix to the final distribution binary for some arches
archSuffix =
if stdenv.hostPlatform.system == "x86_64-linux" then ""
else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64"
else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet.";
# In order to build the thick k3s binary (which is what
# ./scripts/package-cli does), we need to get all the binaries that script
# expects in place.
@ -182,7 +204,7 @@ let
pushd go/src/${goPackagePath}
mkdir -p "$out/bin"
install -m 0755 -t "$out/bin" ./dist/artifacts/k3s
install -m 0755 -T ./dist/artifacts/k3s${archSuffix} "$out/bin/k3s"
popd
'';
@ -202,12 +224,20 @@ stdenv.mkDerivation rec {
# Important utilities used by the kubelet, see
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
# Note the list in that issue is stale and some aren't relevant for k3s.
k3sRuntimeDeps = [
socat iptables iproute bridge-utils ethtool utillinux ipset conntrack-tools
k3sRuntimeDeps = [
socat
iptables
iproute
bridge-utils
ethtool
utillinux
ipset
conntrack-tools
];
buildInputs = [
k3sBuild makeWrapper
buildInputs = [
k3sBuild
makeWrapper
] ++ k3sRuntimeDeps;
unpackPhase = "true";
@ -225,11 +255,11 @@ stdenv.mkDerivation rec {
--prefix PATH : "$out/bin"
'';
meta = {
description = "A lightweight Kubernetes distribution.";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
meta = {
description = "A lightweight Kubernetes distribution.";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
}

11
pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch
View File

@ -55,10 +55,17 @@ index 72d3c07ece..3e5455b262 100755
echo Building containerd-shim
make -C ./vendor/github.com/containerd/containerd bin/containerd-shim
diff --git a/scripts/package-cli b/scripts/package-cli
index 4c66ce32df..6d1e0c03cb 100755
index 4c66ce32df..280b428bb8 100755
--- a/scripts/package-cli
+++ b/scripts/package-cli
@@ -55,10 +55,10 @@ LDFLAGS="
@@ -49,16 +49,16 @@ fi
CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
-go generate
+CGO_ENABLED=0 env -u GOARCH go generate
LDFLAGS="
-X github.com/rancher/k3s/pkg/version.Version=$VERSION
-X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8}
-w -s
"

2
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
comment = "VoIP and Instant Messaging client";
desktopName = "Jitsi";
genericName = "Instant Messaging";
categories = "Application;Internet;";
categories = "Application;X-Internet;";
};
libPath = lib.makeLibraryPath ([

22
pkgs/applications/networking/ipfs-migrator/default.nix
View File

@ -1,24 +1,22 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage {
buildGoModule rec {
pname = "ipfs-migrator";
version = "7";
goPackagePath = "github.com/ipfs/fs-repo-migrations";
goDeps = ./deps.nix;
version = "1.5.1";
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
rev = "4e8e0b41d7348646c719d572c678c3d0677e541a";
sha256 = "1i6izncgc3wgabppglnnrslffvwrv3cazbdhsk4vjfsd66hb4d37";
rev = "v${version}";
sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm";
};
patches = [ ./lru-repo-path-fix.patch ];
modSha256 = "1magqgbb6prnihr8lr6jc2fcgsbqqc9y317mkdnvq9qs6bj0a6qj";
meta = with stdenv.lib; {
description = "Migration tool for ipfs repositories";
subPackages = [ "." ];
meta = with lib; {
description = "Migrations for the filesystem repository of ipfs clients";
homepage = "https://ipfs.io/";
license = licenses.mit;
platforms = platforms.unix;

47
pkgs/applications/networking/ipfs-migrator/deps.nix generated
View File

@ -1,47 +0,0 @@
[
{
goPackagePath = "github.com/jbenet/goprocess";
fetch = {
type = "git";
url = "https://github.com/jbenet/goprocess";
rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";
sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
};
}
{
goPackagePath = "github.com/jbenet/go-random";
fetch = {
type = "git";
url = "https://github.com/jbenet/go-random";
rev = "384f606e91f542a98e779e652eed88051618f0f7";
sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa";
};
}
{
goPackagePath = "github.com/jbenet/go-random-files";
fetch = {
type = "git";
url = "https://github.com/jbenet/go-random-files";
rev = "737479700b40b4b50e914e963ce8d9d44603e3c8";
sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw";
};
}
{
goPackagePath = "github.com/hashicorp/golang-lru";
fetch = {
type = "git";
url = "https://github.com/hashicorp/golang-lru";
rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768";
sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2";
sha256 = "17bqkd64zksi1578lb10ls4qf5lbqs7shfjcc6bi97y1qz5k31c4";
};
}
]

13
pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch
View File

@ -1,13 +0,0 @@
diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go
index 7eb18eb..cd8dcb7 100644
--- a/ipfs-1-to-2/go-datastore/lru/datastore.go
+++ b/ipfs-1-to-2/go-datastore/lru/datastore.go
@@ -3,7 +3,7 @@ package lru
import (
"errors"
- lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru"
+ lru "github.com/hashicorp/golang-lru"
ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore"
dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query"

15
pkgs/applications/networking/ipfs/default.nix
View File

@ -1,22 +1,29 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "ipfs";
version = "0.4.23";
version = "0.5.0";
rev = "v${version}";
src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm";
sha256 = "0dbyvs49wyqj46c8hvz0fr4vpgfrdj1h8blniwzjf0jabgvw8nik";
};
postPatch = ''
rm -rf test/dependencies
patchShebangs plugin/loader/preload.sh
'';
modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
buildPhase = ''
make install
'';
passthru.tests.ipfs = nixosTests.ipfs;
modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";

4
pkgs/applications/networking/maestral/default.nix
View File

@ -8,7 +8,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral${lib.optionalString withGui "-gui"}";
version = "0.6.3";
version = "0.6.4";
disabled = python3.pkgs.pythonOlder "3.6";
@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "SamSchott";
repo = "maestral-dropbox";
rev = "v${version}";
sha256 = "0h1vbx00mps2msdhsab1yz64c8sprwrg38nkqyj86mkb6jkirq92";
sha256 = "06psbjd205qj6vx7k7ywhclz1bs5zp43xnf275hf0k80h3b064sn";
};
propagatedBuildInputs = with python3.pkgs; [

490
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
View File

@ -1,615 +1,615 @@
{
version = "68.7.0";
version = "68.8.0";
sources = [
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ar/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ar/thunderbird-68.8.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
sha512 = "549c2fde5a7da05f1d0da28e6e203fffef5cc7d39073baef204da5ce221fdb12da53da64b29dc84cf4518eaee7394db71cee6e22611d5d86938df1b9b3bf8e0b";
sha512 = "a45860fc124ef1c3ce15b1c91ab1d920beff2d6f886a646b6162bc5687e8910d559de6d616a36e7bdbd99fe18aa39720b44fcd4fe14e6d5fd4872750f209a740";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ast/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ast/thunderbird-68.8.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
sha512 = "92fa156e6dd72d9c0a6b0b6889e7486d97922cad3d8c8a4e572b048ff5694cd4fcd7f7f91eff718417760b72a50d045e5508befb8404f9343ec73633c8c43040";
sha512 = "21e025c3e28b46e1d6af0fa10f3ab5b6b86543bb422c2b3d4928ae733cf3387ab092a20af15f05bdcebf0108c376973982d099371a4b2c2f9a892defe144e160";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/be/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/be/thunderbird-68.8.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
sha512 = "1ddce136d33b7eb6065cc1fa02f3e167b76a546308a19edf51f1102e569b259cb2bbd98d720050d48669ae04610cde6c09400ae6a9f467d611f3a5d332dcf203";
sha512 = "5cb35465afbf6ba68aab98197ab6997e925d5e34db6deaf3b047fb679f32372e0524ac03d7988898f34c493349283088a3b4c0cfff679774760916673e49b757";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/bg/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/bg/thunderbird-68.8.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
sha512 = "31aeab60348dcb199e3fee7c167eccb8e02e98a62c0a30ad48d2963fda56a1cf25ff71eb9f16bc186db481fa90d795191c6aa29eef33742adab6e2df0c2e5282";
sha512 = "a06dea6a215003ef5663cea4928cf201ee71cd021565f3a2f9317f21679047adc7f6c87427d65c4f919facb30e8dfaf941e308173f23c6c0b3e92606fa0220b8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/br/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/br/thunderbird-68.8.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
sha512 = "f1555dbb5e30ad7d9d7468473f042424e9abd159a85325af55fdda74963c54e780f76093d15a2fc23a555b22896c6a76ad4c449846611222b63d13745cb577b7";
sha512 = "194f7332e6c67dea103bae4001b555296b2a64259060bb63329aee95f774e4f3f82c9bf133a456989b43f05682eba7e73e16235f1530012aeb7cf323bc16a381";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ca/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ca/thunderbird-68.8.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
sha512 = "44e0a8cb1feda921b6a3afb6ef0f72d2ad3aaf681f908673c015ef43a660914df5a8b61a6d987c3ddb0b6abc6cd778e0ddb07c56c737a74848942e26d4ee45a2";
sha512 = "99952f59100fe127fb274df641e02185a9416c315d5b023e990ca39fe6edb014a2e6e8ae702cce4d3133635a4c8488c42a72a6b3111147fc19dafeacae396943";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cak/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cak/thunderbird-68.8.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
sha512 = "e907643f6c7065117fd131d24b452734c229fad3bace6d445de15757ffbed875fdc69dcfc535cbe7b00b38df30c0b69b378b50560382e57fabff166c71d7ea33";
sha512 = "9e4d9dd67fa7480c2897175d08ed250a14bb2595c9a69f74db7b7723d08e6218021a0916d637bb682f7e0e3e316cafcfe9a09408e5cced018616c00a752ccb0a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cs/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cs/thunderbird-68.8.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
sha512 = "1b65fe735bb61d2dbcd2d23ede39e7770a66feb6f898ec31cb7c198fdf95796d4f42876730fdb993767026c4c315a9be9cb53229cc21a5328ff443bc463ca4c3";
sha512 = "53d653b9eda30f7b5ce75ebd31a2bb9e5bde683ca65549cb5d67ed4173eb4f44524f2bd148a0b41368e183b2ec513b7b7c698fcdeb2679ffd6391f133db2a0c6";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cy/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cy/thunderbird-68.8.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
sha512 = "77a3beb1ce6e78fb1d5138a7f0021462efb96e7f1d13cae2213670016a4a89dbd4a46bbe0e588ad15957ec71d053643cbd01033d9cdcc4e91b9e0303726abc27";
sha512 = "ba01e95181c8b0e04989681cffacbc48a57a7861ce7f60377e219823fc5c70096bdf4f0a38401a35fd442e28c62b0bbb38328e62800db82ea7d097b919f60d55";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/da/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/da/thunderbird-68.8.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
sha512 = "b9d12257b5b4fae31cb70edf36ff02d48dc56481b37fa3f3a65bacadc38d772e407d7c1382899179299c23d70e55652c1d05f8ada855621a9db5f300b9c983a7";
sha512 = "5b79cff38ae706023ef74799e66fb3e47e0cc4b1986f7df9b420dc27881c91db881311da9ac8c8d45c2a1c04a2e8b16b9a1d06e724e891f8a4e6323eedfd984b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/de/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/de/thunderbird-68.8.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
sha512 = "c84cd6e76e18207ed02209bb333e922e3dc928c0f0ecd0243f4f8024d49c3ad1f4c3268dde921ced90a77cacffcd41eac82beab65d226dedcd07fd7a2f821a00";
sha512 = "de71986c0fecd12358a6ce01c708b7cfc1ebbc9a3f748f301bec76c1c4b23f584de224bfb8cca0bc59f545aa29990de0175af5a3005b33b77786c8b69065427f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/dsb/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/dsb/thunderbird-68.8.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
sha512 = "e29bd848258aa5b04eb60391183bead511ad8bdee038994a84982d068312c97b2e490cb5abe3821825101ed313c503c5c679e42d79011aab89bd116af7807276";
sha512 = "e18851b7c709feb8c3bde88db8d9c297174ea3a7ff512f8a5d35d515e3693717f55631b4ab60fd134f0af056257e0b21947a400d305f91c904dc0848fa9ce5ec";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/el/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/el/thunderbird-68.8.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
sha512 = "b203b8cb46f51f5dd176aabfc720eadc41ed081094c8feed87658885025ba4aef422ac19f4b4773976c42c4f8ce38aa80b39bc75f56c42ec59f5313ce4b98111";
sha512 = "10816787adb0d02712b1a200f0b7547d8b03ff44056690dcf41a8a74c0dd1faa86a073c5036527a34626e83f47742caa213bc953a0d80e3598b2a743bcfc4d78";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-GB/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-GB/thunderbird-68.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
sha512 = "998aaa3ea0dcc387568802f367ea1637806a1dc19929ac8875ab4823c691c84004f62c6450b3c4439b88e017774ecbd4abfa38f72661fd9ce97208fe920060e4";
sha512 = "295a440863622a263a8c157da9ae4d39f73c83d9e9fab3e8fad792480c84a1fdf0e073398c137c359e0dc078bd755bd024f2f15bb5129218df4cf54d02b9e565";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-US/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-US/thunderbird-68.8.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
sha512 = "583e9a08aff1d3e4be47e5a9f31b7595109e25a4062a36e8640468a354e29a47f389062db5fa134af6c231af5fb1caaa31368584fa662105100419a64134f0ac";
sha512 = "cce266a330866ec3368c7d3f596868a87e1e3d786ddb848402456c5d80e5dec60a93a6feeee596b1ad91492e1d07aa5cc5703b09f0703d44575db7a050d58864";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-AR/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-AR/thunderbird-68.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
sha512 = "d976f3b916430388af3a50f58253cd4ddcaa5adef935b3965c71f38e938a8e3ad28f7ea8d83d4a9e0d0c85d29a1613547a95d4c9c4917159dce06d700e3f8122";
sha512 = "78d7897c537807068ce92d6520086f921aa6530d893c7d1b662530bfee5a5082740ba4cbbecd7e8e57f5f600e8a288b259ed3d89a97f3e88d5e5ebc47b5bd6b4";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-ES/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-ES/thunderbird-68.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
sha512 = "e51afeb81b39f6f3e7c501a0d5ca839d87794ed3a7f04ce552175a7f1227fee9667dec917a0c13d509687e31d6d87516bd5580dfe0158a964b13e4c26c82fb52";
sha512 = "df97856ec0f8cf1fd82ceeb93529d8560cfe80416db769eea290ea1c28dcdc60799822ef1cdde744dfe4fb9622d16f32b0ed992293481762cf45c44a5bd846e8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/et/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/et/thunderbird-68.8.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
sha512 = "60872a5306f154af3e2b9e58dfecf6135927464c92a3a6cac7c44fb934cc074eefeef6bbb6242e7403aaad3e1fb850d475efb07aaa80a07043f213960b92bd3b";
sha512 = "9028d26dc4393043b39c7c918163d50aba07d6c1c57916b7e1c607b92be0c16dd8d62ff41b0ff26991b70f63a9fc684904c266e1a18ca8fc3e5abf5c61c6d372";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/eu/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/eu/thunderbird-68.8.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
sha512 = "5f774a38904b5881d0a5bdf0ddad71fa7f85db82daf7879de54d337e8dae17021267b1a289676a11daf1e96572f2734f74a29327f23636e8b38aed084b874bd7";
sha512 = "adf9c6eedb1b086fa72af21b44a55bd9d8a1b3f4c45db4c232384abd570564e62fc9068dc1391b0bbe0adda4043c7893bf1cb15a9c3019230eed6f66001bcb97";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fi/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fi/thunderbird-68.8.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
sha512 = "0d977cbd85d7f1360e985844cc8ee433414abc3d10b8a33b2fbb9a03fdddcf3a91018edc12a12d96cc680d2c119e0c020549bd40cc10db9eba4188805e40dea8";
sha512 = "a436504ebc04f1214226a0555838fe5eda6e12dabd3b09e9c83e85cc8b6b7bfea00389202c9680bf14d147e8e0a9200de01fdb1bac2197b8d7e8a392aa3b617e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fr/thunderbird-68.8.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
sha512 = "dc6d20875579d8e788a236885859faee3ca61d83aa051a48bfe18c484afec986353c1493e7e68181a83fea7a42ee62c29d3f71cc053873743959513dddf6e8ce";
sha512 = "16d02c3e7d6342fed0f785c0f6a65c06a04eb6915bf67c7ff7d80a59ae9f4e069c329d54a9dbc8add6b84755e18aa485db7950dd1e3231a6ac135d799b27656a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fy-NL/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fy-NL/thunderbird-68.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
sha512 = "add2c509cb15cebc5dc77957c44e26a80ee52eda82f395308303216ebf14d13c09338f7bee14bad46ad0ffa8187008e7f4cc101c712029ff15b3ce14904c0a69";
sha512 = "c5ddf9105d06b2b5cb45299d88bb7b753832d54a653a62d68695c88aa9cfa0d6e12f510139e924d142b867a5b1e10f7e9704c503fcc93dcb8d97d1b071a69b7a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ga-IE/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ga-IE/thunderbird-68.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
sha512 = "d1771c8282253a80ed62dca8f49797796f202da66e2a607d27dee89a1a8fe556dda440bc03d441b8b63bf732cd9c0960ebf9b9cc047de9c07e901a1051dfc94b";
sha512 = "6479f7692fda207c51435691cbd6281a24fc6ad47101827516bad3c2b40ca8c0bb592aacd9936a22d9305ff8ffd53c376a79479ce82dee3af1eacf47a068b130";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gd/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gd/thunderbird-68.8.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
sha512 = "ea0f6d6287ef4e771c49b4891a4d9dff8b9766e444087456448e9ebe32c17e41d5cd9c9a17747250c393e389720a6ecb3bc6df98dc5c81f26504fc9cd6ea3e03";
sha512 = "43b94bbd76809f67078ae5248df2d25b399be35ca7d5261236b6149142083483d2871edf17eec7fd42812fa8f5d775bc141ffb8d0fd43d14f39d3d150dc83a41";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gl/thunderbird-68.8.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
sha512 = "487af69af4e9844a97d72e14a9de8f8aaf8f45efee6f72ad0d5b310019d6fe73c74288b3e4c7d2a83f6e30cb5b3fbeab2d2200d406814e6e25936ccefdbb5f14";
sha512 = "be4c49d737b2b6bc1a19c0e63df9558c04b448be44a4552fd4fe3d3d28d8cab59bc1bc05cc72acecc8e398fd75ef9785e61848c8f3e39b55b7a534dd337845ab";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/he/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/he/thunderbird-68.8.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
sha512 = "13f43a849b765ed9743947c9e03fe9cb7bffcf120446ec80e8622ae1ecc7994497617464e7597a1e883520598f5de2404e2901b8d30cc91fad78dfe58763da20";
sha512 = "4f0a83e57ac97d3e278c727f49ffff615333812dd9708ebbdd687fc35848be8074705aca6f09b5bb868eb6535c61252272729241cfe46a96e500f7ab6604849c";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hr/thunderbird-68.8.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
sha512 = "bbcb86e67a1975920a3e0fd4298b817103fbf88eea05e822eeb89f60f4690164c90940e32082cbcc19fb9222f53c30b32c39eb041a768b1f8cdf61ae866abd13";
sha512 = "08a8f8d273b1fceec0151813439be41d6ff1b2b42b28711a782caab04800e1acf61019f0fa8c7be27036ece8184b4b7f587b58f436c0eb8c73f35aa13be8afba";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hsb/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hsb/thunderbird-68.8.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
sha512 = "23c9d885024b178a37de1f968def6e338fb1e44d2414f01d6b8757e3be082ab4b5950ca6bfb0cfb93093ebcf57d061cfeb2c7c8c46ac56274ff495b83a7754e7";
sha512 = "1f64e9193fc44201e7bae329af94f7c18e6c0c0d30edf01b66dcca43e996f12622e795890e394c207ba20fc84198836b69e2fb1c61ae83c1875b1e424b5b3b97";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hu/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hu/thunderbird-68.8.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
sha512 = "8076d47c0b15fb565ecda807c789d5eba41b1209df356fe2184d4550a115b7ea986bb51fb6e9e8a4a279ed6025b7acb8f5c7ca88e5ccd72e4556fdaaf95619fc";
sha512 = "4e8741809e8eb3b45a7931d4f5bdbceb1e7018a4f4cef97d32d16d00eb3713d85d70a2a4987830f1480633b07fa839cc8ed73fc1fa2d4b3a2944cf03221a3240";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hy-AM/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hy-AM/thunderbird-68.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
sha512 = "825f0066a329fc3e35c6a2c9038a28c1e673b93767a020a6f4297dff5b769882d6550eb2cd293b232123223fbbb0f0e0d54893c98ae9f2e35072071a26171967";
sha512 = "07f817b7c3229ea993d65861b75c21f37e53e20db2645e68c90a1fc87fd151603580a1ecc67c9007284ab21167e781581a7727a885b760524ffa7079f44986c0";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/id/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/id/thunderbird-68.8.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
sha512 = "253cc87eee92b10d9b74e7885e43d5d9b146694bed63ebbb1b5e63730b18feeef53de4581ae824ded77a5770c45fce8b46d90621212d4b0e1ab32ba5fc7df1b3";
sha512 = "3753ae5cd20cc6a65ff1b1e5484fb596dc08d1a08e6747295904106db0f231006328e0a906d0f2d7fa98c53352cc61351eeefc32b8f35bde2ffe1b8c800d7640";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/is/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/is/thunderbird-68.8.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
sha512 = "0e0784865fa1f0b57f5287674c94993263a03b8876fa6a053cb9bd52cef89a93a07dace1d2425ad669656ebc86a083e37faa456ee52481844e8e8e7fe87f3c85";
sha512 = "26b1a7169221df476224ca5e1d9e5b97e9cbb8d84bbc12fef19685916f7b8e95e784aef6a86e7fc0078f9bddcc617823f2ca2af9de4412431e878f6efbff6fb9";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/it/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/it/thunderbird-68.8.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
sha512 = "0eca59d5adf138f2be6b9c2cd11e51252e550b711f3f6584e6971ec3564630eebb7f1774dfed4f79c6b38f3218420825300bb447b0bddd0e16379aa787edd0f8";
sha512 = "96049256ede8fb4ad1a6f20e3bf2d8513b21536c9dfd2acfd1679c41d25cafe5f938ed7cdc2bd0b11bdcd0a13d730f1d8056e85791211561ad4b3c1017ba23b7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ja/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ja/thunderbird-68.8.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
sha512 = "6a112e7ae24616115f6b5dadc72bd30d8dd046b8df16ebae1d609199d9467259f83b354659a1358d70d2e1ad8c52e71db9991f95aff6f2864649d539b9f0f139";
sha512 = "df162eff6af3bad1cf1a9ac359f977410f612885f005c989e928af3464d3cebe7511712cdea4e3951bdf4a69a40fc68e2b4f5efb35f25375f04bfae79ab70eaf";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ka/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ka/thunderbird-68.8.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
sha512 = "e2c71035f910648cc83d92af69bd96f3a7668be2ac4ddfcd40c97762a1fa4e94c7d67b9ff588b27783ff943330ee07940fe0f8bf1671dfd87dd34a23b78b55cf";
sha512 = "74186db28403463f9bf8b41242ce7122d410106c21e369977b73d6e72aec9bdeafb3b47665b0450f5b5eaf75c515759e3d6752d0743a2b598c4c7158c47bc7c5";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kab/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kab/thunderbird-68.8.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
sha512 = "4e1a72147657fc0706f3cd4c4511fc22949fdb5e90e5d17a080b5c814240451d030ccb4c287ec6901d1dfd8a7ebfd74d59e617ca73530fd20c0b4fad539f9154";
sha512 = "933fe5f2ae31ee322c4da4c985ed775f8a15b0290f22c2e9e6ecce2f856b0d1236a78659ba3909c9ef97fd4de9634d1ed6aa452174fc987ccdc42b0b65de565b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kk/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kk/thunderbird-68.8.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
sha512 = "61cbaa5aa674a4b6a34869f271d93234d874fdf49231b0ebf3c882863b294a0e2e0447bc81c8980c7f27c5dda4e8c29ace091c7097870d4109aa1f4718379099";
sha512 = "b7ae4f00d7c91e8609ba99592feedfe8f53d4257eacf0a6f206cf768cc4ba16abb54c86f9865416f617b1417601ce4408ba939d065a0a8d3e95aa38ae17444bf";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ko/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ko/thunderbird-68.8.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
sha512 = "b2d3be58c8af63b3a94888e8365cd7253858733686ee30776c61ccbb8e05db57882158ad3a9aa5af6e319c875e870bb52dae9dd8c834ea5643e811dd948b6fd2";
sha512 = "6f2d017af8755980f39fefe0d78b22115f33c7397917fb713c8e4fe34e88c7f4d0d6ce58767336dfe3f99d3b4a06b34305f92e4d414fc755a885c954eea97cad";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/lt/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/lt/thunderbird-68.8.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
sha512 = "e878eefffd3ada9d49c3a692fe1a968159d8fd23ec8660cb71ce8019034e10c905f1acb79c6122384c7b18f3da3d1e6b91e31807c9d88ae799175fae2ef18005";
sha512 = "8fc98daf3fe5eb8844d02cb56656aabd260d309ec6ac59055ba0f10f7470292bf942be1647b038103ff99c12cb34e3e03bad2fc8dfbebef0e356ecbfbe93b354";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ms/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ms/thunderbird-68.8.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
sha512 = "1d6094b7ea3fbdd40d278a60684b2e2357c1608e3403037a761038460dd1c89149f3f010a9f93d795f3f408acb81c3b6fa2b5ce206f5550352db6391895fb0f3";
sha512 = "5582840bff43eccb907187930286c47c54a10a9a2af1af3e23b61b5ad56ed3eff32e9b488f00a1e2fba7a47fd647e55f0562adf4c01b1fe843f8708e1dee859b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nb-NO/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nb-NO/thunderbird-68.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
sha512 = "0deb1e4fb220c9b17bd68ddec7bf4569ee8425528a6586f5cdadd17f7c1948f933070700d36d7c6cc9442c172d6bb302d2681716abac131c9777d8b57d4f0a4c";
sha512 = "aae8ce8c919cc9621e99af620959427e732d5bab1515676b9ee7b7bd2a6d46af7163677f6601a52e2aa246f619b2206b7239663660e4bbe8dd2ab558e55c073d";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nl/thunderbird-68.8.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
sha512 = "24c5100339da2ea1df96d515c1529f02b0132385e141520d7a2c94d194ca71a634310eb26f3a88ea0cd6a8ad0a56f33ce5055bce19c68e3465037afe33a85550";
sha512 = "7d166e84b3406ee0c5caf2309aa005c22779a78e7074f4a061b9e6df50722a95be3977802fafe10bc367f90e8a4e77895b28e2b6a2650b066d2d644962ad3557";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nn-NO/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nn-NO/thunderbird-68.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
sha512 = "525675451d274d17d3b5dbd1d3b75d3475b3c29f32b5d0813c71d5cff6c8002f35038ee7801c245d0b2cefa596ba4288c4287a6fed66905b6497591cca96be61";
sha512 = "ffc39e7398220dcf4deadd24aa63a0838326bf2b24c58d0507c00169b322f0e56c5d803c1b78c9bfbd8aa345122c928fe688780e6d5ef238de9e399f40998bfd";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pl/thunderbird-68.8.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
sha512 = "3ef251ebd90637c11cb64f00f429611a2621fc5841e91fa51d7a3ba97d1244ddcf383c8b0011abb009935a59bab58a3bba52e3c4db05483b28c400dbd500ba42";
sha512 = "f6f2302693af1f466733244f1cde764b0aed0b64afef085e91ba9f24c341007d8e8ab4ca58e777c307ae33bc5c1a78670317393b601d6fb2851095386d7dcb1b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-BR/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-BR/thunderbird-68.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
sha512 = "fe80b879e307d6ca192bae16e13df892bc837e0e216562c4a4ddf7ae3c526e2967cdf8f8291e53a450f70759025303b2195f7e2acf683cca9d8620a00d8ed69f";
sha512 = "f14380f5b22e9743a0e3b0c390ba4ea1decbb7aa85c1bcecd42f967e5f90416f8904b28b3c5f4b8fcebf55fb07505b96d9b9d8a39d99da5f8725b6bf48e05ab7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-PT/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-PT/thunderbird-68.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
sha512 = "437e5390889424f126a1a229bf8c66881ac4a98d300f6308e242c5f2386d443c1977c52f78fe9e2b620952d181c14c35692718ff447d267c000e1ccc8cdafd5d";
sha512 = "215fe20e131557f54091c80e7b2c09c07bcdfb57bbc145964ca37e66b39add37348ac0a08b6c46a6186e25a864447c8cbe2f485fa04687c4cf8e169a731bb8fa";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/rm/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/rm/thunderbird-68.8.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
sha512 = "d76f9f0e992da2e28e69b20a1ae532c8e98415825d41ee5716c34639abd1a3bb456d8645a108d17423bfac848f8e8a340358ccfc2635794cc703764d6f8de0a9";
sha512 = "dfb3e49c940b0332753fa9d2347ba833c8243d1f006fd7e463d514c38cd27a14069ccdcfa60847bc6bbdfac1cec95629a2ae699cd702ef1f40e4898fda4961f4";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ro/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ro/thunderbird-68.8.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
sha512 = "0485cdcdf247ed4bd67420fe7919f7f9d845e3c369c80960d92e448c48e3ce7e55c03ddbce16aed6de84da70a5e7610d8be5f55c5f53dc4568ac712b92a7153c";
sha512 = "57d7bc23aaf3365b1a76f1bb8006f725a620d14773886dce9aa9bb4625fc062af08bb6bbd40248601569d7aab2a31794bbb79f7b208f36507c7a919d14872a8a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ru/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ru/thunderbird-68.8.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
sha512 = "96b28866dd1e4b68846cd88adee09e4edb60af8d506f42838f3f5f1dadd59ef5339e8c331b2a8b6ed0d1ff482ed48d83861b9db174b28dce5ce90b619b3a237d";
sha512 = "5e85808686c79ebd323990ea2957c10714281d3f0d4a9b097d2e3820769bf1406f4400ac541eccb5a817a6aa639048d1767c2cf4bfd56a3262ac83ce01516275";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/si/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/si/thunderbird-68.8.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
sha512 = "0ea525527ab09277fce4202f488778d838090d2d59fcb2f049b1869ff0a6d50f54eb22449dbd1063aa6b15d5e559dc119e36dbf97d8a7bbf22e9ac4971393a1e";
sha512 = "c4b3b8d62c0369c95c7f498eb319e839688b27cb23a49d15d9a4e15251d7555be7f65ec9a7b19237921dc71ec6dd5cbec02aa4bfc6c16382f917e0f66b1032bc";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sk/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sk/thunderbird-68.8.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
sha512 = "26280b266d2a7956321854ec57737d8cd4ff6ecc938ca07304431e6f351f73ea43e2213e28797d0bc994e0174da41108421a957054a00adca97cc630c107e4b9";
sha512 = "3cd7c89db92dee5ea3ce44df89749d5822659e7b83bcdf56ebcfe0ffd295393c9f5acea5bb836b5bb0a0a6a69e6ce1406efb39d2943357086e14a3802d9181f0";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sl/thunderbird-68.8.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
sha512 = "3cf380bb8bab8917e3643eaa337e8382e73802d725ca6134e73fc9d991d9e137b6681fb2aaa86aa83cf6766c3f536406298a4962b97175cf63bbf81142b75618";
sha512 = "d08549134713d50842b82d24ddc8f8fb5ff098c41d3baec30198e43435ac73cc620e7d9375a9aa9622e991c38e4e36241183a026b6aa63420038694d74833180";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sq/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sq/thunderbird-68.8.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
sha512 = "daeeb1a66f65e2da8ef2a6e3c59eb07bc341bebd19a79cce606d787d16f674e2d52decb17ae12125a7df78ecdb7c7a693644b17aa726ce1fd424fd30bb05ae43";
sha512 = "9c6849fa77de94df39d9e2615aa3392dea0f8adf7e61b0171243fa202b6747a4208279b0c0ce4b05f57544caa69a40641a3b145726d304df549f2b4e75d939d2";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sr/thunderbird-68.8.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
sha512 = "01a71c036d95587adb010cdd0f0641c4559af557c3596b16e43d11accddf64290d06ed5b35ab8d0b640b9242157b04a899ded266a47ad7bf2a07e3b923bc6fb7";
sha512 = "b52b146a4a54c4987d430eae6d7e922a0a43e57d38ef2956e84b4ab50bae2a896ad1350f98171f57b2e4cbf4a69f0b1123a540e4cc582721cda391b2ae7c7616";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sv-SE/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sv-SE/thunderbird-68.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
sha512 = "28abf6b95fc03abd0f8d5008a1a3ba5b46138a616750b20e8f7be08fc2307cc75ef0e1ac3b8e29e37542553de502d07c092a771cc94c9b794da6a5bd268e3c6e";
sha512 = "73767026562ca540c6d3f77792a29b55938ba5d43bfc59d5a020809e020cc9e7c9fcedad8f0653be71e54c44b54374aa1e1d4f5a6e44a40436cf0a9b59e484cb";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/tr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/tr/thunderbird-68.8.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
sha512 = "a7cb235bf1db3dfc5f7bed0fb92c327fedeb2f319c602bc13727b3c452305345a053405f77895611d294578a96eb8dfe7c7e9f008c531fa2acddfc81679391b6";
sha512 = "4ce31c5bcd8075d3f6edff2f8266c2c6546e4f19b8c00486b4dd15b68d7ea898b6e76a5745087c0c4a41b3462e4d8facb7ee0e9e988b8b76ff2374206fa3cd62";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uk/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uk/thunderbird-68.8.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
sha512 = "0fd2ea32ce4ef03150db5234561546f45724e399fb12967a4ecde42149a81f4609505bd1da5cf85ae745e71768b93738c2885c4c7ace9b7b0063d6ace566bbb5";
sha512 = "affb8eb4049a2452a4f17a405d6228e6debc87802b77bca55848b66fe136ab0eab6bdb64817f43fc25652109fadf1dc830fd7c22339702684916d7cd95147e1a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uz/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uz/thunderbird-68.8.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
sha512 = "4394e70e02ef67428b74af0b1d35ea06964b71a23d5a0d73afa2e6fdbe8d23286abde651b17a48a2353a1ac762d5a8b169f8e699a79644f00340b05e204f05c8";
sha512 = "e4a6abf7ee0d6c2c0c7484911b025cd40b4f2d0fb5715a6333430336047deda5721f19abb3c5bf49ad3d16b0d128a495525fbf0a23bab7b1bd8ffd8539d17054";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/vi/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/vi/thunderbird-68.8.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
sha512 = "e1eeb7b46a9ece66fc40d2d58d2781fea4cca320a97b6cfeddd02f3f6907b44539f4400390467a794cbadde50c8ffe350fb08d8012f207db60d36a61d205a368";
sha512 = "f58a50ed7505be5903af948025cc2cb15cd6a3370fa6789f784c3d2cf512f7d51a03d7961ede14e6ecad87cdc207932c90741cdfa7325ba67bc44ff150f39b53";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-CN/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-CN/thunderbird-68.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
sha512 = "ab6839f46e41c14fbc588a59044496feb3e8a35aaaa1f0777212636e9b4dc5a6640b34a3f1e833239d5597f468960a947c0591373938306dd8bedd6c6e13283e";
sha512 = "609d4b4cd3ff7f1501e7ca6e247ed29e8376b8bafeb140cc134565fffaf65b6051c158d8f4b90fa2e15b3aeb9bb92897f708a00d666ec2eca490c7dd856b28c8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-TW/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-TW/thunderbird-68.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
sha512 = "4923f6c790335820811bad56494d24a5899c1586ab2344b3e2fc81a91651d9de5b378ec6ac0ec68597ee83a8dc0f24ef084a41bfcd98dbde128cf4831646db70";
sha512 = "78bbba535a4cc284e7fde8c96739c29fb6998a5aa71a4ba424121cbcd0a44168412e54a0590cb6a1d7d9bfaabe0ddd343ce4cc4dbe63e4c88d99451ac6823143";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ar/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ar/thunderbird-68.8.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
sha512 = "91b19e61a360062d71e090d7eb8dd78b1ff73fd3e7733573ff1ce6ef4e98c13fb297c219fda8c43c9d80299625ea8bf9566e25a5546f28d010737a399488f3fd";
sha512 = "1e5d29f706216ddcc8887e17826af397b54fbfe75d4b5c14a644e6c834eec60522ba401392977aaf40a6357713af68f274442288a01db65430acbd7549625c07";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ast/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ast/thunderbird-68.8.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
sha512 = "2edcc3b6d7c51c79b1539fe8fa4da53003af0379727ed658ca7523d608c96c251e8be6fea004098609d5b854ebfe6cc8b81830f8e1d359386edd2593f3eff6c7";
sha512 = "24bab81e6d36189635ae8f0da6f0153f1ef32eaaee388dcdb9f9cb5049c586b01e8de2c79372784645ba42749e48f1d77f7a91c857df69ff72566969a68619dc";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/be/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/be/thunderbird-68.8.0.tar.bz2";
locale = "be";
arch = "linux-i686";
sha512 = "84a76ba8031d25f6b097f66e4b0c74359ac313f25016c3b82e547d8e973814d8398697572014590f23ea094aad7941c13cb4130b618a776f6c4973356cccb30a";
sha512 = "70a4a9881cdb15b68c5fdcd85ce6234644119bbeb1a3dfdeb47899515303bc65013cde6fbec7d4b2997acca18abe298e9fcf7c7e236931a9f06b7f9c4a5032ce";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/bg/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/bg/thunderbird-68.8.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
sha512 = "b489ff67e47eb1d431f5b2f59f0d6b8cfcded889e167cea3a2d602057264a402769e44191ac015e15930faacf7acd9f1fccb87abbd438e3629db7b795b8fe43d";
sha512 = "80a0c836a7809ba49d067fb76fbb639d653f0a38cd77034d3265807da06c3212eb5c7cc522793fdb22c80be65f763a25ba55775d67a6e8716f7ece9dfcd6796a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/br/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/br/thunderbird-68.8.0.tar.bz2";
locale = "br";
arch = "linux-i686";
sha512 = "3ffa33885f86bbf13f4c2a2bb15b864aec851b5558eba88e7a64e8b8b111169bf4e163e590491702465ec8436274ee72dd140a0bda2c9ba39754145de5501388";
sha512 = "81bb47202578f138e135c7f4bc30af3a3ccbd3dbf127dfbb47bb6ff4fbb09c2fd54c68bc65d81e5c3e72cbda749bb0d69cba442e0f7a5336ffa6eb10ab9af4a1";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ca/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ca/thunderbird-68.8.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
sha512 = "fad5eeda16877f0bfa5edfec10fd8fe5baf16a112aaf56c908c718159b0bb6b72ac314b93584536ca369d054059612fbf86c396d076158b6efc7a9d9cd2fff93";
sha512 = "61ae36d17fbbc8f91f517992966b59a687ce6e6c72f18cc3a8e8c6d29cb4dac18a7edaea2132bb258e77a0e6690df622aa35f9f0700d713c6411ef4363ba9028";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cak/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cak/thunderbird-68.8.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
sha512 = "f4a0605533cfd5b0806c8412514de4478c520f52903a07c809df136b443ff0734be917444cec2d4c73301d0821d77e585c96bf314ab17deec4b4bd5036e83a97";
sha512 = "eb0a3dccaae4cdc70fb3a1f5c25cde379ac3d9be65b3125428532ddd8e4ff8c7d65733a2eb101435ae14ac06d1a4ea32c1cba40d8c114b4b8025287ac7fa85c9";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cs/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cs/thunderbird-68.8.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
sha512 = "319f3a63a352a2f7831bb6d2d046d238db4c136cdc256934ac19fd4e8421344c98b4900c57a12f49af77d1844ffc8e8c7129c4ab9557d590affd59aaa0229ba4";
sha512 = "8b8cdfb5f0449e48ce50ab27f75dbb9cdb05ecc9df58dca52be3b72dc523d06248c14656f4a072645e5292e8b06a82b274307b7d4dec99228de7353b539937cb";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cy/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cy/thunderbird-68.8.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
sha512 = "4aa1974543b568168d06ec8c0004127cabab481fa798a67878a9bd5c1955d98d14d770383ef5e6af35dadc106fb20da46a1744a7156b3bfc582e416a32df1673";
sha512 = "a265e96a1ba45a57999a905f21e45edb457004cc2a337d2b84e2d55d2b2a0f71d1f20d524701a2287f3038f76fd814b051d46b1f130a40713d745b701e66570f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/da/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/da/thunderbird-68.8.0.tar.bz2";
locale = "da";
arch = "linux-i686";
sha512 = "c587a13d45f5a5e94108252d8dc98548583ac7f27b35f3fc28100df0a15f696c04c68a4f786d7b9c3ee461db6120c14aef2b6ee14cfcabbe855f16ed00660861";
sha512 = "4ff53dc463e51d14ae4cb7935f44cf2d2624e98469d7dd1285c7a8c512ee8c73aecf0067c6a695024a6e0588b9f567ef3ed12ea9c72bb6e525af348a52144ea2";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/de/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/de/thunderbird-68.8.0.tar.bz2";
locale = "de";
arch = "linux-i686";
sha512 = "5c425faa2c44d30b695ce6713b59e5720bbd8294aea20d1c7431f26173da0f6ca85b1cdb9f178e54ff670e109bc6c30abf21110df0c7029b5d5a01373c8b1510";
sha512 = "aac47bce113450818c44d4c17f05be4a57bb33a7e41fc1fbf50b9123ebaf229d673484190538c6fdb6b1a02ad42e33f1644d4ee625707bd3776eb86e023366b3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/dsb/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/dsb/thunderbird-68.8.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
sha512 = "6ad04e1e43d0a7e4821c584a78b476262e77aa5f6c7d170806eb02d74b0d831f53e66568917837d11c11cb5ed19b796c23ba6d496573ca1da7029fb1eedbad9f";
sha512 = "35e4a54a82175a1f214a87718800a42743f81cd39e14971da9729cdcd863dbbb70d61d60d58387951cd3e470c764df22b225a4cf9ce894b97699073ca475d46e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/el/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/el/thunderbird-68.8.0.tar.bz2";
locale = "el";
arch = "linux-i686";
sha512 = "e9c7d89bbc736527ea9918151886705fec533969582ff37fe8e1acec3b6c1938fb33da4285c02ea92c2a87df1c6700c9c2223ca391ba342eb2e4e1fad8e06f8f";
sha512 = "b919a771034e06e8b30ba9662930d7961fab757d2d6dd4603239063127702051a29c6401a983a0d0e4b232b16cf5780f8d1cb53037a22b0b2175653eb86e893a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-GB/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-GB/thunderbird-68.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
sha512 = "ead179d699feabcf14373aa4e02ec96f52e96f8a1413294f690d70608f2cf83fdfbccd1031f0430a0f3805bb230943d8aea269195d0f092334040d0c092cf9b7";
sha512 = "70c979be649771596478d0ec9f33398baa862e12aadb5369af42a62c732f1cf40c3e1184ddabd12ac1cb4b21759d2b00f24c59e7f89ca6e221a62837813f9785";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-US/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-US/thunderbird-68.8.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
sha512 = "18309ddef56d0e7e50f3b5895e1c21c206b432da141c7517f9220686ada6523f7b0181e98a6722205bfe09d9023c4d2beeeb11ad60a7b6ec4242441bd60afcd0";
sha512 = "a0750ff269b11f52d8b001274257c7e4e35fe356e7ee0d31bf929c9336e7abef5f8670d19541f45900192ee72417d8b90a388e17896dc279e78a15c5faeae929";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-AR/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-AR/thunderbird-68.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
sha512 = "d0a1ce2264c3663a529df667f800bb7e7ae446e09a5b0b09934e00ca18e523baca3943edf1bc2e3269a1b41399a47bd989b487e8650a0ce9a66b94b8bcb37726";
sha512 = "ad524e9198f42cc06bcd6b6ea86ba64b4faca80e9fb5df45e34d49997d131973426edde698d3e6e9fd89f133e527ba7089f1c5b753f6614e597a74b80edb5626";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-ES/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-ES/thunderbird-68.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
sha512 = "5dc04a48b1997e0291265533351818b1912d73b9b002c8978f729006f7b406c03c27edf736a99d898ad9cb8328b40d732b27ca51e3f621740146b81968f87d8d";
sha512 = "8bba8a570e58ba7e3091af1c1cea4fe6e4cef3ef2bd0ce14ea13087c80d3c01efe43e60497977be6ece54ecfd92d0f6c30afd0d561129e7589c18bf318e415c7";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/et/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/et/thunderbird-68.8.0.tar.bz2";
locale = "et";
arch = "linux-i686";
sha512 = "8fdb9911b0da646fca7256fc0e004530339f6631fe3a91e1c0857b52d3d7f786a6fb8bf83cfea9e3c4e0faf6093d0b3afcd46a0dd1ce5c1357a40ff217393d6b";
sha512 = "ad6b225169aea7b8634b57f7d1afe04b99a358a9f010915f2bf9fdf898c0f6dbbf5990e114a220584c1aa06bf750c9fd426587c07292dfc7082caeed1b5f7cc4";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/eu/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/eu/thunderbird-68.8.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
sha512 = "788cee146a94621d373e8d815daef246d58b46ab1e935b01dee3955fe695af43e7a482f287d611e98a376b137b5bcd5b92baed5ab322a39ef30d8815abff6640";
sha512 = "73f6ab9d2f285f1848f25af22339988b2993fb12a9e458ca7c6c67e57aaf53b660e182c4a99f6f1a424ac0336fb7c9e5e72209444dc4e99a1b74df0062e61f50";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fi/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fi/thunderbird-68.8.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
sha512 = "b65e042905882d1c7fbc88bffb512b32fc91475b99c3b1bf6a4e10ed355f9bb3223a3c709273b0ad84c30ad3c6c405c07cb3e04eeb8a4938ec22bae3af4dfbe5";
sha512 = "10f42882594f3cb3bc02afcfdac7171139cc11915440b7888ff9edd2d9b0a0a2cbc9fa6faba0f8044d085397e6a7f4fd4b5190990e5f67592ccb85dc24f0cc9b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fr/thunderbird-68.8.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
sha512 = "a85af36139d6f7ab6028acaba61a8dd47c2fd6ef9114b5ae8783c78c85e16c606d72b05c15a299d1a0beb518301aeb65d3493d518b270bfb97f22c88d23bbc0a";
sha512 = "bd50ba42353e3cc3b709d1f6f0f16b998dce896ac2b08df9e75eee715e90df5f84b128861af69a2587c1b288774b273d2ae2fca6337723e105fe6b42da0fdaf3";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fy-NL/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fy-NL/thunderbird-68.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
sha512 = "60cc189b7eedc72327d3fce18809403014cc6b2c4dc53617cc8cd589dade6be25ade584416f9be18830f3c7a6060fad3e19bb930a591f17fdb3437b4597f48a6";
sha512 = "c5200ec273a85489e3975f87e0050a2de6e2033f7e5ef1bfe7416c4cb0abab8047cbb04b6b8018adf2d9ec9c2a2c362317a92bb90c43c2dab52bb4a8bab50ede";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ga-IE/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ga-IE/thunderbird-68.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
sha512 = "95b337d681a5292c0343bb545232b666268e5fbea0afd6b96122ff00e504da0a5628126a11495ba54d4e8500615d35b34de13851ad43f180bd9b5b1f584c7ec9";
sha512 = "cb4886d2a9f20f6deb600dd3338268b160934e42a0b73e74600c35694c83253bdcb4d77ddb5292294d38da23801fae7559dc6601fa40b873c7c71e2cc64707e0";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gd/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gd/thunderbird-68.8.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
sha512 = "483a1bcc1a0066a962ed91c8f4c6f948623e3555d2977c593a473c5c08e12baf05fc4c043ef5db1fc839fb9f550764abe457f2d33e23ffc748ea6aa50d675101";
sha512 = "49fba7937ca3ab596ccd656267d7ebb5592623a1a8a9143fe25f84424fb2a9d27f72f3fafeca57e204911208671e9fad7acac97d4202a9adf89a7640ba001411";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gl/thunderbird-68.8.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
sha512 = "0a88fc59510fa06757dd1b6994be0ceb8a0ad2cd1246077838756a0d65d6c01a64f8c48fc8ac87690686bdfea8c7d0b44e5fd96feca4c3aa59d6fb43eaeed3f2";
sha512 = "b80131b5ced22d861fd2e6682149e2fde2d3106d2b4d4f528d8620b400acda0db497500bc489b7806a942dffe5001798a05a440d0b00a56879ccdfe81390d353";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/he/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/he/thunderbird-68.8.0.tar.bz2";
locale = "he";
arch = "linux-i686";
sha512 = "9c2ae42cf2d43e4ae9d0dad829871b44321b2cf49cde1f17568f96c4d6a69793d78c9b7a72cb29b71c108718906ab749f006f7c727d6f3892efa3d56d0852449";
sha512 = "601f99613725276d801c8d0dee9ad25f98ffe8ccba42620551f5a41e02b6abede34547857f43a265f12be01ccf4b3e4b4479e1ec6f8ab5d3b5890f230d4b43b6";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hr/thunderbird-68.8.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
sha512 = "9e9a949fe54c23a0f73bcb05a4fe2b212c6701cbd1d68ae10dba2b62de07fcc5dad5210de0ec3c3f684f06828f8fd1c420712396e5132da6053de42f319d6454";
sha512 = "b9c681c4b2edf89f789cfd6bb703670aa62d8e48bd6afd8147409a1154d01f1b59933acdcd0f1f6b88ddf131031a64237958ffc25572dc818b1e06f9c8cace4c";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hsb/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hsb/thunderbird-68.8.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
sha512 = "0d3c5ca3ce6a9becaad63b2d7bf3e1d4491cad18201e1ddb634ad80d4d9d9d26c95b02034888f24ce50c5390b1197fe3bbd69525bcffd5192d95ed35203515de";
sha512 = "a512ed1d095bc1077836486aa40a6f223fc2c37cada6bd59d5ebafb8bf17d47bca0acf7ef007dc6adf8141db2b81b6a6304bc85b36b929bb2b1375898e67472e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hu/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hu/thunderbird-68.8.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
sha512 = "4519acbc2d00cb1f97d73f17b37db4625fd16f7f25e628d5309bdddee2012feb2133ce599bc69eabb22a18f015a00c8e98d6804140ea1ae41d66f59164355f32";
sha512 = "3333452d03a2e8436bdd8e7ed0195553d0dc86e74d55903aee4484d5e920bf81f979c4a482d5e44be6dd6bbdccd85d7d50dfe5d58c6590c5ea95c8b5164c71ac";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hy-AM/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hy-AM/thunderbird-68.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
sha512 = "f60cca5cef19516a5c6e4b22962567c0c0d22035ee7583b0d93a4db0db7f625ed0cfaddc78f56621371d0a8b6341948cbf9171debe81c222d170af2c759eef36";
sha512 = "e6a01f614533824e9d69a4feee3ff483ec57f42415a1854db4125479d38137102465050de140d113daedd6d0a4ede83f5c3aa5e9c27fb77f368c70079eb90c44";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/id/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/id/thunderbird-68.8.0.tar.bz2";
locale = "id";
arch = "linux-i686";
sha512 = "75adaedcce7dae3998a063794552d3e5fd69e037422e44fafcc7871a05cabcb592c9ddb637c1f7b0639e03f6d0d99b262679087df2d6806fe2a202121cdb5563";
sha512 = "4c505da3cd0a57cd0d24199ad3df92b5ba28f0bbc3410e05000f1fc7d93bc0228b6c16e1ed4852d84e2f8bc25c15886312bc471538ec12ad3fcfc8bc7cf1f852";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/is/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/is/thunderbird-68.8.0.tar.bz2";
locale = "is";
arch = "linux-i686";
sha512 = "b80488a594bebecaa139a2bbac76e3daa0d3a9f3257cfdc2f6954f8cbf427c3b3ec1db3d1f55b9c5e8c37242778e53904b92adff1cb7e1907142008e69607ee8";
sha512 = "0088ca68a63d53f242e82c3d304417a3503a78301b6a4c1198671e55b5fcbcbf75b874ed783ac907dd5ed3415b955481fa699e0aeba0062de7de58e4ffa0eee1";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/it/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/it/thunderbird-68.8.0.tar.bz2";
locale = "it";
arch = "linux-i686";
sha512 = "c8a0f75f6467f6428103c98e97afce1690a0d986ea6466dbfbaa2eba2853d8f7a1e65c568d10884d6d4412fcbab39e8743d3e3233ac16f69ab57a5f698c3ac5c";
sha512 = "1f70db3fa112f208a395202b18387fafdd8abceabce2717d33b295cae441353b759400d8ea5aacce07481f841523d932004105eed61551ec6271c796fdb6aec0";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ja/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ja/thunderbird-68.8.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
sha512 = "b1abc4fb9e7af1695ca2a4fe88d2198876212923ae10977b0caedffc96dadd891fe6068fd8d53c7cb7667854523197d1378791fb71c12eb817dd9b6e338eb3a3";
sha512 = "3e43f8d7e52ffe9b7e7b4817756997f68171d08717020406410ffe999a55c9d4f83f1f30c7cedde4732923bf3ee3385828e6d0ec49f7e69d87cb97cd9f083d25";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ka/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ka/thunderbird-68.8.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
sha512 = "11e56137a0e5f9f6cc4b24e02861e6ee4c451280076e9efc46e1f28066862b3bd494ff7388f6be736be3dcf6412c5dbd141546dd37d6351aed54790deff841f9";
sha512 = "3a1a8eb0c49bf963e9586c42128d2574dd04ef775749506e09f4d8d8256ffa5690f5c5e21d1cfa304c298388028e333ea5cb1964b6ff9b97a1f17c00e581ce3b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kab/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kab/thunderbird-68.8.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
sha512 = "b930bd22990497a66cc9aff96f0c9bbfae4396fd9b4397893db9c72b59b602b45f6ab7388b8899890e151bf8dd1e0b788d668cdad607f4326794825508d36ebd";
sha512 = "d977575e4723c643c04209a875f15e6b7a00133c938dfceacb4a896bb65846348511ea2078971eb3b8fe413c484aab035134411d615d7c153b69452139d155a8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kk/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kk/thunderbird-68.8.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
sha512 = "17b7ec790013cdbad015d3045ec8d4c5ee6d92b1ea9be18e2b9a5d7776f53c7b621193e7dec418f86be25e3d876e4a9cf9c8ceef0cac4051461afc1a51498353";
sha512 = "5cb567862e9627b9c684045dba9342afa6f1f78064a941f19eb90e8c6ce30d102a611dae85ec3c6ca271ec57fe0fd2b7df07c1aaa8f5bc93c4501cfb0161b55f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ko/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ko/thunderbird-68.8.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
sha512 = "1030a289a2e0793553ec3bfa8ac1b3ff3bfac3766318f5ffd9e6eff1979481b327a90a2207a5c16ca33719675c65e20d58ea8074fbd5fe9877fd334114e9b5f2";
sha512 = "e3e83cfffcd472b22f60c3e65b458e534c7c76d8c6b637c69b7e1a062b11e3c7461cb8f3fda21e7f0f3a9512c2d713bc0d40a84e235dc6807ed6d7e96d9a4095";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/lt/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/lt/thunderbird-68.8.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
sha512 = "e433d8933c1d4a41e70ae2a8bdb6f1a502d478aad1308e1f0e8489149371893deea61fe8339717eb22996d844a5a6bbef916ec6c468a57cfbb7a54751bee2408";
sha512 = "5f1438e9c1a71dbde9abd06b34c8d384fd3923ace38ab643fb0b16352c54efa94db83d4a86573b59c7f9bb418e23a6c158f3a3744b2114f0c535cf49e90f3439";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ms/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ms/thunderbird-68.8.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
sha512 = "31343703e214decf4f25d724507dc706cb6c47d6247989cc2019841175099a0c328fca562fbd257f0003ec6a6fc8cdcd632c141de13e910a6a7b9c75733998bb";
sha512 = "87e8e1fcef966a7a14700ea4113f28945bc25eb1351a67d2eaf55b9d54864de98cc86e494d3ef81a075c9bda8f6018ed3273796e422dd304abbfe1740ad4cd2a";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nb-NO/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nb-NO/thunderbird-68.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
sha512 = "e79708c309dd16d23bba5bc0e29a4f5b426a7dcb7dcd56b86c40875abd0d7fa532d9ca8c8b5019552fa0d07e5c4686a66f0a4173e2fdbf8865d3921c8b29f327";
sha512 = "9ce730dbf2e80c8badbd9c8f3277648deb44b00fb44d367bfc9ff8894ea7a945774aba9241300b01b04617040bcc82f7e65ae024483205a707cd1b63f585e0e8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nl/thunderbird-68.8.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
sha512 = "8c268bbe04c30a3dbef069add7b6e47fc576a60d0709020d0aee03b0be634f0fbfd4928489fe7b984a8c54fb1ad9ae951b9dd0c0ba04483b35a242bbbe3bbc19";
sha512 = "aada9422ada20cb8561da823b6a240a30c155cea774b369649f8423f6659d6bdee0d2b6ecba2dd0c64837e04e6e6a60235a588d1850fe5ca8a6b7a9d1dfa5fc8";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nn-NO/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nn-NO/thunderbird-68.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
sha512 = "9c73e09e4680f3c258e7d25691dffaf805ca6946335c9c30ef091a739d7f87e0f36f5328875ceb2b7f0f2cee2bf16fe1401411f11f4e5e45ca86837c4e207d79";
sha512 = "adb4a038f4cd87ba6ef425911eed240adaf23a23d8719b5401b463578f9de7ad049a76ea1b9b9460afe7b18aa86a9be4e39eccfa42d0be7609077fda9c3381fc";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pl/thunderbird-68.8.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
sha512 = "6dcb19a95e0bd8dd783a420c3f06e0980c5706c065397d4ee424969bd84daf783752d55153808df5811f656d28adeb15f826b1d4f2b9e356846c6b1c01b89a04";
sha512 = "40fd0b0123f768e66f669566395e151a696a54445daf5ac30cc6e4dc42e1aa20545c12ed29bfcd0b3881928242b0d12bd7426497b7401ae6876a1a076a6d8dab";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-BR/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-BR/thunderbird-68.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
sha512 = "99deb6fe54bf1f9bb1858f2c454e44246b34bca6aaeb5322db57d048acdea5de853d439d4f079c3e2587174364ecb05861cac461a34dfba495eb747bb8fc98ac";
sha512 = "603f026cce3a097fc424e754393f9699f3a8639ccf8669e58ffde5eb7363071fc87ffcb2fbf1f04866cb403a0d08d3c8bfa801a0ea9e4290d63b106f657d7aba";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-PT/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-PT/thunderbird-68.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
sha512 = "fd0fe715c0e816e6a92b9cb6a2afea50952851161cdd217f764cdafdc529f7cf0c5a6913546b81fc1d9532de74eecf13517c6eb8380ab5f920487df4c26d331b";
sha512 = "3fed3c60cf4c77bc1336db22c65a0f84e4f2a4ca0476f016d289f5951b48e96394365c98e5025b42d51b8990a46151d2cf00eb3381ed98ac96bf3760b640f91b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/rm/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/rm/thunderbird-68.8.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
sha512 = "5ff0306c7c6f88976f3080d34690e4607a74730509f9f43a0ba56fb9e5b9cdea8e85a4137333c150110fa110ab6d98cbbf265ea07ca439f199841a82af500152";
sha512 = "87ec8c6e2358df02baf3bd6a2241c4e83a4441be6c9ff465da9fb0a992d316ba1a3f2e5b41d7186769a8c8e4894c04158a4497a70a4c6c82a630954d5758c1fa";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ro/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ro/thunderbird-68.8.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
sha512 = "9240e285135f27f82402cd0d3374f28d293a29c904a503297014802554e8257bf95c8d0cbcf18841c44d1012e0d3d8067ab24186317cb4f42f96dfeeb65255b9";
sha512 = "0b740488109c97bf3a54d87de45f14063ba356d26da56651de7902de4264755f9837f8910a3b524ada953e6e1387d43c0f60572673af2d1cab0e6c7bdebca67c";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ru/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ru/thunderbird-68.8.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
sha512 = "0c90806ecfe1e4b2e4d17ba01a5945bf5c0d3a0e7b5caaecd36456286f5a1ea597b743743acfbaef585cdc4bada86e6f194608ebe9dd2308f24d093fbba49fa5";
sha512 = "16f07bcc8bb6f49754fe6741ce2ce0f77d44dc6641a37b9b9fef601604abbd9c44861d4540e544daf67c871955cdcf141ad1db3ac2cdcc0fc371638bb0aa8058";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/si/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/si/thunderbird-68.8.0.tar.bz2";
locale = "si";
arch = "linux-i686";
sha512 = "a10ab6a050df683057d4532c0c1ebfbed80de96f6831ae60e53f4e4fe95a342ce97b545c7a658fa092a7b9d4c2196f4bb296e4af9b0c7e4183f112ab50b464e6";
sha512 = "cbaeb62f5ca1ac9ea731e291d5988044ab86f7c26eec99ea4741f0db200685bb88b1358c4d29f1d641d01947dfd1ce5eccd971131e49f4373fad1074f15c004c";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sk/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sk/thunderbird-68.8.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
sha512 = "1aa04c5702a89099645616f7aee86a507cc5c54f3a62696eaef17d6ca161ded644285d77782ff940c2ab128d2ff9f4c5b385999da9de678837ecf91d00f88f16";
sha512 = "933e45cb5ee1832ad27aefed0ed99077957374727b00a227ae79a004add3fc395917e351d90ae522cf98fce50aafdccc86f3a74e5b4b7ec2e3fa5a9fd498a5df";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sl/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sl/thunderbird-68.8.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
sha512 = "afacff8423baa933c6e4b2282fc112636876dd97e607e9a63675fc5232907bf7b06dc50e1377aeedd3cc56dded6f3d71b47aa774dbea12217f6243c6182a2bf8";
sha512 = "b46ec4da60c666ad13fd31269c3e06e5b50b6f5d37ef89a4cafbcd7d30f60dc0b5de5ce318930ac0aee404c2a72eaeb97698bd2a1d077ec29dd0335256af6e40";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sq/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sq/thunderbird-68.8.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
sha512 = "6036f12337b129025c34906b8df0663ae210294d3914cceb9f97be907f058e9eaeafad2aa2e2c2ee79f83be3659a242ab2135cf7f240b34eee24dcf555aef40f";
sha512 = "fc4bfd6355fc462fbf196f326291d98659a1c0ba4a5d4d829ec9b184917e524d925b301b2e1aaf3f03b334786c4974f8e2f218c5f96d1ce71a6642c2f46a53c9";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sr/thunderbird-68.8.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
sha512 = "c48be7ba5b42ebd244c59a6188be08236974fabdf7cc30f3473add6b215c6c7ea80fd4ad4d739d7e62fe2f1043afb288d2a6f7e838bf0e17fcc68b5340806e45";
sha512 = "ef76ee6b540bed79743d223e80f997eb8c6bfb92085659df72d8360c3883ac4862b990334ed9412a2fde7eda01ea0a1bfc80adaf581feb54d5031c2352dda89f";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sv-SE/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sv-SE/thunderbird-68.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
sha512 = "c943304a7f40e715d1fb1194ba7f306538b917788306f02be10a86e1d01baf091b1bc58b417aad7775fba58cf90ddd8412a56cfbcf2f12e4f7581be34c328205";
sha512 = "f431dbcba41510823b489a80699af68c32801b3a994ad5b596fea564f007697c26e2ce3c8cce39f9b56eb102adf6cf701ae8cbefb7bee84e37fcfb91a39a49db";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/tr/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/tr/thunderbird-68.8.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
sha512 = "53d5c9d7db4a44ea3858c55377c0ab8f8d359440f86634a0ff5eefdaf0553dd2c7a9ca66112a2cd4fe3a8e6094cf9c1f16fe01119ab11f1a039f471fcba37609";
sha512 = "021b6f44f576e1b35e6e74d0ca40ab8b48def0f8f0159e7864929322cea2aedaadc3c9aa5e7294c1f91898b4eefed6f1032cf26afb560629308cd2ae081c56fa";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uk/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uk/thunderbird-68.8.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
sha512 = "8204e0ca96902f16b92a6e02c09a788362359af3a6566f8246055727d5a74736d0b9f8570a4671a1f69233a993e25676c730001dfef9a92d034edcb8b12a5f7f";
sha512 = "a2a14df4f815368a798f035a6d9a917bb88ed7e954e1ada08d1dd526b0c8e93653da2cfb7568912f1416eaa2912ce394d334a3fc38da32c5dd8cc9e8db920b4b";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uz/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uz/thunderbird-68.8.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
sha512 = "496d82507602cff8e48f43b9c63a696d24020b804ffda45f2027103c5f3768543db0f03051ef062e0076c16b78b31759f7d4a4878a45e7dfac1cc0e4e9d046cb";
sha512 = "2c63ab4db77702e8e975809f71e1a64fc2acf0bbafc8d24bb407ad5d3b79a9a20041320cf1716b2555b3d6843acc12762a07db4857acd6c1009f645198290a25";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/vi/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/vi/thunderbird-68.8.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
sha512 = "f360794ecb21ed3f90552797269ab6e89024591903eb53dcf6216b25bb4dbcdf94c2526672b94ba979717f90cce5bfb6329efb3b5a2b9bec7c3d4d06d339ac9e";
sha512 = "f68610e7f1df34209212d8db6620fd038b1e8f6a5ef430b8b23fb1bb9a3f51ce5da8b98e576561693d0dc125e5d428246e4cbfd38ee991e3d3695dcbeeffa05e";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-CN/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-CN/thunderbird-68.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
sha512 = "ec7274b2870206647fd853c30db4e30b3856896ce9c89d5d825363e9d4327d23a230c899abbb740036a8e060f1532007ba5936af010feea85318bdeb18f29e0d";
sha512 = "42bab5ba6dd11f185ed09b1826c1578b9f90caf8612558e6d4bc09038181f9559bece41eac9fb2060a21ddc11cee9522794fbfba3126b750ad1a283e3557be14";
}
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-TW/thunderbird-68.7.0.tar.bz2";
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-TW/thunderbird-68.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
sha512 = "f0fb6deda0813516753386ae69ddb7b6dce95ce89c6dfba3ba5828d80d9fe92e3eaf014e89ab56c4548d39932bbfe12d4b9c6c8ff66b77a9ebe4f7476a9f6be9";
sha512 = "6f6f5365976c0eae38f26e83248c9cff718433ad4d9757732d87289a876f3c0023df71907ff43434ee0dbf5ba8ee737a44f33d832979dc1e260edb003702f817";
}
];
}

4
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
version = "68.7.0";
version = "68.8.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
"0glskn3djf739v2dphs663a2lfg5b0lbk1vlwwbzwfj9wfshvk7l07ijp84143bamvgb0lhhh0c9zx4gy5jj3x1j4196m3s1c1n7rzs";
"18963ccclfvz85bkiy7dpxgzkf71yh4qjbr8hblwyha9d3h8xnm29mi1dd3a2bz05qi3ly1v3k5mrhcbivhy2can2ippsal6j8rky0s";
};
nativeBuildInputs = [

2
pkgs/applications/networking/p2p/torrential/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS";
homepage = "https://github.com/davidmhewitt/torrential";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

2
pkgs/applications/networking/ping/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A helpful tool that lets you debug what part of your API is causing you issues";
homepage = "https://github.com/jeremyvaartjes/ping";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

4
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -17,13 +17,13 @@ let
in stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "0d2559v0z1jnq6jlrvsgdf8p6gd27m8kwdnxckl1x0ygaxs50bqc";
sha256 = "0905374k4x647052sr27m2hgjcavbxdl0xd8n02vm5xa6whz239j";
};
postPatch = ''

2
pkgs/applications/office/agenda/default.nix
View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS";
homepage = "https://github.com/dahenson/agenda";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

2
pkgs/applications/office/envelope/default.nix
View File

@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Personal finance manager for elementary OS";
homepage = "https://github.com/cjfloss/envelope";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3Plus;
};

2
pkgs/applications/office/khronos/default.nix
View File

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Track each task's time in a simple inobtrusive way";
homepage = "https://github.com/lainsce/khronos";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

2
pkgs/applications/office/spice-up/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Create simple and beautiful presentations";
homepage = "https://github.com/Philip-Scott/Spice-up";
maintainers = with maintainers; [ samdroid-apps kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
# The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+
license = licenses.gpl3Plus;

2
pkgs/applications/office/timetable/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Plot out your own timetable for the week and organize it";
homepage = "https://github.com/lainsce/timetable";
maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers;
maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers;
license = licenses.gpl2Plus;
};
}

6
pkgs/applications/science/electronics/librepcb/default.nix
View File

@ -2,14 +2,14 @@
mkDerivation {
pname = "librepcb";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "LibrePCB";
repo = "LibrePCB";
fetchSubmodules = true;
rev = "56bc60d347ff67df0fe1d57807d03f0606de557f";
sha256 = "0z6jn5zawp0x5i9zda7l787jnsv3yl8aqwnpii3g4hsnf2q3hhrh";
rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535";
sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc";
};
enableParallelBuilding = true;

6
pkgs/applications/science/logic/elan/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "elan";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "kha";
repo = "elan";
rev = "v${version}";
sha256 = "17i8sn53hk03fsawpwfinm1w0nb6lcmdbk8ar2mxyhkxczd45vag";
sha256 = "0aw538shvpfbk481y0gw3z97nsazdnk8qh8fwsb6ji62p2r51v6f";
};
cargoSha256 = "1b2b200wci1lirnkbhfmravz85v8ly918qkr0nwg7dlmhvg9gjb0";
cargoSha256 = "0zg3q31z516049v9fhli4yxldx9fg31k2qfx4ag8rmyvpgy9xh6c";
nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/science/math/rofi-calc/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "rofi-calc";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92";
sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa";
};
nativeBuildInputs = [

2
pkgs/applications/science/physics/elmerfem/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.elmerfem.org/;
homepage = "https://elmerfem.org/";
description = "A finite element software for multiphysical problems.";
platforms = platforms.unix;
maintainers = [ maintainers.wulfsta ];

6
pkgs/applications/system/monitor/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "monitor";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "stsdc";
repo = "monitor";
rev = version;
sha256 ="194s9rjh3yd2c3rf3zwxsxr2lwqfswjazj39yiyccy0wcxmxpv34";
sha256 ="1gd2i7gja4k9j4xac8jnls3v41d6qqhmqradz2jbsxwm2sk3cgcf";
fetchSubmodules = true;
};
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
section in the NixOS manual.
'';
homepage = "https://github.com/stsdc/monitor";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};

6
pkgs/applications/version-management/git-and-tools/gitui/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
sha256 = "06x4a7ynq6vznjwdm0dhzlj9353skxz65xabwr5xxa85zp2a7vcm";
sha256 = "0ln959zsdn0w15kfyp5i4524hzzk23l31n9smi1md4jfj7jycbh1";
};
cargoSha256 = "08z3z1m0ik62gzj146a4imk4xx5n8sbvjs0w7gkclvlsvm9dp8q4";
cargoSha256 = "128g23pcccy07jcb4phlfag9ixh5fkwkaiyd7mxjh3wmhppjcx0i";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];

4
pkgs/applications/window-managers/sway/default.nix
View File

@ -2,7 +2,7 @@
, meson, ninja
, pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols
}:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev
pango cairo libinput libcap pam gdk-pixbuf
pango cairo libinput libcap pam gdk-pixbuf librsvg
wlroots wayland-protocols
];

12
pkgs/applications/window-managers/sway/wrapper.nix
View File

@ -2,7 +2,7 @@
, sway-unwrapped, swaybg
, makeWrapper, symlinkJoin, writeShellScriptBin
, withBaseWrapper ? true, extraSessionCommands ? "", dbus
, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf
, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3
, extraOptions ? [] # E.g.: [ "--verbose" ]
}:
@ -33,12 +33,14 @@ in symlinkJoin {
nativeBuildInputs = [ makeWrapper ]
++ (optional withGtkWrapper wrapGAppsHook);
buildInputs = optional withGtkWrapper gdk-pixbuf;
buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ];
# We want to run wrapProgram manually
dontWrapGApps = true;
postBuild = ''
# We want to run wrapProgram manually to only wrap sway and add swaybg:
export dontWrapGApps=true
${optionalString withGtkWrapper "wrapGAppsHook"}
${optionalString withGtkWrapper "gappsWrapperArgsHook"}
wrapProgram $out/bin/sway \
--prefix PATH : "${swaybg}/bin" \
${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9d50cd974714cdcfdaabd089923b571a66bae55a.tar.gz";
sha256 = "1hv4pxp47850l36ci2ywmc75c95fvdqr3swz9qymy25gd6rbfs9f";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a734b1438c8379ed3945412538ff4ec49823564c.tar.gz";
sha256 = "0y1y818n10fh0qq7cg67p9l293js78fyahk5f6s9w3c21xn9wn8r";
}

4
pkgs/desktops/xfce/core/xfconf/default.nix
View File

@ -3,9 +3,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfconf";
version = "4.14.1";
version = "4.14.3";
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
sha256 = "0yxpdcyz81di7w9493jzps09bgrlgianjj5abnzahqmkpmpvb0rh";
buildInputs = [ libxfce4util ];

2
pkgs/development/compilers/ghc/8.10.1.nix
View File

@ -27,7 +27,7 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no

2
pkgs/development/compilers/ghc/8.4.4.nix
View File

@ -24,7 +24,7 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no

2
pkgs/development/compilers/ghc/8.6.5.nix
View File

@ -27,7 +27,7 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no

2
pkgs/development/compilers/ghc/8.8.2.nix
View File

@ -27,7 +27,7 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no

2
pkgs/development/compilers/ghc/8.8.3.nix
View File

@ -27,7 +27,7 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no

8
pkgs/development/compilers/ghc/head.nix
View File

@ -32,10 +32,10 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "8.11.20200403"
, version ? "8.11.20200505"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -103,8 +103,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "4291bddaea3148908c55f235ee8978e1d9aa6f20";
sha256 = "1gs3mxmsdpsgsp7vnawx8mys0qwg4x2zhfrbciy3wv8nv13ar1af";
rev = "40c71c2cf38b4e134d81b7184a4d5e02949ae70c";
sha256 = "04h9rcyzm9w3an1z00hjs062dp7dl19b8pkyxjsypr7a2i9dmvkb";
};
enableParallelBuilding = true;

4
pkgs/development/compilers/mercury/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mercury";
version = "20.01.1";
version = "20.01.2";
src = fetchurl {
url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
sha256 = "0vxp9f0jmr228n13p6znhbxncav6ay0bnl4ypy6r3lw5lh7z172p";
sha256 = "084ml6kswgaqjgmib3gq7zjnqsimz3f35w13ff6z0dv4d9csmq4m";
};
buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper

4
pkgs/development/compilers/openjdk/13.nix
View File

@ -41,7 +41,7 @@ let
# so grab the work-around from
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
(fetchurl {
url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch;
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
})
] ++ lib.optionals (!headless && enableGnome2) [
@ -140,7 +140,7 @@ let
disallowedReferences = [ openjdk13-bootstrap ];
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/;
homepage = "http://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];

4
pkgs/development/coq-modules/bignums/default.nix
View File

@ -18,8 +18,8 @@ let params = {
sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01";
};
"8.10" = {
rev = "V8.10+beta1";
sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404";
rev = "V8.10.0";
sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5";
};
"8.11" = {
rev = "V8.11.0";

8
pkgs/development/coq-modules/contribs/default.nix
View File

@ -1031,10 +1031,10 @@ let mkContrib = repo: revs: param:
sha256 = "0iwkpmc22nwasrk4g7ki4s5y05zjs7kmqk3j98giwp2wiavhgapn";
};
zorns-lemma = mkContrib "zorns-lemma" [ "8.6" "8.7" "8.8" "8.9" ] {
version = "v8.9.0";
rev = "6ac9bb914f6017cdd9a544ff4b0bef73fd33b44c";
sha256 = "1vdsl5gxpadkjjjw314s4fawzlssdmp4qkwrjz5qdmyl2dcpil4p";
zorns-lemma = mkContrib "zorns-lemma" [ "8.10" "8.11" ] {
version = "v8.11.0";
rev = "a573b50fff994f996b8e15dec2079490a5233dc6";
sha256 = "0jbp1ay6abal66glbablbqsh5hzgd5fv81dc1vzn65jw0iiznxyq";
};
zsearch-trees = mkContrib "zsearch-trees" [ "8.6" "8.7" ] {

6
pkgs/development/coq-modules/coq-bits/default.nix
View File

@ -9,9 +9,9 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "coq-community";
repo = "coq-bits";
rev = "f74498a6c67e97d9565e139d62be8eaae7111f06";
sha256 = "1ibg37qxgkmpbpvc78qcb179bcnzl149z1kzwdm8n98xk5ibavrf";
repo = "bits";
rev = "1.0.0";
sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
};
buildInputs = [ coq ];

42
pkgs/development/coq-modules/coqprime/default.nix
View File

@ -1,22 +1,26 @@
{ stdenv, fetchFromGitHub, coq, bignums }:
{ stdenv, which, fetchFromGitHub, coq, bignums }:
let params =
let v_8_8 = {
version = "8.8";
sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
};
in
{
"8.7" = {
version = "8.7.2";
sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
};
"8.8" = v_8_8;
"8.9" = v_8_8;
"8.10" = v_8_8;
};
param = params.${coq.coq-version}
; in
let
params =
let v_8_8 = {
version = "8.8";
sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
};
in
{
"8.7" = {
version = "8.7.2";
sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
};
"8.8" = v_8_8;
"8.9" = v_8_8;
"8.10" = {
version = "8.10";
sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
};
};
param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
inherit (param) sha256;
};
buildInputs = [ coq ];
buildInputs = [ which coq ];
propagatedBuildInputs = [ bignums ];

345
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -1,97 +1,151 @@
{ stdenv, fetchFromGitHub, ncurses, which, graphviz, coq,
recurseIntoAttrs, withDoc ? false
#############################
# Main derivation: mathcomp #
########################################################################
# This file mainly provides the `mathcomp` derivation, which is #
# essentially a meta-package containing all core mathcomp libraries #
# (ssreflect fingroup algebra solvable field character). They can be #
# accessed individually through the paththrough attributes of mathcomp #
# bearing the same names (mathcomp.ssreflect, etc). #
# #
# Do not use overrideAttrs, but overrideMathcomp instead, which #
# regenerate a full mathcomp derivation with sub-derivations, and #
# behave the same as `mathcomp_`, described below. #
########################################################################
############################################################
# Compiling a custom version of mathcomp using `mathcomp_` #
##############################################################################
# The prefered way to compile a custom version of mathcomp (other than a #
# released version which should be added to `mathcomp-config-initial` #
# and pushed to nixpkgs), is to apply the function `coqPackages.mathcomp_` #
# to either: #
# - a string without slash, which is interpreted as a github revision, #
# i.e. either a tag, a branch or a commit hash #
# - a string with slashes "owner/p_1/.../p_n", which is interpreted as #
# github owner "owner" and revision "p_1/.../p_n". #
# - a path which is interpreted as a local source for the repository, #
# the name of the version is taken to be the basename of the path #
# i.e. if the path is /home/you/git/package/branch/, #
# then "branch" is the name of the version #
# - an attribute set which overrides some attributes (e.g. the src) #
# if the version is updated, the name is automatically regenerated using #
# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" #
# - a "standard" override function (old: new_attrs) to override the default #
# attribute set, so that you can use old.${field} to patch the derivation. #
##############################################################################
#########################################################################
# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix #
#########################################################################
#################################
# Adding a new mathcomp version #
#############################################################################
# When adding a new version of mathcomp, add an attribute to `sha256` (use #
# ```sh #
# nix-prefetch-url --unpack #
# https://github.com/math-comp/math-comp/archive/version.tar.gz #
# ``` #
# to get the corresponding `sha256`) and to `coq-version` (read the release #
# notes to check which versions of coq it is compatible with). Then add #
# it in `preference version`, if not all mathcomp-extra packages are #
# ready, you might want to give new release secondary priority. #
#############################################################################
{ stdenv, fetchFromGitHub, ncurses, which, graphviz,
recurseIntoAttrs, withDoc ? false,
coqPackages,
mathcomp_, mathcomp, mathcomp-config,
}:
with builtins // stdenv.lib;
let
####################################
# CONFIGURATION (please edit this) #
####################################
# sha256 of released mathcomp versions
mathcomp-sha256 = {
"1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
"1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
"1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
"1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
"1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
mathcomp-config-initial = rec {
#######################################################################
# CONFIGURATION (please edit this), it is exported as mathcomp-config #
#######################################################################
# sha256 of released mathcomp versions
sha256 = {
"1.11.0+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm";
"1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
"1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
"1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
"1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
"1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
};
# versions of coq compatible with released mathcomp versions
coq-versions = {
"1.11.0+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
"1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
"1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ];
"1.8.0" = flip elem [ "8.7" "8.8" "8.9" ];
"1.7.0" = flip elem [ "8.6" "8.7" "8.8" "8.9" ];
"1.6.1" = flip elem [ "8.5"];
};
# sets the default version of mathcomp given a version of Coq
# this is currently computed using version-perference below
# but it can be set to a fixed version number
preferred-version = let v = head (
filter (mc: mathcomp-config.coq-versions.${mc} coq.coq-version)
mathcomp-config.version-preferences ++ ["0.0.0"]);
in if v == "0.0.0" then head mathcomp-config.version-preferences else v;
# mathcomp preferred versions by decreasing order
# (the first version in the list will be tried first)
version-preferences =
[ "1.10.0" "1.9.0" "1.11.0+beta1" "1.8.0" "1.7.0" "1.6.1" ];
# list of core mathcomp packages sorted by dependency order
packages = _version: # unused in current versions of mathcomp
# because the following list of packages is fixed for
# all versions of mathcomp up to 1.11.0
[ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ];
# compute the dependencies of the core package pkg
# (assuming the total ordering above, change if necessary)
deps = version: pkg: if pkg == "single" then [] else
(pred-split-list (x: x == pkg) (mathcomp-config.packages version)).left;
};
# versions of coq compatible with released mathcomp versions
mathcomp-coq-versions = {
"1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
"1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"];
"1.8.0" = flip elem ["8.7" "8.8" "8.9"];
"1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"];
"1.6.1" = flip elem ["8.5"];
};
# computes the default version of mathcomp given a version of Coq
max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));
# mathcomp prefered version by decreasing order
# (the first version in the list will be tried first)
mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ];
##############################################################
# COMPUTED using the configuration above (edit with caution) #
##############################################################
default-mathcomp-version = let v = head (
filter (mc: mathcomp-coq-versions.${mc} coq.coq-version)
mathcomp-version-preference ++ ["0.0.0"]);
in if v == "0.0.0" then max-mathcomp-version else v;
# list of core mathcomp packages sorted by dependency order
mathcomp-packages =
[ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ];
# compute the dependencies of the core package pkg
# (assuming the total ordering above, rewrite if necessary)
mathcomp-deps = pkg: if pkg == "single" then [] else
(split (x: x == pkg) mathcomp-packages).left;
# generic split function (TODO: move to lib?)
split = pred: l:
pred-split-list = pred: l:
let loop = v: l: if l == [] then {left = v; right = [];}
else let hd = builtins.head l; tl = builtins.tail l; in
if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl;
in loop [] l;
# exported, documented at the end.
mathcompGen = mkMathcompGenFrom (_: {}) mathcomp-packages;
pkgUp = l: r: l // r // {
meta = (l.meta or {}) // (r.meta or {});
passthru = (l.passthru or {}) // (r.passthru or {});
};
# exported, documented at the end.
mathcompGenSingle = mkMathcompGen (_: {}) "single";
coq = coqPackages.coq;
mathcomp-deps = mathcomp-config.deps mathcomp.config.preferred-version;
# mkMathcompGen: internal mathcomp package generator
# returns {error = ...} if impossible to generate
# returns {${mathcomp-pkg} = <derivation>} otherwise
mkMathcompGenFrom = o: l: mcv: fold (pkg: pkgs: pkgs // mkMathcompGen o pkg mcv) {} l;
mkMathcompGen = overrides: mathcomp-pkg: mathcomp-version:
# default set of attributes given a 'package' name.
# this attribute set will be extended using toOverrideFun
default-attrs = package:
let
coq-version-check = mathcomp-coq-versions.${mathcomp-version} or (_: false);
pkgpath = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp/${mathcomp-pkg}";
pkgname = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp-${mathcomp-pkg}";
pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}";
pkgname = if package == "single" then "mathcomp" else "mathcomp-${package}";
pkgallMake = ''
echo "all.v" > Make
echo "-I ." >> Make
echo "-R . mathcomp.all" >> Make
echo "all.v" > Make
echo "-I ." >> Make
echo "-R . mathcomp.all" >> Make
'';
is-released = builtins.isString mathcomp-version;
custom-version = if is-released then mathcomp-version else "custom";
# the base set of attributes for mathcomp
attrs = {
name = "coq${coq.coq-version}-${pkgname}-${custom-version}";
# used in ssreflect
version = custom-version;
src = if is-released then fetchFromGitHub {
owner = "math-comp";
repo = "math-comp";
rev = "mathcomp-${mathcomp-version}";
sha256 = mathcomp-sha256.${mathcomp-version};
} else mathcomp-version;
in
rec {
version = "master";
name = "coq${coq.coq-version}-${pkgname}-${version}";
nativeBuildInputs = optionals withDoc [ graphviz ];
buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
propagatedBuildInputs = [ coq ] ++
attrValues (mkMathcompGenFrom overrides (mathcomp-deps mathcomp-pkg) mathcomp-version);
propagatedBuildInputs = [ coq ];
enableParallelBuilding = true;
buildFlags = optional withDoc "doc";
@ -101,7 +155,7 @@ let
preBuild = ''
patchShebangs etc/utils/ssrcoqdep || true
cd ${pkgpath}
'' + optionalString (mathcomp-pkg == "all") pkgallMake;
'' + optionalString (package == "all") pkgallMake;
installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
@ -110,67 +164,98 @@ let
'';
meta = with stdenv.lib; {
homepage = "https://math-comp.github.io/";
license = licenses.cecill-b;
maintainers = [ maintainers.vbgl maintainers.jwiegley ];
platforms = coq.meta.platforms;
homepage = "https://math-comp.github.io/";
license = licenses.cecill-b;
maintainers = [ maintainers.vbgl maintainers.jwiegley maintainers.cohencyril ];
platforms = coq.meta.platforms;
};
passthru = {
compatibleCoqVersions = coq-version-check;
currentOverrides = overrides;
overrideMathcomp = moreOverrides:
(mkMathcompGen (old: let new = overrides old; in new // moreOverrides new)
mathcomp-pkg mathcomp-version).${mathcomp-pkg};
mathcompGen = moreOverrides:
(mkMathcompGenFrom (old: let new = overrides old; in new // moreOverrides new)
mathcomp-packages mathcomp-version);
mathcompDeps = mathcomp-deps package;
inherit package mathcomp-config;
compatibleCoqVersions = _: true;
};
};
# converts a string, path or attribute set into an override function
toOverrideFun = overrides:
if isFunction overrides then overrides else old:
let
pkgname = if old.passthru.package == "single" then "mathcomp"
else "mathcomp-${old.passthru.package}";
string-attrs = if hasAttr overrides mathcomp-config.sha256 then
let version = overrides;
in {
inherit version;
src = fetchFromGitHub {
owner = "math-comp";
repo = "math-comp";
rev = "mathcomp-${version}";
sha256 = mathcomp-config.sha256.${version};
};
passthru = old.passthru // {
compatibleCoqVersions = mathcomp-config.coq-versions.${version};
mathcompDeps = mathcomp-config.deps version old.passthru.package;
};
}
else
let splitted = filter isString (split "/" overrides);
owner = head splitted;
ref = concatStringsSep "/" (tail splitted);
version = head (reverseList splitted);
in if length splitted == 1 then {
inherit version;
src = fetchTarball "https://github.com/math-comp/math-comp/archive/${version}.tar.gz";
} else {
inherit version;
src = fetchTarball "https://github.com/${owner}/math-comp/archive/${ref}.tar.gz";
};
attrs =
if overrides == null || overrides == "" then _: {}
else if isString overrides then string-attrs
else if isPath overrides then { version = baseNameOf overrides; src = overrides; }
else if isAttrs overrides then pkgUp old overrides
else let overridesStr = toString overrides; in
abort "${overridesStr} not a legitimate overrides";
in
attrs // (if attrs?version && ! (attrs?name)
then { name = "coq${coq.coq-version}-${pkgname}-${attrs.version}"; } else {});
# generates {ssreflect = «derivation ...» ; ... ; character = «derivation ...», ...}
mkMathcompGenSet = pkgs: o:
fold (pkg: pkgs: pkgs // {${pkg} = mkMathcompGen pkg o;}) {} pkgs;
# generates the derivation of one mathcomp package.
mkMathcompGen = package: overrides:
let
up = x: o: x // (toOverrideFun o x);
fixdeps = attrs:
let version = attrs.version or "master";
mcdeps = if package == "single" then {}
else mkMathcompGenSet (filter isString attrs.passthru.mathcompDeps) overrides;
allmc = mkMathcompGenSet (mathcomp-config.packages version ++ [ "single" ]) overrides;
in {
propagatedBuildInputs = [ coq ]
++ filter isDerivation attrs.passthru.mathcompDeps
++ attrValues mcdeps
;
passthru = allmc //
{ overrideMathcomp = o: mathcomp_ (old: up (up old overrides) o); };
};
in
{${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);};
getAttrOr = a: n: a.${n} or (throw a.error);
mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
mathcompCorePkgs_1_10 = mathcompGen "1.10.0";
mathcompCorePkgs = recurseIntoAttrs
(mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
in {
# mathcompGenSingle: given a version of mathcomp
# generates an attribute set {single = <drv>;} with the single mathcomp derivation
inherit mathcompGenSingle;
mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single";
mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single";
mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single";
mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single";
mathcomp_single = dontDistribute
(getAttrOr (mathcompGenSingle default-mathcomp-version) "single");
# mathcompGen: given a version of mathcomp
# generates an attribute set {ssreflect = <drv>; ... character = <drv>; all = <drv>;}.
# each of these have a special attribute overrideMathcomp which
# must be used instead of overrideAttrs in order to also fix the dependencies
inherit mathcompGen mathcompCorePkgs
mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9
mathcompCorePkgs_1_10
;
mathcomp = getAttrOr mathcompCorePkgs "all";
mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all";
mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all";
mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all";
mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all";
ssreflect = getAttrOr mathcompCorePkgs "ssreflect";
} //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10)
stdenv.mkDerivation (up (up (default-attrs package) overrides) fixdeps);
in
{
mathcomp-config = mathcomp-config-initial;
mathcomp_ = mkMathcompGen "all";
mathcomp = mathcomp_ mathcomp-config.preferred-version;
# mathcomp-single = mathcomp.single;
ssreflect = mathcomp.ssreflect;
mathcomp-ssreflect = mathcomp.ssreflect;
mathcomp-fingroup = mathcomp.fingroup;
mathcomp-algebra = mathcomp.algebra;
mathcomp-solvable = mathcomp.solvable;
mathcomp-field = mathcomp.field;
mathcomp-character = mathcomp.character;
}

541
pkgs/development/coq-modules/mathcomp/extra.nix
View File

@ -1,202 +1,371 @@
{ stdenv, fetchFromGitHub, coq, ssreflect, coqPackages,
recurseIntoAttrs }:
##########################################################
# Main derivation: #
# mathcomp-finmap mathcomp-analysis mathcomp-bigenough #
# mathcomp-multinomials mathcomp-real-closed coqeal #
# Additionally: #
# mathcomp-extra-all contains all the extra packages #
# mathcomp-extra-fast contains the one not marked slow #
########################################################################
# This file mainly provides the above derivations, which are packages #
# extra mathcomp libraries based on mathcomp. #
########################################################################
#####################################################
# Compiling customs versions using `mathcomp-extra` #
##############################################################################
# The prefered way to compile a custom version of mathcomp extra packages #
# (other than released versions which should be added to #
# `rec-mathcomp-extra-config` and pushed to nixpkgs, see below), #
# is to use `coqPackages.mathcomp-extra name version` where #
# 1. `name` is a string representing the name of a declared package #
# OR undeclared package. #
# 2. `version` is either: #
# - a string without slash, which is interpreted as a github revision, #
# i.e. either a tag, a branch or a commit hash #
# - a string with slashes "owner/p_1/.../p_n", which is interpreted as #
# github owner "owner" and revision "p_1/.../p_n". #
# - a path which is interpreted as a local source for the repository, #
# the name of the version is taken to be the basename of the path #
# i.e. if the path is /home/you/git/package/branch/, #
# then "branch" is the name of the version #
# - an attribute set which overrides some attributes (e.g. the src) #
# if the version is updated, the name is automatically regenerated using #
# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" #
# - a "standard" override function (old: new_attrs) to override the default #
# attribute set, so that you can use old.${field} to patch the derivation. #
# #
# Should you choose to use `pkg.overrideAttrs` instead, we provide the #
# function mathcomp-extra-override which takes a name and a version exactly #
# as above and returns an override function. #
##############################################################################
#########################################################################
# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix #
#########################################################################
###########################################
# Adding a new package or package version #
################################################################################
# 1. Update or add a `package` entry to `initial`, it must be a function #
# taking the version as argument and returning an attribute set. Everything #
# is optional and the default for the sources of the repository and the #
# homepage will be https://github.com/math-comp/${package}. #
# #
# 2. Update or add a `package` entry to `sha256` for each release. #
# You may use #
# ```sh #
# nix-prefetch-url --unpack #
# https://github.com/math-comp/math-comp/archive/version.tar.gz #
# ``` #
# #
# 3. Update or create a new consistent set of extra packages. #
# /!\ They must all be co-compatible. /!\ #
# Do not use versions that may disappear: it must either be #
# - a tag from the main repository (e.g. version or tag), or #
# - a revision hash that has been *merged in master* #
################################################################################
{ stdenv, fetchFromGitHub, recurseIntoAttrs,
which, mathcomp, coqPackages,
mathcomp-extra-config, mathcomp-extra-override,
mathcomp-extra, current-mathcomp-extra,
}:
with builtins // stdenv.lib;
let current-ssreflect = ssreflect; in
let
# configuring packages
param = {
finmap = {
version-sha256 = {
"1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf";
"1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
"1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
"1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa";
};
description = "A finset and finmap library";
};
bigenough = {
version-sha256 = {"1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";};
description = "A small library to do epsilon - N reasonning";
};
multinomials = {
version-sha256 = {
"1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
"1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
"1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
"1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
};
description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
};
analysis = {
version-sha256 = {
"0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk";
"0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
"0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
};
compatibleCoqVersions = flip elem ["8.8" "8.9"];
description = "Analysis library compatible with Mathematical Components";
license = stdenv.lib.licenses.cecill-c;
};
real-closed = {
version-sha256 = {
"1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
"1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl";
"1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
};
description = "Mathematical Components Library on real closed fields";
};
coqeal = {
version-sha256 = {
"1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii";
};
description = "CoqEAL - The Coq Effective Algebra Library";
owner = "CoqEAL";
compatibleCoqVersions = flip elem ["8.7" "8.8" "8.9"];
license = stdenv.lib.licenses.mit;
};
};
versions = {
"1.9.0" = {
finmap.version = "1.2.1";
bigenough.version = "1.0.0";
analysis = {
version = "0.2.2";
core-deps = with coqPackages; [ mathcomp-field_1_9 ];
extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];
};
multinomials = {
version = "1.3";
core-deps = with coqPackages; [ mathcomp-algebra_1_9 ];
extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];
};
real-closed = {
version = "1.0.3";
core-deps = with coqPackages; [ mathcomp-field_1_9 ];
extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ];
};
};
"1.8.0" = {
finmap.version = "1.2.1";
bigenough.version = "1.0.0";
analysis = {
version = "0.2.2";
core-deps = with coqPackages; [ mathcomp-field_1_8 ];
extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];
};
multinomials = {
version = "1.3";
core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];
extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];
};
real-closed = {
version = "1.0.3";
core-deps = with coqPackages; [ mathcomp-field_1_8 ];
extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ];
};
coqeal = {
version = "1.0.0";
core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];
extra-deps = with coqPackages; [ bignums paramcoq mathcomp_1_8-multinomials ];
};
};
"1.7.0" = {
finmap.version = "1.1.0";
bigenough.version = "1.0.0";
analysis = {
version = "0.1.0";
core-deps = with coqPackages; [ mathcomp-field_1_7 ];
extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ];
};
multinomials = {
version = "1.1";
core-deps = with coqPackages; [ mathcomp-algebra_1_7 ];
extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ];
};
real-closed = {
version = "1.0.1";
core-deps = with coqPackages; [ mathcomp-field_1_7 ];
extra-deps = with coqPackages; [ mathcomp_1_7-bigenough ];
};
};
};
##############################
# CONFIGURATION, please edit #
##############################
############################
# Packages base delaration #
############################
rec-mathcomp-extra-config = {
initial = {
mathcomp-finmap = version: {
meta = {
description = "A finset and finmap library";
repo = "finmap";
homepage = "https://github.com/math-comp/finmap";
};
passthru.compatibleCoqVersions = flip elem [ "8.8" "8.9" "8.10" "8.11" ];
};
# generic package generator
packageGen = {
# optional arguments
src ? "",
owner ? "math-comp",
extra-deps ? [],
ssreflect ? current-ssreflect,
core-deps ? null,
compatibleCoqVersions ? null,
license ? ssreflect.meta.license,
# mandatory
package, version ? "broken", version-sha256, description
}:
let
theCompatibleCoqVersions = if compatibleCoqVersions == null
then ssreflect.compatibleCoqVersions
else compatibleCoqVersions;
mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;
in
{ ${package} = let from = src; in
mathcomp-bigenough = version: {
meta = {
description = "A small library to do epsilon - N reasonning";
repo = "bigenough";
homepage = "https://github.com/math-comp/bigenough";
};
passthru.compatibleCoqVersions = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
};
stdenv.mkDerivation rec {
inherit version;
name = "coq${coq.coq-version}-mathcomp${ssreflect.version}-${package}-${version}";
multinomials = version: {
buildInputs = [ which ];
propagatedBuildInputs = with coqPackages;
[ mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];
meta = {
description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
repo = "multinomials";
homepage = "https://github.com/math-comp/multinomials";
};
passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ];
};
src = if from == "" then fetchFromGitHub {
owner = owner;
repo = package;
rev = version;
sha256 = version-sha256.${version};
} else from;
mathcomp-analysis = version: {
propagatedBuildInputs = with coqPackages;
[ mathcomp.field mathcomp-finmap mathcomp-bigenough ];
meta = {
description = "Analysis library compatible with Mathematical Components";
homepage = "https://github.com/math-comp/analysis";
repo = "analysis";
license = stdenv.lib.licenses.cecill-c;
};
passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ];
};
propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;
mathcomp-real-closed = version: {
propagatedBuildInputs = with coqPackages;
[ coq mathcomp.field mathcomp-bigenough ];
meta = {
description = "Mathematical Components Library on real closed fields";
repo = "real-closed";
homepage = "https://github.com/math-comp/real-closed";
};
passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ];
};
coqeal = version: {
buildInputs = [ which ];
propagatedBuildInputs = with coqPackages;
[ mathcomp-algebra bignums paramcoq multinomials ];
meta = {
description = "CoqEAL - The Coq Effective Algebra Library";
homepage = "https://github.com/coqeal/coqeal";
license = stdenv.lib.licenses.mit;
owner = "CoqEAL";
};
passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ];
};
};
###############################
# sha256 of released versions #
###############################
sha256 = {
mathcomp-finmap = {
"1.5.0" = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq";
"1.4.1" = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p";
"1.4.0+coq-8.11" = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb";
"1.4.0" = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd";
"1.3.4" = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii";
"1.3.3" = "1n844zjhv354kp4g4pfbajix0plqh7yxv6471sgyb46885298am5";
"1.3.1" = "14rvm0rm5hd3pd0srgak3jqmddzfv6n7gdpjwhady5xcgrc7gsx7";
"1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf";
"1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
"1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
"1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa";
};
mathcomp-bigenough = {
"1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";
};
mathcomp-analysis = {
"0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
"0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk";
"0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
"0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
};
multinomials = {
"1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3";
"1.5" = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw";
"1.4" = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p";
"1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
"1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
"1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
"1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
};
mathcomp-real-closed = {
"1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2";
"1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b";
"1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
"1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl";
"1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
};
coqeal = {
"1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
"1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj";
"1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm";
"1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii";
};
};
################################
# CONSISTENT sets of packages. #
################################
for-coq-and-mc = let
v5 = {
mathcomp-finmap = "1.5.0";
mathcomp-bigenough = "1.0.0";
mathcomp-analysis = "678d3cc37f5f3c71b1bd550836eb44e3ba2a5459";
multinomials = "1.5.1";
mathcomp-real-closed = "1.0.5";
coqeal = "CohenCyril/bdfc96771644b082e41268edc43d61dc5fda2358";
};
v4 = v3 // { coqeal = "1.0.3"; };
v3 = {
mathcomp-finmap = "1.4.0";
mathcomp-bigenough = "1.0.0";
mathcomp-analysis = "0.2.3";
multinomials = "1.5";
mathcomp-real-closed = "1.0.4";
coqeal = "1.0.0";
};
v2 = {
mathcomp-finmap = "1.3.4";
mathcomp-bigenough = "1.0.0";
mathcomp-analysis = "0.2.3";
multinomials = "1.4";
mathcomp-real-closed = "1.0.3";
coqeal = "1.0.0";
};
v1 = {
mathcomp-finmap = "1.1.0";
mathcomp-bigenough = "1.0.0";
multinomials = "1.1";
mathcomp-real-closed = "1.0.1";
coqeal = "1.0.0";
};
in
{
"8.11" = {
"1.11.0+beta1" = v5;
"1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";};
};
"8.10" = {
"1.11.0+beta1" = v5;
"1.10.0" = v4;
"1.9.0" = removeAttrs v3 ["coqeal"];
};
"8.9" = {
"1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"];
"1.10.0" = v4;
"1.9.0" = removeAttrs v3 ["coqeal"];
"1.8.0" = removeAttrs v2 ["coqeal"];
};
"8.8" = {
"1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"];
"1.10.0" = removeAttrs v4 ["mathcomp-analysis"];
"1.9.0" = removeAttrs v3 ["coqeal"];
"1.8.0" = removeAttrs v2 ["coqeal"];
"1.7.0" = removeAttrs v1 ["coqeal" "multinomials"];
};
"8.7" = {
"1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"];
"1.10.0" = removeAttrs v4 ["mathcomp-analysis"];
"1.9.0" = removeAttrs v3 ["coqeal"];
"1.8.0" = removeAttrs v2 ["coqeal"];
"1.7.0" = removeAttrs v1 ["coqeal" "multinomials"];
};
};
};
##############################
# GENERATION, EDIT WITH CARE #
##############################
coq = coqPackages.coq;
default-attrs = {
version = "master";
buildInputs = [];
propagatedBuildInputs = (with coqPackages; [ ssreflect ]);
installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = {
inherit description;
inherit license;
inherit (src.meta) homepage;
inherit (ssreflect.meta) platforms;
maintainers = [ stdenv.lib.maintainers.vbgl ];
broken = (version == "broken");
inherit (mathcomp.meta) platforms license;
owner = "math-comp";
maintainers = [ maintainers.vbgl maintainers.cohencyril ];
};
passthru = {
inherit version-sha256;
compatibleCoqVersions = if meta.broken then _: false
else theCompatibleCoqVersions;
};
};
passthru.compatibleCoqVersions = (_: true);
};
current-versions = versions.${current-ssreflect.version} or {};
pkgUp = recursiveUpdateUntil (path: l: r: !(isAttrs l && isAttrs r) || path == ["src"]);
select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);
# Fixes a partial attribute set using the configuration
# in the style of the above mathcomp-extra-config.initial,
# and generates a name according to the conventional naming scheme below
fix-attrs = pkgcfg:
let attrs = pkgUp default-attrs pkgcfg; in
pkgUp attrs (rec {
name = "coq${coq.coq-version}mathcomp${mathcomp.version}-${attrs.meta.repo or attrs.meta.package or "anonymous"}-${attrs.version}";
src = attrs.src or (fetchTarball "${meta.homepage}/archive/${attrs.version}.tar.gz");
meta = rec {
homepage = attrs.meta.homepage or attrs.src.meta.homepage or "https://github.com/${owner}/${repo}";
owner = attrs.meta.owner or "math-comp";
repo = attrs.meta.repo or attrs.meta.package or "math-comp-nix";
};
});
for-version = v: suffix: (mapAttrs' (n: pkg:
{name = "mathcomp_${suffix}-${n}";
value = (packageGen ({
ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";
} // pkg)).${n};})
(select versions.${v}));
# Gets a version out of a string, path or attribute set.
getVersion = arg:
if isFunction arg then (arg {}).version
else if arg == "" then "master"
else if isDerivation arg then arg.drvAttrs.version or "master"
else if isAttrs arg then arg.version or "master"
else if isString arg then head (reverseList (split "/" arg))
else if isPath arg then (baseNameOf arg)
else "master";
all = (for-version "1.7.0" "1_7") //
(for-version "1.8.0" "1_8") //
(for-version "1.9.0" "1_9") //
(recurseIntoAttrs (mapDerivationAttrset dontDistribute (
mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};})
(select current-versions))));
# Converts a string, path or attribute set into an override function
# It tries to fill the `old` argument of the override function using
# `mathcomp-extra-config.initial` first and finishes with `fix-attrs`
rec-mathcomp-extra-override = generic: old: let
version = getVersion generic;
package = old.meta.package or "math-comp-nix";
cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {})) version) old
// { inherit version; };
fix = attrs: fix-attrs (pkgUp cfg attrs);
in
if isFunction generic then fix (generic cfg)
else if generic == null || generic == "" then fix {}
else if isDerivation generic then fix generic.drvAttrs
else if isAttrs generic then fix generic
else if generic == "broken" then fix { meta.broken = true; passthru.compatibleCoqVersions = _: false; }
else let fixedcfg = fix cfg; in fixedcfg // (
if isString generic then
if (mathcomp-extra-config.sha256.${package} or {})?${generic} then {
src = fetchFromGitHub {
inherit (fixedcfg.meta) owner repo;
rev = version;
sha256 = mathcomp-extra-config.sha256.${package}.${version};
};
}
else let splitted = filter isString (split "/" generic); in {
src = fetchTarball
("https://github.com/" +
(if length splitted == 1 then "${fixedcfg.meta.owner}/${fixedcfg.meta.repo}/archive/${version}.tar.gz"
else "${head splitted}/${fixedcfg.meta.repo}/archive/${concatStringsSep "/" (tail splitted)}.tar.gz"));
}
else if isPath generic then { src = generic; }
else abort "${toString generic} not a legitimate generic version/override");
# applies mathcomp-extra-config.for-coq-and-mc to the current mathcomp version
for-this = mathcomp-extra-config.for-coq-and-mc.${coq.coq-version}.${mathcomp.version} or {};
# specializes mathcomp-extra to the current mathcomp version.
rec-current-mathcomp-extra = package: mathcomp-extra package (for-this.${package} or {});
in
{
mathcompExtraGen = packageGen;
mathcomp_1_7-finmap_1_0 =
(packageGen (select {finmap = {version = "1.0.0";
ssreflect = coqPackages.mathcomp-ssreflect_1_7;};
}).finmap).finmap;
multinomials = all.mathcomp-multinomials;
coqeal = all.mathcomp-coqeal;
} // all
{
mathcomp-extra-override = rec-mathcomp-extra-override;
mathcomp-extra-config = rec-mathcomp-extra-config;
current-mathcomp-extra = rec-current-mathcomp-extra;
mathcomp-extra = package: version:
stdenv.mkDerivation (mathcomp-extra-override version {meta = {inherit package;};});
mathcomp-finmap = current-mathcomp-extra "mathcomp-finmap";
mathcomp-analysis = current-mathcomp-extra "mathcomp-analysis";
mathcomp-bigenough = current-mathcomp-extra "mathcomp-bigenough";
multinomials = current-mathcomp-extra "multinomials";
mathcomp-real-closed = current-mathcomp-extra "mathcomp-real-closed";
coqeal = current-mathcomp-extra "coqeal";
mathcomp-extra-fast = map (pkg: current-mathcomp-extra pkg)
(attrNames (filterAttrs (pkg: config: !(config?slow && config.slow)) for-this));
mathcomp-extra-all = map (pkg: current-mathcomp-extra pkg) (attrNames for-this);
}

32
pkgs/development/coq-modules/ssreflect/default.nix
View File

@ -1,32 +0,0 @@
{ stdenv, coq, ncurses, which
, graphviz, mathcomp, withDoc ? false
}:
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-ssreflect-${version}";
inherit (mathcomp) src version meta;
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
enableParallelBuilding = true;
COQBIN = "${coq}/bin/";
preBuild = ''
patchShebangs etc/utils/ssrcoqdep || true
cd mathcomp/ssreflect
'';
installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
'';
postInstall = stdenv.lib.optionalString withDoc ''
mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
'';
passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions;
}

36
pkgs/development/dotnet-modules/python-language-server/create_deps.sh Executable file
View File

@ -0,0 +1,36 @@
#! /usr/bin/env nix-shell
#! nix-shell -p python3 dotnet-sdk_3 -i bash
# Run this script to generate deps.nix
# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
if [ -d "$1" ]; then
CHECKOUT_PATH="$1"
else
echo "First argument must be a directory, the path to the Microsoft Python Language Server source checkout"
exit 1
fi
# Generate lockfiles in source checkout
cd $CHECKOUT_PATH/src
dotnet nuget locals all --clear
dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64
# Use the lockfiles to make a file with two columns: name and version number
# for all possible package dependencies
cd $SCRIPTDIR
echo "" > all_versions.txt
for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do
echo "Processing lockfile $lockfile"
python ./process_lockfile.py "$lockfile" >> all_versions.txt
done
# Add extra manually added packages
cat ./manual_deps.txt >> all_versions.txt
cat all_versions.txt | sed '/^$/d' | sort | uniq > tmp
mv tmp all_versions.txt
# Retrieve sha256 hashes for each dependency and format fetchNuGet calls into deps.nix
./format-deps.sh all_versions.txt > deps.nix
rm all_versions.txt

104
pkgs/development/dotnet-modules/python-language-server/default.nix Normal file
View File

@ -0,0 +1,104 @@
{ stdenv
, fetchFromGitHub
, fetchurl
, makeWrapper
, dotnet-sdk_3
, openssl
, icu
, patchelf
, Nuget
}:
let deps = import ./deps.nix { inherit fetchurl; };
version = "2020-04-24";
# Build the nuget source needed for the later build all by itself
# since it's a time-consuming step that only depends on ./deps.nix.
# This makes it easier to experiment with the main build.
nugetSource = stdenv.mkDerivation {
pname = "python-language-server-nuget-deps";
inherit version;
dontUnpack = true;
nativeBuildInputs = [ Nuget ];
buildPhase = ''
export HOME=$(mktemp -d)
mkdir -p $out/lib
# disable default-source so nuget does not try to download from online-repo
nuget sources Disable -Name "nuget.org"
# add all dependencies to the source
for package in ${toString deps}; do
nuget add $package -Source $out/lib
done
'';
dontInstall = true;
};
in
stdenv.mkDerivation {
pname = "python-language-server";
inherit version;
src = fetchFromGitHub {
owner = "microsoft";
repo = "python-language-server";
rev = "d480cd12649dcff78ed271c92c274fab60c00f2f";
sha256 = "0p2sw6w6fymdlxn8r5ndvija2l7rd77f5rddq9n71dxj1nicljh3";
};
buildInputs = [dotnet-sdk_3 openssl icu];
nativeBuildInputs = [
Nuget
makeWrapper
patchelf
];
buildPhase = ''
mkdir home
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
pushd src
nuget sources Disable -Name "nuget.org"
dotnet restore --source ${nugetSource}/lib -r linux-x64
popd
pushd src/LanguageServer/Impl
dotnet publish --no-restore -c Release -r linux-x64
popd
'';
installPhase = ''
mkdir -p $out
cp -r output/bin/Release/linux-x64/publish $out/lib
mkdir $out/bin
makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server
'';
postFixup = ''
patchelf --set-rpath ${icu}/lib $out/lib/System.Globalization.Native.so
patchelf --set-rpath ${openssl.out}/lib $out/lib/System.Security.Cryptography.Native.OpenSsl.so
'';
# If we don't disable stripping, the executable fails to start with an error about being unable
# to find some of the packaged DLLs.
dontStrip = true;
meta = with stdenv.lib; {
description = "Microsoft Language Server for Python";
homepage = "https://github.com/microsoft/python-language-server";
license = licenses.asl20;
maintainers = with maintainers; [ thomasjm ];
platforms = [ "x86_64-linux" ];
};
}

1321
pkgs/development/dotnet-modules/python-language-server/deps.nix generated Normal file
View File

File diff suppressed because it is too large Load Diff

40
pkgs/development/dotnet-modules/python-language-server/format-deps.sh Executable file
View File

@ -0,0 +1,40 @@
#! /usr/bin/env nix-shell
#! nix-shell -p gawk nix -i bash
# Retrieve sha256 hashes for each dependency in and format fetchNuGet calls
echo "" > deps.nix
urlbase="https://www.nuget.org/api/v2/package"
cat << EOL
# This file is autogenerated.
# To regenerate, run "create_deps.sh \$PATH_TO_LANGUAGE_SERVER_CHECKOUT"
{ fetchurl }: let
fetchNuGet = { name, version, sha256 }: fetchurl {
inherit sha256;
url = "$urlbase/\${name}/\${version}";
};
in [
EOL
IFS=''
while read line; do
name=$(echo $line | awk '{print $1}')
version=$(echo $line | awk '{print $2}')
sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null)
if [ -n "$sha256" ]; then
cat << EOL
(fetchNuGet {
name = "$name";
version = "$version";
sha256 = "$sha256";
})
EOL
fi
done < $1
cat << EOL
]
EOL

14
pkgs/development/dotnet-modules/python-language-server/manual_deps.txt Normal file
View File

@ -0,0 +1,14 @@
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3
Microsoft.AspNetCore.App.Ref 3.0.1
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2
Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3
Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2
Microsoft.NetCore.App.Ref 3.1.0
Microsoft.NetCore.App.Ref 3.0.0
Microsoft.NetCore.App.Runtime.linux-x64 3.1.3
Microsoft.NetCore.App.Runtime.linux-x64 3.1.2
Microsoft.NetCore.App.Runtime.linux-x64 3.0.2
Microsoft.NetCore.App.Runtime.linux-x64 3.0.3
Microsoft.NetCore.App.Host.linux-x64 3.1.3
Microsoft.NetCore.App.Host.linux-x64 3.0.2
Microsoft.NetCore.App.Host.linux-x64 3.0.3

37
pkgs/development/dotnet-modules/python-language-server/process_lockfile.py Executable file
View File

@ -0,0 +1,37 @@
#!/usr/bin/python
import json
import sys
def process_section(name, section):
packages = set()
if "resolved" in section:
packages.add((name, section["resolved"]))
if "dependencies" in section:
for name in section["dependencies"]:
packages.add((name, section["dependencies"][name]))
return packages
def main():
with open(sys.argv[1], 'r') as f:
tree = json.loads(f.read())
packages = set()
topDependencies = tree["dependencies"]
for area in topDependencies:
for name in topDependencies[area]:
packages = packages.union(process_section(name, topDependencies[area][name]))
for (name, version) in packages:
print("%s %s" % (name, version))
if __name__ == "__main__":
main()

29
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -71,7 +71,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy";
sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -333,6 +333,7 @@ self: super: {
nats-queue = dontCheck super.nats-queue;
netpbm = dontCheck super.netpbm;
network = dontCheck super.network;
network_2_6_3_1 = dontCheck super.network_2_6_3_1;
network-dbus = dontCheck super.network-dbus;
notcpp = dontCheck super.notcpp;
ntp-control = dontCheck super.ntp-control;
@ -1488,4 +1489,30 @@ self: super: {
selective = self.selective_0_4_1;
};
# Needed for ghcide
haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
};
# this will probably need to get updated with every ghcide update,
# we need an override because ghcide is tracking haskell-lsp closely.
ghcide = dontCheck (super.ghcide.override rec {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
haskell-lsp = self.haskell-lsp_0_19_0_0;
});
# stackage right now is not new enough for hlint-3.0
ghc-lib-parser-ex_8_10_0_6 = super.ghc-lib-parser-ex_8_10_0_6.override {
ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412;
};
hlint = super.hlint.override {
ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_6;
extra = self.extra_1_7_1;
filepattern = self.filepattern.override {
extra = self.extra_1_7_1;
};
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

12
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -132,11 +132,13 @@ self: super: {
url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch";
sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
});
dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch;
# https://github.com/ndmitchell/hlint/issues/959
hlint = super.hlint.override {
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser;
};
# https://github.com/commercialhaskell/pantry/issues/21
pantry = appendPatch super.pantry (pkgs.fetchpatch {
name = "add-cabal-3.2.x-support.patch";
url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch";
sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2";
excludes = ["package.yaml"];
});
}

147
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -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 15.10
# LTS Haskell 15.11
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@ -378,6 +378,8 @@ default-package-overrides:
- can-i-haz ==0.3.1.0
- ca-province-codes ==1.0.0.0
- carray ==0.1.6.8
- casa-client ==0.0.1
- casa-types ==0.0.1
- cased ==0.1.0.0
- case-insensitive ==1.2.1.0
- cases ==0.1.3.2
@ -574,7 +576,7 @@ default-package-overrides:
- data-tree-print ==0.1.0.2
- dataurl ==0.1.0.0
- DAV ==1.3.4
- dbus ==1.2.13
- dbus ==1.2.14
- debian-build ==0.10.2.0
- debug-trace-var ==0.2.0
- dec ==0.0.3
@ -664,7 +666,7 @@ default-package-overrides:
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- emacs-module ==0.1.1
- email-validate ==2.3.2.12
- email-validate ==2.3.2.13
- emojis ==0.1
- enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0
@ -897,6 +899,7 @@ default-package-overrides:
- groups ==0.4.1.0
- guarded-allocation ==0.0.1
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.8.0
- half ==0.3
- hamtsolo ==1.0.3
@ -1073,7 +1076,7 @@ default-package-overrides:
- hw-fingertree-strict ==0.1.2.0
- hw-hedgehog ==0.1.1.0
- hw-hspec-hedgehog ==0.1.1.0
- hw-int ==0.0.1.0
- hw-int ==0.0.2.0
- hw-ip ==2.4.2.0
- hw-json ==1.3.2.0
- hw-json-simd ==0.1.1.0
@ -1116,7 +1119,7 @@ default-package-overrides:
- incremental-parser ==0.4.0.1
- indents ==0.5.0.1
- indexed ==0.1.3
- indexed-list-literals ==0.2.1.2
- indexed-list-literals ==0.2.1.3
- indexed-profunctors ==0.1
- infer-license ==0.2.0
- inflections ==0.4.0.5
@ -1153,7 +1156,7 @@ default-package-overrides:
- ip6addr ==1.0.1
- iproute ==1.7.9
- IPv6Addr ==1.1.3
- ipynb ==0.1
- ipynb ==0.1.0.1
- ipython-kernel ==0.10.1.0
- irc ==0.6.1.0
- irc-client ==1.1.1.1
@ -1167,7 +1170,7 @@ default-package-overrides:
- ix-shapable ==0.1.0
- jack ==0.7.1.4
- jira-wiki-markup ==1.0.0
- jose ==0.8.2.0
- jose ==0.8.2.1
- jose-jwt ==0.8.0
- js-dgtable ==0.5.2
- js-flot ==0.8.3
@ -1196,7 +1199,7 @@ default-package-overrides:
- kind-generics-th ==0.2.1.0
- kmeans ==0.1.3
- koofr-client ==1.0.0.3
- kubernetes-webhook-haskell ==0.2.0.0
- kubernetes-webhook-haskell ==0.2.0.1
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==1.0.12
@ -1209,7 +1212,7 @@ default-package-overrides:
- language-java ==0.2.9
- language-javascript ==0.7.1.0
- language-protobuf ==1.0.1
- language-puppet ==1.4.6.2
- language-puppet ==1.4.6.3
- lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1
- lapack-ffi ==0.0.2
@ -1276,6 +1279,7 @@ default-package-overrides:
- lsp-test ==0.10.2.0
- lucid ==2.9.12
- lucid-extras ==0.2.2
- lukko ==0.1.1.2
- lzma ==0.0.0.3
- lzma-conduit ==1.2.1
- machines ==0.7
@ -1508,6 +1512,7 @@ default-package-overrides:
- pandoc-plot ==0.2.2.0
- pandoc-pyplot ==2.3.0.1
- pandoc-types ==1.20
- pantry ==0.4.0.1
- papillon ==0.1.1.1
- parallel ==3.2.2.0
- parallel-io ==0.3.3
@ -1659,8 +1664,8 @@ default-package-overrides:
- PyF ==0.9.0.1
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qrcode-core ==0.9.2
- qrcode-juicypixels ==0.8.0
- qrcode-core ==0.9.3
- qrcode-juicypixels ==0.8.1
- quadratic-irrational ==0.1.1
- QuasiText ==0.1.2.6
- QuickCheck ==2.13.2
@ -1718,6 +1723,7 @@ default-package-overrides:
- RefSerialize ==0.4.0
- regex ==1.1.0.0
- regex-applicative ==0.3.3.1
- regex-applicative-text ==0.1.0.1
- regex-base ==0.94.0.0
- regex-compat ==0.95.2.0
- regex-compat-tdfa ==0.95.1.4
@ -1751,7 +1757,7 @@ default-package-overrides:
- rfc1751 ==0.1.2
- rfc5051 ==0.1.0.4
- rigel-viz ==0.2.0.0
- rio ==0.1.15.0
- rio ==0.1.15.1
- rio-orphans ==0.1.1.0
- rio-prettyprint ==0.1.0.0
- roc-id ==0.1.0.0
@ -1870,7 +1876,7 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5.1
- simple-affine-space ==0.1
- simple-affine-space ==0.1.1
- simple-cabal ==0.1.1
- simple-cmd ==0.2.1
- simple-cmd-args ==0.1.6
@ -1962,6 +1968,7 @@ default-package-overrides:
- string-combinators ==0.6.0.5
- string-conv ==0.1.2
- string-conversions ==0.4.0.1
- string-interpolate ==0.2.0.3
- string-qq ==0.0.4
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
@ -2006,7 +2013,7 @@ default-package-overrides:
- tasty-dejafu ==2.0.0.1
- tasty-discover ==4.2.1
- tasty-expected-failure ==0.11.1.2
- tasty-golden ==2.3.3.1
- tasty-golden ==2.3.3.2
- tasty-hedgehog ==1.0.0.2
- tasty-hspec ==1.1.5.1
- tasty-hunit ==0.10.0.2
@ -2390,6 +2397,8 @@ extra-packages:
- happy <1.19.6 # newer versions break Agda
- happy == 1.19.9 # for purescript
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-lsp == 0.19.* # required for ghcide 0.1.0
- haskell-lsp-types == 0.19.* # required for ghcide 0.1.0
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hoogle == 5.0.14 # required by hie-hoogle
@ -2693,6 +2702,7 @@ broken-packages:
- activitypub
- activitystreams-aeson
- actor
- acts
- Adaptive
- Adaptive-Blaisorblade
- adaptive-containers
@ -2784,6 +2794,7 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- amazonka-dynamodb
- amby
- AMI
- ampersand
@ -2815,10 +2826,12 @@ broken-packages:
- anticiv
- antigate
- antimirov
- antiope-dynamodb
- antisplice
- antlr-haskell
- antlrc
- anydbm
- aop-prelude
- aosd
- apart
- apecs-stm
@ -2877,6 +2890,7 @@ broken-packages:
- arguedit
- ariadne
- arion
- arithmetic-circuits
- armada
- armor
- arpa
@ -2963,6 +2977,7 @@ broken-packages:
- authenticate-ldap
- authinfo-hs
- authoring
- autoapply
- AutoForms
- autom
- automata
@ -2976,6 +2991,7 @@ broken-packages:
- avl-static
- AvlTree
- avr-shake
- avro-piper
- avwx
- awesome-prelude
- awesomium
@ -3040,6 +3056,7 @@ broken-packages:
- barrie
- barrier
- barrier-monad
- base-encoding
- base-feature-macros
- base-generics
- base-io-access
@ -3144,6 +3161,7 @@ broken-packages:
- bindings-libg15
- bindings-librrd
- bindings-libstemmer
- bindings-libusb
- bindings-libv4l2
- bindings-linux-videodev2
- bindings-monetdb-mapi
@ -3370,6 +3388,7 @@ broken-packages:
- cabal-dependency-licenses
- cabal-dev
- cabal-dir
- cabal-fmt
- cabal-ghc-dynflags
- cabal-ghci
- cabal-graphdeps
@ -3403,6 +3422,7 @@ broken-packages:
- cabin
- cabocha
- cached
- cacophony
- cafeteria-prelude
- caffegraph
- cairo-core
@ -3503,6 +3523,7 @@ broken-packages:
- cereal-time
- certificate
- cf
- cfenv
- cfipu
- cflp
- cfopu
@ -3676,6 +3697,7 @@ broken-packages:
- collections-api
- collections-base-instances
- colonnade
- Color
- color-counter
- colorless
- colorless-http-client
@ -3936,6 +3958,7 @@ broken-packages:
- cspmchecker
- cspretty
- css
- css-selectors
- css-syntax
- csv-enumerator
- csv-nptools
@ -3956,6 +3979,7 @@ broken-packages:
- curves
- custom-prelude
- CV
- cv-combinators
- cypher
- d-bus
- d10
@ -4124,6 +4148,7 @@ broken-packages:
- demarcate
- denominate
- dense-int-set
- dependent-hashmap
- dependent-monoidal-map
- dependent-state
- dependent-sum-aeson-orphans
@ -4163,6 +4188,7 @@ broken-packages:
- dhall-yaml
- dhcp-lease-parser
- dhrun
- di-polysemy
- dia-base
- dia-functions
- diagrams-boolean
@ -4200,6 +4226,7 @@ broken-packages:
- DigitalOcean
- digitalocean-kzs
- digits
- digraph
- dimensional-codata
- dimensional-tf
- DimensionalHash
@ -4404,6 +4431,7 @@ broken-packages:
- effect-stack
- effin
- egison-quote
- egison-tutorial
- ehaskell
- ehs
- eibd-client-simple
@ -4411,6 +4439,7 @@ broken-packages:
- Eight-Ball-Pool-Hack-Cheats
- either-unwrap
- EitherT
- ejdb2-binding
- ekg-bosun
- ekg-carbon
- ekg-elastic
@ -4581,6 +4610,7 @@ broken-packages:
- extensible-data
- extensible-effects-concurrent
- extensible-skeleton
- extensions
- external-sort
- Extra
- extract-dependencies
@ -4637,6 +4667,7 @@ broken-packages:
- fca
- fcache
- fcd
- fcf-containers
- fcg
- fckeditor
- fclabels-monadlib
@ -4708,6 +4739,7 @@ broken-packages:
- findhttp
- fingertree-psqueue
- fingertree-tf
- finitary
- finitary-derive
- FiniteMap
- firefly-example
@ -4822,6 +4854,7 @@ broken-packages:
- fraction
- frag
- Frames-beam
- Frames-dsv
- franchise
- Frank
- fraxl
@ -4905,6 +4938,7 @@ broken-packages:
- funpat
- funsat
- funspection
- fused-effects-readline
- fused-effects-squeal
- fusion
- fusion-plugin
@ -5013,6 +5047,7 @@ broken-packages:
- ghc-dump-tree
- ghc-dump-util
- ghc-dup
- ghc-events-analyze
- ghc-events-parallel
- ghc-generic-instances
- ghc-imported-from
@ -5039,7 +5074,6 @@ broken-packages:
- ghci-lib
- ghci-ng
- ghci-pretty
- ghcide
- ghcjs-dom-jsffi
- ghcjs-fetch
- ghcjs-hplay
@ -5081,6 +5115,7 @@ broken-packages:
- git-remote-ipfs
- git-repair
- git-sanity
- git-vogue
- gitdo
- github-backup
- github-data
@ -5368,6 +5403,7 @@ broken-packages:
- hakyll-R
- hakyll-series
- hakyll-shortcode
- hakyll-shortcut-links
- hakyll-typescript
- hal
- halberd
@ -5384,6 +5420,7 @@ broken-packages:
- hamsql
- hamtmap
- hamusic
- hanabi-dealer
- handa-gdata
- handle-like
- HandlerSocketClient
@ -5835,7 +5872,6 @@ broken-packages:
- hichi
- hid-examples
- hidden-char
- hie-bios
- hie-core
- hieraclus
- hierarchical-exceptions
@ -6001,6 +6037,7 @@ broken-packages:
- hoovie
- hopencc
- hopencl
- HOpenCV
- hOpenPGP
- hopenpgp-tools
- hopfield
@ -6097,6 +6134,7 @@ broken-packages:
- hs-rs-notify
- hs-scrape
- hs-snowtify
- hs-speedscope
- hs-twitter
- hs-twitterarchiver
- hs-vcard
@ -6331,7 +6369,16 @@ broken-packages:
- huzzy
- hvega-theme
- hVOIDP
- hw-all
- hw-ci-assist
- hw-dsv
- hw-json
- hw-json-lens
- hw-json-simd
- hw-json-simple-cursor
- hw-json-standard-cursor
- hw-kafka-avro
- hw-simd
- hwall-auth-iitk
- hweblib
- hwhile
@ -6415,9 +6462,20 @@ broken-packages:
- ignore
- igraph
- igrf
- ihaskell
- ihaskell-aeson
- ihaskell-basic
- ihaskell-blaze
- ihaskell-charts
- ihaskell-diagrams
- ihaskell-display
- ihaskell-gnuplot
- ihaskell-graphviz
- ihaskell-hatex
- ihaskell-hvega
- ihaskell-inline-r
- ihaskell-juicypixels
- ihaskell-magic
- ihaskell-parsec
- ihaskell-plot
- ihaskell-rlangqq
@ -6655,6 +6713,7 @@ broken-packages:
- json-rpc-client
- json-schema
- json-sop
- json-syntax
- json-togo
- json-tokens
- json-tracer
@ -6874,6 +6933,9 @@ broken-packages:
- language-vhdl
- language-webidl
- lapack
- lapack-carray
- lapack-comfort-array
- lapack-ffi
- large-hashable
- Lastik
- lat
@ -6902,6 +6964,7 @@ broken-packages:
- lda
- ldap-client
- ldapply
- LDAPv3
- ldif
- leaf
- leaky
@ -6976,6 +7039,7 @@ broken-packages:
- libxslt
- licensor
- lie
- life-sync
- lifted-base-tf
- lifted-protolude
- lifted-stm
@ -7048,6 +7112,8 @@ broken-packages:
- liszt
- lit
- literals
- LiterateMarkdown
- little-logger
- live-sequencer
- ll-picosat
- llsd
@ -7141,6 +7207,7 @@ broken-packages:
- lsystem
- ltext
- ltk
- LTS
- lua-bc
- luachunk
- luautils
@ -7164,6 +7231,7 @@ broken-packages:
- lz4-conduit
- lzma-enumerator
- lzma-streams
- lzo
- maam
- mac
- macaroon-shop
@ -7242,6 +7310,9 @@ broken-packages:
- marxup
- masakazu-bot
- MASMGen
- massiv
- massiv-io
- massiv-test
- master-plan
- matchable
- matchable-th
@ -7254,6 +7325,7 @@ broken-packages:
- mathlink
- matrix-as-xyz
- matrix-market
- matrix-sized
- matsuri
- maude
- maxent
@ -7335,6 +7407,7 @@ broken-packages:
- miconix-test
- micro-recursion-schemes
- microaeson
- microbase
- microformats2-parser
- microformats2-types
- microgroove
@ -7516,8 +7589,10 @@ broken-packages:
- ms
- msgpack
- msgpack-aeson
- msgpack-binary
- msgpack-idl
- msgpack-rpc
- msgpack-rpc-conduit
- msh
- msi-kb-backlit
- MSQueue
@ -7529,9 +7604,11 @@ broken-packages:
- mtl-tf
- mtlx
- mtp
- mu-avro
- mu-grpc-client
- mu-grpc-common
- mu-grpc-server
- mu-kafka
- mu-protobuf
- MuCheck
- MuCheck-Hspec
@ -7749,6 +7826,7 @@ broken-packages:
- nix-deploy
- nix-eval
- nix-freeze-tree
- nix-narinfo
- nix-tools
- nixfromnpm
- nixpkgs-update
@ -7823,12 +7901,14 @@ broken-packages:
- ObjectIO
- objective
- ocaml-export
- ochan
- octane
- octohat
- octopus
- Octree
- oculus
- odbc
- odd-jobs
- OddWord
- oden-go-packages
- oeis2
@ -7868,6 +7948,7 @@ broken-packages:
- OpenAFP
- OpenAFP-Utils
- openapi-petstore
- openapi-typed
- opench-meteo
- OpenCL
- OpenCLRaw
@ -7876,10 +7957,12 @@ broken-packages:
- opendatatable
- OpenGLCheck
- opengles
- openid-connect
- OpenSCAD
- opensoundcontrol-ht
- openssh-github-keys
- openssh-protocol
- opentelemetry-extra
- opentelemetry-http-client
- opentelemetry-lightstep
- opentelemetry-wai
@ -7914,6 +7997,7 @@ broken-packages:
- orders
- Ordinary
- ordrea
- oref
- organize-imports
- orgmode
- origami
@ -7933,6 +8017,7 @@ broken-packages:
- otp-authenticator
- ottparse-pretty
- overload
- overloaded
- overloaded-records
- overture
- pack
@ -8231,6 +8316,7 @@ broken-packages:
- plugins-multistage
- plur
- plural
- plzwrk
- png-file
- pngload
- pngload-fixed
@ -8333,6 +8419,7 @@ broken-packages:
- prelude-plus
- preprocess-haskell
- preprocessor
- preql
- presburger
- present
- press
@ -8344,6 +8431,7 @@ broken-packages:
- prettyprinter-graphviz
- prettyprinter-vty
- preview
- prim
- prim-array
- prim-ref
- primes-type
@ -8721,7 +8809,6 @@ broken-packages:
- relation
- relational-postgresql8
- relative-date
- releaser
- relevant-time
- reload
- remark
@ -8845,6 +8932,8 @@ broken-packages:
- robots-txt
- roc-cluster
- roc-cluster-demo
- rock
- rocksdb-query
- roku-api
- rollbar
- rollbar-hs
@ -8965,7 +9054,10 @@ broken-packages:
- scgi
- schedevr
- schedule-planner
- scheduler
- schedyield
- schema
- schemas
- schematic
- scholdoc
- scholdoc-citeproc
@ -8974,6 +9066,7 @@ broken-packages:
- sci-ratio
- SciBaseTypes
- scidb-hquery
- scientific-notation
- SciFlow
- SciFlow-drmaa
- scion
@ -9184,6 +9277,7 @@ broken-packages:
- shivers-cfg
- shoap
- shopify
- shortcut-links
- shorten-strings
- ShortestPathProblems
- show-prettyprint
@ -9302,9 +9396,11 @@ broken-packages:
- smsaero
- smt-lib
- SmtLib
- smtlib2
- smtlib2-debug
- smtlib2-pipe
- smtlib2-quickcheck
- smtlib2-timing
- smtp-mail-ng
- SMTPClient
- smtps-gmail
@ -9552,12 +9648,14 @@ broken-packages:
- stern-brocot
- stgi
- STL
- STLinkUSB
- stm-chunked-queues
- stm-containers
- stm-firehose
- stm-hamt
- stm-promise
- stm-stats
- STM32-Zombie
- stmcontrol
- stochastic
- StockholmAlignment
@ -9785,9 +9883,12 @@ broken-packages:
- telegram-api
- telegram-bot
- telegram-bot-simple
- telegram-raw-api
- telegram-types
- teleport
- teleshell
- tellbot
- tempi
- template-default
- template-haskell-util
- template-hsml
@ -9799,6 +9900,10 @@ broken-packages:
- tempus
- tensor
- tensor-safe
- tensorflow
- tensorflow-core-ops
- tensorflow-logging
- tensorflow-ops
- termbox
- termbox-banana
- termbox-bindings
@ -10078,6 +10183,7 @@ broken-packages:
- turingMachine
- turtle-options
- tweak
- tweet-hs
- twentefp-eventloop-graphics
- twentefp-eventloop-trees
- twentefp-graphs
@ -10130,6 +10236,7 @@ broken-packages:
- type-tree
- typeable-th
- TypeClass
- typed-encoding
- typed-streams
- typed-wire
- typedflow
@ -10242,6 +10349,7 @@ broken-packages:
- urn
- urn-random
- urxml
- usb
- usb-enumerator
- usb-hid
- usb-id-database
@ -10360,6 +10468,7 @@ broken-packages:
- visual-graphrewrite
- visual-prof
- visualize-cbn
- vitrea
- vivid
- vivid-osc
- vivid-supercollider
@ -10542,6 +10651,7 @@ broken-packages:
- wraxml
- wrecker
- wrecker-ui
- wreq-patchable
- wreq-sb
- wright
- writer-cps-full
@ -10552,6 +10662,7 @@ broken-packages:
- wsdl
- wsedit
- wshterm
- wstunnel
- wtk
- wtk-gtk
- wu-wei
@ -10852,3 +10963,5 @@ broken-packages:
- ztar
- zuramaru
- Zwaluw
- zxcvbn-dvorak
- zxcvbn-hs

3
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -727,4 +727,7 @@ self: super: builtins.intersectAttrs super {
--prefix PATH : "${path}"
'';
});
# Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios;
}

20
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -48,12 +48,8 @@ in
, isExecutable ? false, isLibrary ? !isExecutable
, jailbreak ? false
, license
# We cannot enable -j<n> parallelism for libraries because GHC is far more
# likely to generate a non-determistic library ID in that case. Further
# details are at <https://github.com/peti/ghc-library-id-bug>.
#
# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449.
, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64)
# aarch64 sometimes crashes for -jn with n>1: https://ghc.haskell.org/trac/ghc/ticket/15449
, enableParallelBuilding ? !stdenv.buildPlatform.isAarch64
, maintainers ? []
, doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false)
@ -82,7 +78,7 @@ in
# same package in the (recursive) dependencies of the package being
# built. Will delay failures, if any, to compile time.
allowInconsistentDependencies ? false
, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221
, maxBuildCores ? 16 # more cores usually don't improve performance: https://ghc.haskell.org/trac/ghc/ticket/9221
, # If set to true, this builds a pre-linked .o file for this Haskell library.
# This can make it slightly faster to load this library into GHCi, but takes
# extra disk space and compile time.
@ -181,6 +177,8 @@ let
(optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
];
parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
crossCabalFlagsString =
stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
@ -199,7 +197,7 @@ let
"--package-db=$packageConfDir"
(optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
(optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
(optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}")
(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
(enableFeature (enableDeadCodeElimination && !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
(enableFeature enableLibraryProfiling "library-profiling")
@ -227,9 +225,9 @@ let
setupCompileFlags = [
(optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
(optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
# https://github.com/haskell/cabal/issues/2398
(optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
(optionalString enableParallelBuilding (parallelBuildingFlags))
"-threaded" # https://github.com/haskell/cabal/issues/2398
"-rtsopts" # allow us to pass RTS flags to the generated Setup executable
];
isHaskellPkg = x: x ? isHaskellLibrary;

2314
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/libraries/cutelyst/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "cutelyst";
version = "2.9.0";
version = "2.10.0";
src = fetchFromGitHub {
owner = "cutelyst";
repo = "cutelyst";
rev = "v${version}";
sha256 = "13h2sj131s31qdzdwa3hx7ildmvlk8mv9s0j99kvx1ijaq49z79f";
sha256 = "1k8pbpwll19l3i3s34l9yhkxj4yqxbrf393nm29jqwlhvi9nz8qm";
};
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];

4
pkgs/development/libraries/gmime/3.nix
View File

@ -2,12 +2,12 @@
, vala }:
stdenv.mkDerivation rec {
version = "3.2.6";
version = "3.2.7";
pname = "gmime";
src = fetchurl {
url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb";
sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/java/jflex/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, jre} :
stdenv.mkDerivation rec {
name = "jflex-1.8.1";
name = "jflex-1.8.2";
src = fetchurl {
url = "http://jflex.de/release/${name}.tar.gz";
sha256 = "0hspw4z1i7wc1dnnyh4xx6ka7891nsw4hc66bf45510gjks6779x";
sha256 = "1ar7g6zb2xjgnws3j4cqcp86jplhc9av8cpcjdmxw08x6igd5q51";
};
sourceRoot = name;

4
pkgs/development/libraries/lasso/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "lasso";
version = "2.6.0";
version = "2.6.1";
src = fetchurl {
url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
sha256 = "1kqagm63a4mv5sw5qc3y0qlky7r9qg5lccq0c3cnfr0n4mxgysql";
sha256 = "1pniisy4z9cshf6lvlz28kfa3qnwnhldb2rvkjxzc0l84g7dpa7q";
};

27
pkgs/development/libraries/libaec/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitLab
, cmake
}:
stdenv.mkDerivation rec {
pname = "libaec";
version = "1.0.4";
src = fetchFromGitLab {
domain = "gitlab.dkrz.de";
owner = "k202009";
repo = "libaec";
rev = "v${version}";
sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2";
};
nativeBuildInputs = [
cmake
];
meta = with stdenv.lib; {
homepage = "https://gitlab.dkrz.de/k202009/libaec";
description = "Adaptive Entropy Coding library";
license = licenses.bsd2;
maintainers = with maintainers; [ tbenst ];
};
}

4
pkgs/development/libraries/liblcf/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "liblcf";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "EasyRPG";
repo = "liblcf";
rev = version;
sha256 = "18kx9h004bncyi0hbj6vrc7f4k8l1rwp96cwncv3xm0lwspj0vyl";
sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/development/libraries/libspiro/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libspiro";
version = "20190731";
version = "20200505";
src = fetchFromGitHub {
owner = "fontforge";
repo = pname;
rev = version;
sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v";
sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];

4
pkgs/development/libraries/science/math/petsc/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.13.0";
version = "3.13.1";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz";
sha256 = "0pr604b9pnryl9q0q5arlhs0xdx7wslca0sbz0pzs9qylmz775qp";
};
nativeBuildInputs = [ blas gfortran.cc.lib lapack python ];

Some files were not shown because too many files have changed in this diff Show More