Commit Graph

44859 Commits

Author SHA1 Message Date
third3ye
9c83a6bc76 Minor logic fix
music_directory     "${cfg.musicDirectory}"
playlist_directory  "${cfg.dataDir}/playlists"
db_file             "${cfg.dataDir}/tag_cache"
state_file          "${cfg.dataDir}/state"
sticker_file        "${cfg.dataDir}/sticker.sql"

all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/". 

Parsing for instance ${cfg.datadir}/playlists results in:
/var/lib/mpd//playlists - NOT FOUND.
2014-06-17 03:24:39 +00:00
John Wiegley
6025caa92b Merge pull request #2972 from proger/rsync-patch-hash
rsync: sha256 for the patch was updated
2014-06-16 15:42:44 -07:00
John Wiegley
61e8fe50c2 Agda: add 2.4.0.1, 2.3.2.2 is still the default for now 2014-06-16 14:03:17 -07:00
John Wiegley
39dfef4af0 haskell-boxes: new expression 2014-06-16 14:03:17 -07:00
John Wiegley
20f31b66a2 haskell-free-operational: new expression 2014-06-16 14:03:17 -07:00
John Wiegley
7a45ef7e25 haskell-equivalence: new expression 2014-06-16 14:03:17 -07:00
John Wiegley
cd3798c266 haskell-STMonadTrans: new expression 2014-06-16 14:03:17 -07:00
Mateusz Kowalczyk
43c6bfc0c9 mpd: clean up some flags
Some changed, some are no longer used.
2014-06-16 22:50:14 +02:00
Mateusz Kowalczyk
8f5f9f6c6b libid3tag: apply fixes before build
Amongst other things, this stops things like mpd spinning up to full
memory when updating the database.
2014-06-16 22:50:14 +02:00
Vladimir Kirillov
2dfb036a30 rsync: sha256 for the patch was updated 2014-06-16 23:20:24 +03:00
Austin Seipp
c585786c1f Merge pull request #2970 from tailhook/nanomsg_and_zeromq
Upgrade zeromq and nanomsg
2014-06-16 15:03:25 -05:00
Paul Colomiets
6b27a2789e Upgrade zeromq and nanomsg 2014-06-16 22:25:56 +03:00
Eelco Dolstra
9ae3654fd6 Fix generation of synergy-{client,server} when disabled 2014-06-16 10:45:09 -04:00
Shea Levy
52aa2afdcd nixUnstable: bump 2014-06-16 10:44:02 -04:00
Peter Simons
0f9b3ef24a hscolour-bootstrap: GHC 6.10.x and earlier don't support the -rtsopts option 2014-06-16 16:28:39 +02:00
Peter Simons
c5b7e2a2f2 haskell-git-annex: update to version 5.20140613 2014-06-16 16:12:36 +02:00
Peter Simons
fa8f2ca300 hscolour-bootstrap: allow setting RTS options for the hscolour binary we use to generate our documentation
Other tools like hsc2hs or haddock allows this, too, and some tools explicitly
set memory limits on these tools during the build (i.e. llvm-general-pure) by
exposing a GHCRTS environment variable. See [1] for a concrete example of this
issue.

[1] https://github.com/NixOS/nixpkgs/issues/2939
2014-06-16 15:38:38 +02:00
Peter Simons
a83aa733c3 Merge pull request #2967 from sol/master
Update haskell-http-kit and haskell-aeson-qq
2014-06-16 15:15:09 +02:00
Simon Hengel
78c0b2fca6 Update haskell-aeson-qq to version 0.7.2 2014-06-16 20:12:05 +08:00
Simon Hengel
5434317aac Update haskell-http-kit to version 0.5.0 2014-06-16 19:18:08 +08:00
Vladimír Čunát
1b78ca58bc Merge #2798: stdenv and a few other big updates
Stdenv-changing things:
    - gcc 4.8.2 -> 4.8.3
    - long-running grsecurity branch
Others:
    - pkgconfig update
    - CVE for libtasn1, dbus

Conflicts (simple):
    pkgs/development/compilers/ghc/7.6.3.nix
2014-06-16 10:23:36 +02:00
Shea Levy
5e16c9428b Merge pull request #2962 from fmapfmapfmap/hxt-tagsoup
New derivation: hxt-tagsoup #haskell
2014-06-16 02:08:16 -04:00
vi
fd08da1116 New derivation: hxt-tagsoup #haskell 2014-06-16 13:32:24 +08:00
Austin Seipp
5f960cc893 Merge pull request #2934 from CodeBlock/spawn-fcgi-update
update spawn-fcgi to 1.6.4
2014-06-15 19:02:25 -05:00
Austin Seipp
f0fc62d6a6 Merge pull request #2956 from Fuuzetsu/rtorrent
rtorrent
2014-06-15 19:01:50 -05:00
Mateusz Kowalczyk
8ae9d533b7 rtorrent: update to 0.9.4 2014-06-16 01:05:22 +02:00
Mateusz Kowalczyk
d97d34398c libtorrent: update to 0.13.4 2014-06-16 01:05:11 +02:00
ambrop7@gmail.com
576fa310b2 Warzone2100: Update to 3.1.1.
Changed to use openal-soft, which makes sound work,
in combination with https://github.com/NixOS/nixpkgs/pull/2947 .

