This reverts commit 25c42e7736.
This commit is still causing evaluation errors (despite passing
OfBorg!)
Here is the current error:
error: undefined variable 'Log4Perl' at
/nix/store/n0gwyv3mcvm3hc9jrmkxjhmsrdjqzcqb-source/maintainers/scripts/nix-generate-from-cpan.nix:7:71
More investigation is needed
/cc @volth
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.
This commit should be reverted on the next mass rebuild.
otherwise we get this error on evaluation:
derivation 'lollypop-portal' has invalid meta attribute 'override'
derivation 'lollypop-portal' has invalid meta attribute 'overrideDerivation'
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
According to the current convention python packages should live in
`pkgs/development/python-modules`. As I altered the `graphite_api`
expression previously in d3d1b88873 I decided to move it as well.
Additionally I applied some minor refactorings:
* use `fetchFromGitHub` instead of `fetchgit`.
* use `checkInputs` for test dependencies
* got rid of fixed points
* applied patch which supports flask-caching to 1.3.1 using `git apply
-3`
The package is currently broken and most folks recommend to use
`flask-caching` (see
https://github.com/thadeusb/flask-cache/issues/171).
The only package in `nixpkgs` which remained to use `flask_cache`
(`graphite_api`) still builds with `pythonPackages.flask-caching`.
The removal and corresponding `graphite_api` change unbreaks several
Hydra builds (see https://hydra.nixos.org/build/76953777).
