Project import generated by Copybara.

GitOrigin-RevId: 4138cbd913fad85073e59007710e3f083d0eb7c6
This commit is contained in:
Default email 2021-08-12 08:41:47 -06:00
parent e18f6fb5f9
commit 69f1308e7b
85 changed files with 1433 additions and 1141 deletions

View file

@ -1,44 +1,56 @@
{ lib }: { lib }:
let
spdx = lic: lic // { lib.mapAttrs (lname: lset: let
url = "https://spdx.org/licenses/${lic.spdxId}.html"; defaultLicense = rec {
shortName = lname;
free = true; # Most of our licenses are Free, explicitly declare unfree additions as such!
deprecated = false;
}; };
in mkLicense = licenseDeclaration: let
applyDefaults = license: defaultLicense // license;
lib.mapAttrs (n: v: v // { shortName = n; }) ({ applySpdx = license:
if license ? spdxId
then license // { url = "https://spdx.org/licenses/${license.spdxId}.html"; }
else license;
applyRedistributable = license: { redistributable = license.free; } // license;
in lib.pipe licenseDeclaration [
applyDefaults
applySpdx
applyRedistributable
];
in mkLicense lset) ({
/* License identifiers from spdx.org where possible. /* License identifiers from spdx.org where possible.
* If you cannot find your license here, then look for a similar license or * If you cannot find your license here, then look for a similar license or
* add it to this list. The URL mentioned above is a good source for inspiration. * add it to this list. The URL mentioned above is a good source for inspiration.
*/ */
abstyles = spdx { abstyles = {
spdxId = "Abstyles"; spdxId = "Abstyles";
fullName = "Abstyles License"; fullName = "Abstyles License";
}; };
afl20 = spdx { afl20 = {
spdxId = "AFL-2.0"; spdxId = "AFL-2.0";
fullName = "Academic Free License v2.0"; fullName = "Academic Free License v2.0";
}; };
afl21 = spdx { afl21 = {
spdxId = "AFL-2.1"; spdxId = "AFL-2.1";
fullName = "Academic Free License v2.1"; fullName = "Academic Free License v2.1";
}; };
afl3 = spdx { afl3 = {
spdxId = "AFL-3.0"; spdxId = "AFL-3.0";
fullName = "Academic Free License v3.0"; fullName = "Academic Free License v3.0";
}; };
agpl3Only = spdx { agpl3Only = {
spdxId = "AGPL-3.0-only"; spdxId = "AGPL-3.0-only";
fullName = "GNU Affero General Public License v3.0 only"; fullName = "GNU Affero General Public License v3.0 only";
}; };
agpl3Plus = spdx { agpl3Plus = {
spdxId = "AGPL-3.0-or-later"; spdxId = "AGPL-3.0-or-later";
fullName = "GNU Affero General Public License v3.0 or later"; fullName = "GNU Affero General Public License v3.0 or later";
}; };
@ -55,7 +67,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
apsl20 = spdx { apsl20 = {
spdxId = "APSL-2.0"; spdxId = "APSL-2.0";
fullName = "Apple Public Source License 2.0"; fullName = "Apple Public Source License 2.0";
}; };
@ -65,72 +77,72 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://www.freedesktop.org/wiki/Arphic_Public_License/"; url = "https://www.freedesktop.org/wiki/Arphic_Public_License/";
}; };
artistic1 = spdx { artistic1 = {
spdxId = "Artistic-1.0"; spdxId = "Artistic-1.0";
fullName = "Artistic License 1.0"; fullName = "Artistic License 1.0";
}; };
artistic2 = spdx { artistic2 = {
spdxId = "Artistic-2.0"; spdxId = "Artistic-2.0";
fullName = "Artistic License 2.0"; fullName = "Artistic License 2.0";
}; };
asl20 = spdx { asl20 = {
spdxId = "Apache-2.0"; spdxId = "Apache-2.0";
fullName = "Apache License 2.0"; fullName = "Apache License 2.0";
}; };
boost = spdx { boost = {
spdxId = "BSL-1.0"; spdxId = "BSL-1.0";
fullName = "Boost Software License 1.0"; fullName = "Boost Software License 1.0";
}; };
beerware = spdx { beerware = {
spdxId = "Beerware"; spdxId = "Beerware";
fullName = "Beerware License"; fullName = "Beerware License";
}; };
blueOak100 = spdx { blueOak100 = {
spdxId = "BlueOak-1.0.0"; spdxId = "BlueOak-1.0.0";
fullName = "Blue Oak Model License 1.0.0"; fullName = "Blue Oak Model License 1.0.0";
}; };
bsd0 = spdx { bsd0 = {
spdxId = "0BSD"; spdxId = "0BSD";
fullName = "BSD Zero Clause License"; fullName = "BSD Zero Clause License";
}; };
bsd1 = spdx { bsd1 = {
spdxId = "BSD-1-Clause"; spdxId = "BSD-1-Clause";
fullName = "BSD 1-Clause License"; fullName = "BSD 1-Clause License";
}; };
bsd2 = spdx { bsd2 = {
spdxId = "BSD-2-Clause"; spdxId = "BSD-2-Clause";
fullName = ''BSD 2-clause "Simplified" License''; fullName = ''BSD 2-clause "Simplified" License'';
}; };
bsd2Patent = spdx { bsd2Patent = {
spdxId = "BSD-2-Clause-Patent"; spdxId = "BSD-2-Clause-Patent";
fullName = "BSD-2-Clause Plus Patent License"; fullName = "BSD-2-Clause Plus Patent License";
}; };
bsd3 = spdx { bsd3 = {
spdxId = "BSD-3-Clause"; spdxId = "BSD-3-Clause";
fullName = ''BSD 3-clause "New" or "Revised" License''; fullName = ''BSD 3-clause "New" or "Revised" License'';
}; };
bsdOriginal = spdx { bsdOriginal = {
spdxId = "BSD-4-Clause"; spdxId = "BSD-4-Clause";
fullName = ''BSD 4-clause "Original" or "Old" License''; fullName = ''BSD 4-clause "Original" or "Old" License'';
}; };
bsdOriginalUC = spdx { bsdOriginalUC = {
spdxId = "BSD-4-Clause-UC"; spdxId = "BSD-4-Clause-UC";
fullName = "BSD 4-Clause University of California-Specific"; fullName = "BSD 4-Clause University of California-Specific";
}; };
bsdProtection = spdx { bsdProtection = {
spdxId = "BSD-Protection"; spdxId = "BSD-Protection";
fullName = "BSD Protection License"; fullName = "BSD Protection License";
}; };
@ -141,119 +153,119 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
clArtistic = spdx { clArtistic = {
spdxId = "ClArtistic"; spdxId = "ClArtistic";
fullName = "Clarified Artistic License"; fullName = "Clarified Artistic License";
}; };
cc0 = spdx { cc0 = {
spdxId = "CC0-1.0"; spdxId = "CC0-1.0";
fullName = "Creative Commons Zero v1.0 Universal"; fullName = "Creative Commons Zero v1.0 Universal";
}; };
cc-by-nc-sa-20 = spdx { cc-by-nc-sa-20 = {
spdxId = "CC-BY-NC-SA-2.0"; spdxId = "CC-BY-NC-SA-2.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
free = false; free = false;
}; };
cc-by-nc-sa-25 = spdx { cc-by-nc-sa-25 = {
spdxId = "CC-BY-NC-SA-2.5"; spdxId = "CC-BY-NC-SA-2.5";
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";
free = false; free = false;
}; };
cc-by-nc-sa-30 = spdx { cc-by-nc-sa-30 = {
spdxId = "CC-BY-NC-SA-3.0"; spdxId = "CC-BY-NC-SA-3.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";
free = false; free = false;
}; };
cc-by-nc-sa-40 = spdx { cc-by-nc-sa-40 = {
spdxId = "CC-BY-NC-SA-4.0"; spdxId = "CC-BY-NC-SA-4.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";
free = false; free = false;
}; };
cc-by-nc-30 = spdx { cc-by-nc-30 = {
spdxId = "CC-BY-NC-3.0"; spdxId = "CC-BY-NC-3.0";
fullName = "Creative Commons Attribution Non Commercial 3.0 Unported"; fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";
free = false; free = false;
}; };
cc-by-nc-40 = spdx { cc-by-nc-40 = {
spdxId = "CC-BY-NC-4.0"; spdxId = "CC-BY-NC-4.0";
fullName = "Creative Commons Attribution Non Commercial 4.0 International"; fullName = "Creative Commons Attribution Non Commercial 4.0 International";
free = false; free = false;
}; };
cc-by-nd-30 = spdx { cc-by-nd-30 = {
spdxId = "CC-BY-ND-3.0"; spdxId = "CC-BY-ND-3.0";
fullName = "Creative Commons Attribution-No Derivative Works v3.00"; fullName = "Creative Commons Attribution-No Derivative Works v3.00";
free = false; free = false;
}; };
cc-by-sa-25 = spdx { cc-by-sa-25 = {
spdxId = "CC-BY-SA-2.5"; spdxId = "CC-BY-SA-2.5";
fullName = "Creative Commons Attribution Share Alike 2.5"; fullName = "Creative Commons Attribution Share Alike 2.5";
}; };
cc-by-30 = spdx { cc-by-30 = {
spdxId = "CC-BY-3.0"; spdxId = "CC-BY-3.0";
fullName = "Creative Commons Attribution 3.0"; fullName = "Creative Commons Attribution 3.0";
}; };
cc-by-sa-30 = spdx { cc-by-sa-30 = {
spdxId = "CC-BY-SA-3.0"; spdxId = "CC-BY-SA-3.0";
fullName = "Creative Commons Attribution Share Alike 3.0"; fullName = "Creative Commons Attribution Share Alike 3.0";
}; };
cc-by-40 = spdx { cc-by-40 = {
spdxId = "CC-BY-4.0"; spdxId = "CC-BY-4.0";
fullName = "Creative Commons Attribution 4.0"; fullName = "Creative Commons Attribution 4.0";
}; };
cc-by-sa-40 = spdx { cc-by-sa-40 = {
spdxId = "CC-BY-SA-4.0"; spdxId = "CC-BY-SA-4.0";
fullName = "Creative Commons Attribution Share Alike 4.0"; fullName = "Creative Commons Attribution Share Alike 4.0";
}; };
cddl = spdx { cddl = {
spdxId = "CDDL-1.0"; spdxId = "CDDL-1.0";
fullName = "Common Development and Distribution License 1.0"; fullName = "Common Development and Distribution License 1.0";
}; };
cecill20 = spdx { cecill20 = {
spdxId = "CECILL-2.0"; spdxId = "CECILL-2.0";
fullName = "CeCILL Free Software License Agreement v2.0"; fullName = "CeCILL Free Software License Agreement v2.0";
}; };
cecill-b = spdx { cecill-b = {
spdxId = "CECILL-B"; spdxId = "CECILL-B";
fullName = "CeCILL-B Free Software License Agreement"; fullName = "CeCILL-B Free Software License Agreement";
}; };
cecill-c = spdx { cecill-c = {
spdxId = "CECILL-C"; spdxId = "CECILL-C";
fullName = "CeCILL-C Free Software License Agreement"; fullName = "CeCILL-C Free Software License Agreement";
}; };
cpal10 = spdx { cpal10 = {
spdxId = "CPAL-1.0"; spdxId = "CPAL-1.0";
fullName = "Common Public Attribution License 1.0"; fullName = "Common Public Attribution License 1.0";
}; };
cpl10 = spdx { cpl10 = {
spdxId = "CPL-1.0"; spdxId = "CPL-1.0";
fullName = "Common Public License 1.0"; fullName = "Common Public License 1.0";
}; };
curl = spdx { curl = {
spdxId = "curl"; spdxId = "curl";
fullName = "curl License"; fullName = "curl License";
}; };
doc = spdx { doc = {
spdxId = "DOC"; spdxId = "DOC";
fullName = "DOC License"; fullName = "DOC License";
}; };
@ -264,12 +276,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
efl10 = spdx { efl10 = {
spdxId = "EFL-1.0"; spdxId = "EFL-1.0";
fullName = "Eiffel Forum License v1.0"; fullName = "Eiffel Forum License v1.0";
}; };
efl20 = spdx { efl20 = {
spdxId = "EFL-2.0"; spdxId = "EFL-2.0";
fullName = "Eiffel Forum License v2.0"; fullName = "Eiffel Forum License v2.0";
}; };
@ -280,12 +292,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
epl10 = spdx { epl10 = {
spdxId = "EPL-1.0"; spdxId = "EPL-1.0";
fullName = "Eclipse Public License 1.0"; fullName = "Eclipse Public License 1.0";
}; };
epl20 = spdx { epl20 = {
spdxId = "EPL-2.0"; spdxId = "EPL-2.0";
fullName = "Eclipse Public License 2.0"; fullName = "Eclipse Public License 2.0";
}; };
@ -296,42 +308,42 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
eupl11 = spdx { eupl11 = {
spdxId = "EUPL-1.1"; spdxId = "EUPL-1.1";
fullName = "European Union Public License 1.1"; fullName = "European Union Public License 1.1";
}; };
eupl12 = spdx { eupl12 = {
spdxId = "EUPL-1.2"; spdxId = "EUPL-1.2";
fullName = "European Union Public License 1.2"; fullName = "European Union Public License 1.2";
}; };
fdl11Only = spdx { fdl11Only = {
spdxId = "GFDL-1.1-only"; spdxId = "GFDL-1.1-only";
fullName = "GNU Free Documentation License v1.1 only"; fullName = "GNU Free Documentation License v1.1 only";
}; };
fdl11Plus = spdx { fdl11Plus = {
spdxId = "GFDL-1.1-or-later"; spdxId = "GFDL-1.1-or-later";
fullName = "GNU Free Documentation License v1.1 or later"; fullName = "GNU Free Documentation License v1.1 or later";
}; };
fdl12Only = spdx { fdl12Only = {
spdxId = "GFDL-1.2-only"; spdxId = "GFDL-1.2-only";
fullName = "GNU Free Documentation License v1.2 only"; fullName = "GNU Free Documentation License v1.2 only";
}; };
fdl12Plus = spdx { fdl12Plus = {
spdxId = "GFDL-1.2-or-later"; spdxId = "GFDL-1.2-or-later";
fullName = "GNU Free Documentation License v1.2 or later"; fullName = "GNU Free Documentation License v1.2 or later";
}; };
fdl13Only = spdx { fdl13Only = {
spdxId = "GFDL-1.3-only"; spdxId = "GFDL-1.3-only";
fullName = "GNU Free Documentation License v1.3 only"; fullName = "GNU Free Documentation License v1.3 only";
}; };
fdl13Plus = spdx { fdl13Plus = {
spdxId = "GFDL-1.3-or-later"; spdxId = "GFDL-1.3-or-later";
fullName = "GNU Free Documentation License v1.3 or later"; fullName = "GNU Free Documentation License v1.3 or later";
}; };
@ -346,7 +358,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
fullName = "Unspecified free software license"; fullName = "Unspecified free software license";
}; };
ftl = spdx { ftl = {
spdxId = "FTL"; spdxId = "FTL";
fullName = "Freetype Project License"; fullName = "Freetype Project License";
}; };
@ -362,22 +374,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
gpl1Only = spdx { gpl1Only = {
spdxId = "GPL-1.0-only"; spdxId = "GPL-1.0-only";
fullName = "GNU General Public License v1.0 only"; fullName = "GNU General Public License v1.0 only";
}; };
gpl1Plus = spdx { gpl1Plus = {
spdxId = "GPL-1.0-or-later"; spdxId = "GPL-1.0-or-later";
fullName = "GNU General Public License v1.0 or later"; fullName = "GNU General Public License v1.0 or later";
}; };
gpl2Only = spdx { gpl2Only = {
spdxId = "GPL-2.0-only"; spdxId = "GPL-2.0-only";
fullName = "GNU General Public License v2.0 only"; fullName = "GNU General Public License v2.0 only";
}; };
gpl2Classpath = spdx { gpl2Classpath = {
spdxId = "GPL-2.0-with-classpath-exception"; spdxId = "GPL-2.0-with-classpath-exception";
fullName = "GNU General Public License v2.0 only (with Classpath exception)"; fullName = "GNU General Public License v2.0 only (with Classpath exception)";
}; };
@ -392,17 +404,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://www.mysql.com/about/legal/licensing/foss-exception"; url = "https://www.mysql.com/about/legal/licensing/foss-exception";
}; };
gpl2Plus = spdx { gpl2Plus = {
spdxId = "GPL-2.0-or-later"; spdxId = "GPL-2.0-or-later";
fullName = "GNU General Public License v2.0 or later"; fullName = "GNU General Public License v2.0 or later";
}; };
gpl3Only = spdx { gpl3Only = {
spdxId = "GPL-3.0-only"; spdxId = "GPL-3.0-only";
fullName = "GNU General Public License v3.0 only"; fullName = "GNU General Public License v3.0 only";
}; };
gpl3Plus = spdx { gpl3Plus = {
spdxId = "GPL-3.0-or-later"; spdxId = "GPL-3.0-or-later";
fullName = "GNU General Public License v3.0 or later"; fullName = "GNU General Public License v3.0 or later";
}; };
@ -412,12 +424,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception"; url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
}; };
hpnd = spdx { hpnd = {
spdxId = "HPND"; spdxId = "HPND";
fullName = "Historic Permission Notice and Disclaimer"; fullName = "Historic Permission Notice and Disclaimer";
}; };
hpndSellVariant = spdx { hpndSellVariant = {
fullName = "Historical Permission Notice and Disclaimer - sell variant"; fullName = "Historical Permission Notice and Disclaimer - sell variant";
spdxId = "HPND-sell-variant"; spdxId = "HPND-sell-variant";
}; };
@ -428,12 +440,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://old.calculate-linux.org/packages/licenses/iASL"; url = "https://old.calculate-linux.org/packages/licenses/iASL";
}; };
ijg = spdx { ijg = {
spdxId = "IJG"; spdxId = "IJG";
fullName = "Independent JPEG Group License"; fullName = "Independent JPEG Group License";
}; };
imagemagick = spdx { imagemagick = {
fullName = "ImageMagick License"; fullName = "ImageMagick License";
spdxId = "imagemagick"; spdxId = "imagemagick";
}; };
@ -450,17 +462,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
ipa = spdx { ipa = {
spdxId = "IPA"; spdxId = "IPA";
fullName = "IPA Font License"; fullName = "IPA Font License";
}; };
ipl10 = spdx { ipl10 = {
spdxId = "IPL-1.0"; spdxId = "IPL-1.0";
fullName = "IBM Public License v1.0"; fullName = "IBM Public License v1.0";
}; };
isc = spdx { isc = {
spdxId = "ISC"; spdxId = "ISC";
fullName = "ISC License"; fullName = "ISC License";
}; };
@ -478,52 +490,52 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
lgpl2Only = spdx { lgpl2Only = {
spdxId = "LGPL-2.0-only"; spdxId = "LGPL-2.0-only";
fullName = "GNU Library General Public License v2 only"; fullName = "GNU Library General Public License v2 only";
}; };
lgpl2Plus = spdx { lgpl2Plus = {
spdxId = "LGPL-2.0-or-later"; spdxId = "LGPL-2.0-or-later";
fullName = "GNU Library General Public License v2 or later"; fullName = "GNU Library General Public License v2 or later";
}; };
lgpl21Only = spdx { lgpl21Only = {
spdxId = "LGPL-2.1-only"; spdxId = "LGPL-2.1-only";
fullName = "GNU Lesser General Public License v2.1 only"; fullName = "GNU Lesser General Public License v2.1 only";
}; };
lgpl21Plus = spdx { lgpl21Plus = {
spdxId = "LGPL-2.1-or-later"; spdxId = "LGPL-2.1-or-later";
fullName = "GNU Lesser General Public License v2.1 or later"; fullName = "GNU Lesser General Public License v2.1 or later";
}; };
lgpl3Only = spdx { lgpl3Only = {
spdxId = "LGPL-3.0-only"; spdxId = "LGPL-3.0-only";
fullName = "GNU Lesser General Public License v3.0 only"; fullName = "GNU Lesser General Public License v3.0 only";
}; };
lgpl3Plus = spdx { lgpl3Plus = {
spdxId = "LGPL-3.0-or-later"; spdxId = "LGPL-3.0-or-later";
fullName = "GNU Lesser General Public License v3.0 or later"; fullName = "GNU Lesser General Public License v3.0 or later";
}; };
lgpllr = spdx { lgpllr = {
spdxId = "LGPLLR"; spdxId = "LGPLLR";
fullName = "Lesser General Public License For Linguistic Resources"; fullName = "Lesser General Public License For Linguistic Resources";
}; };
libpng = spdx { libpng = {
spdxId = "Libpng"; spdxId = "Libpng";
fullName = "libpng License"; fullName = "libpng License";
}; };
libpng2 = spdx { libpng2 = {
spdxId = "libpng-2.0"; # Used since libpng 1.6.36. spdxId = "libpng-2.0"; # Used since libpng 1.6.36.
fullName = "PNG Reference Library version 2"; fullName = "PNG Reference Library version 2";
}; };
libtiff = spdx { libtiff = {
spdxId = "libtiff"; spdxId = "libtiff";
fullName = "libtiff License"; fullName = "libtiff License";
}; };
@ -533,22 +545,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://opensource.franz.com/preamble.html"; url = "https://opensource.franz.com/preamble.html";
}; };
llvm-exception = spdx { llvm-exception = {
spdxId = "LLVM-exception"; spdxId = "LLVM-exception";
fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License
}; };
lppl12 = spdx { lppl12 = {
spdxId = "LPPL-1.2"; spdxId = "LPPL-1.2";
fullName = "LaTeX Project Public License v1.2"; fullName = "LaTeX Project Public License v1.2";
}; };
lppl13c = spdx { lppl13c = {
spdxId = "LPPL-1.3c"; spdxId = "LPPL-1.3c";
fullName = "LaTeX Project Public License v1.3c"; fullName = "LaTeX Project Public License v1.3c";
}; };
lpl-102 = spdx { lpl-102 = {
spdxId = "LPL-1.02"; spdxId = "LPL-1.02";
fullName = "Lucent Public License v1.02"; fullName = "Lucent Public License v1.02";
}; };
@ -560,43 +572,43 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
# spdx.org does not (yet) differentiate between the X11 and Expat versions # spdx.org does not (yet) differentiate between the X11 and Expat versions
# for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions # for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions
mit = spdx { mit = {
spdxId = "MIT"; spdxId = "MIT";
fullName = "MIT License"; fullName = "MIT License";
}; };
mpl10 = spdx { mpl10 = {
spdxId = "MPL-1.0"; spdxId = "MPL-1.0";
fullName = "Mozilla Public License 1.0"; fullName = "Mozilla Public License 1.0";
}; };
mpl11 = spdx { mpl11 = {
spdxId = "MPL-1.1"; spdxId = "MPL-1.1";
fullName = "Mozilla Public License 1.1"; fullName = "Mozilla Public License 1.1";
}; };
mpl20 = spdx { mpl20 = {
spdxId = "MPL-2.0"; spdxId = "MPL-2.0";
fullName = "Mozilla Public License 2.0"; fullName = "Mozilla Public License 2.0";
}; };
mspl = spdx { mspl = {
spdxId = "MS-PL"; spdxId = "MS-PL";
fullName = "Microsoft Public License"; fullName = "Microsoft Public License";
}; };
nasa13 = spdx { nasa13 = {
spdxId = "NASA-1.3"; spdxId = "NASA-1.3";
fullName = "NASA Open Source Agreement 1.3"; fullName = "NASA Open Source Agreement 1.3";
free = false; free = false;
}; };
ncsa = spdx { ncsa = {
spdxId = "NCSA"; spdxId = "NCSA";
fullName = "University of Illinois/NCSA Open Source License"; fullName = "University of Illinois/NCSA Open Source License";
}; };
nposl3 = spdx { nposl3 = {
spdxId = "NPOSL-3.0"; spdxId = "NPOSL-3.0";
fullName = "Non-Profit Open Software License 3.0"; fullName = "Non-Profit Open Software License 3.0";
}; };
@ -613,53 +625,53 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
odbl = spdx { odbl = {
spdxId = "ODbL-1.0"; spdxId = "ODbL-1.0";
fullName = "Open Data Commons Open Database License v1.0"; fullName = "Open Data Commons Open Database License v1.0";
}; };
ofl = spdx { ofl = {
spdxId = "OFL-1.1"; spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1"; fullName = "SIL Open Font License 1.1";
}; };
openldap = spdx { openldap = {
spdxId = "OLDAP-2.8"; spdxId = "OLDAP-2.8";
fullName = "Open LDAP Public License v2.8"; fullName = "Open LDAP Public License v2.8";
}; };
openssl = spdx { openssl = {
spdxId = "OpenSSL"; spdxId = "OpenSSL";
fullName = "OpenSSL License"; fullName = "OpenSSL License";
}; };
osl2 = spdx { osl2 = {
spdxId = "OSL-2.0"; spdxId = "OSL-2.0";
fullName = "Open Software License 2.0"; fullName = "Open Software License 2.0";
}; };
osl21 = spdx { osl21 = {
spdxId = "OSL-2.1"; spdxId = "OSL-2.1";
fullName = "Open Software License 2.1"; fullName = "Open Software License 2.1";
}; };
osl3 = spdx { osl3 = {
spdxId = "OSL-3.0"; spdxId = "OSL-3.0";
fullName = "Open Software License 3.0"; fullName = "Open Software License 3.0";
}; };
parity70 = spdx { parity70 = {
spdxId = "Parity-7.0.0"; spdxId = "Parity-7.0.0";
fullName = "Parity Public License 7.0.0"; fullName = "Parity Public License 7.0.0";
url = "https://paritylicense.com/versions/7.0.0.html"; url = "https://paritylicense.com/versions/7.0.0.html";
}; };
php301 = spdx { php301 = {
spdxId = "PHP-3.01"; spdxId = "PHP-3.01";
fullName = "PHP License v3.01"; fullName = "PHP License v3.01";
}; };
postgresql = spdx { postgresql = {
spdxId = "PostgreSQL"; spdxId = "PostgreSQL";
fullName = "PostgreSQL License"; fullName = "PostgreSQL License";
}; };
@ -670,7 +682,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
psfl = spdx { psfl = {
spdxId = "Python-2.0"; spdxId = "Python-2.0";
fullName = "Python Software Foundation License version 2"; fullName = "Python Software Foundation License version 2";
url = "https://docs.python.org/license.html"; url = "https://docs.python.org/license.html";
@ -691,12 +703,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://prosperitylicense.com/versions/3.0.0.html"; url = "https://prosperitylicense.com/versions/3.0.0.html";
}; };
qhull = spdx { qhull = {
spdxId = "Qhull"; spdxId = "Qhull";
fullName = "Qhull License"; fullName = "Qhull License";
}; };
qpl = spdx { qpl = {
spdxId = "QPL-1.0"; spdxId = "QPL-1.0";
fullName = "Q Public License 1.0"; fullName = "Q Public License 1.0";
}; };
@ -706,22 +718,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://qwt.sourceforge.io/qwtlicense.html"; url = "https://qwt.sourceforge.io/qwtlicense.html";
}; };
ruby = spdx { ruby = {
spdxId = "Ruby"; spdxId = "Ruby";
fullName = "Ruby License"; fullName = "Ruby License";
}; };
sendmail = spdx { sendmail = {
spdxId = "Sendmail"; spdxId = "Sendmail";
fullName = "Sendmail License"; fullName = "Sendmail License";
}; };
sgi-b-20 = spdx { sgi-b-20 = {
spdxId = "SGI-B-2.0"; spdxId = "SGI-B-2.0";
fullName = "SGI Free Software License B v2.0"; fullName = "SGI Free Software License B v2.0";
}; };
sleepycat = spdx { sleepycat = {
spdxId = "Sleepycat"; spdxId = "Sleepycat";
fullName = "Sleepycat License"; fullName = "Sleepycat License";
}; };
@ -737,6 +749,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
fullName = "Server Side Public License"; fullName = "Server Side Public License";
url = "https://www.mongodb.com/licensing/server-side-public-license"; url = "https://www.mongodb.com/licensing/server-side-public-license";
free = false; free = false;
# NOTE Debatable.
# The license a slightly modified AGPL but still considered unfree by the
# OSI for what seem like political reasons
redistributable = true; # Definitely redistributable though, it's an AGPL derivative
}; };
stk = { stk = {
@ -745,7 +761,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://github.com/thestk/stk/blob/master/LICENSE"; url = "https://github.com/thestk/stk/blob/master/LICENSE";
}; };
tcltk = spdx { tcltk = {
spdxId = "TCL"; spdxId = "TCL";
fullName = "TCL/TK License"; fullName = "TCL/TK License";
}; };
@ -763,25 +779,27 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
unfreeRedistributable = { unfreeRedistributable = {
fullName = "Unfree redistributable"; fullName = "Unfree redistributable";
free = false; free = false;
redistributable = true;
}; };
unfreeRedistributableFirmware = { unfreeRedistributableFirmware = {
fullName = "Unfree redistributable firmware"; fullName = "Unfree redistributable firmware";
redistributable = true;
# Note: we currently consider these "free" for inclusion in the # Note: we currently consider these "free" for inclusion in the
# channel and NixOS images. # channel and NixOS images.
}; };
unicode-dfs-2015 = spdx { unicode-dfs-2015 = {
spdxId = "Unicode-DFS-2015"; spdxId = "Unicode-DFS-2015";
fullName = "Unicode License Agreement - Data Files and Software (2015)"; fullName = "Unicode License Agreement - Data Files and Software (2015)";
}; };
unicode-dfs-2016 = spdx { unicode-dfs-2016 = {
spdxId = "Unicode-DFS-2016"; spdxId = "Unicode-DFS-2016";
fullName = "Unicode License Agreement - Data Files and Software (2016)"; fullName = "Unicode License Agreement - Data Files and Software (2016)";
}; };
unlicense = spdx { unlicense = {
spdxId = "Unlicense"; spdxId = "Unlicense";
fullName = "The Unlicense"; fullName = "The Unlicense";
}; };
@ -791,7 +809,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://oss.oracle.com/licenses/upl/"; url = "https://oss.oracle.com/licenses/upl/";
}; };
vim = spdx { vim = {
spdxId = "Vim"; spdxId = "Vim";
fullName = "Vim License"; fullName = "Vim License";
}; };
@ -802,17 +820,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false; free = false;
}; };
vsl10 = spdx { vsl10 = {
spdxId = "VSL-1.0"; spdxId = "VSL-1.0";
fullName = "Vovida Software License v1.0"; fullName = "Vovida Software License v1.0";
}; };
watcom = spdx { watcom = {
spdxId = "Watcom-1.0"; spdxId = "Watcom-1.0";
fullName = "Sybase Open Watcom Public License 1.0"; fullName = "Sybase Open Watcom Public License 1.0";
}; };
w3c = spdx { w3c = {
spdxId = "W3C"; spdxId = "W3C";
fullName = "W3C Software Notice and License"; fullName = "W3C Software Notice and License";
}; };
@ -822,12 +840,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab"; url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab";
}; };
wtfpl = spdx { wtfpl = {
spdxId = "WTFPL"; spdxId = "WTFPL";
fullName = "Do What The F*ck You Want To Public License"; fullName = "Do What The F*ck You Want To Public License";
}; };
wxWindows = spdx { wxWindows = {
spdxId = "wxWindows"; spdxId = "wxWindows";
fullName = "wxWindows Library Licence, Version 3.1"; fullName = "wxWindows Library Licence, Version 3.1";
}; };
@ -837,68 +855,68 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken
}; };
zlib = spdx { zlib = {
spdxId = "Zlib"; spdxId = "Zlib";
fullName = "zlib License"; fullName = "zlib License";
}; };
zpl20 = spdx { zpl20 = {
spdxId = "ZPL-2.0"; spdxId = "ZPL-2.0";
fullName = "Zope Public License 2.0"; fullName = "Zope Public License 2.0";
}; };
zpl21 = spdx { zpl21 = {
spdxId = "ZPL-2.1"; spdxId = "ZPL-2.1";
fullName = "Zope Public License 2.1"; fullName = "Zope Public License 2.1";
}; };
} // { } // {
# TODO: remove legacy aliases # TODO: remove legacy aliases
agpl3 = spdx { agpl3 = {
spdxId = "AGPL-3.0"; spdxId = "AGPL-3.0";
fullName = "GNU Affero General Public License v3.0"; fullName = "GNU Affero General Public License v3.0";
deprecated = true; deprecated = true;
}; };
fdl11 = spdx { fdl11 = {
spdxId = "GFDL-1.1"; spdxId = "GFDL-1.1";
fullName = "GNU Free Documentation License v1.1"; fullName = "GNU Free Documentation License v1.1";
deprecated = true; deprecated = true;
}; };
fdl12 = spdx { fdl12 = {
spdxId = "GFDL-1.2"; spdxId = "GFDL-1.2";
fullName = "GNU Free Documentation License v1.2"; fullName = "GNU Free Documentation License v1.2";
deprecated = true; deprecated = true;
}; };
fdl13 = spdx { fdl13 = {
spdxId = "GFDL-1.3"; spdxId = "GFDL-1.3";
fullName = "GNU Free Documentation License v1.3"; fullName = "GNU Free Documentation License v1.3";
deprecated = true; deprecated = true;
}; };
gpl1 = spdx { gpl1 = {
spdxId = "GPL-1.0"; spdxId = "GPL-1.0";
fullName = "GNU General Public License v1.0"; fullName = "GNU General Public License v1.0";
deprecated = true; deprecated = true;
}; };
gpl2 = spdx { gpl2 = {
spdxId = "GPL-2.0"; spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0"; fullName = "GNU General Public License v2.0";
deprecated = true; deprecated = true;
}; };
gpl3 = spdx { gpl3 = {
spdxId = "GPL-3.0"; spdxId = "GPL-3.0";
fullName = "GNU General Public License v3.0"; fullName = "GNU General Public License v3.0";
deprecated = true; deprecated = true;
}; };
lgpl2 = spdx { lgpl2 = {
spdxId = "LGPL-2.0"; spdxId = "LGPL-2.0";
fullName = "GNU Library General Public License v2"; fullName = "GNU Library General Public License v2";
deprecated = true; deprecated = true;
}; };
lgpl21 = spdx { lgpl21 = {
spdxId = "LGPL-2.1"; spdxId = "LGPL-2.1";
fullName = "GNU Lesser General Public License v2.1"; fullName = "GNU Lesser General Public License v2.1";
deprecated = true; deprecated = true;
}; };
lgpl3 = spdx { lgpl3 = {
spdxId = "LGPL-3.0"; spdxId = "LGPL-3.0";
fullName = "GNU Lesser General Public License v3.0"; fullName = "GNU Lesser General Public License v3.0";
deprecated = true; deprecated = true;

View file

@ -11,6 +11,7 @@ let
filter filter
foldl' foldl'
head head
tail
isAttrs isAttrs
isBool isBool
isDerivation isDerivation
@ -144,7 +145,7 @@ rec {
if def.value != first.value then if def.value != first.value then
throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}"
else else
first) (head defs) defs).value; first) (head defs) (tail defs)).value;
/* Extracts values of all "value" keys of the given list. /* Extracts values of all "value" keys of the given list.

View file

@ -42,8 +42,6 @@ LOG_LEVELS = {
} }
log = logging.getLogger() log = logging.getLogger()
log.addHandler(logging.StreamHandler())
def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2):
"""Retry calling the decorated function using an exponential backoff. """Retry calling the decorated function using an exponential backoff.
@ -203,7 +201,6 @@ class Editor:
name: str, name: str,
root: Path, root: Path,
get_plugins: str, get_plugins: str,
generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None],
default_in: Optional[Path] = None, default_in: Optional[Path] = None,
default_out: Optional[Path] = None, default_out: Optional[Path] = None,
deprecated: Optional[Path] = None, deprecated: Optional[Path] = None,
@ -213,7 +210,6 @@ class Editor:
self.name = name self.name = name
self.root = root self.root = root
self.get_plugins = get_plugins self.get_plugins = get_plugins
self._generate_nix = generate_nix
self.default_in = default_in or root.joinpath(f"{name}-plugin-names") self.default_in = default_in or root.joinpath(f"{name}-plugin-names")
self.default_out = default_out or root.joinpath("generated.nix") self.default_out = default_out or root.joinpath("generated.nix")
self.deprecated = deprecated or root.joinpath("deprecated.json") self.deprecated = deprecated or root.joinpath("deprecated.json")
@ -226,9 +222,9 @@ class Editor:
def load_plugin_spec(self, plugin_file) -> List[PluginDesc]: def load_plugin_spec(self, plugin_file) -> List[PluginDesc]:
return load_plugin_spec(plugin_file) return load_plugin_spec(plugin_file)
def generate_nix(self, plugins, outfile): def generate_nix(self, plugins, outfile: str):
'''Returns nothing for now, writes directly to outfile''' '''Returns nothing for now, writes directly to outfile'''
self._generate_nix(plugins, outfile) raise NotImplementedError()
def get_update(self, input_file: str, outfile: str, proc: int): def get_update(self, input_file: str, outfile: str, proc: int):
return get_update(input_file, outfile, proc, editor=self) return get_update(input_file, outfile, proc, editor=self)
@ -237,9 +233,58 @@ class Editor:
def attr_path(self): def attr_path(self):
return self.name + "Plugins" return self.name + "Plugins"
def get_drv_name(self, name: str):
return self.attr_path + "." + name
def rewrite_input(self, *args, **kwargs): def rewrite_input(self, *args, **kwargs):
return rewrite_input(*args, **kwargs) return rewrite_input(*args, **kwargs)
def create_parser(self):
parser = argparse.ArgumentParser(
description=(
f"Updates nix derivations for {self.name} plugins"
f"By default from {self.default_in} to {self.default_out}"
)
)
parser.add_argument(
"--add",
dest="add_plugins",
default=[],
action="append",
help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo",
)
parser.add_argument(
"--input-names",
"-i",
dest="input_file",
default=self.default_in,
help="A list of plugins in the form owner/repo",
)
parser.add_argument(
"--out",
"-o",
dest="outfile",
default=self.default_out,
help="Filename to save generated nix code",
)
parser.add_argument(
"--proc",
"-p",
dest="proc",
type=int,
default=30,
help="Number of concurrent processes to spawn.",
)
parser.add_argument(
"--no-commit", "-n", action="store_true", default=False,
help="Whether to autocommit changes"
)
parser.add_argument(
"--debug", "-d", choices=LOG_LEVELS.keys(),
default=logging.getLevelName(logging.WARN),
help="Adjust log level"
)
return parser
@ -466,54 +511,6 @@ def rewrite_input(
with open(input_file, "w") as f: with open(input_file, "w") as f:
f.writelines(lines) f.writelines(lines)
# TODO move to Editor ?
def parse_args(editor: Editor):
parser = argparse.ArgumentParser(
description=(
f"Updates nix derivations for {editor.name} plugins"
f"By default from {editor.default_in} to {editor.default_out}"
)
)
parser.add_argument(
"--add",
dest="add_plugins",
default=[],
action="append",
help=f"Plugin to add to {editor.attr_path} from Github in the form owner/repo",
)
parser.add_argument(
"--input-names",
"-i",
dest="input_file",
default=editor.default_in,
help="A list of plugins in the form owner/repo",
)
parser.add_argument(
"--out",
"-o",
dest="outfile",
default=editor.default_out,
help="Filename to save generated nix code",
)
parser.add_argument(
"--proc",
"-p",
dest="proc",
type=int,
default=30,
help="Number of concurrent processes to spawn.",
)
parser.add_argument(
"--no-commit", "-n", action="store_true", default=False,
help="Whether to autocommit changes"
)
parser.add_argument(
"--debug", "-d", choices=LOG_LEVELS.keys(),
default=logging.getLevelName(logging.WARN),
help="Adjust log level"
)
return parser.parse_args()
def commit(repo: git.Repo, message: str, files: List[Path]) -> None: def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
repo.index.add([str(f.resolve()) for f in files]) repo.index.add([str(f.resolve()) for f in files])
@ -547,12 +544,10 @@ def get_update(input_file: str, outfile: str, proc: int, editor: Editor):
return update return update
def update_plugins(editor: Editor): def update_plugins(editor: Editor, args):
"""The main entry function of this module. All input arguments are grouped in the `Editor`.""" """The main entry function of this module. All input arguments are grouped in the `Editor`."""
args = parse_args(editor)
log.setLevel(LOG_LEVELS[args.debug]) log.setLevel(LOG_LEVELS[args.debug])
log.info("Start updating plugins") log.info("Start updating plugins")
nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
update = editor.get_update(args.input_file, args.outfile, args.proc) update = editor.get_update(args.input_file, args.outfile, args.proc)
@ -581,7 +576,7 @@ def update_plugins(editor: Editor):
if autocommit: if autocommit:
commit( commit(
nixpkgs_repo, nixpkgs_repo,
"{editor.attr_path}.{name}: init at {version}".format( "{editor.get_drv_name name}: init at {version}".format(
editor=editor.name, name=plugin.normalized_name, version=plugin.version editor=editor.name, name=plugin.normalized_name, version=plugin.version
), ),
[args.outfile, args.input_file], [args.outfile, args.input_file],

View file

@ -16,20 +16,17 @@ from dataclasses import dataclass
import subprocess import subprocess
import csv import csv
import logging import logging
import textwrap
from multiprocessing.dummy import Pool
from typing import List from typing import List, Tuple
from pathlib import Path from pathlib import Path
LOG_LEVELS = {
logging.getLevelName(level): level for level in [
logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ]
}
log = logging.getLogger() log = logging.getLogger()
log.addHandler(logging.StreamHandler()) log.addHandler(logging.StreamHandler())
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent
from pluginupdate import Editor, parse_args, update_plugins, PluginDesc, CleanEnvironment from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache
PKG_LIST="maintainers/scripts/luarocks-packages.csv" PKG_LIST="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)" TMP_FILE="$(mktemp)"
@ -67,12 +64,11 @@ class LuaEditor(Editor):
def get_current_plugins(self): def get_current_plugins(self):
return [] return []
def load_plugin_spec(self, input_file) -> List[PluginDesc]: def load_plugin_spec(self, input_file) -> List[LuaPlugin]:
luaPackages = [] luaPackages = []
csvfilename=input_file csvfilename=input_file
log.info("Loading package descriptions from %s", csvfilename) log.info("Loading package descriptions from %s", csvfilename)
with open(csvfilename, newline='') as csvfile: with open(csvfilename, newline='') as csvfile:
reader = csv.DictReader(csvfile,) reader = csv.DictReader(csvfile,)
for row in reader: for row in reader:
@ -81,96 +77,115 @@ class LuaEditor(Editor):
luaPackages.append(plugin) luaPackages.append(plugin)
return luaPackages return luaPackages
def generate_nix(
self,
results: List[Tuple[LuaPlugin, str]],
outfilename: str
):
with tempfile.NamedTemporaryFile("w+") as f:
f.write(HEADER)
header2 = textwrap.dedent(
# header2 = inspect.cleandoc(
"""
{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args:
self: super:
with self;
{
""")
f.write(header2)
for (plugin, nix_expr) in results:
f.write(f"{plugin.normalized_name} = {nix_expr}")
f.write(FOOTER)
f.flush()
# if everything went fine, move the generated file to its destination
# using copy since move doesn't work across disks
shutil.copy(f.name, outfilename)
print(f"updated {outfilename}")
@property @property
def attr_path(self): def attr_path(self):
return "luaPackages" return "luaPackages"
def get_update(self, input_file: str, outfile: str, _: int): def get_update(self, input_file: str, outfile: str, proc: int):
cache: Cache = Cache(self.cache_file)
_prefetch = generate_pkg_nix
def update() -> dict: def update() -> dict:
plugin_specs = self.load_plugin_spec(input_file) plugin_specs = self.load_plugin_spec(input_file)
sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower())
self.generate_nix(plugin_specs, outfile) try:
pool = Pool(processes=proc)
results = pool.map(_prefetch, sorted_plugin_specs)
finally:
pass
self.generate_nix(results, outfile)
redirects = [] redirects = []
return redirects return redirects
return update return update
def rewrite_input(self, *args, **kwargs): def rewrite_input(self, input_file: str, *args, **kwargs):
# vim plugin reads the file before update but that shouldn't be our case
# not implemented yet # not implemented yet
# fieldnames = ['name', 'server', 'version', 'luaversion', 'maintainers']
# input_file = "toto.csv"
# with open(input_file, newline='') as csvfile:
# writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
# writer.writeheader()
# for row in reader:
# # name,server,version,luaversion,maintainers
# plugin = LuaPlugin(**row)
# luaPackages.append(plugin)
pass pass
def generate_nix( def generate_pkg_nix(plug: LuaPlugin):
plugins: List[LuaPlugin], '''
outfilename: str Generate nix expression for a luarocks package
): Our cache key associates "p.name-p.version" to its rockspec
sorted_plugins = sorted(plugins, key=lambda v: v.name.lower()) '''
log.debug("Generating nix expression for %s", plug.name)
cmd = [ "luarocks", "nix", plug.name]
# plug = {} if plug.server:
# selon le manifest luarocks.org/manifest cmd.append(f"--only-server={plug.server}")
def _generate_pkg_nix(plug):
cmd = [ "luarocks", "nix", plug.name]
if plug.server:
cmd.append(f"--only-server={plug.server}")
if plug.maintainers: if plug.maintainers:
cmd.append(f"--maintainers={plug.maintainers}") cmd.append(f"--maintainers={plug.maintainers}")
if plug.version: if plug.version:
cmd.append(plug.version) cmd.append(plug.version)
if plug.luaversion: if plug.luaversion:
with CleanEnvironment(): with CleanEnvironment():
local_pkgs = str(ROOT.resolve()) local_pkgs = str(ROOT.resolve())
cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"]
log.debug("running %s", cmd2) log.debug("running %s", ' '.join(cmd2))
lua_drv_path=subprocess.check_output(cmd2, text=True).strip() lua_drv_path=subprocess.check_output(cmd2, text=True).strip()
cmd.append(f"--lua-dir={lua_drv_path}/bin") cmd.append(f"--lua-dir={lua_drv_path}/bin")
log.debug("running %s", cmd)
output = subprocess.check_output(cmd, text=True)
return output
with tempfile.NamedTemporaryFile("w+") as f:
f.write(HEADER)
f.write("""
{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args:
self: super:
with self;
{
""")
for plugin in sorted_plugins:
nix_expr = _generate_pkg_nix(plugin)
f.write(f"{plugin.normalized_name} = {nix_expr}"
)
f.write(FOOTER)
f.flush()
# if everything went fine, move the generated file to its destination
# using copy since move doesn't work across disks
shutil.copy(f.name, outfilename)
print(f"updated {outfilename}")
def load_plugin_spec():
pass
log.debug("running %s", cmd)
output = subprocess.check_output(cmd, text=True)
return (plug, output)
def main(): def main():
editor = LuaEditor("lua", ROOT, '', generate_nix, editor = LuaEditor("lua", ROOT, '',
default_in = ROOT.joinpath(PKG_LIST), default_in = ROOT.joinpath(PKG_LIST),
default_out = ROOT.joinpath(GENERATED_NIXFILE) default_out = ROOT.joinpath(GENERATED_NIXFILE)
) )
args = parse_args(editor) parser = editor.create_parser()
args = parser.parse_args()
log.setLevel(LOG_LEVELS[args.debug]) log.setLevel(LOG_LEVELS[args.debug])
update_plugins(editor) update_plugins(editor, args)
if __name__ == "__main__": if __name__ == "__main__":

View file

@ -520,11 +520,7 @@ in
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''} ''}
${if cfg.forwardX11 then '' X11Forwarding ${if cfg.forwardX11 then "yes" else "no"}
X11Forwarding yes
'' else ''
X11Forwarding no
''}
${optionalString cfg.allowSFTP '' ${optionalString cfg.allowSFTP ''
Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags} Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}

View file

@ -42,11 +42,6 @@ in {
description = '' description = ''
The interfaces <command>wpa_supplicant</command> will use. If empty, it will The interfaces <command>wpa_supplicant</command> will use. If empty, it will
automatically use all wireless interfaces. automatically use all wireless interfaces.
<warning><para>
The automatic discovery of interfaces does not work reliably on boot:
it may fail and leave the system without network. When possible, specify
a known interface name.
</para></warning>
''; '';
}; };
@ -230,14 +225,6 @@ in {
message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
}); });
warnings =
optional (cfg.interfaces == [] && config.systemd.services.wpa_supplicant.wantedBy != [])
''
No network interfaces for wpa_supplicant have been configured: the service
may randomly fail to start at boot. You should specify at least one using the option
networking.wireless.interfaces.
'';
environment.systemPackages = [ package ]; environment.systemPackages = [ package ];
services.dbus.packages = [ package ]; services.dbus.packages = [ package ];
@ -258,31 +245,45 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
stopIfChanged = false; stopIfChanged = false;
path = [ package ]; path = [ package pkgs.udev ];
script = let script = let
configStr = if cfg.allowAuxiliaryImperativeNetworks configStr = if cfg.allowAuxiliaryImperativeNetworks
then "-c /etc/wpa_supplicant.conf -I ${configFile}" then "-c /etc/wpa_supplicant.conf -I ${configFile}"
else "-c ${configFile}"; else "-c ${configFile}";
in '' in ''
if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ] if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then
then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
fi fi
iface_args="-s -u -D${cfg.driver} ${configStr}" iface_args="-s -u -D${cfg.driver} ${configStr}"
${if ifaces == [] then '' ${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do # detect interfaces automatically
DEVTYPE=
UEVENT_PATH=/sys/class/net/$i/uevent # check if there are no wireless interface
if [ -e "$UEVENT_PATH" ]; then if ! find -H /sys/class/net/* -name wireless | grep -q .; then
source "$UEVENT_PATH" # if so, wait until one appears
if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then echo "Waiting for wireless interfaces"
args+="''${args:+ -N} -i$i $iface_args" grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu)
fi # Note: the above line has been carefully written:
fi # 1. The process substitution avoids udevadm hanging (after grep has quit)
# until it tries to write to the pipe again. Not even pipefail works here.
# 2. stdbuf is needed because udevadm output is buffered by default and grep
# may hang until more udev events enter the pipe.
fi
# add any interface found to the daemon arguments
for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do
echo "Adding interface $name"
args+="''${args:+ -N} -i$name $iface_args"
done done
'' else '' '' else ''
# add known interfaces to the daemon arguments
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''} ''}
# finally start daemon
exec wpa_supplicant $args exec wpa_supplicant $args
''; '';
}; };

View file

@ -232,13 +232,13 @@ let
defaultListen = defaultListen =
if vhost.listen != [] then vhost.listen if vhost.listen != [] then vhost.listen
else optionals (hasSSL || vhost.rejectSSL) ( else
singleton { addr = "0.0.0.0"; port = 443; ssl = true; } let addrs = if vhost.listenAddresses != [] then vhost.listenAddreses else (
++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]"
) ++ optionals (!onlySSL) ( );
singleton { addr = "0.0.0.0"; port = 80; ssl = false; } in
++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs)
); ++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs);
hostListen = hostListen =
if vhost.forceSSL if vhost.forceSSL

View file

@ -43,9 +43,26 @@ with lib;
IPv6 addresses must be enclosed in square brackets. IPv6 addresses must be enclosed in square brackets.
Note: this option overrides <literal>addSSL</literal> Note: this option overrides <literal>addSSL</literal>
and <literal>onlySSL</literal>. and <literal>onlySSL</literal>.
If you only want to set the addresses manually and not
the ports, take a look at <literal>listenAddresses</literal>
''; '';
}; };
listenAddresses = mkOption {
type = with types; listOf str;
description = ''
Listen addresses for this virtual host.
Compared to <literal>listen</literal> this only sets the addreses
and the ports are choosen automatically.
Note: This option overrides <literal>enableIPv6</literal>
'';
default = [];
example = [ "127.0.0.1" "::1" ];
};
enableACME = mkOption { enableACME = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;

View file

@ -164,6 +164,11 @@ in
systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ];
environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
# We dont use the upstream gdm service
# it has to be disabled since the gdm package has it
# https://github.com/NixOS/nixpkgs/issues/108672
systemd.services.gdm.enable = false;
systemd.services.display-manager.wants = [ systemd.services.display-manager.wants = [
# Because sd_login_monitor_new requires /run/systemd/machines # Because sd_login_monitor_new requires /run/systemd/machines
"systemd-machined.service" "systemd-machined.service"

View file

@ -681,7 +681,7 @@ in
systemd.services.display-manager = systemd.services.display-manager =
{ description = "X11 Server"; { description = "X11 Server";
after = [ "acpid.service" "systemd-logind.service" ]; after = [ "acpid.service" "systemd-logind.service" "systemd-user-sessions.service" ];
restartIfChanged = false; restartIfChanged = false;

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "svkbd"; pname = "svkbd";
version = "0.3"; version = "0.4";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz"; url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz";
sha256 = "108khx665d7dlzs04iy4g1nw3fyqpy6kd0afrwiapaibgv4xhfsk"; sha256 = "sha256-j9RW5/4cb8l3FK9jpFf206l1rQhCR5H/WMiu7I6rzV8=";
}; };
inherit patches; inherit patches;

View file

@ -39,52 +39,57 @@ in lib.filterAttrs (n: v: v != null) checksums)"""
HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
class KakouneEditor(pluginupdate.Editor):
def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
with open(outfile, "w+") as f: def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
f.write(HEADER) sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
f.write(
"""
{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
let
packages = ( self:
{"""
)
for owner, repo, plugin in sorted_plugins:
if plugin.has_submodules:
submodule_attr = "\n fetchSubmodules = true;"
else:
submodule_attr = ""
with open(outfile, "w+") as f:
f.write(HEADER)
f.write( f.write(
f""" """
{plugin.normalized_name} = buildKakounePluginFrom2Nix {{ { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
pname = "{plugin.normalized_name}"; let
version = "{plugin.version}"; packages = ( self:
src = fetchFromGitHub {{ {"""
owner = "{owner}";
repo = "{repo}";
rev = "{plugin.commit}";
sha256 = "{plugin.sha256}";{submodule_attr}
}};
meta.homepage = "https://github.com/{owner}/{repo}/";
}};
"""
) )
f.write( for owner, repo, plugin in sorted_plugins:
""" if plugin.has_submodules:
}); submodule_attr = "\n fetchSubmodules = true;"
in lib.fix' (lib.extends overrides packages) else:
""" submodule_attr = ""
)
print(f"updated {outfile}") f.write(
f"""
{plugin.normalized_name} = buildKakounePluginFrom2Nix {{
pname = "{plugin.normalized_name}";
version = "{plugin.version}";
src = fetchFromGitHub {{
owner = "{owner}";
repo = "{repo}";
rev = "{plugin.commit}";
sha256 = "{plugin.sha256}";{submodule_attr}
}};
meta.homepage = "https://github.com/{owner}/{repo}/";
}};
"""
)
f.write(
"""
});
in lib.fix' (lib.extends overrides packages)
"""
)
print(f"updated {outfile}")
def main(): def main():
editor = pluginupdate.Editor("kakoune", ROOT, GET_PLUGINS, generate_nix) editor = KakouneEditor("kakoune", ROOT, GET_PLUGINS)
pluginupdate.update_plugins(editor) parser = editor.create_parser()
args = parser.parse_args()
pluginupdate.update_plugins(editor, args)
if __name__ == "__main__": if __name__ == "__main__":

View file

@ -4,7 +4,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vimacs"; pname = "vimacs";
version = vimPackage.version; version = lib.getVersion vimPackage;
vimPackage = if useMacvim then macvim else vim_configurable; vimPackage = if useMacvim then macvim else vim_configurable;
buildInputs = [ vimPackage vimPlugins.vimacs ]; buildInputs = [ vimPackage vimPlugins.vimacs ];

View file

@ -34,31 +34,37 @@ let
qonlinetranslator = fetchFromGitHub { qonlinetranslator = fetchFromGitHub {
owner = "crow-translate"; owner = "crow-translate";
repo = "QOnlineTranslator"; repo = "QOnlineTranslator";
rev = "1.4.1"; rev = "1.4.4";
sha256 = "1c6a8mdxms5vh8l7shi2kqdhafbzm50pbz6g1hhgg6qslla0vfn0"; sha256 = "sha256-ogO6ovkQmyvTUPCYAQ4U3AxOju9r3zHB9COnAAfKSKA=";
}; };
circleflags = fetchFromGitHub { circleflags = fetchFromGitHub {
owner = "HatScripts"; owner = "HatScripts";
repo = "circle-flags"; repo = "circle-flags";
rev = "v2.0.0"; rev = "v2.1.0";
sha256 = "1xz5b6nhcxxzalcgwnw36npap71i70s50g6b63avjgjkwz1ys5j4"; sha256 = "sha256-E0iTDjicfdGqK4r+anUZanEII9SBafeEUcMLf7BGdp0=";
};
we10x = fetchFromGitHub {
owner = "yeyushengfan258";
repo = "We10X-icon-theme";
rev = "bd2c68482a06d38b2641503af1ca127b9e6540db";
sha256 = "sha256-T1oPstmjLffnVrIIlmTTpHv38nJHBBGJ070ilRwAjk8=";
}; };
in in
mkDerivation rec { mkDerivation rec {
pname = "crow-translate"; pname = "crow-translate";
version = "2.8.1"; version = "2.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crow-translate"; owner = "crow-translate";
repo = "crow-translate"; repo = pname;
rev = version; rev = version;
sha256 = "sha256-fmlNUhNorV/MUdfdDXM6puAblTTa6p2slVT/EKy5THg="; sha256 = "sha256-TPJgKTZqsh18BQGFWgp0wsw1ehtI8ydQ7ZCvYNX6pH8=";
}; };
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./dont-fetch-external-libs.patch; src = ./dont-fetch-external-libs.patch;
inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags; inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags we10x;
}) })
(substituteAll { (substituteAll {
# See https://github.com/NixOS/nixpkgs/issues/86054 # See https://github.com/NixOS/nixpkgs/issues/86054
@ -67,7 +73,10 @@ mkDerivation rec {
}) })
]; ];
postPatch = "cp -r ${circleflags}/flags/* data/icons"; postPatch = ''
cp -r ${circleflags}/flags/* data/icons
cp -r ${we10x}/src/* data/icons
'';
nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; nativeBuildInputs = [ cmake extra-cmake-modules qttools ];

View file

@ -1,26 +1,28 @@
diff --git i/CMakeLists.txt w/CMakeLists.txt diff --git i/CMakeLists.txt w/CMakeLists.txt
index 2576203..26162a0 100644 index 0cd2140..16e3190 100644
--- i/CMakeLists.txt --- i/CMakeLists.txt
+++ w/CMakeLists.txt +++ w/CMakeLists.txt
@@ -91,12 +91,11 @@ qt5_add_translation(QM_FILES @@ -97,13 +97,11 @@ qt5_add_translation(QM_FILES
) )
configure_file(src/cmake.h.in cmake.h) configure_file(src/cmake.h.in cmake.h)
-configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) -configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY)
-configure_file(data/icons/we10x.qrc ${We10X_SOURCE_DIR}/src/we10x.qrc COPYONLY)
add_executable(${PROJECT_NAME} add_executable(${PROJECT_NAME}
${QM_FILES}
data/icons/engines/engines.qrc
- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc - ${CircleFlags_SOURCE_DIR}/flags/flags.qrc
+ data/icons/flags.qrc + data/icons/flags.qrc
${QM_FILES}
- ${We10X_SOURCE_DIR}/src/we10x.qrc
+ data/icons/we10x.qrc
data/icons/engines/engines.qrc
src/addlanguagedialog.cpp src/addlanguagedialog.cpp
src/addlanguagedialog.ui src/addlanguagedialog.ui
src/cli.cpp
diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake
index 21eba0a..b613d3e 100644 index d738716..fb01f3d 100644
--- i/cmake/ExternalLibraries.cmake --- i/cmake/ExternalLibraries.cmake
+++ w/cmake/ExternalLibraries.cmake +++ w/cmake/ExternalLibraries.cmake
@@ -2,29 +2,24 @@ include(FetchContent) @@ -2,34 +2,28 @@ include(FetchContent)
set(QAPPLICATION_CLASS QApplication) set(QAPPLICATION_CLASS QApplication)
FetchContent_Declare(SingleApplication FetchContent_Declare(SingleApplication
@ -44,14 +46,20 @@ index 21eba0a..b613d3e 100644
FetchContent_Declare(QOnlineTranslator FetchContent_Declare(QOnlineTranslator
- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator
- GIT_TAG 1.4.1 - GIT_TAG 1.4.4
+ SOURCE_DIR @qonlinetranslator@ + SOURCE_DIR @qonlinetranslator@
) )
FetchContent_Declare(CircleFlags FetchContent_Declare(CircleFlags
- GIT_REPOSITORY https://github.com/HatScripts/circle-flags - GIT_REPOSITORY https://github.com/HatScripts/circle-flags
- GIT_TAG v2.0.0 - GIT_TAG v2.1.0
+ SOURCE_DIR @circleflags@ + SOURCE_DIR @circleflags@
) )
FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags) FetchContent_Declare(We10X
- GIT_REPOSITORY https://github.com/yeyushengfan258/We10X-icon-theme
- GIT_TAG bd2c68482a06d38b2641503af1ca127b9e6540db
+ SOURCE_DIR @we10x@
)
FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags We10X)

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "etesync-dav"; pname = "etesync-dav";
version = "0.30.7"; version = "0.30.8";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "16b3105834dd6d9e374e976cad0978e1acfed0f0328c5054bc214550aea3e2c5"; sha256 = "sha256-HBLQsq3B6TMdcnUt8ukbk3+S0Ed44+gePkpuGZ2AyC4=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View file

@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zathura"; pname = "zathura";
version = "0.4.7"; version = "0.4.8";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0"; sha256 = "1nr0ym1mi2afk4ycdf1ppmkcv7i7hyzwn4p3r4m0j2qm3nvaiami";
}; };
outputs = [ "bin" "man" "dev" "out" ]; outputs = [ "bin" "man" "dev" "out" ];

View file

@ -273,7 +273,10 @@ buildStdenv.mkDerivation ({
'') + '' '') + ''
# AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS unset AS
''; '' + (lib.optionalString enableOfficialBranding ''
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
'');
configureFlags = [ configureFlags = [
"--enable-application=browser" "--enable-application=browser"
@ -325,11 +328,7 @@ buildStdenv.mkDerivation ({
cd obj-* cd obj-*
''; '';
makeFlags = lib.optionals enableOfficialBranding [ makeFlags = lib.optionals ltoSupport [
"MOZILLA_OFFICIAL=1"
"BUILD_OFFICIAL=1"
]
++ lib.optionals ltoSupport [
"AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar" "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump" "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
"NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm" "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"

View file

@ -169,7 +169,7 @@ stdenv.mkDerivation {
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
name = "thunderbird-bin-${version}"; pname = "thunderbird-bin";
baseName = "thunderbird"; baseName = "thunderbird";
channel = "release"; channel = "release";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

View file

@ -1,665 +1,665 @@
{ {
version = "78.12.0"; version = "78.13.0";
sources = [ sources = [
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/af/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/af/thunderbird-78.13.0.tar.bz2";
locale = "af"; locale = "af";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "39671f52392f2c10c7398376047e01d85c42ca8eb21d2c536e11fa575cca4874"; sha256 = "f08190514cb9e7a429e12db93b5423e83f8c4f8b34079e266b797099d6e5b3cb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ar/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ar/thunderbird-78.13.0.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "b3ac3c166b5eec0ae3857a89817a0a7088dddd5545aa4864705caf79aa8bae1a"; sha256 = "cafc6a55a1bd4b1ed0c412cdcce917d803f1d81689a496e09ffd702bf1495c8e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ast/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ast/thunderbird-78.13.0.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "2a98210aef008bd04206eb4019d9b6d0301e21085d8c96e5d8f023c77b079900"; sha256 = "b444e1b6cc64b28069382e97f8b966f6d154fbc4216cc67b20ce0105ebd0be89";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/be/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/be/thunderbird-78.13.0.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "6309d4959ebcc9be6d139277f990562f8d912766d57d64fc3ec4078e214097cc"; sha256 = "18ef49bc393dfc223638edb54525a336f604c606c36f40e3c0f6e4a883cbb1d9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/bg/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/bg/thunderbird-78.13.0.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "20fd0b411962c3ed0da4f6eb95d8c47dc57a7b366dee0e771708c2c67772619f"; sha256 = "2fe1b34fbb43e22f8fb7238baca4aa2d5d5df3dbf4baf0aa276fc8bd0dd5bc02";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/br/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/br/thunderbird-78.13.0.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "e9f43ff375066cbb23340f2138c0ebf7b2c18e0a57d7049437034a580d8ebc74"; sha256 = "e1a46004fefb79e3febf8bcd2b8aa6aa7140b97170740c4b5cc4b6351cb1fd6f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ca/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ca/thunderbird-78.13.0.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "2eaf6674ea616116457b7100b90f2b813eab906091a53bce71d52f4bdae17fb9"; sha256 = "d7e9112b78155af6e684f9f306e35fb7aa8862f2008aa842729aedf10e5b62ef";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cak/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cak/thunderbird-78.13.0.tar.bz2";
locale = "cak"; locale = "cak";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f56dc013fad49782a074ef7d0721a12f43af5f029e690937d72e6a14d79c1505"; sha256 = "325acc4638890583fcd2483846cce33a4ed9a2fb376265c926bb8904e37cb6cf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cs/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cs/thunderbird-78.13.0.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "87fecc8661be9ee8891b74f83bd9a6746b826700a6ac46b550d5e2bcc93e560e"; sha256 = "a9926717859e51e5f66c41c0a11a70e8d4e635b8dae3486f454ad24464ad1e80";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cy/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cy/thunderbird-78.13.0.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4177b225e02341b96baa6528f1053c718e2e85d452b730a40ebf124a4c70d118"; sha256 = "e8d6edb4ba1b6749517ef5d4ae3300aed654c3aa9d6a6e6d7f4a0ff6c829d139";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/da/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/da/thunderbird-78.13.0.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "9d8cb26a9011130ce973e9e7ecd20650296d406b7ce8b4cf8740ab7e9759e641"; sha256 = "ab5288a8d809f9979eb3a330ec0cd8bb4c5deab564b755f064470fe13df3d0be";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/de/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/de/thunderbird-78.13.0.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "ee19d3702cd0fc0b193e09a3fc470c450ddc919d78471df071183c89c063f443"; sha256 = "9a477fe13a4a99fc48fae4713b82771ecca367869047ef268d8811dac1aac220";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/dsb/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/dsb/thunderbird-78.13.0.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "20d78a72fb2c5d91e2534dd21aa00d9f958d2df61bec297e1662d7f594c76a5e"; sha256 = "deb4947364fd806e06b5c69ea4b51b411b9cd10bec92a23d6d7432d8ba0bbdf0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/el/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/el/thunderbird-78.13.0.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "c5014ec8b8382814e3184839192aa71e5610c8c0a6df8dfc9b6b596afbd22bcb"; sha256 = "18cc09ee14827e4a3f155215a11551791e5708106ae0d993145ccce4890d8cf0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-CA/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-CA/thunderbird-78.13.0.tar.bz2";
locale = "en-CA"; locale = "en-CA";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "79f1c4166607a01cb32eec5ddb60892822f9047f43c7af3cdeb877ba9c7b7584"; sha256 = "6afd716eeae087a27a8c75029735e501fd7e32f95a8842bc5ba0e3a64cb31630";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-GB/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-GB/thunderbird-78.13.0.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "8dfe9daac9224dd4c64d689b7b066c126f72e75f283d8a66dcf3fa846e46c881"; sha256 = "91e0ad90be9e4e89f5245e660e09c3ad06d1ff807a30b3eb696261a883ea77ea";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-US/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-US/thunderbird-78.13.0.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "43c021edf529f388856432315d99fd1261a0034aa1cead97cc104598eba63d7e"; sha256 = "97515bda6e141aef0d74696db3459711985f7fb526ca0e2d7544725d72f5fb3b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/es-AR/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-AR/thunderbird-78.13.0.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5f6f86557456d717790a16053e663dce8878a4e7b60f4ee15d02ae753b5c8e78"; sha256 = "ef6067e00544e37786694d85957c0fbdf12bb20add6f6f5dadc03b095d24513d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/es-ES/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-ES/thunderbird-78.13.0.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f6e85e580871e225e5315eeb0aa7f2982f43352c6c4065966ead1eff47037989"; sha256 = "be6df6fa4ed5facfb77a5849e0a4008ec42c2629deb5ea2dc3fa5251891e0306";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/et/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/et/thunderbird-78.13.0.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "37ea60b93f1d57a1c5f30acdc93dcd73a35ab7107dc05b8e8eebe3a996454186"; sha256 = "6c63ddb05366d3a9d0baadceccb3aac8fe3c6788515feeb2649bdc5d717d6d0c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/eu/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/eu/thunderbird-78.13.0.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "9f7a1fc4b94017d6341c993209987e9647bf29973c3ffc3427ece6277cf92c5a"; sha256 = "215861f41e59b6e9c5892e9b10483b890a7a4c351376c455001215af4c3bf276";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fa/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fa/thunderbird-78.13.0.tar.bz2";
locale = "fa"; locale = "fa";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "dc36f3eb91e32ea44a30792f8d65ed225455567ec4b7ec386fe6ec6510caa5da"; sha256 = "6486a7b0923d5b689e15eb2082317127e62f050d68f887dbe410619f5c36a470";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fi/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fi/thunderbird-78.13.0.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "1fa2cfe9354f7a5b4c9aa0927ae83cad535e8cb448d8a2d82f7a946b5c142b22"; sha256 = "5e6a55e1520174f9cd27a82e3634999df0703f8bbdee82fdec433f862c41daaf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fr/thunderbird-78.13.0.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "49887ce333f50f404a383291d813e3e8f891045247d2de353627998c47821a12"; sha256 = "7c9573fbf4a0d16e89a9f8d8fae71874cf49577b3749ba942ecb71b1b6a3a8d5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fy-NL/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fy-NL/thunderbird-78.13.0.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "e408da5478ea01797c260b414ff513e87e71c6de41d6ca0c8bc11780c06fad28"; sha256 = "6ff1fe09e82b723ebc7022744bba0cd064da2fcc7b8b92fc23475bbbea57c0fb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ga-IE/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ga-IE/thunderbird-78.13.0.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "6dc99c43a076c4575163e640260b27aaebef01ffcc1ce8b6c6e2da8c993eee72"; sha256 = "be25c020f47cf42c05dfd33338b210ad603ede6af97f8b41528d8a18be209fe3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/gd/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gd/thunderbird-78.13.0.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "3ba9424491565e4e576dbfe656e681892ff1084fcd8b9659beb6a17b36cc4c27"; sha256 = "65cd07e5151809ae64a905163c939bfdef60226b4fe24b9657f6de3a2c10eaa6";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/gl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gl/thunderbird-78.13.0.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "a8348d99ba729122d2d2cc0a10d60c38ff4b7e83eaf7ebd04a58d7fad5326664"; sha256 = "882ed57366537562882a5e7822789a7b16d6161b8a68e7292d86741d9c3f4b95";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/he/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/he/thunderbird-78.13.0.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "fcba79332eeba50f074a7f1864120414ca20152a16b4b9aed02dbc05d487cf10"; sha256 = "115e4cb00d50dd7c5c42e94a432b04e4ac6129e1409c5b5c578594917a1b60d0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hr/thunderbird-78.13.0.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d6a51f6c92ab53a73abb5733a9737d36f59aee7acd248ea656b7aa3c406e3980"; sha256 = "325cfc1ea9f0a8cb8bd3cb7c881e1bd84a8d8813b78618dcdc7b1ca7b4647b30";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hsb/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hsb/thunderbird-78.13.0.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "a99dbdd453d31674178faecf37e61b414cc24468a39b8a5e5afa037bf938ffd7"; sha256 = "c92d6bd04f71dc7379c3777186d094706ea41ad6a3e1fefa515d0a2316c7735d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hu/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hu/thunderbird-78.13.0.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "aa8384952169ea4f60c8bb11d47c39b81a9c327546ceacdefedb1a37a91e80b0"; sha256 = "ee0ab2733affbbd7f23589f1e07399ef73fd3c8901463085a67d6c9a3f6e5302";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hy-AM/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hy-AM/thunderbird-78.13.0.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "2a3fd50c42b1aeea61e921e70f05c4ca74e03904c8400b7fa0e245816e42e0f9"; sha256 = "fa5b38c93c4777046213b00e6162a7afe14cafb1a3fec47383f54a9fd11a440b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/id/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/id/thunderbird-78.13.0.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5b606b68a3f618ca0d3fadc5a8ee1da7aa636b6d1c1aee0b3e46c978c4a95ef3"; sha256 = "a5602d079dd6ae9edbd5b1461474d858085c3250edb33573afd7f4ea2b232176";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/is/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/is/thunderbird-78.13.0.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "af75f627fc5eb5c0628bbc3ece9549c0daf967e267de850503314830384b340c"; sha256 = "eed6de442870f9c4933bef7e94019bbc386465ba5f7f2baa26de2b79973fa567";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/it/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/it/thunderbird-78.13.0.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "de55f082a0de2c6a3f5c04e6a3bc00f4dd79dc4c8c91d7218bbc50c5e31421a4"; sha256 = "960c1552022ea30da269981d986b5715c971438e5d379d74fde59f18d033d862";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ja/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ja/thunderbird-78.13.0.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5db89a1ef3e1546ac48e870c06a235e2f525a9634fed09ce706773cf2582c15b"; sha256 = "0a13ffba546db10ff44ff5c5db7d17813febdf557b8aea7d7399b6987806e8da";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ka/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ka/thunderbird-78.13.0.tar.bz2";
locale = "ka"; locale = "ka";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "524d9508d2b8ee337658d5538f9b290e08f0df9ef0c7ed0da9dc5e1e8dc2a9de"; sha256 = "42b41113b2886cc35afe5ed48026d503519e8c318efad6123f5e074caa8ca425";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/kab/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kab/thunderbird-78.13.0.tar.bz2";
locale = "kab"; locale = "kab";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "7dd3d55f7a5b68b0ebaa96efb2091c320553bbee17b0329dce2ffdb5bed0954c"; sha256 = "17f0fdf3f2697256052335808a6ad1ef81d97fc94f848c29df9e717a3e63fba8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/kk/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kk/thunderbird-78.13.0.tar.bz2";
locale = "kk"; locale = "kk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f49fe966e1f22e542b62f7e2f3aa8a7377ec6997d5d0b3dc8f0e6986e0418111"; sha256 = "94956589eeaaf7c9dd3c3c5c004907f33d6ee515d1202dad8f651cfbd1726638";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ko/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ko/thunderbird-78.13.0.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "f48b05376ce85123a163ec54be9baa1325e38e1994753696a3054028a6f60ab2"; sha256 = "0a7efb01da1befb18111c117d2ed4c69e52de0b3f3aa24e6e3e2d0356bf645d8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/lt/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/lt/thunderbird-78.13.0.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "124b0f6e6f1db1cac8ac33f0878d8583c29913c65fb5ca1be4653a9592967407"; sha256 = "810dae8617107773cc0d0de4ed7cc4fad42282edcea81fb2b6419777d7386bae";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ms/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ms/thunderbird-78.13.0.tar.bz2";
locale = "ms"; locale = "ms";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "c2917bf55feb4c9efa905920add0bea79b715dc631960e283cb413d05e1e51ec"; sha256 = "ae4fdae5ca5a07e3f1b9fdd3b9eaff1cd1d8448eefb0b67cde16124514f075a3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nb-NO/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nb-NO/thunderbird-78.13.0.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "1a5f059665aacea4f12f0f604979bc6de5059e50ab85710cf25d6f0478fd1acb"; sha256 = "ce73218100a0153fee49edaedc78910cfda0784ebf59ec90847b7718eb108b73";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nl/thunderbird-78.13.0.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4efc6479b4948aa96e4c4a14f25ca6401058ddfea4b4175cdce851839327dd8e"; sha256 = "63e23bba6301b86da1df350e87d107c53bc04b5eaf54c36bb57e0140b79a1479";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nn-NO/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nn-NO/thunderbird-78.13.0.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "910661eecc2d65c27f63597ed5bdc96973e39603a0c702e7dd760e87b373d7c8"; sha256 = "287efd5bc94297448895121c8df4fe43beaf39850ce8a82cda31d9a89a4d7b62";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pa-IN/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pa-IN/thunderbird-78.13.0.tar.bz2";
locale = "pa-IN"; locale = "pa-IN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "50aa0006b3252d7ba020a162b36f863c632fb3f6d13bf0589334ba3f34ae6ba4"; sha256 = "7079c15ce806ba3cb20bb50b6c36004ffa745ac083f514b2ac5b5dece95eef89";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pl/thunderbird-78.13.0.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "6f75b4492c9cf6bd3b03800a55b0e91a121e7e13ca1f451571cf25abde040487"; sha256 = "30048a59149c8ca6b9d240140826b61a777752dafa221c47738d291c51e70ccd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pt-BR/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-BR/thunderbird-78.13.0.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "ed8834d038affbd7fadc93dbb72d972a7dca77d9d9af4b5cbdb0cf4c36bd7b70"; sha256 = "38cf30326280109a1f08de860ac1045c78b27a1dc851a7972e03e8c8d07bf6b9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pt-PT/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-PT/thunderbird-78.13.0.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "6add8c6de555561d892b23909e5b4828230567789f71467600483c8eb0f4e6d1"; sha256 = "ef892e822f76b00b06f088335f736552cd7c864212eadfdf4afcd4e6a7eba2dd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/rm/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/rm/thunderbird-78.13.0.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "c9ceb44aea4f61d4376d2519b233356ca48ab7eed6c62e0402c1c435baac379c"; sha256 = "c19dc84c5437b1126ab568a5be2c5256403511cb2624c4d5ff253f5579cdd2ab";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ro/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ro/thunderbird-78.13.0.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5d2889df62325331b5869e17af8125179ff9371c8860ad52b4cc8d4c21253e6e"; sha256 = "263d6cfc4efd27849017ae3f13849f6e5be0bd7dd6a9964b6716a948705beb20";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ru/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ru/thunderbird-78.13.0.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "07aeda5b10bcdca5474ef156be35c38ebd15de68a3670e4e2532b045964d7164"; sha256 = "425b1544350335e5a15dc8dfe2525c6c3143e34377bb9bbfb25f9b1a688b202a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/si/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/si/thunderbird-78.13.0.tar.bz2";
locale = "si"; locale = "si";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "a70410319bcab48a407f4b379e82029528b8998ec89d7105a85ffce5e804a285"; sha256 = "bc506ac571d49e70e330ccbfd62c566985754c7b98f8b484209128ab173a6b08";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sk/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sk/thunderbird-78.13.0.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4b110a5b7d3cab0a9145635c0e458e22eddddd97e407a229d8c8a5f5761d150d"; sha256 = "46b479e0085402f43446bd003ff4b9c014e888b4eec0cbcdcdf9336893ffc967";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sl/thunderbird-78.13.0.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "d253ee57d3eac036b1b758d45609db39b47dae05e282ccaace739993ef3cfccc"; sha256 = "a8a70d172e8d5890394f9974208de1cf422290b6fd8e5629a31b2f7706eaaa35";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sq/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sq/thunderbird-78.13.0.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "700a8e7798f8b92c6874febd71b188ab0a97a2ca62930db4cb36fb12e02cefe8"; sha256 = "f26287b10e906805984b0beb4ea6890bfb62a82ae8138bd26b7a5febc628be7c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sr/thunderbird-78.13.0.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "5485ce5280b71f9adc8ae2a544eecb8c8a12720efd604d93d5f2bf051f3edc0d"; sha256 = "20fc984078efae2ddcbbe7dbd81238a79342a7fe7d1f8736594c1fb290104ed0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sv-SE/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sv-SE/thunderbird-78.13.0.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "a3d0f4d3d32ebb2ec9b67fcbbbabf5640b714fbcd01a742c7cabd872c5bd94f4"; sha256 = "ea67fdba6f8f3825ed1637fd7f73b9f8159c519de3920165ae58052b351c0936";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/th/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/th/thunderbird-78.13.0.tar.bz2";
locale = "th"; locale = "th";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "2d6963ec130e14f5d0721782d5a4f724eaac5bab1b4e3469e19dbbdf1512396d"; sha256 = "86f069a0a4ef2e5338754e3a5de369a25b0d8fe96b3b7047dbfd009171e8fcf9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/tr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/tr/thunderbird-78.13.0.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "b6ada3486cbba66992db5a04138f03f12ac6fc004cb86558a4b8787481f39383"; sha256 = "9e975e5d8493a7f2b4dab36b5719b5a80c239820cd7d1adddb83440e9560d810";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/uk/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uk/thunderbird-78.13.0.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "c24fa7aab502cfdb88703c0abe2444cfd1bc7b94cab1f34b0626240c2a75a8cb"; sha256 = "a0d14c98ee3534d7eb7f0098d0fd7b8f64b4c70d5bc0bd78ea695b42babefa17";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/uz/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uz/thunderbird-78.13.0.tar.bz2";
locale = "uz"; locale = "uz";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "119d29856eb9656d89b5d06301f3abef4db106ddf3793dc0b9c0c7f2cb03428c"; sha256 = "e7d1e5b0b6a72d8b0e3611f1d4f245c46222148c1f69805a15057a85cccda9dd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/vi/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/vi/thunderbird-78.13.0.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "4aa063fd673684488c9565ca7f35b8b6aa2c944cec921131de8ac2dd483b5b8c"; sha256 = "67a733ec644060ca58673dccf1e4e534bb1e17f7f40e0c248e6f666450ad8b07";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/zh-CN/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-CN/thunderbird-78.13.0.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "78fd8d25250632336c574b4d02a9c397d2a01d91660a17a3dedc98155cce84d1"; sha256 = "324c6f5c203b9ecc050bce51cf657785c7129251130efbe9f216540bbd32438c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/zh-TW/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-TW/thunderbird-78.13.0.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha256 = "724451f25a3e45cc23a277c4d1bf3ce76457d883d43b5a5f172340e6d8e81f41"; sha256 = "e2df519a3fdfe586edac6ffb9496637df8d6ab3ba93c51c7ee979cd4b901a1e5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/af/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/af/thunderbird-78.13.0.tar.bz2";
locale = "af"; locale = "af";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "6ee9ef2596d099bed0962199cf95bae3f8ce322cbc2d9d78195c1caa661297d2"; sha256 = "1228035980663d4712877ccbef838522ce8e7c80d04598bc37f42972f6b01b12";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ar/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ar/thunderbird-78.13.0.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "dfa41ea4a15f074b2530b8e8383b76617e1a916344567e30dcc370660f0ab05a"; sha256 = "1b4950bc1227ae4e38da2db53a381609eb836afb4ee14dd23e7f1d93db58718d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ast/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ast/thunderbird-78.13.0.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "602d1ee72a11a88004236572cb2fa22fdd86cbda81a74f89342e8371a295a140"; sha256 = "ad399d8ec5e48ee79470018df8db138791e4207156f3f7c818d24a9688b83ae4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/be/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/be/thunderbird-78.13.0.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "1e7d385da89801d9a949fef16de5904314e6e012a2693a936c122e9b8276b267"; sha256 = "00c324154a4d2cfcd1399dec6dea9d60812c89ffb7fa7d8ad0caa699a2826f9f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/bg/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/bg/thunderbird-78.13.0.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e8c52029a88272d3371c42cdab8d8fd97d8a816032377d22285154686a557f08"; sha256 = "f3b88a019536ca8446600d5f5b35ce5d35d5dc483ae63437d2ee0ed9a8696426";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/br/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/br/thunderbird-78.13.0.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "49d0c56d04033da26b9e73cce83e7de55755b269e2c15003537c2cc53d1e57c1"; sha256 = "d76b6774e0ca7e25687fe25936f81e80167dca6b7ef1a2cd1248be71e2bb3abd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ca/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ca/thunderbird-78.13.0.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "c31cc0421858f4a31840d6924882ed692db260e66c16b4c916d82e2eb07ec229"; sha256 = "d1a0da69ebf33a8d96110133fe91fd7799e95f303b55aec750d8a3b5ad395e49";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cak/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cak/thunderbird-78.13.0.tar.bz2";
locale = "cak"; locale = "cak";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "5be14239cea98b350a05230efb5e15dbac7bb530f1c3f2b7f17c12b0d2ff75ba"; sha256 = "b61a9548b72fdf5e3211cf238129a17df3d8b3fdf76da3aa06cf83ff9ba43b7e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cs/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cs/thunderbird-78.13.0.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "51260bbdeebf1cc18b7d36ad2a302841b29eee797d096ef033b5be03162177ad"; sha256 = "605b02fcbc6b1aafa261cbad5aa12d85342f9f9d9458b4a154ee23bbbc91d49b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cy/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cy/thunderbird-78.13.0.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "8c6e1fce7834da9a3a820bcb9df6a27f77c132f0c513ed074c24af9de8858798"; sha256 = "af5bf08dd943334629f60fe139392dfc957bae073bc50ec4e10bdace08b2fe1a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/da/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/da/thunderbird-78.13.0.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "fabc99558863a646565eff20badf08805e2460e541a3907fab9c6b029dadc0de"; sha256 = "ac1e4082bc78248ca1dc8760cf71901fc0e0e537b92e7dadb9af5ac9c80c49f8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/de/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/de/thunderbird-78.13.0.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "dc6d7c639e6e9b3ef9f4c13054ec543ed1ec6d789ae2c5e0fce5650c7fa7932b"; sha256 = "a26ba23ae9eeaeba09d2a9fbb4fecbe87e6b5662488d7c0dded0fee89cbb5107";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/dsb/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/dsb/thunderbird-78.13.0.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "86edac99d1e2a8da228718f2fd78448948e207e3398f781ddec43d4c9ac9e425"; sha256 = "775d9f85cc392e2c219e2c19800d4fba8aba1762e1c7b3a2f328dc61925b9638";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/el/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/el/thunderbird-78.13.0.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "0113409e306300aa4bbc9dacdd85ca52e5d71ca52962ff4628a96c4103337a1b"; sha256 = "d11d1c2b09d8f9e55dee43e19d64157cf040865729eb2986dbe8aeca8fabfa6f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-CA/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-CA/thunderbird-78.13.0.tar.bz2";
locale = "en-CA"; locale = "en-CA";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "1e792a76d371479abd43bdfb993cada3b23fbb547cfadf691b25f51cacf4265e"; sha256 = "14691fa34a7ced54eec6a7485a5258af4934e0f07cc612588698e88fd624a07a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-GB/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-GB/thunderbird-78.13.0.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "596ccfcaee2a005ea2ee0a93f9644666a5e7e955e22b799bf91766908dac7db9"; sha256 = "919b63cd0018df0913d9f230d36e5d8124bef5afe9d224072eaa1d40dc45fa28";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-US/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-US/thunderbird-78.13.0.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "97fcb2332b1343f9b5e06efff7ea5a73c80212512ac2b2959537d1e255a8ce44"; sha256 = "1fc8e76d7840ec8fccdabe4765e72555e75e027d47359e7a3f2fb092a30d2673";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/es-AR/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-AR/thunderbird-78.13.0.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "0af5917c4828c08425709f0fc3aca7c74668ece53721666d6e4004b637469b17"; sha256 = "0c38fe5f220b3ed9f096c026e05ebfb195bf6c545e2041fd5d1f84e95bc2c238";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/es-ES/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-ES/thunderbird-78.13.0.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "6283c85e34f6ab7d25fdebb5ed70b1d26c601b3416cef45cc8f06a15e723d9b7"; sha256 = "db0dcd82200922451b79a00ad7660ad2e1df6a2abb84ea4ff7ebdc73a751c068";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/et/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/et/thunderbird-78.13.0.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ab1cefeb07ead51998a7f54befb0a291c065d8a0d440a6d2c7972fa64f345948"; sha256 = "a3c802a85f607d85c97e955c45ba4e35842da4bc5bebc6dd43407c6aea546d65";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/eu/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/eu/thunderbird-78.13.0.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "f4ce3787e3cd46c8bcadbc6ab2a728e3b76ee2556ad5e4129e4418e844a8c4e6"; sha256 = "3bc5f4ceb596334fb9a570be31807898efe3684441fe9a9f96a28d16d4269864";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fa/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fa/thunderbird-78.13.0.tar.bz2";
locale = "fa"; locale = "fa";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "35da798ea7f613489820e4e42b1c78c078c21ee7f7521ef5ba21a7602fb302ae"; sha256 = "eba6a5b4bd14860d97a71c7eabcd893c733ae52ebc5e06c9e12afda86552d35a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fi/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fi/thunderbird-78.13.0.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "dd97b6c745b88a6493d280e5efc2165bc5895ec7ac56c1df63d7adcb860eec59"; sha256 = "77d8335a6c5fb8e302cc5a4490f6248e51e555e5d5c428116557b0cb560f2b14";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fr/thunderbird-78.13.0.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9d49108417933e1f79a285b99cf0e49f6a009a121084148da70f4cf93a238c34"; sha256 = "2fce215ad23039c43624e897353b8b696eff73281c0739050ca5621b1ad209c2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fy-NL/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fy-NL/thunderbird-78.13.0.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "efe33dbc8d7c6347359d30c63034a3553720ac806c1754752b0649d91ce293a4"; sha256 = "1c670d870e6e9cc1366467d0c0acfab98a83842442bcd3b7b2bb1d302c2cf331";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ga-IE/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ga-IE/thunderbird-78.13.0.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "c99c54902c522ec9472ed6ea4a85e6be9dd0e013a2835a38d90b4b77554c05dc"; sha256 = "77207016b5cd5204c9dcf849ec099c5bdf3bee4d79ec8ecde2cf61dc6719fb8c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/gd/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gd/thunderbird-78.13.0.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "af46f3aa8480469783a625553688f7ef5ff00bdcd9be9c98af7d49f98e8cba7e"; sha256 = "5ee8c00cd937b9e7c62b13c594db9138b9550ddefa0c38127f7636cdaea7e420";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/gl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gl/thunderbird-78.13.0.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "bdf94938571db3959781b490fc74aaf1a48b42663b22ae32dfab97600772be0c"; sha256 = "2fe3765c8dcbb2a281f7de1ae481a9f725c2df785552d840e1f65f922e94d42e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/he/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/he/thunderbird-78.13.0.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "1e9f6f580751bcf518813a123a0e1f2f66cee92110516867b4844bbcaa2fa67f"; sha256 = "f63094c0bc5cdbdf0640d9281e52bcdbab517f3d72f84e4a01a120c148f39ea0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hr/thunderbird-78.13.0.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "a6727dce9ac4074ed5685086f224cc956eacf04b3aa54fc4b7d669e2d3a548e2"; sha256 = "0740acd2e924fb424790a806e2fef66ad43cf53e43fbaa87ac984225616b6167";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hsb/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hsb/thunderbird-78.13.0.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "16f985d7c4520bd81bc1e5a8e939a2ce97e807ab0635625d38290b073defa79d"; sha256 = "bf6d4d7230d55ec1ddb7fb9764fc182dc8468bf57663661ef7e87d0762080900";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hu/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hu/thunderbird-78.13.0.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9e7c771cd0dfd8dd1b42721f9129d1fdd760c2d3f7bce407adec6c4f3e0fc955"; sha256 = "a4d9f65e964787fba470c0a091edbe7a21e667ab80e1f7dd1fc76290230aa721";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hy-AM/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hy-AM/thunderbird-78.13.0.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4a5878d9be7d0b60347a19c2533fe22ff0f02aeb5228070ecdc1bb5bd0ca5490"; sha256 = "9718afe2417006bda611b12c42ed2dc74d397cbd6703d86ca758119535226d0f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/id/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/id/thunderbird-78.13.0.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "80bb061ed6efa9396627bb05ef26247e92b49fe50787e04add488cc3c69c5304"; sha256 = "d3b9d86bddb1ed6db4a4e6456d09295d057da47aed4ad23a95021f3a2aa38ec4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/is/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/is/thunderbird-78.13.0.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4d96a6de273846f133a307967e4d96f6594c8f4fdd6c16efd39f10bd5121cf60"; sha256 = "e2dc5cf9120dcaa54516393b9b14659b24a43a86809b3113724cc0480dad7a71";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/it/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/it/thunderbird-78.13.0.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "f10c633cd2ab40a4845fe7c681094bbe18b2d0240c10d77ab2e47c633e10baaf"; sha256 = "66c24020386335156d2659f70570f798982f2cf36014fbb8b866f1e3870b9dcb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ja/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ja/thunderbird-78.13.0.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b97a41e3e48c29f60aa22e9ce98bb4bab641ba633877d3086e92d1904bc7e34a"; sha256 = "ece2f1660ef41a31ae4116a32b9b025547a419fcbd8612d1a36d9bc0b9e821af";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ka/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ka/thunderbird-78.13.0.tar.bz2";
locale = "ka"; locale = "ka";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "c2a0bdf08c8ae9f5ca5df56eef07331834d52d4d8fefbe87e3f5f7bd31f83457"; sha256 = "b549016df313c46518ee50c03b7f075c78feefeaadfd5a5c0ec2508d0607d999";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/kab/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kab/thunderbird-78.13.0.tar.bz2";
locale = "kab"; locale = "kab";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4475c84a76bf254c6126384c15bb9721750cb935b2ab49b4825bc1d2c9552cc4"; sha256 = "c56fe1f7051a47c05834a7378313b24fe8fdbbd816692dcaeefaf3635f09eab9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/kk/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kk/thunderbird-78.13.0.tar.bz2";
locale = "kk"; locale = "kk";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "5e74e269de716b9239dd45254d660679f8cacba3264aab7565be68c16143bf40"; sha256 = "86594f4e1d92d495c76bbe20cadeb3bea74d5f57a4b3155edd01ff4f62c5f1a5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ko/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ko/thunderbird-78.13.0.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b40047124044f3ba15f08526c1898f12d88e186f422202ce3aab1ee0f23cd0c7"; sha256 = "47c8cb4a58643c56f005fa36b0790344546f5efad5446c2b5b49040906eb9339";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/lt/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/lt/thunderbird-78.13.0.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "f7bb95f825b8aa20f40851fd0e99ac1574e26f2a5c69dd7bfdc2f865a11051b5"; sha256 = "e3afe316e77d4c33e936574f32c3d477643b51fd0f0f228d52cce676c8ab4f82";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ms/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ms/thunderbird-78.13.0.tar.bz2";
locale = "ms"; locale = "ms";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "473ea13ae580d09237a04e08331d883eff6c419d61f0ba1afaa1c5a948da98b8"; sha256 = "626dd1acb63356a2f531095833b0e697231009f5b0c51f401a17e8551b21a32d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nb-NO/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nb-NO/thunderbird-78.13.0.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "efe8ac1e38a085caec95b817548c5cc06f45aac03bee5545cb65b93eb19efbf7"; sha256 = "fe236ce5d719b3ac205f47ab4837ea3ad5d6f2817c44e2e562b0a011480a91ce";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nl/thunderbird-78.13.0.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "a646a84098185d299118305c651788bef0a88f805b08ff51bcc87067a5460c06"; sha256 = "33fb2a46384f38e887575297ad495eaaea0ff0910b59cc05ea4512dd9498b9eb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nn-NO/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nn-NO/thunderbird-78.13.0.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "14b765aa23671318b6356886f3bee0847570158c4215e0d106bc823df045414b"; sha256 = "5e724e31b26ae96a0b535495dd10b77c954a5a043e0353fd17962601ec042e3c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pa-IN/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pa-IN/thunderbird-78.13.0.tar.bz2";
locale = "pa-IN"; locale = "pa-IN";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ddc9dae4e4f7a9cd99d8e2e5041ac52432b6835f7b6e0867bc7ea2ff7283ba95"; sha256 = "ee1db2f6e9000ff4ca6ba4fd4b758109ea0f94d066fad9c20020e75935f5fc05";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pl/thunderbird-78.13.0.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "396373ad618f35be40c79f1e67ba67f1e72dbb2ee250459f610cc1ad2b7bd2c4"; sha256 = "b09d9c4655b4c32b9554b83fdd2b2635586b9d8f669ec39f5722e7ac8175b79e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pt-BR/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-BR/thunderbird-78.13.0.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "0e62406a68fc33d7c77b10c2ae427c508ee491e33041be114b03c4eb630e8003"; sha256 = "f774513c0c23794c69112b962999512485beaa2a97517b06e335e4fce5b23d9a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pt-PT/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-PT/thunderbird-78.13.0.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ba8e89a5a15fe69660758a83e3801800d1a15ab051d8ee581dd1b97b6a67ddd0"; sha256 = "39f0f2fd17ea216acc5383f3c65e4da8928d56e4b8bdf2d1bb76d6dfc8491ec1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/rm/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/rm/thunderbird-78.13.0.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "ac9705e6c64093d375db018116f66792eadef36fa32919bc467a0d08ed20fadc"; sha256 = "3a966692544873281adf12a850ae904e1304ce08d8bd09ede0ad8b0cf66b5f09";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ro/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ro/thunderbird-78.13.0.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "4fdcb748d23044effd6fe4e94c525381e2dce3941c1829625c84eab795dc4797"; sha256 = "4514976e0a5d433b64fc28e42f3baca52e871f7c99434e2993984dda9025b370";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ru/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ru/thunderbird-78.13.0.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "63f0d9be0baa91b3a65189ce9bee01d5984e04eba319484c69560cd10af750e9"; sha256 = "97915e34bbbf036fbe8093bdf79a426181c57b78bd8d8b7f99b97fd1c3dceb7c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/si/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/si/thunderbird-78.13.0.tar.bz2";
locale = "si"; locale = "si";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "db371618474a3812c641d9518f04035c353c9e184b91f713d9b70f09b693f6d0"; sha256 = "e27e823a4a6141141b92c2c1c55cd77e591d3e2b05d0fa6cc9502b4bc21e67a8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sk/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sk/thunderbird-78.13.0.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "6b5370c99076c0955e3b3fb58be9649656fd12a32126a4bf2d54d51e9147c7c5"; sha256 = "ff4d89bc1e0ae8d10dc8dcf377c4b3c45ab1db38c0489ca328e0a8f3145772c6";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sl/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sl/thunderbird-78.13.0.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "5c5ef16ae617f18f4ad4774bda932d8858c35d6ef6e61a5bd1c730564193bedb"; sha256 = "27d34b8508afa306d6ce94e73a2251071cf4480c5f55cc087597e56511e85173";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sq/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sq/thunderbird-78.13.0.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "e8462127bcfdfec2b651b11d569918e7ffff37c7ab0b556c10434273e59b43d9"; sha256 = "3fb60c21d42ae9a961838081c12eea7e98e43a27ebc24ef7470e912bf13053ca";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sr/thunderbird-78.13.0.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9fe5e0091ebb9d3b0d07a6cc6dcb167b7608b0acc7ef5a5e24604e8d007001f5"; sha256 = "dab84cca4db8412b3ce40690e7b31df1d66b06979cb39f4efd8206684a802edc";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sv-SE/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sv-SE/thunderbird-78.13.0.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "1b6d4b29e53b933418ba25b8284d62d218076b1dde09006e0508a060190b81ca"; sha256 = "cec350da20515ca0e5b317264e3969e1465e9d055de743c130c4011d5f3cc825";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/th/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/th/thunderbird-78.13.0.tar.bz2";
locale = "th"; locale = "th";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "68a90653d02c8b9f022b52693884f5bce8d60bb89c5099784347dd9c9e578c87"; sha256 = "0a8302af0995624d37c71757c851e8ba3ffdcbe89d90023c69c5f69a6ec888b7";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/tr/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/tr/thunderbird-78.13.0.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9776f2eceb7bfc15292d621d874a7fa3f092223752b81b65623a3294044022d0"; sha256 = "8c7013e71cd57795f0bddc5061b24e43fcd5b1f23abc7c1653ad345869d73b24";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/uk/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uk/thunderbird-78.13.0.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9c3dde23f775176780ff24d89d46659b293b22cee45df9a2dcf1bf3f8257c19c"; sha256 = "ed9a30630c0821b515a2984257d6dc19410ca1f6a723e856bfe8758ad32b11f1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/uz/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uz/thunderbird-78.13.0.tar.bz2";
locale = "uz"; locale = "uz";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "b2d9d4b3e43fe3af5c602c4b429d4fb29461ace04498cf14b0f75fba7ea0c667"; sha256 = "b834c2f59b3945a362d1ace0dd5b6275a1ba90587c8fcb894678a188301f3848";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/vi/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/vi/thunderbird-78.13.0.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "c2c7a721d82ad59022020cad3dd152271a83207fbd0f61b91d3c464aed16bcaf"; sha256 = "9f724e2c2e3faf0ad1d1ac6d08f8bc595ad16b408d7e712e3fc2f51b3d6f2a95";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/zh-CN/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-CN/thunderbird-78.13.0.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "9e26860c8d78d13fffcc9eb418fb4d34a7da07b5604f8d01eddc10471e57dd70"; sha256 = "7c8f7982d035bebf250542232d782834709becd60c766e6bd85a617bc6a443bd";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/zh-TW/thunderbird-78.12.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-TW/thunderbird-78.13.0.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-i686"; arch = "linux-i686";
sha256 = "403ab2f3262ce3e79d2261ca2afd8ddca98c116086dda620bbe54c45d2111632"; sha256 = "a4c90eb3a5bf2fcd04b40b60e976accda049d10666e487f477c8d154c8928be5";
} }
]; ];
} }

View file

@ -74,13 +74,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "thunderbird"; pname = "thunderbird";
version = "78.12.0"; version = "78.13.0";
src = fetchurl { src = fetchurl {
url = url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = sha512 =
"8a9275f6a454b16215e9440d8b68926e56221dbb416f77ea0cd0a42853bdd26f35514e792564879c387271bd43d8ee966577f133f8ae7781f43e8bec9ab78696"; "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,46 @@
{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem, unzip }:
stdenv.mkDerivation rec {
pname = "logisim-evolution";
version = "3.5.0";
src = fetchurl {
url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar";
sha256 = "1r6im4gmjbnckx8jig6bxi5lxv06lwdnpxkyfalsfmw4nybd5arw";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper copyDesktopItems unzip ];
desktopItems = [
(makeDesktopItem {
name = pname;
desktopName = "Logisim-evolution";
exec = "logisim-evolution";
icon = "logisim-evolution";
comment = meta.description;
categories = "Education;";
})
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src"
unzip $src resources/logisim/img/logisim-icon.svg
install -D resources/logisim/img/logisim-icon.svg $out/share/pixmaps/logisim-evolution.svg
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/logisim-evolution/logisim-evolution";
description = "Digital logic designer and simulator";
maintainers = with maintainers; [ angustrau ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }: { lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ginac-1.8.0"; name = "ginac-1.8.1";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2"; url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "0l9byzfxq3f9az5pcdldnl95ws8mpirkqky46f973mvxi5541d24"; sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as=";
}; };
propagatedBuildInputs = [ cln ]; propagatedBuildInputs = [ cln ];

View file

@ -13,11 +13,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gitkraken"; pname = "gitkraken";
version = "7.7.1"; version = "7.7.2";
src = fetchzip { src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-nFXj40PfHctymBcZoiJNzkvAsFnABD300/aUqNpUn2c="; sha256 = "sha256-jL0XLw0V0ED+lDBn3sGaJmm96zQwXue333UuYGHjB64=";
}; };
dontBuild = true; dontBuild = true;

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ccextractor"; pname = "ccextractor";
version = "0.91"; version = "0.92";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CCExtractor"; owner = "CCExtractor";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-VqJQaYzH8psQJfnDariV4q7SkDiXRz9byR51C8DzVEs="; sha256 = "sha256-cEC0SF69CDLKQyTPIOZYPgxNR29mJVnzOZraGvPQjdg=";
}; };
sourceRoot = "source/src"; sourceRoot = "source/src";

View file

@ -472,7 +472,7 @@ stdenv.mkDerivation {
+ optionalString hostPlatform.isCygwin '' + optionalString hostPlatform.isCygwin ''
hardening_unsupported_flags+=" pic" hardening_unsupported_flags+=" pic"
'' + optionalString targetPlatform.isMinGW '' '' + optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector" hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString targetPlatform.isAvr '' '' + optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic" hardening_unsupported_flags+=" stackprotector pic"
'' + optionalString (targetPlatform.libc == "newlib") '' '' + optionalString (targetPlatform.libc == "newlib") ''

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel
, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , sassc, inkscape, libxml2, glib, gtk_engines, gtk-engine-murrine
, cinnamonSupport ? true , cinnamonSupport ? true
, gnomeFlashbackSupport ? true , gnomeFlashbackSupport ? true
, gnomeShellSupport ? true , gnomeShellSupport ? true
@ -19,17 +19,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "plata-theme"; pname = "plata-theme";
version = "0.9.8"; version = "0.9.9";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "tista500"; owner = "tista500";
repo = "plata-theme"; repo = "plata-theme";
rev = version; rev = version;
sha256 = "1sqmydvx36f6r4snw22s2q4dvcyg30jd7kg7dibpzqn3njfkkfag"; sha256 = "1iwvlv9qcrjyfbzab00vjqafmp3vdybz1hi02r6lwbgvwyfyrifk";
}; };
preferLocalBuild = true;
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkg-config pkg-config
@ -37,17 +35,16 @@ stdenv.mkDerivation rec {
sassc sassc
inkscape inkscape
libxml2 libxml2
glib.dev glib
] ]
++ lib.optionals mateSupport [ gtk3 marco ] ++ lib.optionals mateSupport [ gtk3 marco ]
++ lib.optional telegramSupport zip; ++ lib.optional telegramSupport zip;
buildInputs = [ buildInputs = [ gtk_engines ];
gdk-pixbuf
librsvg
];
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [
gtk-engine-murrine
];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fennel"; pname = "fennel";
version = "0.9.2"; version = "0.10.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~technomancy"; owner = "~technomancy";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1kpm3lzxzwkhxm4ghpbx8iw0ni7gb73y68lsc3ll2rcx0fwv9303"; sha256 = "sha256-/xCnaDNZJTBGxIgjPUVeEyMVeRWg8RCNuo5nPpLrJXY=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,6 +1,4 @@
{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }: { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx }:
assert stdenv.hostPlatform.isUnix -> upx != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vlang"; pname = "vlang";
@ -25,16 +23,15 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glfw freetype openssl ] propagatedBuildInputs = [ glfw freetype openssl ]
++ lib.optional stdenv.hostPlatform.isUnix upx; ++ lib.optional stdenv.hostPlatform.isUnix upx;
buildPhase = '' nativeBuildInputs = [ makeWrapper ];
runHook preBuild
cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS makeFlags = [
# vlang seems to want to write to $HOME/.vmodules, "local=1"
# so lets give it a writable HOME "VC=${vc}"
HOME=$PWD ./v -prod self # vlang seems to want to write to $HOME/.vmodules , so lets give
# Exclude thirdparty/vschannel as it is windows-specific. # it a writable HOME
find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} $LDFLAGS ';' "HOME=$TMPDIR"
runHook postBuild ];
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -43,6 +40,7 @@ stdenv.mkDerivation rec {
cp -r {cmd,vlib,thirdparty} $out/lib cp -r {cmd,vlib,thirdparty} $out/lib
mv v $out/lib mv v $out/lib
ln -s $out/lib/v $out/bin/v ln -s $out/lib/v $out/bin/v
wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
runHook postInstall runHook postInstall
''; '';

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "dyncall"; pname = "dyncall";
version = "1.2"; version = "1.2";
src = fetchurl { src = fetchurl {
url = "https://www.dyncall.org/r1.2/dyncall-1.2.tar.gz"; url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz";
# https://www.dyncall.org/r1.2/SHA256 # https://www.dyncall.org/r1.2/SHA256
sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc="; sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc=";
}; };

View file

@ -406,6 +406,7 @@ stdenv.mkDerivation rec {
(enableFeature (zlib != null) "zlib") (enableFeature (zlib != null) "zlib")
(enableFeature (isLinux && vulkan-loader != null) "vulkan") (enableFeature (isLinux && vulkan-loader != null) "vulkan")
(enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang") (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang")
(enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient")
#(enableFeature (zvbi != null && gplLicensing) "libzvbi") #(enableFeature (zvbi != null && gplLicensing) "libzvbi")
/* /*
* Developer flags * Developer flags

View file

@ -0,0 +1,76 @@
{ stdenv
, fetchgit
, lib
, meson
, ninja
, pkg-config
, boost
, gnutls
, openssl
, libevent
, lttng-ust
, gst_all_1
, gtest
, graphviz
, doxygen
, python3
, python3Packages
}:
stdenv.mkDerivation {
pname = "libcamera";
version = "unstable-2021-06-02";
src = fetchgit {
url = "git://linuxtv.org/libcamera.git";
rev = "143b252462b9b795a1286a30349348642fcb87f5";
sha256 = "0mlwgd3rxagzhmc94lnn6snriyqvfdpz8r8f58blcf16859galyl";
};
postPatch = ''
patchShebangs utils/
'';
buildInputs = [
# IPA and signing
gnutls
openssl
boost
# gstreamer integration
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
# cam integration
libevent
# lttng tracing
lttng-ust
];
nativeBuildInputs = [
meson
ninja
pkg-config
python3
python3Packages.jinja2
python3Packages.pyyaml
python3Packages.ply
python3Packages.sphinx
gtest
graphviz
doxygen
];
mesonFlags = [ "-Dv4l2=true" "-Dqcam=disabled" ];
# Fixes error on a deprecated declaration
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
meta = with lib; {
description = "An open source camera stack and framework for Linux, Android, and ChromeOS";
homepage = "https://libcamera.org";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ citadelcore ];
};
}

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnbd"; pname = "libnbd";
version = "1.9.2"; version = "1.9.3";
src = fetchurl { src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
hash = "sha256-UDLH5IMuKI6mAO/9VNmI8pCbxv94tCCQYRKZn2DBclg="; hash = "sha256-qF9IFZGj+9Zuw00+9pbgAhBUk+eUIAxhYNJAMWxmWo0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libsodium"; pname = "libsodium";
@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch;
nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook;
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -0,0 +1,15 @@
diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac
--- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400
+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400
@@ -217,11 +217,6 @@
AC_CHECK_DEFINE([__wasi__], [WASI="yes"], [])
-AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
-])
-
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
[CFLAGS="$CFLAGS -fvisibility=hidden"])

View file

@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch"; url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch";
sha256 = "1v6ashqzpr0xidxq0vpkjd8wd66cj8df01kyzj678ljzcrax35hk"; sha256 = "1v6ashqzpr0xidxq0vpkjd8wd66cj8df01kyzj678ljzcrax35hk";
}) })
(fetchurl {
name = "0002-CVE-2021-20314.patch";
url = "https://github.com/shevek/libspf2/commit/c37b7c13c30e225183899364b9f2efdfa85552ef.patch";
sha256 = "190nnh7mlz6328829ba6jajad16s3md8kraspn81qnvhwh0nkiak";
})
]; ];
postPatch = '' postPatch = ''

View file

@ -1,13 +1,26 @@
{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, readline, { stdenv
fetchFromGitHub, lib, , cmake
multimediaSupport ? true , pkg-config
, pandoc
, libunistring
, ncurses
, ffmpeg
, readline
, fetchFromGitHub
, lib
, multimediaSupport ? true
}: }:
let
version = "2.3.8"; stdenv.mkDerivation rec {
in
stdenv.mkDerivation {
pname = "notcurses"; pname = "notcurses";
inherit version; version = "2.3.8";
src = fetchFromGitHub {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E=";
};
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -16,20 +29,11 @@ stdenv.mkDerivation {
buildInputs = [ libunistring ncurses readline ] buildInputs = [ libunistring ncurses readline ]
++ lib.optional multimediaSupport ffmpeg; ++ lib.optional multimediaSupport ffmpeg;
cmakeFlags = cmakeFlags = [ "-DUSE_QRCODEGEN=OFF" ]
[ "-DUSE_QRCODEGEN=OFF" ]
++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none"; ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none";
src = fetchFromGitHub { meta = with lib; {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E=";
};
meta = {
description = "blingful TUIs and character graphics"; description = "blingful TUIs and character graphics";
longDescription = '' longDescription = ''
A library facilitating complex TUIs on modern terminal emulators, A library facilitating complex TUIs on modern terminal emulators,
supporting vivid colors, multimedia, and Unicode to the maximum degree supporting vivid colors, multimedia, and Unicode to the maximum degree
@ -39,11 +43,9 @@ stdenv.mkDerivation {
It is not a source-compatible X/Open Curses implementation, nor a It is not a source-compatible X/Open Curses implementation, nor a
replacement for NCURSES on existing systems. replacement for NCURSES on existing systems.
''; '';
homepage = "https://github.com/dankamongmen/notcurses"; homepage = "https://github.com/dankamongmen/notcurses";
license = licenses.asl20;
license = lib.licenses.asl20; platforms = platforms.all;
platforms = lib.platforms.all; maintainers = with maintainers; [ jb55 ];
maintainers = with lib.maintainers; [ jb55 ];
}; };
} }

View file

@ -2,13 +2,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "portmidi"; pname = "portmidi";
version = "217"; version = "234";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/portmedia/portmidi-src-${version}.zip"; url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip";
sha256 = "03rfsk7z6rdahq2ihy5k13qjzgx757f75yqka88v3gc0pn9ais88"; sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp";
}; };
prePatch = ''
cd portmidi/trunk
'';
cmakeFlags = let cmakeFlags = let
#base = "${jdk}/jre/lib/${jdk.architecture}"; #base = "${jdk}/jre/lib/${jdk.architecture}";
in [ in [

View file

@ -12,17 +12,17 @@ index 4919b78..758eccb 100644
if(UNIX) if(UNIX)
diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
index e171047..aafa09c 100644 index cbeeade..f765430 100644
--- a/pm_common/CMakeLists.txt --- a/pm_common/CMakeLists.txt
+++ b/pm_common/CMakeLists.txt +++ b/pm_common/CMakeLists.txt
@@ -22,7 +22,7 @@ else(APPLE OR WIN32) @@ -22,7 +22,7 @@ else(APPLE OR WIN32)
endif(APPLE OR WIN32) endif(APPLE OR WIN32)
if(APPLE) if(APPLE)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk CACHE - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE
+ set(CMAKE_OSX_SYSROOT / CACHE + set(CMAKE_OSX_SYSROOT / CACHE
PATH "-isysroot parameter for compiler" FORCE) PATH "-isysroot parameter for compiler")
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE) STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
@@ -54,10 +54,6 @@ if(UNIX) @@ -54,10 +54,6 @@ if(UNIX)

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spglib"; pname = "spglib";
version = "1.16.1"; version = "1.16.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "atztogo"; owner = "atztogo";
repo = "spglib"; repo = "spglib";
rev = "v${version}"; rev = "v${version}";
sha256 = "1sk59nnar9npka4mdcfh4154ja46i35y4gbq892kwqidzyfs80in"; sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tkrzw"; pname = "tkrzw";
version = "0.9.3"; version = "0.9.51";
# TODO: defeat multi-output reference cycles # TODO: defeat multi-output reference cycles
src = fetchurl { src = fetchurl {
url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz";
sha256 = "1ap93fsw7vhn329kvy8g20l8p4jdygfl8r8mrgsfcpa20a29fnwl"; hash = "sha256-UqF2cJ/r8OksAKyHw6B9UiBFIXgKeDmD2ZyJ+iPkY2w=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -34,7 +34,7 @@ ansicolors = buildLuarocksPackage {
version = "1.0.2-3"; version = "1.0.2-3";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/ansicolors-1.0.2-3.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ansicolors-1.0.2-3.src.rock";
sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -94,7 +94,7 @@ binaryheap = buildLuarocksPackage {
version = "0.4-1"; version = "0.4-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/binaryheap-0.4-1.src.rock";
sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -175,7 +175,7 @@ compat53 = buildLuarocksPackage {
version = "0.7-1"; version = "0.7-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/compat53-0.7-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/compat53-0.7-1.src.rock";
sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb";
}; };
disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
@ -194,7 +194,7 @@ cosmo = buildLuarocksPackage {
version = "16.06.04-1"; version = "16.06.04-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/cosmo-16.06.04-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.src.rock";
sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww";
}; };
propagatedBuildInputs = [ lpeg ]; propagatedBuildInputs = [ lpeg ];
@ -278,7 +278,7 @@ digestif = buildLuarocksPackage {
version = "0.2-1"; version = "0.2-1";
src = fetchurl { src = fetchurl {
url = "mirror://luarocks/digestif-0.2-1.src.rock"; url = "https://luarocks.org/digestif-0.2-1.src.rock";
sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd";
}; };
disabled = (luaOlder "5.3"); disabled = (luaOlder "5.3");
@ -326,6 +326,37 @@ fifo = buildLuarocksPackage {
}; };
}; };
gitsigns-nvim = buildLuarocksPackage {
pname = "gitsigns.nvim";
version = "scm-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/gitsigns.nvim-scm-1.rockspec";
sha256 = "12cl4dpx18jrdjfzfk8mckqgb52fh9ayikqny5rfn2s4mbn9i5lj";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "git://github.com/lewis6991/gitsigns.nvim",
"rev": "083dc2f485571546144e287c38a96368ea2e79a1",
"date": "2021-08-09T21:58:59+01:00",
"path": "/nix/store/1kwvlcshbbk31i4pa3s9gx8znsh9nwk2-gitsigns.nvim",
"sha256": "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w",
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
disabled = (lua.luaversion != "5.1");
propagatedBuildInputs = [ lua plenary-nvim ];
meta = with lib; {
homepage = "http://github.com/lewis6991/gitsigns.nvim";
description = "Git signs written in pure lua";
license.fullName = "MIT/X11";
};
};
http = buildLuarocksPackage { http = buildLuarocksPackage {
pname = "http"; pname = "http";
version = "0.3-0"; version = "0.3-0";
@ -350,7 +381,7 @@ inspect = buildLuarocksPackage {
version = "3.1.1-0"; version = "3.1.1-0";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.src.rock";
sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -422,7 +453,7 @@ lgi = buildLuarocksPackage {
version = "0.9.2-1"; version = "0.9.2-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.src.rock";
sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -440,7 +471,7 @@ linenoise = buildLuarocksPackage {
version = "0.9-1"; version = "0.9-1";
knownRockspec = (fetchurl { knownRockspec = (fetchurl {
url = "https://luarocks.org/linenoise-0.9-1.rockspec"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/linenoise-0.9-1.rockspec";
sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4";
}).outPath; }).outPath;
@ -483,7 +514,7 @@ lpeg = buildLuarocksPackage {
version = "1.0.2-1"; version = "1.0.2-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.src.rock";
sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -537,7 +568,7 @@ lpty = buildLuarocksPackage {
version = "1.2.2-1"; version = "1.2.2-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/lpty-1.2.2-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock";
sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -744,7 +775,7 @@ lua-resty-http = buildLuarocksPackage {
version = "0.16.1-0"; version = "0.16.1-0";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/lua-resty-http-0.16.1-0.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-http-0.16.1-0.src.rock";
sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj"; sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -923,7 +954,7 @@ lua_cliargs = buildLuarocksPackage {
version = "3.0-2"; version = "3.0-2";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/lua_cliargs-3.0-2.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock";
sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -1377,7 +1408,7 @@ luautf8 = buildLuarocksPackage {
version = "0.1.3-1"; version = "0.1.3-1";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/luautf8-0.1.3-1.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.src.rock";
sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48"; sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -1432,7 +1463,7 @@ luv = buildLuarocksPackage {
version = "1.30.0-0"; version = "1.30.0-0";
src = fetchurl { src = fetchurl {
url = "https://luarocks.org/luv-1.30.0-0.src.rock"; url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.30.0-0.src.rock";
sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");
@ -1588,15 +1619,15 @@ plenary-nvim = buildLuarocksPackage {
knownRockspec = (fetchurl { knownRockspec = (fetchurl {
url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; url = "https://luarocks.org/plenary.nvim-scm-1.rockspec";
sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; sha256 = "1xgqq0skg3vxahlnh1libc5dvhafp11k6k8cs65jcr9sw6xjycwh";
}).outPath; }).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{ src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "git://github.com/nvim-lua/plenary.nvim", "url": "git://github.com/nvim-lua/plenary.nvim",
"rev": "d897b4d9fdbc51febd71a1f96c96001ae4fa6121", "rev": "adf9d62023e2d39d9d9a2bc550feb3ed7b545d0f",
"date": "2021-08-03T08:49:43-04:00", "date": "2021-08-11T11:38:20-04:00",
"path": "/nix/store/nwarm7lh0r1rzmx92srq73x3r40whyw1-plenary.nvim", "path": "/nix/store/fjmpxdswkx54a1n8vwmh3xfrzjq3j5wg-plenary.nvim",
"sha256": "0rgqby4aakqamiw3ykvzhn3vd2grjkzgfxrpzjjp1ipkd2qak8mb", "sha256": "1h11a0lil14c13v5mdzdmxxqjpqip5fhvjbm34827czb5pz1hvcz",
"fetchSubmodules": true, "fetchSubmodules": true,
"deepClone": false, "deepClone": false,
"leaveDotGit": false "leaveDotGit": false

View file

@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
let param = let param =
let v6_3 = { let v6_4 = {
version = "6.3"; version = "6.4";
sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6"; sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1";
useDune2 = true; useDune2 = true;
buildInputs = [cppo]; buildInputs = [cppo];
}; in }; in
@ -27,11 +27,12 @@ let param =
"4.07" = { "4.07" = {
version = "5.1+4.06.0"; version = "5.1+4.06.0";
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
"4.08" = v6_3; "4.08" = v6_4;
"4.09" = v6_3; "4.09" = v6_4;
"4.10" = v6_3; "4.10" = v6_4;
"4.11" = v6_3; "4.11" = v6_4;
"4.12" = v6_3; "4.12" = v6_4;
"4.13" = v6_4;
}.${ocaml.meta.branch}; }.${ocaml.meta.branch};
in in

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bleach"; pname = "bleach";
version = "3.3.0"; version = "3.3.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; sha256 = "1yma53plrlw2llaqxv8yk0g5al0vvlywwzym18b78m3rm6jq6r1h";
}; };
checkInputs = [ pytest pytest-runner ]; checkInputs = [ pytest pytest-runner ];

View file

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fsspec"; pname = "fsspec";
version = "2021.06.0"; version = "2021.07.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intake"; owner = "intake";
repo = "filesystem_spec"; repo = "filesystem_spec";
rev = version; rev = version;
sha256 = "sha256-2yTjaAuORlZMACKnXkZ6QLMV2o71sPMM2O/bDPaPHD0="; hash = "sha256-I0oR7qxMCB2egyOx69hY0++H7fzCdK3ZyyzCvP3yXAs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -57,8 +57,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "fsspec" ]; pythonImportsCheck = [ "fsspec" ];
meta = with lib; { meta = with lib; {
description = "A specification that Python filesystems should adhere to";
homepage = "https://github.com/intake/filesystem_spec"; homepage = "https://github.com/intake/filesystem_spec";
description = "A specification that Python filesystems should adhere to";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };

View file

@ -15,13 +15,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hass-nabucasa"; pname = "hass-nabucasa";
version = "0.45.1"; version = "0.46.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nabucasa"; owner = "nabucasa";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-ZDPlYoLAQLXiV+LUMdu/8v3TrG5/Zz4+r4PtThrLAas="; sha256 = "109ma1qlhifj5hs530zfnvc6mqv5grfmcq3s57wawq9nzq0gpfy8";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -18,7 +18,7 @@ buildPythonPackage rec {
pytest-cov pytest-cov
]; ];
pythomImportsCheck = [ pythonImportsCheck = [
"multimethod" "multimethod"
]; ];

View file

@ -2,6 +2,7 @@
, aiohttp , aiohttp
, aresponses , aresponses
, asynctest , asynctest
, backoff
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, poetry-core , poetry-core
@ -13,19 +14,22 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyopenuv"; pname = "pyopenuv";
version = "2.0.2"; version = "2.1.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ="; sha256 = "sha256-S2X7cTArjiWOFjQGnrZ4AuhgN8t18wf9d6i9X5thRZg=";
}; };
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ aiohttp ]; propagatedBuildInputs = [
aiohttp
backoff
];
checkInputs = [ checkInputs = [
aresponses aresponses

View file

@ -1,19 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest }: { lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, pytest
}:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.5.1";
pname = "pytest-dependency"; pname = "pytest-dependency";
version = "0.5.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; hash = "sha256-wqiSkGGSZj+FAwpquRME5QjlRs3f5VfWktYexXodlGs=";
}; };
patches = [ patches = [
# Fix build with pytest 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51 # Fix build with pytest >= 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51
(fetchpatch { (fetchpatch {
url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch"; url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch";
sha256 = "0ka892j0rrlnfvk900fcph0f6lsnr9dy06q5k2s2byzwijhdw6n5"; sha256 = "sha256-xRreoIz8+yW0mAUb4FvKVlPjALzMAZDmdpbmDKRISE0=";
}) })
]; ];

View file

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "s3fs"; pname = "s3fs";
version = "2021.6.0"; version = "2021.7.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "53790061e220713918602c1f110e6a84d6e3e22aaba27b8e134cc56a3ab6284c"; hash = "sha256-KTKU7I7QhgVhfbRA46UCKaQT3Bbc8yyUj66MvZsCrpY=";
}; };
buildInputs = [ buildInputs = [
@ -32,8 +32,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "s3fs" ]; pythonImportsCheck = [ "s3fs" ];
meta = with lib; { meta = with lib; {
description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3";
homepage = "https://github.com/dask/s3fs/"; homepage = "https://github.com/dask/s3fs/";
description = "A Pythonic file interface for S3";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ teh ]; maintainers = with maintainers; [ teh ];
}; };

View file

@ -0,0 +1,70 @@
{ lib
, buildPythonPackage
, fetchPypi
, cython
, ecos
, joblib
, numexpr
, numpy
, osqp
, pandas
, scikit-learn
, scipy
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "scikit-survival";
version = "0.15.0.post0";
src = fetchPypi {
inherit pname version;
sha256 = "572c3ac6818a9d0944fc4b8176eb948051654de857e28419ecc5060bcc6fbf37";
};
nativeBuildInputs = [
cython
];
propagatedBuildInputs = [
ecos
joblib
numexpr
numpy
osqp
pandas
scikit-learn
scipy
];
pythonImportsCheck = [ "sksurv" ];
checkInputs = [ pytestCheckHook ];
# Hack needed to make pytest + cython work
# https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298
preCheck = ''
export HOME=$(mktemp -d)
cp -r $TMP/$sourceRoot/tests $HOME
pushd $HOME
'';
postCheck = "popd";
# very long tests, unnecessary for a leaf package
disabledTests = [
"test_coxph"
"test_datasets"
"test_ensemble_selection"
"test_minlip"
"test_pandas_inputs"
"test_survival_svm"
"test_tree"
];
meta = with lib; {
description = "Survival analysis built on top of scikit-learn";
homepage = "https://github.com/sebp/scikit-survival";
license = licenses.gpl3Only;
maintainers = with maintainers; [ GuillaumeDesforges ];
};
}

View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "smbprotocol"; pname = "smbprotocol";
version = "1.5.1"; version = "1.6.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jborean93"; owner = "jborean93";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ym0fvljbwgl1h7f63m3psbsvqm64fipsrrmbqb97hrhfdzxqxpa"; sha256 = "0pyjnmrkiqcd0r1s6zl8w91zy0605k7cyy5n4cvv52079gy0axhd";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "codeql"; pname = "codeql";
version = "2.5.8"; version = "2.5.9";
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip { src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-XfxzvzGiSBhPVIvdtDifKjkcGK2afWXVWul3Pah3tKo="; sha256 = "sha256-r3Jm+VYjn0Dz4BCSbADbgTWL1owbyIXlkoj6mOmZcZk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.6.1"; version = "0.6.2";
disabled = python3.pythonOlder "3.6"; disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0p5vjpfmy52hbq6mz8svvxrg9757cvgj0cbvaa0340309953ilvj"; sha256 = "sha256-N1ZIm5LsKXXu3CyqFJZd7biaIhVW1EMBLKajgSAwc0g=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
@ -28,10 +28,9 @@ python3.pkgs.buildPythonApplication rec {
pytest pytest
tblib tblib
toml toml
typing-extensions
] ++ lib.optionals (pythonOlder "3.7") [ ] ++ lib.optionals (pythonOlder "3.7") [
dataclasses dataclasses
] ++ lib.optionals (pythonOlder "3.9") [
typing-extensions
]; ];
checkInputs = with python3.pkgs; [ checkInputs = with python3.pkgs; [

View file

@ -115,13 +115,13 @@ rec {
headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y"; headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y";
}; };
electron_13 = mkElectron "13.1.8" { electron_13 = mkElectron "13.1.9" {
x86_64-linux = "a4630aadd7e510e46ffe30632a69183b240bc19db226c83fab43e998d080e0ef"; x86_64-linux = "60c7c74a5dd00ebba6d6b5081a4b83d94ac97ec5e53488b8b8a1b9aabe17fefc";
x86_64-darwin = "05c58efb89c69da53c8a512c2bd1ecb5996d996de16af3a2ed937e1f3bf126bb"; x86_64-darwin = "b897bdc42d9d1d0a49fc513c769603bff6e111389e2a626eb628257bc705f634";
i686-linux = "59e6d0d13640ee674a0b1ba96d51704eba8be1220fadf922832f6f52a72e12ec"; i686-linux = "081f08ce7ff0e1e8fb226a322b855f951d120aa522773f17dd8e5a87969b001f";
armv7l-linux = "2b62f9874b4553782e8e5c7d7b667271fe4a5916adb2074a3b56ab9076076617"; armv7l-linux = "c6b6b538d4764104372539c511921ddecbf522ded1fea856cbc3d9a303a86206";
aarch64-linux = "2071c389cff1196e3ce1be4f5b486372003335bc132a2dbf4dc3b983dd26ee52"; aarch64-linux = "9166dd3e703aa8c9f75dfee91fb250b9a08a32d8181991c1143a1da5aa1a9f20";
aarch64-darwin = "c870b31e30611a4d38557d6992bf5afe8d80f75548a427381aaf37d1d46af524"; aarch64-darwin = "a1600c0321a0906761fdf88ab9f30d1c53b53803ca33bcae20a6ef7a6761cac1";
headers = "1q5gbsxrvf2mqfm91llkzcdlqg8lkpgxqxmzfmrm7na1r01lb4hr"; headers = "1k9x9hgwl23sd5zsdrdlcjp4ap40g282a1dxs1jyxrwq1dzgmsl3";
}; };
} }

View file

@ -0,0 +1,49 @@
{ lib, stdenvNoCC, fetchurl, makeWrapper, copyDesktopItems, makeDesktopItem, unzip, imagemagick, jre }:
stdenvNoCC.mkDerivation rec {
pname = "mars-mips";
version = "4.5";
src = fetchurl {
url = "https://courses.missouristate.edu/KenVollmar/MARS/MARS_${lib.replaceStrings ["."] ["_"] version}_Aug2014/Mars${lib.replaceStrings ["."] ["_"] version}.jar";
sha256 = "15kh1fahkkbbf4wvb6ijzny4fi5dh4pycxyzp5325dm2ddkhnd5c";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper copyDesktopItems unzip imagemagick ];
desktopItems = [
(makeDesktopItem {
name = pname;
desktopName = "MARS";
exec = "mars-mips";
icon = "mars-mips";
comment = "An IDE for programming in MIPS assembly language";
categories = "Development;IDE;";
})
];
installPhase = ''
runHook preInstall
export JAR=$out/share/java/${pname}/${pname}.jar
install -D $src $JAR
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-jar $JAR"
unzip ${src} images/MarsThumbnail.gif
mkdir -p $out/share/pixmaps
convert images/MarsThumbnail.gif $out/share/pixmaps/mars-mips.png
runHook postInstall
'';
meta = with lib; {
description = "An IDE for programming in MIPS assembly language intended for educational-level use";
homepage = "https://courses.missouristate.edu/KenVollmar/MARS/";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.all;
};
}

View file

@ -1,14 +1,16 @@
{ lib, fetchzip, buildDunePackage, cppo, ocp-indent, cmdliner, re }: { lib, fetchFromGitHub, buildDunePackage, cppo, ocp-indent, cmdliner, re }:
buildDunePackage rec { buildDunePackage rec {
pname = "ocp-index"; pname = "ocp-index";
version = "1.2.2"; version = "1.3.1";
useDune2 = true; useDune2 = true;
src = fetchzip { src = fetchFromGitHub {
url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; owner = "OCamlPro";
sha256 = "0k4i0aabyn750f4wqbnk0yv10kdjd6nhjw2pbmpc4cz639qcsm40"; repo = "ocp-index";
rev = version;
sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7";
}; };
buildInputs = [ cppo cmdliner re ]; buildInputs = [ cppo cmdliner re ];
@ -18,6 +20,7 @@ buildDunePackage rec {
meta = { meta = {
homepage = "https://www.typerex.org/ocp-index.html"; homepage = "https://www.typerex.org/ocp-index.html";
description = "A simple and light-weight documentation extractor for OCaml"; description = "A simple and light-weight documentation extractor for OCaml";
changelog = "https://github.com/OCamlPro/ocp-index/raw/${version}/CHANGES.md";
license = lib.licenses.lgpl3; license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };

View file

@ -1,87 +0,0 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
pname = "now-cli";
version = "15.8.7";
# TODO: switch to building from source, if possible
src = fetchurl {
url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
sha256 = "1x6nsn9qmsy4hk7l2dsyabc7fxkwwwl1y1852vs4dgxi8w1hax93";
};
sourceRoot = ".";
unpackCmd = ''
gunzip -c $curSrc > now-linux
'';
dontBuild = true;
installPhase = ''
mkdir $out
mkdir $out/bin
cp now-linux $out/bin/now
'';
# now is a node program packaged using zeit/pkg.
# thus, it contains hardcoded offsets.
# patchelf shifts these locations when it expands headers.
# this could probably be generalised into allowing any program packaged
# with zeit/pkg to be run on nixos.
preFixup = let
libPath = lib.makeLibraryPath [stdenv.cc.cc];
in ''
orig_size=$(stat --printf=%s $out/bin/now)
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/now
patchelf --set-rpath ${libPath} $out/bin/now
chmod +x $out/bin/now
new_size=$(stat --printf=%s $out/bin/now)
###### zeit-pkg fixing starts here.
# we're replacing plaintext js code that looks like
# PAYLOAD_POSITION = '1234 ' | 0
# [...]
# PRELUDE_POSITION = '1234 ' | 0
# ^-----20-chars-----^^------22-chars------^
# ^-- grep points here
#
# var_* are as described above
# shift_by seems to be safe so long as all patchelf adjustments occur
# before any locations pointed to by hardcoded offsets
var_skip=20
var_select=22
shift_by=$(expr $new_size - $orig_size)
function fix_offset {
# $1 = name of variable to adjust
location=$(grep -obUam1 "$1" $out/bin/now | cut -d: -f1)
location=$(expr $location + $var_skip)
value=$(dd if=$out/bin/now iflag=count_bytes,skip_bytes skip=$location \
bs=1 count=$var_select status=none)
value=$(expr $shift_by + $value)
echo -n $value | dd of=$out/bin/now bs=1 seek=$location conv=notrunc
}
fix_offset PAYLOAD_POSITION
fix_offset PRELUDE_POSITION
'';
dontStrip = true;
meta = with lib; {
homepage = "https://zeit.co/now";
description = "The Command Line Interface for Now - Global Serverless Deployments";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = [ maintainers.bhall ];
};
}

View file

@ -1,40 +1,24 @@
{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkg-config}: { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "fceux-unstable"; pname = "fceux";
version = "2020-01-29"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TASVideos"; owner = "TASVideos";
repo = "fceux"; repo = pname;
rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337"; rev = "${pname}-${version}";
sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992"; sha256 = "sha256-i0mb0vy46D97oOpAjMw3CPbG4w/LWP9YRVEMWjdYgs0=";
}; };
nativeBuildInputs = [ pkg-config scons ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ buildInputs = [ SDL2 lua5_1 minizip x264 ];
zlib SDL lua5_1
];
sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false"; meta = with lib; {
prefixKey = "--prefix=";
# sed allows scons to find libraries in nix.
# mkdir is a hack to make scons succeed. It still doesn't
# actually put the files in there due to a bug in the SConstruct file.
# OPENGL doesn't work because fceux dlopens the library.
preBuild = ''
sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
export CC="gcc"
export CXX="g++"
mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
'';
meta = {
description = "A Nintendo Entertainment System (NES) Emulator"; description = "A Nintendo Entertainment System (NES) Emulator";
license = lib.licenses.gpl2; license = licenses.gpl2Plus;
maintainers = [ lib.maintainers.scubed2 ]; maintainers = with maintainers; [ sbruder scubed2 ];
homepage = "http://www.fceux.com/"; homepage = "http://www.fceux.com/";
platforms = lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -281,12 +281,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix { barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim"; pname = "barbar-nvim";
version = "2021-08-09"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romgrk"; owner = "romgrk";
repo = "barbar.nvim"; repo = "barbar.nvim";
rev = "e5a10501b34a1a6a6d9499a7caccc788e41093ec"; rev = "f4163e2ca987f25c3d1fb5cf3d9329d8ab343f35";
sha256 = "0l492f2kjzp521xwzihdiv8rhbmq2iql0qxhczk68nqy5lj2x7q0"; sha256 = "1wlxfkpa42rvw853x8nalxy3zxaaji0d365jbp3pcvhsy0li33dc";
}; };
meta.homepage = "https://github.com/romgrk/barbar.nvim/"; meta.homepage = "https://github.com/romgrk/barbar.nvim/";
}; };
@ -437,12 +437,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-08-09"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "0ec533cd84ee16a420ea50941f5c06faa433ec0a"; rev = "5647222ddcf1bb484103da1267028b4074f55a32";
sha256 = "1qxzg5yyz07d76msbbxyk1z1nn4p4si6p8cd00knla8mdyfg779p"; sha256 = "02dyhgfp76bxggjlyc0kq9wfcz96319x4y49fqmanqdhgmqbzzxb";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -581,12 +581,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix { coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim"; pname = "coc-nvim";
version = "2021-07-26"; version = "2021-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neoclide"; owner = "neoclide";
repo = "coc.nvim"; repo = "coc.nvim";
rev = "bdd11f8bfbe38522e20e49c97739d747c9db5bcf"; rev = "6a9a0ee38d2d28fc978db89237cdceb40aea6de3";
sha256 = "0a3y0ldj6y7xc3nbkzj2af1zs430z69wkzf5y8mcgxcavfg3krz4"; sha256 = "04ywmwbr8y86z6fgcx4w8w779rl0c9c3q8fazncmx24wmcmilhb5";
}; };
meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.homepage = "https://github.com/neoclide/coc.nvim/";
}; };
@ -690,24 +690,24 @@ final: prev:
compe-tabnine = buildVimPluginFrom2Nix { compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine"; pname = "compe-tabnine";
version = "2021-07-07"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tzachar"; owner = "tzachar";
repo = "compe-tabnine"; repo = "compe-tabnine";
rev = "a4d7b60dc538b724c4bc7df50687a879bcf764c7"; rev = "4e3dc7b9950e0e5dbfb9451622de670cf62875ac";
sha256 = "1lhy2m4awni2pmz9b7b1hkjmaaf4napgihykqwhm9rshsb0xzgvx"; sha256 = "0nb0jsr65q4497mbikc9fm2vkf2dq64ahxf60lv4rzm2irr3azdj";
}; };
meta.homepage = "https://github.com/tzachar/compe-tabnine/"; meta.homepage = "https://github.com/tzachar/compe-tabnine/";
}; };
compe-tmux = buildVimPluginFrom2Nix { compe-tmux = buildVimPluginFrom2Nix {
pname = "compe-tmux"; pname = "compe-tmux";
version = "2021-07-25"; version = "2021-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andersevenrud"; owner = "andersevenrud";
repo = "compe-tmux"; repo = "compe-tmux";
rev = "d0256c802411e0e76c979e2b7e150f4f8a71a6b0"; rev = "e9b92b703389732a4b6100b890daacc5f2115636";
sha256 = "1crryfvkr9f2dnva565m23cy0v0hz7jkc0ck110ya3ib2r929pmx"; sha256 = "0czf30dwnksp72ppsydkw2z93s39m5jcmzdrpvlg39zmalxcgbll";
}; };
meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
}; };
@ -834,12 +834,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix { Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail"; pname = "Coqtail";
version = "2021-07-30"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whonore"; owner = "whonore";
repo = "Coqtail"; repo = "Coqtail";
rev = "570c13efcab0191e1ab3837c712c711944cbb21d"; rev = "0ca6714f45124afadce133f21bfe00aaa3edc2ad";
sha256 = "09iwiicasv9qj8lbs3gljgha91s35xd8cbchmjn6k0ldc8nc19n7"; sha256 = "1hy9y34amrcbr64mzllj7xrldkxw0a0qp48mkc17csgxchqc5wxx";
}; };
meta.homepage = "https://github.com/whonore/Coqtail/"; meta.homepage = "https://github.com/whonore/Coqtail/";
}; };
@ -1280,12 +1280,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix { deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim"; pname = "deoplete-nvim";
version = "2021-07-14"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "deoplete.nvim"; repo = "deoplete.nvim";
rev = "49151bc9f7a52b02e5aac5eb76bbb80ba81e3726"; rev = "4caf12730256579921d77e80423b339b8128c5b6";
sha256 = "02csaq7x99l5h175kyy0bwdb8kdq3caldj6gkpc7lx7zdc987pwn"; sha256 = "0zcaxqgmjkps4vlrgd8vdq2b6ys9raj2fhg9xkvlkn5q1pz764f2";
}; };
meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
}; };
@ -1400,12 +1400,12 @@ final: prev:
edge = buildVimPluginFrom2Nix { edge = buildVimPluginFrom2Nix {
pname = "edge"; pname = "edge";
version = "2021-08-06"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sainnhe"; owner = "sainnhe";
repo = "edge"; repo = "edge";
rev = "14a4681737cf2ac33ff479cebd42398bbe2a68f0"; rev = "c13057303e04f32c2f6c5682f553e2f3e744e262";
sha256 = "0d8cps2sb3p40kwx534430r1yy2mdgvl5vls4wbzw9i71miqnvxk"; sha256 = "1mqsi5i6zxylgpcn40qmgf6r9f3z2v8w0f8ngyb41v4z05zychxg";
}; };
meta.homepage = "https://github.com/sainnhe/edge/"; meta.homepage = "https://github.com/sainnhe/edge/";
}; };
@ -1895,12 +1895,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim"; pname = "gitsigns-nvim";
version = "2021-08-07"; version = "2021-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "dd58b795a4863871fe2378dc17c6821e15b0eb59"; rev = "083dc2f485571546144e287c38a96368ea2e79a1";
sha256 = "1s33j8xbh4y8hiw7d0msr77h79zqrdcxfnmnf2lkqbh6jzqfyyqf"; sha256 = "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
}; };
@ -2027,12 +2027,12 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix { gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material"; pname = "gruvbox-material";
version = "2021-08-06"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sainnhe"; owner = "sainnhe";
repo = "gruvbox-material"; repo = "gruvbox-material";
rev = "d66186aacb6b8fef03832fd149a941a21111049a"; rev = "04fc67660a87adc2edbbc0b4b39d379e45c3baf8";
sha256 = "0dsdbrgqyh0h3kfxkrwh4hqa883r08wkijpdy1dk5wl76b4if2cp"; sha256 = "03yi4n4xx3a2sbnl2s61wk8w1ncrjm4f9hpi2i4566a4fmh6mm1p";
}; };
meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
}; };
@ -2592,12 +2592,12 @@ final: prev:
lh-vim-lib = buildVimPluginFrom2Nix { lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib"; pname = "lh-vim-lib";
version = "2021-04-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LucHermitte"; owner = "LucHermitte";
repo = "lh-vim-lib"; repo = "lh-vim-lib";
rev = "6cb8f4cbe54b735dfa6dbb708cc9eaddead251d2"; rev = "d13642f7a2a4f82da9cb00949ad0163bf5d61e04";
sha256 = "0qggqhj2ikq2ki9g93qgwpl2w5nhssafmwc8a2xkwi4qm4k2shqh"; sha256 = "086f66wkyngcy5x0wmhdi9abna9pq5m6cl0ic2kvdxpbgdl7qc2q";
}; };
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
}; };
@ -2652,12 +2652,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix { lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim"; pname = "lightspeed-nvim";
version = "2021-08-08"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "lightspeed.nvim"; repo = "lightspeed.nvim";
rev = "ec36e68de3b73fd20a02d0cebbb9fd370c2ad532"; rev = "889e6360c3026fb35101f5d81db630721c526a18";
sha256 = "078b5ri8hg1vd15n7n8v90rpp4abp93sh2zvzn9ybdlk5wl5kn9g"; sha256 = "03klvjqk7n2ssji1di2w204py32h13lb0jv4d7h6c52y442k0q37";
}; };
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
}; };
@ -2736,12 +2736,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix { lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim"; pname = "lsp_signature-nvim";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ray-x"; owner = "ray-x";
repo = "lsp_signature.nvim"; repo = "lsp_signature.nvim";
rev = "0381f3cb17f46c5e7a7277bb267d8f594da17430"; rev = "6f0d7b847334ca460b0484cb527afdf13a9febaa";
sha256 = "1px2m3v9z2gw60i0vjd984b2v434bdkndihsw51nmvxl3w2mbgii"; sha256 = "1iy6pfz2y4908b22l5zdgj9bynciy6yb4g5x8irgp824m8s3s6ps";
}; };
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
}; };
@ -2800,8 +2800,8 @@ final: prev:
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "l3mon4d3"; owner = "l3mon4d3";
repo = "luasnip"; repo = "luasnip";
rev = "86bee9cd7b66237730789e872b952759d2f5b3ac"; rev = "453b23f1a170f92f378d974d1c72a2739850a018";
sha256 = "0ja7jlwlyjiw8imfqmd4m3i5xx6pkfh7sjm108g3k4fpp8xmpbl7"; sha256 = "1m1j4g55wzlcflvxf1fci1554ws8g1liihm1qrapccmknpsxcnq6";
}; };
meta.homepage = "https://github.com/l3mon4d3/luasnip/"; meta.homepage = "https://github.com/l3mon4d3/luasnip/";
}; };
@ -3168,12 +3168,12 @@ final: prev:
neco-vim = buildVimPluginFrom2Nix { neco-vim = buildVimPluginFrom2Nix {
pname = "neco-vim"; pname = "neco-vim";
version = "2021-08-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "neco-vim"; repo = "neco-vim";
rev = "ba9b6535381690fc6773d682fc046d8ddd2a863a"; rev = "6cbf6f0610e3c194366fc938b4a0ad572ad476e9";
sha256 = "0n2pbl9fcvqp0ikhmlg1rfaig24awkhg8lv79zn6k37yx29kissi"; sha256 = "03afyhpfbwisf4l025bj41qmfaa0awancrd4q8ikq8b07n61mzmv";
}; };
meta.homepage = "https://github.com/Shougo/neco-vim/"; meta.homepage = "https://github.com/Shougo/neco-vim/";
}; };
@ -3204,12 +3204,12 @@ final: prev:
neoformat = buildVimPluginFrom2Nix { neoformat = buildVimPluginFrom2Nix {
pname = "neoformat"; pname = "neoformat";
version = "2021-08-05"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sbdchd"; owner = "sbdchd";
repo = "neoformat"; repo = "neoformat";
rev = "1ff0099c62dad62f1126dba15b61b35d54aa607f"; rev = "10794f73493192f082078ba8fe88e27db1ee4859";
sha256 = "18xczksv70v18xh6f40d5bad2f890vm8gyg5xqh7sh2vh9jdg0jz"; sha256 = "1myi8b2dzrdycyw94dq0a2mcmyjhlv2711scvqj879kcfkv3i43a";
}; };
meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.homepage = "https://github.com/sbdchd/neoformat/";
}; };
@ -3468,12 +3468,12 @@ final: prev:
nnn-vim = buildVimPluginFrom2Nix { nnn-vim = buildVimPluginFrom2Nix {
pname = "nnn-vim"; pname = "nnn-vim";
version = "2021-07-30"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mcchrish"; owner = "mcchrish";
repo = "nnn.vim"; repo = "nnn.vim";
rev = "ed06cc9f0e40e96bb7e3900bf6a56858db21e3f7"; rev = "40ea24ad904f082d593f6f2250521cd8a51a21a1";
sha256 = "0qr7j9wf7kdkcv9a151nz0sjzvcx926dxss17b7mwrq3bpwhckvh"; sha256 = "0msn55xd1bk1f2rm7vjz6fsp5pg02pr59ph1ynmg13dnah0h8x85";
}; };
meta.homepage = "https://github.com/mcchrish/nnn.vim/"; meta.homepage = "https://github.com/mcchrish/nnn.vim/";
}; };
@ -3516,24 +3516,24 @@ final: prev:
nterm-nvim = buildVimPluginFrom2Nix { nterm-nvim = buildVimPluginFrom2Nix {
pname = "nterm-nvim"; pname = "nterm-nvim";
version = "2021-07-15"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jlesquembre"; owner = "jlesquembre";
repo = "nterm.nvim"; repo = "nterm.nvim";
rev = "8076f2960512d50a93ffd3d9b04499f9d4fbe793"; rev = "9f37152269ae0fe520899f454355ad2158eee1b3";
sha256 = "0z2d9jvw7yf415mpvqlx5vc8k9n02vc28v4p1fimvz7axcv67361"; sha256 = "1d15l57krygxcg686naqk47g9bl802dbz3mghcihybqhw5sxdn56";
}; };
meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
}; };
null-ls-nvim = buildVimPluginFrom2Nix { null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim"; pname = "null-ls-nvim";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "07fd5abcab09a370f8d15fc437f79becb121e025"; rev = "1724d220448a327de92be556e2edb2b3cf2117c1";
sha256 = "0p45wg4g28w6zlfz8cq9a5ypcsf0l6br98khf5gv81zfr4r7n68h"; sha256 = "0p53pphn03wh1vlscjk4i8bvn36l2xkxm7f83lvy9yb16a8yky29";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
}; };
@ -3576,12 +3576,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix { nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs"; pname = "nvim-autopairs";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "windwp"; owner = "windwp";
repo = "nvim-autopairs"; repo = "nvim-autopairs";
rev = "13820ff0af7dec102b15c68f7c8fcd94302099f7"; rev = "d71b3f6060a056dd4d3830b6406fe7143691d631";
sha256 = "0b59ikp6z63mls64szk3bc7hzvmwrsb97k6b56vaylbx9g1wvlk6"; sha256 = "0f4w32gpb3n415x4h6fbfi8cvcmxb0mp3vspnga6n2zynvwv9rfq";
}; };
meta.homepage = "https://github.com/windwp/nvim-autopairs/"; meta.homepage = "https://github.com/windwp/nvim-autopairs/";
}; };
@ -3624,12 +3624,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix { nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua"; pname = "nvim-bufferline-lua";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "nvim-bufferline.lua"; repo = "nvim-bufferline.lua";
rev = "5c82307c64143ed2848e6ea1777ee51a40d3b978"; rev = "067ec55a10ef8a58f8c7b45621daca759ab54437";
sha256 = "07nid4wnd18bd26pl9y79427jsm4k602qph8090rkwl3h9b14w9x"; sha256 = "1lm6jwsngqnhfh43r3s1qf2qynfd92d7pyp7a2myxcdzhcdhn08f";
}; };
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
}; };
@ -3684,12 +3684,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix { nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap"; pname = "nvim-dap";
version = "2021-07-25"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-dap"; repo = "nvim-dap";
rev = "c8a5ec7ec32c1fe1697437ad83bd26ba3b997abd"; rev = "ef5a201caa05eba06f115515f9c4c8897045fe93";
sha256 = "07qy81zpdh0wnxmiawj2yfbyvbvswvrlgj8pm95fwy7fvr7gbrnk"; sha256 = "1h6dw1zwz57q4if2akfrwhvhgj0fcf1x5c3cax351sjq9gshx86h";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
}; };
@ -3744,12 +3744,12 @@ final: prev:
nvim-hlslens = buildVimPluginFrom2Nix { nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens"; pname = "nvim-hlslens";
version = "2021-08-06"; version = "2021-08-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kevinhwang91"; owner = "kevinhwang91";
repo = "nvim-hlslens"; repo = "nvim-hlslens";
rev = "0f6f0717c55a1e92b1e1a5f08f4bb03234a9bc39"; rev = "d789c9ccba5c83c0fec6aa4e9cdac3803b5550e7";
sha256 = "1p4dvafi0kqxnfw46085jk14lk47hcippkw9b1lqi1kjimgxwwwg"; sha256 = "0wm9axsj9ns00xmiix83b2l6lqm2y7qyh81y851z32im9xjfxixk";
}; };
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
}; };
@ -3768,12 +3768,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix { nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls"; pname = "nvim-jdtls";
version = "2021-08-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-jdtls"; repo = "nvim-jdtls";
rev = "2a9e67310b333eabf0a15acc0c78da42e9e8202e"; rev = "e04105f551a982663b8d7707a064b733ab71db9b";
sha256 = "1jv6pal9rvhn9lmc932g5fsj1g0s5sq3p22c1kk4xvzlhv8i6j69"; sha256 = "0vfslh8qbl03c1prg5sfff6bxpyjbpdczxfc0r3i8hl9mwvdc4zx";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
}; };
@ -3792,12 +3792,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2021-08-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "8b1e79a1d04e4b077aab1706891ed48e397bcaea"; rev = "d2d6e6251172a78436b7d2730a638e572f04b6ce";
sha256 = "093hc1n899d1w2x07vq0x2lx144w2w8acnlsis1pmqj4d2z9c0bf"; sha256 = "0b146fvcsg5i5x8bqmk9n1gfv9h158b6vss69pp47nr7jf7xfrfd";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -4140,12 +4140,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix { packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim"; pname = "packer-nvim";
version = "2021-08-07"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wbthomason"; owner = "wbthomason";
repo = "packer.nvim"; repo = "packer.nvim";
rev = "c0954d66fa658181c72733cda2991d258b47e816"; rev = "add255996af31fcec142cb28faa99998c2d5ac4e";
sha256 = "1sjlffaymvci4lhrvnjndwnqbgm8n5379i14ipdjf0gqgd9xsczr"; sha256 = "0k7xsrs83fqm738lmnjcd5adyiw3ld26v0ybvg5wsydi0nirwryd";
}; };
meta.homepage = "https://github.com/wbthomason/packer.nvim/"; meta.homepage = "https://github.com/wbthomason/packer.nvim/";
}; };
@ -4248,12 +4248,12 @@ final: prev:
plenary-nvim = buildVimPluginFrom2Nix { plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim"; pname = "plenary-nvim";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "58a51d59999022fdc05a0b22428124b4f37c07ad"; rev = "adf9d62023e2d39d9d9a2bc550feb3ed7b545d0f";
sha256 = "0yxydnvbzzfpyx8y6pqsnkb030nirdh12q138iixqy7l3j9p5jr9"; sha256 = "1h11a0lil14c13v5mdzdmxxqjpqip5fhvjbm34827czb5pz1hvcz";
}; };
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
}; };
@ -4297,12 +4297,12 @@ final: prev:
presence-nvim = buildVimPluginFrom2Nix { presence-nvim = buildVimPluginFrom2Nix {
pname = "presence-nvim"; pname = "presence-nvim";
version = "2021-08-08"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andweeb"; owner = "andweeb";
repo = "presence.nvim"; repo = "presence.nvim";
rev = "77227a06ecf84037277318758a8026524aa736ab"; rev = "e632306af10f28a662d53bafed85a8cf8b4f63b7";
sha256 = "0x13p4pyby6g425cwm9b42qxknh1k27knf8hhn7jfgb4c5bdzk5a"; sha256 = "1sa8lc3xyb8sbmh0iwrh2r3j3rqnp5pjmi99h3i0ksm7yqcmkkk4";
}; };
meta.homepage = "https://github.com/andweeb/presence.nvim/"; meta.homepage = "https://github.com/andweeb/presence.nvim/";
}; };
@ -4489,12 +4489,12 @@ final: prev:
registers-nvim = buildVimPluginFrom2Nix { registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim"; pname = "registers-nvim";
version = "2021-08-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tversteeg"; owner = "tversteeg";
repo = "registers.nvim"; repo = "registers.nvim";
rev = "3ce2624dba442ae9bb04a5eeccd8aaef02f52ff2"; rev = "fc070007d6c1c87a671db6632425004fa8a0b2e2";
sha256 = "0bb3mncvlm0mkn47s4mfz6rx63pq6ywvss0akz9zssph5jy1knga"; sha256 = "1bziyijfsm5q1m6bbp5m7nkki48f16nsiyibr178k9rlr2k6yccm";
}; };
meta.homepage = "https://github.com/tversteeg/registers.nvim/"; meta.homepage = "https://github.com/tversteeg/registers.nvim/";
}; };
@ -4814,12 +4814,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix { sonokai = buildVimPluginFrom2Nix {
pname = "sonokai"; pname = "sonokai";
version = "2021-08-06"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sainnhe"; owner = "sainnhe";
repo = "sonokai"; repo = "sonokai";
rev = "c76023c57a34e5cb0852f49061d5181a743db358"; rev = "0e1af11d2297ae65ba504419cd8d6bbd6ed3534d";
sha256 = "010cm39w3av8agk2d5z22vp8s1s13i17njbwvi56hyjmwsa706vf"; sha256 = "1m6kzdyam2syly0abcjd3j4pimkmhvd9x1872lzw35bfqhbxq947";
}; };
meta.homepage = "https://github.com/sainnhe/sonokai/"; meta.homepage = "https://github.com/sainnhe/sonokai/";
}; };
@ -4935,12 +4935,12 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix { sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim"; pname = "sql-nvim";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tami5"; owner = "tami5";
repo = "sql.nvim"; repo = "sql.nvim";
rev = "653b3dea6f2703dc450621df0589e3665a007656"; rev = "2e53ff98879fcdb41a011f5088bb2bbb070350f1";
sha256 = "0ppn7mwv5n46dwhslrpdganrfikcz57v425c5az01nm16n57rp5i"; sha256 = "176jv5q2bln5gg7smh9f4dd3c2hc6pzskqjjx5pl45hmb4k0akjr";
}; };
meta.homepage = "https://github.com/tami5/sql.nvim/"; meta.homepage = "https://github.com/tami5/sql.nvim/";
}; };
@ -5273,12 +5273,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim"; pname = "telescope-nvim";
version = "2021-08-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "273942cc478b356d7b2e0a5211281daaef69d161"; rev = "d4a52ded6767ccda6c29e47332247003ac4c2007";
sha256 = "1w2h6lvk5jz6v19m89cd019mbdz47b55qcx05nyx65j3jrn0n8av"; sha256 = "15d996l9zbd300nrb946nfkw1b39v9qmzm1w2i8p4k11rclm77si";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
}; };
@ -5526,12 +5526,12 @@ final: prev:
unicode-vim = buildVimPluginFrom2Nix { unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim"; pname = "unicode-vim";
version = "2021-05-24"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrisbra"; owner = "chrisbra";
repo = "unicode.vim"; repo = "unicode.vim";
rev = "62f7a3558ee4402bcaaae8638e768268f1137a0f"; rev = "1fc0dd5dce6a0751903c69c629cc1d2f2cd114d5";
sha256 = "1y5inpiaqvnq69n1dbpiwilqfq2hf56m7w5a6kj2fkav15pyczx7"; sha256 = "04w6m1kkwyavnyq285pd83yab9zjq7zmnxkhaf2ipdh63pgfl6s8";
}; };
meta.homepage = "https://github.com/chrisbra/unicode.vim/"; meta.homepage = "https://github.com/chrisbra/unicode.vim/";
}; };
@ -5850,12 +5850,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix { vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline"; pname = "vim-airline";
version = "2021-08-04"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-airline"; owner = "vim-airline";
repo = "vim-airline"; repo = "vim-airline";
rev = "0cfd829c92a6fd208bfdcbdd2881105462224636"; rev = "0de4c9df21abf9256091d205148601f718d3a12c";
sha256 = "1jl6j7pq5klcr5rf2vmwrqvzx1y7paywhfw96dfk6397rxsga058"; sha256 = "12k3kdxnmqhkb8f71cqrrf1xwphlcc7nbimlxkp7my5y75xrk6lx";
}; };
meta.homepage = "https://github.com/vim-airline/vim-airline/"; meta.homepage = "https://github.com/vim-airline/vim-airline/";
}; };
@ -6870,12 +6870,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix { vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm"; pname = "vim-floaterm";
version = "2021-08-08"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "voldikss"; owner = "voldikss";
repo = "vim-floaterm"; repo = "vim-floaterm";
rev = "20618a61bc74f3f1a7fa165431b69685c01048c6"; rev = "9716765f2af3415ad1f9091a50c334649a74e4c5";
sha256 = "1z7r3zvhr2zcspqxgwgqskf4w2vwmb3ymvk2kl5r0r3paf305jck"; sha256 = "1fclir7g02x8cpsyzf40l1igcw140h695g6mslyhhgjclm0rigpm";
}; };
meta.homepage = "https://github.com/voldikss/vim-floaterm/"; meta.homepage = "https://github.com/voldikss/vim-floaterm/";
}; };
@ -6930,12 +6930,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix { vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive"; pname = "vim-fugitive";
version = "2021-08-09"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpope"; owner = "tpope";
repo = "vim-fugitive"; repo = "vim-fugitive";
rev = "4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9"; rev = "b709d9f782813565be57344538129cf00ea71463";
sha256 = "1vgv4im6bp7688cdwnfvkh5p1fl69bk83d2rsx733l6n45pczzfv"; sha256 = "0r2z1ahkvwsh54lsgm6r1hpj4bl639pazrf9w551zzw8h30najcl";
}; };
meta.homepage = "https://github.com/tpope/vim-fugitive/"; meta.homepage = "https://github.com/tpope/vim-fugitive/";
}; };
@ -7054,8 +7054,8 @@ final: prev:
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatih"; owner = "fatih";
repo = "vim-go"; repo = "vim-go";
rev = "819cd8ff2006706b90f78da8fa4b5842b398bff9"; rev = "b8a824ae865032066793fb10c1c7d8a184a3a035";
sha256 = "1k0kz8s0km9k5cc0wagfbbclc21rjw29rzbrmd042ldv53ssq8ad"; sha256 = "02dbmkr48cac0qbiqcgd1qblbj98a9pakmsr5kr54wa89s90bpxm";
}; };
meta.homepage = "https://github.com/fatih/vim-go/"; meta.homepage = "https://github.com/fatih/vim-go/";
}; };
@ -7869,12 +7869,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix { vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup"; pname = "vim-matchup";
version = "2021-07-25"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andymass"; owner = "andymass";
repo = "vim-matchup"; repo = "vim-matchup";
rev = "80315c2933aa495b8af5833750e8534bf5b1d3bf"; rev = "816751e279f1186d10520bad752206d5f91ce173";
sha256 = "0f7j7cl7p8d5ac2wz7xhxzxgnm743wgb7360yav1pazivx0i5h5c"; sha256 = "1z7gf14ifcza08yp0skdp1zad918fxpmws2p6b4zavmv4c6945ky";
}; };
meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.homepage = "https://github.com/andymass/vim-matchup/";
}; };
@ -8733,12 +8733,12 @@ final: prev:
vim-scala = buildVimPluginFrom2Nix { vim-scala = buildVimPluginFrom2Nix {
pname = "vim-scala"; pname = "vim-scala";
version = "2019-06-24"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derekwyatt"; owner = "derekwyatt";
repo = "vim-scala"; repo = "vim-scala";
rev = "bbdfea4b98fdb8866a8a6060ec1294643cfeb413"; rev = "7657218f14837395a4e6759f15289bad6febd1b4";
sha256 = "14q8j6vwqad2nwia29d0844v2zdcx04xn9dyicv13sdpivzcm4rb"; sha256 = "0iypq4ii1lbnw6x4qc89vy8g8wq0gi06v96nphcc4fbs04pb4cr5";
}; };
meta.homepage = "https://github.com/derekwyatt/vim-scala/"; meta.homepage = "https://github.com/derekwyatt/vim-scala/";
}; };
@ -9430,12 +9430,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix { vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest"; pname = "vim-ultest";
version = "2021-07-23"; version = "2021-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rcarriga"; owner = "rcarriga";
repo = "vim-ultest"; repo = "vim-ultest";
rev = "54eaa1b19c924551e9988063926533583e41b24c"; rev = "3e28c3815c86637944e6425c444ab55cdd25528f";
sha256 = "16d38yc4v0fy7w8qdrbx134f99xny4kfgwgazqa47cgj8nrb0n4g"; sha256 = "0b51mqizw4igzpjgs38pn9f0mn83hlalxv43swq3pkxray5vfav2";
}; };
meta.homepage = "https://github.com/rcarriga/vim-ultest/"; meta.homepage = "https://github.com/rcarriga/vim-ultest/";
}; };
@ -9742,12 +9742,12 @@ final: prev:
vimagit = buildVimPluginFrom2Nix { vimagit = buildVimPluginFrom2Nix {
pname = "vimagit"; pname = "vimagit";
version = "2020-11-18"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jreybert"; owner = "jreybert";
repo = "vimagit"; repo = "vimagit";
rev = "aaf1278f03e866f0b978d4b0f0cc7084db251129"; rev = "fb71060049f829e48fc392e0be43d1040c271204";
sha256 = "1k23q1p6wgjlk1cpmv1ijjggjklz8hgg6s7bx6mrk0aw5j2s1pdh"; sha256 = "1yizvf9s9djxar64kp63r45q5vv2k616xskd4adkcfqn8crzyw52";
}; };
meta.homepage = "https://github.com/jreybert/vimagit/"; meta.homepage = "https://github.com/jreybert/vimagit/";
}; };
@ -9863,24 +9863,24 @@ final: prev:
vimtex = buildVimPluginFrom2Nix { vimtex = buildVimPluginFrom2Nix {
pname = "vimtex"; pname = "vimtex";
version = "2021-08-04"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lervag"; owner = "lervag";
repo = "vimtex"; repo = "vimtex";
rev = "078292ed7efb95a5ff6c4cf21f4273ae599af2bd"; rev = "ae606455d79301f9091c1b6bde0ce87c17512312";
sha256 = "0hk4wx89blvimw5vgkxri2ci4k2dhflwkj5mshc0k8v7bidli8m4"; sha256 = "13l4mli0qnsdillsgwc3f2810vy6mc388g54lc519c62yjc2r14h";
}; };
meta.homepage = "https://github.com/lervag/vimtex/"; meta.homepage = "https://github.com/lervag/vimtex/";
}; };
vimux = buildVimPluginFrom2Nix { vimux = buildVimPluginFrom2Nix {
pname = "vimux"; pname = "vimux";
version = "2021-05-25"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "vimux"; repo = "vimux";
rev = "a1650d5f9bc2d617bb546bb8014a206e41089dc8"; rev = "031cc6208ed93788ce8d8d71b83c9d81fdddeeb3";
sha256 = "0gdhhkpcq654c7jv5ycnss3fra2mysz3zl64n46cq17vmwczbcrh"; sha256 = "1a5sgrnkyngwn2b771b8bm2awsq36yr5f17wclxg7fcms2y43lgv";
}; };
meta.homepage = "https://github.com/preservim/vimux/"; meta.homepage = "https://github.com/preservim/vimux/";
}; };
@ -9983,12 +9983,12 @@ final: prev:
wilder-nvim = buildVimPluginFrom2Nix { wilder-nvim = buildVimPluginFrom2Nix {
pname = "wilder-nvim"; pname = "wilder-nvim";
version = "2021-08-07"; version = "2021-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gelguy"; owner = "gelguy";
repo = "wilder.nvim"; repo = "wilder.nvim";
rev = "719e83269062b7421a4e82f3d77263915b12d452"; rev = "8f15d62faab17f700798c4eabe75203a9bc4a6d2";
sha256 = "0qd66h72v4n8w9xh1dziihqhly44yn31r12a8pb19qy1fgqmrp78"; sha256 = "0sicqzlvpiax38l46ccpnlfgsl8bkks9kn9b613v33n50j20bppc";
}; };
meta.homepage = "https://github.com/gelguy/wilder.nvim/"; meta.homepage = "https://github.com/gelguy/wilder.nvim/";
}; };

View file

@ -11,9 +11,14 @@
import inspect import inspect
import os import os
import sys import sys
import logging
import textwrap
from typing import List, Tuple from typing import List, Tuple
from pathlib import Path from pathlib import Path
log = logging.getLogger()
log.addHandler(logging.StreamHandler())
# Import plugin update library from maintainers/scripts/pluginupdate.py # Import plugin update library from maintainers/scripts/pluginupdate.py
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts")) sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts"))
@ -40,50 +45,49 @@ HEADER = (
) )
def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): class VimEditor(pluginupdate.Editor):
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
with open(outfile, "w+") as f: with open(outfile, "w+") as f:
f.write(HEADER) f.write(HEADER)
f.write( f.write(textwrap.dedent("""
""" { lib, buildVimPluginFrom2Nix, fetchFromGitHub }:
{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }:
final: prev: final: prev:
{""" {"""
) ))
for owner, repo, plugin in sorted_plugins: for owner, repo, plugin in sorted_plugins:
if plugin.has_submodules: if plugin.has_submodules:
submodule_attr = "\n fetchSubmodules = true;" submodule_attr = "\n fetchSubmodules = true;"
else: else:
submodule_attr = "" submodule_attr = ""
f.write(textwrap.indent(textwrap.dedent(
f"""
{plugin.normalized_name} = buildVimPluginFrom2Nix {{
pname = "{plugin.normalized_name}";
version = "{plugin.version}";
src = fetchFromGitHub {{
owner = "{owner}";
repo = "{repo}";
rev = "{plugin.commit}";
sha256 = "{plugin.sha256}";{submodule_attr}
}};
meta.homepage = "https://github.com/{owner}/{repo}/";
}};
"""
), ' '))
f.write("\n}")
print(f"updated {outfile}")
f.write(
f"""
{plugin.normalized_name} = buildVimPluginFrom2Nix {{
pname = "{plugin.normalized_name}";
version = "{plugin.version}";
src = fetchFromGitHub {{
owner = "{owner}";
repo = "{repo}";
rev = "{plugin.commit}";
sha256 = "{plugin.sha256}";{submodule_attr}
}};
meta.homepage = "https://github.com/{owner}/{repo}/";
}};
"""
)
f.write(
"""
}
"""
)
print(f"updated {outfile}")
def main(): def main():
editor = pluginupdate.Editor("vim", ROOT, GET_PLUGINS, generate_nix) editor = VimEditor("vim", ROOT, GET_PLUGINS)
pluginupdate.update_plugins(editor) parser = editor.create_parser()
args = parser.parse_args()
pluginupdate.update_plugins(editor, args)
if __name__ == "__main__": if __name__ == "__main__":

View file

@ -91,7 +91,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "fwupd"; pname = "fwupd";
version = "1.5.7"; version = "1.5.12";
# libfwupd goes to lib # libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out # daemon, plug-ins and libfwupdplugin go to out
@ -100,7 +100,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh"; sha256 = "sha256-BluwLlm6s/2H/USARQpAvDR0+X8WP/q0h8VvxA6Qftc=";
}; };
patches = [ patches = [
@ -296,7 +296,6 @@ let
"fwupd/thunderbolt.conf" "fwupd/thunderbolt.conf"
"fwupd/upower.conf" "fwupd/upower.conf"
"fwupd/uefi_capsule.conf" "fwupd/uefi_capsule.conf"
"pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd/LVFS-CA.pem" "pki/fwupd/LVFS-CA.pem"

View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2021.8.5"; version = "2021.8.6";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];

View file

@ -62,23 +62,6 @@ let
(mkOverride "pylast" "4.2.0" (mkOverride "pylast" "4.2.0"
"0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3") "0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3")
# Pinned due to API changes in pyopenuv>=1.1.0
(self: super: {
pyopenuv = super.pyopenuv.overridePythonAttrs (oldAttrs: rec {
version = "1.0.13";
src = fetchFromGitHub {
owner = "bachya";
repo = "pyopenuv";
rev = version;
sha256 = "1gx9xjkyvqqy8410lnbshq1j5y4cb0cdc4m505g17rwdzdwb01y8";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "poetry.masonry.api" "poetry.core.masonry.api"
'';
});
})
# Pinned due to API changes in pyruckus>0.12 # Pinned due to API changes in pyruckus>0.12
(self: super: { (self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
@ -138,7 +121,7 @@ let
extraBuildInputs = extraPackages py.pkgs; extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2021.8.5"; hassVersion = "2021.8.6";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -155,7 +138,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
sha256 = "0alyr87vm0szljw1lgdsv7085rl0m9r16nwdprwskhcjlwllk1bh"; sha256 = "1hahxvvlk32dbmv2lhn67w1ii5g24znvjqgsq318qv8c2qh5z5ws";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling

View file

@ -75,7 +75,15 @@ let
chmod +x $out/bin/cryptpad chmod +x $out/bin/cryptpad
''; '';
meta.maintainers = with lib.maintainers; [ davhau ]; meta = {
longDescription = ''
CryptPad is a collaboration suite that is end-to-end-encrypted and open-source.
It is built to enable collaboration, synchronizing changes to documents in real time.
Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.
'';
maintainers = with lib.maintainers; [ davhau ];
mainProgram = "cryptpad";
};
}; };
in in

View file

@ -2,21 +2,21 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "afterburn"; pname = "afterburn";
version = "5.0.0"; version = "5.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coreos"; owner = "coreos";
repo = "afterburn"; repo = "afterburn";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-sdgAZuT8bIX4eWN7nLNNyclxazmCBr5kDFS6s6cRXVU="; sha256 = "sha256-5dzgvoR6qGlVz0RJ1j9B4yna1aCbOczVLcU++GWNEL8=";
}; };
cargoSha256 = "sha256-IzcaaQjge2z49XwyFcPHX/AMjvrbcOLw0J1qBzHw7Is="; cargoSha256 = "sha256-cqipYIH/XHMe7ppsXPVnDfsUqXoIep7CHiOGEPbZK4M=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];
patchPhase = '' postPatch = ''
substituteInPlace ./systemd/afterburn-checkin.service --replace /usr/bin $out/bin substituteInPlace ./systemd/afterburn-checkin.service --replace /usr/bin $out/bin
substituteInPlace ./systemd/afterburn-firstboot-checkin.service --replace /usr/bin $out/bin substituteInPlace ./systemd/afterburn-firstboot-checkin.service --replace /usr/bin $out/bin
substituteInPlace ./systemd/afterburn-sshkeys@.service.in --replace /usr/bin $out/bin substituteInPlace ./systemd/afterburn-sshkeys@.service.in --replace /usr/bin $out/bin

View file

@ -1,9 +1,10 @@
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }:
yarn2nix-moretea.mkYarnPackage rec { yarn2nix-moretea.mkYarnPackage rec {
version = "0.8.98"; version = "0.8.98";
src = fetchzip { src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.98.tgz"; url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz";
sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26"; sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26";
}; };

View file

@ -16,13 +16,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "tts"; pname = "tts";
version = "0.1.3"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coqui-ai"; owner = "coqui-ai";
repo = "TTS"; repo = "TTS";
rev = "v${version}"; rev = "v${version}";
sha256 = "0akhiaaqz53bf5zyps3vgjifmgh5wvcc9r4lrq9hmj3dds03vkjq"; sha256 = "sha256-FlxR1bPkUZT3SPuWiK0oAuI9dKfurEZurB0NhyDgOyY=";
}; };
postPatch = '' postPatch = ''
@ -40,6 +40,7 @@ python3.pkgs.buildPythonApplication rec {
anyascii anyascii
coqpit coqpit
flask flask
fsspec
gruut gruut
gdown gdown
inflect inflect
@ -104,6 +105,7 @@ python3.pkgs.buildPythonApplication rec {
"tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py"
"tests/tts_tests/test_tacotron2_tf_model.py" "tests/tts_tests/test_tacotron2_tf_model.py"
# RuntimeError: fft: ATen not compiled with MKL support # RuntimeError: fft: ATen not compiled with MKL support
"tests/tts_tests/test_vits_train.py"
"tests/vocoder_tests/test_fullband_melgan_train.py" "tests/vocoder_tests/test_fullband_melgan_train.py"
"tests/vocoder_tests/test_hifigan_train.py" "tests/vocoder_tests/test_hifigan_train.py"
"tests/vocoder_tests/test_melgan_train.py" "tests/vocoder_tests/test_melgan_train.py"

View file

@ -14,11 +14,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "agi"; pname = "agi";
version = "2.1.0-dev-20210804"; version = "2.1.0-dev-20210809";
src = fetchzip { src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-ptxESGdgGus4ZfCvpOYCcURdPSLZEFq3iYy/MmetJCU="; sha256 = "sha256-n1a35syStFbhpVGyi/7oxWzBb2lXyVZd3K8/Bt8b0Lg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/sharkdp/bat"; homepage = "https://github.com/sharkdp/bat";
changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ]; license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ dywedir lilyball zowoq ]; maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ];
}; };
} }

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "chezmoi"; pname = "chezmoi";
version = "2.1.4"; version = "2.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "twpayne"; owner = "twpayne";
repo = "chezmoi"; repo = "chezmoi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+KSLmr6tia22XFHYFmn3leRdT6TTKdrQa9PrGGJNPaw="; sha256 = "sha256-zMmQxg+Qdb4pu+gzouz/lpIu6/u+GaYPhIet7xAgTIk=";
}; };
vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y="; vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y=";

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "elfcat"; pname = "elfcat";
version = "0.1.4"; version = "0.1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ruslashev"; owner = "ruslashev";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; sha256 = "sha256-v8G9XiZS+49HtuLjs4Co9A1J+5STAerphkLaMGvqXT4=";
}; };
cargoSha256 = null; cargoSha256 = null;

View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "infracost"; pname = "infracost";
version = "0.9.4"; version = "0.9.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "infracost"; owner = "infracost";
rev = "v${version}"; rev = "v${version}";
repo = "infracost"; repo = "infracost";
sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE="; sha256 = "sha256-B9byIortXH9v1aZNVU55uXA+5w7rdLijoE+JNq3OZlE=";
}; };
vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8="; vendorSha256 = "sha256-TfaT5xPzdyTR0sH+EsZKCNXONkfjDRvT/jevAVQt+Zg=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "t1utils-1.42"; pname = "t1utils";
version = "1.42";
src = fetchurl { src = fetchurl {
url = "https://www.lcdf.org/type/${name}.tar.gz"; url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz";
sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk=";
}; };
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
resources from a Macintosh font file or create a Macintosh Type 1 font resources from a Macintosh font file or create a Macintosh Type 1 font
file from a PFA or PFB font. file from a PFA or PFB font.
''; '';
homepage = "http://www.lcdf.org/type/"; homepage = "https://www.lcdf.org/type/";
# README from tarball says "BSD-like" and points to non-existing LICENSE # README from tarball says "BSD-like" and points to non-existing LICENSE
# file... # file...
license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE

View file

@ -1,17 +1,18 @@
{lib, stdenv, fetchurl}: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cksfv"; pname = "cksfv";
version = "1.3.15"; version = "1.3.15";
src = fetchurl { src = fetchurl {
url = "http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2"; url = "https://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2";
sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1"; sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1";
}; };
meta = with lib; { meta = with lib; {
homepage = "http://zakalwe.fi/~shd/foss/cksfv/"; homepage = "https://zakalwe.fi/~shd/foss/cksfv/";
description = "A tool for verifying files against a SFV checksum file"; description = "A tool for verifying files against a SFV checksum file";
maintainers = with maintainers; [ ];
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl2; license = licenses.gpl2;
}; };

View file

@ -5,7 +5,7 @@ buildGoPackage rec {
version = "0.7.4"; version = "0.7.4";
src = fetchurl { src = fetchurl {
url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz"; url = "https://viric.name/soft/filegive/filegive-${version}.tar.gz";
sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy"; sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
}; };
@ -14,7 +14,7 @@ buildGoPackage rec {
goPackagePath = "viric.name/soft/filegive"; goPackagePath = "viric.name/soft/filegive";
meta = with lib; { meta = with lib; {
homepage = "http://viric.name/cgi-bin/filegive"; homepage = "https://viric.name/cgi-bin/filegive";
description = "Easy p2p file sending program"; description = "Easy p2p file sending program";
license = licenses.agpl3Plus; license = licenses.agpl3Plus;
maintainers = [ maintainers.viric ]; maintainers = [ maintainers.viric ];

View file

@ -14,11 +14,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kea"; pname = "kea";
version = "1.9.9"; version = "1.9.10";
src = fetchurl { src = fetchurl {
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; sha256 = "08pr2qav87jmrf074v8zbqyjkl51wf6r9hhgbkzhdav9d4f9kny3";
}; };
patches = [ ./dont-create-var.patch ]; patches = [ ./dont-create-var.patch ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2021-08-06"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "offensive-security"; owner = "offensive-security";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-aKF/6SuSAk319QqGmyUu91//ofvPtHxX2Uv8FxhzqCM="; sha256 = "sha256-OSEG0pWnxSvUS1h9v1j9/poo15ZoouNqiG+qB/JrOHc=";
}; };
installPhase = '' installPhase = ''

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terrascan"; pname = "terrascan";
version = "1.8.1"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "accurics"; owner = "accurics";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk="; sha256 = "sha256-DTwA8nHWKOXeha0TBoEGJuoUedxJVev0R0GnHuaHEMc=";
}; };
vendorSha256 = "1fqk9dpbfz97jwx1m54a8q67g95n5w7m1bxb7g9gkzk98f1zzv3r"; vendorSha256 = "sha256-gDhEaJ444d7fITVaEkH5RXMykmZyXjC+mPfaa2vkpIk=";
# Tests want to download a vulnerable Terraform project # Tests want to download a vulnerable Terraform project
doCheck = false; doCheck = false;

View file

@ -90,7 +90,6 @@ stdenv.mkDerivation {
kovirobi kovirobi
]; ];
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.isDarwin;
}; };
} }
# TODO: investigate the mouse chording support patch # TODO: investigate the mouse chording support patch

View file

@ -1,15 +1,16 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sg3_utils-1.46r862"; pname = "sg3_utils";
version = "1.46r862";
src = fetchurl { src = fetchurl {
url = "http://sg.danny.cz/sg/p/${name}.tgz"; url = "http://sg.danny.cz/sg/p/sg3_utils-${version}.tgz";
sha256 = "sha256-s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; sha256 = "sha256-s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8=";
}; };
meta = with lib; { meta = with lib; {
homepage = "http://sg.danny.cz/sg/"; homepage = "https://sg.danny.cz/sg/";
description = "Utilities that send SCSI commands to devices"; description = "Utilities that send SCSI commands to devices";
platforms = platforms.linux; platforms = platforms.linux;
license = with licenses; [ bsd2 gpl2Plus ]; license = with licenses; [ bsd2 gpl2Plus ];

View file

@ -1,17 +1,25 @@
{ lib, stdenv, fetchurl, autoreconfHook { lib
, enableMail ? false, mailutils, inetutils , stdenv
, IOKit, ApplicationServices }: , fetchurl
, autoreconfHook
, enableMail ? false
, mailutils
, inetutils
, IOKit
, ApplicationServices
}:
let let
dbrev = "5171"; dbrev = "5171";
drivedbBranch = "RELEASE_7_2_DRIVEDB"; drivedbBranch = "RELEASE_7_2_DRIVEDB";
driverdb = fetchurl { driverdb = fetchurl {
url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn"; sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn";
name = "smartmontools-drivedb.h"; name = "smartmontools-drivedb.h";
}; };
in stdenv.mkDerivation rec { in
stdenv.mkDerivation rec {
pname = "smartmontools"; pname = "smartmontools";
version = "7.2"; version = "7.2";
@ -24,10 +32,11 @@ in stdenv.mkDerivation rec {
# fixes darwin build # fixes darwin build
./smartmontools.patch ./smartmontools.patch
]; ];
postPatch = "cp -v ${driverdb} drivedb.h"; postPatch = ''
cp -v ${driverdb} drivedb.h
'';
configureFlags = lib.optional enableMail configureFlags = lib.optional enableMail "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}";
"--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}";
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ];
@ -35,10 +44,10 @@ in stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Tools for monitoring the health of hard drives"; description = "Tools for monitoring the health of hard drives";
homepage = "https://www.smartmontools.org/"; homepage = "https://www.smartmontools.org/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ peti Frostman ]; maintainers = with maintainers; [ peti Frostman ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
mainProgram = "smartctl"; mainProgram = "smartctl";
}; };
} }

View file

@ -526,6 +526,7 @@ mapAliases ({
nmap-unfree = nmap; # added 2021-04-06 nmap-unfree = nmap; # added 2021-04-06
nologin = shadow; # added 2018-04-25 nologin = shadow; # added 2018-04-25
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
nxproxy = nx-libs; # added 2019-02-15 nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
oauth2_proxy = oauth2-proxy; # added 2021-04-18 oauth2_proxy = oauth2-proxy; # added 2021-04-18

View file

@ -6701,8 +6701,6 @@ with pkgs;
nodejs = pkgs.nodejs; nodejs = pkgs.nodejs;
}); });
now-cli = callPackage ../development/web/now-cli {};
np2kai = callPackage ../misc/emulators/np2kai { }; np2kai = callPackage ../misc/emulators/np2kai { };
ox = callPackage ../applications/editors/ox { }; ox = callPackage ../applications/editors/ox { };
@ -7033,6 +7031,8 @@ with pkgs;
marktext = callPackage ../applications/misc/marktext { }; marktext = callPackage ../applications/misc/marktext { };
mars-mips = callPackage ../development/tools/mars-mips { };
mawk = callPackage ../tools/text/mawk { }; mawk = callPackage ../tools/text/mawk { };
mb2md = callPackage ../tools/text/mb2md { }; mb2md = callPackage ../tools/text/mb2md { };
@ -16419,6 +16419,8 @@ with pkgs;
libcacard = callPackage ../development/libraries/libcacard { }; libcacard = callPackage ../development/libraries/libcacard { };
libcamera = callPackage ../development/libraries/libcamera { };
libcanberra = callPackage ../development/libraries/libcanberra { libcanberra = callPackage ../development/libraries/libcanberra {
inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
}; };
@ -30765,6 +30767,8 @@ with pkgs;
logisim = callPackage ../applications/science/logic/logisim {}; logisim = callPackage ../applications/science/logic/logisim {};
logisim-evolution = callPackage ../applications/science/logic/logisim-evolution {};
ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; ltl2ba = callPackage ../applications/science/logic/ltl2ba {};
metis-prover = callPackage ../applications/science/logic/metis-prover { }; metis-prover = callPackage ../applications/science/logic/metis-prover { };
@ -31361,7 +31365,7 @@ with pkgs;
faustStk = callPackage ../applications/audio/faustStk { }; faustStk = callPackage ../applications/audio/faustStk { };
fceux = callPackage ../misc/emulators/fceux { }; fceux = libsForQt5.callPackage ../misc/emulators/fceux { };
flockit = callPackage ../tools/backup/flockit { }; flockit = callPackage ../tools/backup/flockit { };

View file

@ -5438,8 +5438,6 @@ in {
pysyncthru = callPackage ../development/python-modules/pysyncthru { }; pysyncthru = callPackage ../development/python-modules/pysyncthru { };
pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { };
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; python-crfsuite = callPackage ../development/python-modules/python-crfsuite { };
@ -6969,6 +6967,8 @@ in {
pytest-socket = callPackage ../development/python-modules/pytest-socket { }; pytest-socket = callPackage ../development/python-modules/pytest-socket { };
pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { };
pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { };
pytest-subtests = callPackage ../development/python-modules/pytest-subtests { }; pytest-subtests = callPackage ../development/python-modules/pytest-subtests { };
@ -7918,6 +7918,8 @@ in {
scripttest = callPackage ../development/python-modules/scripttest { }; scripttest = callPackage ../development/python-modules/scripttest { };
scikit-survival = callPackage ../development/python-modules/scikit-survival { };
scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
sdnotify = callPackage ../development/python-modules/sdnotify { }; sdnotify = callPackage ../development/python-modules/sdnotify { };