Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ...

Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix

2014-09-02 12:31:03 +02:00

..

attrsets.nix

Remove backward-compatible implementations of some primops

2013-11-12 13:50:45 +01:00

composable-derivation.nix

Shea told me composableDerivation is hard to understand.

2014-04-30 20:31:40 +02:00

customisation.nix

Move pkgs/lib/ to lib/

2013-10-10 13:28:21 +02:00

debug.nix

Move pkgs/lib/ to lib/

2013-10-10 13:28:21 +02:00

default.nix

Add some primops to lib

2013-11-12 13:48:30 +01:00

licenses.nix

licenses: comment about two versions of MIT

2014-08-30 07:28:26 +02:00

lists.nix

gnome3: use package names for environment.gnome3.excludePackages

2014-04-14 09:58:03 +02:00

maintainers.nix

Add xar

2014-08-30 22:52:46 +01:00

meta.nix

Make appendToName do the right thing

2014-03-10 15:01:56 +01:00

misc.nix

Small cleanup

2013-10-24 14:49:59 +02:00

modules.nix

Add error an message to prevent use of useless submodules.

2014-08-29 18:54:15 +02:00

options.nix

Add some primops to lib

2013-11-12 13:48:30 +01:00

platforms.nix

Merge #2823: better cygwin support, also add x86_64

2014-08-14 20:38:09 +02:00

sources.nix

Manual: Handle XML files in subdirectories

2014-08-25 14:33:33 +02:00

strings-with-deps.nix

Move pkgs/lib/ to lib/

2013-10-10 13:28:21 +02:00

strings.nix

Added concatMapStringsSep and concatImapStringsSep

2014-08-25 10:23:10 +02:00

systems.nix

Use isType instead of typeOf

2013-10-28 22:45:55 +01:00

tests.nix

Move pkgs/lib/ to lib/

2013-10-10 13:28:21 +02:00

trivial.nix

Add a global variable ‘inNixShell’

2014-02-19 19:03:16 +01:00

types.nix

types.nix: Add ‘either’ type

2014-08-19 18:24:37 +02:00