haskell-distributed-process-p2p add from Hackage
Revert "protobuf: Clean up and update to version 2.6.1."

This reverts commit 18b306b0414c13b5584c2325e9a01e065d715498. Protobuf
releases are generally not very backwards compatible and likely to
break lots of stuff. E.g.

  http://hydra.nixos.org/build/17535340
  http://hydra.nixos.org/build/17535640
  http://hydra.nixos.org/build/17536998
  http://hydra.nixos.org/build/17536170

See also b851e970daee1cd4a6b6977c9f67ed16cefc1229.
Merge pull request #5120 from jeremyjh/distributed-process-p2p

haskell-distributed-process-p2p add from Hackage
chromium: Shorten line length of name attribute.

No feature change, I'm just very nitpicky if it comes to lines with more
than 79 characters.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
chromium: Use Nix expressions for plugin settings.

We now create Nix expressions within the plugin output path(s) which
then will be imported and incorporated into the wrapper. This makes it
easier for other plugins to provide configuration settings to the main
Chromium wrapper.

Of course, in order to allow for external plugins we need to allow
passing a list of plugins to the Chromium derivation, but right now we
keep it internal and only use it for things such as NaCl (as soon as we
support it, of course).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
chromium: Allow enableWideVine in nixpkgs.config.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
my-env: Use sed to substitute $initialPath.

initialPath is now added to the top of the modified setup.sh. It's not
very nice altogether to patch setup.sh in this way, as it is prone to
break on setup.sh changes, but it should (hopefully finally, but
unfortunately only temporarily) fix the issue ewemoa (in #nixos) had
with myEnvFun.

In the long term, if people want to have roughly similar functionality,
nix-shell provides a better way for that, so maybe we might either
remove myEnvFun or replace it with a smaller implementation using
nix-shell.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
chromium: Switch to using bundled protobuf.

This is a response to 1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.

We are already using bundled protobuf for the beta and dev channels and
it also breaks regularly with about every new Chromium release, so let's
use bundled protobuf for all channels now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
haskellPackages.snapErrorCollector: New expression
strongSwan needs python for building (Closes #4940)
Added strongSwan service
openimageio: update from 1.4.14 to 1.4.15
Merge branch 'strongswan' of github.com:ip1981/nixpkgs

Add strongswan service
Merge branch 'master' of https://github.com/NixOS/nixpkgs