nixpkgs/pkgs/tools
Jan Malakhovski ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
..
admin oxidized: temperature patch for x-series 2018-05-24 04:40:45 +02:00
archivers tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
audio Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
backup restic: 0.8.3 -> 0.9.0 2018-05-21 22:15:33 +02:00
bluetooth openobex: 1.7.1 -> 1.7.2 2018-02-28 11:32:38 +01:00
bootloaders/refind refind: fix runtime errors 2018-05-03 22:13:39 +02:00
cd-dvd Merge pull request #36885 from obsidiansystems/meta-host-prepare 2018-03-12 19:06:35 -04:00
compression lzma: 5.2.3 -> 5.2.4 2018-05-02 21:37:53 +02:00
filesystems Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
graphics Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00
inputmethods Merge remote-tracking branch 'upstream/master' into staging 2018-05-16 15:16:08 -04:00
misc Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
networking Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
nix/info nix-info: build locally 2018-01-21 14:09:35 +01:00
package-management Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
security Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
system Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
text Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
typesetting Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
video tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux 2018-04-30 18:08:48 -05:00
virtualization distrobuilder: init at HEAD 2018-05-12 21:14:10 +03:00
X11 xpra: 2.2.6 -> 2.3 2018-05-16 22:45:17 -07:00