1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
nixpkgs/pkgs/tools
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
..
admin Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
archivers xarchiver: fix darwion build 2018-03-12 20:33:26 +01:00
audio abcmidi: 2018.02.07 -> 2018.02.22 2018-03-02 23:06:48 +01:00
backup Merge pull request #37099 from ryantm/auto-update/s3ql 2018-03-15 22:11:38 +02:00
bluetooth
bootloaders/refind
cd-dvd Merge pull request #36885 from obsidiansystems/meta-host-prepare 2018-03-12 19:06:35 -04:00
compression Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
filesystems Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
graphics Merge pull request #36985 from obsidiansystems/no-allBut 2018-03-14 18:57:28 -04:00
inputmethods ibus-kkc: init at 1.5.22 2018-03-10 17:13:38 +03:00
misc Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
nagstamon
networking Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
nix/info
package-management nixui: regenerate with node2nix 1.5.3 2018-03-13 10:43:37 +01:00
security Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
system pcstat: init at 2017-05-28 (#33643) 2018-03-12 21:51:38 +00:00
text Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
typesetting Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
video
virtualization Merge pull request #32992 from nh2/fix-32545-blocking-container-destroy 2018-03-12 21:27:50 +00:00
X11 Merge pull request #36719 from ryantm/auto-update/winswitch 2018-03-14 21:02:13 +00:00