Commit graph

40838 commits

Author SHA1 Message Date
Shea Levy
d574c34e0a Merge branch 'master' of git://github.com/madjar/nixpkgs
silver-searcher: avoid -lgcc_s on darwin
2014-03-19 18:18:08 -04:00
Shea Levy
506924c6c2 Merge branch 'kdevelop46' of git://github.com/ambrop72/nixpkgs
kdevelop: Update to 4.6.
2014-03-19 18:11:35 -04:00
Shea Levy
a1fff61e4d Merge branch 'u/vimrc' of git://github.com/wizeman/nixpkgs
vimHugeX: also add wrapper for system-wide vimrc
2014-03-19 18:07:04 -04:00
Shea Levy
78029b7b0f Merge branch 'nixos/elasticsearch/elasticsearch_fix' of git://github.com/offlinehacker/nixpkgs
nixos/elasticsearch: Make port an integer, add dataDir option, make pure
2014-03-19 18:02:13 -04:00
Shea Levy
ca81e38178 Merge branch 'nixos/statsd/statsd_port_fix' of git://github.com/offlinehacker/nixpkgs
nixos/statsd: change default host and port on graphite host and port
2014-03-19 18:00:49 -04:00
Shea Levy
d944c01db6 Merge branch 'pkgs/pythonPackages/fix_graphite2' of git://github.com/offlinehacker/nixpkgs
nixos/graphite: Make pure, fix several bugs, add dataDir option
2014-03-19 17:57:34 -04:00
José Romildo Malaquias
47c7e29ffa make environment.variables.GIO_EXTRA_MODULES a list
Close #1929.
2014-03-19 22:15:44 +01:00
Vladimír Čunát
8a8ae81e40 acpid: update from 2.0.21 to 2.0.22 2014-03-19 21:56:48 +01:00
Vladimír Čunát
5bb0803254 fix evaluation (shotwell license) 2014-03-19 21:10:43 +01:00
Vladimír Čunát
3cf4029981 Merge pull request #1972 from vcunat/p/procps
procps-ng: make it the default procps (name and attr)
2014-03-19 17:54:30 +01:00
Domen Kožar
2a50098657 easy-rsa: don't include directory when wrapping 2014-03-19 12:23:08 +01:00
Shea Levy
4216e42ca8 Merge branch 'openafs' of git://github.com/errge/nixpkgs
Openafs fixes
2014-03-19 05:21:28 -04:00
Shea Levy
77181be713 Set /run/keys ownership based on numerical ids
See comments on 4ab5646417
2014-03-19 05:18:24 -04:00
Shea Levy
e0b8a00607 Merge branch 'fix-ocaml-facile' of git://github.com/maggesi/nixpkgs
Fix compilation of ocaml-facile with OCaml 4.xx
2014-03-19 03:56:20 -04:00
Marco Maggesi
94a690a41a Fix compilation of ocaml-facile with OCaml 4.xx 2014-03-19 08:46:17 +01:00
Rickard Nilsson
043bf5a941 mysql service: Shutdown with normal systemd SIGTERM instead of mysqladmin
According to the MySQL manual, this is a perfectly legal way of
shutting down the server. The shutdown logs also looks fine:

systemd[1]: Stopping MySQL Server...
mysqld[5114]: 140319  8:36:12 [Note] /nix/store/sc26mz82k97mbpx3d1abzn3rrbd155ws-mariadb-10.0.8/bin/mysqld: Normal shutdown
mysqld[5114]: 140319  8:36:12 [Note] Event Scheduler: Purging the queue. 0 events
mysqld[5114]: 140319  8:36:12 [Note] InnoDB: FTS optimize thread exiting.
mysqld[5114]: 140319  8:36:12 [Note] InnoDB: Starting shutdown...
mysqld[5114]: 140319  8:36:14 [Note] InnoDB: Shutdown completed; log sequence number 1619078
mysqld[5114]: 140319  8:36:14 [Note] /nix/store/sc26mz82k97mbpx3d1abzn3rrbd155ws-mariadb-10.0.8/bin/mysqld: Shutdown complete
systemd[1]: Stopped MySQL Server.
2014-03-19 08:41:07 +01:00
Eelco Dolstra
7d8fea797a Run hwclock --hctosys to initialize the system time 2014-03-18 23:14:34 +01:00
Eelco Dolstra
08095f97ce Typo 2014-03-18 22:40:39 +01:00
aszlig
ab7a8abd58
python-hetzner: Update to new version 0.7.0.
This introduces the following changes:

 - hetznerctl: Fix UnicodeEncodeError in server product name.
 - Support rebooting of vServers.
 - Server now has a new attribute is_vserver.
 - Add a README.md with examples.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-18 18:45:22 +01:00
