aszlig
690a845de9
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>
2014-11-25 14:14:43 +01:00
aszlig
518173ac24
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>
2014-11-25 14:14:43 +01:00
Peter Simons
7ae1a17c89
Merge pull request #5120 from jeremyjh/distributed-process-p2p
...
haskell-distributed-process-p2p add from Hackage
2014-11-25 13:40:48 +01:00
Eelco Dolstra
1fdefd5562
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.
2014-11-25 13:00:09 +01:00
vbgl
4158847b3e
Merge pull request #5123 from dysinger/purescript-0.6.1.2
...
Upgrade Purescript to 0.6.1.2
2014-11-25 07:39:24 +00:00
Tim Dysinger
dbe6c1a71f
Upgrade Purescript to 0.6.1.2
2014-11-25 08:11:32 +01:00
Jeremy Huffman
d21dc419d3
haskell-distributed-process-p2p add from Hackage
2014-11-24 20:55:14 -05:00
Shea Levy
140e1de0ec
strongswan: dont patchelf
...
fixes #5045 ('fixes')
2014-11-24 20:50:26 -05:00
aszlig
83c2fcada4
my-env: Provide explicit store path for "rm".
...
If you do not provide any dependencies which don't propagate coreutils,
you'll get "rm: No such file or directory". Like for example by using
this:
nix-build -E '(import <nixpkgs> {}).myEnvFun {
name = "mybrokentest";
buildInputs = [];
}'
Thanks to "ewemoa" from the #nixos IRC channel for spotting this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 02:05:48 +01:00
Ricardo M. Correia
ca6d86b7fb
cargoSnapshot: Update from 2014-09-19 -> 2014-11-22
2014-11-25 01:07:10 +01:00
Vladimír Čunát
5c01205bf7
mesa: use upstream patch to fix doCheck again
2014-11-25 01:03:29 +01:00
Eelco Dolstra
e368ca20c9
Fix old Go versions
...
http://hydra.nixos.org/build/17432147
http://hydra.nixos.org/build/17439772
2014-11-25 00:53:06 +01:00
Eelco Dolstra
52b743add4
tzdata: Update to 2014j
2014-11-25 00:42:22 +01:00
Vladimír Čunát
07bf146b30
gtkmm and related *mm updates
...
Also enableParallelBuilding for gtkmm3.
2014-11-25 00:40:23 +01:00
Eelco Dolstra
97a2de297e
Fix various Perl packages
...
Perl 5.20 removed some modules, in particular Module::Pluggable. So
now other modules need to get it from CPAN.
http://hydra.nixos.org/build/17450281
2014-11-25 00:29:48 +01:00
Vladimír Čunát
b4aba8c577
evince-3.12: maintenance update
2014-11-25 00:05:12 +01:00
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 7ff232e9584b6bd78a38b0d6b85dd2c6e0ebce4e.
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
Ryan Newton
fd73e9948d
racket: add libreadline to ffi libs - enables xrepl.
2014-11-24 13:58:22 -05: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