Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libusb1: fix build on darwin #920

Closed
wants to merge 1 commit into from
Closed

libusb1: fix build on darwin #920

wants to merge 1 commit into from

Conversation

lovek323
Copy link
Member

@lovek323 lovek323 commented Sep 5, 2013

udev introduced as build input in 8500581

lovek323 referenced this pull request Sep 5, 2013
@bluescreen303
libusb1: upgrade to 1.0.16
8500581
vcunat pushed a commit to vcunat/nixpkgs that referenced this pull request Sep 6, 2013
@lovek323 @vcunat
libusb1: fix build on darwin via dropping udev (close NixOS#920)
92f8d01 
vcunat edit: we have udev (systemd) only on Linux systems,
extend platforms so we know about breakages from Hydra.
@vcunat vcunat closed this in e1dc4d8 Sep 6, 2013
@lovek323 lovek323 deleted the libusb1 branch September 6, 2013 12:23
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-fi…
ff2eda9 
…le' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/inkscape' into experimental…
f454489 
…/inkscape

* commit 'refs/top-bases/experimental/inkscape': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental…
f2a007a 
…/gimp-git

* commit 'refs/top-bases/experimental/gimp-git': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/firebird' into experimental…
f1f879f 
…/firebird

* commit 'refs/top-bases/experimental/firebird': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/overlays' into experimental…
97ca667 
…/overlays

* commit 'refs/top-bases/experimental/overlays': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
6e1645d 
…/hack-nix

* experimental/overlays: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/hack-nix' into experimental…
ec86a6d 
…/hack-nix

* commit 'refs/top-bases/experimental/hack-nix': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/vim-plugins' into experimen…
e382d32 
…tal/vim-plugins

* commit 'refs/top-bases/experimental/vim-plugins': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
836c9b7 
…/updates

* experimental/overlays: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/updates' into experimental/…
c550900 
…updates

* commit 'refs/top-bases/experimental/updates': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/fonts' into experimental/fonts
c1883c4 
* commit 'refs/top-bases/experimental/fonts': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/ruby
c2db6fa 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/ruby' into experimental/ruby
b07cbb4 
* commit 'refs/top-bases/experimental/ruby': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/opera' into experimental/opera
a913e57 
* commit 'refs/top-bases/experimental/opera': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/shadow' into experimental/s…
94a0442 
…hadow

* commit 'refs/top-bases/experimental/shadow': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/mercurial' into experimenta…
9167f46 
…l/mercurial

* commit 'refs/top-bases/experimental/mercurial': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/haxe
726d6ce 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/haxe' into experimental/haxe
8da080c 
* commit 'refs/top-bases/experimental/haxe': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/gutenprint
784dfdc 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/gutenprint' into experiment…
8ce409d 
…al/gutenprint

* commit 'refs/top-bases/experimental/gutenprint': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/php
3a539f5 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/php' into experimental/php
8c1f2ba 
* commit 'refs/top-bases/experimental/php': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/blender
e748684 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/blender' into experimental/…
83e2437 
…blender

* commit 'refs/top-bases/experimental/blender': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/ati' into experimental/ati
67df6dc 
* commit 'refs/top-bases/experimental/ati': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/mingw
7ec6a8e 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/mingw' into experimental/mingw
666a95d 
* commit 'refs/top-bases/experimental/mingw': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'experimental/updates' into refs/top-bases/experimental/…
ecabc6e 
…marc

* experimental/updates: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/opencascade' into experimen…
3a16d82 
…tal/opencascade

* commit 'refs/top-bases/experimental/opencascade': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'experimental/multiple-versions-in-one-file' into refs/t…
4fe9a89 
…op-bases/experimental/nodejs

* experimental/multiple-versions-in-one-file: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/nodejs' into experimental/n…
5ca9a84 
…odejs

* commit 'refs/top-bases/experimental/nodejs': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/nix' into experimental/nix
55becf1 
* commit 'refs/top-bases/experimental/nix': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/plover' into experimental/p…
59ccc07 
…lover

* commit 'refs/top-bases/experimental/plover': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/xsbt
e7fc8fa 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/xsbt' into experimental/xsbt
005ff45 
* commit 'refs/top-bases/experimental/xsbt': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/parallel-building' into exp…
5998018 
…erimental/parallel-building

* commit 'refs/top-bases/experimental/parallel-building': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/eclipse
3d79f71 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/eclipse' into experimental/…
1b56065 
…eclipse

* commit 'refs/top-bases/experimental/eclipse': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/imap-sync-update
26d0d6c 
* master: (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/imap-sync-update' into expe…
1c9f8ec 
…rimental/imap-sync-update

* commit 'refs/top-bases/experimental/imap-sync-update': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 6, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc
6119565 
* commit 'refs/top-bases/experimental/marc': (92 commits)
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  source-highlight: 3.1.6 -> 3.1.7
  source-highlight: unbreak by using boost 1.53
  ...

Conflicts:
	pkgs/shells/zsh/default.nix
mornfall pushed a commit to mornfall/nixpkgs that referenced this pull request Sep 7, 2013
@lovek323 @mornfall
libusb1: fix build on darwin via dropping udev (close NixOS#920)
24e96b0 
vcunat edit: we have udev (systemd) only on Linux systems,
extend platforms so we know about breakages from Hydra.
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 12, 2013
@MarcWeber
Merge commit '0ea3365369fa6efc6a3cbde339ae366ff653d959' into experime…
9c176d4 
…ntal/marc

* commit '0ea3365369fa6efc6a3cbde339ae366ff653d959': (94 commits)
  default to 0.10 version
  default to ffmpeg 0.10
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close NixOS#924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close NixOS#920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@lovek323