forked from mirrors/nixpkgs
2e6bf42a22
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299 |
||
---|---|---|
.. | ||
aliases.nix | ||
all-packages.nix | ||
beam-packages.nix | ||
config.nix | ||
coq-packages.nix | ||
darwin-packages.nix | ||
default.nix | ||
dotnet-packages.nix | ||
emacs-packages.nix | ||
emscripten-packages.nix | ||
haskell-packages.nix | ||
haxe-packages.nix | ||
impure.nix | ||
java-packages.nix | ||
lua-packages.nix | ||
make-tarball.nix | ||
metrics.nix | ||
ocaml-packages.nix | ||
perl-packages.nix | ||
php-packages.nix | ||
pure-packages.nix | ||
python-packages.nix | ||
release-cross.nix | ||
release-lib.nix | ||
release-python.nix | ||
release-small.nix | ||
release.nix | ||
splice.nix | ||
stage.nix | ||
static.nix | ||
unix-tools.nix | ||
wine-packages.nix |