Added optional installation of campaign videos, not enabled by default.
2014-06-15 23:38:01 +02:00
Mateusz Kowalczyk
b5ca04f4a8 nitrogen: patchShebangs instead of patchfile + /usr/bin/env
This hopefully fixes the build on Hydra.
2014-06-15 23:34:20 +02:00
Anders Claesson
05402bc7c8 tree: update to version 1.7.0 2014-06-15 23:31:39 +02:00
ambrop7@gmail.com
bf0bacdbf8 openal-soft: Add PulseAudio backend, make non-OSS backends work.
* Added PulseAudio backend support.
* Made ALSA and PulseAudio backends optional.
* Made ALSA and PulseAudio backends actually work by adding to
  NIX_LDFLAGS (because package uses dlopen).

TEST: Tested all 3 backends (OSS, ALSA, PulseAudio) using openal-info
and my upcoming Warzone 2100 update, by selecting the backend in
.alsoftrc. It also works without .alsoftrc (I think it first tries pulse
then alsa then oss).
2014-06-15 23:28:54 +02:00
vi
82cbbb1759 Added CPAN's Crypt::OpenSSL::Bignum. 2014-06-15 23:23:26 +02:00
vi
174f1dac9e Added CPAN's Crypt::DH, and its dependencies. 2014-06-15 23:23:26 +02:00
vi
f6b2155ef4 Added CPAN's Crypt::Blowfish. 2014-06-15 23:23:25 +02:00
Vladimír Čunát
1200a1ecf3 fixup the previous: got renamed to sessionVariables
I'm sorry; I didn't notice Eelco renamed the option.
My dry-run didn't catch that one with nvidia driver, no idea why.
2014-06-15 20:28:30 +02:00
Vladimír Čunát
de783277da nixos/opengl: add LD_LIBRARY_PATH to systemVariables instead
so all users get this variable, thanks to work from #2692.
2014-06-15 19:18:16 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
cillianderoiste
43a77448f8 Merge pull request #2940 from deepfire/xtrace
xtrace:  fix build and update to 1.3.1
2014-06-15 17:45:32 +02:00
Peter Simons
132309de52 scala: cosmetic fix for syntax highlighting in Emacs 2014-06-15 17:12:14 +02:00
Shea Levy
7a0c66c829 Merge branch 'master' of git://github.com/soenkehahn/nixpkgs
packaging hp2any-manager and dependencies
2014-06-15 11:00:40 -04:00
Domen Kožar
0d71d2b631 fixes #2926 2014-06-15 16:05:18 +02:00
Bjørn Forsman
7911072947 sweethome3d: remove '.' at end of description 2014-06-15 13:49:55 +02:00
Edward Tjörnhammar
97f45b1e11 Adding SweetHome3D, TexturesLibraryEditor, FurnitureLibraryEditor 2014-06-15 13:04:59 +02:00
Kosyrev Serge
eda6fd83a8 xtrace: fix build and update to 1.3.1
Alioth now requires a login before you can download tarballs.
2014-06-15 14:10:35 +04:00
cillianderoiste
658d1f656a Merge pull request #2945 from deepfire/e17-terminology
e17.terminology:  0.4.0 -> 0.5.1
2014-06-15 11:53:32 +02:00
Kosyrev Serge
c022486b5f e17.terminology: 0.4.0 -> 0.5.1 2014-06-15 09:26:01 +04:00
Shea Levy
c0cdfccaf8 Merge pull request #2942 from sol/master
Update haskell-hspec2 to version 0.3.4
2014-06-14 22:02:39 -04:00
Simon Hengel
d2eaca9c80 Update haskell-hspec2 to version 0.3.4 2014-06-15 08:47:14 +08:00
Bjørn Forsman
06af50ff42 liboping: new package
liboping is a C library to generate ICMP echo requests, better known as
"ping packets". It is intended for use in network monitoring
applications or applications that would otherwise need to fork ping(1)
frequently.

http://verplant.org/liboping/
2014-06-15 00:42:40 +02:00
Bjørn Forsman
cb64b3d758 libmodbus: new package
libmodbus is a library to send/receive data according to the Modbus
protocol.

http://libmodbus.org/
2014-06-14 21:50:57 +02:00