1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

47598 commits

Author SHA1 Message Date
aszlig 213d11158f beets: Use audiotools backend for replaygain.
Using commands such as mp3gain and aacgain is only the default for
backwards-compatible reasons. However, on Nix(OS), we would have to
either patch those tools into beets or rely on an impurity, so let's
depend on audiotools and also default to that backend.

Of course, there is also a GStreamer backend, but it comes with a hell
of additional dependencies (which not only cover audio files), which is
why I decided against defaulting to GStreamer and package audiotools
instead (in eecd932).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:34 +01:00
aszlig 181f1395dd beets: Allow to configure plugin dependencies.
This also fleshes out/fixes the unit tests, which I've used for
gathering the individual requirements.

Along various Python dependencies we now also have a build-time
dependency on bashInteractive and a runtime dependency on
bashCompletion, which is needed for command line completion to work
correctly.

However, some tests for the shell completion fail at the moment, so I've
disabled them for now.

The patch for fixing mediafile codec info is a modified version of
sampsyo/beets@903e88a, where I just dropped the second hunk modifying
the changelog. It is already merged to master and thus expected to be in
the next upstream version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:34 +01:00
aszlig 4b58ebb356 beets: Switch to using fetchFromGitHub.
The reason for doing this is because the package on PyPI is missing some
files needed for running the test suite (for example:
test/test_completion.sh).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:33 +01:00
aszlig f8702f3207 python: Add new package audiotools.
This is needed for the replaygain plugin in beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:33 +01:00
aszlig dc243f9d30 python: Add new package discogs_client.
Needed in order to fetch Discogs album information in beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:33 +01:00
aszlig 51eacc8a96 python: Add pyacoustid and dependencies.
We're going to need this for fingerprinting support in beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:33 +01:00
aszlig e2166c3a1e python/mutagen: Update to upstream version 1.27.
Also now comes with a few more build dependencies in order to run tests,
which for this version now succeed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:33 +01:00
aszlig 13261b9e38 mp3gain: Fix output path bin directory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:33 +01:00
Moritz Ulrich 4433ebb552 Dwarf Fortress: Update to 0.40.23. 2015-01-01 15:45:33 +01:00
Eelco Dolstra bcf391a94d Disambiguate util-linux package names 2015-01-01 15:45:33 +01:00
Karn Kallio 330a4a28dd openjdk : Patch to extend valid currency change dates to 20 years. 2015-01-01 15:45:33 +01:00
koral 63a77f25d7 fast-export: update to last revision from upstream 2015-01-01 15:45:33 +01:00
Bjørn Forsman b9152bb714 xidel: new package
Command line tool to download and extract data from html/xml page.

http://videlibri.sourceforge.net/xidel.html
2015-01-01 15:45:32 +01:00
Oliver Charles 1bfd620a4d haskellPackages.netwire: Update to 5.0.1 2015-01-01 15:45:32 +01:00
Vladimír Čunát f113b49f72 telepathy-misson-control: minor update, disable upower
Disabling upower is probably just a temporary work around
the incompatibility with 0.99.*
2015-01-01 15:45:32 +01:00
Vladimír Čunát 96913a76f3 Revert "merge #5505: use /run/current-system/sw/bin/*"
I didn't realize it causes a nontrivial rebuild (through systemd).
I'll re-push to staging.

This reverts commit 8cf4ef7ab7.
2015-01-01 15:45:32 +01:00
Tobias Geerinckx-Rice 3d92b057f5 merge #5505: use /run/current-system/sw/bin/*
A working /sbin/shutdown (usually provided by systemd) is required by
"rtcwake -m off". Creating a circular dependency on systemd for this
just isn't worth the trouble, so take the straightforward way out.

One could easily make the argument that rtcwake wants to shut down the
*currently running system*, and that the correct API for that *is* in
fact /run/current-system. And it makes a very tempting sort of sense.

@vcunat moved to postPatch and added #FIXME.
2015-01-01 15:45:32 +01:00
William A. Kennington III fbac211a2c cyrus_sasl: Enable kerberos 2015-01-01 15:45:32 +01:00
William A. Kennington III 41a4f1fa3b krb5: 1.12.2 -> 1.13 2015-01-01 15:45:32 +01:00
William A. Kennington III 1444a6806e heimdal: Update build 2015-01-01 15:45:32 +01:00
William A. Kennington III 5fe743930a kerberos: Use default kerberos instead of krb5 2015-01-01 15:45:32 +01:00
William A. Kennington III 75bc862b39 pam_krb5: Keep kerberos instead of krb5 2015-01-01 15:45:32 +01:00
William A. Kennington III 3a409dc5d9 pam_krb5: 2.3.11 -> 2.4.9 2015-01-01 15:45:32 +01:00
aszlig 7350c57140 beets: Add myself to maintainers.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:32 +01:00
Tobias Geerinckx-Rice 56692eec7c Fix user-facing typos (mainly in descriptions) 2015-01-01 15:45:32 +01:00
aszlig ab5e2b46ab beets: Update to new upstream version 1.3.9.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:32 +01:00
aszlig 58cd4985fd beets: Move into its own package directory.
The primary use of beets is not as a Python library and users usually
would expect to install it into the env using "nix-env -i beets" rather
than "nix-env -i pythonX.Y-beets".

