summaryrefslogtreecommitdiffstats
path: root/maintainers
diff options
context:
space:
mode:
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix65
-rw-r--r--maintainers/scripts/all-tarballs.nix8
-rwxr-xr-xmaintainers/scripts/nixpkgs-lint.pl3
-rwxr-xr-xmaintainers/scripts/update-python-libraries2
4 files changed, 71 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 69026779c325..bc227725a309 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -33,6 +33,11 @@
github = "Anton-Latukha";
name = "Anton Latukha";
};
+ ariutta = {
+ email = "anders.riutta@gmail.com";
+ github = "ariutta";
+ name = "Anders Riutta";
+ };
Baughn = {
email = "sveina@gmail.com";
github = "Baughn";
@@ -78,6 +83,11 @@
github = "DmitryTsygankov";
name = "Dmitry Tsygankov";
};
+ Dje4321 = {
+ email = "dje4321@gmail.com";
+ github = "dje4321";
+ name = "Dje4321";
+ };
Esteth = {
email = "adam.copp@gmail.com";
name = "Adam Copp";
@@ -1702,6 +1712,11 @@
github = "igsha";
name = "Igor Sharonov";
};
+ iimog = {
+ email = "iimog@iimog.org";
+ github = "iimog";
+ name = "Markus J. Ankenbrand";
+ };
ikervagyok = {
email = "ikervagyok@gmail.com";
github = "ikervagyok";
@@ -1712,6 +1727,16 @@
github = "ilya-kolpakov";
name = "Ilya Kolpakov";
};
+ imalison = {
+ email = "IvanMalison@gmail.com";
+ github = "IvanMalison";
+ name = "Ivan Malison";
+ };
+ imalsogreg = {
+ email = "imalsogreg@gmail.com";
+ github = "imalsogreg";
+ name = "Greg Hale";
+ };
infinisil = {
email = "infinisil@icloud.com";
github = "infinisil";
@@ -2458,6 +2483,11 @@
github = "meisternu";
name = "Matt Miemiec";
};
+ melsigl = {
+ email = "melanie.bianca.sigl@gmail.com";
+ github = "melsigl";
+ name = "Melanie B. Sigl";
+ };
metabar = {
email = "softs@metabarcoding.org";
name = "Celine Mercier";
@@ -2829,6 +2859,11 @@
github = "nthorne";
name = "Niklas Thörne";
};
+ numinit = {
+ email = "me@numin.it";
+ github = "numinit";
+ name = "Morgan Jones";
+ };
nyanloutre = {
email = "paul@nyanlout.re";
github = "nyanloutre";
@@ -2913,6 +2948,11 @@
github = "oxij";
name = "Jan Malakhovski";
};
+ oyren = {
+ email = "m.scheuren@oyra.eu";
+ github = "oyren";
+ name = "Moritz Scheuren";
+ };
pSub = {
email = "mail@pascal-wittmann.de";
github = "pSub";
@@ -2933,6 +2973,11 @@
github = "panaeon";
name = "Vitalii Voloshyn";
};
+ pandaman = {
+ email = "kointosudesuyo@infoseek.jp";
+ github = "pandaman64";
+ name = "pandaman";
+ };
paperdigits = {
email = "mica@silentumbrella.com";
github = "paperdigits";
@@ -3077,6 +3122,11 @@
github = "pmiddend";
name = "Philipp Middendorf";
};
+ pmyjavec = {
+ email = "pauly@myjavec.com";
+ github = "pmyjavec";
+ name = "Pauly Myjavec";
+ };
pneumaticat = {
email = "kevin@potatofrom.space";
github = "pneumaticat";
@@ -3140,6 +3190,11 @@
github = "qknight";
name = "Joachim Schiele";
};
+ qoelet = {
+ email = "kenny@machinesung.com";
+ github = "qoelet";
+ name = "Kenny Shen";
+ };
ragge = {
email = "r.dahlen@gmail.com";
github = "ragnard";
@@ -3856,6 +3911,11 @@
github = "timor";
name = "timor";
};
+ timput = {
+ email = "tim@timput.com";
+ github = "TimPut";
+ name = "Tim Put";
+ };
tiramiseb = {
email = "sebastien@maccagnoni.eu";
github = "tiramiseb";
@@ -3891,6 +3951,11 @@
github = "tokudan";
name = "Daniel Frank";
};
+ tomahna = {
+ email = "kevin.rauscher@tomahna.fr";
+ github = "Tomahna";
+ name = "Kevin Rauscher";
+ };
tomberek = {
email = "tomberek@gmail.com";
github = "tomberek";
diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix
index d981a1fa7dbc..6a4de8a4b951 100644
--- a/maintainers/scripts/all-tarballs.nix
+++ b/maintainers/scripts/all-tarballs.nix
@@ -6,13 +6,11 @@
$ copy-tarballs.pl --expr 'import <nixpkgs/maintainers/scripts/all-tarballs.nix>'
*/
-removeAttrs (import ../../pkgs/top-level/release.nix
+import ../../pkgs/top-level/release.nix
{ # Don't apply ‘hydraJob’ to jobs, because then we can't get to the
# dependency graph.
scrubJobs = false;
# No need to evaluate on i686.
supportedSystems = [ "x86_64-linux" ];
- })
- [ # Remove jobs whose evaluation depends on a writable Nix store.
- "tarball" "unstable" "darwin-tested"
- ]
+ limitedSupportedSystems = [];
+ }
diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
index 7e9ff91ebe06..638d1b2aaa16 100755
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -1,4 +1,5 @@
-#! /run/current-system/sw/bin/perl -w
+#! /usr/bin/env nix-shell
+#! nix-shell -i perl -p perl perlPackages.XMLSimple
use strict;
use List::Util qw(min);
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 4536662c8420..d95ff4f347e8 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -262,7 +262,7 @@ def _update_package(path, target):
if new_version == version:
logging.info("Path {}: no update available for {}.".format(path, pname))
return False
- elif new_version <= version:
+ elif Version(new_version) <= Version(version):
raise ValueError("downgrade for {}.".format(pname))
if not new_sha256:
raise ValueError("no file available for {}.".format(pname))