Matthew Bauer 28e2277305 make-derivation: remove selfConsistent check ... version is set in lots of places but might not need to be in a name. Alternative to #50364.		2018-11-30 17:58:33 +01:00
..
applications	Merge master into staging-next	2018-11-30 17:46:21 +01:00
build-support	Merge master into staging-next	2018-11-30 17:46:21 +01:00
common-updater	common-updater, firefox: fix updater for firefox	2018-11-16 23:04:54 +09:00
data	Merge pull request #50987 from c0bw3b/pkg/mailcap	2018-11-25 16:14:34 +01:00
desktops	Merge master into staging-next	2018-11-29 08:12:56 +01:00
development	Merge master into staging-next	2018-11-30 17:46:21 +01:00
games	Merge pull request #51205 from matthewbauer/more-setup-hooks	2018-11-29 19:36:25 -06:00
misc	Merge master into staging-next	2018-11-30 17:46:21 +01:00
os-specific	Merge master into staging-next	2018-11-30 17:46:21 +01:00
servers	Merge master into staging-next	2018-11-30 17:46:21 +01:00
shells	nix-zsh-completions: 0.4.0 -> 0.4.1	2018-11-26 01:13:14 +01:00
stdenv	make-derivation: remove selfConsistent check	2018-11-30 17:58:33 +01:00
test	Merge pull request #50212 from matthewbauer/host-emulator	2018-11-29 19:34:20 -06:00
tools	Merge master into staging-next	2018-11-30 17:46:21 +01:00
top-level	Merge master into staging-next	2018-11-30 17:46:21 +01:00