Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4dc33d06b98a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dace4813771f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 8, 2018

  1. akonadi-import-wizard: Add package expression 

    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
    @aszlig
    aszlig committed May 8, 2018
    Configuration menu
    Copy the full SHA
    eb774f3 View commit details
    Browse the repository at this point in the history

  2. kdepim-addons: Add package expression 

    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
    @aszlig
    aszlig committed May 8, 2018
    Configuration menu
    Copy the full SHA
    dace481 View commit details
    Browse the repository at this point in the history