JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-06-10 10:35:50 +02:00
commit e58f0f6c99
55 changed files with 59249 additions and 2761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -5071,6 +5071,11 @@
github = "thedavidmeister"; github = "thedavidmeister";
name = "David Meister"; name = "David Meister";
}; };
thefloweringash = {
email = "lorne@cons.org.nz";
github = "thefloweringash";
name = "Andrew Childs";
};
thesola10 = { thesola10 = {
email = "thesola10@bobile.fr"; email = "thesola10@bobile.fr";
github = "thesola10"; github = "thesola10";

5
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -23,6 +23,11 @@
End of support is planned for end of April 2020, handing over to 20.03. End of support is planned for end of April 2020, handing over to 20.03.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
PHP now defaults to PHP 7.3, updated from 7.2.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

21
nixos/modules/services/networking/bird.nix
View File

@ -14,15 +14,6 @@ let
bird6 = "1.9.x with IPv6 suport"; bird6 = "1.9.x with IPv6 suport";
bird2 = "2.x"; bird2 = "2.x";
}.${variant}; }.${variant};
configFile = pkgs.stdenv.mkDerivation {
name = "${variant}.conf";
text = cfg.config;
preferLocalBuild = true;
buildCommand = ''
echo -n "$text" > $out
${pkg}/bin/${birdBin} -d -p -c $out
'';
};
in { in {
###### interface ###### interface
options = { options = {
@ -41,14 +32,24 @@ let
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkg ]; environment.systemPackages = [ pkg ];
environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile {
name = "${variant}.conf";
text = cfg.config;
checkPhase = ''
${pkg}/bin/${birdBin} -d -p -c $out
'';
};
systemd.services.${variant} = { systemd.services.${variant} = {
description = "BIRD Internet Routing Daemon (${descr})"; description = "BIRD Internet Routing Daemon (${descr})";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
reloadIfChanged = true; reloadIfChanged = true;
restartTriggers = [ config.environment.etc."bird/${variant}.conf".source ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
Restart = "on-failure"; Restart = "on-failure";
ExecStart = "${pkg}/bin/${birdBin} -c ${configFile} -u ${variant} -g ${variant}"; ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}";
ExecReload = "${pkg}/bin/${birdc} configure"; ExecReload = "${pkg}/bin/${birdc} configure";
ExecStop = "${pkg}/bin/${birdc} down"; ExecStop = "${pkg}/bin/${birdc} down";
CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"

2
nixos/modules/system/boot/networkd.nix
View File

@ -669,7 +669,7 @@ let
}; };
}; };
commonMatchText = def: '' commonMatchText = def: optionalString (def.matchConfig != {}) ''
[Match] [Match]
${attrsToSection def.matchConfig} ${attrsToSection def.matchConfig}
''; '';

400
pkgs/applications/editors/emacs-modes/elpa-generated.nix generated
View File

@ -95,6 +95,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
advice-patch = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "advice-patch";
ename = "advice-patch";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/advice-patch-0.1.el";
sha256 = "0mb7linzsnf72vzkn9h6w2i2b0h92h6qzkapyrv61vh5a67k1m0s";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/advice-patch.html";
license = lib.licenses.free;
};
}) {};
aggressive-indent = callPackage ({ cl-lib ? null aggressive-indent = callPackage ({ cl-lib ? null
, elpaBuild , elpaBuild
, emacs , emacs
@ -163,10 +178,10 @@
elpaBuild { elpaBuild {
pname = "arbitools"; pname = "arbitools";
ename = "arbitools"; ename = "arbitools";
version = "0.97"; version = "0.976";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/arbitools-0.97.el"; url = "https://elpa.gnu.org/packages/arbitools-0.976.el";
sha256 = "0fx1z4mw3v42xzixsj80xw56pg00bch04galkjbxbqzm25nl4aha"; sha256 = "08lvm921zhm22aghz17pps0b5g4f1xyyrl0qisdvd98kz1ajq7xr";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -268,10 +283,10 @@
elpaBuild { elpaBuild {
pname = "avy"; pname = "avy";
ename = "avy"; ename = "avy";
version = "0.4.0"; version = "0.5.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/avy-0.4.0.tar"; url = "https://elpa.gnu.org/packages/avy-0.5.0.tar";
sha256 = "1vbp37ndv5930x120n0isxxxfs8d5wqlrbnxvp6h3ahbbv0zdcsn"; sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d";
}; };
packageRequires = [ cl-lib emacs ]; packageRequires = [ cl-lib emacs ];
meta = { meta = {
@ -309,6 +324,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bnf-mode";
ename = "bnf-mode";
version = "0.4.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bnf-mode-0.4.2.tar";
sha256 = "04wl563hxgjbhz6hhwvysdfvdni9fm7kahy5wxkyqxi1sy64gn7d";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
license = lib.licenses.free;
};
}) {};
brief = callPackage ({ elpaBuild, fetchurl, lib }: brief = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "brief"; pname = "brief";
@ -332,10 +362,10 @@
elpaBuild { elpaBuild {
pname = "buffer-expose"; pname = "buffer-expose";
ename = "buffer-expose"; ename = "buffer-expose";
version = "0.4.1"; version = "0.4.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/buffer-expose-0.4.1.el"; url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.el";
sha256 = "05b1mhcv3860g93a7myqqrhmb9gpp19b4bcxhmdbmf4m0f7p9fw4"; sha256 = "1blpvan31mvqhzal16sdn564jnfnn7xsfn8zb65ijndh23drljwd";
}; };
packageRequires = [ cl-lib emacs ]; packageRequires = [ cl-lib emacs ];
meta = { meta = {
@ -512,10 +542,10 @@
elpaBuild { elpaBuild {
pname = "company"; pname = "company";
ename = "company"; ename = "company";
version = "0.9.9"; version = "0.9.10";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/company-0.9.9.tar"; url = "https://elpa.gnu.org/packages/company-0.9.10.tar";
sha256 = "1qinkz8gwgc27p3p3c9kddrrwx0jb4w0vgx7jq8fwpfj1n92m1rv"; sha256 = "1w6a11rzsx5iyxn76xarzbghm460j0ampqxlh4j12bswvbn7swnd";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -546,10 +576,10 @@
elpaBuild { elpaBuild {
pname = "company-math"; pname = "company-math";
ename = "company-math"; ename = "company-math";
version = "1.1"; version = "1.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/company-math-1.1.tar"; url = "https://elpa.gnu.org/packages/company-math-1.3.tar";
sha256 = "10yi5jmv7njcaansgy2aw7wm1j3acch1j9x6lfg9mxk0j21zvgwp"; sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l";
}; };
packageRequires = [ company math-symbol-lists ]; packageRequires = [ company math-symbol-lists ];
meta = { meta = {
@ -705,10 +735,10 @@
elpaBuild { elpaBuild {
pname = "debbugs"; pname = "debbugs";
ename = "debbugs"; ename = "debbugs";
version = "0.17"; version = "0.18";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.17.tar"; url = "https://elpa.gnu.org/packages/debbugs-0.18.tar";
sha256 = "0zclh2nxj5p10n214sxyxy3ca07l5s9p5spk0xp1smr6nzn0w7gb"; sha256 = "00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07";
}; };
packageRequires = [ cl-lib emacs soap-client ]; packageRequires = [ cl-lib emacs soap-client ];
meta = { meta = {
@ -810,10 +840,10 @@
elpaBuild { elpaBuild {
pname = "disk-usage"; pname = "disk-usage";
ename = "disk-usage"; ename = "disk-usage";
version = "1.3.1"; version = "1.3.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/disk-usage-1.3.1.el"; url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.el";
sha256 = "1jkwlg7w4090a7byfjh30mjz1libls8n71pphmn3973hqwaclnr7"; sha256 = "0h1jwznd41gi0vg830ilfgm01q05zknikzahwasm9cizwm2wyizj";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -900,10 +930,10 @@
elpaBuild { elpaBuild {
pname = "ebdb"; pname = "ebdb";
ename = "ebdb"; ename = "ebdb";
version = "0.6.6"; version = "0.6.8";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.6.6.tar"; url = "https://elpa.gnu.org/packages/ebdb-0.6.8.tar";
sha256 = "1jgx099z9xg47v698qjbk5q70bakfw7zxaj25z4jz1mq64fvk6b5"; sha256 = "0bcs4f2l6cdg6hx3crk0vchhljhgwd1ik8n0p001gs1mk91178jp";
}; };
packageRequires = [ cl-lib emacs seq ]; packageRequires = [ cl-lib emacs seq ];
meta = { meta = {
@ -956,6 +986,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "eev";
ename = "eev";
version = "20190425";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20190425.tar";
sha256 = "0wffwdkk68hcnkggrfmx0ag3pmapdzwzq54sx8y0m68aw0by90y1";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/eev.html";
license = lib.licenses.free;
};
}) {};
eglot = callPackage ({ elpaBuild eglot = callPackage ({ elpaBuild
, emacs , emacs
, fetchurl , fetchurl
@ -985,10 +1030,10 @@
elpaBuild { elpaBuild {
pname = "el-search"; pname = "el-search";
ename = "el-search"; ename = "el-search";
version = "1.11.4"; version = "1.12.5";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.11.4.tar"; url = "https://elpa.gnu.org/packages/el-search-1.12.5.tar";
sha256 = "152kx9s72h94n6nsrn84cmfb264cdw61ny5fn0n3fa581ipy34nm"; sha256 = "0q6fnjp2hh8p1l7wj7645szlz6qxdfy71s0xljjrmc2836i32xzc";
}; };
packageRequires = [ cl-print emacs stream ]; packageRequires = [ cl-print emacs stream ];
meta = { meta = {
@ -1162,10 +1207,10 @@
elpaBuild { elpaBuild {
pname = "flymake"; pname = "flymake";
ename = "flymake"; ename = "flymake";
version = "1.0.5"; version = "1.0.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/flymake-1.0.5.el"; url = "https://elpa.gnu.org/packages/flymake-1.0.6.el";
sha256 = "1zxzad84gcbdfh3pp606sspy8zkgxvngbzbimc2cam4pjcmwfx1y"; sha256 = "10n9vnabiz3m5gs3azc76x7y1p9qhc6aspgygw7awq9ff6hhkhbw";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -1177,10 +1222,10 @@
elpaBuild { elpaBuild {
pname = "fountain-mode"; pname = "fountain-mode";
ename = "fountain-mode"; ename = "fountain-mode";
version = "2.6.2"; version = "2.7.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/fountain-mode-2.6.2.el"; url = "https://elpa.gnu.org/packages/fountain-mode-2.7.1.el";
sha256 = "0ysxk9ap919scg2zz0psw8hk1dj35ys9p0havswsjzm46k43xd6z"; sha256 = "198ls0rvzgpb942mvjyljgbaxp05wjys1a003bfq528przv0vpaz";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -1207,10 +1252,10 @@
elpaBuild { elpaBuild {
pname = "frog-menu"; pname = "frog-menu";
ename = "frog-menu"; ename = "frog-menu";
version = "0.2.2"; version = "0.2.8";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/frog-menu-0.2.2.el"; url = "https://elpa.gnu.org/packages/frog-menu-0.2.8.el";
sha256 = "0kv31p42gmi01xalbvwksk10l28ascdr214bmv1z22dipv0zm30i"; sha256 = "18f937lvhw2dxwldahim13pr3ppndssjp0dis95iaspiwg9mwc4h";
}; };
packageRequires = [ avy emacs posframe ]; packageRequires = [ avy emacs posframe ];
meta = { meta = {
@ -1308,6 +1353,23 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
gnu-elpa-keyring-update = callPackage ({ elpaBuild
, fetchurl
, lib }:
elpaBuild {
pname = "gnu-elpa-keyring-update";
ename = "gnu-elpa-keyring-update";
version = "2019.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2019.3.tar";
sha256 = "1zw65kag25abimg088m4h8vj2nd4y5nc4qal6fsda0dldckfv1w0";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
license = lib.licenses.free;
};
}) {};
gnugo = callPackage ({ ascii-art-to-unicode gnugo = callPackage ({ ascii-art-to-unicode
, cl-lib ? null , cl-lib ? null
, elpaBuild , elpaBuild
@ -1332,10 +1394,10 @@
elpaBuild { elpaBuild {
pname = "gnus-mock"; pname = "gnus-mock";
ename = "gnus-mock"; ename = "gnus-mock";
version = "0.4.0"; version = "0.4.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/gnus-mock-0.4.0.tar"; url = "https://elpa.gnu.org/packages/gnus-mock-0.4.2.tar";
sha256 = "058bd4f8za9bxayrd2j5b05qvk8lxxm8mmfwxb73d7k15z3z3l3s"; sha256 = "04ddmdm2hykgr2y9g2yzmjp3fszhaywwnxhiy608cpvqdjwlwhn7";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -1373,12 +1435,12 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
guess-language = callPackage ({ advice guess-language = callPackage ({ cl-lib ? null
, cl-lib ? null
, elpaBuild , elpaBuild
, emacs , emacs
, fetchurl , fetchurl
, lib }: , lib
, nadvice }:
elpaBuild { elpaBuild {
pname = "guess-language"; pname = "guess-language";
ename = "guess-language"; ename = "guess-language";
@ -1387,7 +1449,7 @@
url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el"; url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el";
sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz"; sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz";
}; };
packageRequires = [ advice cl-lib emacs ]; packageRequires = [ cl-lib emacs nadvice ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/guess-language.html"; homepage = "https://elpa.gnu.org/packages/guess-language.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1489,10 +1551,10 @@
elpaBuild { elpaBuild {
pname = "hyperbole"; pname = "hyperbole";
ename = "hyperbole"; ename = "hyperbole";
version = "7.0.2"; version = "7.0.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar"; url = "https://elpa.gnu.org/packages/hyperbole-7.0.3.tar";
sha256 = "1hgwa740941a9s5wf1cqf76h3af8qbiiw9sc76biz6m3vx0hy1zs"; sha256 = "1mvplaxfjji00gg8rkhidfsdl8knwi6c0ai149zm4djsfaww3ikh";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -1534,10 +1596,10 @@
elpaBuild { elpaBuild {
pname = "ivy"; pname = "ivy";
ename = "ivy"; ename = "ivy";
version = "0.10.0"; version = "0.11.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar"; url = "https://elpa.gnu.org/packages/ivy-0.11.0.tar";
sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm"; sha256 = "1pxapdc7jarqc8lf3a3fsn4nsi4j146dh07f89xkj087psq30v50";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -1744,10 +1806,10 @@
elpaBuild { elpaBuild {
pname = "load-relative"; pname = "load-relative";
ename = "load-relative"; ename = "load-relative";
version = "1.3"; version = "1.3.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/load-relative-1.3.el"; url = "https://elpa.gnu.org/packages/load-relative-1.3.1.el";
sha256 = "1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps"; sha256 = "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -1819,10 +1881,10 @@
elpaBuild { elpaBuild {
pname = "math-symbol-lists"; pname = "math-symbol-lists";
ename = "math-symbol-lists"; ename = "math-symbol-lists";
version = "1.1"; version = "1.2.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/math-symbol-lists-1.1.tar"; url = "https://elpa.gnu.org/packages/math-symbol-lists-1.2.1.el";
sha256 = "06klvnqipz0n9slw72fxmhrydrw6bi9fs9vnn8hrja8gsqf8inlz"; sha256 = "015q44qg9snrpz04syz89f9f79pzg5h7w88nh84p38klynkx2f86";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -2038,10 +2100,10 @@
elpaBuild { elpaBuild {
pname = "nhexl-mode"; pname = "nhexl-mode";
ename = "nhexl-mode"; ename = "nhexl-mode";
version = "1.2"; version = "1.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/nhexl-mode-1.2.el"; url = "https://elpa.gnu.org/packages/nhexl-mode-1.3.el";
sha256 = "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf"; sha256 = "1fcy4ybr12dvswmzaqkv4798snb1x1y7ldxwrsgjv5sx7bb5j60z";
}; };
packageRequires = [ cl-lib emacs ]; packageRequires = [ cl-lib emacs ];
meta = { meta = {
@ -2139,6 +2201,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "olivetti";
ename = "olivetti";
version = "1.7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el";
sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/olivetti.html";
license = lib.licenses.free;
};
}) {};
omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "omn-mode"; pname = "omn-mode";
@ -2158,10 +2235,10 @@
elpaBuild { elpaBuild {
pname = "on-screen"; pname = "on-screen";
ename = "on-screen"; ename = "on-screen";
version = "1.3.2"; version = "1.3.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/on-screen-1.3.2.el"; url = "https://elpa.gnu.org/packages/on-screen-1.3.3.el";
sha256 = "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv"; sha256 = "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -2469,8 +2546,7 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
realgud = callPackage ({ cl-lib ? null realgud = callPackage ({ elpaBuild
, elpaBuild
, emacs , emacs
, fetchurl , fetchurl
, lib , lib
@ -2480,23 +2556,141 @@
elpaBuild { elpaBuild {
pname = "realgud"; pname = "realgud";
ename = "realgud"; ename = "realgud";
version = "1.4.5"; version = "1.5.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar"; url = "https://elpa.gnu.org/packages/realgud-1.5.0.tar";
sha256 = "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"; sha256 = "0bfshrgkfrfb1d8insnb5n25230xd0scdk6bijhgh34q2phjy2fy";
}; };
packageRequires = [ packageRequires = [ emacs load-relative loc-changes test-simple ];
cl-lib
emacs
load-relative
loc-changes
test-simple
];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/realgud.html"; homepage = "https://elpa.gnu.org/packages/realgud.html";
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
realgud-ipdb = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-ipdb";
ename = "realgud-ipdb";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar";
sha256 = "1ljh2igm6na92jdvnn4f51019v3klc6k03nayxf6qxzaxwq2w254";
};
packageRequires = [ emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
license = lib.licenses.free;
};
}) {};
realgud-jdb = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-jdb";
ename = "realgud-jdb";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar";
sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc";
};
packageRequires = [ cl-lib emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
license = lib.licenses.free;
};
}) {};
realgud-lldb = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-lldb";
ename = "realgud-lldb";
version = "1.0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar";
sha256 = "0nqbvknhvw5lwf4i44q8wvh4y4s9mvs5kn7lskg3xicl464ag1d0";
};
packageRequires = [ emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
license = lib.licenses.free;
};
}) {};
realgud-node-debug = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-node-debug";
ename = "realgud-node-debug";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar";
sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir";
};
packageRequires = [ cl-lib emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
license = lib.licenses.free;
};
}) {};
realgud-node-inspect = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-node-inspect";
ename = "realgud-node-inspect";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar";
sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2";
};
packageRequires = [ cl-lib emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
license = lib.licenses.free;
};
}) {};
realgud-trepan-ni = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-trepan-ni";
ename = "realgud-trepan-ni";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar";
sha256 = "0vakfzlk4pgqi66mdvwqhzgdsnks6clgnj7cjjbi80v3ipkfdnak";
};
packageRequires = [ cl-lib emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
license = lib.licenses.free;
};
}) {};
register-list = callPackage ({ elpaBuild, fetchurl, lib }: register-list = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "register-list"; pname = "register-list";
@ -2516,10 +2710,10 @@
elpaBuild { elpaBuild {
pname = "relint"; pname = "relint";
ename = "relint"; ename = "relint";
version = "1.6"; version = "1.8";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/relint-1.6.el"; url = "https://elpa.gnu.org/packages/relint-1.8.el";
sha256 = "17nyy3zqpqgs22lrrpdm0k56xnhj5l3y2y3lnmhcqw63xksgbsyk"; sha256 = "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3";
}; };
packageRequires = [ xr ]; packageRequires = [ xr ];
meta = { meta = {
@ -2623,6 +2817,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "shelisp";
ename = "shelisp";
version = "0.9.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el";
sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/shelisp.html";
license = lib.licenses.free;
};
}) {};
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "shen-mode"; pname = "shen-mode";
@ -2653,6 +2862,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "smalltalk-mode";
ename = "smalltalk-mode";
version = "3.2.92";
src = fetchurl {
url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar";
sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
license = lib.licenses.free;
};
}) {};
smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "smart-yank"; pname = "smart-yank";
@ -2762,10 +2986,10 @@
elpaBuild { elpaBuild {
pname = "ssh-deploy"; pname = "ssh-deploy";
ename = "ssh-deploy"; ename = "ssh-deploy";
version = "3.0"; version = "3.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ssh-deploy-3.0.tar"; url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar";
sha256 = "0lv9qwm1dhcd2l2mnhjfpqsz6xx0wabjg5j5sm3425fjsaqws6m7"; sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -3194,10 +3418,10 @@
elpaBuild { elpaBuild {
pname = "websocket"; pname = "websocket";
ename = "websocket"; ename = "websocket";
version = "1.8"; version = "1.9";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/websocket-1.8.tar"; url = "https://elpa.gnu.org/packages/websocket-1.9.tar";
sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"; sha256 = "00sd0dawpjcr79w6klya5ywq9r1p86d97z62vqpjij6yg5qv470f";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -3314,10 +3538,10 @@
elpaBuild { elpaBuild {
pname = "xr"; pname = "xr";
ename = "xr"; ename = "xr";
version = "1.10"; version = "1.12";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/xr-1.10.tar"; url = "https://elpa.gnu.org/packages/xr-1.12.tar";
sha256 = "16p68rj5h609pnbp7y0jiiq1zkbksh4qqi1q8yby3ldj5x9sfpwc"; sha256 = "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -3362,10 +3586,10 @@
elpaBuild { elpaBuild {
pname = "zones"; pname = "zones";
ename = "zones"; ename = "zones";
version = "2018.12.28"; version = "2019.4.30";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/zones-2018.12.28.el"; url = "https://elpa.gnu.org/packages/zones-2019.4.30.el";
sha256 = "1jd7wy5w96xppdlcl4dzq4wqhr2x6f4hzjps9f4kz256l4ia6hm0"; sha256 = "0f0ryd9wnkg7vh2jv30bqhpzzkaf0gc2ysmib6y36s3m8c2sa9b6";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

5590
pkgs/applications/editors/emacs-modes/melpa-generated.nix generated
View File

File diff suppressed because it is too large Load Diff

1
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -266,6 +266,7 @@ self:
removeAttrs (super // overrides) removeAttrs (super // overrides)
[ [
"show-marks" # missing dependency: fm "show-marks" # missing dependency: fm
"lenlen-theme" # missing dependency: color-theme-solarized
]; ];
in in
melpaPackages // { inherit melpaPackages; } melpaPackages // { inherit melpaPackages; }

54790
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View File

@ -207,6 +207,10 @@ self:
window-numbering = markBroken super.window-numbering; window-numbering = markBroken super.window-numbering;
}; };
melpaStablePackages = super // overrides; melpaStablePackages =
removeAttrs (super // overrides)
[
"lenlen-theme" # missing dependency: color-theme-solarized
];
in in
melpaStablePackages // { inherit melpaStablePackages; } melpaStablePackages // { inherit melpaStablePackages; }

4
pkgs/applications/misc/gallery-dl/default.nix
View File

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "gallery_dl"; pname = "gallery_dl";
version = "1.8.4"; version = "1.8.5";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "01df9aph7qr2yxy0ckpkr5f6yscs29raqs2f4xxg7xn5zaimjhan"; sha256 = "ee5b14e83080b6390f9bf8d9bbfab03f628aebe863efd16a4b2f8536b149cc4f";
}; };
doCheck = false; doCheck = false;

18
pkgs/applications/misc/jgmenu/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg }: { stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jgmenu-${version}"; pname = "jgmenu";
version = "1.1"; version = "3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johanmalm"; owner = "johanmalm";
repo = "jgmenu"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz"; sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
makeWrapper
python3Packages.wrapPython python3Packages.wrapPython
]; ];
@ -22,12 +23,17 @@ stdenv.mkDerivation rec {
libxml2 libxml2
menu-cache menu-cache
xorg.libXinerama xorg.libXinerama
xorg.libXrandr
python3Packages.python
]; ];
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=${placeholder "out"}" ];
postFixup = '' postFixup = ''
wrapPythonProgramsIn "$out/lib/jgmenu" wrapPythonProgramsIn "$out/lib/jgmenu"
for f in $out/bin/jgmenu{,_run}; do
wrapProgram $f --prefix PATH : $out/bin
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -107,7 +107,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
]; ];
sha256 = "0lgxwb9hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7"; sha256 = "160k5qdys6zy5cpsad2rm24ghfc2bd9b9gj3l0159di6hg21rk9k";
}; };
}; };
in in

9
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
let version = "3.31.0"; in let version = "3.42.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "filezilla-${version}"; name = "filezilla-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l"; sha256 = "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg";
}; };
configureFlags = [ configureFlags = [
"--disable-manualupdatecheck" "--disable-manualupdatecheck"
"--disable-autoupdatecheck"
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -19,6 +20,8 @@ stdenv.mkDerivation {
dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite
pugixml libfilezilla nettle ]; pugixml libfilezilla nettle ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://filezilla-project.org/; homepage = https://filezilla-project.org/;
description = "Graphical FTP, FTPS and SFTP client"; description = "Graphical FTP, FTPS and SFTP client";

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

@ -1,585 +1,585 @@
{ {
version = "60.6.0"; version = "60.7.0";
sources = [ sources = [
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ar/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ar/thunderbird-60.7.0.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ba14ed80e0b18cc3b40a1bf1810eb67a246f6e995d527e625432eb24dce46bde85dd0dbcac5590d74b8bbb7be900f266b72055349f9b0ea6839fb8d5779aa54d"; sha512 = "07f3c9310e46fb43bab84c892c06aae11a33f0b7cf14730a92c9292d3e51bce9a1d37707ee819c8ba9fb8b9e78bf2089772684405a8276ac32676b2585c7bc32";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ast/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ast/thunderbird-60.7.0.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b6ab87d344c3e806a2316022a6c8632dcd9548c745766e136ca9aa70f54fe744587849372fc7426173a91996ff4709aee85f8e5de2565add3bbac58d370e7a96"; sha512 = "75967b7e98bd7d3b1d1ddb01aa5950d3d7bda77001bc0d8eb5d30a9bf617eb4fd36d6870c774943c41de9ba784f969fa0ffcfe5787331f3b721a1adbabee4e27";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/be/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/be/thunderbird-60.7.0.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "2d5f88efb2f6e3be552cb503bfe184a3ad6b395da3139c6c97585f490d9a02c5ce391c0f6b3b1be0505b63f0b8af70da9eca8820b5baefc3dc043a60abb47d5a"; sha512 = "78d8a8052bdebce1680d7a68ad3c0a0f8f4e3a0aa789ebc3874e58aa4eaa177feace8874b0bf7ad9d846673fb43e2356e7deefaa0a93dcf7db9c8d393ffc4508";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/bg/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/bg/thunderbird-60.7.0.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "16b7b8d54e200b9156a346a0e4b80cb5c91a0297222a3f4a227770344d6453fea679d7c8a512eb9d879abe262ce34c2dab654cbe60aab13d0cc7919757dcae8d"; sha512 = "228182664420439f0847746db29764a50f85607589600d48e79c4f9ba63912750ebda16c24c31a8b8f11dd0f02c0f493d6c2ca3a56dfc2cd8f2c0621b809092d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/br/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/br/thunderbird-60.7.0.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "d20854f75f09f95489a1d647bbdeed9062a553dcede68f48672d0a0a82001e283a7d24162a6110ce3efa1a1bdd846ca7fe036c37a20f63bf8dcd54d80a767084"; sha512 = "7eed1bee8424f0d6cb26636fffe16da398406902e791c3e346c74a405feff23f158df8a0790064022977469605001aac2ea484e93e803134f8c063da40e9b2ae";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ca/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ca/thunderbird-60.7.0.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "8477742f367c2e4206ba61afcef372d39163aeba5e781ea9a089b0d3cf9ef44be8ce6bd3417490616a51aff3152a52eb3599b2acf66e0186e696c9df29b9732b"; sha512 = "e9071b7f54db240cfdf91b64aec9170a94b2b753d7b7b04dedfa1335f41829db09e6623d6b44186d552b85aedbfe57cacacd7bf68605a488ed8a5d667769c3d2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cs/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/cs/thunderbird-60.7.0.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b434e8763a93df511dcc9c032d11c0a26c7583f7ce01980be63ea453f8d503e703cddca5e5a67db619cb1b9690d0256c91eec8166fff30733186e429d3c513a8"; sha512 = "2366449d58ab72cc59b0abd5bd4c279e3d1e95668b834b4d49a606338206197434f78ec911b6c69301916754f813c137a89ae7fabf1bbfba1273bf4ead1ba1a3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cy/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/cy/thunderbird-60.7.0.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "71a6a2642dfce4505ed3b6b551ffdd5c469f1261191b73d3bd09bdf98788297536b3b94dd52327d263d4b1256080ff0317d8e10e09b53871ab805b426892e9a0"; sha512 = "dcc268a8bb5fe9be6a3ddcb4cd25cf341db58e9ad2837d15ec949dc737edfeda3fdb17368237b58a33ffe1b41ede2496ad06c1fee46f9d59468138e3bd2292d1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/da/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/da/thunderbird-60.7.0.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "e24c19e5caafd4b4c5081acf700fb175e07c1702da0af111122cf793e4791d38c49902e1b9574ab9606482c539677e6caad2b9f8f655ac0fb24f1b0c8454c456"; sha512 = "1d027329c79b9fe335fa9243e6aefd9f5a8f15e8280db3ab449478dd435bdec6d4020c03e22c124a3505aca4908bf35f8b3203a637a508b747f83e4d0fb24de6";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/de/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/de/thunderbird-60.7.0.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "e9ec916a00bfd50745c95ed42976eeb0b9cc314165b6401e24e1433a68fa5591c3020397a0c35566072784e423b42132d4e55dc307a47d34c693d5fe9e3e6380"; sha512 = "51436c4e59dbda6eff921800f65d9181983e3fdc86def4f0d358ff616f646a58c84581376e37a4db180a80535d71da6c75be790419e66fb6b9c949a52f8973c9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/dsb/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/dsb/thunderbird-60.7.0.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "4fd72e0ba6982c0aeba4911a626aa7dea2d6678502aec9523efb5e89b613b20b471d50a2667df000541279ff961fc3323ebaa16d3482c2bebcaa33ec849a05d3"; sha512 = "6316491fc7cc1160456adf586679939ce52f12321b260c137808e7ea4d52ce4251e373d65e8e9bb0462282735a45e557c2e800a3fc0cff7b91a0dbee4b8ecd96";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/el/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/el/thunderbird-60.7.0.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "bd86c6855ce42bf52ca6822e6fd3cfd7e09c9fd2577407c666b46d84afcf43655f30dc0e3546ae41b84eb5ca7e681072fae90a08de9dd017c3594dea4e5b9bb8"; sha512 = "1185db88183bf22d788639ae8b57ae348a54f2ab20562d9f9ad3990ca64d989f7009387a02ebe5bc8121ce2aa8bb5f6eb2d1ff5ecf8cd7bc76af14f02c8fd365";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-GB/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/en-GB/thunderbird-60.7.0.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "47009db4f18cad43a9d4ba20a4edbfbb07cc5222cb65121dfe45eb3c9120fd18277d5601309f9f3f21eebe10fd70201a9d15815fd35ef6f9d3f95360d939a0ec"; sha512 = "085d55a9333d147829f15b7452b59dee2743999270b79f56957ab813d10a8e36242215eedb8db34a2fa8b213c58b4c8bb503c7251dc144fa4ea20c5417dbedad";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-US/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/en-US/thunderbird-60.7.0.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "86bfb05041e347430c424652f8fcb102aa44c0bb68bf1b7a55ce888fcefa2ac08f55bb4bcbe7a558aaf3214ae694b97a6805f14de2ce575968fa2a1988e281ba"; sha512 = "0bf5bbbaf76c1dd304eda6ad175f3fdc4fbe9f56ed11bac4b6855f13c2cbd5ddd635c364d8f9660542a20d4bf8d3a8b18b4398280d15ad47afc4fa88d321d5bb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-AR/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/es-AR/thunderbird-60.7.0.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "87a5caeb7d8f8846c52b9a7344260e480efce156239559a890bf5e167939cd35e2223ef4ad2429b196a87ca164b02eb7df3dd03ed1f52f95bf30d75afec40fd8"; sha512 = "e1212f10b58d13d3376f72df61e1609fba269adc698e55bc3f19624a5004286b417d3181708dc80806a02d910167cd4f63e5d4adb3b2f7cdedcfdd140ed482d4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-ES/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/es-ES/thunderbird-60.7.0.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ec6a17263d696b2fa4195349fd3badaf7ac7dbdf93ee7247a77d27aa13daf5de06db8c2df3449b06e6d28fc032e9c4eeb897be8b1a798e9fb7b68f3c8509d6d8"; sha512 = "136859c06b23f07fad831925f3a990b1bbfe955083f96b767482d496bb054b63d31eaab3361e5edc1d226a1a38296599cdaa1980839b3d0feadfb93c511aa10b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/et/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/et/thunderbird-60.7.0.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "d4591fdc97c5c1654f59116670e8516c12b53311e6f76f13711c04c86cfbf4cbd893a2f5f657b27fc44ad9919e3c0b5192ae98b26281ef4df6863fc522d50a7b"; sha512 = "4562561e5a317ce632e9323096c4ba83c9ac5183e6e42cbcd9475965166392390ece9a370f6f9fe46d3d19fd0d65596bee6519e4060b49bdcac01996c47e0a18";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/eu/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/eu/thunderbird-60.7.0.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "316b4d9d515b23476d29c0136c9981d281f7a3628aacd18f912640a2b6e1d5b53d66d42e9300af6b2cb78e4ada7458d0002c3d4a5ac7f5129db3dd66f4358341"; sha512 = "4601b91b694f76654ea5ea3c932b3bb56f99096144a2c4e6dd5ab369ba0c9bf30044fe7490d67f50c9308b1223cd887e22f8cbbd1f35ba3e769d2b2e1e230b67";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fi/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/fi/thunderbird-60.7.0.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "944742e4331c7ccbc27d887d9d5702ced9807d743d57e8a14b18f4dd6b2148ed24b295eb498c09d1d54f2f1110abfd9e2acbad83a882189d0d7e5403dbe650b4"; sha512 = "39f949f4d71f8ad64ccaaef6b61797f1b8da5fd2e3bd80ec6110bc994806413e4617ba375c973a47819d2c8ae774f01941c5fc9698585b276d805c525bd91abf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/fr/thunderbird-60.7.0.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "1dfeaeb5e6985ebd820188721377589ebf4b993337a4231f6d036ae05173e8fb33c17bae76a3982e34a98da934d584d0efec4e01d6045b24345ea66299ecfe19"; sha512 = "ab281a68685555afbcfad63f6ea55aee413696b50cfba1563de7767a824fc22d00e39dcae04b6383e3b7da57ae23ffb09d49739ac78c69a59d2becd9ce22dd23";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fy-NL/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/fy-NL/thunderbird-60.7.0.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "6e61fc74b45e75170157806c8f358b5236e5de79e1d07db4f7834bebf2b9822d90377334ec1f2cf44a838c52c7135711b5a7036a0336813fe79c7dc3aa43e25e"; sha512 = "042ea959bf071f7f5b62ffdccd13739c4c0defdf9de3bfd19bec695e89b18aca35f4bbb4938de424834309dbb2a0d3f45c32461b6e517f7c9c4740f38f2d02b7";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ga-IE/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ga-IE/thunderbird-60.7.0.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7de19973a7e9770cfdd9ff944e9bea8e6755a81e2fd41ce27ff0d16bfe948534294c18f2f7ca05092aa574bea6fadd5a90bb08ca6472c27e7b0cdc6c15d25341"; sha512 = "1da90daff6d3eb7473dd44e7878cfacc807e495a0028802b04adf61992134179cf7afdc8c1c3fb9336120639efed2969cf197cc29a41591598b486aec20b9a9b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gd/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/gd/thunderbird-60.7.0.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "1d5309b6eb47b16b49142ba18de96b285fc0f91a7eb3be5cac576683da37143c1e91318dff4f039119668679acf3c2643bdde9a26788f0bb240cebaa5f907389"; sha512 = "21197c08e9f27bcc30b4f579c1005caf458f0e1cbcc564ca270885c215aac18e17eae485dd5d2ab756013fea24af36b919e65d100d88db43570ab690be7e2679";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/gl/thunderbird-60.7.0.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ecb09d7d8e6b5705d4c71d306a1556a74f78617520e59f041e3b63a0116f0472717c5f3bb055fda3c5c9fd72b198d997704292f64bc60349ec29efe057c46d52"; sha512 = "12db9c89338c80f063408167b2d91a8361236b220cdddec141d7dcf6518f8ef39105c32dada76f3a326d09e1dca7e4ea134827154546840cbfb8ac18e9bec351";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/he/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/he/thunderbird-60.7.0.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7ced9d95c40376ee1334e5c5cb2bb9fd6e5cefcc26dc134fb5ef71bc20b6476b263ee742d3e0634517ca399c61c776bd7347b58c2c9bd0c395949756d1d0f5af"; sha512 = "be5eef2e90af44623554359960ae0f9da3c54484643ab8ceaa72c0b000c7cb17693be8e865a6964ad3b356906c1872fc2315a601531faf16ebd7c356ac3f8110";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hr/thunderbird-60.7.0.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "c9cb6cd5b3d7f1091f55b74af73825d2d0e8b763ffc102a1d49e58b2ac9e6fe2fdd81c1bcf7effd53d86c1ba8f662e3ae0b413ef80bafcb6e2ae64d34c7f3311"; sha512 = "48f8d55811632b650a1be62125ba3b56b144e422c0b410a2ad5ee4ff1a779c0a6c8d6f8d6c754bfa907a9c7aa22f0a5484cbc624247db89ef7ffe624d9a939cc";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hsb/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hsb/thunderbird-60.7.0.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "e4f8092eb72e8311459a9232dc55342c2ff61b232d0b3a1be04acde78d7c06f14108f68378de200cadbe58125cddf46fddd421f76ac0d046e1a796fc5277278e"; sha512 = "bd38e36a1de618e692298ebd0d8593bddd2f80d36420af091a44974187042d47eb5cb8d1ea908855e5ce832b305e156470f0ad13ab6cf60acb066a4e3fa209d5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hu/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hu/thunderbird-60.7.0.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ba1ca73de9b3b0137e38c10bbf29cd28310a7e2e58804de75247da098401f4b609d414e55a25b9646c16dae353db9d6fd193e437e42b7659d66f0ec9117e8629"; sha512 = "40e992503afd3c10fccda0b2892194e97df0f165b808d953293cc6c5d9c472af45dcf4aacf65eab9bcd052282d46bb1fd6d108f057c7ce8e5e22b902baa56d53";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hy-AM/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hy-AM/thunderbird-60.7.0.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "d5fbb20b9a75be427f1fb2a3c3674397b04793469dc3f493ec9bbf631e83a52573700540832cfe7faf71c16908ee0bc7bcd84b3cbd6e10fde950d477b27bc6dc"; sha512 = "18213aaf5bf8d761209c325305722bbbf8355c09856ce95d6b613c51cf824d6c53881355391ccca8cdf6f02e8f1e0c486219e1eb832124d313cc3115adea4927";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/id/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/id/thunderbird-60.7.0.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "35b1d1db2dc6c38b8d2fce2652857d9251e287acad125ab19c5e20487ac5ee6d4ad01d8f6d6cfc1ed9618cb8a47666d9c64e725b2d1f11894741e8cf99a887f8"; sha512 = "31790666d7cbf9571d32f6d372a3026fc7295004c14282557bf809ac1601242caac511d20ee8bdd04d8d63f864c300179b6d1a79cb8cc3aabfefb8088c88768c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/is/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/is/thunderbird-60.7.0.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "548170e5b1c2d7c09d4792f012064e5bbb201236768ba92fa318821b83101a395f3a4cd06560db89c23561eda20078921902aaa9b7ecbb201c356149af3d55cc"; sha512 = "a790b49f9bc055ab302e369bf69f8353354d1ee1ae50a8666a1c6ebd48d500275cfeef16eadc0330710865dc3b5e4ec8577c973b80e581f03a2dd2f05f299663";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/it/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/it/thunderbird-60.7.0.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "026fc8d2b61eaff1f34ce7726923697ba5c7563b65fbb9bbd700e88998d198eee595348cc47135c5dc8589201fcf0d75141acd5d1e49980ccc5c544b545bb424"; sha512 = "1ba1218036387f697420000b80ed33276a0535e3914ad10d993ec0f2aa9efd312b13027a77816eba129c59303d2dbe80e48b523313d3f1dfced8dd20f23e3f95";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ja/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ja/thunderbird-60.7.0.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "deb6e23d8c3c700d7de3f433862040ae5db610012cfd4a8faaf239a6429662d625d8a40c583f22797e34afbeec7dd6888a1558155e0878f4a84ea71694cc97ef"; sha512 = "a627ec7cac46179cb77e9b234de657cc6817a05adb55632b52a5d316be0fbee6a7475bc06a06b691650088376de4da1e7c2754de0cea3c7d21d47a4298c1f6be";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kab/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/kab/thunderbird-60.7.0.tar.bz2";
locale = "kab"; locale = "kab";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "e6c1dba878c8bfcd4031123f0578512b0cfad675ddfd89859d5ea25b2c112195f788cb1d3e0deec12ca1f052c2c0bfdeda2527402cf0d51f54e781029a6e3b47"; sha512 = "51282592eefdfc6249d48409c4210ded53306474c238785cf1fed7e55681b165e99493c5d3e4c1261c4bdeb5071f4a7d6fc32f0f243c41c749e67859449e6f55";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kk/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/kk/thunderbird-60.7.0.tar.bz2";
locale = "kk"; locale = "kk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "70dd97b4d5db05463deff785fbd9dbdb649c00ec79d8f1cf009ab54961efafc45f12da654367b0df58211a8fe57597cba7743b7557dc121bbf1d838aa692809a"; sha512 = "1ab662dc20156e6f1d90a73528e904b9361eea1d89f3b55ef67541c29f4620244b1e3dd61c795663f109452a98aebf436af4a8aa376b6a751f9a046d0e9d5ab2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ko/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ko/thunderbird-60.7.0.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "8faf4d44bb882107805c663462170e96593f10e7218fa3a1e244937ee3965901d712c89edf9cbc4fefba85c91662c1a7e2811cf1bc3390377cd8ea3f3c8e29e0"; sha512 = "b3135bf41e32d4a431bb385b5e473c94810a65c8703810352a32bc6ae2665427636cb70c4c0c29bd3c85d68a89af1d9c5edef290d35c8b4f0adcd196d4e97084";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/lt/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/lt/thunderbird-60.7.0.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "604b8283cce3cddd90ae65be0d32ce7051bbe360fb772e47be60fa3312330d38b46d240b9e61eed3134fadef90aca9ac930ae6512dfdc1343104edff928be54c"; sha512 = "acf6fe072deeb711480c571506ea96b96bbb2c0fdf85ed66bf03a800e1305682cb34daa2e44530c1c57ef59664e13c01584816453449486f595e38610956c15c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ms/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ms/thunderbird-60.7.0.tar.bz2";
locale = "ms"; locale = "ms";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b4af3085260ece6e30b482e9e8335a75298335b0b551a8219bbc04521d41d0088d483134df8801a529934320ab5d51b99b388177b9432b7fdcbd7391ac11b22d"; sha512 = "8a74dfba38c2228e00ba3503fa6a05a0b4e4aba68c034e0711bc8f68c00efdeec816e0de6e6aea325427f8b6f790eb2b157df795a0d67e800beacd6fa572fe38";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nb-NO/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/nb-NO/thunderbird-60.7.0.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "75022e5524379f4683d6e85bfc057480dcc003d421ec256ade11ba9f4eb60b74c65a7131f07987cecd5a13d8e61dbf2c71446e4c2cbfd9efa65a1c86939e82aa"; sha512 = "49116d9ac9f9fe322b56a5908e1727c53ca5351f60ba9b7ec1f453580e0be85efa84cc467e901aa269fe266d39860b313173a36f08ac6c6420032b3fec11a823";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/nl/thunderbird-60.7.0.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "301dfe0a9ce8743703c1f4968bb9bd7b9881a7b70ce1760c12e9a9b2ffe386e8c85406a2b3121981676e4ba2f9ae5a32782857a168965f1fd93530cb22dc3ddd"; sha512 = "091e81383130fab108de72f71794fbf9eeb08106367f64c5b0fd9ba48dd2363890c2dbfe2c0aec4d44feaad6b55cdaad8844c4291cb1d9d12f2ba0341c259ad9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nn-NO/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/nn-NO/thunderbird-60.7.0.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "67704f6dc56fb2d396cd5154d32648464cbf331890dfbe30c6870f63d8f26d8f46322c2b2c40cec86fdbd7b93eeacae2551b0e699428749c89acb715bf8d00b2"; sha512 = "1384adc5a57fb5d4fb4fff055c94b81fa5430872f687ad339a76120604e4898cc9621ba21f366498f79323e8f3b7b0d1d2c44bcb35894019ee4797fe4b563976";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/pl/thunderbird-60.7.0.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "6477cf8274f38d3922edf51e0a419936d2ac494906c06fcf78c99ae95847c2fd4530e03d1574f7ba4b5d1221e98a71bb1a7e3810a1ebcd72c4e412f0e85c3c31"; sha512 = "088e52c4fed03ccd663f6942c41203adf33e39272f3b6be5e4884e417586620f4eb732d861dfd6325ca63ee11c2e7412bf8eae1a7eec841237fd966f0422d377";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-BR/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/pt-BR/thunderbird-60.7.0.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "775ccbd6e8adda7318a5ff9d364d6d8b3d8af39208a349f61123550a149c728f7d6248c27b3b4561c8445c1c7c53300579f073b47ba31a52b68a8570515e6329"; sha512 = "d0a45e4b826d19d25f703dbf37a718dadb1fd2ec61e25457e306e08ba1f066fdbc48d2032b395c62ebde82280db0e9c519157e8e4b12bc28bf5cf49087760f0a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-PT/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/pt-PT/thunderbird-60.7.0.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "057a2b690dfd529be26ddc225f6f760190315721ef69ab0d9974788b7c00617704af82ec56cbb502a3854945b624896ceb800ba1a31080fe9984fe12af4d301f"; sha512 = "7a4f314d5dbd09ba3b7908d57dfb4719ec1a63ff5ff7edd0cb00e1f0bd96009c2870b0c18ca973210c57cce7d8fc76d4d8dc54b7235652e8f33f468dd58b5026";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/rm/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/rm/thunderbird-60.7.0.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "10c4edf026d5b924d5105201179f8f5f6ecf5917e99efb60c663325ef98e5ba63f965954c93e3962af454111656687abd2be65e0c552617f8fc7eb6ee3b339bf"; sha512 = "239c248c11b3f3a8c1d95ea9e3c973d965b2dfd8fd0790ee5aa85947db1295374e56b9cd1379e54e139fbac7b8c51e201b592d7b371ed72181011ae78f49b275";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ro/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ro/thunderbird-60.7.0.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "d6a4fe46346b6699d570e316c7e97b530100923771d4ab76878dbea959dcd1c34e694c3a968eb786d19be96e0b7757952d47a87bc52f99d078eefc9a2483dd7f"; sha512 = "5be62fbf84bd4e5f4eb24edd620269288aa09e0a65836c0dfdaee28d90a68375dab44d1e5c988704fc82efeab6d060e343b623b01de28e967b91390c54aedb91";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ru/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ru/thunderbird-60.7.0.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "14b79c2751306b7e66cc3049c0338c16042c60fd707275f25775692b09c28fbd30b46886fdb2c8205de342e29cc0519887f8f92efd369e92a0a94ab33a5cba3a"; sha512 = "da9da528081d70ac504f61ae7668150e1a33acd159bf2f984805b7e76fd3e556cc6982b2d9596c621c533817c2cdd5e5ef28b42f362137908df1af097ae54f88";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/si/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/si/thunderbird-60.7.0.tar.bz2";
locale = "si"; locale = "si";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "a8781bfe6bf9ceac67bab6e2f2957d61bb5d27292a15ea24776bdd8dda4b7828a350ec8caaae40a894db85b9d9fe4d457172f8dcedd681fa58912eef74ade60a"; sha512 = "1ec7e7b376b8d1ad9d25b753f785c05fcfd8f46d50b8f9ef8a73600726ba056411d4e2cbca5cef3e8eb7fa9531be7828af30aecd10842ef0d46b7ffd09b6c95d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sk/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sk/thunderbird-60.7.0.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b22ef7083b344f8dec27b09631468c1263cb436479cfffc82b95ec78fc05ef66ec9b133d612dd097f9c24096b9c4e538efde6a88150816268a3a5a2d81a8e1fb"; sha512 = "598a8eca2a14a9c76b098355bc735c641763762dde312e5a47e8448bf0ae5fe2c78061c727a7e097073fd0d05e121fa1f4fcecbafdf02adb5c9c18a92e5ada47";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sl/thunderbird-60.7.0.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b3a295b4f1a27a75634bae5dbf033973849659bf9dc9fdecf33b90618aa919bf644e2211c789ceefa495cc72e6586ed1db1683658ca88f0fe4cb3ed7a909a208"; sha512 = "724cae2a2437e337ca5142916e6072e43a5f329100ae3e72c258cf7efabeafbcd10c8c6ae0fe1e507afdfda23492e5d8a4f54f373bfef9025e5663b8bae291ee";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sq/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sq/thunderbird-60.7.0.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "5f990f0f257d7b096f4310de22a0ea26f27b18e5f7566f3eed45bed66ff89e384f55b7932fd5ce65039077ff902631db3feffce69d2e6a8e13893586759d14b3"; sha512 = "317b776ea77f7232327e7bab54f27b2e47ada0f6ea7df42c42ef89ce2df0d9c3a24b752c08e46a8c246df5a44b7e34c7591e01bd63ec3cde7f537083dc1f8304";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sr/thunderbird-60.7.0.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "71623636dca3b89af58feeb1b998b9bf16c8f8c7ff7c8f273aafc0500ce4b5d4bfae3e997d8669e3075c6586b631df0a613ba062fc4d74cf281f686aa7b18109"; sha512 = "768f31cc6ef0adc40253f60c312cdd8033e1fe5515f007ac18db6e37da79d2ef70ff208786cc738e31ed1ca75d5745b9de845f22eeb4bd3b4c8f7f7aff074af5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sv-SE/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sv-SE/thunderbird-60.7.0.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "2e0f6115a0e1b538288594ff47b92b1eb688a26e5f67bb7b83b5c01fe781efe414fc8a9e2c289fd7312026fa1b9bc56588a0c0b25172c35d1e224269a779e40b"; sha512 = "93951ffef37d547bb13143863c417f3717a4a6d54498852bcbd729f20a422d5a05233161d6970bce20f6992dfa07032d779160659b21e9e858505649ee2b3b6b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/tr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/tr/thunderbird-60.7.0.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "fa3aa0c732a4e2feda079d283f6d0f98eb721a88e98a7df70681acb50d525e48af273deb19e6d2e5f41d20fc5daddf0c89c3e6d9ced74ccc34bd75fc12ebf26b"; sha512 = "c4a5510ecd6a2c98ef335b2862ec8b5123fcc1c88e3be72788f5863219abd20a639d7843faa19331ecdda6dab0365f21abb927e8fcdaf42ee4f36aaa37577fe5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/uk/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/uk/thunderbird-60.7.0.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "535fff2ee782b9818f3953314b084f5d63af4457310e8236b5dbe0fb7d0db5ef3c1aa0efbb992ef32ad89cd1df3ad50acae26fc116eae474b6b6970cb1172772"; sha512 = "54854f5b2c237b0545e062bfce142d9ac5f0353f0e2ce066faadb77e40bf62b1468c537852d486fee610096886d1ffc815948037a8a7fe911133f15ab1e47a70";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/vi/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/vi/thunderbird-60.7.0.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "54bfad80adc5f4a97e5dbb098e4330a7248b650178e9a9f49b2252fe1a15afb7e247f9af29253f59c7ff43e8af67a96f1cf069f3919ecd53ce0ff953e6cb42de"; sha512 = "85203efbb6e8f19135e61a4f297e7556592783d8e254f63c12687b77224af75b5c4d9a0aedd1c50dfd178a0cae865d980d958a8ef6c01b6932322c60ea052a4e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-CN/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/zh-CN/thunderbird-60.7.0.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7452bdee386e1e85967d7b88c6f935cb89ba7dece1f39d3b20f24cdd04a99793d3a11c333b76d107fe88d8c4c3eb69947be11792af7f8657515c48eda655d237"; sha512 = "536759160596e2c893114a7f5dc094325b695fec33543d32feb5b92e244079e9c64a22635b84b5587a7bb34c613041664ad7303fc39b8d25a510bd248d38d124";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-TW/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/zh-TW/thunderbird-60.7.0.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "0c1a7048f250bb0f3248ed92ad2e45d3bb01b308eaa6115cde9050253d960b6538467ea6c5754c6f5458035fe31bd2fc529ab423f6ca9da179dfb7f51ef1f612"; sha512 = "b63e819eae2b5aa71ac13fc875dce504effadd7e00bc46eb6b5c539c34d569d33da4895caa37a424b79d082a8b3693ba41908bd49d4914937c2d2a123a2feea2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ar/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ar/thunderbird-60.7.0.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "c04863a1693b2e0567eda646f6364b58cbf959c61045ba1948aebe9f30f63351888cca4a70de4a1655b48ee0407e0c665691c6ffcc2638c18b70046eb04cb02c"; sha512 = "57acb34987d0d098bf8dcb43d44460f2ebf29a88d4b5377cf889681a50a71195fa81c4920d7fd69c76295a7c41fadc94790e858de53182e5257260817318f49c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ast/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ast/thunderbird-60.7.0.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ed4c86716aa7ca675577f577f62bf11f025ba96a061e0c89952a99ad5e3ba3e3edb01dd8d428cd0884fdc78127453dcfde0e81ecb4ba3e11e650022f6df07102"; sha512 = "f538b3fdff93c7d19962c76e5fb7dba635fb8d2b14b760e39b024e04d878d475cc9f5dd317931f69a92cf8e79e62b32f9d1230d7876b4a5647233111f256d522";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/be/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/be/thunderbird-60.7.0.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "fff19d979335f90004f35646edf2c4ca7f1243a013d79c246db6a0139f787573bd2db2636adf503366a94d44cf8b932d2141ff1df2faced750ac6c604116d6da"; sha512 = "a2e97e6393f9aa24e7d99d8f200019279bd7535982670cc7841411d9f8eedce1b0b7a17c272792097053d50974f8ea092019c1a2a86dfc781ad13f49166c35a9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/bg/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/bg/thunderbird-60.7.0.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "afcbb510382a811af5afadf306ce66915f472a3cac62ec2e2ab5930c795fd443600c02743be29db3bbbccf3c9d8507bf54ad0452bd580de4f9db52d5438aa596"; sha512 = "5936686f7e62aff1475e6ef7600112b83316befa54a9befb34edadc5a2a03e5a4dbf2fb92b3b86b2a4c56296fbad50ab60922006638ccbd705225f6737231ecb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/br/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/br/thunderbird-60.7.0.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "3ca375f94f1f5795b2676d1e8774fc17e3eb0824ceeef6b4598b99f35265806a017e0dfbf2b07f275eae92b68fa975b05cf2d66c6adfd1147399ee7be3df94eb"; sha512 = "58153a303b6a76da23621f9503acb1ae7afcbc8fe68b4dd7d02a8cfcb95e3e5f86e8b3f6f6dd2812ae9781831d6b311c111e0a129d22a7bf83b7e15ebb44cf88";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ca/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ca/thunderbird-60.7.0.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "75d31ded8c44d8429c58f8c6bc1b5104a4b62a3d0899ac81ba9deb277204290d7ae079e6baf4b243188db7e1050b4a0b9046dd26ca8fa546083fdfbbf724bd01"; sha512 = "fd3f289257574191c25e0ae5adc099f95c8c757dc881e8b85404d2df91069f09e6e8e1edbc7326824b55c8d7e10356e2e95f8d27fd741b0ce650cf32120d423b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cs/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/cs/thunderbird-60.7.0.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0ead8f9276a6dcfaf39c1d400c892f95d431cee960c94857cd3e95e6f148571ed946325e6518bcea5821aaeb0e8f8f5dbbdd3970aad9cda549dbfc07eb2392ff"; sha512 = "3d9f97fc839a33ead139e47aebd248dd947ee80c217c065c6714198f3438f5675611d27bfe26e52537bcf595a3e4dbabedd95ec3fac98cdd541da7af05cd82dc";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cy/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/cy/thunderbird-60.7.0.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "fb9d58efc4b0a72a1bbe09624d38b83227c94a2584b4a852b95753d83481b64194e6d14578fe24210581feaf5b8ccf55c530cb3bae606ea6acd39a456a91dcc4"; sha512 = "08b3a7ca0b49cdcc347f04cab508cb037c603eb255074c3c32ee06caa9f15f64038aaea2f96837beb414bafbc8b41e699edf4811eb7ef823c481b37c275d46a1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/da/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/da/thunderbird-60.7.0.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "1bf483526e7e52626b6298c93c6586d1973cdd9c3aec660b31550b4658690e8454622276d2bac3b096acceb8e9b41fbf7db735ed8a2c185ee968e489a62ae329"; sha512 = "6b9c8d18358d771b039e4d2dba999c18d7b8ef70ed74cd4be50325d3506015ba9f3795e9b489f0e99169a02db8daf5a91481aab0c43412f4ad6db93e03fa0ca8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/de/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/de/thunderbird-60.7.0.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "1bdaf4b2a5ce2b1824250b4fd35695ce9c3be306b8c21d9002995e142f6a655166df15d3f68f80dc0f5963f31e87d01b00ee8c4463c6002df0eb536fc3eb2bfb"; sha512 = "55c741a9b849a2b7a8df800967c6ed17cdc805d7827137099fda1466c4677eb630fbeac9e28d1b92eee82521352f43bb77412f896e5d9ef21d9bf16e35a55898";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/dsb/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/dsb/thunderbird-60.7.0.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0b6f71ec6d02f06dde3509fd1fb771a341b12a7a44681d05244aa7ea61726f8f8792ff12a72b0700196162047b23b7a9741a3522519935813b075d617c79490c"; sha512 = "bc96d4452f5b4aba09e30f65bd9298b267fc5b6982ea126d31bb3af22cd55bc9f29040b08d8580000f15b17f4fdc5b160f109145a458d5fdd8b7b6120ae6873f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/el/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/el/thunderbird-60.7.0.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "bec935b6e469400f7d88fee26dab49c8159dd8a74bd34827122d23276e6b5e837dbedb8281b0a2c1b87e90d2897e2dc15a475ac53bf911f15887280630ef82fa"; sha512 = "c448c0fd389e9fb6a7ac1771ba2481c69af6c5549044e958bac258ee71d3e0a80a1ad60fd80e33fd7d96ee0e5921338b067d7d87281f354950db2816f185477b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-GB/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/en-GB/thunderbird-60.7.0.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "4e28d8bbc384c98767825e16111d24a96ad2291f40b1eb7b295ab2b7103482a9aa11c00ae5e455ea7e5a7e5d077a4d7c45e6f8890c69e7c7c237909c332bad75"; sha512 = "29c181d15234088c4e823f9681f8205a910190a493779733e587f0ce5eb304dad367b72b635541d509f2f5ab1bf7cbcaaccdf70047f372ea9f15c33605078778";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-US/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/en-US/thunderbird-60.7.0.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6b5619c5a03a4d585b030682fc41069c3ebe3c783578853c3c36c9055fe03c78c782f2621c12a454b4968e5416e01312639ef48047b407558dd6ad85fd81befd"; sha512 = "631d84e772069bfe192f7db3fde5113595201b56340b8284fbd3c26c58ce67e93c2e52bdbe95c8378fa1b99f6d26d4ba6d2cc5851321251dc84c5d375773824c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-AR/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/es-AR/thunderbird-60.7.0.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "9b6828c7c646f0483b758902d2cfd7897649acfc1622d1a338320d0f9a9f52b38dc8734ace3816fd4a116883ff7c9ffdfbae6b93e5070697a108a7df207de1d1"; sha512 = "b1af2b1a40167ba7a75f833b64f0d27f9be48ec91880884ef33f931fa439084f6ebd77eaeaff19140d50c4da256325fca17385de032a05ebf0b1d0716ac80ea4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-ES/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/es-ES/thunderbird-60.7.0.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "e0a8d2e68602cb5a9c0bca574ff8ed797c0e71a2bd86519e7d7de1ca8fc54316bead8ccc35e7f8dbc26cb11ab76e59076c09e69edb8175947c7c0dfab5758e3f"; sha512 = "1f0452f271eb218d9370f627a7e1ca0b392e8979f26cc4396c159adde26a6f70779851e6d91787c5274a401402f1b924f72bb1add5b6d90c5442d32e86cf8c1e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/et/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/et/thunderbird-60.7.0.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "c597b215fb574f948ed3cd169f7fd814a9f23e5c797da8457d9c810097f71b26751b386280cbba2fbf0224d07665c2fa33c3cb19c0fc54bbb0146fa271b25442"; sha512 = "1dac4826026c051fa38a96287c5a5d5849679681994b584e08ce4143b229503d2912db520c6ddebd081e4d3a799fd692935436cb6816c1ff6a61bf40240d904b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/eu/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/eu/thunderbird-60.7.0.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "9c1dfdeb74e6882689c036995d20ea7d0cbe9f3b406ec15b7a71d1f890cd209d3e7b03f6ce35d778adfcad2dfcfeb20ad55b9888dd222ffdb429166c8ad3a905"; sha512 = "3417239cb9b16b49a97df31008c7768e9fdc3d6197cc84d8bf360e2ff64c7d81f11e52e530b65d54e3a1ef4a1253c6c53c9baec8ffc915a4ae4d33e9abfd6d7f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fi/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/fi/thunderbird-60.7.0.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "fa24033927751c7b1cffbd3e165507d8cc0ef7ac7755f08afe102b9b9a339d0a31b8f738d1bb71bc0a8876f51a1411b4840b033a3716306e5e8a17eb4d7f0382"; sha512 = "3e31ccddca9537a2ddef98e4444a85eeb37227ef5da301d6aecc3abe714cd84aba33b926a7fdc8e5d6c3b72082d9457c0f2362aa5775d7cf354e2fc6600fcd2a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/fr/thunderbird-60.7.0.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "37daee1b1c0f1757a0098806d41bcd71c0dfd700bce2f7da58ec670c58d2b5fefcef2fde102bed7fa6daa62b59404716c26547de54a00eaed6201616c681b5ac"; sha512 = "813887a9db572f588b769c91061886547e813e8fb9761df26294d27af6eab75d1befc1950b890c3eb0a166b6e46d36bc55a2baecc96a4d33ae1a670c28cea0f3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fy-NL/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/fy-NL/thunderbird-60.7.0.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "85b2a6fa843d5364eaaacbc3399ad4a05169a7c988640f3a120fabe994bca31b0c22019a8537d598a14d33dc75f2037cda5504cb7d72149fec1ff040e1f962bd"; sha512 = "ee9621ddc0eb0195fa5a4ca0b982eb9805fe470a098e81e0a0620169ef13081654200573943d429cb2a9ed8de61aa361e5fbc6ae35498bfee8de31192d8a9944";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ga-IE/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ga-IE/thunderbird-60.7.0.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "475b766786a50d461ec6896b72c4eef83231f903672d275513c632eb8f4e7e1dd24bc635c18c066fdada4616b99116b3757d59d2718bc8bf21bfa495abea9a5f"; sha512 = "2e017ce8473ed99b573546aee5ec901c29243a9b4412ea594ce94f244c41edbc614eb902859289ce61d9e25edf0eb534c9bef1c00f3dd67c9515ff24caf6eeaa";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gd/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/gd/thunderbird-60.7.0.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "d5ee56fd14c4abbf9d3335cd75e284d6c00ed28db74ffd2a726a19dbed21a74e2d97e9dcb63d63bca31f3637380a29f3bdd1280c670e446850ba8d4e98971395"; sha512 = "e49cd177caa27b072b08f71e7127a67e96ccc5960c6900e6f43cf47c0e78000f7f03e543243ca316834dc7c887fa0dc5675fa5f304430b0a8435c3be4cb95e92";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/gl/thunderbird-60.7.0.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "262b36a73483dc3a379d416862f6f5c6d685a366f25a2599ba527d28fe0a17da9f3d377c38559a0688cfc5e5927001d3db7db0693fdbae44ba5596ac92c1a72f"; sha512 = "23aa10200e5e96b969db0d1e5c82b3cd78504d2742ebb09fb5910f0d68aef08f09d278954c3612bc980bd820a290b28184de65b229c3edc228db8c6b77d335d1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/he/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/he/thunderbird-60.7.0.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "404838f4defcb0da984532ba32740c9919ebf57c9e68137e43b1e40263a4f553a573028bc96c9f056141e405b4528e060ead4e30dcdc365e87069393b0056a5f"; sha512 = "ff21a536979886895db1e18bde93baf13447f240cf1d64a6018941b22cfdc206b0afaf7e02fa76f778e44d1ab333351bfcfdee475d24f37ea270a5eb500b099b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hr/thunderbird-60.7.0.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "9793e03d4b01c90af721a0197e20ea61c30e09e602321e214674a85ba5366a4eb4a394d0a2347af2a3f8c7f40da2eff50bb25c935db7b59cf573b8e6033469e1"; sha512 = "9e9f91262e633b6bd51cd349450c2078bfcb49e10c1bb63bdd0ce71cb63ba7aa35481547030638f5e2ad810959217887a69ffd99453cae03e20763ed71e66263";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hsb/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hsb/thunderbird-60.7.0.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "bd5be5e781edef1d410ed85552d72449e94b13c28a9943cc64ea4bf8092ed477ad61a39eb956b3ed008168a62206a0684ae8b38f370ac88a3c67df78ed57720d"; sha512 = "3205a0d1d96cf0f6dd1cafc08e3ff4f9fe14ed2917dee0209e1088a8aeddd74c59bb413d1ac32650e9829890ccf5b860b3a71f9dd92d35be7b26f201bcadc1a5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hu/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hu/thunderbird-60.7.0.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "a5f7e309efb45715dd67b4fb5ee1a88ac4c6ae54d5755c2476cff246d93abca6725116817173c72e701cfd570329f1d84f7732e3eaf3e7fd96e238512298c595"; sha512 = "03fb2b6cf147af43ef8621201c75e35767378d72b67d9e3460818ee38a78a35d62ac404685ed0a212da055632f6787402663e5c87f4cc2e827ad23fdd7c54793";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hy-AM/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hy-AM/thunderbird-60.7.0.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "145e562fdf0ea143d0c1e9f4581f2b2fc58bf085aa227e4486e780f7da54e7e0b1cce53cfe9dad1ac47aca50beee5e554f3494c7df2e2c240a3a9b350d5f46b8"; sha512 = "20d87f045b7969783c44c82701dbdcdf29fec9a2fa905ed0e00d824174c38425044983ac8b0507e5c8e5ce6c2489528ab0da880e06b85ae45f78be9a4a48c5d8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/id/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/id/thunderbird-60.7.0.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6f865a97783fe0269547981367717de6577780b24eeab33e26a19fc716cd4733cca28b7fab8cb8156b6a04b09e09b75cfca8b43c07aa99088cfe98a96a716361"; sha512 = "24a68981c39b12c50a2b7454624d548196bdcc0979367169978e782a7f83121f8bb097dd117173a8d3a75cce79c5d40c607048547687240f0e8408525ee66101";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/is/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/is/thunderbird-60.7.0.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "756301497644e2656a383f0c76a7723b1ce9ab49f760e08cc6f0159c898634664dcf5f92952310c408ecf8818939a25b3b181fd50836d32d017dc4c45b67dc25"; sha512 = "4f7dba2a9a04ded46d8812983368631bf9528def3dc03dd06804394c20c6760ca268c8638ae1813558dfe48220ce680a2a6a177817ae81e5719f34d310830b30";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/it/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/it/thunderbird-60.7.0.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "4ebfd6d2dd79e238594286412516729b66fa26d99ed3d6a399428bca87f63bd3f329877f70702d1d43229755268b0e9c951c753ce110250e805cdcdf576e0eb1"; sha512 = "af3cf72dd486d6bdc585d06cc4f32438c7868f378e3ce2910da08c58f20f4e7d4c9012231f73cd95a2df22e1badfc23070b9cae5694889c562285c6587fafc91";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ja/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ja/thunderbird-60.7.0.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0cbdd253afec94716c0a4ce4131e8260cf7e42d9a7df48210875524ca33d42fc7c011b3b9724b29054844b159896cf9a03fd817af4cfbae9b718777d4f4b278d"; sha512 = "20169d2f4887ba49d41f2fd608d4842ad076705910bf720009bd2408d386ebac7ede2c0d52392f49e9c0f4b7403806716ba7dd150ad142a1649005a6d51a5da8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kab/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/kab/thunderbird-60.7.0.tar.bz2";
locale = "kab"; locale = "kab";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "cf363a3e2177d2ac629713674bd22da270887882f21dccefbd6ca30c71f535c5b69fe1c05554fbed95920d4ebc4acc1649a05be1594b1cad5f4b17a7652f3e74"; sha512 = "6be43761a03541cb8c8fc61513745abe9263e9cf2b47dff191742bb1fb6fc6001b7d60ce80e1af85daf6016810064ce532be11f82cfe8ef352ecd0722cc983b1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kk/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/kk/thunderbird-60.7.0.tar.bz2";
locale = "kk"; locale = "kk";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "77555e556b3d04ebc07390633e4ba3a3fda8c7ca9c8e7a61f522633a20378c857522598a3ad1b3b55e03bff181df615186183947c7770a3afc3df6c18d58446c"; sha512 = "31386ac56cf93b3f9aaea18973b5629f8afc1ed44f7fce3ae09ea9dd11a344ba4ada59422f8501984325ddf7906d2f70d69cbd5c6ddc8a768797d22232524423";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ko/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ko/thunderbird-60.7.0.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "634c0ba3322494670df3c7d14b8866d55f185588d1fe6dde706da86a66481f98deefed6739561f3c0c73ca005e1581d541da773c5d3d7caddd5b49510d9f138e"; sha512 = "a241269e84ca52dbd00e073e8227f108028f2bef27f083d3d4c1fe76b4cb05231598bcb88726406b61168ca855ea995e13858fd7c193b8e346e8e6c7bd2b4fc3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/lt/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/lt/thunderbird-60.7.0.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "9646f54ebabca5e8503d44b099871bfb6345cd4a3fe04ab0211aa8f019800b48faae93eb5565428818c4cf25b8b1e536614f23e4fcac76791c06482aa9fd7396"; sha512 = "1f222a2ad3c583020957eab49ec2a6f3230880e8cf5b38be19b7e29b9eb593606f6b3a3a162d47c809ff3da1c7000f599e5ba0fd921340a442bd262f9c02cde3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ms/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ms/thunderbird-60.7.0.tar.bz2";
locale = "ms"; locale = "ms";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ecec0bac0770bd3cad75881266aea00a9ae3c8506a64e000ffb118cc18cb28a3968b9ece10e11bbc4628612065345ab1f58df0df130a2e497809a244049c1774"; sha512 = "faa2fb605a446e79b3f0c75d5c695de56c5404aa3921bd6684c6e385cb97089c43f33db7611d824173d4df9bf98001a76495a68324d87d52e8b4de58eb701a5c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nb-NO/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/nb-NO/thunderbird-60.7.0.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "271be3b2bf2424bb149e7f1a1c11564e9b9d849e043a95489a8215a3ce757d032cfce2ff5df1b666fec5cad00b7a540b437d6d0ef33ccec485a0b5b96f61e8bd"; sha512 = "e1b6d917391561dfac0b36f9a305135659dd96e52cfc9a1080beb3c671a00f37cccbb39de02e790a87f0efef86ec8a8c0b8351184d44c5cbff5c5ba9862ac03d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/nl/thunderbird-60.7.0.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "a80e354c855d51fc278fc46e83ad41de079f1aff1fb7d0329eba377c07ecf67621f9c11e2c51760b23aeea4547eacc7916f3092e61009b162283a8f4458b5573"; sha512 = "957caacf6a84c9d4454fe7b708c5b798c32296ccf2a1aaebcb02645065fb10a2f6f098a0f14661ccd4f9ae665e7ffe62fba40df7aa3d00e63606ff2d97a00c45";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nn-NO/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/nn-NO/thunderbird-60.7.0.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "312414bf118a808ad663807dfab5f69bca61a8f20087cfeac78883a869cd43eb03d5c7dd511a32350c0f59b0e28de7bc1992ce3ba48d8e1b5fe3c2abc09441af"; sha512 = "5d0017b8485e7236ce23c64d1b8aa30d3c8f0d938bf6d98a4413b0abecf6bfb05c2a0975410432702f967e7261b028dbd89c4580d661f438c7c0f9a3181b7845";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/pl/thunderbird-60.7.0.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "4abf25e59400c038e9719200459903e3e113302592bf65d024c1dd05852d51e2969f3f53a33dd55f9d131bcd1405571f713a6dc3165d8af1147616574f4aa5c4"; sha512 = "22231f71381381c358bfabbf62970b8ba69d6f72d0d3a13ac1bd04f870cea53cca9d937b28e8f456f5aee80b3967af5d13fea40177d8715008fb4ce84aa90f3f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-BR/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/pt-BR/thunderbird-60.7.0.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ca38fec5178dfc2f841dea0d30490df8be3e4424a2d94bda1a3cf1cbb1908df90c29adafe3f844ec13f2bf87606fcf20066d3789b29440b55762a9c83ff5bfb9"; sha512 = "53110bc399a63da962617e11f209aad895fa5254be955d70ac70d3bd70676dee695e7ff485255edc2107928ed169118fc50c149966b475fcdd5868a453710db2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-PT/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/pt-PT/thunderbird-60.7.0.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "f8c25a0d9d6a4ca582c7d3593c8a74c1931fdd4a85ca9ac2af0b37efb877ac0232e9188af5cb5985f1a865aabb252b58197cace1f6cff3ce4551b5f4678eea56"; sha512 = "05935c86b294444e296befb13803dec0b4b848e08324346dbd43a1c22e66cda226d0db5317a2c857cc799e6d9d0433c29594a529ba8a7ce3c371729bfdc7651e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/rm/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/rm/thunderbird-60.7.0.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ab74f4fa6729d6f7c2f0fb1f99c457ccd65a81be9bb5d7519beef4ec1ddf58c9f51370e7e3fbf71f2a8781f2669b50d20e65e687794b7dfeccb7da99865bd614"; sha512 = "4567ae5e584f65946209d5ebfad07db68c11211737e446d96ecb3eed2ae55902600eaf1dab7d870b7ea00c38d87045ef45ebe3e78a416070b93206f0ce9a18cf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ro/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ro/thunderbird-60.7.0.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "cb086a6ce3446ee8437c762040b03ee58a3cebd1a0cf473197e7da19d81704bd1ae7cda5d3329e17e76d1f7e682674a12bda3e964fa934fd271d80cfcb5da907"; sha512 = "fc323ca7ab5fb0d259a941ba4f1c49f998fbdacf9679185bc4f17665d092aede662d2ac7793a451b81ab24e968c8ea7a0ea391ee69b1d646831927fcc35af833";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ru/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ru/thunderbird-60.7.0.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "2334973a52a5e954b082be0bc9921a6034532edf558a2ffc2b1ffaad7d1d8777832cfe21e005290c65f4ed906816243dc3c1a35a5e078f005ebe84f3769cbad0"; sha512 = "0f656f500decb22f1e84f1f92d8e5faa4a702ec3858a759dcc303ed0caec50dcf3711da15803dd7c5cac2111653e49276f8935f99d7b75e385dbb0cf9512003c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/si/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/si/thunderbird-60.7.0.tar.bz2";
locale = "si"; locale = "si";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "aa7a52b410a507571551430d538fe4b84efbc57bad8eb89631c2c79f8bd23399a60e8ba8018e9b086d6562ef4e0e96b5f6b912952838ef38507a6eb41e776fe6"; sha512 = "768c011614527977ab446e0e9ac42f90f1bb91d2d1e3ee5e5e91a31e6085e12dbd37542080b964724e4c65a1cad25be7998137740f2bc6cd82cc2d1b9056fd75";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sk/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sk/thunderbird-60.7.0.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "4cef3b0059d27313ff35610fc273b7c02faaeb21996a5b62be6cefd0c4b76162fd8a54bae3e2f6527135bfc97ed8133cde34e51505d8abb25d90a03716427370"; sha512 = "d648a5a20a1c0e4d6f50368fb57000e99b7868b1c4bab8861b2bea73e8b0ec2b9912f41e16ee272d49a6ced36c1e61ba267ba41b136255e3c5aacc15952fa3a2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sl/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sl/thunderbird-60.7.0.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6e4e2771a18bf7af347fff15eb5b5c312b7373d2fa86474317154ed8ae48e996028cda78ad9ac5ad09839af9844039334a25349df2c45c30095606f684b849b4"; sha512 = "ab9923acfcbc5c327a6f7cadbacbf680f1db10a27bbae270824b7ff4673805b20ff76c3fc694acfdf1ac2e537bf4f08d9599b1bdb4a2824eb98d264ca8a9bfeb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sq/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sq/thunderbird-60.7.0.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "eb1d190808ad33b2eecfd8979c3ae669f44c3426bc247781b11698818f1804ba1b28851b7c7f507b676c87d86d89b7f537d378a130997dc21cd8870e070dedcf"; sha512 = "fd6b788ea87a04185162d8bad64c5ac4d649e1c9a89b1eaf1e9cba704827a0d8e70e29cef4e18dd3f63307cde959561ff9cee880650cc9476b31f2f8c0ebe450";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sr/thunderbird-60.7.0.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "bd46e690c9969d65563075996581c9ff13576143425985764a1fef4d2d6d4bf55cecd1e52b3e7a237b187a9144c928578879737f16c4b59be29120b67b18526d"; sha512 = "1edaea6e10b22ad82eca06a5c6f69a9a4cc515c32cde425735e7da371046ecdb6fec3be63212fe7747cda54661874a41dc1f7579ca0ccf8991fc459e3f813b2e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sv-SE/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sv-SE/thunderbird-60.7.0.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "19e859d0f94de0b4cd82fb35a63a32cc9dfe09c74429380c90f749748e17123f161398a465b53aa333c50863a256be99df4029f45d08f80a7695b45883c94799"; sha512 = "3d895759ce8005718d3348058e6b9146d2cbab42ea9bab63446c0f91177ab1d52a84199fe4c0ef4cb5da4994db7239d97b7befddcf5155cd4a53b5fd91b250ad";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/tr/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/tr/thunderbird-60.7.0.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "964a16f7836a1dcfda273db6c65ea22d516722e410ceb961ee8212540837911ba3b156d5c365a7c1a79c7d2239b0df03dc1176a266d09b075c1e5b870a833352"; sha512 = "36d5dd40de1824b97615353b002febcfcacceefd4af189313920292229511ef83049839fbe5fa18a3ae87b922c750da774f69f8cde79b77c57d4aabd14053229";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/uk/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/uk/thunderbird-60.7.0.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "aee1e5a933bcb5238263ebc6ea57e9d3fe851c19c5c017e1e15bbb9e5cf1e9f39edf75b1b908caa4da688e14e41e4318a7fca0c41d045355cdc91b9ef48ba957"; sha512 = "ddceab3f336e9f0edf36a057e1805f41eba3308fe7ad06a135a7cc1a27d59229d9481535eda33aeb2db23c5b074d6bb83e02233645570f8ef4afef697210fa02";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/vi/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/vi/thunderbird-60.7.0.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "dd667bf5db90586bb29c97c8dd3bd0d50c5f4c5f5cbebdfc908dda4a54e72575edcf5d5b8bed97b1b6aa7350ea79c767115137aa6500b263bd5ae80d61efdbc1"; sha512 = "b660eee5eabfd65602d110168c81b6ba99d45f1ffb02e8a037bde6d47513f90b88f160b4125fbd91d3057bd35e1e9b743a715385b796aa2873f4906e3e44321b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-CN/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/zh-CN/thunderbird-60.7.0.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "f791ad02b1a67ac2906602a3c90238e5e8062fedea5851a790196eb1da0e19174543a7dc00e53460d40a0c39089c109125875fbec458fd65a650ab7d438cafdf"; sha512 = "4d4e4d032623835297ca5e43bcd9a058794c3568f4918a6c984c39b8f0998a1f9b412fbb96047c1f5e9bc7bd69253f4636bea81fb6e61031c66ba4e5f229f5e9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-TW/thunderbird-60.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/zh-TW/thunderbird-60.7.0.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "83cec9f663cd4e02d921f2f96a7dab791cdb015756f63148833491a263abb297bed5ee64101b4ae86ea4a3ed09b75d668bcf36a12563885f3eb164655b3348bd"; sha512 = "0bdd9c9bd11544abb6230fc94bfa49e2f1ffccf8a5684a5326a7b38880870e847841e0c81dcc33b969fe4327c6a2d51ba3313306842cb8ecc084222444f2ac4b";
} }
]; ];
} }

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

@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "thunderbird-${version}"; name = "thunderbird-${version}";
version = "60.6.0"; version = "60.7.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "2s8h6z3rkylrclng1cpmj5dvsbhqymrdwvjy3g2s8rq66xca13wkyswdhgh8671d0dw9bmminikk53d2xqg7lqvvd1rdsminwscln4z"; sha512 = "0l773bl9kkrz905rm4ipsic5ykkrw2lmg3i9c5vxpc0j1qgmz3p3x5db1kbk2yy2i5hx9lkn5szhgjf71d7dgvf7935z67d5djqnhk0";
}; };
# from firefox, but without sound libraries # from firefox, but without sound libraries

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

@ -3,14 +3,14 @@
let let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoPackage rec { buildGoPackage rec {
version = "1.1.3"; version = "1.1.4";
name = "${stname}-${version}"; name = "${stname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
sha256 = "00jshqa0nkwj06bfq16p359ss6nl6h49s31hag79wl9gwkca38va"; sha256 = "0a19l1kp4cwyzcd53v9yzv3ms69gn78gajkyfawafr7ls0i8x82f";
}; };
goPackagePath = "github.com/syncthing/syncthing"; goPackagePath = "github.com/syncthing/syncthing";

24
pkgs/applications/networking/websocketd/default.nix
View File

@ -1,21 +1,19 @@
{ stdenv, buildGoPackage, fetchgit }: { lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec { buildGoModule rec {
name = "websocketd-${version}"; pname = "websocketd";
version = "0.3.0"; version = "0.3.1";
rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3";
goPackagePath = "github.com/joewalnes/websocketd"; src = fetchFromGitHub {
owner = "joewalnes";
src = fetchgit { repo = pname;
inherit rev; rev = "v${version}";
url = "https://github.com/joewalnes/websocketd"; sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q";
sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb";
}; };
goDeps = ./deps.nix; modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs";
meta = with stdenv.lib; { meta = with lib; {
description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
homepage = "http://websocketd.com/"; homepage = "http://websocketd.com/";
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];

12
pkgs/applications/networking/websocketd/deps.nix generated
View File

@ -1,12 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
};
}
]

44
pkgs/applications/office/docear/default.nix Normal file
View File

@ -0,0 +1,44 @@
{stdenv, fetchurl, runtimeShell, makeWrapper
, oraclejre
, antialiasFont ? true
}:
stdenv.mkDerivation rec {
pname = "docear";
version = "1.2";
src = fetchurl {
url = "http://docear.org/downloads/docear_linux.tar.gz";
sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4";
};
buildInputs = [ oraclejre makeWrapper ];
buildPhase = "";
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp -R * $out/share
chmod 0755 $out/share/ -R
# The wrapper ensures oraclejre is used
makeWrapper ${runtimeShell} $out/bin/docear \
--set _JAVA_OPTIONS "${stdenv.lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \
--set JAVA_HOME ${oraclejre.home} \
--add-flags "$out/share/docear.sh"
chmod 0755 $out/bin/docear
'';
meta = with stdenv.lib; {
description = "A unique solution to academic literature management";
homepage = "http://www.docear.org/";
# Licenses at: http://www.docear.org/software/download/
license = with licenses; [
gpl2 # for the main software and some dependencies
bsd3 # for one of its dependencies
];
maintainers = with maintainers; [ unode ];
platforms = platforms.all;
};
}

10
pkgs/applications/virtualization/lkl/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }: { stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
, buildPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lkl-2018-08-22"; name = "lkl-2018-08-22";
@ -40,7 +41,12 @@ stdenv.mkDerivation rec {
# crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." # crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
hardeningDisable = [ "format" "fortify" ]; hardeningDisable = [ "format" "fortify" ];
makeFlags = "-C tools/lkl"; makeFlags = [
"-C tools/lkl"
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
enableParallelBuilding = true; enableParallelBuilding = true;

9
pkgs/build-support/trivial-builders.nix
View File

@ -107,10 +107,15 @@ rec {
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
/* /*
* Writes a text file to /nix/store/<store path> and marks the file as executable. * Writes a text file to /nix/store/<store path> and marks the file as
* executable.
*
* If passed as a build input, will be used as a setup hook. This makes setup
* hooks more efficient to create: you don't need a derivation that copies
* them to $out/nix-support/setup-hook, instead you can use the file as is.
* *
* Example: * Example:
* # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable * # Writes my-file to /nix/store/<store path> and makes executable
* writeScript "my-file" * writeScript "my-file"
* '' * ''
* Contents of File * Contents of File

8
pkgs/data/themes/tetra/default.nix → pkgs/data/themes/adementary/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, sassc }: { stdenv, fetchFromGitHub, gtk3, sassc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tetra-gtk-theme"; pname = "adementary-theme";
version = "201905"; version = "201905r1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrdwrrsk"; owner = "hrdwrrsk";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi"; sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk";
}; };
preBuild = '' preBuild = ''
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme";
homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; homepage = https://github.com/hrdwrrsk/adementary-theme;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill ];
platforms = platforms.linux; platforms = platforms.linux;

6
pkgs/development/compilers/osl/default.nix
View File

@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang, # In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this # but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}"; name = "openshadinglanguage-${version}";
version = "1.10.4"; version = "1.10.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "imageworks"; owner = "imageworks";
repo = "OpenShadingLanguage"; repo = "OpenShadingLanguage";
rev = "Release-1.10.4"; rev = "Release-1.10.5";
sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g"; sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi";
}; };
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];

20
pkgs/development/compilers/shaderc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, python }: { stdenv, fetchFromGitHub, cmake, python3 }:
# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
# https://github.com/google/shaderc/blob/known-good/known_good.json # https://github.com/google/shaderc/blob/known-good/known_good.json
@ -8,24 +8,24 @@ let
glslang = fetchFromGitHub { glslang = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "glslang"; repo = "glslang";
rev = "712cd6618df2c77e126d68042ad7a81a69ee4a6f"; rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a";
sha256 = "0wncdj6q1hn40lc7cnz97mx5qjvb8p13mhxilnncgcmf0crsvblz"; sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji";
}; };
spirv-tools = fetchFromGitHub { spirv-tools = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Tools"; repo = "SPIRV-Tools";
rev = "df5bd2d05ac1fd3ec3024439f885ec21cc949b22"; rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158";
sha256 = "0l8ds4nn2qcfi8535ai8891i3547x35hscs2jxwwq6qjgw1sgkax"; sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz";
}; };
spirv-headers = fetchFromGitHub { spirv-headers = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Headers"; repo = "SPIRV-Headers";
rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda";
sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "shaderc-${version}"; name = "shaderc-${version}";
version = "2018.0"; version = "2019.0";
outputs = [ "out" "lib" "bin" "dev" "static" ]; outputs = [ "out" "lib" "bin" "dev" "static" ];
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
owner = "google"; owner = "google";
repo = "shaderc"; repo = "shaderc";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl"; sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2";
}; };
patchPhase = '' patchPhase = ''
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers
''; '';
nativeBuildInputs = [ cmake python ]; nativeBuildInputs = [ cmake python3 ];
postInstall = '' postInstall = ''
moveToOutput "lib/*.a" $static moveToOutput "lib/*.a" $static

13
pkgs/development/libraries/libfilezilla/default.nix
View File

@ -1,14 +1,17 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, pkgconfig, nettle }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libfilezilla-${version}"; pname = "libfilezilla";
version = "0.13.0"; version = "0.16.0";
src = fetchurl { src = fetchurl {
url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0sk8kz2zrvf7kp9jrp3l4rpipv4xh0hg8d4h734xyag7vd03rjpz"; sha256 = "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v";
}; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ nettle ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://lib.filezilla-project.org/; homepage = https://lib.filezilla-project.org/;
description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pyotherside"; pname = "pyotherside";
version = "1.5.5"; version = "1.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thp"; owner = "thp";
repo = "pyotherside"; repo = "pyotherside";
rev = version; rev = version;
sha256 = "1mczagl7mrgw9rqxlasgybrkfigdw1g7k542q75am8gp82m6wka9"; sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

27
pkgs/development/libraries/re2/default.nix
View File

@ -1,24 +1,31 @@
{ stdenv, fetchurl }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "re2-${version}"; name = "re2-${version}";
version = "20140304"; version = "20190401";
src = fetchurl { src = fetchFromGitHub {
url = "https://re2.googlecode.com/files/${name}.tgz"; owner = "google";
sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb"; repo = "re2";
rev = "2019-04-01";
sha256 = "018b8z3fgcr02rmhxdz80r363k40938cbgmk1c9b46k6xkc4q0hd";
}; };
preConfigure = '' preConfigure = ''
substituteInPlace Makefile --replace "/usr/local" "$out" substituteInPlace Makefile --replace "/usr/local" "$out"
'' + stdenv.lib.optionalString stdenv.isDarwin '' # we're using gnu sed, even on darwin
# Fixed in https://github.com/google/re2/commit/b2c9765b4a7afbea8b6be1dae548b6f4d5f39e42 substituteInPlace Makefile --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i"
substituteInPlace Makefile \
--replace '-dynamiclib' '-dynamiclib -Wl,-install_name,$(libdir)/libre2.so.$(SONAME)'
''; '';
preCheck = "patchShebangs runtests";
doCheck = true;
checkTarget = "test";
doInstallCheck = true;
installCheckTarget = "testinstall";
meta = { meta = {
homepage = https://code.google.com/p/re2/; homepage = https://github.com/google/re2;
description = "An efficient, principled regular expression library"; description = "An efficient, principled regular expression library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = with stdenv.lib.platforms; all; platforms = with stdenv.lib.platforms; all;

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.9.152"; # N.B: if you change this, change botocore too version = "1.9.160"; # N.B: if you change this, change botocore too
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0qspp97rddshjfqmmnqbvrszr66wq0ag05j8lcfsb9rj6ymz5s5s"; sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.12.152"; # N.B: if you change this, change boto3 and awscli to a matching version version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1pj9k3x82f9cgr0flg0m5n6fh8rkxy3c0z1qgx5nqvyidswn793r"; sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

39
pkgs/development/python-modules/django_silk/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , python
, fetchFromGitHub
, django , django
, pygments , pygments
, simplejson , simplejson
@ -12,26 +13,50 @@
, pytz , pytz
, pillow , pillow
, mock , mock
, gprof2dot
, freezegun
, contextlib2
, networkx
, pydot
, factory_boy
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-silk"; pname = "django-silk";
version = "3.0.2"; version = "3.0.2";
src = fetchPypi { # pypi tarball doesn't include test project
inherit pname version; src = fetchFromGitHub {
sha256 = "8dd5b78531360bd8c3d571384f9f4f82ef03e1764e30dd4621c5638f5c973a1d"; owner = "jazzband";
repo = "django-silk";
rev = version;
sha256 = "1fbaafc2gx01gscdalp6hj6bz4b0cmq59lgmvsydw7jkds4mps7c";
}; };
# "test_time_taken" tests aren't suitable for reproducible execution, but django's
doCheck = false; # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking
# them up as tests
postPatch = ''
substituteInPlace project/tests/test_silky_profiler.py \
--replace "def test_time_taken" "def _test_time_taken"
'';
buildInputs = [ mock ]; buildInputs = [ mock ];
propagatedBuildInputs = [ django pygments simplejson dateutil requests sqlparse jinja2 autopep8 pytz pillow ]; propagatedBuildInputs = [
django pygments simplejson dateutil requests
sqlparse jinja2 autopep8 pytz pillow gprof2dot
];
checkInputs = [ freezegun contextlib2 networkx pydot factory_boy ];
checkPhase = ''
cd project
DB=sqlite3 DB_NAME=db.sqlite3 ${python.interpreter} manage.py test
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Silky smooth profiling for the Django Framework"; description = "Silky smooth profiling for the Django Framework";
homepage = https://github.com/mtford90/silk; homepage = https://github.com/mtford90/silk;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ris ];
}; };
} }

6
pkgs/development/python-modules/gprof2dot/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildPythonApplication }: { lib, fetchFromGitHub, buildPythonApplication, python, graphviz }:
buildPythonApplication { buildPythonApplication {
name = "gprof2dot-2017-09-19"; name = "gprof2dot-2017-09-19";
@ -10,11 +10,13 @@ buildPythonApplication {
sha256 = "1b5wvjv5ykbhz7aix7l3y7mg1hxi0vgak4a49gr92sdlz8blj51v"; sha256 = "1b5wvjv5ykbhz7aix7l3y7mg1hxi0vgak4a49gr92sdlz8blj51v";
}; };
checkInputs = [ graphviz ];
checkPhase = "${python.interpreter} tests/test.py";
meta = with lib; { meta = with lib; {
homepage = https://github.com/jrfonseca/gprof2dot; homepage = https://github.com/jrfonseca/gprof2dot;
description = "Python script to convert the output from many profilers into a dot graph"; description = "Python script to convert the output from many profilers into a dot graph";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.pmiddend ]; maintainers = [ maintainers.pmiddend ];
}; };
} }

36
pkgs/development/python-modules/python-redis-lock/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, redis
, pytest
, process-tests
, pkgs
, withDjango ? false, django_redis
}:
buildPythonPackage rec {
pname = "python-redis-lock";
version = "3.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "5316d473ce6ce86a774b9f9c110d84c3a9bd1a2abfda5d99e9c0c8a872a8e6d6";
};
checkInputs = [ pytest process-tests pkgs.redis ];
checkPhase = ''
pytest tests/
'';
propagatedBuildInputs = [ redis ]
++ stdenv.lib.optional withDjango django_redis;
meta = with stdenv.lib; {
homepage = "https://github.com/ionelmc/python-redis-lock";
license = licenses.bsd2;
description = "Lock context manager implemented via redis SETNX/BLPOP";
maintainers = with maintainers; [ vanschelven ];
};
}

11
pkgs/development/python-modules/spglib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: { stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "spglib"; pname = "spglib";
@ -9,6 +9,15 @@ buildPythonPackage rec {
sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443"; sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443";
}; };
patches = [
(fetchpatch {
name = "fix-assertions.patch";
url = https://github.com/atztogo/spglib/commit/d57070831585a6f02dec0a31d25b375ba347798c.patch;
stripLen = 1;
sha256 = "0crmkc498rbrawiy9zbl39qis2nmsbfr4s6kk6k3zhdy8z2ppxw7";
})
];
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];
checkInputs = [ nose pyyaml ]; checkInputs = [ nose pyyaml ];

24
pkgs/development/python-modules/strategies/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi
, multipledispatch, toolz
, pytest
}:
buildPythonPackage rec {
pname = "strategies";
version = "0.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "02i4ydrs9k61p8iv2vl2akks8p9gc88rw8031wlwb1zqsyjmb328";
};
propagatedBuildInputs = [ multipledispatch toolz ];
checkInputs = [ pytest ];
meta = {
description = "A Python library for control flow programming";
homepage = "https://github.com/logpy/strategies";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ suhr ];
};
}

4
pkgs/development/tools/detect-secrets/default.nix
View File

@ -2,14 +2,14 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "detect-secrets"; pname = "detect-secrets";
version = "0.11.4"; version = "0.12.4";
# PyPI tarball doesn't ship tests # PyPI tarball doesn't ship tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Yelp"; owner = "Yelp";
repo = "detect-secrets"; repo = "detect-secrets";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ydigridkjirrfhyfr8barw0yrd4hw6w0k9g7mbd0gdqng6gpmgc"; sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1";
}; };
propagatedBuildInputs = [ pyyaml ] propagatedBuildInputs = [ pyyaml ]

19
pkgs/development/tools/git-quick-stats/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "git-quick-stats-${version}";
version = "2.0.8";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = "${version}";
sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi";
};
PREFIX = builtins.placeholder "out";
meta = with stdenv.lib; {
homepage = "https://github.com/arzzen/git-quick-stats";
description = "A simple and efficient way to access various statistics in git repository";
platforms = platforms.all;
maintainers = [ maintainers.kmein ];
license = licenses.mit;
};
}

5
pkgs/development/tools/misc/gdb/default.nix
View File

@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0"; sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0";
}; };
postPatch = if stdenv.isDarwin then ''
substituteInPlace gdb/darwin-nat.c \
--replace '#include "bfd/mach-o.h"' '#include "mach-o.h"'
'' else null;
patches = [ patches = [
./debug-info-from-env.patch ./debug-info-from-env.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [

33
pkgs/os-specific/linux/audit/default.nix
View File

@ -1,12 +1,14 @@
{ {
stdenv, buildPackages, fetchurl, fetchpatch, stdenv, buildPackages, fetchurl, fetchpatch,
runCommand,
autoconf, automake, libtool,
enablePython ? false, python ? null, enablePython ? false, python ? null,
}: }:
assert enablePython -> python != null; assert enablePython -> python != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "audit-2.8.5"; name = "audit-2.8.5"; # at the next release, remove the patches below!
src = fetchurl { src = fetchurl {
url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz";
@ -16,6 +18,8 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = stdenv.lib.optionals stdenv.hostPlatform.isMusl
[ autoconf automake libtool ];
buildInputs = stdenv.lib.optional enablePython python; buildInputs = stdenv.lib.optional enablePython python;
configureFlags = [ configureFlags = [
@ -29,17 +33,24 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
# TODO: Remove the musl patches when
# https://github.com/linux-audit/audit-userspace/pull/25
# is available with the next release.
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [
(fetchpatch { (
url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0002-auparse-remove-use-of-rawmemchr.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; let patch = fetchpatch {
name = "0002-auparse-remove-use-of-rawmemchr.patch"; url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch";
sha256 = "1caaqbfgb2rq3ria5bz4n8x30ihgihln6w9w9a46k62ba0wh9rkz"; name = "Add-substitue-functions-for-strndupa-rawmemchr.patch";
}) sha256 = "015bvzflg1s1k5viap30nznlpjj44a66khyc8yq0waa68qwvdlsd";
(fetchpatch { };
url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0003-all-get-rid-of-strndupa.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; in
name = "0003-all-get-rid-of-strndupa.patch"; runCommand "Add-substitue-functions-for-strndupa-rawmemchr.patch-fix-copyright-merge-conflict" {} ''
sha256 = "1ddrm6a0ijrf7caw1wpw2kkbjp2lkxkmc16v51j5j7dvdalc6591"; cp ${patch} $out
}) substituteInPlace $out --replace \
'-* Copyright (c) 2007-09,2011-16,2018 Red Hat Inc., Durham, North Carolina.' \
'-* Copyright (c) 2007-09,2011-16 Red Hat Inc., Durham, North Carolina.'
''
)
]; ];
prePatch = '' prePatch = ''

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.123"; version = "4.14.124";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "11avfbkd0bsv3ynr4sxgm2q9980c5mglz67fpk4qlf6ydfsqrx95"; sha256 = "1fdwbj26pcnl23n6yw55j5yif6fkka7kvkdh31c8wczc3rw5h3bx";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.48"; version = "4.19.49";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ylkd30hg2skfxl12g45lqm48b732faf41d68513i3nc217xpl01"; sha256 = "1kdv72w9x72z126dycdqm4i5hvmy0njaywb2a6jvq39wjyrj1ncj";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.1.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.1.7"; version = "5.1.8";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "19pkmnvpjacrssyyjhjlz8cqi8fsn3y293yyvc5bv6dpy96x0ih2"; sha256 = "1v56hzzb147mdnhajkgcjwjrmd7qyayky7bprjb3maz2qvy4y5nh";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "5.2-rc3"; version = "5.2-rc4";
modDirVersion = "5.2.0-rc3"; modDirVersion = "5.2.0-rc4";
extraMeta.branch = "5.2"; extraMeta.branch = "5.2";
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1hray0c7lgnsvvgfwff82d2ng03rn3dlljm04sk1w8nlwyphfmj8"; sha256 = "0j5vvmbndmjyal3sd98a9lr0x6lxarbz46rgp197f6sf628gxahq";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?

60
pkgs/servers/monitoring/sensu-go/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ buildGoPackage, fetchFromGitHub, lib }:
let
generic = { subPackages, pname, postInstall ? "" }:
buildGoPackage rec {
inherit pname;
version = "5.9.0";
shortRev = "078f625"; # for internal version info
goPackagePath = "github.com/sensu/sensu-go";
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = version;
sha256 = "1rivnq7m4p44zz1fl46j06aakb0yjsjb3mjqyfq4r0235xr01ajw";
};
inherit subPackages postInstall;
buildFlagsArray = let
versionPkg = "github.com/sensu/sensu-go/version";
in ''
-ldflags=
-X ${versionPkg}.Version=${version}
-X ${versionPkg}.BuildSHA=${shortRev}
'';
meta = {
homepage = https://sensu.io;
description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ thefloweringash ];
};
};
in
{
sensu-go-cli = generic {
pname = "sensu-go-cli";
subPackages = [ "cmd/sensuctl" ];
postInstall = ''
mkdir -p \
"''${!outputBin}/share/bash-completion/completions" \
"''${!outputBin}/share/zsh/site-functions"
''${!outputBin}/bin/sensuctl completion bash > ''${!outputBin}/share/bash-completion/completions/sensuctl
''${!outputBin}/bin/sensuctl completion zsh > ''${!outputBin}/share/zsh/site-functions/_sensuctl
'';
};
sensu-go-backend = generic {
pname = "sensu-go-backend";
subPackages = [ "cmd/sensu-backend" ];
};
sensu-go-agent = generic {
pname = "sensu-go-agent";
subPackages = [ "cmd/sensu-agent" ];
};
}

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pgroonga"; pname = "pgroonga";
version = "2.1.9"; version = "2.2.0";
src = fetchurl { src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "15bix7gqi45nf1ah0sxmlg3aqqrkacn19slp43jiirfnpp74dbnw"; sha256 = "1cankcprikx8nf72yg4h8542gqqlfgww6d63kg7l8l8sz962d28b";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

29
pkgs/tools/X11/xpra/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
, ffmpeg, x264, libvpx, libwebp , ffmpeg_4, x264, libvpx, libwebp, x265
, libfakeXinerama , libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection , gst_all_1, pulseaudio, gobject-introspection
, pam }: , pam }:
@ -14,11 +14,11 @@ let
xf86videodummy = callPackage ./xf86videodummy { }; xf86videodummy = callPackage ./xf86videodummy { };
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "xpra"; pname = "xpra";
version = "2.3.4"; version = "2.5";
src = fetchurl { src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz"; url = "https://xpra.org/src/${pname}-${version}.tar.xz";
sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija"; sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x";
}; };
patches = [ patches = [
@ -28,7 +28,11 @@ in buildPythonApplication rec {
}) })
]; ];
nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ]; postPatch = ''
substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security'
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = with xorg; [ buildInputs = with xorg; [
libX11 xorgproto libXrender libXi libX11 xorgproto libXrender libXi
libXtst libXfixes libXcomposite libXdamage libXtst libXfixes libXcomposite libXdamage
@ -36,9 +40,9 @@ in buildPythonApplication rec {
] ++ [ ] ++ [
cython cython
pango cairo gdk_pixbuf atk gtk3 glib pango cairo gdk_pixbuf atk.out gtk3 glib
ffmpeg libvpx x264 libwebp ffmpeg_4 libvpx x264 libwebp x265
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
@ -47,11 +51,13 @@ in buildPythonApplication rec {
gst_all_1.gst-libav gst_all_1.gst-libav
pam pam
gobject-introspection
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
pillow rencode pycrypto cryptography pycups lz4 dbus-python pillow rencode pycrypto cryptography pycups lz4 dbus-python
netifaces numpy websockify pygobject3 pycairo gst-python pam netifaces numpy pygobject3 pycairo gst-python pam
pyopengl paramiko opencv python-uinput pyxdg
ipaddress idna
]; ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
@ -64,6 +70,9 @@ in buildPythonApplication rec {
"--without-strict" "--without-strict"
"--with-gtk3" "--with-gtk3"
"--without-gtk2" "--without-gtk2"
# Override these, setup.py checks for headers in /usr/* paths
"--with-pam"
"--with-vsock"
]; ];
preFixup = '' preFixup = ''
@ -76,6 +85,8 @@ in buildPythonApplication rec {
doCheck = false; doCheck = false;
enableParallelBuilding = true;
passthru = { inherit xf86videodummy; }; passthru = { inherit xf86videodummy; };
meta = { meta = {
@ -85,8 +96,6 @@ in buildPythonApplication rec {
description = "Persistent remote applications for X"; description = "Persistent remote applications for X";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2; license = licenses.gpl2;
# https://github.com/NixOS/nixpkgs/pull/48872#issuecomment-433559636
broken = true;
maintainers = with maintainers; [ tstrobel offline numinit ]; maintainers = with maintainers; [ tstrobel offline numinit ];
}; };
} }

29
pkgs/tools/X11/xpra/fix-paths.patch
View File

@ -9,25 +9,26 @@
cython_add(Extension("xpra.client.gtk3.cairo_workaround", cython_add(Extension("xpra.client.gtk3.cairo_workaround",
["xpra/client/gtk3/cairo_workaround.pyx"], ["xpra/client/gtk3/cairo_workaround.pyx"],
**pkgconfig(pycairo) **pkgconfig(pycairo)
--- a/xpra/client/gtk3/cairo_workaround.pyx @@ -2363,10 +2363,7 @@
+++ b/xpra/client/gtk3/cairo_workaround.pyx v4l2_pkgconfig = pkgconfig()
@@ -65,7 +65,7 @@ #fuly warning: cython makes this difficult,
void cairo_surface_flush (cairo_surface_t *surface) #we have to figure out if "device_caps" exists in the headers:
void cairo_surface_mark_dirty (cairo_surface_t *surface) - ENABLE_DEVICE_CAPS = False
- if os.path.exists("/usr/include/linux/videodev2.h"):
-cdef extern from "pycairo/pycairo.h": - hdata = open("/usr/include/linux/videodev2.h").read()
+cdef extern from "py3cairo.h": - ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0
ctypedef struct Pycairo_CAPI_t: + ENABLE_DEVICE_CAPS = True
pass kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS}
ctypedef struct PycairoSurface: make_constants("xpra", "codecs", "v4l2", "constants", **kwargs)
cython_add(Extension("xpra.codecs.v4l2.pusher",
--- a/xpra/x11/bindings/keyboard_bindings.pyx --- a/xpra/x11/bindings/keyboard_bindings.pyx
+++ b/xpra/x11/bindings/keyboard_bindings.pyx +++ b/xpra/x11/bindings/keyboard_bindings.pyx
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
DEF PATH_MAX = 1024 DEF PATH_MAX = 1024
DEF DFLT_XKB_RULES_FILE = "base" DEF DFLT_XKB_RULES_FILE = b"base"
-DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb" -DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"
+DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb" +DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"
################################### ###################################
# Headers, python magic # Headers, python magic

4
pkgs/tools/admin/awscli/default.nix
View File

@ -33,11 +33,11 @@ let
in py.pkgs.buildPythonApplication rec { in py.pkgs.buildPythonApplication rec {
pname = "awscli"; pname = "awscli";
version = "1.16.162"; # N.B: if you change this, change botocore to a matching version too version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too
src = py.pkgs.fetchPypi { src = py.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1v5n1klzkysshp73mhrminvkqqqw9mskdaw7xjhpqfrvcdnp60vv"; sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92";
}; };
# No tests included # No tests included

4
pkgs/tools/backup/grab-site/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, python3Packages, fetchFromGitHub }: { stdenv, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
version = "2.1.15"; version = "2.1.16";
name = "grab-site-${version}"; name = "grab-site-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "${version}"; rev = "${version}";
owner = "ArchiveTeam"; owner = "ArchiveTeam";
repo = "grab-site"; repo = "grab-site";
sha256 = "1h3ajsj1c2wlxji1san97vmjd9d97dv0rh0jw1p77irkcvhzfpj8"; sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

8
pkgs/tools/graphics/grim/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }: { stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grim-${version}"; pname = "grim";
version = "1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emersion"; owner = "emersion";
repo = "grim"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz"; sha256 = "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

12
pkgs/tools/networking/shadowfox/default.nix
View File

@ -2,27 +2,21 @@
buildGoModule rec { buildGoModule rec {
pname = "shadowfox"; pname = "shadowfox";
version = "2.0.1"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SrKomodo"; owner = "SrKomodo";
repo = "shadowfox-updater"; repo = "shadowfox-updater";
rev = "v${version}"; rev = "v${version}";
sha256 = "0j8ljnx281a5nwd3zpw7b25ndsxc26b52glk2hqhm5fh08f9w0d8"; sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
}; };
goPackagePath = "github.com/SrKomodo/shadowfox-updater"; goPackagePath = "github.com/SrKomodo/shadowfox-updater";
modSha256 = "0anxrff09r5aw3a11iph0gigmcbmpfczm8him6ly57ywfzc5c850"; modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r";
buildFlags = "--tags release"; buildFlags = "--tags release";
postInstall = ''
# Contains compiler package only used by projects CI, and buildGoModule
# installs all binaries by default. So we remove this again.
rm $out/bin/compiler
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = ''
This project aims at creating a universal dark theme for Firefox while This project aims at creating a universal dark theme for Firefox while

4
pkgs/tools/security/shc/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shc-${version}"; name = "shc-${version}";
version = "4.0.1"; version = "4.0.2";
rev = "${version}"; rev = "${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "neurobin"; owner = "neurobin";
repo = "shc"; repo = "shc";
sha256 = "03f5hq1wkwfcm6b1q9956zqd05l2am91ij8lxbc8akiwz14dmkw7"; sha256 = "1vd9dldm6h234awn5fhpgq4lb85ylcawr2p2108332ffy70kvdix";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

20
pkgs/tools/typesetting/sile/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig { stdenv, darwin, fetchurl, makeWrapper, pkgconfig
, harfbuzz, icu, lpeg, luaexpat, lua-zlib, luafilesystem, luasocket, luasec , harfbuzz, icu
, fontconfig, lua, libiconv , fontconfig, lua, libiconv
, makeFontsConf, gentium, gentium-book-basic, dejavu_fonts , makeFontsConf, gentium, gentium-book-basic, dejavu_fonts
}: }:
@ -7,13 +7,7 @@
with stdenv.lib; with stdenv.lib;
let let
luaEnv = lua.withPackages(ps: with ps;[ lpeg luaexpat lua-zlib luafilesystem luasocket luasec]);
libs = [ lpeg luaexpat lua-zlib luafilesystem luasocket luasec ];
getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
getLuaPath = lib : getPath lib "lua";
getLuaCPath = lib : getPath lib "so";
luaPath = concatStringsSep ";" (map getLuaPath libs);
luaCPath = concatStringsSep ";" (map getLuaCPath libs);
in in
@ -27,8 +21,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [pkgconfig makeWrapper]; nativeBuildInputs = [pkgconfig makeWrapper];
buildInputs = [ harfbuzz icu lua fontconfig libiconv ] buildInputs = [ harfbuzz icu fontconfig libiconv luaEnv ]
++ libs
++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
; ;
@ -38,9 +31,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit"; NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit";
LUA_PATH = luaPath;
LUA_CPATH = luaCPath;
FONTCONFIG_FILE = makeFontsConf { FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ fontDirectories = [
gentium gentium
@ -60,10 +50,6 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
wrapProgram $out/bin/sile \
--set LUA_PATH "${luaPath};" \
--set LUA_CPATH "${luaCPath};" \
install -D -t $out/share/doc/sile documentation/*.pdf install -D -t $out/share/doc/sile documentation/*.pdf
''; '';

25
pkgs/top-level/all-packages.nix
View File

@ -2525,6 +2525,8 @@ in
docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
docear = callPackage ../applications/office/docear { };
dockbarx = callPackage ../applications/misc/dockbarx { }; dockbarx = callPackage ../applications/misc/dockbarx { };
dog = callPackage ../tools/system/dog { }; dog = callPackage ../tools/system/dog { };
@ -5855,9 +5857,7 @@ in
silc_server = callPackage ../servers/silc-server { }; silc_server = callPackage ../servers/silc-server { };
sile = callPackage ../tools/typesetting/sile { sile = callPackage ../tools/typesetting/sile { };
inherit (lua52Packages) lua luaexpat lua-zlib luafilesystem lpeg luasocket luasec;
};
silver-searcher = callPackage ../tools/text/silver-searcher { }; silver-searcher = callPackage ../tools/text/silver-searcher { };
@ -8389,8 +8389,8 @@ in
pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
php = php72; php = php73;
phpPackages = php72Packages; phpPackages = php73Packages;
php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php71; php = php71;
@ -8425,7 +8425,7 @@ in
php72 php72
php73; php73;
php-embed = php72-embed; php-embed = php73-embed;
php71-embed = php71.override { php71-embed = php71.override {
config.php.embed = true; config.php.embed = true;
@ -8442,7 +8442,7 @@ in
config.php.apxs2 = false; config.php.apxs2 = false;
}; };
php-unit = php72-unit; php-unit = php73-unit;
php71-unit = php71.override { php71-unit = php71.override {
config.php.embed = true; config.php.embed = true;
@ -14747,6 +14747,11 @@ in
sensu = callPackage ../servers/monitoring/sensu { }; sensu = callPackage ../servers/monitoring/sensu { };
inherit (callPackages ../servers/monitoring/sensu-go { })
sensu-go-agent
sensu-go-backend
sensu-go-cli;
uchiwa = callPackage ../servers/monitoring/uchiwa { }; uchiwa = callPackage ../servers/monitoring/uchiwa { };
shishi = callPackage ../servers/shishi { shishi = callPackage ../servers/shishi {
@ -16080,6 +16085,8 @@ in
adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { };
adementary-theme = callPackage ../data/themes/adementary { };
agave = callPackage ../data/fonts/agave { }; agave = callPackage ../data/fonts/agave { };
aileron = callPackage ../data/fonts/aileron { }; aileron = callPackage ../data/fonts/aileron { };
@ -16658,8 +16665,6 @@ in
termtekst = callPackage ../misc/emulators/termtekst { }; termtekst = callPackage ../misc/emulators/termtekst { };
tetra-gtk-theme = callPackage ../data/themes/tetra { };
tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre = callPackages ../data/fonts/tex-gyre { };
tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
@ -18099,6 +18104,8 @@ in
python = python27; python = python27;
}; };
git-quick-stats = callPackage ../development/tools/git-quick-stats {};
git-review = callPackage ../applications/version-management/git-review { }; git-review = callPackage ../applications/version-management/git-review { };
gitolite = callPackage ../applications/version-management/gitolite { }; gitolite = callPackage ../applications/version-management/gitolite { };

96
pkgs/top-level/perl-packages.nix
View File

@ -1157,6 +1157,20 @@ let
}; };
}; };
Carton = buildPerlPackage rec {
name = "Carton-v1.0.34";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45";
};
propagatedBuildInputs = [ ClassTiny MenloLegacy ModuleCPANfile PathTiny TryTiny ];
meta = {
homepage = https://github.com/perl-carton/carton;
description = "Perl module dependency manager (aka Bundler for Perl)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
CatalystActionRenderView = buildPerlPackage rec { CatalystActionRenderView = buildPerlPackage rec {
name = "Catalyst-Action-RenderView-0.16"; name = "Catalyst-Action-RenderView-0.16";
src = fetchurl { src = fetchurl {
@ -2779,6 +2793,21 @@ let
}; };
}; };
CPANCommonIndex = buildPerlPackage rec {
name = "CPAN-Common-Index-0.010";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
sha256 = "c43ddbb22fd42b06118fe6357f53700fbd77f531ba3c427faafbf303cbf4eaf0";
};
buildInputs = [ TestDeep TestFailWarnings TestFatal ];
propagatedBuildInputs = [ CPANDistnameInfo ClassTiny TieHandleOffset URI ];
meta = {
homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index;
description = "Common library for searching CPAN modules, authors and distributions";
license = stdenv.lib.licenses.asl20;
};
};
CPANDistnameInfo = buildPerlPackage rec { CPANDistnameInfo = buildPerlPackage rec {
name = "CPAN-DistnameInfo-0.12"; name = "CPAN-DistnameInfo-0.12";
src = fetchurl { src = fetchurl {
@ -7566,6 +7595,20 @@ let
}; };
}; };
HTTPTinyish = buildPerlPackage rec {
name = "HTTP-Tinyish-0.15";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5";
};
propagatedBuildInputs = [ FileWhich IPCRun3 ];
meta = {
homepage = https://github.com/miyagawa/HTTP-Tinyish;
description = "HTTP::Tiny compatible HTTP client wrappers";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
iCalParser = buildPerlPackage rec { iCalParser = buildPerlPackage rec {
name = "iCal-Parser-1.21"; name = "iCal-Parser-1.21";
src = fetchurl { src = fetchurl {
@ -9608,6 +9651,34 @@ let
}; };
}; };
Menlo = buildPerlPackage rec {
name = "Menlo-1.9019";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565";
};
propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo CPANMetaCheck CaptureTiny ClassTiny ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths FileWhich Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote URI Win32ShellQuote locallib ];
meta = {
homepage = https://github.com/miyagawa/cpanminus;
description = "A CPAN client";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
MenloLegacy = buildPerlPackage rec {
name = "Menlo-Legacy-1.9022";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
sha256 = "a6acac3fee318a804b439de54acbc7c27f0b44cfdad8551bbc9cd45986abc201";
};
propagatedBuildInputs = [ Menlo ];
meta = {
homepage = https://github.com/miyagawa/cpanminus;
description = "Legacy internal and client support for Menlo";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
MetaBuilder = buildPerlModule { MetaBuilder = buildPerlModule {
name = "Meta-Builder-0.004"; name = "Meta-Builder-0.004";
src = fetchurl { src = fetchurl {
@ -16884,6 +16955,19 @@ let
}; };
}; };
TieHandleOffset = buildPerlPackage rec {
name = "Tie-Handle-Offset-0.004";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
sha256 = "ee9f39055dc695aa244a252f56ffd37f8be07209b337ad387824721206d2a89e";
};
meta = {
homepage = https://github.com/dagolden/tie-handle-offset;
description = "Tied handle that hides the beginning of a file";
license = stdenv.lib.licenses.asl20;
};
};
TieHashIndexed = buildPerlPackage { TieHashIndexed = buildPerlPackage {
name = "Tie-Hash-Indexed-0.05"; name = "Tie-Hash-Indexed-0.05";
src = fetchurl { src = fetchurl {
@ -17510,6 +17594,18 @@ let
}; };
}; };
Win32ShellQuote = buildPerlPackage rec {
name = "Win32-ShellQuote-0.003001";
src = fetchurl {
url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
sha256 = "aa74b0e3dc2d41cd63f62f853e521ffd76b8d823479a2619e22edb4049b4c0dc";
};
meta = {
description = "Quote argument lists for Win32";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
Workflow = buildPerlModule rec { Workflow = buildPerlModule rec {
name = "Workflow-1.45"; name = "Workflow-1.45";
src = fetchurl { src = fetchurl {

8
pkgs/top-level/python-packages.nix
View File

@ -454,7 +454,9 @@ in {
grandalf = callPackage ../development/python-modules/grandalf { }; grandalf = callPackage ../development/python-modules/grandalf { };
gprof2dot = callPackage ../development/python-modules/gprof2dot { }; gprof2dot = callPackage ../development/python-modules/gprof2dot {
inherit (pkgs) graphviz;
};
gsd = callPackage ../development/python-modules/gsd { }; gsd = callPackage ../development/python-modules/gsd { };
@ -857,6 +859,8 @@ in {
python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
python-redis-lock = callPackage ../development/python-modules/python-redis-lock { };
python-sql = callPackage ../development/python-modules/python-sql { }; python-sql = callPackage ../development/python-modules/python-sql { };
python-snappy = callPackage ../development/python-modules/python-snappy { python-snappy = callPackage ../development/python-modules/python-snappy {
@ -4442,6 +4446,8 @@ in {
statsmodels = callPackage ../development/python-modules/statsmodels { }; statsmodels = callPackage ../development/python-modules/statsmodels { };
strategies = callPackage ../development/python-modules/strategies { };
stravalib = callPackage ../development/python-modules/stravalib { }; stravalib = callPackage ../development/python-modules/stravalib { };
streamz = callPackage ../development/python-modules/streamz { }; streamz = callPackage ../development/python-modules/streamz { };