3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

812 commits

Author SHA1 Message Date
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
joachifm 860aa01782 Merge pull request #14618 from moretea/update_mcrl2
Update mcrl2
2016-04-12 23:42:45 +02:00
joachifm b0d2c0cade Merge pull request #14613 from cransom/jp
Jp
2016-04-12 22:33:48 +02:00
Maarten Hoogendoorn ec098aad41 mcrl2: 2009.01 -> 2014.09 2016-04-12 22:16:30 +02:00
Casey Ransom 800367ee37 Add @cransom as a maintainer 2016-04-11 23:51:34 -04:00
Tobias Geerinckx-Rice 57ef1712e3
Substite new GitHub username ‘timbertson’ for ‘gfxmonk’ 2016-04-11 16:35:18 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
joachifm ddef34387d Merge pull request #14518 from CrystalGamma/master
lombok: init at 1.16.8
2016-04-09 17:47:15 +02:00
Frederik Rietdijk dddafe61eb Merge pull request #14498 from expipiplus1/python-cgkit
pythonPackages.cgkit: init at 2.0.0
2016-04-09 11:51:15 +02:00
Jona Stubbe (CrystalGamma) 8430db7e17 lombok: init at 1.16.8 2016-04-09 10:00:08 +02:00
Vladimír Čunát 710573ce6d Merge #12653: rework default outputs 2016-04-07 16:00:09 +02:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Joe Hermaszewski 2be0505b8d pythonPackages.cgkit: Add maintenance information
Add @expipiplus as a maintainer.
2016-04-07 11:34:53 +01:00
ldesgoui f2a88f89c6 discord: init at 0.0.1 2016-04-05 13:17:43 +02:00
Eelco Dolstra fd2273e419 Stronger warning against usage of splitString 2016-04-01 13:52:54 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ben Booth 449d908b88 xe-guest-utilities: init at 6.2.0
use mkEnableOption

use sha256

add xe-guest-utilities to module-list.nix
2016-03-30 09:27:40 -07:00
zimbatm 4908973b08 Merge pull request #14186 from LatitudeEngineering/latitude/topic/qgroundcontrol
qgroundcontrol: init at 2.9.4
2016-03-25 20:45:24 +00:00
Brad Ediger cdca9d64b4 dvdbackup: init at 0.4.2 2016-03-24 23:16:14 -05:00
Patrick Callahan f30e40df69 qgroundcontrol: init at 2.9.4 2016-03-24 20:06:31 -07:00
Arseniy Seroka 2358582976 Merge pull request #14045 from otwieracz/master
znapzend: added
2016-03-24 23:10:40 +03:00
Slawomir Gonet cb81a3fd2a znapzend: init at 0.15.3 2016-03-24 20:57:16 +01:00
Svintsov Dmitry 64fe4ad82d mxu11x0: init at 1.3.11 2016-03-24 20:19:22 +05:00
joachifm 4f29a8c03e Merge pull request #14023 from Adjective-Object/add/ansifilter
ansifilter: add @ 1.15
2016-03-22 00:44:49 +00:00
Maxwell 5c740539a8 ansifilter: init at 1.15 2016-03-21 09:42:32 -04:00
Peter Hoeg c6a717d212 dynamic-colors: 2013-12-28 -> 0.2.1 2016-03-19 23:45:28 +00:00
aszlig 009fd5ef77
lib/types: Revert handling submodules for "either"
This reverts commit 0f0805b, because @nbp had concerns about whether
this would be a good idea and pointed out problems with this.

We currently do not have a case where "either" is used in conjunction
with submodules, but I'm reverting it anyway to prevent people from
adding options using that type in that way.

This is now being reviewed in #14053.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-19 19:11:31 +01:00
aszlig 0f0805b51a
lib/types: Handle submodules for type "either"
So far the "either" type only handled "flat" types, so you couldn't do
something like:

type = either int (submodule {
  options = ...;
});

Not only caused this the submodule's options not being checked but also
not show up in the documentation.

This was something we stumbled on with #13916.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
2016-03-19 17:22:39 +01:00
Ryan Artecona 9da0403527 yamdi: init at 1.9 2016-03-16 11:39:43 -04:00
Eelco Dolstra 27af419541 Merge pull request #13896 from nbp/import-top-level
Replace references to all-packages.nix, by references to the top-level
2016-03-14 13:49:42 +01:00
Vladimír Čunát d6b46ecb30 Merge branch 'closure-size' into p/default-outputs 2016-03-14 11:27:15 +01:00
zimbatm 94774a717b Merge pull request #13889 from frlan/Update/Geany/1.27
geany: 1.26 -> 1.27
2016-03-13 18:29:18 +00:00
Nicolas B. Pierron 6313a5698a Replace references to all-packages.nix, by references to the top-level of nixpkgs repository. 2016-03-13 18:25:52 +00:00
Frank Lanitz 9d34f2054d geany: 1.26 -> 1.27
Also adding myself as list of maintainers
2016-03-13 18:41:08 +01:00
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
joachifm 25148e8621 Merge pull request #13884 from sheenobu/maintainers/sheenobu
Added sheenobu as maintainer
2016-03-13 12:37:53 +00:00
Sheena Artrip 15f46547d9 Added sheenobu as maintainer 2016-03-13 08:20:16 -04:00
Markus Hauck c97c667610 lib.maintainers: add markus1189 2016-03-11 19:32:10 +01:00
Domen Kožar 721462634f Merge pull request #13546 from zimbatm/document-stdlib
Document stdlib
2016-03-10 12:31:33 +00:00
zimbatm 7883ca774b lib/strings: document all the functions 2016-03-10 12:31:06 +00:00
zimbatm c71e2d4235 lib/lists: document all functions 2016-03-10 12:31:05 +00:00
joachifm d30b6f6a7b Merge pull request #13781 from romildo/new.epson_201207w
epson_201207w: init at 1.0.0
2016-03-10 11:29:10 +00:00
zimbatm 523e328318 lib/attrsets: document all the functions 2016-03-09 19:59:57 +00:00
zimbatm a086858ef5 Remove lib.deepSeqList and lib.deepSeqAttrs
Both functions are broken and unused in the repo.
2016-03-09 19:59:57 +00:00
José Romildo Malaquias e57f1eb6d0 epson_201207w: init at 1.0.0 2016-03-09 15:25:53 -03:00
Matthew Bauer f0e5910c24 rgbds: init at 0.2.4 2016-03-09 00:44:01 -06:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Sergiu Ivanov 7a31227573 oh-my-zsh-git: init at 2016-02-27 2016-03-07 19:42:26 +01:00
Nikolay Amiantov 234c5dce67 Merge commit 'refs/pull/13667/head' of git://github.com/NixOS/nixpkgs 2016-03-06 20:39:27 +03:00
Jakub Skrzypnik d80811d881 ahoviewer: init at 1.4.6 2016-03-06 18:36:16 +01:00