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

..

tests

lib: alphabetize things

2016-02-26 22:15:41 +00:00

attrsets.nix

Revert "Merge #12357: nixos docs: show references to packages"

2016-02-03 12:16:33 +01:00

composable-derivation.nix

Shea told me composableDerivation is hard to understand.

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

customisation.nix

lib: add makeScope

2015-09-27 09:45:23 -05:00

debug.nix

lib: cleanup a little bit, add traceIf

2015-03-26 12:43:42 +00:00

default.nix

cherry-pick lib.sandbox into master

2015-11-19 11:33:21 -08:00

deprecated.nix

Update deprecated.nix

2015-11-15 03:41:39 +08:00

licenses.nix

yarp (+ libace): init at 2.3.64

2016-02-24 22:08:29 +01:00

lists.nix

Use builtins.sort

2015-07-28 18:42:22 +02:00

maintainers.nix

Merge commit 'refs/pull/13667/head' of git://github.com/NixOS/nixpkgs

2016-03-06 20:39:27 +03:00

meta.nix

Make appendToName do the right thing

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

minver.nix

Expose minimum required Nix version.

2015-11-26 23:11:11 +08:00

modules.nix

Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"

2016-03-01 20:52:06 +01:00

options.nix

Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"

2016-03-01 20:52:06 +01:00

platforms.nix

lib.platforms: alphabetize

2016-02-26 22:15:40 +00:00

sandbox.nix

cherry-pick lib.sandbox into master

2015-11-19 11:33:21 -08:00

sources.nix

Manual: Handle XML files in subdirectories

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

strings-with-deps.nix

Replace hasAttr/getAttr calls with the ? and . operators

2014-10-05 01:11:06 +02:00

strings.nix

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

systems.nix

lib: alphabetize things

2016-02-26 22:15:41 +00:00

tests.nix

add helper to lib/attrsets: hasAttrByPath

2015-12-07 11:04:14 +01:00

trivial.nix

lib.trivial: add a new importJSON function

2016-02-29 11:21:56 +00:00

types.nix

Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"

2016-03-01 20:52:06 +01:00