1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Nix Packages collection
Go to file
aszlig 127c928c23
nixos/rename: Fix merging multiple destinations.
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.

We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-22 14:08:28 +01:00
doc Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2015-01-20 20:21:03 -05:00
lib Add cocreature as maintainer of openjdk8 2015-01-20 19:07:54 +01:00
maintainers Update vanity to add more special characters. 2015-01-18 18:20:08 +03:00
nixos nixos/rename: Fix merging multiple destinations. 2015-01-22 14:08:28 +01:00
pkgs Merge pull request #5896 from matejc/nixui 2015-01-22 13:23:36 +01:00
.gitignore Add .DS_Store to gitignore so we Mac users don't accidentally pollute nixpkgs with ugliness 2014-08-09 20:53:36 -04:00
.travis.yml Travis: chop build in install and build phases 2014-10-15 11:05:12 +02:00
.version release: 15.04 -> 15.05 2014-12-09 15:09:06 +01:00
COPYING * Applying an MIT-style license to Nixpkgs. 2006-04-25 16:50:34 +00:00
default.nix if we abort with too old Nix, hint docs 2015-01-21 21:41:40 +01:00
README.md fix mailinglist link 2015-01-21 11:21:45 +01:00