gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
This installs the kio "man:" protocol handler, which fixes the UNIX manual
section in the KDE Help Center.
Note that kde currently parses "/etc/man.conf" manually, if `$MANPATH` is not
set, to build its man page index. (if https://bugs.kde.org/show_bug.cgi?id=404022
is addressed, the "/etc/man.conf" symlink should not be necessary anymore)
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
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
This is needed in order to add location information to contacts in
KAddressbook.
Packaging was quite straightforward except that it needed
akonadi-import-wizard, which I have packaged in the previous commit.
I'm committing this directly to master without a pull request, because
nothing depends on it (for obvious reasons) and packaging was trivial
enough so that if things are not as they supposed to be it can still be
changed very easily.
Tested this using the following VM configuration, because I don't run a
Plasma desktop:
(import <nixpkgs/nixos> {
configuration = { pkgs, ... }: {
environment.systemPackages = with import <nixpkgs> {}; [
kdeApplications.kaddressbook kdeApplications.kdepim-addons
];
users.users.test.isNormalUser = true;
virtualisation.diskSize = 4096;
virtualisation.memorySize = 2048;
services.xserver = {
enable = true;
inherit ((import <nixpkgs/nixos> {}).config.services.xserver) layout;
displayManager.sddm.enable = true;
displayManager.sddm.autoLogin.enable = true;
displayManager.sddm.autoLogin.user = "test";
desktopManager.default = "plasma5";
desktopManager.plasma5.enable = true;
};
};
}).vm
The test I've done is using KAddressbook and check whether the location
tab is working and it does now.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
This is required for kdepim-addons and packaging this is pretty much
straightforward with no hurdles.
I tried to keep the coding style close to other packages in
kdeApplications so that it stays consistent.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
