cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs
History
Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
..
applications Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
build-support Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
common-updater
data Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
desktops Merge remote-tracking branch 'upstream/master' into staging 2018-05-16 15:16:08 -04:00
development Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
games Merge pull request #40567 from dbohdan/master 2018-05-16 23:55:11 +02:00
misc Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
os-specific Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
servers Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
stdenv Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
test tests: move to attribute set 2018-05-10 23:58:12 -05:00
tools Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00
top-level Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 03:54:38 +03:00