nixpkgs/pkgs/tools
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +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 #36581 from matthewbauer/darwin-fixes 2018-03-09 19:32:54 +01:00
bluetooth openobex: 1.7.1 -> 1.7.2 2018-02-28 11:32:38 +01:00
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 netpbm: fetch over https 2018-03-13 14:26:18 +01:00
inputmethods ibus-kkc: init at 1.5.22 2018-03-10 17:13:38 +03:00
misc Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
nagstamon
networking Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
nix/info
package-management nixui: regenerate with node2nix 1.5.3 2018-03-13 10:43:37 +01:00
security Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
system pcstat: init at 2017-05-28 (#33643) 2018-03-12 21:51:38 +00:00
text Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
typesetting Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
video untrunc: init at 2018.01.13 2018-03-01 20:30:48 +01:00
virtualization Merge pull request #32992 from nh2/fix-32545-blocking-container-destroy 2018-03-12 21:27:50 +00:00
X11 Merge pull request #36394 from rycee/fix/sm/icon-cache 2018-03-12 15:16:55 +00:00