Commit Graph

36395 Commits

Author SHA1 Message Date
Vladimír Čunát
6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Vladimír Čunát
50493458bd gnome3.gnome-menus: fix file path, add maintainer
Also some whitespace nitpicks.
2013-12-07 14:04:50 +01:00
Nixpkgs Monitor
1beca24707 sxiv: update from 1.1 to 1.1.1 2013-12-07 14:39:52 +02:00
Evgeny Egorochkin
8c5c4eab54 libgdiplus: fix build against giflib 5.* 2013-12-07 14:34:52 +02:00
Lluís Batlle i Rossell
e12695ba85 Fixing ultrastardx linking with lua.
Now it fails to start to me, due to some alsa problems.
2013-12-07 12:24:34 +01:00
Evgeny Egorochkin
1f5d28001e xplanet: fix build against giflib 5.* 2013-12-07 13:13:06 +02:00
Nixpkgs Monitor
2ce67ca947 giflib: update from 4.2.3 to 5.0.5 2013-12-07 13:13:06 +02:00
Nixpkgs Monitor
6b1a3bffd0 xplanet: update from 1.2.2 to 1.3.0 2013-12-07 13:13:06 +02:00
Bjørn Forsman
ca26e75a73 nixos/avahi-service: small documentation update 2013-12-07 12:03:50 +01:00
Michael Raskin
cf4b259770 Merge pull request #1339 from roelof1967/gnome-menus
new package : gnome-menus 3.x
2013-12-07 01:12:51 -08:00
Roelof Wobben
7f62dd42f3 give gnome-menus a better place 2013-12-07 10:09:25 +01:00
Michael Raskin
fa6e689dcb Use fresh libnl for ntrack 2013-12-07 12:36:31 +04:00
Michael Raskin
2afb58a8d5 Merge pull request #1316 from roelof1967/cinnamon-translations
new pakage:  Cinnamon translations
2013-12-07 00:13:24 -08:00
Michael Raskin
14a0050829 Merge pull request #1319 from wkennington/ntrack
Fix ntrack for latest libnl release
2013-12-07 00:12:46 -08:00
Michael Raskin
1ce105394b Merge pull request #1337 from codename68/master
Add ocaml packages for version 4.01.0
2013-12-07 00:04:49 -08:00
Michael Raskin
0c63a9283d Merge pull request #1338 from ktosiek/quassel
Rename quassel packages
2013-12-07 00:04:14 -08:00
William A. Kennington III
2079bfdc58 Fix ntrack for latest libnl release 2013-12-07 01:38:02 -06:00
Lluís Batlle i Rossell
142298495e Fixing the Ultrastardx build. Not tested if it works and how. 2013-12-07 00:07:35 +01:00
Lluís Batlle i Rossell
a520b9cfa0 Fix the ultrastardx makefile (the hard way). 2013-12-07 00:07:34 +01:00
Andrew Morsillo
3814415be4 Add robomongo, a GUI for exploring mongodb data and building queries. 2013-12-06 19:40:40 +01:00
Peter Simons
f0d3e92b33 atool: have Hydra build this tool only on Linux 2013-12-06 19:32:34 +01:00
Peter Simons
65d33fda95 aterm: mark version 2.8 as broken 2013-12-06 19:31:03 +01:00
Peter Simons
125bf9e488 aescrypt: limit meta.hydraPlatforms to Linux
Builds on other platforms such as FreeBSD fail.
2013-12-06 19:29:22 +01:00
Peter Simons
87e87bd56c alsa: set meta.platform for ALSA-related packages to Linux 2013-12-06 19:26:34 +01:00
Bjørn Forsman
ab98496d0b Revert "gpsd: update from 2.95 to 3.10"
This update broke gpsd because the download url changed and trying to
get version 3.10 from the old url returns an error document with a
timestamp resulting in new hashes on every build.

