Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
bash	Merge pull request #30418 from LnL7/inline-set-environment	2018-03-08 21:07:15 +01:00
command-not-found
digitalbitbox	digitalbitbox: init at 2.2.2 (#33787)	2018-02-27 22:40:22 +00:00
zsh	Merge pull request #30418 from LnL7/inline-set-environment	2018-03-08 21:07:15 +01:00
adb.nix	nixos/adb: add related package	2018-02-09 19:51:06 +00:00
atop.nix
bcc.nix
blcr.nix
browserpass.nix	browserpass module: add firefox support	2018-02-23 00:25:40 +01:00
ccache.nix
cdemu.nix
chromium.nix	nixos/programs.chromium: write policies for google-chrome too	2018-02-23 19:00:26 +00:00
criu.nix	programs.criu: add nixos option for installing criu + kernel flags	2018-02-15 09:10:32 +01:00
dconf.nix	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
environment.nix
fish.nix
freetds.nix
gnupg.nix
gphoto2.nix
info.nix
java.nix
kbdlight.nix
less.nix	nixos/less: use lesspipe package for preprocessing	2018-01-29 22:08:32 +07:00
light.nix
man.nix
mosh.nix
mtr.nix
nano.nix
npm.nix
nylas-mail.nix
oblogout.nix
plotinus.nix	nixos/plotinus: add module to enable plotinus	2018-02-14 22:25:12 +01:00
plotinus.xml	nixos/plotinus: add module to enable plotinus	2018-02-14 22:25:12 +01:00
qt5ct.nix
rootston.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
screen.nix
shadow.nix	sg/newgrp should always be available, not chfn	2018-01-14 20:54:40 +01:00
shell.nix
slock.nix
spacefm.nix
ssh.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
ssmtp.nix
sway.nix	nixos/sway: Extend the descriptions and examples	2017-12-25 00:15:06 +01:00
sysdig.nix
systemtap.nix	programs.systemtap: add nixos option for installing systemtap	2018-02-15 09:10:32 +01:00
thefuck.nix
tmux.nix	nixos/tmux: add related package	2018-02-09 19:51:06 +00:00
udevil.nix	nixos udevil: set up wrapper for udevil	2018-02-26 14:30:22 +08:00
venus.nix
vim.nix
virtualbox.nix
way-cooler.nix
wireshark.nix
xfs_quota.nix
xonsh.nix
yabar.nix	yabar: add module	2018-01-04 09:58:21 +01:00