d5758c99a3
Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix |
||
---|---|---|
.. | ||
unichrome | ||
builder.sh | ||
default.nix | ||
extra.list | ||
generate-expr-from-tarballs.pl | ||
imake.patch | ||
imake.sh | ||
libpciaccess-apple.patch | ||
old.list | ||
overrides.nix | ||
replacements.nix | ||
tarballs-7.7.list | ||
xorgserver-dri-path.patch | ||
xorgserver-xkbcomp-path.patch | ||
xorgserver.sh |