Charles Strahan
a188373640
Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs
...
Conflicts:
pkgs/development/libraries/haskell/ghcjs-dom/default.nix
pkgs/top-level/haskell-packages.nix
2014-12-27 14:35:01 -05:00
Charles Strahan
571af5b988
ghcjs: clean up
2014-12-27 14:27:37 -05:00
Austin Seipp
5eba046b5d
nixpkgs: openresty 1.7.4.1rc2 -> 1.7.7.1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-27 12:43:52 -06:00
vbgl
baeb69626e
Merge pull request #5482 from DamienCassou/mutag-0.0.2
...
Update pythonPackages.mutag
2014-12-27 19:24:41 +01:00
Daniel Peebles
8df8943b92
I think this should fix the evaluation errors in hydra
2014-12-27 12:02:58 -05:00
Damien Cassou
fe5949c6b7
Update pythonPackages.mutag
2014-12-27 16:21:15 +01:00
Marco Maggesi
30f621944b
Bumb BLCR
2014-12-27 14:56:21 +01:00
Domen Kožar
8a1347c47a
remove pythonPackages.docopt as it's already defined
2014-12-27 11:58:04 +01:00
Domen Kožar
9ac97d8f11
udiskie: specify correct dependencies for the version bump
...
(cherry picked from commit ea540f8fc66a857e44de320175f80b89de39da93)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-27 11:53:08 +01:00
Domen Kožar
ec5fcfa82c
network-manager: specify full path to sytemctl binary
...
(cherry picked from commit af8f76c2568ae9d842716d98673b3639292a920e)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-27 11:53:07 +01:00
Vincent Laporte
3ccd6509ad
ocaml-uucp: update from 0.9.0 to 0.9.1
2014-12-27 09:17:09 +01:00
Austin Seipp
79f82686e1
nixpkgs: afl 0.89b -> 1.04b
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-26 21:43:05 -06:00
Vladimír Čunát
becf038336
Merge branch 'staging'
2014-12-26 22:41:19 +01:00
Vladimír Čunát
dd4dfee2c2
qt5: work around a build problem
2014-12-26 22:03:05 +01:00
Shea Levy
bbd2be6075
Restore accidentally-dropped stdenv adapter
2014-12-26 12:38:18 -05:00
Shea Levy
7e0a5c38f3
More gcc->cc refs
2014-12-26 12:33:16 -05:00
Shea Levy
05edd656f6
Missed gcc refs
2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
tv
ce100a5d58
journal-mailer: camelCasify attribute name
2014-12-26 16:47:18 +01:00
tv
7015c61686
journal-mailer: add version 0.1.1.0
2014-12-26 16:41:18 +01:00
muflax
e5480cab83
bup: update to 0.26 and adopt it
...
[Bjørn: use patchShebangs to unbreak chroot build (fixes up references
to /usr/bin/env {python,bash}]
2014-12-26 14:09:56 +01:00
muflax
001f2110bd
par2cmdline: update to 0.6.11 and adopt it
...
[Bjørn: break overlong longDescription line]
2014-12-26 14:09:56 +01:00
lethalman
f40807701a
Merge pull request #5475 from prikhi/fix-awesome
...
awesome: fix lua version
2014-12-26 12:38:09 +01:00
muflax
745e3e64a9
awscli: update to 1.6.10 and adopt it
...
[Bjørn: upper-case first letter in description]
2014-12-26 12:26:08 +01:00
muflax
24349b8e99
jmespath: update to 0.5.0
2014-12-26 12:26:08 +01:00
muflax
9ffb6d1fb2
botocore: update to 0.80.0
2014-12-26 12:26:08 +01:00
Michael Raskin
dace8fe45f
Merge pull request #5013 from doublec/aliceml
...
Update aliceml to use git version of Alice ML
2014-12-26 14:21:12 +03:00
Pavan Rikhi
ece2c5e49b
awesome: fix lua version
2014-12-26 05:16:02 -05:00
Jaka Hudoklin
344eafc4b9
Merge pull request #4922 from offlinehacker/node_shebangs
...
nodePackages: Enable source patching, patch shebangs, patch versions, fix recursive dependencies runtime
2014-12-26 01:23:34 +01:00
Jaka Hudoklin
86744fef91
nodePackages: fix builder
...
- reuse unpack and patch phase
- patch shebangs of source code
- properly patch depdency versions (thanks @svanderburg)
- add patching for github version names
- add some inline docs
- fix recursive depdencies runtime handling by copying files instead of
symlinking if package has recursive dependencies
2014-12-26 01:04:08 +01:00
vbgl
58c283f0dd
Merge pull request #5359 from ambrop72/printrun
...
Printrun: Update to printrun-20140801, add dependencies.
2014-12-25 23:43:38 +01:00
vbgl
e553cbee5a
Merge pull request #5446 from nckx/remotebox-squashed
...
Add RemoteBox, a (you guessed it) remote VirtualBox client
2014-12-25 23:32:51 +01:00
Arseniy Seroka
1c8783f39b
Merge pull request #5461 from wyvie/openarena
...
Added openarena 0.8.8
2014-12-26 01:17:49 +03:00
Arseniy Seroka
67b56ea5d8
Merge pull request #5464 from ftrvxmtrx/fldigi-3.22.02
...
fldigi 3.21.83 -> 3.22.02
2014-12-26 01:12:14 +03:00
Vladimír Čunát
7671875b25
upower_99: port commit bf3fd50e14
2014-12-25 18:29:08 +01:00
Vladimír Čunát
38ee8859e8
upower_99: update
...
It doesn't depend on polkit anymore (upstream change in 0.99.1).
2014-12-25 18:17:00 +01:00
Vladimír Čunát
1aec647906
udisks2: update
...
Also depend on systemd instead of udev, as some libsystemd* is used.
2014-12-25 18:17:00 +01:00
Domen Kožar
4e87c458c4
Merge pull request #5470 from DamienCassou/mu-0.9.11
...
Update mu to 0.9.11
2014-12-25 17:50:47 +01:00
Domen Kožar
44a26e0fed
Merge pull request #5460 from mvcisback/master
...
Rawdog RSS Reader
2014-12-25 17:43:10 +01:00
Damien Cassou
41cff1e9d0
Update mu to 0.9.11
2014-12-25 17:15:47 +01:00
Vladimír Čunát
de572de4f0
blender: fix build by upstream patch
...
The freetype-2.5.4 update changed signedness of some struct fields.
2014-12-25 16:52:39 +01:00
Vladimír Čunát
9c94c42af8
opencv: fix build on i686 by upstream patch
...
CC maintainers @viric, @flosse, #5356 .
2014-12-25 16:52:39 +01:00
koral
ed4eee3a06
New python package: percol-0.0.7
2014-12-25 16:23:47 +01:00
Bjørn Forsman
0a8623d6a9
nixos/munin: add /var/setuid-wrappers to PATH
...
/var/setuid-wrappers is an extension of the system profile, so it
belongs in PATH for the munin service.
2014-12-25 15:43:51 +01:00
Vladimír Čunát
0fbc5ddadb
ntp: security update, and use libcrypto
...
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
The package would no longer build without libcrypto,
and it wouldn't find it without pkgconfig.
I checked that Debian and Arch do use openssl as a dependency,
so it's probably not so bad a thing to have.
CC maintainer @edolstra.
2014-12-25 12:30:53 +01:00
Vladimír Čunát
d89518bd1b
gstreamer-1: double maintenance bump
...
CC maintainer @iyzsong.
2014-12-25 11:55:04 +01:00
Vladimír Čunát
b5bfacefa9
orc: maintenance update
...
CC maintainer @fuuzetsu.
2014-12-25 11:44:33 +01:00
Vladimír Čunát
5d903d850a
libpng: security update (no CVE yet)
...
http://www.securitytracker.com/id/1031444
2014-12-25 11:36:21 +01:00
Vladimír Čunát
600534513c
xfce4-task-manager: update (features and bugfixes)
2014-12-25 11:30:04 +01:00
Peter Simons
a4a778bac7
haskell-haddock: update to version 2.15.0.1
2014-12-25 11:05:49 +01:00