1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 17:41:12 +00:00
Commit graph

6 commits

Author SHA1 Message Date
Jan Tojnar 452017032a
fix Merge 8213ff161c
cc @FRidh
2018-07-21 20:20:36 +02:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
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
2018-07-18 23:25:20 -04:00
Jan Tojnar 28b6f74c3f
gnome3.gconf: remove 2018-07-10 12:14:40 +02:00
worldofpeace 914994276b terminus: gnome2 cleanup (#41173)
* terminus: gnome2 cleanup

* terminus: use toplevel gtk2
2018-05-30 09:20:22 +02:00
José Luis Lafuente 7a27cae113
terminus: init at 1.0.0-alpha.42 2018-03-24 22:33:53 +01:00