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
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/dvdstyler --help` got 0 exit code
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/dvdstyler --version` and found version 3.0.4
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped -h` got 0 exit code
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped --help` got 0 exit code
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped -v` and found version 3.0.4
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped --version` and found version 3.0.4
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped -h` and found version 3.0.4
- found 3.0.4 with grep in /nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4
- found 3.0.4 in filename of file in /nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4