obadz 3de6e5be50 Merge branch 'master' into staging ...

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

2016-08-27 23:54:54 +01:00

..

activation

switch-to-configuration: use absolute path to systemd-escape

2016-07-01 08:35:38 +02:00

boot

Merge branch 'master' into staging

2016-08-27 23:54:54 +01:00

etc

etc: remove obsolete directories

2016-07-25 15:50:53 +03:00