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
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.
Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.
The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
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 generated by https://github.com/ryantm/nix-update tools.
This update was made based on information from https://repology.org/metapackage/newsboat/versions.
These checks were done:
- built on NixOS
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat -h` got 0 exit code
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat --help` got 0 exit code
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat -V` and found version 2.11.1
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat -v` and found version 2.11.1
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat --version` and found version 2.11.1
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat -h` and found version 2.11.1
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/newsboat --help` and found version 2.11.1
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/podboat -h` got 0 exit code
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/podboat --help` got 0 exit code
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/podboat -h` and found version 2.11.1
- ran `/nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1/bin/podboat --help` and found version 2.11.1
- found 2.11.1 with grep in /nix/store/sijgq2a38x45ada8xzl69s7c6lsiar3c-newsboat-2.11.1
- directory tree listing: https://gist.github.com/b1dad1e84335a691d0ccf4aa357c12ad
