fix evaluation
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  fix evaluation
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix evaluation
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (273 commits)
  missing file
  can be null
  missing file
  fix
  adding missing patch
  drop merge failure
  fix mingw cross builds by using older compiler.
  openssl: fix mingw cross build by disabling patch
  make curl and mingw work
  new tg branch experimental/mingw
  Forgot to commit all-packages.nix for pstack.
  Add pstack, a wrapper script for gdb. Used to be part of gdb.
  cscope: update to 15.8a
  gimp: revert broken gimp-2.6 dependencies
  nodejs: Bump and backport fix to support ESPIPE
  gnutls: Disable tests on FreeBSD.
  qemu-kvm: Revert the qemu update to 1.1.1
  qemu-kvm: I missed a change present in a previous reverted update
  qemu-kvm: update to 1.1.1
  virtualbox: Update to 4.1.20
  ...
Merge commit 'c44be5be09a5d0fff87eff050033f50f4d02bef2' into experimental/php

* commit 'c44be5be09a5d0fff87eff050033f50f4d02bef2': (261 commits)
  Forgot to commit all-packages.nix for pstack.
  Add pstack, a wrapper script for gdb. Used to be part of gdb.
  cscope: update to 15.8a
  gimp: revert broken gimp-2.6 dependencies
  nodejs: Bump and backport fix to support ESPIPE
  gnutls: Disable tests on FreeBSD.
  qemu-kvm: Revert the qemu update to 1.1.1
  qemu-kvm: I missed a change present in a previous reverted update
  qemu-kvm: update to 1.1.1
  virtualbox: Update to 4.1.20
  nvidia-x11: Update to 304.37
  virtualbox: Drop accidental JDK dependency
  Removed unused jdkPlugin attribute
  Prevent the JDK from appearing in the Nixpkgs channel
  Remove obsolete JDK versions
  Add hacky way to prevent Hydra from building/distributing unfree packages
  stdenv/generic/default.nix: Simplify the code using the "or" construct
  buildNodePackage: Remove absolute path to source tarball to avoid runtime dependency
  Set platforms for packages depending on CUDA to none.
  gimp28 should probably be gimp_2_8
  ...
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc:
  New TopGit dependency: experimental/gutenprint
  New TopGit dependency: experimental/mingw
  New TopGit dependency: experimental/nix
  fix
  New TopGit dependency: experimental/shadow
  ec2 api tools fix hash merge failure
  fix
  updating fossil
  New TopGit dependency: experimental/nodejs
  New TopGit dependency: experimental/opencascade
  New TopGit dependency: experimental/opera
  texmacs: gnuplot fix + parallel building
  New TopGit dependency: experimental/shadow
  New TopGit dependency: experimental/urweb
  New TopGit dependency: experimental/firebird
  New TopGit dependency: experimental/gutenprint
  New TopGit dependency: experimental/multi-shell-support
  New TopGit dependency: experimental/php
  New TopGit dependency: experimental/hack-nix
  new tg branch experimental/marc
Merge commit 'c9fd4559a8889576ffc4144b51df72e17ee45ce4' into experimental/marc

* commit 'c9fd4559a8889576ffc4144b51df72e17ee45ce4': (275 commits)
  New TopGit dependency: experimental/gutenprint
  missing file
  can be null
  missing file
  fix
  adding missing patch
  drop merge failure
  New TopGit dependency: experimental/mingw
  fix mingw cross builds by using older compiler.
  openssl: fix mingw cross build by disabling patch
  make curl and mingw work
  new tg branch experimental/mingw
  Forgot to commit all-packages.nix for pstack.
  Add pstack, a wrapper script for gdb. Used to be part of gdb.
  cscope: update to 15.8a
  gimp: revert broken gimp-2.6 dependencies
  nodejs: Bump and backport fix to support ESPIPE
  gnutls: Disable tests on FreeBSD.
  qemu-kvm: Revert the qemu update to 1.1.1
  qemu-kvm: I missed a change present in a previous reverted update
  ...