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
..
checkinstall
clib
createrepo_c
disnix
dpkg
fpm	fpm: 1.4.0 -> 1.6.2	2016-08-21 20:28:39 +08:00
gx
koji
libhif
librepo
nix	nix: remove unused unstable.nix file	2016-08-18 23:14:07 -04:00
nix-prefetch-scripts
nix-repl
nix-serve
nixops
nixui
nox
opkg
opkg-utils
packagekit	packagekit: vala -> vala_0_23	2016-08-21 20:18:21 +03:00
python2nix
rpm	rpm: remove hack	2016-08-24 19:23:42 +00:00