nixpkgs/pkgs/tools
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
..
admin Merge branch 'staging' 2017-07-05 08:55:26 +02:00
archivers unzipNLS : Fix build by removing patch fuzz. 2017-07-09 10:44:48 +02:00
audio ezstream: init at 0.6.0 (#27259) 2017-07-09 16:46:16 +01:00
backup Merge pull request #27616 from jfrankenau/update-borg 2017-07-24 18:44:21 +00:00
bluetooth blueman: wrap binaries in libexec 2017-06-01 14:30:40 +03:00
bootloaders/refind refind: mark as broken 2017-03-14 15:36:35 +01:00
cd-dvd unetbootin: set QT_X11_NO_MITSHM=1 2017-05-20 14:42:32 -04:00
compression Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
filesystems accelio: Remove 2017-07-23 10:47:13 -04:00
graphics Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
inputmethods ibus-m17n: fix homepage URL. 2017-05-27 22:39:16 -04:00
misc Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
nagstamon nagstamon: init at 2.0.1 2017-06-01 19:32:06 +02:00
networking Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
package-management Merge pull request #27347 from cstrahan/osquery-new 2017-07-24 21:51:10 -04:00
security Merge pull request #27352 from adisbladis/vulnix-py36 2017-07-19 11:46:19 +02:00
system Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
text Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
typesetting texlive: switch to a *working* temporary mirror 2017-07-11 15:34:05 +02:00
video atomicparsley: 0.9.0 -> 0.9.6 2017-04-14 12:10:28 -07:00
virtualization google-compute-engine: init at 20170523 2017-07-15 18:00:55 +01:00
X11 setroot: 1.4.4 -> 2.0.1 2017-07-24 05:38:06 +10:00