Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ...

Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix

2013-06-08 15:41:39 +00:00

..

attrsets.nix

Add a library function ‘genAttrs’

2013-03-06 16:33:01 +01:00

composable-derivation.nix

adding gis system grass (graphviz 3d is not supported yet)

2010-06-03 15:19:59 +00:00

customisation.nix

Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all outputs""

2013-05-15 00:39:17 -04:00

debug.nix

Remove unnecessary parentheses around if conditions

2012-12-28 19:54:15 +01:00

default.nix

Added licenses to the lib attributeset

2010-02-25 13:09:08 +00:00

licenses.nix

adding unfree-redistributable-firmware

2013-06-05 22:44:17 +02:00

lists.nix

Remove broken ‘removeList’ function

2013-03-26 11:58:59 +01:00

maintainers.nix

Add offline <Jaka Hudoklin> as a maintainer, so i can latter add myself as maintainer to packages

2013-05-26 13:23:28 +00:00

meta.nix

Fix hiPrio.

2013-02-25 06:31:19 -05:00

misc.nix

ReRevert Merge x-updates into master

2013-05-29 23:25:02 +02:00

modules.nix

Revert "Add isPath to trivial.nix"

2013-05-02 15:04:21 -04:00

options.nix

Merge submodule extraArgs and individualExtraArgs

2013-06-05 11:20:59 -04:00

platforms.nix

Adding some 'arm' as mesa platforms. Otherwise assertions won't let me

2013-02-17 15:55:47 +01:00

properties.nix

Get rid of some error contexts that don't provide useful info

2012-12-04 12:58:22 +01:00

sources.nix

cleanSource: Avoid copying git files.

2009-07-06 16:19:52 +00:00

strings-with-deps.nix

* Add stringAfter' as a synonym of fullDepEntry', with the arguments

2010-09-13 15:31:06 +00:00

strings.nix

ReRevert Merge x-updates into master

2013-05-29 23:25:02 +02:00

systems.nix

Add armv7l support.

2012-04-15 23:41:25 +00:00

tests.nix

fix sort in lists.nix

2012-11-20 13:56:14 +01:00

trivial.nix

Revert "Add isPath to trivial.nix"

2013-05-02 15:04:21 -04:00

types.nix

Revert "Add isPath to trivial.nix"

2013-05-02 15:04:21 -04:00