Having beets in its own package directory also allows for better
customization, where we're going to implement attributes that can be
used to turn on/off various features and plugins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-01 15:45:31 +01:00
koral fa4b210d3f webkitgtk: added optional geoclue2 dependency. 2015-01-01 15:45:31 +01:00
koral 01a48ead88 webkitgtk: 2.6.2 -> 2.6.4 2015-01-01 15:45:31 +01:00
Austin Seipp e420d371d1 nmap: fix dependencies on makeWrapper/python
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-01 15:45:31 +01:00
Ricardo M. Correia 24bb7dc46f rustcMaster: Update from 0.13.0-pre-2604-g2f3cff6 -> 0.13.0-pre-2763-g6366631 2015-01-01 15:45:31 +01:00
Vincent Laporte 0f05b01dce Adds ocaml-ojquery-0.1
jQuery Binding for Eliom

Homepage: http://ocsigen.org/ojquery/
2015-01-01 15:45:31 +01:00
Vincent Laporte 8f2588f0ce Adds ocaml-magick-0.34
This package aims to provide the ImageMagick methods to OCaml

Homepage: http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/
2015-01-01 15:45:31 +01:00
Vincent Laporte 4c4768c4b0 Adds ocaml-safepass-1.3
OCaml-safepass is a library offering facilities for the safe storage of
user passwords. By "safe" we mean that passwords are salted and hashed
using the Bcrypt algorithm. Salting prevents rainbow-table based
attacks, whereas hashing by a very time-consuming algorithm such as
Bcrypt renders brute-force password cracking impractical.

Homepage: http://ocaml-safepass.forge.ocamlcore.org/
2015-01-01 15:45:31 +01:00
Peter Simons e9eb8b491b haskell-sdl2: re-enable Haddock phase
GHC 7.8.4 fixed https://github.com/haskell-game/sdl2/issues/31.
2015-01-01 15:45:31 +01:00
Lluís Batlle i Rossell 3137a5ca48 Adding scantailor.
(cherry picked from commit 7eda68709e)
2015-01-01 15:45:31 +01:00
Austin Seipp 39e03699fe nixpkgs: afl-1.04b -> 1.06b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-01 15:45:31 +01:00
Austin Seipp 91f53545cc nixpkgs: p0f 3.07b -> 3.08b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-01 15:45:31 +01:00
Austin Seipp 6c952fd9e6 nixpkgs: nmap 6.40 -> 6.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-01 15:45:31 +01:00
Ricardo M. Correia 0a97acdc0f grsecurity: Update stable and test patches
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test:   3.0-3.17.7-201412211910  -> 3.0-3.18.1-201412281149
2015-01-01 15:45:31 +01:00
Matej Cotman 3c96afe0b1 etcd: upgrade server and ctl 2015-01-01 15:45:31 +01:00
Matthew William Cox 2028c283cd nixpkgs: unbound 1.4.22 -> 1.5.1 2015-01-01 15:45:31 +01:00
Jaka Hudoklin 1bdcf9a701 Add cadvisor 2015-01-01 15:45:30 +01:00
Eelco Dolstra 698b6f53df Typo 2015-01-01 15:45:30 +01:00
Eelco Dolstra 056ace5bca ntp: Don't depend on openssl, don't install docs 2015-01-01 15:45:30 +01:00
Tom Hunger c53b959c0e Update elm to 0.14.
Note that elm has a different package split: The old Elm 0.13 package
is now elm-compiler, elm-make and elm-package.

Instead of invoking "elm" one now has to use "elm-make".

