Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates ...

Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.

2012-12-28 23:28:16 +01:00

..

attrsets.nix

Typos

2012-11-14 11:38:47 +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

Rename hostDrv -> crossDrv, buildDrv -> nativeDrv

2012-12-28 19:08:19 +01: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

- zfs 0.6.0-rc11, spl 0.6.0-rc11

2012-10-05 09:11:25 -07:00

lists.nix

fix sort in lists.nix

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

maintainers.nix

maintainers: add myself to the maintainers list

2012-12-27 15:44:11 +04:00

meta.nix

Give Org-Mode a high priority.

2010-07-22 08:59:46 +00:00

misc.nix

Remove unnecessary parentheses around if conditions

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

modules.nix

Use "or" in a few places

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

options.nix

Replace some calls to attrByPath with "or"

2012-08-13 15:15:16 -04:00

platforms.nix

pkgs/lib/platforms.nix: fix specification of mesaPlatforms

2012-12-06 11:25:08 +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

Add a function ‘getVersion’ to get the version of a derivation

2012-10-05 13:48:57 -04: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

* Fix eval-release.nix by testing whether all attributes of a

2010-08-19 12:37:10 +00:00

types.nix

D'oh

2012-12-20 00:52:51 -05:00