diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 4 | ||||
| -rw-r--r-- | lib/strings.nix | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6be346ad9bfa4..97d3ec8438f0d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -39,6 +39,7 @@ aristid = "Aristid Breitkreuz <aristidb@gmail.com>"; arobyn = "Alexei Robyn <shados@shados.net>"; artuuge = "Artur E. Ruuge <artuuge@gmail.com>"; + ashalkhakov = "Artyom Shalkhakov <artyom.shalkhakov@gmail.com>"; asppsa = "Alastair Pharo <asppsa@gmail.com>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; @@ -241,7 +242,7 @@ mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>"; matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>"; maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>"; - mbakke = "Marius Bakke <ymse@tuta.io>"; + mbakke = "Marius Bakke <mbakke@fastmail.com>"; matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>"; mbe = "Brandon Edens <brandonedens@gmail.com>"; mboes = "Mathieu Boespflug <mboes@tweag.net>"; @@ -249,6 +250,7 @@ meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; + michalrus = "Michal Rus <m@michalrus.com>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; mimadrid = "Miguel Madrid <mimadrid@ucm.es>"; mingchuan = "Ming Chuan <ming@culpring.com>"; diff --git a/lib/strings.nix b/lib/strings.nix index 112165df82abe..86af4d438344b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -248,7 +248,7 @@ rec { /* Converts an ASCII string to upper-case. Example: - toLower "home" + toUpper "home" => "HOME" */ toUpper = replaceChars lowerChars upperChars; @@ -372,7 +372,12 @@ rec { getVersion pkgs.youtube-dl => "2016.01.01" */ - getVersion = x: (builtins.parseDrvName (x.name or x)).version; + getVersion = x: + let + parse = drv: (builtins.parseDrvName drv).version; + in if isString x + then parse x + else x.version or (parse x.name); /* Extract name with version from URL. Ask for separator which is supposed to start extension. |