I kept the 0.13 version of elm around in case someone depends
on it.
2015-01-01 15:45:30 +01:00
Thomas Tuegel 5d7dbaa0fe vcsh: add ttuegel as maintainer 2015-01-01 15:45:30 +01:00
Thomas Tuegel 75a5c8b84f vcsh: bump version to 1.20141026 2015-01-01 15:45:30 +01:00
Vincent Laporte 56d651d347 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
2015-01-01 15:45:30 +01:00
Alexander Kjeldaas f98df44ada Eradicate gzip -9 without -n 2015-01-01 15:45:30 +01:00
Vladimír Čunát 3b353824cc e19: enableParallelBuilding of some larger components
Some parts build too long, it seems to me, so I sped them up.
2015-01-01 15:45:30 +01:00
William A. Kennington III c34daa0b48 ipset: Add derivation 2015-01-01 15:45:29 +01:00
Matej Cotman d5457d7229 efl: fix build 2015-01-01 15:45:29 +01:00
Vladimír Čunát 12c51681d3 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.
2015-01-01 15:45:29 +01:00
Vladimír Čunát 591511c554 xfce4-session: support newer upower by an Arch patch
Tested.
2015-01-01 15:45:29 +01:00
Eduard Bachmakov 0771071cf9 Add photoqt-1.1.0.1
Also, add myself to maintainers.
2015-01-01 15:45:29 +01:00
Vladimír Čunát 1d7bdfac8e libcaca: add another mirror
The original does not work ATM.
2015-01-01 15:45:29 +01:00
Thomas Tuegel 53317799ec suitesparse: add version 4.4.1 2015-01-01 15:45:29 +01:00
Thomas Tuegel 84553e0aa0 arpack: build against atlasWithLapack 2015-01-01 15:45:29 +01:00
Thomas Tuegel 202acdbdaf arpack: version bump to 3.2.0 2015-01-01 15:45:29 +01:00
Thomas Tuegel 32ffad3e6b atlas: optionally build with full lapack 2015-01-01 15:45:29 +01:00
Thomas Tuegel 6e46a100b4 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.
2015-01-01 15:45:29 +01:00
Thomas Tuegel 9c67a3bc35 openblas: version bump to 0.2.13 2015-01-01 15:45:29 +01:00
Stewart Mackenzie 30e21cedae hammer: version bump 2015-01-01 15:45:29 +01:00
lostdj d85bbfcce4 SmartGitHg: update from 6.0.6 to 6.5.3. 2015-01-01 15:45:29 +01:00
codyopel 91531adb78 x265-hg: updated to latest commit, fixed package naming issue 2015-01-01 15:45:29 +01:00
Patrick Mahoney 06e523b7e8 Update skarnet.org software for 2.0 release.
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:

execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
2015-01-01 15:45:28 +01:00
Charles Strahan a0d62bf978 ghcjs: update to latest 2014-12-31 01:15:13 -05:00
Charles Strahan 76976398f8 ghcjs: fix whitespace 2014-12-31 00:06:20 -05:00
Charles Strahan df55381b65 ghcjs: restructure 2014-12-31 00:03:43 -05:00
koral e00e679d12 New haskell package: webkitgtk3 2014-12-30 21:32:09 +01:00
Domen Kožar 6dc71c19b0 Merge pull request #5480 from lostdj/ltp/upstream-master/smartgit653
SmartGitHg: update from 6.0.6 to 6.5.3.
2014-12-30 03:47:14 +01:00
Domen Kožar 503071b77f Merge pull request #5495 from mcox/unbound
nixpkgs: unbound 1.4.22 -> 1.5.1
2014-12-30 03:46:36 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
William A. Kennington III e62e634128 Merge pull request #5476 from codyopel/x265-update
x265-hg: updated to latest commit, fixed package naming issue
2014-12-29 20:33:24 -05:00
Austin Seipp c619e54e60 nmap: fix dependencies on makeWrapper/python
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-29 12:55:14 -06:00
Jaka Hudoklin 1b19b7a3bf Merge pull request #5491 from offlinehacker/cadvisor
Add cadvisor package and nixos module
2014-12-29 17:58:43 +01:00
Ricardo M. Correia 2386eff378 rustcMaster: Update from 0.13.0-pre-2604-g2f3cff6 -> 0.13.0-pre-2763-g6366631 2014-12-29 17:55:31 +01:00
Vincent Laporte a1822087e6 Adds ocaml-ojquery-0.1
jQuery Binding for Eliom

Homepage: http://ocsigen.org/ojquery/
2014-12-29 15:19:05 +01:00
Vincent Laporte 837b2abb2b Adds ocaml-magick-0.34
This package aims to provide the ImageMagick methods to OCaml

Homepage: http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/
2014-12-29 15:15:04 +01:00
Vincent Laporte 9fc35ed766 Adds ocaml-safepass-1.3
OCaml-safepass is a library offering facilities for the safe storage of
user passwords. By "safe" we mean that passwords are salted and hashed
using the Bcrypt algorithm. Salting prevents rainbow-table based
attacks, whereas hashing by a very time-consuming algorithm such as
Bcrypt renders brute-force password cracking impractical.