And more importantly, gpsd 3.10 switched to the scons build system, so
even if the download url was correct it will fail to build until the
expression is updated.

This reverts commit 3f1c26b825.
2013-12-06 19:03:43 +01:00
Nixpkgs Monitor
d643418edd wgetpaste: update from 2.20 to 2.23 2013-12-06 17:13:23 +02:00
David Cadé
ba2b36a1d7 Add ocaml packages for version 4.01.0 2013-12-06 15:16:58 +01:00
Shea Levy
5588f25a15 hg 2.8.1
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-06 08:34:44 -05:00
Peter Simons
46e1f71e2d haskell-defaults.nix: ghc-head builds 'cabal-install' using its internal version of Cabal, which is newer or equal to the latest release 2013-12-06 12:02:24 +01:00
Tomasz Kontusz
b4c5a6f15f Rename quassel packages 2013-12-05 23:56:11 +01:00
Vladimír Čunát
3d3b19d767 Merge #1325: linux-3.2 and grsecurity updates 2013-12-05 23:20:18 +01:00
Vladimír Čunát
7e9b24c8f1 cogl, clutter: update to 1.16.{0,2} 2013-12-05 22:52:29 +01:00
Michael Raskin
42d4c20710 Merge pull request #1333 from codename68/master
added OCaml package ocamlsdl
2013-12-05 09:29:07 -08:00
Moritz Ulrich
fc9772a270 openttd: update from 1.3.2 to 1.3.3 2013-12-05 16:21:28 +00:00
Shea Levy
bb9caf40dd Linux 3.12.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-05 10:21:06 -05:00
David Cadé
9bda7275ce added OCaml package ocamlsdl 2013-12-05 16:20:32 +01:00
Michael Raskin
010f535c27 Merge pull request #1331 from urv/master
fix: syntax error in networking/mumble
2013-12-05 06:24:07 -08:00
Michael Raskin
c60fe6b4e4 Merge pull request #1330 from grwlf/yandex-disk
yandex-disk: fix bash-completion, add long description
2013-12-05 06:23:47 -08:00
Arvin Moezzi
a286f65a93 fix: syntax error in networking/mumble 2013-12-05 14:47:54 +01:00
Sergey Mironov
82fefa0de8 yandex-disk: fix bash-completion, add long description
bashCompletion created 'have1' file in the current directory occasionally. this
patch fixes it.
2013-12-05 14:42:16 +04:00
Lluís Batlle i Rossell
e5b0867492 Updating zathura to 0.2.6 2013-12-05 10:44:49 +01:00
Roelof Wobben
3c1fb82718 added gnome-menus-3 2013-12-05 09:14:25 +01:00
Evgeny Egorochkin
610532ac6a Revert "fluidsynth: switch to cmake build system" which causes mpd and calf to fail to detect
fluidsynth.

This reverts commit cd16faa257.
2013-12-05 07:45:04 +02:00
Michael Raskin
990d9684a4 Merge pull request #1321 from wkennington/mumble
Break mumble into client and server components
2013-12-04 20:56:36 -08:00
Michael Raskin
8095dce441 Merge pull request #1327 from AndersonTorres/master
Adding Portuguese language dictionary for Aspell
2013-12-04 20:55:57 -08:00
Michael Raskin
a6087d9139 Merge pull request #1328 from lovek323/drush
drush: add expression
2013-12-04 20:54:52 -08:00
Jason "Don" O'Conal
1d7108d5f5 drush: add expression 2013-12-05 04:38:35 +00:00
AndersonTorres
9c60834b23 Adding support for Portuguese language for Aspell 2013-12-05 02:22:47 +01:00
Lluís Batlle i Rossell
ad90f2f0b8 Adding ffmpeg 2.x 2013-12-04 21:04:30 +01:00
Peter Simons
614544b439 haskell-src: clean out the obsolete happy parser that's included in the distribution tarball 2013-12-04 18:41:18 +01:00