diff --git a/lib/licenses.nix b/lib/licenses.nix
index 4792f1cb5925..57939308c3a3 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -1,44 +1,56 @@
{ lib }:
-let
- spdx = lic: lic // {
- url = "https://spdx.org/licenses/${lic.spdxId}.html";
+lib.mapAttrs (lname: lset: let
+ defaultLicense = rec {
+ shortName = lname;
+ free = true; # Most of our licenses are Free, explicitly declare unfree additions as such!
+ deprecated = false;
};
-in
-
-lib.mapAttrs (n: v: v // { shortName = n; }) ({
+ mkLicense = licenseDeclaration: let
+ applyDefaults = license: defaultLicense // license;
+ 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.
* 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.
*/
- abstyles = spdx {
+ abstyles = {
spdxId = "Abstyles";
fullName = "Abstyles License";
};
- afl20 = spdx {
+ afl20 = {
spdxId = "AFL-2.0";
fullName = "Academic Free License v2.0";
};
- afl21 = spdx {
+ afl21 = {
spdxId = "AFL-2.1";
fullName = "Academic Free License v2.1";
};
- afl3 = spdx {
+ afl3 = {
spdxId = "AFL-3.0";
fullName = "Academic Free License v3.0";
};
- agpl3Only = spdx {
+ agpl3Only = {
spdxId = "AGPL-3.0-only";
fullName = "GNU Affero General Public License v3.0 only";
};
- agpl3Plus = spdx {
+ agpl3Plus = {
spdxId = "AGPL-3.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;
};
- apsl20 = spdx {
+ apsl20 = {
spdxId = "APSL-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/";
};
- artistic1 = spdx {
+ artistic1 = {
spdxId = "Artistic-1.0";
fullName = "Artistic License 1.0";
};
- artistic2 = spdx {
+ artistic2 = {
spdxId = "Artistic-2.0";
fullName = "Artistic License 2.0";
};
- asl20 = spdx {
+ asl20 = {
spdxId = "Apache-2.0";
fullName = "Apache License 2.0";
};
- boost = spdx {
+ boost = {
spdxId = "BSL-1.0";
fullName = "Boost Software License 1.0";
};
- beerware = spdx {
+ beerware = {
spdxId = "Beerware";
fullName = "Beerware License";
};
- blueOak100 = spdx {
+ blueOak100 = {
spdxId = "BlueOak-1.0.0";
fullName = "Blue Oak Model License 1.0.0";
};
- bsd0 = spdx {
+ bsd0 = {
spdxId = "0BSD";
fullName = "BSD Zero Clause License";
};
- bsd1 = spdx {
+ bsd1 = {
spdxId = "BSD-1-Clause";
fullName = "BSD 1-Clause License";
};
- bsd2 = spdx {
+ bsd2 = {
spdxId = "BSD-2-Clause";
fullName = ''BSD 2-clause "Simplified" License'';
};
- bsd2Patent = spdx {
+ bsd2Patent = {
spdxId = "BSD-2-Clause-Patent";
fullName = "BSD-2-Clause Plus Patent License";
};
- bsd3 = spdx {
+ bsd3 = {
spdxId = "BSD-3-Clause";
fullName = ''BSD 3-clause "New" or "Revised" License'';
};
- bsdOriginal = spdx {
+ bsdOriginal = {
spdxId = "BSD-4-Clause";
fullName = ''BSD 4-clause "Original" or "Old" License'';
};
- bsdOriginalUC = spdx {
+ bsdOriginalUC = {
spdxId = "BSD-4-Clause-UC";
fullName = "BSD 4-Clause University of California-Specific";
};
- bsdProtection = spdx {
+ bsdProtection = {
spdxId = "BSD-Protection";
fullName = "BSD Protection License";
};
@@ -141,119 +153,119 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- clArtistic = spdx {
+ clArtistic = {
spdxId = "ClArtistic";
fullName = "Clarified Artistic License";
};
- cc0 = spdx {
+ cc0 = {
spdxId = "CC0-1.0";
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";
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
free = false;
};
- cc-by-nc-sa-25 = spdx {
+ cc-by-nc-sa-25 = {
spdxId = "CC-BY-NC-SA-2.5";
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";
free = false;
};
- cc-by-nc-sa-30 = spdx {
+ cc-by-nc-sa-30 = {
spdxId = "CC-BY-NC-SA-3.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";
free = false;
};
- cc-by-nc-sa-40 = spdx {
+ cc-by-nc-sa-40 = {
spdxId = "CC-BY-NC-SA-4.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";
free = false;
};
- cc-by-nc-30 = spdx {
+ cc-by-nc-30 = {
spdxId = "CC-BY-NC-3.0";
fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";
free = false;
};
- cc-by-nc-40 = spdx {
+ cc-by-nc-40 = {
spdxId = "CC-BY-NC-4.0";
fullName = "Creative Commons Attribution Non Commercial 4.0 International";
free = false;
};
- cc-by-nd-30 = spdx {
+ cc-by-nd-30 = {
spdxId = "CC-BY-ND-3.0";
fullName = "Creative Commons Attribution-No Derivative Works v3.00";
free = false;
};
- cc-by-sa-25 = spdx {
+ cc-by-sa-25 = {
spdxId = "CC-BY-SA-2.5";
fullName = "Creative Commons Attribution Share Alike 2.5";
};
- cc-by-30 = spdx {
+ cc-by-30 = {
spdxId = "CC-BY-3.0";
fullName = "Creative Commons Attribution 3.0";
};
- cc-by-sa-30 = spdx {
+ cc-by-sa-30 = {
spdxId = "CC-BY-SA-3.0";
fullName = "Creative Commons Attribution Share Alike 3.0";
};
- cc-by-40 = spdx {
+ cc-by-40 = {
spdxId = "CC-BY-4.0";
fullName = "Creative Commons Attribution 4.0";
};
- cc-by-sa-40 = spdx {
+ cc-by-sa-40 = {
spdxId = "CC-BY-SA-4.0";
fullName = "Creative Commons Attribution Share Alike 4.0";
};
- cddl = spdx {
+ cddl = {
spdxId = "CDDL-1.0";
fullName = "Common Development and Distribution License 1.0";
};
- cecill20 = spdx {
+ cecill20 = {
spdxId = "CECILL-2.0";
fullName = "CeCILL Free Software License Agreement v2.0";
};
- cecill-b = spdx {
+ cecill-b = {
spdxId = "CECILL-B";
fullName = "CeCILL-B Free Software License Agreement";
};
- cecill-c = spdx {
+ cecill-c = {
spdxId = "CECILL-C";
fullName = "CeCILL-C Free Software License Agreement";
};
- cpal10 = spdx {
+ cpal10 = {
spdxId = "CPAL-1.0";
fullName = "Common Public Attribution License 1.0";
};
- cpl10 = spdx {
+ cpl10 = {
spdxId = "CPL-1.0";
fullName = "Common Public License 1.0";
};
- curl = spdx {
+ curl = {
spdxId = "curl";
fullName = "curl License";
};
- doc = spdx {
+ doc = {
spdxId = "DOC";
fullName = "DOC License";
};
@@ -264,12 +276,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- efl10 = spdx {
+ efl10 = {
spdxId = "EFL-1.0";
fullName = "Eiffel Forum License v1.0";
};
- efl20 = spdx {
+ efl20 = {
spdxId = "EFL-2.0";
fullName = "Eiffel Forum License v2.0";
};
@@ -280,12 +292,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- epl10 = spdx {
+ epl10 = {
spdxId = "EPL-1.0";
fullName = "Eclipse Public License 1.0";
};
- epl20 = spdx {
+ epl20 = {
spdxId = "EPL-2.0";
fullName = "Eclipse Public License 2.0";
};
@@ -296,42 +308,42 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- eupl11 = spdx {
+ eupl11 = {
spdxId = "EUPL-1.1";
fullName = "European Union Public License 1.1";
};
- eupl12 = spdx {
+ eupl12 = {
spdxId = "EUPL-1.2";
fullName = "European Union Public License 1.2";
};
- fdl11Only = spdx {
+ fdl11Only = {
spdxId = "GFDL-1.1-only";
fullName = "GNU Free Documentation License v1.1 only";
};
- fdl11Plus = spdx {
+ fdl11Plus = {
spdxId = "GFDL-1.1-or-later";
fullName = "GNU Free Documentation License v1.1 or later";
};
- fdl12Only = spdx {
+ fdl12Only = {
spdxId = "GFDL-1.2-only";
fullName = "GNU Free Documentation License v1.2 only";
};
- fdl12Plus = spdx {
+ fdl12Plus = {
spdxId = "GFDL-1.2-or-later";
fullName = "GNU Free Documentation License v1.2 or later";
};
- fdl13Only = spdx {
+ fdl13Only = {
spdxId = "GFDL-1.3-only";
fullName = "GNU Free Documentation License v1.3 only";
};
- fdl13Plus = spdx {
+ fdl13Plus = {
spdxId = "GFDL-1.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";
};
- ftl = spdx {
+ ftl = {
spdxId = "FTL";
fullName = "Freetype Project License";
};
@@ -362,22 +374,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- gpl1Only = spdx {
+ gpl1Only = {
spdxId = "GPL-1.0-only";
fullName = "GNU General Public License v1.0 only";
};
- gpl1Plus = spdx {
+ gpl1Plus = {
spdxId = "GPL-1.0-or-later";
fullName = "GNU General Public License v1.0 or later";
};
- gpl2Only = spdx {
+ gpl2Only = {
spdxId = "GPL-2.0-only";
fullName = "GNU General Public License v2.0 only";
};
- gpl2Classpath = spdx {
+ gpl2Classpath = {
spdxId = "GPL-2.0-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";
};
- gpl2Plus = spdx {
+ gpl2Plus = {
spdxId = "GPL-2.0-or-later";
fullName = "GNU General Public License v2.0 or later";
};
- gpl3Only = spdx {
+ gpl3Only = {
spdxId = "GPL-3.0-only";
fullName = "GNU General Public License v3.0 only";
};
- gpl3Plus = spdx {
+ gpl3Plus = {
spdxId = "GPL-3.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";
};
- hpnd = spdx {
+ hpnd = {
spdxId = "HPND";
fullName = "Historic Permission Notice and Disclaimer";
};
- hpndSellVariant = spdx {
+ hpndSellVariant = {
fullName = "Historical Permission Notice and Disclaimer - 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";
};
- ijg = spdx {
+ ijg = {
spdxId = "IJG";
fullName = "Independent JPEG Group License";
};
- imagemagick = spdx {
+ imagemagick = {
fullName = "ImageMagick License";
spdxId = "imagemagick";
};
@@ -450,17 +462,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- ipa = spdx {
+ ipa = {
spdxId = "IPA";
fullName = "IPA Font License";
};
- ipl10 = spdx {
+ ipl10 = {
spdxId = "IPL-1.0";
fullName = "IBM Public License v1.0";
};
- isc = spdx {
+ isc = {
spdxId = "ISC";
fullName = "ISC License";
};
@@ -478,52 +490,52 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- lgpl2Only = spdx {
+ lgpl2Only = {
spdxId = "LGPL-2.0-only";
fullName = "GNU Library General Public License v2 only";
};
- lgpl2Plus = spdx {
+ lgpl2Plus = {
spdxId = "LGPL-2.0-or-later";
fullName = "GNU Library General Public License v2 or later";
};
- lgpl21Only = spdx {
+ lgpl21Only = {
spdxId = "LGPL-2.1-only";
fullName = "GNU Lesser General Public License v2.1 only";
};
- lgpl21Plus = spdx {
+ lgpl21Plus = {
spdxId = "LGPL-2.1-or-later";
fullName = "GNU Lesser General Public License v2.1 or later";
};
- lgpl3Only = spdx {
+ lgpl3Only = {
spdxId = "LGPL-3.0-only";
fullName = "GNU Lesser General Public License v3.0 only";
};
- lgpl3Plus = spdx {
+ lgpl3Plus = {
spdxId = "LGPL-3.0-or-later";
fullName = "GNU Lesser General Public License v3.0 or later";
};
- lgpllr = spdx {
+ lgpllr = {
spdxId = "LGPLLR";
fullName = "Lesser General Public License For Linguistic Resources";
};
- libpng = spdx {
+ libpng = {
spdxId = "Libpng";
fullName = "libpng License";
};
- libpng2 = spdx {
+ libpng2 = {
spdxId = "libpng-2.0"; # Used since libpng 1.6.36.
fullName = "PNG Reference Library version 2";
};
- libtiff = spdx {
+ libtiff = {
spdxId = "libtiff";
fullName = "libtiff License";
};
@@ -533,22 +545,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://opensource.franz.com/preamble.html";
};
- llvm-exception = spdx {
+ llvm-exception = {
spdxId = "LLVM-exception";
fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License
};
- lppl12 = spdx {
+ lppl12 = {
spdxId = "LPPL-1.2";
fullName = "LaTeX Project Public License v1.2";
};
- lppl13c = spdx {
+ lppl13c = {
spdxId = "LPPL-1.3c";
fullName = "LaTeX Project Public License v1.3c";
};
- lpl-102 = spdx {
+ lpl-102 = {
spdxId = "LPL-1.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
# for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions
- mit = spdx {
+ mit = {
spdxId = "MIT";
fullName = "MIT License";
};
- mpl10 = spdx {
+ mpl10 = {
spdxId = "MPL-1.0";
fullName = "Mozilla Public License 1.0";
};
- mpl11 = spdx {
+ mpl11 = {
spdxId = "MPL-1.1";
fullName = "Mozilla Public License 1.1";
};
- mpl20 = spdx {
+ mpl20 = {
spdxId = "MPL-2.0";
fullName = "Mozilla Public License 2.0";
};
- mspl = spdx {
+ mspl = {
spdxId = "MS-PL";
fullName = "Microsoft Public License";
};
- nasa13 = spdx {
+ nasa13 = {
spdxId = "NASA-1.3";
fullName = "NASA Open Source Agreement 1.3";
free = false;
};
- ncsa = spdx {
+ ncsa = {
spdxId = "NCSA";
fullName = "University of Illinois/NCSA Open Source License";
};
- nposl3 = spdx {
+ nposl3 = {
spdxId = "NPOSL-3.0";
fullName = "Non-Profit Open Software License 3.0";
};
@@ -613,53 +625,53 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- odbl = spdx {
+ odbl = {
spdxId = "ODbL-1.0";
fullName = "Open Data Commons Open Database License v1.0";
};
- ofl = spdx {
+ ofl = {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
};
- openldap = spdx {
+ openldap = {
spdxId = "OLDAP-2.8";
fullName = "Open LDAP Public License v2.8";
};
- openssl = spdx {
+ openssl = {
spdxId = "OpenSSL";
fullName = "OpenSSL License";
};
- osl2 = spdx {
+ osl2 = {
spdxId = "OSL-2.0";
fullName = "Open Software License 2.0";
};
- osl21 = spdx {
+ osl21 = {
spdxId = "OSL-2.1";
fullName = "Open Software License 2.1";
};
- osl3 = spdx {
+ osl3 = {
spdxId = "OSL-3.0";
fullName = "Open Software License 3.0";
};
- parity70 = spdx {
+ parity70 = {
spdxId = "Parity-7.0.0";
fullName = "Parity Public License 7.0.0";
url = "https://paritylicense.com/versions/7.0.0.html";
};
- php301 = spdx {
+ php301 = {
spdxId = "PHP-3.01";
fullName = "PHP License v3.01";
};
- postgresql = spdx {
+ postgresql = {
spdxId = "PostgreSQL";
fullName = "PostgreSQL License";
};
@@ -670,7 +682,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- psfl = spdx {
+ psfl = {
spdxId = "Python-2.0";
fullName = "Python Software Foundation License version 2";
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";
};
- qhull = spdx {
+ qhull = {
spdxId = "Qhull";
fullName = "Qhull License";
};
- qpl = spdx {
+ qpl = {
spdxId = "QPL-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";
};
- ruby = spdx {
+ ruby = {
spdxId = "Ruby";
fullName = "Ruby License";
};
- sendmail = spdx {
+ sendmail = {
spdxId = "Sendmail";
fullName = "Sendmail License";
};
- sgi-b-20 = spdx {
+ sgi-b-20 = {
spdxId = "SGI-B-2.0";
fullName = "SGI Free Software License B v2.0";
};
- sleepycat = spdx {
+ sleepycat = {
spdxId = "Sleepycat";
fullName = "Sleepycat License";
};
@@ -737,6 +749,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
fullName = "Server Side Public License";
url = "https://www.mongodb.com/licensing/server-side-public-license";
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 = {
@@ -745,7 +761,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://github.com/thestk/stk/blob/master/LICENSE";
};
- tcltk = spdx {
+ tcltk = {
spdxId = "TCL";
fullName = "TCL/TK License";
};
@@ -763,25 +779,27 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
unfreeRedistributable = {
fullName = "Unfree redistributable";
free = false;
+ redistributable = true;
};
unfreeRedistributableFirmware = {
fullName = "Unfree redistributable firmware";
+ redistributable = true;
# Note: we currently consider these "free" for inclusion in the
# channel and NixOS images.
};
- unicode-dfs-2015 = spdx {
+ unicode-dfs-2015 = {
spdxId = "Unicode-DFS-2015";
fullName = "Unicode License Agreement - Data Files and Software (2015)";
};
- unicode-dfs-2016 = spdx {
+ unicode-dfs-2016 = {
spdxId = "Unicode-DFS-2016";
fullName = "Unicode License Agreement - Data Files and Software (2016)";
};
- unlicense = spdx {
+ unlicense = {
spdxId = "Unlicense";
fullName = "The Unlicense";
};
@@ -791,7 +809,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
url = "https://oss.oracle.com/licenses/upl/";
};
- vim = spdx {
+ vim = {
spdxId = "Vim";
fullName = "Vim License";
};
@@ -802,17 +820,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
- vsl10 = spdx {
+ vsl10 = {
spdxId = "VSL-1.0";
fullName = "Vovida Software License v1.0";
};
- watcom = spdx {
+ watcom = {
spdxId = "Watcom-1.0";
fullName = "Sybase Open Watcom Public License 1.0";
};
- w3c = spdx {
+ w3c = {
spdxId = "W3C";
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";
};
- wtfpl = spdx {
+ wtfpl = {
spdxId = "WTFPL";
fullName = "Do What The F*ck You Want To Public License";
};
- wxWindows = spdx {
+ wxWindows = {
spdxId = "wxWindows";
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
};
- zlib = spdx {
+ zlib = {
spdxId = "Zlib";
fullName = "zlib License";
};
- zpl20 = spdx {
+ zpl20 = {
spdxId = "ZPL-2.0";
fullName = "Zope Public License 2.0";
};
- zpl21 = spdx {
+ zpl21 = {
spdxId = "ZPL-2.1";
fullName = "Zope Public License 2.1";
};
} // {
# TODO: remove legacy aliases
- agpl3 = spdx {
+ agpl3 = {
spdxId = "AGPL-3.0";
fullName = "GNU Affero General Public License v3.0";
deprecated = true;
};
- fdl11 = spdx {
+ fdl11 = {
spdxId = "GFDL-1.1";
fullName = "GNU Free Documentation License v1.1";
deprecated = true;
};
- fdl12 = spdx {
+ fdl12 = {
spdxId = "GFDL-1.2";
fullName = "GNU Free Documentation License v1.2";
deprecated = true;
};
- fdl13 = spdx {
+ fdl13 = {
spdxId = "GFDL-1.3";
fullName = "GNU Free Documentation License v1.3";
deprecated = true;
};
- gpl1 = spdx {
+ gpl1 = {
spdxId = "GPL-1.0";
fullName = "GNU General Public License v1.0";
deprecated = true;
};
- gpl2 = spdx {
+ gpl2 = {
spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0";
deprecated = true;
};
- gpl3 = spdx {
+ gpl3 = {
spdxId = "GPL-3.0";
fullName = "GNU General Public License v3.0";
deprecated = true;
};
- lgpl2 = spdx {
+ lgpl2 = {
spdxId = "LGPL-2.0";
fullName = "GNU Library General Public License v2";
deprecated = true;
};
- lgpl21 = spdx {
+ lgpl21 = {
spdxId = "LGPL-2.1";
fullName = "GNU Lesser General Public License v2.1";
deprecated = true;
};
- lgpl3 = spdx {
+ lgpl3 = {
spdxId = "LGPL-3.0";
fullName = "GNU Lesser General Public License v3.0";
deprecated = true;
diff --git a/lib/options.nix b/lib/options.nix
index 87cd8b797969..204c86df9f51 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -11,6 +11,7 @@ let
filter
foldl'
head
+ tail
isAttrs
isBool
isDerivation
@@ -144,7 +145,7 @@ rec {
if def.value != first.value then
throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}"
else
- first) (head defs) defs).value;
+ first) (head defs) (tail defs)).value;
/* Extracts values of all "value" keys of the given list.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0096d15941d6..fdc0cd3c458d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6722,6 +6722,12 @@
githubId = 35892750;
name = "Maxine Aubrey";
};
+ maxhille = {
+ email = "mh@lambdasoup.com";
+ github = "maxhille";
+ githubId = 693447;
+ name = "Max Hille";
+ };
maxhbr = {
email = "nixos@maxhbr.dev";
github = "maxhbr";
@@ -6977,6 +6983,12 @@
fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92";
}];
};
+ michaeladler = {
+ email = "therisen06@gmail.com";
+ github = "michaeladler";
+ githubId = 1575834;
+ name = "Michael Adler";
+ };
michaelpj = {
email = "michaelpj@gmail.com";
github = "michaelpj";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index eacdb902da14..68d09a778131 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -182,6 +182,13 @@
from 1.0.4 to 3.0.1
+
+
+ The erigon ethereum node has moved to a new
+ database format in 2021-05-04, and requires
+ a full resync
+
+
services.geoip-updater was broken and has
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 3a08df5b341d..d7c38056ef61 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -57,6 +57,8 @@ pt-services.clipcat.enable).
- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1
+- The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync
+
- `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable).
- PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release.
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c2e588bf00dd..c7ab3f313a6e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -178,7 +178,7 @@ in
radvd = 139;
zookeeper = 140;
dnsmasq = 141;
- uhub = 142;
+ #uhub = 142; # unused
yandexdisk = 143;
mxisd = 144; # was once collectd
consul = 145;
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 889688a26853..98ef1e2c691b 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -61,7 +61,7 @@ in {
port = mkOption {
default = 8080;
- type = types.int;
+ type = types.port;
description = ''
Specifies port number on which the jenkins HTTP interface listens.
The default is 8080.
diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix
index 6d6c88b9b2aa..a6693013b73c 100644
--- a/nixos/modules/services/development/hoogle.nix
+++ b/nixos/modules/services/development/hoogle.nix
@@ -17,7 +17,7 @@ in {
enable = mkEnableOption "Haskell documentation server";
port = mkOption {
- type = types.int;
+ type = types.port;
default = 8080;
description = ''
Port number Hoogle will be listening to.
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index dcd825bba433..f1a1a88580eb 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -78,7 +78,7 @@ in {
port = mkOption {
default = 8123;
- type = types.int;
+ type = types.port;
description = "The port on which to listen.";
};
diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix
index d1b388310280..da2613e6db17 100644
--- a/nixos/modules/services/misc/uhub.nix
+++ b/nixos/modules/services/misc/uhub.nix
@@ -3,178 +3,110 @@
with lib;
let
-
- cfg = config.services.uhub;
-
- uhubPkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; };
-
- pluginConfig = ""
- + optionalString cfg.plugins.authSqlite.enable ''
- plugin ${uhubPkg.mod_auth_sqlite}/mod_auth_sqlite.so "file=${cfg.plugins.authSqlite.file}"
- ''
- + optionalString cfg.plugins.logging.enable ''
- plugin ${uhubPkg.mod_logging}/mod_logging.so ${if cfg.plugins.logging.syslog then "syslog=true" else "file=${cfg.plugins.logging.file}"}
- ''
- + optionalString cfg.plugins.welcome.enable ''
- plugin ${uhubPkg.mod_welcome}/mod_welcome.so "motd=${pkgs.writeText "motd.txt" cfg.plugins.welcome.motd} rules=${pkgs.writeText "rules.txt" cfg.plugins.welcome.rules}"
- ''
- + optionalString cfg.plugins.history.enable ''
- plugin ${uhubPkg.mod_chat_history}/mod_chat_history.so "history_max=${toString cfg.plugins.history.max} history_default=${toString cfg.plugins.history.default} history_connect=${toString cfg.plugins.history.connect}"
- '';
-
- uhubConfigFile = pkgs.writeText "uhub.conf" ''
- file_acl=${pkgs.writeText "users.conf" cfg.aclConfig}
- file_plugins=${pkgs.writeText "plugins.conf" pluginConfig}
- server_bind_addr=${cfg.address}
- server_port=${toString cfg.port}
- ${lib.optionalString cfg.enableTLS "tls_enable=yes"}
- ${cfg.hubConfig}
- '';
-
-in
-
-{
+ settingsFormat = {
+ type = with lib.types; attrsOf (oneOf [ bool int str ]);
+ generate = name: attrs:
+ pkgs.writeText name (lib.strings.concatStringsSep "\n"
+ (lib.attrsets.mapAttrsToList
+ (key: value: "${key}=${builtins.toJSON value}") attrs));
+ };
+in {
options = {
- services.uhub = {
+ services.uhub = mkOption {
+ default = { };
+ description = "Uhub ADC hub instances";
+ type = types.attrsOf (types.submodule {
+ options = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable the uhub ADC hub.";
- };
+ enable = mkEnableOption "hub instance" // { default = true; };
- port = mkOption {
- type = types.int;
- default = 1511;
- description = "TCP port to bind the hub to.";
- };
-
- address = mkOption {
- type = types.str;
- default = "any";
- description = "Address to bind the hub to.";
- };
-
- enableTLS = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable TLS support.";
- };
-
- hubConfig = mkOption {
- type = types.lines;
- default = "";
- description = "Contents of uhub configuration file.";
- };
-
- aclConfig = mkOption {
- type = types.lines;
- default = "";
- description = "Contents of user ACL configuration file.";
- };
-
- plugins = {
-
- authSqlite = {
- enable = mkOption {
+ enableTLS = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable the Sqlite authentication database plugin";
+ description = "Whether to enable TLS support.";
};
- file = mkOption {
- type = types.path;
- example = "/var/db/uhub-users";
- description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users.";
- };
- };
- logging = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable the logging plugin.";
- };
- file = mkOption {
- type = types.str;
- default = "";
- description = "Path of log file.";
- };
- syslog = mkOption {
- type = types.bool;
- default = false;
- description = "If true then the system log is used instead of writing to file.";
- };
- };
-
- welcome = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable the welcome plugin.";
- };
- motd = mkOption {
- default = "";
- type = types.lines;
+ settings = mkOption {
+ inherit (settingsFormat) type;
description = ''
- Welcome message displayed to clients after connecting
- and with the !motd command.
+ Configuration of uhub.
+ See https://www.uhub.org/doc/config.php for a list of options.
'';
+ default = { };
+ example = {
+ server_bind_addr = "any";
+ server_port = 1511;
+ hub_name = "My Public Hub";
+ hub_description = "Yet another ADC hub";
+ max_users = 150;
+ };
};
- rules = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Rules message, displayed to clients with the !rules command.
- '';
- };
- };
- history = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable the history plugin.";
+ plugins = mkOption {
+ description = "Uhub plugin configuration.";
+ type = with types;
+ listOf (submodule {
+ options = {
+ plugin = mkOption {
+ type = path;
+ example = literalExample
+ "$${pkgs.uhub}/plugins/mod_auth_sqlite.so";
+ description = "Path to plugin file.";
+ };
+ settings = mkOption {
+ description = "Settings specific to this plugin.";
+ type = with types; attrsOf str;
+ example = { file = "/etc/uhub/users.db"; };
+ };
+ };
+ });
+ default = [ ];
};
- max = mkOption {
- type = types.int;
- default = 200;
- description = "The maximum number of messages to keep in history";
- };
- default = mkOption {
- type = types.int;
- default = 10;
- description = "When !history is provided without arguments, then this default number of messages are returned.";
- };
- connect = mkOption {
- type = types.int;
- default = 5;
- description = "The number of chat history messages to send when users connect (0 = do not send any history).";
- };
- };
- };
+ };
+ });
};
};
- config = mkIf cfg.enable {
+ config = let
+ hubs = lib.attrsets.filterAttrs (_: cfg: cfg.enable) config.services.uhub;
+ in {
- users = {
- users.uhub.uid = config.ids.uids.uhub;
- groups.uhub.gid = config.ids.gids.uhub;
- };
+ environment.etc = lib.attrsets.mapAttrs' (name: cfg:
+ let
+ settings' = cfg.settings // {
+ tls_enable = cfg.enableTLS;
+ file_plugins = pkgs.writeText "uhub-plugins.conf"
+ (lib.strings.concatStringsSep "\n" (map ({ plugin, settings }:
+ "plugin ${plugin} ${
+ toString
+ (lib.attrsets.mapAttrsToList (key: value: ''"${key}=${value}"'')
+ settings)
+ }") cfg.plugins));
+ };
+ in {
+ name = "uhub/${name}.conf";
+ value.source = settingsFormat.generate "uhub-${name}.conf" settings';
+ }) hubs;
- systemd.services.uhub = {
- description = "high performance peer-to-peer hub for the ADC network";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- Type = "notify";
- ExecStart = "${uhubPkg}/bin/uhub -c ${uhubConfigFile} -u uhub -g uhub -L";
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ systemd.services = lib.attrsets.mapAttrs' (name: cfg: {
+ name = "uhub-${name}";
+ value = let pkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; };
+ in {
+ description = "high performance peer-to-peer hub for the ADC network";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ reloadIfChanged = true;
+ serviceConfig = {
+ Type = "notify";
+ ExecStart = "${pkg}/bin/uhub -c /etc/uhub/${name}.conf -L";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ DynamicUser = true;
+ };
};
- };
+ }) hubs;
};
}
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 93a21fd4c97e..fba0d817006e 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -32,9 +32,9 @@ let
description = "Bind address for ${name} endpoint.";
};
port = mkOption {
- type = types.int;
+ type = types.port;
default = port;
- description = "Bind port for ${name} endoint.";
+ description = "Bind port for ${name} endpoint.";
};
};
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index a808a7f39d05..405808491ea4 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -41,7 +41,7 @@ in {
};
port = mkOption {
- type = types.int;
+ type = types.port;
default = 9000;
description = "TCP port to listen on for http connections.";
};
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 2c96b94ca43c..28d7c82f8575 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -520,11 +520,7 @@ in
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
- ${if cfg.forwardX11 then ''
- X11Forwarding yes
- '' else ''
- X11Forwarding no
- ''}
+ X11Forwarding ${if cfg.forwardX11 then "yes" else "no"}
${optionalString cfg.allowSFTP ''
Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}
diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix
index e3147c10502c..27a16fb2e29f 100644
--- a/nixos/modules/services/networking/syncplay.nix
+++ b/nixos/modules/services/networking/syncplay.nix
@@ -21,7 +21,7 @@ in
};
port = mkOption {
- type = types.int;
+ type = types.port;
default = 8999;
description = ''
TCP port to bind to.
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 494d21cc8678..6238a351b998 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -42,11 +42,6 @@ in {
description = ''
The interfaces wpa_supplicant will use. If empty, it will
automatically use all wireless interfaces.
-
- 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.
-
'';
};
@@ -230,14 +225,6 @@ in {
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 ];
services.dbus.packages = [ package ];
@@ -258,31 +245,45 @@ in {
wantedBy = [ "multi-user.target" ];
stopIfChanged = false;
- path = [ package ];
+ path = [ package pkgs.udev ];
script = let
configStr = if cfg.allowAuxiliaryImperativeNetworks
then "-c /etc/wpa_supplicant.conf -I ${configFile}"
else "-c ${configFile}";
in ''
- if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]
- then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
+ if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then
+ echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
fi
+
iface_args="-s -u -D${cfg.driver} ${configStr}"
+
${if ifaces == [] then ''
- for i in $(cd /sys/class/net && echo *); do
- DEVTYPE=
- UEVENT_PATH=/sys/class/net/$i/uevent
- if [ -e "$UEVENT_PATH" ]; then
- source "$UEVENT_PATH"
- if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
- args+="''${args:+ -N} -i$i $iface_args"
- fi
- fi
+ # detect interfaces automatically
+
+ # check if there are no wireless interface
+ if ! find -H /sys/class/net/* -name wireless | grep -q .; then
+ # if so, wait until one appears
+ echo "Waiting for wireless interfaces"
+ grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu)
+ # Note: the above line has been carefully written:
+ # 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
'' else ''
+ # add known interfaces to the daemon arguments
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''}
+
+ # finally start daemon
exec wpa_supplicant $args
'';
};
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index f354a9d42c79..a34b2d871541 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -32,7 +32,7 @@ in with lib; {
};
port = mkOption {
- type = types.int;
+ type = types.port;
default = 43110;
example = 43110;
description = "Optional zeronet web UI port.";
@@ -41,7 +41,7 @@ in with lib; {
fileserverPort = mkOption {
# Not optional: when absent zeronet tries to write one to the
# read-only config file and crashes
- type = types.int;
+ type = types.port;
default = 12261;
example = 12261;
description = "Zeronet fileserver port.";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 30c1c77c6c94..8369f60e7b2e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -94,6 +94,7 @@ in
cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
+ cryptpad = handleTest ./cryptpad.nix {};
deluge = handleTest ./deluge.nix {};
dendrite = handleTest ./dendrite.nix {};
dhparams = handleTest ./dhparams.nix {};
diff --git a/nixos/tests/cryptpad.nix b/nixos/tests/cryptpad.nix
new file mode 100644
index 000000000000..895f291abaca
--- /dev/null
+++ b/nixos/tests/cryptpad.nix
@@ -0,0 +1,18 @@
+import ./make-test-python.nix ({ lib, ... }:
+
+with lib;
+
+{
+ name = "cryptpad";
+ meta.maintainers = with maintainers; [ davhau ];
+
+ nodes.machine =
+ { pkgs, ... }:
+ { services.cryptpad.enable = true; };
+
+ testScript = ''
+ machine.wait_for_unit("cryptpad.service")
+ machine.wait_for_open_port("3000")
+ machine.succeed("curl -L --fail http://localhost:3000/sheet")
+ '';
+})
diff --git a/pkgs/applications/accessibility/svkbd/default.nix b/pkgs/applications/accessibility/svkbd/default.nix
index 57e6cdba5ae8..eb9ddb091693 100644
--- a/pkgs/applications/accessibility/svkbd/default.nix
+++ b/pkgs/applications/accessibility/svkbd/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "svkbd";
- version = "0.3";
+ version = "0.4";
src = fetchurl {
url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz";
- sha256 = "108khx665d7dlzs04iy4g1nw3fyqpy6kd0afrwiapaibgv4xhfsk";
+ sha256 = "sha256-j9RW5/4cb8l3FK9jpFf206l1rQhCR5H/WMiu7I6rzV8=";
};
inherit patches;
diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix
new file mode 100644
index 000000000000..3338fe40bf17
--- /dev/null
+++ b/pkgs/applications/audio/cyanrip/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, ffmpeg
+, libcdio
+, libcdio-paranoia
+, libmusicbrainz5
+, curl
+}:
+stdenv.mkDerivation rec {
+ pname = "cyanrip";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "cyanreg";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0lgb92sfpf4w3nj5vlj6j7931mj2q3cmcx1app9snf853jk9ahmw";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ];
+ buildInputs = [ ffmpeg libcdio libcdio-paranoia libmusicbrainz5 curl ];
+
+ meta = with lib; {
+ homepage = "https://github.com/cyanreg/cyanrip";
+ description = "Bule-ish CD ripper";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.zane ];
+ };
+}
diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix
new file mode 100644
index 000000000000..0d6a395b05af
--- /dev/null
+++ b/pkgs/applications/blockchains/erigon.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "erigon";
+ version = "2021.08.01";
+
+ src = fetchFromGitHub {
+ owner = "ledgerwatch";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M=";
+ };
+
+ vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs";
+ runVend = true;
+
+ # Build errors in mdbx when format hardening is enabled:
+ # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
+ hardeningDisable = [ "format" ];
+
+ subPackages = [
+ "cmd/erigon"
+ "cmd/evm"
+ "cmd/rpcdaemon"
+ "cmd/rlpdump"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/ledgerwatch/erigon/";
+ description = "Ethereum node implementation focused on scalability and modularity";
+ license = with licenses; [ lgpl3Plus gpl3Plus ];
+ maintainers = with maintainers; [ d-xo ];
+ };
+}
diff --git a/pkgs/applications/blockchains/turbo-geth/default.nix b/pkgs/applications/blockchains/turbo-geth/default.nix
deleted file mode 100644
index 58c0b45337eb..000000000000
--- a/pkgs/applications/blockchains/turbo-geth/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
- pname = "turbo-geth";
- version = "2021.05.02";
-
- src = fetchFromGitHub {
- owner = "ledgerwatch";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-7sTRAAlKZOdwi/LRbIEDKWpBe1ol8pZfEf2KIC4s0xk=";
- };
-
- vendorSha256 = "1d0ahdb2b5v8nxq3kdxw151phnyv6habb8kr8qjaq3kyhcnyk6ng";
- runVend = true;
-
- subPackages = [
- "cmd/tg"
- "cmd/evm"
- "cmd/rpcdaemon"
- "cmd/rlpdump"
- ];
-
- meta = with lib; {
- homepage = "https://github.com/ledgerwatch/turbo-geth/";
- description = "Ethereum node and geth fork focused on scalability and modularity";
- license = with licenses; [ lgpl3Plus gpl3Plus ];
- maintainers = with maintainers; [ d-xo ];
- };
-}
diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
index a36ff1cde464..315951b0e9e6 100644
--- a/pkgs/applications/editors/helix/default.nix
+++ b/pkgs/applications/editors/helix/default.nix
@@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec {
description = "A post-modern modal text editor";
homepage = "https://helix-editor.com";
license = licenses.mpl20;
+ mainProgram = "hx";
maintainers = with maintainers; [ yusdacra ];
};
}
diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix
index 55f75777bee5..7733f123ac01 100644
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@@ -3,13 +3,14 @@
, lib
, fetchFromGitHub
, fetchgit
+, fetchurl
, makeWrapper
, pkg-config
, python2
-, expat
, openssl
, SDL2
, fontconfig
+, freetype
, ninja
, gn
, llvmPackages
@@ -21,16 +22,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "neovide";
- version = "unstable-2021-06-21";
+ version = "unstable-2021-08-08";
src = fetchFromGitHub {
owner = "Kethku";
repo = "neovide";
- rev = "4159c47ff4f30073b92b9d63fc6ab70e07b74b6d";
- sha256 = "sha256-XwirJGXMGxc/NkpSeHBUc16ppvJ+H4ECnrOVu030Qfg=";
+ rev = "725f12cafd4a26babd0d6bbcbca9a99c181991ac";
+ sha256 = "sha256-ThMobWKe3wHhR15TmmKrI6Gp1wvGVfJ52MzibK0ubkc=";
};
- cargoSha256 = "sha256-WCk9kt81DtBwpEEdKH9gKQSVxAvH+vkyP2y24tU+vzY=";
+ cargoSha256 = "sha256-5lOGncnyA8DwetY5bU6k2KXNClFgp+xIBEeA0/iwGF0=";
SKIA_SOURCE_DIR =
let
@@ -38,8 +39,8 @@ rustPlatform.buildRustPackage rec {
owner = "rust-skia";
repo = "skia";
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
- rev = "m90-0.38.3";
- sha256 = "sha256-l8c4vfO1PELAT8bDyr/yQGZetZsaufAlJ6bBOXz7E1w=";
+ rev = "m91-0.39.4";
+ sha256 = "sha256-ovlR1vEZaQqawwth/UYVUSjFu+kTsywRpRClBaE1CEA=";
};
# The externals for skia are taken from skia/DEPS
externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json);
@@ -79,10 +80,20 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
buildInputs = [
- expat
openssl
SDL2
- fontconfig
+ (fontconfig.overrideAttrs (old: {
+ propagatedBuildInputs = [
+ # skia is not compatible with freetype 2.11.0
+ (freetype.overrideAttrs (old: rec {
+ version = "2.10.4";
+ src = fetchurl {
+ url = "mirror://savannah/${old.pname}/${old.pname}-${version}.tar.xz";
+ sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
+ };
+ }))
+ ];
+ }))
];
postFixup = ''
diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix
index 628b4c46cba5..d98e3b37514f 100644
--- a/pkgs/applications/editors/vim/vimacs.nix
+++ b/pkgs/applications/editors/vim/vimacs.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "vimacs";
- version = vimPackage.version;
+ version = lib.getVersion vimPackage;
vimPackage = if useMacvim then macvim else vim_configurable;
buildInputs = [ vimPackage vimPlugins.vimacs ];
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index a7f9fb328ffe..7279d6bf60b5 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -22,7 +22,7 @@ let
inherit pname version src sourceRoot;
passthru = {
- inherit executableName tests updateScript;
+ inherit executableName longName tests updateScript;
fhs = fhs {};
fhsWithPackages = f: fhs { additionalPkgs = f; };
};
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index d2c91f155d53..8f4e7f004245 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -1,4 +1,4 @@
-{ lib, runCommand, buildEnv, vscode, makeWrapper
+{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper
, vscodeExtensions ? [] }:
/*
@@ -42,8 +42,7 @@
*/
let
-
- inherit (vscode) executableName;
+ inherit (vscode) executableName longName;
wrappedPkgVersion = lib.getVersion vscode;
wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
@@ -52,6 +51,9 @@ let
paths = vscodeExtensions;
};
+ extensionsFlag = lib.optionalString (vscodeExtensions != []) ''
+ --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions"
+ '';
in
# When no extensions are requested, we simply redirect to the original
@@ -62,7 +64,17 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
dontPatchELF = true;
dontStrip = true;
meta = vscode.meta;
-} ''
+} (if stdenv.isDarwin then ''
+ mkdir -p $out/bin/
+ mkdir -p "$out/Applications/${longName}.app/Contents/MacOS"
+
+ for path in PkgInfo Frameworks Resources _CodeSignature Info.plist; do
+ ln -s "${vscode}/Applications/${longName}.app/Contents/$path" "$out/Applications/${longName}.app/Contents/"
+ done
+
+ makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag}
+ makeWrapper "${vscode}/Applications/${longName}.app/Contents/MacOS/Electron" "$out/Applications/${longName}.app/Contents/MacOS/Electron" ${extensionsFlag}
+'' else ''
mkdir -p "$out/bin"
mkdir -p "$out/share/applications"
mkdir -p "$out/share/pixmaps"
@@ -70,7 +82,5 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
- makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''
- --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions"
- ''}
-''
+ makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag}
+'')
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index 8c9639e3fd52..17a811aa87f8 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "openimageio";
- version = "2.2.12.0";
+ version = "2.2.17.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
- sha256 = "16z8lnsqhljbfaarfwx9rc95p0a9wxf4p271j6kxdfknjb88p56i";
+ sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h";
};
outputs = [ "bin" "out" "dev" "doc" ];
diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix
new file mode 100644
index 000000000000..bd1a98ef9cce
--- /dev/null
+++ b/pkgs/applications/misc/archivebox/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, requests
+, mypy-extensions
+, django_3
+, django_extensions
+, dateparser
+, youtube-dl
+, python-crontab
+, croniter
+, w3lib
+, ipython
+}:
+
+let
+ django_3' = django_3.overridePythonAttrs (old: rec {
+ pname = "Django";
+ version = "3.1.7";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac=";
+ };
+ });
+in
+
+buildPythonApplication rec {
+ pname = "archivebox";
+ version = "0.6.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ mypy-extensions
+ django_3'
+ django_extensions
+ dateparser
+ youtube-dl
+ python-crontab
+ croniter
+ w3lib
+ ipython
+ ];
+
+ meta = with lib; {
+ description = "Open source self-hosted web archiving";
+ homepage = "https://archivebox.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ siraben ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 387177a8c4c5..bfe9af768412 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -100,13 +100,13 @@ in {
application = mkSweetHome3D rec {
pname = lib.toLower module + "-application";
- version = "6.5.2";
+ version = "6.6";
module = "SweetHome3D";
description = "Design and visualize your future home";
license = lib.licenses.gpl2Plus;
src = fetchurl {
url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";
- sha256 = "1j0xm2vmcxxjmf12k8rfnisq9hd7hqaiyxrfbrbjxis9iq3kycp3";
+ sha256 = "sha256-CnVXpmodmyoZdqmt7OgRyzuLeDhkPhrAS/CldFM8SQs=";
};
desktopName = "Sweet Home 3D";
icons = {
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 783ea3e79402..d6ea3fccfa66 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -99,14 +99,14 @@ in {
};
furniture-editor = mkEditorProject rec {
- version = "1.27";
+ version = "1.28";
module = "FurnitureLibraryEditor";
pname = module;
description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
license = lib.licenses.gpl2;
src = fetchurl {
url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";
- sha256 = "1zxbcn9awgax8lalzkc05f5yfwbgnrayc17fkyv5i19j4qb3r2a0";
+ sha256 = "sha256-r5xJlUctUdcknJfm8rbz+bdzFhqgHsHpHwxEC4mItws=";
};
desktopName = "Sweet Home 3D - Furniture Library Editor";
};
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 0b6a57492c5c..000fc06bbf1b 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "zathura";
- version = "0.4.7";
+ version = "0.4.8";
src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
- sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0";
+ sha256 = "1nr0ym1mi2afk4ycdf1ppmkcv7i7hyzwn4p3r4m0j2qm3nvaiami";
};
outputs = [ "bin" "man" "dev" "out" ];
diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix
new file mode 100644
index 000000000000..ddb137137cf3
--- /dev/null
+++ b/pkgs/applications/networking/aether/default.nix
@@ -0,0 +1,115 @@
+{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook
+, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
+, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
+, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
+, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
+, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
+, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems
+}:
+
+let
+ binaryName = "AetherP2P";
+in
+stdenv.mkDerivation rec {
+ pname = "aether";
+ version = "2.0.0-dev.15";
+
+ srcs = [
+ (fetchurl {
+ url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz";
+ sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7";
+ # % in the url / canonical filename causes an error
+ name = "aether-tarball.tar.gz";
+ })
+ (fetchFromGitHub {
+ owner = "aethereans";
+ repo = "aether-app";
+ rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d";
+ sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r";
+ })
+ ];
+
+ sourceRoot = "Aether-${version}+2011262249.19338c93";
+
+ # there is no logo in the tarball so we grab it from github and convert it in the build phase
+ buildPhase = ''
+ convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png
+ '';
+
+ dontWrapGApps = true;
+
+ buildInputs = [
+ alsa-lib
+ cups
+ libdrm
+ libuuid
+ libXdamage
+ libX11
+ libXScrnSaver
+ libXtst
+ libxcb
+ libxshmfence
+ mesa
+ nss
+ ];
+
+ nativeBuildInputs = [
+ imagemagick
+ autoPatchelfHook
+ wrapGAppsHook
+ copyDesktopItems
+ ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = pname;
+ exec = binaryName;
+ icon = pname;
+ desktopName = "Aether";
+ genericName = meta.description;
+ categories = "Network;";
+ mimeType = "x-scheme-handler/aether";
+ })
+ ];
+
+ installPhase =
+ let
+ libPath = lib.makeLibraryPath [
+ libcxx systemd libpulseaudio libdrm mesa
+ stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
+ gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
+ libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
+ libXtst nspr nss libxcb pango systemd libXScrnSaver
+ libappindicator-gtk3 libdbusmenu
+ ];
+ in
+ ''
+ mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps}
+ mv * $out/opt/${binaryName}
+
+ chmod +x $out/opt/${binaryName}/${binaryName}
+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
+ $out/opt/${binaryName}/${binaryName}
+
+ wrapProgram $out/opt/${binaryName}/${binaryName} \
+ "''${gappsWrapperArgs[@]}" \
+ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
+ --prefix LD_LIBRARY_PATH : ${libPath}
+
+ ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
+
+ ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Peer-to-peer ephemeral public communities";
+ homepage = "https://getaether.net/";
+ downloadPage = "https://getaether.net/download/";
+ license = licenses.agpl3Only;
+ maintainers = with maintainers; [ maxhille ];
+ # other platforms could be supported by building from source
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index bc04d283507b..44ceb3f16227 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
- version = "0.14.1";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Jm0ySxn4GFW4iAH3tOIvclcDGJMKzH7m7fhWnAf4+gs=";
+ sha256 = "sha256-PzGlEEhootf2SCOy7+11aST7NMTNhNMQWeZO40mrMYQ=";
};
- vendorSha256 = "sha256-IzmAlthE6SVvGHj72wrY1/KLehOv8Ck9VaTv5jMpt48=";
+ vendorSha256 = "sha256-T/jgFPBUQMATX7DoWsDR/VFjka7Vxk7F4taE25cdnTk=";
subPackages = [ "." ];
diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix
index 8226e8e38cce..bcd42b361b93 100644
--- a/pkgs/applications/office/foliate/default.nix
+++ b/pkgs/applications/office/foliate/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, meson, gettext, glib, gjs, ninja, python3, gtk3
, webkitgtk, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils
-, gobject-introspection }:
+, gobject-introspection, glib-networking }:
stdenv.mkDerivation rec {
pname = "foliate";
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gettext
glib
+ glib-networking
gjs
gtk3
webkitgtk
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 901b9a340fea..0a6f1569cd4e 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }:
stdenv.mkDerivation rec {
- name = "ginac-1.8.0";
+ name = "ginac-1.8.1";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
- sha256 = "0l9byzfxq3f9az5pcdldnl95ws8mpirkqky46f973mvxi5541d24";
+ sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as=";
};
propagatedBuildInputs = [ cln ];
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix
index f2a5e2368b4f..c06c70e26789 100644
--- a/pkgs/applications/version-management/git-and-tools/glab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix
@@ -2,20 +2,26 @@
buildGoModule rec {
pname = "glab";
- version = "1.18.1";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g=";
+ sha256 = "sha256-MHNhl6lrBqHZ6M4fVOnSDxEcF6RqfWHWx5cvUhRXJKw=";
};
- vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8=";
+ vendorSha256 = "sha256-9+WBKc8PI0v6bnkC+78Ygv/eocQ3D7+xBb8lcv16QTE=";
runVend = true;
- # Tests are trying to access /homeless-shelter
- doCheck = false;
+ ldflags = [
+ "-X main.version=${version}"
+ ];
+
+ preCheck = ''
+ # failed to read configuration: mkdir /homeless-shelter: permission denied
+ export HOME=$TMPDIR
+ '';
subPackages = [ "cmd/glab" ];
diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
index e91192d53de8..8774e69e48c6 100644
--- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
@@ -1,16 +1,23 @@
-{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }:
+{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl, undmg }:
let
pname = "radicle-upstream";
- version = "0.2.3";
+ version = "0.2.9";
name = "${pname}-${version}";
- src = fetchurl {
- url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
- sha256 = "sha256-SL6plXZ+o7JchY/t/1702FK57fVjxllHqB8ZOma/43c=";
+ srcs = {
+ x86_64-linux = fetchurl {
+ url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
+ sha256 = "sha256-chju3ZEFFLOzE9FakUK2izm/5ejELdL/iWMtM3bRpWY=";
+ };
+ x86_64-darwin = fetchurl {
+ url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg";
+ sha256 = "sha256-OOqe4diRcJWHHOa6jBpljPoA3FQOKlghMhKGQ242GnM=";
+ };
};
+ src = srcs.${stdenv.hostPlatform.system};
- contents = appimageTools.extractType2 { inherit name src; };
+ contents = appimageTools.extract { inherit name src; };
git-remote-rad = stdenv.mkDerivation rec {
pname = "git-remote-rad";
@@ -25,40 +32,56 @@ let
cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad
'';
};
-in
-# FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros
-# v0.1.0) uses unstable rust features, making a from source build impossible at
-# this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674
-appimageTools.wrapType2 {
- inherit name src;
+ # FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros
+ # v0.1.0) uses unstable rust features, making a from source build impossible at
+ # this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674
+ linux = appimageTools.wrapType2 {
+ inherit name src meta;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
- extraInstallCommands = ''
- mv $out/bin/${name} $out/bin/${pname}
+ extraInstallCommands = ''
+ mv $out/bin/${name} $out/bin/${pname}
- # this automatically adds the git-remote-rad binary to the users `PATH` so
- # they don't need to mess around with shell profiles...
- ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad
+ # this automatically adds the git-remote-rad binary to the users `PATH` so
+ # they don't need to mess around with shell profiles...
+ ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad
- # desktop item
- install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop
- substituteInPlace $out/share/applications/${pname}.desktop \
- --replace 'Exec=AppRun' 'Exec=${pname}'
+ # desktop item
+ install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
- # icon
- install -m 444 -D ${contents}/${pname}.png \
- $out/share/icons/hicolor/512x512/apps/${pname}.png
- '';
+ # icon
+ install -m 444 -D ${contents}/${pname}.png \
+ $out/share/icons/hicolor/512x512/apps/${pname}.png
+ '';
+ };
+
+ darwin = stdenv.mkDerivation {
+ inherit pname version src meta;
+
+ nativeBuildInputs = [ undmg ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/Applications
+ cp -r *.app $out/Applications
+ '';
+ };
meta = with lib; {
description = "A decentralized app for code collaboration";
homepage = "https://radicle.xyz/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ d-xo ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
-}
+in
+if stdenv.isDarwin
+then darwin
+else linux
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index a636c2c3e599..1fbb099e0139 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.7.1";
+ version = "7.7.2";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "sha256-nFXj40PfHctymBcZoiJNzkvAsFnABD300/aUqNpUn2c=";
+ sha256 = "sha256-jL0XLw0V0ED+lDBn3sGaJmm96zQwXue333UuYGHjB64=";
};
dontBuild = true;
diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
index 6e47f96253e2..1f15e87c739e 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "ccextractor";
- version = "0.91";
+ version = "0.92";
src = fetchFromGitHub {
owner = "CCExtractor";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-VqJQaYzH8psQJfnDariV4q7SkDiXRz9byR51C8DzVEs=";
+ sha256 = "sha256-cEC0SF69CDLKQyTPIOZYPgxNR29mJVnzOZraGvPQjdg=";
};
sourceRoot = "source/src";
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index d7784279c315..82040203c4f3 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, stdenv
+{ config
+, lib
+, stdenv
, mkDerivation
, fetchFromGitHub
, addOpenGLRunpath
@@ -41,7 +43,8 @@
let
inherit (lib) optional optionals;
-in mkDerivation rec {
+in
+mkDerivation rec {
pname = "obs-studio";
version = "27.0.0";
@@ -61,7 +64,13 @@ in mkDerivation rec {
./Change-product_version-to-user_agent_product.patch
];
- nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ];
+ nativeBuildInputs = [
+ addOpenGLRunpath
+ cmake
+ pkg-config
+ makeWrapper
+ ]
+ ++ optional scriptingSupport swig;
buildInputs = [
curl
@@ -81,10 +90,9 @@ in mkDerivation rec {
wayland
x264
libvlc
- makeWrapper
mbedtls
]
- ++ optionals scriptingSupport [ luajit swig python3 ]
+ ++ optionals scriptingSupport [ luajit python3 ]
++ optional alsaSupport alsa-lib
++ optional pulseaudioSupport libpulseaudio
++ optional pipewireSupport pipewire;
@@ -132,7 +140,7 @@ in mkDerivation rec {
'';
homepage = "https://obsproject.com";
maintainers = with maintainers; [ jb55 MP2E V ];
- license = licenses.gpl2;
- platforms = [ "x86_64-linux" "i686-linux" ];
+ license = licenses.gpl2Plus;
+ platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
};
}
diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index 4ad082dabfcd..c4f29e14f56c 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -134,7 +134,7 @@ let self = stdenv.mkDerivation rec {
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
passthru = {
- libdir = "${self}/lib/mutter-7";
+ libdir = "${self}/lib/mutter-8";
tests = {
libdirExists = runCommand "mutter-libdir-exists" {} ''
diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix
index 9df97998891f..674720b4eeb2 100644
--- a/pkgs/desktops/gnome/extensions/extensionRenames.nix
+++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix
@@ -13,6 +13,8 @@
"lockkeys@vaina.lt" = "lock-keys";
"lockkeys@fawtytoo" = "lock-keys-2";
+ "system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged
+ "System_Monitor@bghome.gmail.com" = "system-monitor-2";
# ############################################################################
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
index c48e2a84336a..faba5d97b79d 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
index 65b024e8cc32..89b47df405fe 100644
--- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
NIX_CFLAGS_COMPILE = [
"-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
index fdc134bdf4b1..16f58616aab7 100644
--- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix
index eb3446342b4a..9557f9d2d808 100644
--- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, src, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, src, cmake, python3, libllvm, libcxxabi }:
let
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
inherit src;
sourceRoot = "source/compiler-rt";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
index dce7cde3713e..9f937ed140fd 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
index d97333bc503a..7ee0943a8886 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
index 87ebc3eff025..f6190b799189 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
index a3ce09cba976..bbaae803738d 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
index a3db5c0ad68d..4dc75bd1c14c 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
let
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
inherit version;
src = fetch "compiler-rt" "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
index eb3446342b4a..9557f9d2d808 100644
--- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, version, src, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, llvm_meta, version, src, cmake, python3, libllvm, libcxxabi }:
let
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
inherit src;
sourceRoot = "source/compiler-rt";
- nativeBuildInputs = [ cmake python3 llvm.dev ];
+ nativeBuildInputs = [ cmake python3 libllvm.dev ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index a3c953b8a305..60f61324e650 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -5,7 +5,7 @@
libchipcard.version = "5.0.4";
libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
libchipcard.releaseId = "158";
- aqbanking.version = "6.2.10";
- aqbanking.sha256 = "13dbpi58mw09gnsza11pxy5c8j99r11nkyg2j53y4lqk47rmyhvq";
- aqbanking.releaseId = "368";
+ aqbanking.version = "6.3.0";
+ aqbanking.sha256 = "1k2mhdnk0jc0inq1hmp74m3y7azxrjm8r07x5k1pp4ic0yi5vs50";
+ aqbanking.releaseId = "372";
}
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index 8a829aa3c91c..f92f2f0affe4 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "dyncall";
version = "1.2";
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
sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc=";
};
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index c3d6516a3dfd..85163daad0a1 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -1,4 +1,7 @@
-{ lib, stdenv, fetchurl, cmake
+{ lib
+, stdenv
+, fetchurl
+, cmake
, glib
, nss
, nspr
@@ -52,18 +55,39 @@ let
cups
libxshmfence
];
-in stdenv.mkDerivation rec {
+ platforms = {
+ "aarch64-linux" = {
+ platformStr = "linuxarm64";
+ projectArch = "arm64";
+ sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081";
+ };
+ "i686-linux" = {
+ platformStr = "linux32";
+ projectArch = "x86";
+ sha256 = "0ki4zr8ih06kirgbpxbinv4baw3qvacx208q6qy1cvpfh6ll4fwb";
+ };
+ "x86_64-linux" = {
+ platformStr = "linux64";
+ projectArch = "x86_64";
+ sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj";
+ };
+ };
+
+ platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
+in
+stdenv.mkDerivation rec {
pname = "cef-binary";
version = "90.6.7";
gitRevision = "19ba721";
chromiumVersion = "90.0.4430.212";
src = fetchurl {
- url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2";
- sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj";
+ url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
+ inherit (platformInfo) sha256;
};
nativeBuildInputs = [ cmake ];
+ cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}";
makeFlags = [ "libcef_dll_wrapper" ];
dontStrip = true;
dontPatchELF = true;
@@ -83,6 +107,6 @@ in stdenv.mkDerivation rec {
homepage = "https://cef-builds.spotifycdn.com/index.html";
maintainers = with maintainers; [ puffnfresh ];
license = licenses.bsd3;
- platforms = with platforms; linux;
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
};
}
diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix
index 635f8b8a6159..7781c936b929 100644
--- a/pkgs/development/libraries/libnbd/default.nix
+++ b/pkgs/development/libraries/libnbd/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchurl {
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 = [
diff --git a/pkgs/development/libraries/optparse-bash/default.nix b/pkgs/development/libraries/optparse-bash/default.nix
new file mode 100644
index 000000000000..811458ed187c
--- /dev/null
+++ b/pkgs/development/libraries/optparse-bash/default.nix
@@ -0,0 +1,63 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, bash
+, gnused
+, gawk
+, coreutils
+}:
+
+stdenvNoCC.mkDerivation {
+ pname = "optparse-bash-unstable";
+ version = "2021-06-13";
+
+ src = fetchFromGitHub {
+ owner = "nk412";
+ repo = "optparse";
+ rev = "d86ec17d15368e5b54eb2d47b001b0b61d68bbd0";
+ sha256 = "sha256-vs7Jo1+sV0tPse4Wu2xtzSX1IkahwLgO3e4Riz3uMmI=";
+ };
+
+ postPatch = ''
+ substituteInPlace optparse.bash \
+ --replace sed "${gnused}/bin/sed" \
+ --replace awk "${gawk}/bin/awk" \
+ --replace printf "${coreutils}/bin/printf"
+'';
+
+ dontBuild = true;
+
+ doCheck = true;
+
+ checkInputs = [ bash ];
+
+ # `#!/usr/bin/env` isn't okay for OfBorg
+ # Need external bash to run
+ checkPhase = ''
+ runHook preCheck
+ bash ./sample_head.sh -v --file README.md
+ runHook postCheck
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ mv optparse.bash $out/bin/
+ mkdir -p $out/share/doc/optparse-bash
+ mv README.md sample_head.sh $out/share/doc/optparse-bash/
+ runHook postInstall
+ '';
+
+ # As example code,
+ # sample_head.sh shows how users can use opt-parse in their script,
+ # and its shebang (`/usr/bin/env bash`) should not be patched.
+ dontPatchShebangs = true;
+
+ meta = with lib; {
+ description = "A BASH wrapper for getopts, for simple command-line argument parsing";
+ homepage = "https://github.com/nk412/optparse";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ShamrockLee ];
+ };
+}
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index 0fb9636bc2a1..2b8f006a7558 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -2,13 +2,17 @@
stdenv.mkDerivation rec {
pname = "portmidi";
- version = "217";
+ version = "234";
src = fetchurl {
- url = "mirror://sourceforge/portmedia/portmidi-src-${version}.zip";
- sha256 = "03rfsk7z6rdahq2ihy5k13qjzgx757f75yqka88v3gc0pn9ais88";
+ url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip";
+ sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp";
};
+ prePatch = ''
+ cd portmidi/trunk
+ '';
+
cmakeFlags = let
#base = "${jdk}/jre/lib/${jdk.architecture}";
in [
@@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
'';
postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
- ln -s libportmidi.${ext} "$out/lib/libporttime.${ext}"
+ ln -s libportmidi${ext} "$out/lib/libporttime${ext}"
'';
nativeBuildInputs = [ unzip cmake ];
diff --git a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff
index 975dbb57b59d..15ed874f172f 100644
--- a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff
+++ b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff
@@ -12,17 +12,17 @@ index 4919b78..758eccb 100644
if(UNIX)
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
+++ b/pm_common/CMakeLists.txt
@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
endif(APPLE OR WIN32)
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
- PATH "-isysroot parameter for compiler" FORCE)
- set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE
+ PATH "-isysroot parameter for compiler")
+ set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
@@ -54,10 +54,6 @@ if(UNIX)
diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix
index 3d1236a03dbb..9f50c80bf7a1 100644
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spglib";
- version = "1.16.1";
+ version = "1.16.2";
src = fetchFromGitHub {
owner = "atztogo";
repo = "spglib";
rev = "v${version}";
- sha256 = "1sk59nnar9npka4mdcfh4154ja46i35y4gbq892kwqidzyfs80in";
+ sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix
index 8d75a1b11ee5..16678c9f04e6 100644
--- a/pkgs/development/python-modules/aioambient/default.nix
+++ b/pkgs/development/python-modules/aioambient/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioambient";
- version = "1.2.5";
+ version = "1.2.6";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1v8xr69y9cajyrdfz8wdksz1hclh5cvgxppf9lpygwfj4q70wh88";
+ sha256 = "sha256-EppnuZP62YTFI3UJUzBUj2m5TvFh1WiDz9smHY7We60=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index d68318355d88..5f09dda0f44a 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bleach";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM=";
+ sha256 = "1yma53plrlw2llaqxv8yk0g5al0vvlywwzym18b78m3rm6jq6r1h";
};
checkInputs = [ pytest pytest-runner ];
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 28c7e9c6eea5..87446ed95f39 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "eventlet";
- version = "0.31.0";
+ version = "0.31.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b36ec2ecc003de87fc87b93197d77fea528aa0f9204a34fdf3b2f8d0f01e017b";
+ sha256 = "0xldgwjf9jkp28rn0pg0i32bg6m7pdh7dwgi0grcvqzs0iii5sdr";
};
propagatedBuildInputs = [ dnspython greenlet monotonic six ]
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 3b14560eb9dd..27cb4e445258 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "fastapi";
- version = "0.67.0";
+ version = "0.68.0";
format = "flit";
src = fetchFromGitHub {
owner = "tiangolo";
repo = "fastapi";
rev = version;
- sha256 = "15zbalyib7ndcbxvf9prj0n9n6qb4bfzhmaacsjrvdmjzmqdjgw0";
+ sha256 = "00cjkc90h0qlca30g981zvwlxh2wc3rfipw25v667jdl9x5gxv9p";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 556576459695..1bd8fd5f63cc 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.45.1";
+ version = "0.46.0";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "sha256-ZDPlYoLAQLXiV+LUMdu/8v3TrG5/Zz4+r4PtThrLAas=";
+ sha256 = "109ma1qlhifj5hs530zfnvc6mqv5grfmcq3s57wawq9nzq0gpfy8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix
index d95aa846965d..6832266b87ad 100644
--- a/pkgs/development/python-modules/opensimplex/default.nix
+++ b/pkgs/development/python-modules/opensimplex/default.nix
@@ -1,10 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, autopep8
, nose
-, pycodestyle
-, twine
}:
buildPythonPackage rec {
@@ -18,10 +15,11 @@ buildPythonPackage rec {
sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM=";
};
- checkInputs = [ autopep8 nose pycodestyle twine ];
+ checkInputs = [ nose ];
checkPhase = ''
nosetests tests/
'';
+ pythonImportsCheck = [ "opensimplex" ];
meta = with lib; {
description = "OpenSimplex Noise functions for 2D, 3D and 4D";
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 3b37b236c48d..ec6d9c41a0d8 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = version;
- sha256 = "sha256-ywVCa6PfyQ1SiejE2IYkf/IpQM0iDXJPpCm0vDtlrw8=";
+ sha256 = "sha256-fZ0mhsM7LroJgIyBO4eRzZaz2OQxa4Hhj1rNufHXvHI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix
index f115b2b5c6a7..7bf5296eb362 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/pkgs/development/python-modules/pybotvac/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pybotvac";
- version = "0.0.21";
+ version = "0.0.22";
src = fetchPypi {
inherit pname version;
- sha256 = "1hf692w44dmalv7hlcpwzbnr6xhvnmdv5nl1jcy2jhiwp89lkhzv";
+ sha256 = "sha256-hl8UmoVUbbHCSpCWdUTxoIlop5di+rUmGUQI9UWq3ik=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix
index 4f1180ebee4a..4bf56d5e6edc 100644
--- a/pkgs/development/python-modules/pylutron/default.nix
+++ b/pkgs/development/python-modules/pylutron/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pylutron";
- version = "0.2.8";
+ version = "0.2.9";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Jg2waoIxvBvX+hoAgt/yoM87XdShCHQOZXbsHG3b4cw=";
+ sha256 = "sha256-xy5XPNOrvdPZMCfa2MYA+xtUcFdGSurW5QYL6H7n2VI=";
};
# Project has no tests
diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix
index 92918efa8ed8..4ee22feed1df 100644
--- a/pkgs/development/python-modules/pymunk/default.nix
+++ b/pkgs/development/python-modules/pymunk/default.nix
@@ -1,9 +1,11 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchPypi
, python
, cffi
, pytestCheckHook
+, ApplicationServices
}:
buildPythonPackage rec {
@@ -17,6 +19,9 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ cffi ];
+ buildInputs = lib.optionals stdenv.isDarwin [
+ ApplicationServices
+ ];
preBuild = ''
${python.interpreter} setup.py build_ext --inplace
@@ -26,11 +31,13 @@ buildPythonPackage rec {
pytestFlagsArray = [
"pymunk/tests"
];
+ pythonImportsCheck = [ "pymunk" ];
meta = with lib; {
description = "2d physics library";
homepage = "https://www.pymunk.org";
license = with licenses; [ mit ];
maintainers = with maintainers; [ angustrau ];
+ platforms = platforms.linux ++ [ "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index ff7b9a464998..e749c467ab19 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
-, fetchpatch
, mupdf
, swig
, freetype
@@ -26,10 +25,7 @@ buildPythonPackage rec {
patches = [
# Add NIX environment support.
# Should be removed next pyMuPDF release.
- (fetchpatch {
- url = "https://github.com/pymupdf/PyMuPDF/commit/d9b2d42019e5705a1c6621ea0cdfa26da1ce9ad5.patch";
- sha256 = "fc3f6ad88c8f3933ed9ab9d4db9ebec8bc30ed5113f6ca9d72080b56dfa52ad6";
- })
+ ./nix-support.patch
];
postPatch = ''
diff --git a/pkgs/development/python-modules/pymupdf/nix-support.patch b/pkgs/development/python-modules/pymupdf/nix-support.patch
new file mode 100644
index 000000000000..e0a14337a8d9
--- /dev/null
+++ b/pkgs/development/python-modules/pymupdf/nix-support.patch
@@ -0,0 +1,17 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,10 +36,14 @@ LIBRARIES = {
+ "opensuse": OPENSUSE,
+ "fedora": FEDORA,
+ "alpine": ALPINE,
++ "nix": FEDORA,
+ }
+
+
+ def load_libraries():
++ if os.getenv("NIX_STORE"):
++ return LIBRARIES["nix"]
++
+ try:
+ import distro
+
diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix
index 130b44c09694..5560f3811fa3 100644
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -2,6 +2,7 @@
, aiohttp
, aresponses
, asynctest
+, backoff
, buildPythonPackage
, fetchFromGitHub
, poetry-core
@@ -13,19 +14,22 @@
buildPythonPackage rec {
pname = "pyopenuv";
- version = "2.0.2";
+ version = "2.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ=";
+ sha256 = "sha256-S2X7cTArjiWOFjQGnrZ4AuhgN8t18wf9d6i9X5thRZg=";
};
nativeBuildInputs = [ poetry-core ];
- propagatedBuildInputs = [ aiohttp ];
+ propagatedBuildInputs = [
+ aiohttp
+ backoff
+ ];
checkInputs = [
aresponses
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 9d06569dfdc3..831ae6e39668 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "python-gitlab";
- version = "2.9.0";
+ version = "2.10.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y=";
+ sha256 = "sha256-N2s+mCOBzsc0RxxQKz2ixueFio300DyZNJnmp1k5UOY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix
new file mode 100644
index 000000000000..ffa3a5302ae5
--- /dev/null
+++ b/pkgs/development/python-modules/pyuseragents/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pyuseragents";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "Animenosekai";
+ repo = "useragents";
+ rev = "v${version}";
+ sha256 = "D7Qs3vsfkRH2FDkbfakrR+FfWzQFiOCQM7q9AdJavyU=";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+ pytestFlagsArray = [ "test.py" ];
+ pythonImportsCheck = [ "pyuseragents" ];
+
+ meta = with lib; {
+ description = "Giving you a random User-Agent Header";
+ homepage = "https://github.com/Animenosekai/useragents";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ angustrau ];
+ };
+}
diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix
index a89e0b3789cf..c7c60d20f3cd 100644
--- a/pkgs/development/python-modules/pywebpush/default.nix
+++ b/pkgs/development/python-modules/pywebpush/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "pywebpush";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "97ef000a685cd1f63d9d3553568508508904bfe419485df2b83b025d94e9ae54";
+ sha256 = "sha256-bDbhZ5JoIZ5pO6lA2yvyVMJAygJmTeECtyaa/DxUVzE=";
};
propagatedBuildInputs = [
@@ -36,6 +36,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportsCheck = [ "pywebpush" ];
+
meta = with lib; {
description = "Webpush Data encryption library for Python";
homepage = "https://github.com/web-push-libs/pywebpush";
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index ce1dfc366f45..01b9d0fd099d 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "requests-cache";
- version = "0.7.2";
+ version = "0.7.3";
disabled = pythonOlder "3.6";
format = "pyproject";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
- sha256 = "055dfyjm8dqwr62v86lyvq4r04692gmvlgp86218vwvzgm7p3p2c";
+ sha256 = "sha256-QGh/ThI5bKE65luVHDSsr6RQq5RReugdZrVvR1R0pUU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix
new file mode 100644
index 000000000000..8428f0b06e4c
--- /dev/null
+++ b/pkgs/development/python-modules/translatepy/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, beautifulsoup4
+, pyuseragents
+, inquirer
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "translatepy";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ owner = "Animenosekai";
+ repo = "translate";
+ rev = "v${version}";
+ sha256 = "Rt6FvB4kZVaB/jxxqOHsnkReTFCCyiEaZf240n0zVZs=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ beautifulsoup4
+ pyuseragents
+ inquirer
+ ];
+
+ checkInputs = [ pytestCheckHook ];
+ disabledTestPaths = [
+ # Requires network connection
+ "tests/test_translators.py"
+ ];
+ pythonImportsCheck = [ "translatepy" ];
+
+ meta = with lib; {
+ description = "A module grouping multiple translation APIs";
+ homepage = "https://github.com/Animenosekai/translate";
+ license = with licenses; [ agpl3Only ];
+ maintainers = with maintainers; [ angustrau ];
+ };
+}
diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix
index 50e112583f1e..4918e69922ea 100644
--- a/pkgs/development/python-modules/transmission-rpc/default.nix
+++ b/pkgs/development/python-modules/transmission-rpc/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "transmission-rpc";
- version = "3.2.5";
+ version = "3.2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "59598c9aa338703951686420fea292d9ba2d83d2a81361f16b64c2603c4ebb45";
+ sha256 = "1k4yyrbdqxp43zsmcg37a99x4s2kwsm7yyajf810y2wx61nq49d1";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
index ee09ceb10504..4822922da3ce 100644
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -3,28 +3,34 @@
, fetchPypi
, pythonOlder
, pytestCheckHook
-, pysocks
+, python-socks
}:
buildPythonPackage rec {
pname = "websocket-client";
- version = "1.1.0";
+ version = "1.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-to5JWdcEdo+iDjXJ1QjI3Cu8BB/Y0mfA1zRc/+KCRWg=";
+ sha256 = "sha256-dmW6bGRZibKLYWcIdKt1PmkpF56fyQVlrOasCQ9ZxVk=";
};
- checkInputs = [ pytestCheckHook pysocks ];
+ propagatedBuildInputs = [
+ python-socks
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
pythonImportsCheck = [ "websocket" ];
meta = with lib; {
description = "Websocket client for Python";
homepage = "https://github.com/websocket-client/websocket-client";
+ changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ fab ];
- changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog";
};
}
diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix
index 888708e799c7..dc10c3d58143 100644
--- a/pkgs/development/python-modules/yeelight/default.nix
+++ b/pkgs/development/python-modules/yeelight/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "yeelight";
- version = "0.6.3";
+ version = "0.7.2";
disabled = pythonOlder "3.4";
src = fetchFromGitLab {
owner = "stavros";
repo = "python-yeelight";
rev = "v${version}";
- sha256 = "sha256-71ncPGcqTRSldWVhJ2uZ2AEgkv1KO2i6UtAUTcJcru8=";
+ sha256 = "06pg5q50dw5a0h6jnln8419asi8nahzvlk0s65ymykqq0jxac31y";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index 9a64572e3866..7a7a005efed0 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "yfinance";
- version = "0.1.61";
+ version = "0.1.63";
# GitHub source releases aren't tagged
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-+tc0rwweGFaBkrl7LBHdsff98PuupqovKh4nRP3hRJ0=";
+ sha256 = "0k1saz0wknxv31vpqcfyi35mzi68c75hlqpw8lf83xqw9zllydhi";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index 8dac16f243ca..a4c51121cd5f 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.5.8";
+ version = "2.5.9";
dontConfigure = true;
dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "sha256-XfxzvzGiSBhPVIvdtDifKjkcGK2afWXVWul3Pah3tKo=";
+ sha256 = "sha256-r3Jm+VYjn0Dz4BCSbADbgTWL1owbyIXlkoj6mOmZcZk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix
index 66b457f9902a..efbc46448259 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }:
+{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm, perl }:
stdenv.mkDerivation rec {
pname = "sparse";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libxml2 llvm ];
+ buildInputs = [ libxml2 llvm perl ];
doCheck = true;
meta = {
diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index fb515841c7f2..230f5b09b99f 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -7,29 +7,32 @@
buildGoModule rec {
pname = "buf";
- version = "0.46.0";
+ version = "0.49.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5mjk31HuPNO/RhmMhIm3dAZAED/Kk33ObjC8KbPKRxk=";
- leaveDotGit = true; # Required by TestWorkspaceGit
+ sha256 = "sha256-xP2UbcHwimN09IXrGp3zhBLL74l/8YKotqBNRTITF18=";
};
- vendorSha256 = "sha256-K8UZDEhAvD292RCEDKfY9PdZGS389vLF3oukcBndUF4=";
+ vendorSha256 = "sha256-WgQSLe99CbOwJC8ewDcSq6PcBJdmiPRmvAonq8drQ1w=";
patches = [
# Skip a test that requires networking to be available to work.
./skip_test_requiring_network.patch
+ # Skip TestWorkspaceGit which requires .git and commits.
+ ./skip_test_requiring_dotgit.patch
];
nativeBuildInputs = [ protobuf ];
+ # Required for TestGitCloner
checkInputs = [ git ];
ldflags = [ "-s" "-w" ];
preCheck = ''
- export PATH=$PATH:$GOPATH/bin
+ # The tests need access to some of the built utilities
+ export PATH="$PATH:$GOPATH/bin"
# To skip TestCloneBranchAndRefToBucket
export CI=true
'';
@@ -38,24 +41,32 @@ buildGoModule rec {
runHook preInstall
mkdir -p "$out/bin"
- dir="$GOPATH/bin"
# Only install required binaries, don't install testing binaries
- for file in \
+ for FILE in \
"buf" \
"protoc-gen-buf-breaking" \
"protoc-gen-buf-lint" \
"protoc-gen-buf-check-breaking" \
"protoc-gen-buf-check-lint"; do
- cp "$dir/$file" "$out/bin/"
+ cp "$GOPATH/bin/$FILE" "$out/bin/"
done
runHook postInstall
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/buf --help
+ $out/bin/buf --version 2>&1 | grep "${version}"
+ runHook postInstallCheck
+ '';
+
meta = with lib; {
- description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
homepage = "https://buf.build";
+ changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}";
+ description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
license = licenses.asl20;
- maintainers = with maintainers; [ raboof ];
+ maintainers = with maintainers; [ raboof jk ];
};
}
diff --git a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch
new file mode 100644
index 000000000000..c4a7803661ad
--- /dev/null
+++ b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch
@@ -0,0 +1,14 @@
+diff --git a/internal/buf/cmd/buf/workspace_test.go b/internal/buf/cmd/buf/workspace_test.go
+index e051690..8887837 100644
+--- a/internal/buf/cmd/buf/workspace_test.go
++++ b/internal/buf/cmd/buf/workspace_test.go
+@@ -335,6 +335,9 @@ func TestWorkspaceNestedArchive(t *testing.T) {
+ }
+
+ func TestWorkspaceGit(t *testing.T) {
++ // Requires .git directory which we do not retain due to
++ // `leaveDotGit` non-determinism
++ t.Skip()
+ // Directory paths specified as a git reference within a workspace.
+ t.Parallel()
+ testRunStdout(
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 473196f9a96b..1ba8cb0a9d3d 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "conftest";
- version = "0.26.0";
+ version = "0.27.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
- sha256 = "sha256-AIFZhe0N6FT06IrDVF2OVfSwmQVg62ZglOcnnDL9TK8=";
+ sha256 = "sha256-Yc/aejGLMbAqpIRTVQQ3lv7/oyr7tVAy41Gx6198Eos=";
};
- vendorSha256 = "sha256-7wj1n5ggYYrmMrDuQkbbJ2C1S1LHawkkj91owHDIwr0=";
+ vendorSha256 = "sha256-jI5bX6S2C0ckiiieVlaRNEsLS/5gGkC3o/xauDtCOjA=";
doCheck = false;
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 74cb56c201d9..f5c485e5b014 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.62.0";
+ version = "1.63.1";
vendorSha256 = null;
@@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "sha256-5YqGNuC1mmsIsEtnbgumaLuZGy3k6L9jZNbVwZln8WY=";
+ sha256 = "sha256-SSjTrCR5H+3nIKHKEfrQX917HjgpViS6H1RwmRe4coI=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix
new file mode 100644
index 000000000000..6bca1fa64eee
--- /dev/null
+++ b/pkgs/development/tools/mars-mips/default.nix
@@ -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;
+ };
+}
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 5b1973c2b9e0..fd1896f24b81 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -26,6 +26,7 @@ let
CatalystPluginAccessLog
CatalystPluginAuthorizationRoles
CatalystPluginCaptcha
+ CatalystPluginPrometheusTiny
CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap
CatalystPluginSmartURI
@@ -59,6 +60,7 @@ let
NetPrometheus
NetStatsd
PadWalker
+ PrometheusTinyShared
Readonly
SQLSplitStatement
SetScalar
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index a124b4a5c6e2..ac5600519b49 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -2,12 +2,12 @@
{
hydra-unstable = callPackage ./common.nix {
- version = "2021-05-03";
+ version = "2021-08-11";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
- rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
- sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
+ rev = "9bce425c3304173548d8e822029644bb51d35263";
+ sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU=";
};
nix = nixUnstable;
diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix
index 483a85db02a1..657b1965012e 100644
--- a/pkgs/development/tools/pscale/default.nix
+++ b/pkgs/development/tools/pscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pscale";
- version = "0.60.0";
+ version = "0.63.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-hrWSieWeVAg28f3Fh9mElr+mDh4v4T5JI1c3+Hrm7c0=";
+ sha256 = "sha256-LYVR8vcMS6ErYH4sGRi1JT9E4ElYe5mloc3C1TudzSE=";
};
- vendorSha256 = "sha256-h4YUQWmFYouEvHup8Pu6OqfHf1EoPszVFzklU9SbJZQ=";
+ vendorSha256 = "sha256-3LuzdvwLYSL7HaGbKDfrqBz2FV2yr6YUdI5kXXiIvbU=";
meta = with lib; {
homepage = "https://www.planetscale.com/";
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 308cf7b8f54f..a6c879f77fea 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.12.2";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xIFJv/roTD7sq7vCy4JDwe8gYDMuZd34vyjS08xeijI=";
+ sha256 = "sha256-iSL9YAcYdeZ9E5diAJG1oHzujPmfblOvheewOu9QIu8=";
};
- cargoSha256 = "sha256-aETAFh5yTE+ZonDC0ITdaZ2YN3/SpYROsXP47aNEICE=";
+ cargoSha256 = "sha256-1aibJwZ3o3bU5PWPVPBsRpjGo4JgOsNAgnPVAk1ZQHE=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix
index a85d2bf76f2d..15c20cf4d768 100644
--- a/pkgs/development/web/deno/librusty_v8.nix
+++ b/pkgs/development/web/deno/librusty_v8.nix
@@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
- version = "0.25.3";
+ version = "0.26.0";
shas = {
- x86_64-linux = "sha256-Z3lEJT3QVhP8PoDiM6Fw0sm5rXWvasBqASBO5tZA5zM=";
- aarch64-linux = "sha256-pbcd1zV7IIEqCIp8vsRiO0KBGrOv52SvMZ4gthxuN/I=";
- x86_64-darwin = "sha256-BwYdgd1kK8EQFfDc9RgtNvwvx7agt9hYNVmBGwHoqz0=";
- aarch64-darwin = "sha256-/RHeNuR7VjhfwdjZXWMMX3UnweAjJblSCUq9eIwGvWc=";
+ x86_64-linux = "sha256-eYvfsgkLuV//4NmnxTNgB5vGoQ2JdSpXwF34d1kNxBw=";
+ aarch64-linux = "sha256-t+0/bJI4q2XElYz398aig/widJEOAascOmv4qnnKMQY=";
+ x86_64-darwin = "sha256-lYJcx5Oe/nuF3l5coH4WIMbBbiFMwxNWlIYojrdiJfI=";
+ aarch64-darwin = "sha256-5blisZ4Z/f68fZg7aDr5WK4MNvL5IRZZSJrvFb9N5oY=";
};
}
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 8828b0222cc2..ccac1644b690 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.229";
+ version = "0.0.230";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "sha256-mw+rTMFj41+T6lDe/MOQpmRcjt/gJhOCfaHcBkpjcsg=";
+ sha256 = "sha256-TI6pBtpUfI1vPsi+tq7FduFaZv9CvkAooqFmHCGslzI=";
};
preBuild = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ];
- vendorSha256 = "sha256-NnHnSfm3XYiwgGn56GsthFKiflJvhYhjoxmm8ogm+Uc=";
+ vendorSha256 = "sha256-6t2aLSr78pEhrYI53OMQpfJqa65wQAxlz6+ksUtxzmI=";
doCheck = false;
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
deleted file mode 100644
index 586fc03687c5..000000000000
--- a/pkgs/development/web/now-cli/default.nix
+++ /dev/null
@@ -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 ];
- };
-}
diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/games/antsimulator/default.nix
index b43b91d5cb99..bac481c88f35 100644
--- a/pkgs/games/antsimulator/default.nix
+++ b/pkgs/games/antsimulator/default.nix
@@ -2,20 +2,31 @@
stdenv.mkDerivation rec {
pname = "antsimulator";
- version = "1.2";
+ version = "3.1";
src = fetchFromGitHub {
owner = "johnBuffer";
repo = "AntSimulator";
rev = "v${version}";
- sha256 = "0wz80971rf86kb7mcnxwrq75vriwhmyir5s5n3wzml12rzfnj5f1";
+ sha256 = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ sfml ];
+ postPatch = ''
+ substituteInPlace src/main.cpp \
+ --replace "res/" "$out/opt/antsimulator/"
+
+ substituteInPlace include/simulation/config.hpp \
+ --replace "res/" "$out/opt/antsimulator/"
+
+ substituteInPlace include/render/colony_renderer.hpp \
+ --replace "res/" "$out/opt/antsimulator/"
+ '';
+
installPhase = ''
- mkdir -p $out/bin
+ install -Dm644 -t $out/opt/antsimulator res/*
install -Dm755 ./AntSimulator $out/bin/antsimulator
'';
diff --git a/pkgs/games/brutalmaze/default.nix b/pkgs/games/brutalmaze/default.nix
new file mode 100644
index 000000000000..d9c904d99a3b
--- /dev/null
+++ b/pkgs/games/brutalmaze/default.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromSourcehut, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "brutalmaze";
+ version = "1.1.1";
+ format = "flit";
+ disabled = python3Packages.pythonOlder "3.7";
+
+ src = fetchFromSourcehut {
+ owner = "~cnx";
+ repo = pname;
+ rev = version;
+ sha256 = "1m105iq378mypj64syw59aldbm6bj4ma4ynhc50gafl656fabg4y";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ loca
+ palace
+ pygame
+ ];
+
+ doCheck = false; # there's no test
+
+ meta = with lib; {
+ description = "Minimalist thrilling shoot 'em up game";
+ homepage = "https://brutalmaze.rtfd.io";
+ license = licenses.agpl3Plus;
+ maintainers = [ maintainers.McSinyx ];
+ };
+}
diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index 04c0868510fe..987d0005d24e 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "crispy-doom";
- version = "5.10.1";
+ version = "5.10.2";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-5doytVxemqaXWXiqDSQUEAe71xmY0pOLASj/NJNyM5g=";
+ sha256 = "sha256-NUBodIojvlw46yLZ9Bn2pCpBwyVW8noOHQMM4uGmO3U=";
};
postPatch = ''
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index e006507a6335..1ac8a41ca1a7 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation {
pname = "ioquake3-git";
- version = "2020-12-26";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "ioquake";
repo = "ioq3";
- rev = "05180e32dcfb9a4552e1b9652b56127248a9950c";
- sha256 = "0hcxxa1ambpdwhg7nb5hvb32g49rl5p9dcflpzcv5cax9drn166i";
+ rev = "bc8737d707595aebd7cc11d6d5a5d65ede750f59";
+ sha256 = "1icrkaw6c5c5ndy886bn65lycwnxzxwvz0ndz4p9i6r716k11add";
};
nativeBuildInputs = [ which pkg-config ];
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index f76fc761abbc..50e9c447f2fc 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -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 {
- pname = "fceux-unstable";
- version = "2020-01-29";
+stdenv.mkDerivation rec {
+ pname = "fceux";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "TASVideos";
- repo = "fceux";
- rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337";
- sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992";
+ repo = pname;
+ rev = "${pname}-${version}";
+ sha256 = "sha256-i0mb0vy46D97oOpAjMw3CPbG4w/LWP9YRVEMWjdYgs0=";
};
- nativeBuildInputs = [ pkg-config scons ];
- buildInputs = [
- zlib SDL lua5_1
- ];
+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+ buildInputs = [ SDL2 lua5_1 minizip x264 ];
- sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false";
- 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 = {
+ meta = with lib; {
description = "A Nintendo Entertainment System (NES) Emulator";
- license = lib.licenses.gpl2;
- maintainers = [ lib.maintainers.scubed2 ];
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ sbruder scubed2 ];
homepage = "http://www.fceux.com/";
- platforms = lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix
index b7f8ce99b533..e449de9ca255 100644
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/pkgs/misc/screensavers/betterlockscreen/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "betterlockscreen";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchFromGitHub {
owner = "pavanjadhaw";
repo = "betterlockscreen";
rev = "v${version}";
- sha256 = "1ha1yddrcmbsdljdg3gn7i42csbw8h3zgf4i3mcsmbz8nsvc2wdc";
+ sha256 = "sha256-eteuNEGc1BOlYgV7/hwe7z4zqqs/6EJzB88126U1jiU=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index be5a660f3c87..9713d1e9cc33 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "cc34310a99ece2a1bb8d626f77436e53d43fa18b";
- sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f";
+ rev = "a099fe24b2e898c93c0aa4391e5a5631932684a6";
+ sha256 = "0gp764xcspvwmhqhjf8f94y2wxw32ids0zfy22r1z0s2zm85088r";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -281,12 +281,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "877ef78049d44eee8ebf4d0e6ec541ca23e4ab49";
- sha256 = "0m4yn8kkljn6m45ha7279wv7p9ppjyqrrpagmq92yrqnbfi87qa1";
+ rev = "e5a10501b34a1a6a6d9499a7caccc788e41093ec";
+ sha256 = "0l492f2kjzp521xwzihdiv8rhbmq2iql0qxhczk68nqy5lj2x7q0";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -363,6 +363,18 @@ final: prev:
meta.homepage = "https://github.com/fruit-in/brainfuck-vim/";
};
+ bufdelete-nvim = buildVimPluginFrom2Nix {
+ pname = "bufdelete-nvim";
+ version = "2021-07-24";
+ src = fetchFromGitHub {
+ owner = "famiu";
+ repo = "bufdelete.nvim";
+ rev = "f73ecffb790c9b1e356c5511ba6ae3b761331d8d";
+ sha256 = "0lyc49c909r74q0pvzx0fmyzl3lvspq590vgkld8b3r6vyp44m2c";
+ };
+ meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
+ };
+
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
version = "2021-04-20";
@@ -425,12 +437,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "455cf79d081afec70973819160edf3bcf3c6fd85";
- sha256 = "1kbda51padbi6qgykzwr1rf081p3154rs6zy7gzpzlhi9k61jqnh";
+ rev = "0ec533cd84ee16a420ea50941f5c06faa433ec0a";
+ sha256 = "1qxzg5yyz07d76msbbxyk1z1nn4p4si6p8cd00knla8mdyfg779p";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -798,12 +810,12 @@ final: prev:
context_filetype-vim = buildVimPluginFrom2Nix {
pname = "context_filetype-vim";
- version = "2021-07-25";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "context_filetype.vim";
- rev = "89496f3c110d907605319355ea9fc2a560827719";
- sha256 = "09shjaxqr71nfq4yj15xkvkh204l7fjr7na0cyx3k3mflmldha8w";
+ rev = "28768168261bca161c3f2599e0ed63c96aab6dea";
+ sha256 = "1kyfl4xcx9brsnmqb19ibc2sai5zdrjd1vv7zn63halm2imdv2sj";
};
meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
};
@@ -978,12 +990,12 @@ final: prev:
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-07-15";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "6ccd2d35581f5c497b2fe3e6a9ecbbb494210d6e";
- sha256 = "0fg8gv38xvsv7y739m1wix5a384zjn0hqnmkqiz244jxii1l0p8y";
+ rev = "d4bf081bc6bdf062097fddbbcf9c8fdf5b8fb101";
+ sha256 = "1sdkfij72z068h2fnhay1ppmf9my32jgzr1pf8liqs6647l90i1v";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -1546,12 +1558,12 @@ final: prev:
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-08-01";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "ff74cd42ca7e76691e826dbdc7efe7ab683e9856";
- sha256 = "0h7i45rwzf3b8xm1rbyly287769fq1xyvl51sa44nghdy6zhx7vi";
+ rev = "ed2e422f047eb2cc8afcfecea9464984cfa801a0";
+ sha256 = "0jr632pd274xhyji7b1l195i8avf20v4d9g8r4w1ryskirj1k3ry";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -2640,12 +2652,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim";
- version = "2021-08-04";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
- rev = "9a9a28e58cb00935486acf49fba8683e8b2de22a";
- sha256 = "0m1y6lwr7gqwshmrr3yzvbbsbrva3h276cj2fnczgchqbix9jzvi";
+ rev = "ec36e68de3b73fd20a02d0cebbb9fd370c2ad532";
+ sha256 = "078b5ri8hg1vd15n7n8v90rpp4abp93sh2zvzn9ybdlk5wl5kn9g";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -2724,12 +2736,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "dbd5f6a5116f74ccf89b2ea18d59b629397c7940";
- sha256 = "1mmm5h14p7jgalvgl68m9gj0dfl1r29kf5z7h4vmzy07q3nm8xq3";
+ rev = "0381f3cb17f46c5e7a7277bb267d8f594da17430";
+ sha256 = "1px2m3v9z2gw60i0vjd984b2v434bdkndihsw51nmvxl3w2mbgii";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -2784,24 +2796,24 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "f4a2f500afde3624e41557781117d7f50ccc7223";
- sha256 = "08fflc2ky7zpb0wazim5v46fhqcm8sadpsvkjml544gv29yjx7f3";
+ rev = "86bee9cd7b66237730789e872b952759d2f5b3ac";
+ sha256 = "0ja7jlwlyjiw8imfqmd4m3i5xx6pkfh7sjm108g3k4fpp8xmpbl7";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush-nvim";
- version = "2021-08-07";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
- rev = "b665ea59600f91afe87b8665faec8155c09420f8";
- sha256 = "0s6n2dsbvr4qr79g8bcil8r80q931m4w6wp7qf4y2lxasjmnnf5g";
+ rev = "08f64bcf46afc3a1116ef23c95822de914d14abe";
+ sha256 = "02m0kshj9q61dihhgckp801gh6r2jz1hw5s3vx46ha2zvzxbvf93";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@@ -3516,12 +3528,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "2f7407775d532b17c3a67a1d948ec910674cd8b0";
- sha256 = "1jsrl0079jp0pfv4235b1ghhv911dlnrz0mshbbm8bby4jd3q3a4";
+ rev = "07fd5abcab09a370f8d15fc437f79becb121e025";
+ sha256 = "0p45wg4g28w6zlfz8cq9a5ypcsf0l6br98khf5gv81zfr4r7n68h";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -3564,12 +3576,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "50fec950de31edc84bb7799b6a692a187037c03b";
- sha256 = "05gs9zws4g3y3nn5xyqd4j145f37j8ibax3lrash100jr2v7m8h6";
+ rev = "13820ff0af7dec102b15c68f7c8fcd94302099f7";
+ sha256 = "0b59ikp6z63mls64szk3bc7hzvmwrsb97k6b56vaylbx9g1wvlk6";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@@ -3612,12 +3624,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
- version = "2021-08-03";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
- rev = "3fb698aef5f48b660dacf8abd1bcdff6588dd2b8";
- sha256 = "15zzjyzz53w79j8jn8bsbxgdgs6qfpxm9pp5xvkkah53g34wfqwd";
+ rev = "5c82307c64143ed2848e6ea1777ee51a40d3b978";
+ sha256 = "07nid4wnd18bd26pl9y79427jsm4k602qph8090rkwl3h9b14w9x";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@@ -3648,12 +3660,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-07-23";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "73529ce61611c9ee3821e18ecc929c422416c462";
- sha256 = "1r55z5abg7ha3xh84ypbbnc3fs7a1718zqmypc49f3wa6ln2rjxz";
+ rev = "8ed6999e005015251b6b05cb5c0bfe857785b1d4";
+ sha256 = "0921vgji6n5hcb3z2cppz2gfbkww71yn7wqvh3wvgrw041ird3af";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3792,12 +3804,12 @@ final: prev:
nvim-lsputils = buildVimPluginFrom2Nix {
pname = "nvim-lsputils";
- version = "2021-05-27";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "nvim-lsputils";
- rev = "f34927f8ec777f4e91e14afc709de9da1cd70116";
- sha256 = "1s1pvddgkdslh3r9p08r3xjdpi93d15i4k1jssh8apxzm37gw7lm";
+ rev = "ae2f20d6938bab234815e0bc69dae1a991307b99";
+ sha256 = "0ikim2zwrlc19bpshr1vzsk15wi5z7am59f4fi53rbh985jmncqr";
};
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
@@ -3876,12 +3888,12 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-08-07";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "e5a534f51ba65e3a28742b640b6b4702726189a5";
- sha256 = "1m4sal8wz7z05kvim2c08clzqcqvzfw7jz8dmyk41nllpg2kppqr";
+ rev = "6175d63eaecdc7d80105825f89a6c9864c4dd432";
+ sha256 = "0q716l729flcnqkjs98bgjlqpibm8jpknq9h3izcnas2h5bgrmjj";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@@ -3900,12 +3912,12 @@ final: prev:
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2021-08-06";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
- rev = "bcc0fa0eb585b5639fbc756c1463cdc8d31f33e6";
- sha256 = "0ikdrsym0a2ik9rrsclp83gbj73r2chsbin7y54qy16dmii001gy";
+ rev = "9c71ace8af7bfbfef3beb25c648c8d41f72bd09a";
+ sha256 = "1jp4an8nni9m8528lza6vc0bj5pkmzfadzvqrgh6vi545ppmxihl";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
@@ -4236,12 +4248,12 @@ final: prev:
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-08-03";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "d897b4d9fdbc51febd71a1f96c96001ae4fa6121";
- sha256 = "0rgqby4aakqamiw3ykvzhn3vd2grjkzgfxrpzjjp1ipkd2qak8mb";
+ rev = "58a51d59999022fdc05a0b22428124b4f37c07ad";
+ sha256 = "0yxydnvbzzfpyx8y6pqsnkb030nirdh12q138iixqy7l3j9p5jr9";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -4273,24 +4285,24 @@ final: prev:
popup-nvim = buildVimPluginFrom2Nix {
pname = "popup-nvim";
- version = "2021-05-08";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "popup.nvim";
- rev = "5e3bece7b4b4905f4ec89bee74c09cfd8172a16a";
- sha256 = "1k6rz652fjkzhjd8ljr0l6vfispanrlpq0r4aya4qswzxni4rxhg";
+ rev = "f91d80973f80025d4ed00380f2e06c669dfda49d";
+ sha256 = "1pp1d6kbx8yn4cg2zs8rynvvpa8y89ryr8rial9csg26v2z22z95";
};
meta.homepage = "https://github.com/nvim-lua/popup.nvim/";
};
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence-nvim";
- version = "2021-07-28";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
- rev = "f2a0dd50c67a62cea144775a120c1246a645f5ed";
- sha256 = "08di6dfzvn2jzr4ym2ikcf036ycm2pi4s4qwn36nfxyg3zbii71q";
+ rev = "77227a06ecf84037277318758a8026524aa736ab";
+ sha256 = "0x13p4pyby6g425cwm9b42qxknh1k27knf8hhn7jfgb4c5bdzk5a";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
@@ -4513,12 +4525,12 @@ final: prev:
riv-vim = buildVimPluginFrom2Nix {
pname = "riv-vim";
- version = "2020-04-09";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "gu-fan";
repo = "riv.vim";
- rev = "e26c3e8dce4c1332e802cde84f83e61ec8a13986";
- sha256 = "1da3iwrpy08rayrsf8v0ml4khlp9j5i4cffpv9j3iyalcbhk2m9g";
+ rev = "201ffc4e8dbfc3deeb26c6e278980f53d81d7f6a";
+ sha256 = "1drl291lq44hf7qx1g6l5ivqclfb6ih9lj5qy5cmv9w9b3svwlv4";
};
meta.homepage = "https://github.com/gu-fan/riv.vim/";
};
@@ -4923,12 +4935,12 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
- rev = "58db9ca9d92618af78440e05bc5fc2dac9311fcd";
- sha256 = "0wxgl7w2qp24ggq4z6s58jpw7cv1qlbxks7sc8vkfsyiyy5b89xl";
+ rev = "653b3dea6f2703dc450621df0589e3665a007656";
+ sha256 = "0ppn7mwv5n46dwhslrpdganrfikcz57v425c5az01nm16n57rp5i";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
@@ -6138,12 +6150,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-08-07";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "dffb352d5f49792a4df5653d7adab07a1c688928";
- sha256 = "1rqm6wsdpx5n6l4kkrxm8bw2837mm63b5n1igq1v4ji5zbjz6si2";
+ rev = "865b453825f309a204909f13b5afa98d36f7369f";
+ sha256 = "1zfbm81qnvz7rgi2awi29id5z0xr6qzv04pj0yaxyhyjmy7frjyk";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -6858,12 +6870,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-07-14";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "daf9389e827dd19d804ffaad19cc8b64e389da6c";
- sha256 = "0kcjfi61md9n0fgnypamvqsc9k4mykr9wx978qna2xjb19vfkvad";
+ rev = "20618a61bc74f3f1a7fa165431b69685c01048c6";
+ sha256 = "1z7r3zvhr2zcspqxgwgqskf4w2vwmb3ymvk2kl5r0r3paf305jck";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -6918,12 +6930,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "55382eb722407daaebe1db1f7f7ed99d99302cf5";
- sha256 = "0nxcv69sicgbsns6x0ld9z33mlg2kv3dggvln1i99a0ljxr4p8xm";
+ rev = "4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9";
+ sha256 = "1vgv4im6bp7688cdwnfvkh5p1fl69bk83d2rsx733l6n45pczzfv";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -7038,12 +7050,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-08-02";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "2ee4f84fa9871ce666d89907d3a3985d5109647f";
- sha256 = "1554919qfr22831hw708hfvi006izzd66ygkymxjc3lsgywp1rl8";
+ rev = "819cd8ff2006706b90f78da8fa4b5842b398bff9";
+ sha256 = "1k0kz8s0km9k5cc0wagfbbclc21rjw29rzbrmd042ldv53ssq8ad";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -7784,12 +7796,12 @@ final: prev:
vim-maktaba = buildVimPluginFrom2Nix {
pname = "vim-maktaba";
- version = "2021-08-05";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "google";
repo = "vim-maktaba";
- rev = "339ab52b488b2d9ced5dde5ebd734b95bc6500f3";
- sha256 = "1191bdrlc2sxwfick7y82cvl2hsxai32sdspxpwskbigyzsd6xks";
+ rev = "f5127b339a9d776f220cc0393783c55def9d8ce0";
+ sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg";
};
meta.homepage = "https://github.com/google/vim-maktaba/";
};
@@ -8205,12 +8217,12 @@ final: prev:
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
- version = "2021-08-07";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
- rev = "e2a6ec4fb91b38591445bdaa9972f54653dbcd49";
- sha256 = "031xy0h9a55ijfq6ni237x4xl2ywbwm3ad0r0h05dj8g1352s1vr";
+ rev = "1189ef91c95f522159f9fd267a6bd1ea4b070195";
+ sha256 = "12smb5p5lw3gakz6qbbdi11wcbyh8hap70csi8j0crr31fgjmsyf";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@@ -8949,12 +8961,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-08-04";
+ version = "2021-08-09";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "95c6f94bd5849e533542c2e375e3347c7faa1c58";
- sha256 = "023p5x6h8jwsxv724r6dgy0hh0bi0j0jfq68klm0shl68q4g5awq";
+ rev = "75309fc96c49725cf9bbd7bc881b7b342a60aa9a";
+ sha256 = "1k5n73dz60ds9ahgrkiypk0srh1ys39ahipsxkmm2k94gzmh6hj7";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -9105,12 +9117,12 @@ final: prev:
vim-swap = buildVimPluginFrom2Nix {
pname = "vim-swap";
- version = "2021-04-07";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "machakann";
repo = "vim-swap";
- rev = "e75fb91c4940447758902f8cab95d13f8be84d0e";
- sha256 = "0z8mlcjhp1r2v9hs69h6kpk7yfyi7c2y7ck096y5y0hbcwrarn6n";
+ rev = "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83";
+ sha256 = "1vi0d4mp3npyv1hz4zyillrw4dpq71b1cqc2lwc4ks5b6g83pf27";
};
meta.homepage = "https://github.com/machakann/vim-swap/";
};
@@ -9646,12 +9658,12 @@ final: prev:
vim-xtabline = buildVimPluginFrom2Nix {
pname = "vim-xtabline";
- version = "2021-08-04";
+ version = "2021-08-08";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-xtabline";
- rev = "dd1a4d7e05c79a48ef4f22400af2aff1b2e09ddd";
- sha256 = "18sfwc36m7c901lfdk3f5mlx4bhk0vdg4qb54j4fr487hg89vnfc";
+ rev = "da2b4d1094e7771cf2de671ce64bd086da9e8d57";
+ sha256 = "0p48dzjvjb403dbn641h9p0jhip4dbd6w7r9zf73b3wbd2ym6y38";
};
meta.homepage = "https://github.com/mg979/vim-xtabline/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 492080a89e69..139df6fe6cb9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -138,6 +138,7 @@ esneider/YUNOcommit.vim
euclidianAce/BetterLua.vim
euclio/vim-markdown-composer
f-person/git-blame.nvim
+famiu/bufdelete.nvim
famiu/feline.nvim
farmergreg/vim-lastplace
fatih/vim-go
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 24e23f2b7e97..4f3c3a79f5b0 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -91,7 +91,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
- version = "1.5.7";
+ version = "1.5.12";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -100,7 +100,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh";
+ sha256 = "sha256-BluwLlm6s/2H/USARQpAvDR0+X8WP/q0h8VvxA6Qftc=";
};
patches = [
@@ -296,7 +296,6 @@ let
"fwupd/thunderbolt.conf"
"fwupd/upower.conf"
"fwupd/uefi_capsule.conf"
- "pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd/LVFS-CA.pem"
diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index 587266ec999a..c2f94a8a03b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -44,6 +44,12 @@ buildLinux (args // rec {
ANDROID_BINDER_IPC = module;
ANDROID_BINDERFS = module;
ANDROID_BINDER_DEVICES = freeform "binder,hwbinder,vndbinder";
+
+ # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
+ # Futex2 interface compatible w/ latest Wine / Proton Fsync.
+ FUTEX = yes;
+ FUTEX2 = yes;
+ FUTEX_PI = yes;
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 2b91a259232b..712f3f08895a 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
- version = "5.13.7";
+ version = "5.13.9";
suffix = "zen1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0=";
+ sha256 = "sha256-RuY6ZIIKU56R+IGMtQDV6mIubGDqonRpsIdlrpAHFXM=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6677be105bb9..0231c5fb6053 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.8.5";
+ version = "2021.8.6";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 384766852c2e..060a00006052 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -62,23 +62,6 @@ let
(mkOverride "pylast" "4.2.0"
"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
(self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
@@ -138,7 +121,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.8.5";
+ hassVersion = "2021.8.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -155,7 +138,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "0alyr87vm0szljw1lgdsv7085rl0m9r16nwdprwskhcjlwllk1bh";
+ sha256 = "1hahxvvlk32dbmv2lhn67w1ii5g24znvjqgsq318qv8c2qh5z5ws";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index c8cb13022e26..8763591d05e3 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -3,19 +3,15 @@
stdenv.mkDerivation rec {
pname = "mod_auth_mellon";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "latchset";
repo = "mod_auth_mellon";
rev = "v${version}";
- sha256 = "03bkvqkmqq72ff1a8cpvpcxngnlz1p6433y2fkkynpjfr19cna2s";
+ sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn";
};
- patches = [
- ./fixdeps.patch
- ];
-
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ];
@@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "https://github.com/UNINETT/mod_auth_mellon";
+ homepage = "https://github.com/latchset/mod_auth_mellon";
description = "An Apache module with a simple SAML 2.0 service provider";
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
deleted file mode 100644
index 4f814ad60368..000000000000
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1388c91..ab28982 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -42,7 +42,7 @@ DISTFILES=$(SRC) \
- all: mod_auth_mellon.la
-
- mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h
-- @APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
-+ @APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@ @LIBXML2_CFLAGS@ @XMLSEC_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@ @LIBXML2_LIBS@ @XMLSEC_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
-
-
- # Building configure (for distribution)
-diff --git a/configure.ac b/configure.ac
-index 421b952..e62768e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,6 +91,16 @@ AC_SUBST(GLIB_LIBS)
-
- AC_SUBST(MELLON_CFLAGS)
-
-+#include
-+PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
-+AC_SUBST(LIBXML2_CFLAGS)
-+AC_SUBST(LIBXML2_LIBS)
-+
-+#include
-+PKG_CHECK_MODULES(XMLSEC, xmlsec1-openssl)
-+AC_SUBST(XMLSEC_CFLAGS)
-+AC_SUBST(XMLSEC_LIBS)
-+
- # Test to see if we can include lasso/utils.h
- # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories
- # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS.
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 226efe51f56e..5648ea012938 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "8.1.0";
+ version = "8.1.1";
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
@@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "sha256-l7tVsxyUJ+WEPA3q3pcW3W74/2YlSgz84Au1A9a7s/E=";
+ sha256 = "sha256-dP0aBlp/956YyRGkIJTR9UtGBMTsSUBt9LYB5yIJvDU=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "sha256-OsjIK9NOU5XynzUOLyntTquH0UPwL/Eqw9XjaDsSO+g=";
+ sha256 = "sha256-kJHZmP+os+qmpdK2bm5FY7rdT0yyXrDYACn+U4xyUr8=";
};
vendorSha256 = "sha256-cfErlr7YS+8TVy0+XWDiA3h1lMoV3efdsjuH+yEcwXs=";
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index 57866388b465..fc5910a1ae53 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -4,26 +4,26 @@ let
webassets = fetchFromGitHub {
owner = "gravitational";
repo = "webassets";
- rev = "c63397375632f1a4323918dde78334472f3ffbb9";
- sha256 = "sha256-6YKk0G3s+35PRsUBkKgu/tNoSSwjJ5bTn8DACF4gYr4=";
+ rev = "2891baa0de7283f61c08ff2fa4494e53f9d4afc1";
+ sha256 = "sha256-AvhCOLa+mgty9METlOCARlUOEDMAW6Kk1esSmBbVcok=";
};
in
-
buildGoModule rec {
pname = "teleport";
- version = "6.2.8";
+ version = "7.0.0";
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub {
owner = "gravitational";
repo = "teleport";
rev = "v${version}";
- sha256 = "sha256-TVjdz97CUXBKCQh9bYrvtcH4StblBMsXiQ9Gix/NIm4=";
+ sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I=";
};
vendorSha256 = null;
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
+ tags = [ "webassets_embed" ];
nativeBuildInputs = [ zip makeWrapper ];
@@ -34,26 +34,15 @@ buildGoModule rec {
./test.patch
];
- postBuild = ''
- pushd .
- mkdir -p build
- echo "making webassets"
- cp -r ${webassets}/* webassets/
- make build/webassets.zip
- cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport
- rm -fr build/webassets.zip
- cd $NIX_BUILD_TOP/go/bin
- zip -q -A teleport
- popd
- '';
-
- # Do not strip the embedded web assets
- dontStrip = true;
-
# Reduce closure size for client machines
outputs = [ "out" "client" ];
- buildTargets = [ "full" ];
+ preBuild = ''
+ mkdir -p build
+ echo "making webassets"
+ cp -r ${webassets}/* webassets/
+ make lib/web/build/webassets.zip
+ '';
preCheck = ''
export HOME=$(mktemp -d)
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 4569ee675d92..df76789f9086 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -1,52 +1,31 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config, systemd
-, tlsSupport ? false }:
+{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config
+, systemd, tlsSupport ? false }:
assert tlsSupport -> openssl != null;
stdenv.mkDerivation rec {
pname = "uhub";
- version = "0.5.0";
+ version = "unstable-2019-12-13";
src = fetchFromGitHub {
owner = "janvidar";
repo = "uhub";
- rev = version;
- sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg";
+ rev = "35d8088b447527f56609b85b444bd0b10cd67b5c";
+ hash = "sha256-CdTTf82opnpjd7I9TTY+JDEZSfdGFPE0bq/xsafwm/w=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ sqlite systemd ] ++ lib.optional tlsSupport openssl;
- outputs = [ "out"
- "mod_example"
- "mod_welcome"
- "mod_logging"
- "mod_auth_simple"
- "mod_auth_sqlite"
- "mod_chat_history"
- "mod_chat_only"
- "mod_topic"
- "mod_no_guest_downloads"
- ];
-
- patches = [
- ./plugin-dir.patch
- # fix aarch64 build: https://github.com/janvidar/uhub/issues/46
- (fetchpatch {
- url = "https://github.com/janvidar/uhub/pull/47.patch";
- sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq";
- })
-
- # Fixed compilation on systemd > 210
- (fetchpatch {
- url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff";
- sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp";
- })
- ];
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "/usr/lib/uhub/" "$out/plugins" \
+ --replace "/etc/uhub" "$TMPDIR"
+ '';
cmakeFlags = [
"-DSYSTEMD_SUPPORT=ON"
- (if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF")
+ "-DSSL_SUPPORT=${if tlsSupport then "ON" else "OFF"}"
];
meta = with lib; {
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch
deleted file mode 100644
index d29d600425ff..000000000000
--- a/pkgs/servers/uhub/plugin-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -241,8 +241,14 @@
-
- if (UNIX)
- install( TARGETS uhub uhub-passwd RUNTIME DESTINATION bin )
-- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
-- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
-+
-+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
-+
-+ foreach( PLUGIN ${PLUGINS} )
-+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )
-+ endforeach( PLUGIN )
-+
-+ install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL )
- endif()
-
-
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index be0c3ab72c75..83c707472931 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
@@ -1,42 +1,40 @@
# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
{ fetchbower, buildEnv }:
buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
- (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr")
(fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn")
(fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")
(fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")
(fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp")
- (fetchbower "codemirror" "5.56.0+components1" "^5.19.0" "0fv8rxw6dspyv4bl6p2aka57544f45527rallnhnm5scv77qnakm")
+ (fetchbower "codemirror" "5.61.1" "^5.19.0" "1abm1fcps86y2qm033wa96pd6ixf9w01vlhly5i51j0j94arnz4g")
(fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")
(fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz")
(fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")
(fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh")
(fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
(fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
- (fetchbower "chainpad-crypto" "0.2.4" "^0.2.0" "0sqqc2j0pc34ig6319n18i85j03hibqkhz3cbr70vbd8x43vfzby")
- (fetchbower "chainpad-listmap" "0.9.0" "^0.9.0" "173yr5a6zxq7nb3fha6f1ajv2vy0mvqwmm949ww7ihvrhh7cd0f5")
- (fetchbower "chainpad" "5.2.2" "^5.2.0" "1rmh039bqk11xnnh99sqrqksr4idly75y5q4f5wyl9cg4slsqrdp")
+ (fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0")
+ (fetchbower "chainpad-listmap" "0.10.2" "^0.10.0" "03j3qws0icam4c0yqrz7f6maf1dxhlc56hc6csr2d9dx0wshd57s")
+ (fetchbower "chainpad" "5.2.4" "^5.2.0" "1f4nap0r8w50qpmjdfhhjhpz5xcl0n4zaxxnav1qaxi5j6dyg8h6")
(fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
(fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
(fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv")
(fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq")
(fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
- (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
- (fetchbower "bootstrap" "4.5.0" "^v4.0.0" "0cfdn6z8jwx6y8lbbq6xpkfhq2vra0i84nkj9ji2bil1fzgzi40f")
+ (fetchbower "bootstrap" "4.6.0" "^v4.0.0" "1pp2n88pkms25p7mbna7vxxl5mkpdn8nvnfzwcwpp6b0871njmr6")
(fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
(fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
(fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
- (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
- (fetchbower "localforage" "1.8.1" "^1.5.2" "0ci265385racnxvn4g1n672yaxi47msw6k042nxdb5vlpf5g327j")
+ (fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx")
+ (fetchbower "localforage" "1.9.0" "^1.5.2" "18ds5427gaschld5afwi128hqy8kysa1b1ckbrzbmqz8xnlshmc2")
(fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69")
(fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx")
- (fetchbower "sortablejs" "1.10.2" "^1.6.0" "10q4gyblhjy7w51clr0k9j7h722l4ybzn5535givwpmp6xagv11v")
+ (fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0")
(fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
- (fetchbower "jszip" "Stuk/jszip#3.5.0" "Stuk/jszip#^3.1.5" "1ra19d82cq1hrnbw88l8c61bs12kpgxvbfiiwpfi8fhy0l8hcsvk")
+ (fetchbower "jszip" "Stuk/jszip#3.7.1" "Stuk/jszip#^3.1.5" "0lzq1zd2glvfh3wwj73c9sffas56ql5472yj1cwq3g7iva5iliwq")
(fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
(fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0")
(fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0")
- (fetchbower "chainpad-netflux" "0.11.2" "^0.11.0" "1dqfricbm6s8iv7w1bsx1700m5cpk5rk1f4spqv0fqyf6mdz366v")
- (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz")
+ (fetchbower "chainpad-netflux" "0.12.9" "^0.12.0" "1b2jkfl354gs9iy05i6db9g0hnngacxd2wdv59lc0icbmx62fpvi")
+ (fetchbower "netflux-websocket" "0.1.21" "^0.1.20" "13ia8cqipq1jnyzzxwf9yy91gzwnwb2g5kzb6l8id5gdr415q5yn")
(fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
]; }
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
index abd20d644990..4e8daf38453c 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/pkgs/servers/web-apps/cryptpad/default.nix
@@ -2,6 +2,7 @@
, pkgs
, lib
, buildBowerComponents
+, fetchbower
, fetchurl
, nodejs
}:
@@ -12,30 +13,39 @@ let
inherit (stdenv.hostPlatform) system;
};
- bowerPackages = buildBowerComponents {
+ bowerPackages = (buildBowerComponents {
name = "${cryptpad.name}-bower-packages";
- # this list had to be tweaked by hand:
- # * add the second jquery ~2.1.0 entry
- # * add the second bootstrap ~3.1.1 entry
generated = ./bower-packages.nix;
src = cryptpad.src;
- };
+ }).overrideAttrs (old: {
+ bowerPackages = old.bowerPackages.override (old_: {
+ # add missing dependencies:
+ # Those dependencies are EOL and they are not installed by buildBowerComponents,
+ # but they are required, otherwise the resolver crashes.
+ # * add the second jquery ~2.1.0 entry
+ # * add the second bootstrap ~3.1.1 entry
+ paths = old_.paths ++ [
+ (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr")
+ (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
+ ];
+ });
+ });
# find an element in an attribute set
findValue = pred: default: set:
let
list =
lib.concatMap
- (name:
- let v = set.${name}; in
- if pred name v then [v] else []
- )
- (lib.attrNames set)
- ;
- in
- if list == [] then default
- else lib.head list
+ (name:
+ let v = set.${name}; in
+ if pred name v then [ v ] else [ ]
+ )
+ (lib.attrNames set)
;
+ in
+ if list == [ ] then default
+ else lib.head list
+ ;
# The cryptpad package attribute key changes for each release. Get it out
# programatically instead.
@@ -43,7 +53,7 @@ let
(k: v: v.packageName == "cryptpad")
(throw "cryptpad not found")
nodePackages
- ;
+ ;
combined = cryptpad.override {
postInstall = ''
@@ -64,6 +74,17 @@ let
EOF
chmod +x $out/bin/cryptpad
'';
+
+ 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
- combined
+combined
diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh
index 697b5a74a08a..925420c49a58 100755
--- a/pkgs/servers/web-apps/cryptpad/generate.sh
+++ b/pkgs/servers/web-apps/cryptpad/generate.sh
@@ -1,11 +1,18 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix
+#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix
+
+# This script is meant to be run in the current directory
+
+cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw)
+echo "cryptpad src: $cryptpadSrc"
+
+nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-10_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix"
+
+
set -euo pipefail
node2nix --nodejs-12 \
--input node-packages.json \
--output node-packages-generated.nix \
--composition node-packages.nix \
- --node-env ../../../development/node-packages/node-env.nix \
-
-# TODO: bower2nix > bower-packages.nix
+ --node-env ../../../development/node-packages/node-env.nix
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index 47e64e9d911e..cbc12d113cfb 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -4,6 +4,15 @@
let
sources = {
+ "@mcrowe/minibloom-0.2.0" = {
+ name = "_at_mcrowe_slash_minibloom";
+ packageName = "@mcrowe/minibloom";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@mcrowe/minibloom/-/minibloom-0.2.0.tgz";
+ sha1 = "1bed96aec18388198da37443899b2c3ff5948053";
+ };
+ };
"accepts-1.3.7" = {
name = "accepts";
packageName = "accepts";
@@ -49,22 +58,22 @@ let
sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
};
};
- "chainpad-crypto-0.2.5" = {
+ "chainpad-crypto-0.2.6" = {
name = "chainpad-crypto";
packageName = "chainpad-crypto";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz";
- sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA==";
+ url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.6.tgz";
+ sha512 = "yk7bBj22rs9PaX6LiqQxiw+Vj/afBStsNP1xP/B4Uh9a8iyJ7JrSZJ2Hj3d6fyqxJlBrMAX82Aj5PCZb5dzzHw==";
};
};
- "chainpad-server-4.0.9" = {
+ "chainpad-server-5.1.0" = {
name = "chainpad-server";
packageName = "chainpad-server";
- version = "4.0.9";
+ version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.9.tgz";
- sha512 = "8h1W41ktE05TM6LuXrklpW2TUxWeNyIDiRaQygKsXaA/7pyJxF7+AmPVS+xW0c31VkHjQDPiaMzPoxhcxXnIyA==";
+ url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz";
+ sha512 = "BdjgOOLTXXo1EjQ7lURDe7oqsqfQISNvwhILfp3K3diY2K1hxpPLbjYzOSgxNOTADeOAff0xnInR5eUCESVWaQ==";
};
};
"content-disposition-0.5.2" = {
@@ -184,13 +193,13 @@ let
sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
};
};
- "forwarded-0.1.2" = {
+ "forwarded-0.2.0" = {
name = "forwarded";
packageName = "forwarded";
- version = "0.1.2";
+ version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
- sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
+ url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz";
+ sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";
};
};
"fresh-0.5.2" = {
@@ -229,13 +238,13 @@ let
sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==";
};
};
- "graceful-fs-4.2.4" = {
+ "graceful-fs-4.2.8" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.2.4";
+ version = "4.2.8";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
- sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz";
+ sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
};
};
"http-errors-1.6.3" = {
@@ -337,22 +346,22 @@ let
sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
};
};
- "mime-db-1.45.0" = {
+ "mime-db-1.49.0" = {
name = "mime-db";
packageName = "mime-db";
- version = "1.45.0";
+ version = "1.49.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
- sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz";
+ sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==";
};
};
- "mime-types-2.1.28" = {
+ "mime-types-2.1.32" = {
name = "mime-types";
packageName = "mime-types";
- version = "2.1.28";
+ version = "2.1.32";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
- sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz";
+ sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==";
};
};
"ms-2.0.0" = {
@@ -373,13 +382,13 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
- "netflux-websocket-0.1.20" = {
+ "netflux-websocket-0.1.21" = {
name = "netflux-websocket";
packageName = "netflux-websocket";
- version = "0.1.20";
+ version = "0.1.21";
src = fetchurl {
- url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz";
- sha512 = "svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg==";
+ url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.21.tgz";
+ sha512 = "Zjl5lefg8urC0a0T7YCPGiUgRsISZBsTZl1STylmQz8Bq4ohcZ8cP3r6VoCpeVcvJ1Y/e3ZCXPxndWlNP9Jfug==";
};
};
"nthen-0.1.8" = {
@@ -418,13 +427,13 @@ let
sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
};
};
- "proxy-addr-2.0.6" = {
+ "proxy-addr-2.0.7" = {
name = "proxy-addr";
packageName = "proxy-addr";
- version = "2.0.6";
+ version = "2.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
- sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz";
+ sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==";
};
};
"pull-stream-3.6.14" = {
@@ -647,27 +656,28 @@ let
};
in
{
- "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" = nodeEnv.buildNodePackage {
+ "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" = nodeEnv.buildNodePackage {
name = "cryptpad";
packageName = "cryptpad";
- version = "3.20.1";
+ version = "4.9.0";
src = fetchgit {
url = "https://github.com/xwiki-labs/cryptpad.git";
- rev = "9bc27d7d0d50d17c345bd545a45341a05293c558";
- sha256 = "4a1fc833b38b2097741500cef38c6b04f5b752c21736e95eb492c33012016332";
+ rev = "b1281fb4abd14e9758d58df4801e0a00eda7bc44";
+ sha256 = "ed2d0e2520645fccdada7fa5f25bb878c0ee0e61d6c81a98c18906c12750578c";
};
dependencies = [
+ sources."@mcrowe/minibloom-0.2.0"
sources."accepts-1.3.7"
sources."array-flatten-1.1.1"
sources."async-limiter-1.0.1"
sources."body-parser-1.18.3"
sources."bytes-3.0.0"
- (sources."chainpad-crypto-0.2.5" // {
+ (sources."chainpad-crypto-0.2.6" // {
dependencies = [
sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2"
];
})
- sources."chainpad-server-4.0.9"
+ sources."chainpad-server-5.1.0"
sources."content-disposition-0.5.2"
sources."content-type-1.0.4"
sources."cookie-0.3.1"
@@ -681,12 +691,12 @@ in
sources."etag-1.8.1"
sources."express-4.16.4"
sources."finalhandler-1.1.1"
- sources."forwarded-0.1.2"
+ sources."forwarded-0.2.0"
sources."fresh-0.5.2"
sources."fs-extra-7.0.1"
sources."gar-1.0.4"
sources."get-folder-size-2.0.1"
- sources."graceful-fs-4.2.4"
+ sources."graceful-fs-4.2.8"
sources."http-errors-1.6.3"
sources."iconv-lite-0.4.23"
sources."inherits-2.0.3"
@@ -698,16 +708,16 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.4.1"
- sources."mime-db-1.45.0"
- sources."mime-types-2.1.28"
+ sources."mime-db-1.49.0"
+ sources."mime-types-2.1.32"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
- sources."netflux-websocket-0.1.20"
+ sources."netflux-websocket-0.1.21"
sources."nthen-0.1.8"
sources."on-finished-2.3.0"
sources."parseurl-1.3.3"
sources."path-to-regexp-0.1.7"
- sources."proxy-addr-2.0.6"
+ sources."proxy-addr-2.0.7"
sources."pull-stream-3.6.14"
sources."qs-6.5.2"
sources."range-parser-1.2.1"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
index 07e02a1a0a2e..fde63614a46a 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.json
@@ -1,3 +1,3 @@
[
- { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" }
+ { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" }
]
diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix
index 7b522dd93b80..0126d68ed2d0 100644
--- a/pkgs/tools/admin/afterburn/default.nix
+++ b/pkgs/tools/admin/afterburn/default.nix
@@ -2,21 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "afterburn";
- version = "5.0.0";
+ version = "5.1.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "afterburn";
rev = "v${version}";
- sha256 = "sha256-sdgAZuT8bIX4eWN7nLNNyclxazmCBr5kDFS6s6cRXVU=";
+ sha256 = "sha256-5dzgvoR6qGlVz0RJ1j9B4yna1aCbOczVLcU++GWNEL8=";
};
- cargoSha256 = "sha256-IzcaaQjge2z49XwyFcPHX/AMjvrbcOLw0J1qBzHw7Is=";
+ cargoSha256 = "sha256-cqipYIH/XHMe7ppsXPVnDfsUqXoIep7CHiOGEPbZK4M=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
- patchPhase = ''
+ postPatch = ''
substituteInPlace ./systemd/afterburn-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
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index b0765d852ca0..836f9082d242 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
- version = "4.1.2";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eeNJ6oQayPBOHKsFrr2JbdLSv3R7N1xW3lV4LgVpUI4=";
+ sha256 = "sha256-PVR7QMndjfCNVo9U3lnArpRBxLfmOH8iEdFub7hZyio=";
};
- vendorSha256 = "sha256-79+j/+X9DQBpUvZuyQCSaoy1f4UnkERh54zmo4AhGwc=";
+ vendorSha256 = "sha256-npskCUVxNTgI8egVU1id02xHFfTizOb7kBUNfOLdbOc=";
doCheck = false;
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index 7ad304519693..902521743442 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.39.0";
+ version = "1.40.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-tCvncpD89OYTWW83pScSZqpoxoactARAZDRfEoPaqsc=";
+ sha256 = "sha256-zhVG9mtkW0avMTtSnJ36qkxuy4SiiAENrKZqE5mXvaA=";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix
new file mode 100644
index 000000000000..690c215471cf
--- /dev/null
+++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchurl, autoPatchelfHook, rpmextract, libX11, libXext }:
+
+stdenv.mkDerivation rec {
+ pname = "realvnc-vnc-viewer";
+ version = "6.21.406";
+
+ src = {
+ "x86_64-linux" = fetchurl {
+ url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
+ sha256 = "0rnizzanaykqg1vfy56p8abc4fmgpbibj54j4c1v81zsj3kmahka";
+ };
+ "i686-linux" = fetchurl {
+ url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm";
+ sha256 = "1rlxfiqymi1licn2spyiqa00kiwzhdr0pkh7vv3ai6gb9f6phk31";
+ };
+ }.${stdenv.system};
+
+ nativeBuildInputs = [ autoPatchelfHook rpmextract ];
+ buildInputs = [ libX11 libXext ];
+
+ unpackPhase = ''
+ rpmextract $src
+ '';
+
+ postPatch = ''
+ substituteInPlace ./usr/share/applications/realvnc-vncviewer.desktop \
+ --replace /usr/share/icons/hicolor/48x48/apps/vncviewer48x48.png vncviewer48x48.png
+ substituteInPlace ./usr/share/mimelnk/application/realvnc-vncviewer-mime.desktop \
+ --replace /usr/share/icons/hicolor/48x48/apps/vncviewer48x48.png vncviewer48x48.png
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mv usr $out
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "VNC remote desktop client software by RealVNC";
+ homepage = "https://www.realvnc.com/en/connect/download/viewer/";
+ license = {
+ fullName = "VNC Connect End User License Agreement";
+ url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf";
+ free = false;
+ };
+ maintainers = with maintainers; [ angustrau ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix
index e7cd29e1a812..cce9c5b77b7b 100644
--- a/pkgs/tools/backup/gphotos-sync/default.nix
+++ b/pkgs/tools/backup/gphotos-sync/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages, ffmpeg }:
python3Packages.buildPythonApplication rec {
pname = "gphotos-sync";
@@ -19,10 +19,14 @@ python3Packages.buildPythonApplication rec {
pyyaml
requests_oauthlib
];
+
+ buildInputs = [ ffmpeg ];
+
checkInputs = with python3Packages; [
pytestCheckHook
mock
];
+
checkPhase = ''
export HOME=$(mktemp -d)
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index bbc346d46f71..98e652a05f9d 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "duperemove";
- version = "0.11.2";
+ version = "0.11.3";
src = fetchFromGitHub {
owner = "markfasheh";
repo = "duperemove";
rev = "v${version}";
- sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9";
+ sha256 = "sha256-WjUM52IqMDvBzeGHo7p4JcvMO5iPWPVOr8GJ3RSsnUs=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 95b5b6ab34aa..e0755a1eead0 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
- version = "1.89";
+ version = "1.90";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${version}";
- sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k=";
+ sha256 = "sha256-tcoINdkPfIdO0VMQ5tdpKcslpvvgVhaJiDFnS/ix0sc=";
};
buildInputs = [ curl openssl libxml2 fuse ];
diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix
index bd15661a0e00..b78cafe566a6 100644
--- a/pkgs/tools/graphics/agi/default.nix
+++ b/pkgs/tools/graphics/agi/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
- version = "2.1.0-dev-20210804";
+ version = "2.1.0-dev-20210809";
src = fetchzip {
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 = [
diff --git a/pkgs/tools/misc/ethminer/add-global-context.patch b/pkgs/tools/misc/ethminer/add-global-context.patch
new file mode 100644
index 000000000000..f0891e5a2758
--- /dev/null
+++ b/pkgs/tools/misc/ethminer/add-global-context.patch
@@ -0,0 +1,25 @@
+diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt
+index 1a53de8..832e926 100644
+--- a/libethcore/CMakeLists.txt
++++ b/libethcore/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(SOURCES
+ include_directories(BEFORE ..)
+
+ add_library(ethcore ${SOURCES})
+-target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon)
++target_link_libraries(ethcore PUBLIC devcore ethash::ethash ethash-global-context PRIVATE hwmon)
+
+ if(ETHASHCL)
+ target_link_libraries(ethcore PRIVATE ethash-cl)
+diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h
+index d9aadc7..fe5c6cf 100644
+--- a/libethcore/EthashAux.h
++++ b/libethcore/EthashAux.h
+@@ -22,6 +22,7 @@
+ #include
+
+ #include
++#include
+
+ namespace dev
+ {
diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix
index 675147bc5d57..e159622bc8e1 100644
--- a/pkgs/tools/misc/ethminer/default.nix
+++ b/pkgs/tools/misc/ethminer/default.nix
@@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
cudatoolkit
];
+ patches = [
+ # global context library is separated from libethash
+ ./add-global-context.patch
+ ];
+
preConfigure = ''
sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
'';
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index b5d884dbace4..5ccdf2e2feba 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
- version = "5.4.0";
+ version = "5.4.1";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
- sha256 = "sha256-/FhOZ6WCaQQOzsLH3iZTnwzmwUcdsskgASJFZupSIY0=";
+ sha256 = "sha256-0Pg9bHQwWElW4B3oRco5F2FsaEeLC0ZXx7J+hl7dc3Y=";
};
dontConfigure = true;
diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix
index 3d91dd6d9abb..fc078ca64dfd 100644
--- a/pkgs/tools/misc/infracost/default.nix
+++ b/pkgs/tools/misc/infracost/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
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}" ];
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index 6412eaa1f802..a6d635a6f7ed 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
- version = "0.5.6";
+ version = "0.5.8";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
- sha256 = "sha256-x2cED+WEc50RB8BxiDEm/XnauT1RqqGjSIdL5MMaFBY=";
+ sha256 = "sha256-D8ScF/3qyT0VuMGmWkkeGRyCu4LdOXt1wvR9whbNURE=";
};
postInstall = ''
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
install -Dm644 -t $out/share/mcfly mcfly.fish
'';
- cargoSha256 = "sha256-7RKewz5jBS2HhHvXHBUWaQQ/wq9nryS9E+DqzBOVjPs=";
+ cargoSha256 = "sha256-VZgxfVmAa5lPfdLNbsotNoRpTLe3HID36sF8T/0mywI=";
meta = with lib; {
homepage = "https://github.com/cantino/mcfly";
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index cef09241420d..f9d9224e91b1 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -1,17 +1,18 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "cksfv";
version = "1.3.15";
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";
};
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";
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
license = licenses.gpl2;
};
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 60dbd1c323b7..681bda5b4e1b 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -5,7 +5,7 @@ buildGoPackage rec {
version = "0.7.4";
src = fetchurl {
- url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz";
+ url = "https://viric.name/soft/filegive/filegive-${version}.tar.gz";
sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
};
@@ -14,7 +14,7 @@ buildGoPackage rec {
goPackagePath = "viric.name/soft/filegive";
meta = with lib; {
- homepage = "http://viric.name/cgi-bin/filegive";
+ homepage = "https://viric.name/cgi-bin/filegive";
description = "Easy p2p file sending program";
license = licenses.agpl3Plus;
maintainers = [ maintainers.viric ];
diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix
index 54de621763c5..2cbe5fd91849 100644
--- a/pkgs/tools/networking/telepresence2/default.nix
+++ b/pkgs/tools/networking/telepresence2/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "telepresence2";
- version = "2.3.6";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "telepresenceio";
repo = "telepresence";
rev = "v${version}";
- sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3";
+ sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f";
};
- vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5";
+ vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q";
buildFlagsArray = ''
-ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 6b4e450a70cb..cc577098562b 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
- version = "0.16.2";
+ version = "0.16.3";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = "v${version}";
- sha256 = "sha256-o3AKA/uP6VWMO4c62H3ey0P98KIhbzhnng5ggKjNeZ8=";
+ sha256 = "sha256-VAXuxHCayjmuI26rhJroEBbnyJ4z+w7HY5TNTanYvpw=";
};
- cargoSha256 = "sha256-SHLiUVH5LiQNd/Ipj/xrjSG0X2HXfcAwswqsbqweJBs=";
+ cargoSha256 = "sha256-cXuAPQ8xRkeixWNYGjStNipbn4xIc1NsfVqROd6RHdg=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix
index bd16ecc6f3fc..0077c6c01895 100644
--- a/pkgs/tools/package-management/nix-simple-deploy/default.nix
+++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nix-simple-deploy";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "misuzu";
repo = pname;
rev = version;
- sha256 = "0vkgs3ffb5vdzhrqdnd54vbi36vrgd3408zvjn0rmqlnwi3wwhnk";
+ sha256 = "1qq4fbsd2mvxblsggwbnh88mj18f3vrfzv1kgc7a92pfiwxznq8r";
};
- cargoSha256 = "0z4d4cazl6qvigyqzdayxqfjc1ki1rhrpm76agc8lkrxrvhyay2h";
+ cargoSha256 = "1r6dl7qipbyyvjcd3l9ynawjln1g1qzvw5za6nyjcf41dzv48m8x";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index cd1f6062cfba..8f89fd6641d1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -234,13 +234,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.4${suffix}";
- suffix = "pre20210707_02dd6bb";
+ suffix = "pre20210802_47e96bb";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
- sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
+ rev = "47e96bb533f8cacc171bec9b688b134de31a48a9";
+ sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg=";
};
boehmgc = boehmgc_nixUnstable;
diff --git a/pkgs/tools/security/dnspeep/Cargo.lock b/pkgs/tools/security/dnspeep/Cargo.lock
new file mode 100644
index 000000000000..9039c430d4c8
--- /dev/null
+++ b/pkgs/tools/security/dnspeep/Cargo.lock
@@ -0,0 +1,660 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+dependencies = [
+ "libc",
+ "num-integer",
+ "num-traits",
+ "time",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "dns-message-parser"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e859c9ca137be3407a445a34eda3395aeef5aae12cd47d46a7fffba54460072"
+dependencies = [
+ "bytes 1.0.1",
+ "hex",
+ "thiserror",
+]
+
+[[package]]
+name = "dnspeep"
+version = "0.1.2"
+dependencies = [
+ "bytes 1.0.1",
+ "chrono",
+ "dns-message-parser",
+ "etherparse",
+ "eyre",
+ "futures",
+ "getopts",
+ "hex",
+ "libc",
+ "pcap",
+ "tokio",
+]
+
+[[package]]
+name = "etherparse"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fa20922281f9ee5ffcda45e80d56085829279f1270f79fbabc39809a4354807"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+dependencies = [
+ "bitflags",
+ "fuchsia-zircon-sys",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+
+[[package]]
+name = "futures"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
+
+[[package]]
+name = "futures-task"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
+
+[[package]]
+name = "futures-util"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite 0.2.6",
+ "pin-utils",
+ "proc-macro-hack",
+ "proc-macro-nested",
+ "slab",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
+
+[[package]]
+name = "libloading"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "mio"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log",
+ "miow 0.2.2",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
+]
+
+[[package]]
+name = "mio-named-pipes"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
+dependencies = [
+ "log",
+ "mio",
+ "miow 0.3.7",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "mio-uds"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
+dependencies = [
+ "iovec",
+ "libc",
+ "mio",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+dependencies = [
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "net2"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+
+[[package]]
+name = "pcap"
+version = "0.8.1"
+source = "git+https://github.com/jvns/pcap#ae2aa7f501ae5bb7069155cf7c5c700b7482681d"
+dependencies = [
+ "futures",
+ "libc",
+ "libloading",
+ "mio",
+ "regex",
+ "tokio",
+ "widestring",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+
+[[package]]
+name = "syn"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tokio"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
+dependencies = [
+ "bytes 0.5.6",
+ "fnv",
+ "futures-core",
+ "iovec",
+ "lazy_static",
+ "libc",
+ "memchr",
+ "mio",
+ "mio-named-pipes",
+ "mio-uds",
+ "num_cpus",
+ "pin-project-lite 0.1.12",
+ "signal-hook-registry",
+ "slab",
+ "tokio-macros",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "widestring"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
diff --git a/pkgs/tools/security/dnspeep/default.nix b/pkgs/tools/security/dnspeep/default.nix
new file mode 100644
index 000000000000..534894813ca2
--- /dev/null
+++ b/pkgs/tools/security/dnspeep/default.nix
@@ -0,0 +1,32 @@
+{ fetchFromGitHub, lib, libpcap, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dnspeep";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "jvns";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0lz22vlgi1alsq676q4nlzfzwnsrvziyqdnmdbn00rwqsvlb81q6";
+ };
+
+ # dnspeep has git dependencies therefore doesn't work with `cargoSha256`
+ cargoLock = {
+ # update Cargo.lock every update
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "pcap-0.8.1" = "1nnfyhlhcpbl4i6zmfa9rvnvr6ibg5khran1f5yhmr9yfhmhgakd";
+ };
+ };
+
+ LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ];
+ LIBPCAP_VER = libpcap.version;
+
+ meta = with lib; {
+ description = "Spy on the DNS queries your computer is making";
+ homepage = "https://github.com/jvns/dnspeep";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix
index 75c85deb1cce..7872e4a8eace 100644
--- a/pkgs/tools/security/dnsx/default.nix
+++ b/pkgs/tools/security/dnsx/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dnsx";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "dnsx";
rev = "v${version}";
- sha256 = "sha256-w+FQp5pvySM36UHFxBH5WRZvnGi43NZeI2tLr6HAF3Q=";
+ sha256 = "sha256-rAicKytDtdnPwWdxJvBd5UnMGTAI4NHcPUjISlT7kCw=";
};
- vendorSha256 = "sha256-gsoeAau3klOFTu+ZEYEMdIuXw/5IVsfFJ2maxPaZKjA=";
+ vendorSha256 = "sha256-8YoYfn2BFUnVwH9FcAgb1p5CV3dJVrWjEMPfivOGvQE=";
meta = with lib; {
description = "Fast and multi-purpose DNS toolkit";
diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index fb87251d737c..ad49251aae86 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
- version = "3.31.0";
+ version = "3.31.1";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "sha256-jmOHr32mDnjY3n9/nU/YaQ/ZuVsCKTo2likM2homToM=";
+ sha256 = "sha256-m8dugkZ0n51RnclZwKGgjVG3OrDMz3MsOQMvNbG4BPU=";
};
vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8=";
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 47c017ee98c9..0e92047c63fa 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2021-08-06";
+ version = "2021-08-11";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
- sha256 = "sha256-aKF/6SuSAk319QqGmyUu91//ofvPtHxX2Uv8FxhzqCM=";
+ sha256 = "sha256-OSEG0pWnxSvUS1h9v1j9/poo15ZoouNqiG+qB/JrOHc=";
};
installPhase = ''
diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix
index 7c3e58634275..5905632294f2 100644
--- a/pkgs/tools/security/httpx/default.nix
+++ b/pkgs/tools/security/httpx/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "httpx";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "httpx";
rev = "v${version}";
- sha256 = "sha256-selmBW6GlfzKbVHz7EgmUB8n567NS08gwkRB9Y+Px8s=";
+ sha256 = "sha256-uuHvU/KUHliY3FUwknp7ninKTY9qs+gI7WljgIvJEF4=";
};
- vendorSha256 = "sha256-q0cTFYepq7odZSACNuUoz6kjT7sE38Pv6B113w2gpIQ=";
+ vendorSha256 = "sha256-/xip2lwmpaSvnQoGj3de8Tgeog+HPrI8mF6catC1O4s=";
meta = with lib; {
description = "Fast and multi-purpose HTTP toolkit";
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index c48d19fbe87d..15231c945316 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/OpenSC/OpenSC/wiki";
license = licenses.lgpl21Plus;
platforms = platforms.all;
- maintainers = [ maintainers.erictapen ];
+ maintainers = [ maintainers.michaeladler ];
};
}
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index a6f479dc71ab..73f602cbf695 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -21,15 +21,15 @@ let
in
buildGoModule rec {
pname = "distrobuilder";
- version = "1.2";
+ version = "1.3";
- vendorSha256 = "sha256-G5FUO6Ul4dA4MZZI9Ho1kE9ptX31tAWak9rWAoD/iuU=";
+ vendorSha256 = "sha256-FKnpoLA4enZ1vGSJQFLbp/OjoEgdxagL73ucxUgIoKY=";
src = fetchFromGitHub {
owner = "lxc";
repo = "distrobuilder";
rev = "distrobuilder-${version}";
- sha256 = "CE3Tq0oWpVZnSfBBY3/2E2GdZLFsO0NzkPABT8lu+TY=";
+ sha256 = "sha256-cvxbJbg9yTcAPWQccH+1nQivwRh8CIN3Cga2HKY8VlQ=";
fetchSubmodules = false;
};
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e88c6978ad1f..87c582987468 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -526,6 +526,7 @@ mapAliases ({
nmap-unfree = nmap; # added 2021-04-06
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
+ now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
oauth2_proxy = oauth2-proxy; # added 2021-04-18
@@ -876,6 +877,7 @@ mapAliases ({
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07
+ turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08
uberwriter = apostrophe; # added 2020-04-23
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
ucsFonts = ucs-fonts; # added 2016-07-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1431bce8baf..cff389cf951b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -161,6 +161,8 @@ with pkgs;
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
+ aether = callPackage ../applications/networking/aether { };
+
alda = callPackage ../development/interpreters/alda { };
althttpd = callPackage ../servers/althttpd { };
@@ -1124,6 +1126,8 @@ with pkgs;
ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { };
+ archivebox = python3Packages.callPackage ../applications/misc/archivebox { };
+
archivemount = callPackage ../tools/filesystems/archivemount { };
archivy = python3Packages.callPackage ../applications/misc/archivy { };
@@ -3781,7 +3785,9 @@ with pkgs;
cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
- cryptpad = callPackage ../servers/web-apps/cryptpad { };
+ cryptpad = callPackage ../servers/web-apps/cryptpad {
+ nodejs = nodejs-12_x;
+ };
ethash = callPackage ../development/libraries/ethash { };
@@ -4208,6 +4214,8 @@ with pkgs;
dnsmasq = callPackage ../tools/networking/dnsmasq { };
+ dnspeep = callPackage ../tools/security/dnspeep { };
+
dnsproxy = callPackage ../tools/networking/dnsproxy { };
dnsperf = callPackage ../tools/networking/dnsperf { };
@@ -6693,8 +6701,6 @@ with pkgs;
nodejs = pkgs.nodejs;
});
- now-cli = callPackage ../development/web/now-cli {};
-
np2kai = callPackage ../misc/emulators/np2kai { };
ox = callPackage ../applications/editors/ox { };
@@ -7025,6 +7031,8 @@ with pkgs;
marktext = callPackage ../applications/misc/marktext { };
+ mars-mips = callPackage ../development/tools/mars-mips { };
+
mawk = callPackage ../tools/text/mawk { };
mb2md = callPackage ../tools/text/mb2md { };
@@ -8476,6 +8484,8 @@ with pkgs;
rtss = callPackage ../development/tools/misc/rtss { };
+ realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer {};
+
reaverwps = callPackage ../tools/networking/reaver-wps {};
reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {};
@@ -9548,6 +9558,8 @@ with pkgs;
translate-shell = callPackage ../applications/misc/translate-shell { };
+ translatepy = with python3.pkgs; toPythonApplication translatepy;
+
trash-cli = callPackage ../tools/misc/trash-cli { };
trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { };
@@ -18045,6 +18057,8 @@ with pkgs;
openrct2 = callPackage ../games/openrct2 { };
+ optparse-bash = callPackage ../development/libraries/optparse-bash { };
+
orcania = callPackage ../development/libraries/orcania { };
osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
@@ -23604,6 +23618,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
+ cyanrip = callPackage ../applications/audio/cyanrip { };
+
centerim = callPackage ../applications/networking/instant-messengers/centerim { };
cgit = callPackage ../applications/version-management/git-and-tools/cgit {
@@ -28866,6 +28882,8 @@ with pkgs;
ergo = callPackage ../applications/blockchains/ergo { };
+ erigon = callPackage ../applications/blockchains/erigon.nix { };
+
exodus = callPackage ../applications/blockchains/exodus { };
faraday = callPackage ../applications/blockchains/faraday { };
@@ -28937,8 +28955,6 @@ with pkgs;
tessera = callPackage ../applications/blockchains/tessera { };
- turbo-geth = callPackage ../applications/blockchains/turbo-geth { };
-
vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin {
boost = boost165;
withGui = true;
@@ -29072,6 +29088,8 @@ with pkgs;
brogue = callPackage ../games/brogue { };
+ brutalmaze = callPackage ../games/brutalmaze { };
+
bsdgames = callPackage ../games/bsdgames { };
btanks = callPackage ../games/btanks { };
@@ -31343,7 +31361,7 @@ with pkgs;
faustStk = callPackage ../applications/audio/faustStk { };
- fceux = callPackage ../misc/emulators/fceux { };
+ fceux = libsForQt5.callPackage ../misc/emulators/fceux { };
flockit = callPackage ../tools/backup/flockit { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 93e7acff553d..fb2f2db19d81 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2150,6 +2150,21 @@ let
};
};
+ CatalystPluginPrometheusTiny = buildPerlPackage {
+ pname = "Catalyst-Plugin-PrometheusTiny";
+ version = "0.006";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SY/SYSPETE/Catalyst-Plugin-PrometheusTiny-0.006.tar.gz";
+ sha256 = "1hd2nv21c2mq3yvhsys4a276bdwr5igs4b73m99v7ymzpabvjf9b";
+ };
+ buildInputs = [ HTTPMessage Plack SubOverride TestDeep ];
+ propagatedBuildInputs = [ CatalystRuntime Moose PrometheusTiny PrometheusTinyShared ];
+ meta = {
+ description = "Prometheus metrics for Catalyst";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
CatalystPluginSession = buildPerlPackage {
pname = "Catalyst-Plugin-Session";
version = "0.41";
@@ -4932,6 +4947,20 @@ let
};
};
+ DataRandom = buildPerlPackage {
+ pname = "Data-Random";
+ version = "0.13";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/B/BA/BAREFOOT/Data-Random-0.13.tar.gz";
+ sha256 = "eb590184a8db28a7e49eab09e25f8650c33f1f668b6a472829de74a53256bfc0";
+ };
+ buildInputs = [ FileShareDirInstall TestMockTime ];
+ meta = {
+ description = "Perl module to generate random data";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
DataSection = buildPerlPackage {
pname = "Data-Section";
version = "0.200007";
@@ -9416,6 +9445,20 @@ let
};
};
+ HashSharedMem = buildPerlModule {
+ pname = "Hash-SharedMem";
+ version = "0.005";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz";
+ sha256 = "324776808602f7bdc44adaa937895365454029a926fa611f321c9bf6b940bb5e";
+ };
+ buildInputs = [ ScalarString ];
+ meta = {
+ description = "Efficient shared mutable hash";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
HashUtilFieldHashCompat = buildPerlPackage {
pname = "Hash-Util-FieldHash-Compat";
version = "0.11";
@@ -17433,6 +17476,37 @@ let
propagatedBuildInputs = [ IPCSignal ];
};
+ PrometheusTiny = buildPerlPackage {
+ pname = "Prometheus-Tiny";
+ version = "0.008";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-0.008.tar.gz";
+ sha256 = "17d7b69chkcq8fprww6m15glndyb0lms2l0xjbnbw04q7f8ncskk";
+ };
+ buildInputs = [ HTTPMessage Plack TestException ];
+ meta = {
+ homepage = "https://github.com/robn/Prometheus-Tiny";
+ description = "A tiny Prometheus client";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
+ PrometheusTinyShared = buildPerlPackage {
+ pname = "Prometheus-Tiny-Shared";
+ version = "0.024";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-Shared-0.024.tar.gz";
+ sha256 = "02w24r4amk8dqlavg6abxap48hzxrbda48f1pmrqypgx1cz59g4g";
+ };
+ buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException ];
+ propagatedBuildInputs = [ HashSharedMem JSONXS PrometheusTiny ];
+ meta = {
+ homepage = "https://github.com/robn/Prometheus-Tiny-Shared";
+ description = "A tiny Prometheus client with a shared database behind it";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
ProtocolRedis = buildPerlPackage {
pname = "Protocol-Redis";
version = "1.0011";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b30dfe4511bf..abd21cf5c92d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6323,7 +6323,9 @@ in {
pymumble = callPackage ../development/python-modules/pymumble { };
- pymunk = callPackage ../development/python-modules/pymunk { };
+ pymunk = callPackage ../development/python-modules/pymunk {
+ inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices;
+ };
pymupdf = callPackage ../development/python-modules/pymupdf { };
@@ -7336,6 +7338,8 @@ in {
inherit (pkgs) libusb1;
};
+ pyuseragents = callPackage ../development/python-modules/pyuseragents { };
+
pyutilib = callPackage ../development/python-modules/pyutilib { };
pyuv = callPackage ../development/python-modules/pyuv { };
@@ -8846,6 +8850,8 @@ in {
transitions = callPackage ../development/python-modules/transitions { };
+ translatepy = callPackage ../development/python-modules/translatepy { };
+
translationstring = callPackage ../development/python-modules/translationstring { };
transmission-rpc = callPackage ../development/python-modules/transmission-rpc { };