Commit graph

53709 commits

Author SHA1 Message Date
Vladimír Čunát acbdaf2f27 Merge branch 'master' into staging
This is to get the systemd fix to avoid yet another rebuild.
2014-11-24 23:56:48 +01:00
Vladimír Čunát 7e94263c6d pidgin: minor update 2014-11-24 23:32:58 +01:00
Aristid Breitkreuz 82f2be6a26 containers: add test that stopping and starting a container works (#4989) 2014-11-24 23:19:34 +01:00
Vladimír Čunát af379076ce harfbuzz: small update 2014-11-24 23:06:39 +01:00
Vladimír Čunát 443e0fcbea dbus: small update, fixing boot on slow machines
See http://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.8
2014-11-24 23:06:12 +01:00
Aristid Breitkreuz b216e2b8e6 systemd-nspawn: Ignore existing directories when trying to create mount-points (#4989) 2014-11-24 22:43:54 +01:00
Vladimír Čunát d39c6ceffc nvidia_x11: current long-lived becomes a new legacy
CC: #5070.
2014-11-24 22:39:00 +01:00
Eduard Bachmakov bba575ff7a nvidia_x11: update to 340.58
Picked from #5070.
2014-11-24 22:39:00 +01:00
Cillian de Róiste 909311b650 openimageio: update from 1.4.13 to 1.4.14 2014-11-24 22:17:00 +01:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Vladimír Čunát bb2fba1125 Revert "mesa: Don't depend on Wayland"
This reverts commit 7ff232e958.
See discussion at the original commit.

CC: #4999, #5001, #5061, #5071.
2014-11-24 22:10:06 +01:00
cillianderoiste 04d62f6643 Merge pull request #5006 from daogames/este/customgitoliteuser
enable different useraccount name for gitolite user
2014-11-24 22:03:20 +01:00
Bart Brouns 0168c1ba19 faust: rename to faust-compiler (close #5113)
@vcunat adjusted coding style slightly.
2014-11-24 22:00:58 +01:00
William A. Kennington III f83aa6c0ea nixos/unifi: Properly depend on mountpoints 2014-11-24 12:40:07 -08:00
Cillian de Róiste 4e46e4cb59 qtractor: update from 0.6.3 to 0.6.4 2014-11-24 18:27:04 +01:00
aszlig cc28e819e4
nixos/cupsd: Ignore collisions in cups-progs.
There currently are collisions between the main CUPS package and the
filters package, which are:

  * $storepath/share/cups/banners/classified
  * $storepath/share/cups/banners/confidential
  * $storepath/share/cups/banners/secret
  * $storepath/share/cups/banners/standard
  * $storepath/share/cups/banners/topsecret
  * $storepath/share/cups/banners/unclassified
  * $storepath/share/cups/data/testprint

And they actually have different content, so let's ignore those for now
until we have a better fix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-24 17:40:03 +01:00
Peter Simons 292bf1729c Merge pull request #5114 from vandenoever/calligra
Update Calligra to 2.8.6.
2014-11-24 17:34:07 +01:00
Jos van den Oever 5611996172 Update Calligra to 2.8.6. 2014-11-24 16:26:37 +01:00
Peter Simons d9924f565e haskell-snaplet-stripe: jailbreak to fix build with recent lens-family-core 2014-11-24 16:24:12 +01:00
Peter Simons ad0de68dc5 haskell-ekg-bosun: jailbreak to fix build with recent http-client 2014-11-24 16:24:12 +01:00
Peter Simons 52809ef21d haskell-twitter-conduit: patch build to load the edited Cabal file from Hackage 2014-11-24 16:24:12 +01:00
Peter Simons 4f48c33b74 haskell-elm-get: jailbreak to fix build with recent http-client 2014-11-24 16:24:12 +01:00
Peter Simons 3970579141 haskell-yesod: update to version 1.4.1 2014-11-24 16:24:12 +01:00
Peter Simons e432a4bcf1 haskell-yesod-form: update to version 1.4.1.1 2014-11-24 16:24:12 +01:00
Peter Simons 005b789839 haskell-pipes: update to version 4.1.4 2014-11-24 16:24:12 +01:00
Peter Simons 357af72d0a haskell-linear: update to version 1.15.4 2014-11-24 16:24:12 +01:00
Peter Simons 3400054d69 haskell-lens-family: update to version 1.2.0 2014-11-24 16:24:11 +01:00
Peter Simons 3fc1624faf haskell-lens-family-core: update to version 1.2.0 2014-11-24 16:24:11 +01:00
Peter Simons e398b44cf6 haskell-diagrams-cairo: update to version 1.2.0.4 2014-11-24 16:24:11 +01:00
Peter Simons ea0d509a81 haskell-Chart: update to version 1.3.2 2014-11-24 16:24:11 +01:00
Peter Simons 817564741c haskell-Chart-gtk: update to version 1.3.2 2014-11-24 16:24:11 +01:00
Peter Simons d82dbca3b7 haskell-Chart-diagrams: update to version 1.3.2 2014-11-24 16:24:11 +01:00
Peter Simons 4b95beb82d haskell-Chart-cairo: update to version 1.3.2 2014-11-24 16:24:11 +01:00
Peter Simons 3deaeb43fc haskell-cairo: update to version 0.13.0.5 2014-11-24 16:24:11 +01:00
Peter Simons bdbe5cd147 haskell-http-client: update to version 0.4.5 2014-11-24 16:24:11 +01:00
Peter Simons c62278fe2b haskell-pandoc: patch build to load the edited Cabal file from Hackage 2014-11-24 16:24:11 +01:00
Peter Simons 4535d19f93 haskell-authenticate-oauth: jailbreak to support current versions of RSA 2014-11-24 16:24:11 +01:00
Peter Simons 2440e27ee5 haskell-keter: update to version 1.3.6 2014-11-24 16:24:11 +01:00
Peter Simons 56bdbabbc5 haskell-cabal-bounds: update to version 0.8.9 2014-11-24 16:24:11 +01:00
Peter Simons 5ecee5fde9 haskell-zlib: update to version 0.5.4.2 2014-11-24 16:24:11 +01:00
Peter Simons 9626601f8a haskell-yesod-test: update to version 1.4.2 2014-11-24 16:24:11 +01:00
Peter Simons 9e73c0ac09 haskell-yesod-static: update to version 1.4.0.3 2014-11-24 16:24:10 +01:00
Peter Simons f602eadcb5 haskell-yesod-core: update to version 1.4.4.4 2014-11-24 16:24:10 +01:00
Peter Simons 1c26473da2 haskell-yesod-bin: update to version 1.4.0.9 2014-11-24 16:24:10 +01:00
Peter Simons a43ddafe8e haskell-yesod-auth: update to version 1.4.1 2014-11-24 16:24:10 +01:00
Peter Simons 7664a1ad07 haskell-yaml: update to version 0.8.10 2014-11-24 16:24:10 +01:00
Peter Simons b5430cfff0 haskell-webdriver: update to version 0.6.0.3 2014-11-24 16:24:10 +01:00
Peter Simons e75da9bb5b haskell-wai-app-static: update to version 3.0.0.3 2014-11-24 16:24:10 +01:00
Peter Simons faf2d31e39 haskell-units: update to version 2.2 2014-11-24 16:24:10 +01:00
Peter Simons 5a3bb5a09e haskell-twitter-types: update to version 0.6.0 2014-11-24 16:24:10 +01:00