mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-15 14:26:33 +01: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 |
||
|---|---|---|
| .. | ||
| add-opengl-runpath | ||
| agda | ||
| appimage | ||
| bintools-wrapper | ||
| build-bazel-package | ||
| build-dotnet-package | ||
| build-fhs-userenv | ||
| build-setupcfg | ||
| buildenv | ||
| cc-wrapper | ||
| docker | ||
| dotnetbuildhelpers | ||
| dotnetenv | ||
| emacs | ||
| expand-response-params | ||
| fetchbitbucket | ||
| fetchbower | ||
| fetchbzr | ||
| fetchcvs | ||
| fetchdarcs | ||
| fetchdocker | ||
| fetchfossil | ||
| fetchgit | ||
| fetchgithub | ||
| fetchgitlab | ||
| fetchgitlocal | ||
| fetchgx | ||
| fetchhg | ||
| fetchipfs | ||
| fetchmavenartifact | ||
| fetchmtn | ||
| fetchnuget | ||
| fetchpatch | ||
| fetchrepoorcz | ||
| fetchrepoproject | ||
| fetchs3 | ||
| fetchsavannah | ||
| fetchsvn | ||
| fetchsvnrevision | ||
| fetchsvnssh | ||
| fetchurl | ||
| fetchzip | ||
| icon-conv-tools | ||
| kernel | ||
| libredirect | ||
| make-desktopitem | ||
| make-startupitem | ||
| make-symlinks | ||
| mkshell | ||
| mono-dll-fixer | ||
| nix-gitignore | ||
| nix-prefetch-github | ||
| nuke-references | ||
| ocaml | ||
| prefer-remote-fetch | ||
| references-by-popularity | ||
| release | ||
| remove-references-to | ||
| rust | ||
| setup-hooks | ||
| singularity-tools | ||
| skaware | ||
| snap | ||
| src-only | ||
| substitute | ||
| substitute-files | ||
| templaterpm | ||
| upstream-updater | ||
| vm | ||
| wrapper-common | ||
| writers | ||
| build-maven.nix | ||
| build-pecl.nix | ||
| closure-info.nix | ||
| dhall-to-nix.nix | ||
| plugins.nix | ||
| replace-dependency.nix | ||
| setup-systemd-units.nix | ||
| source-from-head-fun.nix | ||
| trivial-builders.nix | ||