Domen Kožar
d4b1250b6c remove prefix for kazam 2014-03-18 18:23:13 +01:00
Domen Kozar
902b059967 Add shotwell 1.15.1 2014-03-18 18:23:13 +01:00
Eelco Dolstra
26a868139e kdf: Disable parallel building
http://hydra.nixos.org/build/9595928
2014-03-18 17:30:57 +01:00
Ricardo M. Correia
cc69228119 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403142107 -> 3.0-3.2.55-201403172027
test:   3.0-3.13.6-201403142112 -> 3.0-3.13.6-201403172032
2014-03-18 16:51:25 +01:00
Eelco Dolstra
f73ff0529e runInLinuxVM: Set the clock properly 2014-03-18 15:02:09 +01:00
William A. Kennington III
b6d3526c53 qemu: Update 1.5.2 -> 1.7.0 2014-03-18 14:24:46 +01:00
Eelco Dolstra
de57c0eb66 Shut up Perl warning 2014-03-18 14:10:31 +01:00
Eelco Dolstra
01fc3e5153 Revert "test-driver: Set the date to the current time on boot"
This reverts commit 4e6eae45ee. It
breaks running the test driver interactively (in that it causes all
VMs to be started immediately, which is not always what you wnat).
2014-03-18 14:05:51 +01:00
Peter Simons
5e7608e226 Merge pull request #1932 from wkennington/master.sup
sup: Push sup to the latest git commit
2014-03-18 12:09:20 +01:00
Peter Simons
869fb5298d Merge pull request #1976 from madjar/python
Update to python 3.4.0
2014-03-18 11:52:21 +01:00
Peter Simons
a42374ff66 Merge pull request #1979 from larkery/update-isync
Update isync version to 1.1.0 (doesn't need recursive listing patch any ...
2014-03-18 11:47:21 +01:00
Domen Kožar
186e5a0f81 Merge pull request #1978 from larkery/fix-autorandr
Add missing sha256sum to autorandr derivation
2014-03-18 11:19:46 +01:00
Tom Hinton
7b9485145d Add missing sha256sum to autorandr derivation 2014-03-18 10:15:59 +00:00
Tom Hinton
cf0f710b13 Update isync version to 1.1.0 (doesn't need recursive listing patch any more) 2014-03-18 10:14:52 +00:00
Vladimír Čunát
cca592b455 liferea: minor update 2014-03-18 10:24:00 +01:00
Shea Levy
a1a167bc8b nginx module: Enable modularly specifying servers 2014-03-17 23:31:56 -04:00
Shea Levy
4e6eae45ee test-driver: Set the date to the current time on boot
Should allow merging #1816
2014-03-17 22:05:19 -04:00
Vladimír Čunát
da4fca4ce4 ffmpeg (0.10): minor update
(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05)

Conflicts:
	pkgs/development/libraries/ffmpeg/0.10.nix
2014-03-17 22:56:19 +01:00
Peter Simons
f202729d53 haskell-dbus: disable test suite
The tests need access to the Internet to succeed.
2014-03-17 18:33:55 +01:00
Peter Simons
dd701b4c51 haskell-options: we cannot easily run the test suite because it requires 'chell', which requires 'options' 2014-03-17 18:33:55 +01:00
Peter Simons
d17eb6576d haskell-haskell-names: update to version 0.3.3 2014-03-17 18:33:55 +01:00
Peter Simons
745a35c130 haskell-hlint: update to version 1.8.59 2014-03-17 18:33:55 +01:00
Peter Simons
8dfc2e1e4f haskell-th-desugar: update to version 1.3.0 2014-03-17 18:33:55 +01:00
Peter Simons
7548ed77fb haskell-tasty: update to version 0.8.0.2 2014-03-17 18:33:55 +01:00
Peter Simons
d56ff5cf60 haskell-tagged: update to version 0.7.1 2014-03-17 18:33:55 +01:00
Peter Simons
10fde8fe5c haskell-snap-core: update to version 0.9.6.1 2014-03-17 18:33:55 +01:00
Peter Simons
b9a837c26c haskell-sample-frame: update to version 0.0.3 2014-03-17 18:33:55 +01:00
Peter Simons
165ada34b9 haskell-numeric-prelude: update to version 0.4.1 2014-03-17 18:33:55 +01:00
Peter Simons
dbd61dbdae haskell-midi: update to version 0.2.1.1 2014-03-17 18:33:55 +01:00
Peter Simons
e31bd9e6ee haskell-ltk: update to version 0.13.1.0 2014-03-17 18:33:55 +01:00
Peter Simons
e63062ed9d haskell-linear: update to version 1.9.1 2014-03-17 18:33:55 +01:00