jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b1916b45a3
nixpkgs/pkgs
History
Tuomas Tynkkynen b1916b45a3 Merge remote-tracking branch 'upstream/staging' into gcc-7 
Conflicts:
	pkgs/development/libraries/libidn/default.nix
	pkgs/top-level/all-packages.nix
2018-02-15 15:45:37 +02:00
..
applications Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
build-support Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
common-updater
data Merge pull request #34879 from dywedir/iosevka 2018-02-14 06:43:12 -06:00
desktops Merge pull request #34949 from romildo/upd.mate 2018-02-14 15:37:23 +00:00
development Merge remote-tracking branch 'upstream/staging' into gcc-7 2018-02-15 15:45:37 +02:00
games Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
misc vim-pencil: init at 2017-06-14 2018-02-12 22:33:41 +01:00
os-specific Merge remote-tracking branch 'upstream/staging' into gcc-7 2018-02-15 15:45:37 +02:00
servers Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
shells define top-level attrs for getent, getconf 2018-02-13 11:47:16 -06:00
stdenv Merge remote-tracking branch 'upstream/staging' into gcc-7 2018-02-15 15:45:37 +02:00
test sierra-shared-test: fix build 2018-01-05 23:20:55 +01:00
tools Merge remote-tracking branch 'upstream/staging' into gcc-7 2018-02-15 15:45:37 +02:00
top-level Merge remote-tracking branch 'upstream/staging' into gcc-7 2018-02-15 15:45:37 +02:00