mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 15:58:36 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs
History
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
..
applications Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
build-support Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
common-updater
data Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
desktops
development Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
games tintin: 2.01.1 -> 2.01.4 2018-02-28 14:17:27 +00:00
misc Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
os-specific Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
servers Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
stdenv Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
test
tools Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
top-level Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00