mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 11:53:27 +00:00
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 |
||
|---|---|---|
| .. | ||
| androidndk-pkgs | ||
| arduino | ||
| beam-modules | ||
| bower-modules/generic | ||
| compilers | ||
| coq-modules | ||
| dhall-modules | ||
| dotnet-modules/patches | ||
| em-modules/generic | ||
| go-modules | ||
| go-packages | ||
| guile-modules | ||
| haskell-modules | ||
| idris-modules | ||
| interpreters | ||
| java-modules | ||
| libraries | ||
| lisp-modules | ||
| lua-modules | ||
| misc | ||
| mobile | ||
| node-packages | ||
| ocaml-modules | ||
| perl-modules | ||
| pharo | ||
| pure-modules | ||
| python-modules | ||
| r-modules | ||
| ruby-modules | ||
| tools | ||
| web | ||