Pascal Wittmann
880f6a517e
bmon: update from 3.5 to 3.6
2014-11-25 18:18:05 +01:00
Oliver Charles
60e661074d
haskellPackages.ekgBosun: New expression
2014-11-25 16:10:36 +00:00
Ricardo M. Correia
a4beb6a2b6
flashplayer: Update from 11.2.202.418 -> 11.2.202.424
2014-11-25 16:32:44 +01:00
Eelco Dolstra
1abc3e0155
firefox-bin: Fix meta.license
2014-11-25 16:30:50 +01:00
Shea Levy
957eb52f6f
Merge branch 'strongswan' of github.com:ip1981/nixpkgs
...
Add strongswan service
2014-11-25 09:37:15 -05:00
Cillian de Róiste
d250ca4e31
openimageio: update from 1.4.14 to 1.4.15
2014-11-25 15:33:22 +01:00
Igor Pashev
4f9111e91f
strongSwan needs python for building ( Closes #4940 )
2014-11-25 15:29:05 +01:00
Oliver Charles
8a6914e659
haskellPackages.snapErrorCollector: New expression
2014-11-25 14:12:36 +00:00
aszlig
28b29f173d
chromium: Switch to using bundled protobuf.
...
This is a response to 1fdefd5562
.
We are already using bundled protobuf for the beta and dev channels and
it also breaks regularly with about every new Chromium release, so let's
use bundled protobuf for all channels now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:58 +01:00
aszlig
6f683e4ba3
my-env: Use sed to substitute $initialPath.
...
initialPath is now added to the top of the modified setup.sh. It's not
very nice altogether to patch setup.sh in this way, as it is prone to
break on setup.sh changes, but it should (hopefully finally, but
unfortunately only temporarily) fix the issue ewemoa (in #nixos) had
with myEnvFun.
In the long term, if people want to have roughly similar functionality,
nix-shell provides a better way for that, so maybe we might either
remove myEnvFun or replace it with a smaller implementation using
nix-shell.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig
7d9fb8625e
chromium: Allow enableWideVine in nixpkgs.config.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
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 18b306b041
. 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 b851e970da
.
2014-11-25 13:00:09 +01: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
Eelco Dolstra
52b743add4
tzdata: Update to 2014j
2014-11-25 00:42:22 +01:00
Vladimír Čunát
b4aba8c577
evince-3.12: maintenance update
2014-11-25 00:05:12 +01:00
Vladimír Čunát
7e94263c6d
pidgin: minor update
2014-11-24 23:32:58 +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
Bart Brouns
0168c1ba19
faust: rename to faust-compiler ( close #5113 )
...
@vcunat adjusted coding style slightly.
2014-11-24 22:00:58 +01:00
Cillian de Róiste
4e46e4cb59
qtractor: update from 0.6.3 to 0.6.4
2014-11-24 18:27:04 +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