public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating from trunk. I resolved simple conflicts.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
This commit is contained in:
Lluís Batlle i Rossell
2010-12-11 12:47:00 +00:00
parent 3f1a32c266 97d4a54698
commit ee04ffcb55
106 changed files with 2507 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/lib/maintainers.nix
View File

@@ -13,12 +13,14 @@
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
ludo = "Ludovic Courtès <ludo@gnu.org>";
marcweber = "Marc Weber <marco-oweber@gmx.de>";
neznalek = "Vladimír Čunát <vcunat@gmail.com>";
phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
raskin = "Michael Raskin <7c6f434c@mail.ru>";
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
simons = "Peter Simons <simons@cryp.to>";
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
viric = "Lluís Batlle i Rossell <viriketo@gmail.com>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";