ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-26 23:27:29 +03:00
Code Issues Projects Releases Wiki Activity
9be40841ea
nixpkgs/pkgs
History
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
..
applications Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
build-support Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
common-updater common-updater-script: fix error handling 2017-05-19 17:14:43 +03:00
data Revert "docbook-xsl: Install dbtoepub" 2017-07-26 11:35:03 +02:00
desktops stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files 2017-07-26 09:07:55 -04:00
development Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
games hedgewars: fix ambiguous use of the zlib variable 2017-07-26 10:20:31 +02:00
misc Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
os-specific Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
servers Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
shells bash-completion: 2.5 -> 2.7 2017-07-19 23:58:53 +02:00
stdenv Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
test
tools Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
top-level Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00