diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
| commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
| tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /lib | |
| parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
| parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) | |
| download | nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.gz nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.bz2 nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.lz nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.xz nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.zst nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.zip | |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 3 | ||||
| -rw-r--r-- | lib/minver.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7728749f054..8e97bac42ac 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -97,6 +97,7 @@ canndrew = "Andrew Cann <shum@canndrew.org>"; carlsverre = "Carl Sverre <accounts@carlsverre.com>"; casey = "Casey Rodarmor <casey@rodarmor.net>"; + caugner = "Claas Augner <nixos@caugner.de>"; cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>"; cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>"; changlinli = "Changlin Li <mail@changlinli.com>"; @@ -215,6 +216,7 @@ garrison = "Jim Garrison <jim@garrison.cc>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gebner = "Gabriel Ebner <gebner@gebner.org>"; + geistesk = "Alvar Penning <post@0x21.biz>"; georgewhewell = "George Whewell <georgerw@gmail.com>"; gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; @@ -578,6 +580,7 @@ thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; timbertson = "Tim Cuthbertson <tim@gfxmonk.net>"; titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; + tnias = "Philipp Bartsch <phil@grmr.de>"; tohl = "Tomas Hlavaty <tom@logand.com>"; tokudan = "Daniel Frank <git@danielfrank.net>"; tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; diff --git a/lib/minver.nix b/lib/minver.nix index 4f448266d06..2147820c0e4 100644 --- a/lib/minver.nix +++ b/lib/minver.nix @@ -1,2 +1,2 @@ # Expose the minimum required version for evaluating Nixpkgs -"1.10" +"1.11" |