forked from mirrors/nixpkgs
985d1ac425
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611 |
||
|---|---|---|
| .. | ||
| 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 | ||