Homepage: http://ocaml-safepass.forge.ocamlcore.org/
2014-12-29 15:15:04 +01:00
Peter Simons 18d3da1a02 haskell-sdl2: re-enable Haddock phase
GHC 7.8.4 fixed https://github.com/haskell-game/sdl2/issues/31.
2014-12-29 12:24:16 +01:00
Lluís Batlle i Rossell b985a9e0a1 Adding scantailor.
(cherry picked from commit 7eda68709e)
2014-12-29 10:23:27 +01:00
Austin Seipp 2cabafd363 nixpkgs: afl-1.04b -> 1.06b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:45:25 -06:00
Austin Seipp bf5935e34c nixpkgs: p0f 3.07b -> 3.08b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:43:34 -06:00
Austin Seipp baa2e7326f nixpkgs: nmap 6.40 -> 6.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:41:54 -06:00
Ricardo M. Correia 1d44322d53 grsecurity: Update stable and test patches
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test:   3.0-3.17.7-201412211910  -> 3.0-3.18.1-201412281149
2014-12-29 03:00:47 +01:00
Matej Cotman d28c65ff05 etcd: upgrade server and ctl 2014-12-29 01:55:40 +01:00
Matthew William Cox 676c462faa nixpkgs: unbound 1.4.22 -> 1.5.1 2014-12-28 17:52:03 -05:00
Peter Simons fb3f5fc7db Merge pull request #5488 from teh/master
Update elm to 0.14.
2014-12-28 22:27:05 +01:00
Arseniy Seroka 42bb368025 Merge pull request #5481 from sjmackenzie/hammer
hammer: version bump
2014-12-28 23:36:38 +03:00
Jaka Hudoklin b232395a06 Add cadvisor 2014-12-28 20:20:38 +01:00
Eelco Dolstra a30869a525 Typo 2014-12-28 19:41:06 +01:00
Eelco Dolstra 782440310d ntp: Don't depend on openssl, don't install docs 2014-12-28 19:38:45 +01:00
Tom Hunger e67535cb1d Update elm to 0.14.
Note that elm has a different package split: The old Elm 0.13 package
is now elm-compiler, elm-make and elm-package.

Instead of invoking "elm" one now has to use "elm-make".

I kept the 0.13 version of elm around in case someone depends
on it.
2014-12-28 17:00:41 +00: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
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 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
Charles Strahan 289e33f852 ghcjs: don't use extension for haddock override 2014-12-27 23:10:07 -05:00
Charles Strahan 780ec20283 ghcjs: regenerate extension 2014-12-27 22:31:56 -05:00
Charles Strahan e92c65f37d ghcjs: remove commented-out buildLocalCabalWithArgs 2014-12-27 22:14:17 -05:00
Charles Strahan dd28f5ff0a ghcjs: remove (seemingly) unnecessary tfRandom workaround 2014-12-27 22:12:31 -05:00
Charles Strahan a8d78dffb0 ghcjs: don't use extension to set Cabal 2014-12-27 22:09:05 -05:00
Charles Strahan 94aa6539de remove ghcServer 2014-12-27 21:57:11 -05:00
Charles Strahan 7661626e21 ghcjs-dom: remove unused fetchgit 2014-12-27 21:54:41 -05:00
Charles Strahan 5288863ada webkit (haskell package): update to 0.13.1.1 2014-12-27 21:52:53 -05:00
Charles Strahan 0dabcc34c3 ghcjs-dom: clean up 2014-12-27 21:51:30 -05:00
Charles Strahan d05e237cb0 ghcjs-dom: use correct conf-flags and dependencies 2014-12-27 21:40:18 -05:00
Charles Strahan c05ec6104d ghcjs-dom: fix expression and update to version 0.1.1.3 2014-12-27 19:54:48 -05:00
Charles Strahan 83d58831bc ghcjs: update revisions 2014-12-27 19:51:21 -05:00
Charles Strahan dcee26642c ghcjs: remove commented-out ghcjs-prim 2014-12-27 18:53:23 -05:00
Charles Strahan bd6cbe73e4 ghcjs: remove duplicated lens expression 2014-12-27 18:51:43 -05:00
Charles Strahan 347a9674c1 ghcjs: cleanup 2014-12-27 18:48:12 -05:00
Charles Strahan f36fabb389 ghcjs: fix build 2014-12-27 16:51:39 -05: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
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
Stewart Mackenzie 247cc8b9ef hammer: version bump 2014-12-27 21:36:50 +08: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 ea540f8fc6)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-27 11:53:08 +01:00
lostdj cf8a716baa SmartGitHg: update from 6.0.6 to 6.5.3. 2014-12-27 11:28:38 +03: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
Pavan Rikhi b5ff6c2c62 mezzanine: add expression 2014-12-26 15:27:38 -05:00
Pavan Rikhi e41656f69c grappelli_safe: add expression 2014-12-26 15:27:38 -05:00
Pavan Rikhi 92e3549314 filebrowser_safe: add expression 2014-12-26 15:27:38 -05:00
Pavan Rikhi ef71298abb requests_oauthlib: v0.3.2 -> v0.4.1 2014-12-26 15:27:37 -05:00