fix vimnox
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

* experimental/updates:
  fix vimnox
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:

Conflicts:
	pkgs/development/interpreters/php/default.nix
Merge commit 'refs/top-bases/experimental/multi-shell-support' into experimental/multi-shell-support

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* commit 'refs/top-bases/experimental/multi-shell-support': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'experimental/multi-shell-support' into refs/top-bases/experimental/marc

* experimental/multi-shell-support:
Merge commit 'refs/top-bases/experimental/opera' into experimental/opera

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* commit 'refs/top-bases/experimental/opera': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'experimental/opera' into refs/top-bases/experimental/marc

* experimental/opera:
Merge commit 'refs/top-bases/experimental/opencascade' into experimental/opencascade

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* commit 'refs/top-bases/experimental/opencascade': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'experimental/opencascade' into refs/top-bases/experimental/marc

* experimental/opencascade:
Merge commit 'refs/top-bases/experimental/nodejs' into experimental/nodejs

* commit 'refs/top-bases/experimental/nodejs': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...

Conflicts:
	pkgs/development/web/nodejs/default.nix
Merge commit 'refs/top-bases/experimental/shadow' into experimental/shadow

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* commit 'refs/top-bases/experimental/shadow': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'experimental/nodejs' into refs/top-bases/experimental/marc

* experimental/nodejs:
Merge branch 'experimental/shadow' into refs/top-bases/experimental/marc

* experimental/shadow:
Merge branch 'master' into refs/top-bases/experimental/mingw

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* master: (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'experimental/mingw' into refs/top-bases/experimental/marc

* experimental/mingw:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/mingw

* experimental/multiple-versions-in-one-file:
Merge commit 'refs/top-bases/experimental/mingw' into experimental/mingw

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* commit 'refs/top-bases/experimental/mingw': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'master' into refs/top-bases/experimental/gutenprint

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* master: (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/gutenprint

* experimental/gimp-git:
Merge commit 'refs/top-bases/experimental/gutenprint' into experimental/gutenprint

# By Peter Simons (76) and others
# Via Peter Simons (4) and others
* commit 'refs/top-bases/experimental/gutenprint': (137 commits)
  Update Julia and compensat for their specification of /bin/bash as SHELL
  Fix git-annex build.
  Fix haskell-testpack build.
  Fix Agda build.
  Update default Haskell environment to Haskell Platform 2012.4.0.0.
  haskell: drop noHaddock from some packages which build fine in their respective latest version
  haskell-semigroupoids: update to version 3.0.0.1
  haskell-resourcet: update to version 0.4.1
  haskell-lrucache: update to version 1.1.1.2
  haskell-hinotify: update to version 0.3.4
  haskell-conduit: update to version 0.5.3
  haskell-OpenGL: add version 2.6.0.1
  Update Haskell Platform 2012.4.0.0 Cabal file to final version.
  file: Add extra source URL
  zip: Add extra source URL
  mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
  pinentry: update to version 0.8.2
  boost: update to version 1.52.0
  linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption
  linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption
  ...