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
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config -h` got 0 exit code
- ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config --help` got 0 exit code
- ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config help` got 0 exit code
- ran `/nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0/bin/tulip-config --version` and found version 5.1.0
- found 5.1.0 with grep in /nix/store/z17wdp6l55y3b18875c9zj2pw1lywrqd-tulip-5.1.0
cc ""
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
