public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
nixpkgs/pkgs
History
John Ericson 446cb32ea1 haskell generic-builder: Remove merge conflict 
I forgot this in 17316643fd
 		2018-05-23 10:11:03 -04:00
..
applications Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00
build-support Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
common-updater
…
data Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
desktops Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
development haskell generic-builder: Remove merge conflict 2018-05-23 10:11:03 -04:00
games freeciv: enable on darwin 2018-05-21 19:56:52 -05:00
misc Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
os-specific Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00
servers Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00
stdenv Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:59:57 -04: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-23 09:40:37 -04:00
top-level Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00