Charles Strahan ca2b03439f Merge pull request #19496 from Ericson2314/overridePackages ...

Make `overridePackages` extend rather than replace existing overrides

2016-10-26 14:01:13 -04:00

..

applications

chirp: 0.4.1 -> 20161018

2016-10-26 17:15:20 +02:00

build-support

Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-26 13:06:43 +02:00

data

Merge pull request #19845 from NeQuissimus/unifont_9_0_03

2016-10-25 11:48:27 -04:00

desktops

Merge pull request #19744 from groxxda/gnome-fwdport

2016-10-23 14:11:41 +01:00

development

saleae-logic: 1.2.9 -> 1.2.10 (bugfixes)

2016-10-26 17:16:10 +02:00

games

Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-26 13:06:43 +02:00

misc

Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-26 13:06:43 +02:00

os-specific

wireguard: 2016-10-01 -> 2016-10-25

2016-10-26 16:49:52 +02:00

servers

bird: 1.6.0 -> 1.6.2

2016-10-26 16:47:34 +02:00

shells

oh-my-zsh: 2016-10-08 -> 2016-10-25

2016-10-25 14:29:36 -04:00

stdenv

Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-26 13:06:43 +02:00

test

…

tools

gencfsm: use standalone libgee_0_6 as not every version of gnome3_* has libgee_1 after gnome 3.22 addition

2016-10-26 16:51:24 +02:00

top-level

Merge pull request #19496 from Ericson2314/overridePackages

2016-10-26 14:01:13 -04:00