Commit graph

55243 commits

Author SHA1 Message Date
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Charles Strahan 4ed847d81d redmine: fix use of bundler 2014-12-28 14:22:11 -05:00
Eelco Dolstra a30869a525 Typo 2014-12-28 19:41:06 +01:00
Eelco Dolstra ea9d391bb5 Fix ntpd
Since the 4.2.8 upgrade, ntpd is broken on NixOS:

  Dec 28 19:06:54 hagbard ntpd[27723]: giving up resolving host 1.nixos.pool.ntp.org: Servname not supported for ai_socktype (-8)

This appears to be because DNS resolution doesn't work in chroots
anymore (due to /etc being missing). So disable chroots for now. It's
probably better to use systemd's containment facilities anyway.
2014-12-28 19:38:45 +01:00
Eelco Dolstra 782440310d ntp: Don't depend on openssl, don't install docs 2014-12-28 19:38:45 +01:00
Thomas Tuegel 0dcdb3c76a Merge branch 'vcsh' 2014-12-28 09:01:19 -06:00
Thomas Tuegel e5e6931088 vcsh: add ttuegel as maintainer 2014-12-28 09:00:49 -06:00
Thomas Tuegel a1860dab81 vcsh: bump version to 1.20141026 2014-12-28 09:00:38 -06:00
Vincent Laporte 2335ec0b40 Adds ocaml-uuseg
Uuseg is an OCaml library for segmenting Unicode text. It implements the
locale independent Unicode text segmentation algorithms to detect
grapheme cluster, word and sentence boundaries and the Unicode line
breaking algorithm to detect line break opportunities.

Homepage: http://erratique.ch/software/uuseg
2014-12-28 14:30:12 +01:00
Alexander Kjeldaas da1f8578b0 Eradicate gzip -9 without -n 2014-12-28 13:45:27 +01:00
Vladimír Čunát 40397be737 e19: enableParallelBuilding of some larger components
Some parts build too long, it seems to me, so I sped them up.
2014-12-28 11:40:01 +01:00
Vladimír Čunát 61d9f06760 fix a typo from 2627198b0c 2014-12-28 10:44:50 +01:00
Domen Kožar 4fdf1fcbb9 Merge pull request #5485 from matejc/eflfix
efl: fix build
2014-12-28 10:21:56 +01:00
William A. Kennington III 2627198b0c nixos/firewall: Add ipset utility 2014-12-28 00:04:49 -08:00
William A. Kennington III c17fda769a ipset: Add derivation 2014-12-28 00:03:54 -08:00
Matej Cotman 812e2734a5 efl: fix build 2014-12-28 06:09:59 +01:00
Vladimír Čunát 3c050d00a5 upower: use newer version by default
Tested on KDE4, fixed with xfce, and was used with GNOME before.
CC @lethalman.

I did not test e19, as it won't build, probably due to #5392 @shlevy.
CC maintainer @matejc.

Also removed a forgotten unused patch.
2014-12-27 22:46:46 +01:00
Vladimír Čunát ca80e416dd xfce4-session: support newer upower by an Arch patch
Tested.
2014-12-27 22:46:46 +01:00
Eduard Bachmakov 5e4a8d9fd8 Add photoqt-1.1.0.1
Also, add myself to maintainers.
2014-12-27 22:13:41 +01:00
Thomas Tuegel 09435f05d4 Merge pull request #5484 from ttuegel/linear-algebra
Version bump some linear algebra packages
2014-12-27 15:12:58 -06:00
Vladimír Čunát 5f0686fc95 libcaca: add another mirror
The original does not work ATM.
2014-12-27 20:59:24 +01:00
Thomas Tuegel d582090a15 suitesparse: add version 4.4.1 2014-12-27 13:47:53 -06:00
Thomas Tuegel 81c0f94d74 arpack: build against atlasWithLapack 2014-12-27 13:40:40 -06:00
Thomas Tuegel 893f277bd7 arpack: version bump to 3.2.0 2014-12-27 13:40:40 -06:00
Thomas Tuegel 3ce76d4dd0 atlas: optionally build with full lapack 2014-12-27 13:40:40 -06:00
Thomas Tuegel 91657e30ca atlas: fix generic options
Build atlas with the generic options recommended by the upstream
documentation for distributions. The expression now takes the parameter
'threads' which configures the number of threads atlas will use. The
default is to build serial atlas ('threads = "0"'). The expression also
takes the parameter 'cacheEdge' which is the L2 cache per core, in
bytes. This reduces build time because the cache size doesn't need to be
detected. It also reduces impurity, since different build nodes on Hydra
may have different hardware. It is set to 256k by default, which is
recommended for distributions by the upstream documentation.
2014-12-27 13:40:40 -06:00
Thomas Tuegel 8a5d7e7944 openblas: version bump to 0.2.13 2014-12-27 13:40:40 -06: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