Lluís Batlle i Rossell
7c74edc9bc
sipwitch: update to 1.6.1 to fix build
2013-06-29 15:30:05 +02:00
Lluís Batlle i Rossell
748a0f607b
Updating siproxd to 0.8.1, and libosip.
2013-06-29 15:14:02 +02:00
Bjørn Forsman
b02b7bd162
sqlite: set meta.platforms so that Hydra will build it
...
I'm sure that sqlite works on more platforms than linux, but I cannot
verify that myself (I only have linux). So I'll leave it up to the users
of other platforms to expand this as needed.
2013-06-29 13:36:08 +02:00
Vladimír Čunát
9404b2cc12
qt3: fix infinite recursion created by 0b17251c06
2013-06-28 08:33:43 +02:00
Mathijs Kwik
f7b3032da7
ffmpeg-1.x: passthrough vdpauSupport
2013-06-27 21:35:22 +02:00
Mathijs Kwik
e78b013fe3
libpng: merge apng expression (keep patch disabled by default)
...
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
2013-06-27 21:35:21 +02:00
Mathijs Kwik
0b17251c06
libpng: keep versioning in all-packages.nix, not in individual expressions
2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c
whitespace cleaning
2013-06-27 21:35:21 +02:00
Eelco Dolstra
989c58eb29
Process /etc/fonts/conf.d before upstream fonts/conf.d
...
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
2013-06-27 13:31:35 +02:00
Lluís Batlle i Rossell
5ff3d84137
Adding sflphone.
...
Merge branch 'sflphone'
2013-06-27 00:10:13 +02:00
Lluís Batlle i Rossell
d3e7649eee
Update ucommon to 6.0.5.
...
The hope that newer means better.
2013-06-26 23:47:34 +02:00
Lluís Batlle i Rossell
c77f6a0c2f
As libccrtp propagates ucommon, it's not needed in libzrtpcpp.
2013-06-26 23:47:09 +02:00
Lluís Batlle i Rossell
3d8cd48c58
Making ccrtp propagate its build time requirement, ucommon.
2013-06-26 23:46:47 +02:00
Evgeny Egorochkin
9dc3599960
Merge pull request #676 from errge/master
...
Add regex-tdfa-text
2013-06-25 05:17:34 -07:00
Eelco Dolstra
acba9240cd
nixos.org/tarballs -> tarballs.nixos.org
...
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Gergely Risko
9b2a657f42
Add regex-tdfa-text
2013-06-25 13:01:41 +02:00
aszlig
5228e569e8
gpgme: Update to latest upstream version 1.4.1.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:16 +02:00
Aristid Breitkreuz
ad06d4df18
update pulseaudio to 4.0 and sbc to 1.1
2013-06-22 17:25:47 +02:00
Peter Simons
933f77f10d
Merge pull request #662 from rnons/yesod-bin
...
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
2013-06-22 05:09:35 -07:00
Domen Kozar
dbe9bf7e59
networkmanagerapplet: 0.9.8.0 -> 0.9.8.2
...
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
2013-06-21 19:59:20 +02:00
rnons
f84119331c
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
2013-06-21 22:55:37 +08:00
aszlig
f974573a5e
iksemel: Add new package with version 1.4.
...
This library is used by Zabbix in order to send XMPP alerts/notifications.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
Peter Simons
8c2b28b4a6
haskell-mongoDB: update to version 1.4.1
2013-06-20 12:37:54 +02:00
Peter Simons
b2b6c81d4c
haskell-ghc-heap-view: update to version 0.5.1
2013-06-20 12:37:54 +02:00
Lluís Batlle i Rossell
5f28fb15af
Note about the source of previous build fix in glext85
2013-06-19 17:38:38 +02:00
Lluís Batlle i Rossell
d4aa6099bd
Fixing vaapi-vdpau build with newer mesa.
2013-06-19 17:33:44 +02:00
Peter Simons
962e2aede8
haskell-postgresql-simple: update to version 0.3.3.2
2013-06-19 10:42:43 +02:00
Peter Simons
c7097891e0
haskell-persistent-template: update to version 1.2.0.2
2013-06-19 10:42:43 +02:00
Peter Simons
f14d6839b1
haskell-hakyll: update to version 4.3.1.0
2013-06-19 10:42:43 +02:00
Peter Simons
5e5b04d00a
haskell-JuicyPixels: update to version 3.1
2013-06-19 10:42:43 +02:00
Peter Simons
7154e32f65
Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10.
2013-06-19 10:42:42 +02:00
Vladimír Čunát
4255b343e8
pango, gtk3: non-Linux attempts to fix
2013-06-19 09:00:06 +02:00
Evgeny Egorochkin
6b4eaf71fe
Merge pull request #636 from craff/glsurf
...
Glsurf (3D drawing of implicit surfaces and curves)
2013-06-18 22:34:08 -07:00
Oliver Charles
81b564b52e
haskellPackages: vector-0.9.1 fix 'primitive' dependency
2013-06-19 00:28:30 +01:00
Vladimír Čunát
e366dc565a
Fix the hash changes accidentally caused in 98436616
...
Moreover I'm not sure It's legal to add *lists inside* buildInputs.
2013-06-18 23:59:23 +02:00
Vladimír Čunát
1f81984293
non-Linux: more adjustments
...
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00
Vladimír Čunát
2058d95eb4
non-Linux platforms: extend to some important pkgs
2013-06-18 22:03:35 +02:00
Vladimír Čunát
3cba755596
qt48: minimize default dependencies on non-Linux
2013-06-18 22:03:35 +02:00
Sander van der Burg
98436616a5
Replaced ad-hoc gettext buildinput by libintlOrEmpty
2013-06-18 22:01:40 +02:00
Vladimír Čunát
92ecf99373
qt48, gstreamer: attempt to fix on non-Linux
2013-06-18 18:34:25 +02:00
Vladimír Čunát
ab7d7333be
dbus: attempt to fix build on FreeBSD and Darwin
...
Also build it there.
2013-06-18 17:52:09 +02:00
Vladimír Čunát
a8f153267c
qt48: security fix for CVE-2013-0254
...
Taken from Gentoo.
2013-06-18 13:57:15 +02:00
Vladimír Čunát
53fa11cfc9
poppler: attempt to fix missing libiconv on non-Linux
2013-06-18 12:53:19 +02:00
Sander van der Burg
23f43527e1
harfbuzz needs libintl on non glibc platforms
2013-06-18 10:36:28 +02:00
Jason \"Don\" O'Conal
85bfa943f7
glib: fix on darwin (merge #644 )
...
* include Foundation.h header
* add myself to maintainers
* build with gccApple
@vcunat: minor refactoring.
2013-06-18 08:17:36 +02:00
Vladimír Čunát
6bcf790d05
Merge branch 'master' into x-updates
2013-06-17 22:08:16 +02:00
Vladimír Čunát
afdc7fdfb6
fix evaluation on non-Linux, should fix tarball
2013-06-17 22:06:36 +02:00
Jason \"Don\" O'Conal
8ce7550a9f
cairo-1.12.2: fix pixman include path
2013-06-17 14:14:09 +02:00
Lluís Batlle i Rossell
2c71506929
nlopt: build octave plugins
2013-06-17 12:47:45 +02:00
Vladimír Čunát
cba6d9b11a
qt48: I give up, switching off parallel building
...
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
# (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# core
# dev.diff
# pkgs/applications/networking/browsers/firefox/cairo-test.patch
# pkgs/applications/video/flowblade/
# pkgs/desktops/gnome-3/core/dconf/
# pkgs/desktops/gnome-3/core/eog/
# pkgs/desktops/gnome-3/core/libsecret/
# pkgs/development/libraries/ncurses/builder.sh
# pkgs/servers/x11/xorg/download-cache/
# pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
Peter Simons
41a0ef966b
haskell-Chart: use the homepage URL specified in the cabal file
2013-06-17 09:57:37 +02:00
Gergely Risko
7a602e5f86
Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk
2013-06-17 09:53:28 +02:00
Christophe Raffalli
c205449003
upgraded freeglut to 2.8.1 (menu are broken in 2.8.0)
2013-06-16 22:33:41 +02:00
Vladimír Čunát
c72ed04892
Merge 'master' and 'stdenv-fixes' into x-updates
...
Final stabilization phase before merging into master.
Conflicts (glibc-2.13):
pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Michael Raskin
81b7f5fe63
Merge remote-tracking branch 'upstream/master' into x-updates
2013-06-15 17:15:32 +04:00
Mathijs Kwik
1f4c079bc3
Re-propagate libdrm
2013-06-15 17:15:07 +04:00
Peter Simons
9ce5dec479
cosmetic
2013-06-15 13:40:59 +02:00
Peter Simons
5a1e9a9cf2
haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4
2013-06-15 13:18:51 +02:00
Peter Simons
0ec9ca98a9
haskell-shake: update to version 0.10.5
2013-06-15 12:39:16 +02:00
Peter Simons
67fc03f1e4
haskell-accelerate: update to version 0.13.0.5
2013-06-15 12:39:16 +02:00
Peter Simons
41b4c3da48
haskell-accelerate-io: update to version 0.13.0.2
2013-06-15 12:39:16 +02:00
Peter Simons
ad8413ac0b
haskell-accelerate-cuda: update to version 0.13.0.3
2013-06-15 12:39:16 +02:00
Peter Simons
0f25c404bc
haskell-hashable: add version 1.2.0.10
2013-06-15 12:39:15 +02:00
Peter Simons
c0d78bf9a6
Merge pull request #621 from errge/xtest
...
Add haskell/xtest
2013-06-15 03:37:39 -07:00
Peter Simons
c7ee3ca11c
Merge pull request #622 from errge/hit
...
Add hit and (it's dependency,) bytedump
2013-06-15 03:37:12 -07:00
Peter Simons
c9192f5ed5
Merge pull request #624 from errge/template-default
...
Add template-default
2013-06-15 03:36:42 -07:00
Peter Simons
4399352078
Merge pull request #625 from errge/vector
...
Add vectorThUnbox
2013-06-15 03:34:13 -07:00
Mathijs Kwik
4d19da7e99
gtk-2: remove unneeded argument
2013-06-14 13:49:35 +02:00
Eelco Dolstra
672ae93687
jquery-ui: Update to 1.10.3
...
Also add a symlink jquery.js (jquery.min.js is gone).
2013-06-14 13:38:37 +02:00
Gergely Risko
fab2610bcf
Add vectorThUnbox
2013-06-14 13:09:11 +02:00
Gergely Risko
4d49435cf6
Add template-default
2013-06-14 13:04:40 +02:00
Gergely Risko
89f28c9923
Add hit and (it's dependency,) bytedump
2013-06-14 11:57:24 +02:00
Gergely Risko
efb46727cb
Add haskell/xtest
2013-06-14 11:35:52 +02:00
Michael Raskin
7093dd2c70
Some fixes
2013-06-14 07:46:33 +04:00
Michael Raskin
1a41887398
Fix a missing option declaration after merge
2013-06-14 00:11:34 +04:00
Michael Raskin
605c5a55a8
Merge branch 'x-updates-failed-merge-2013-06-13' into x-updates
2013-06-14 00:10:35 +04:00
Vladimír Čunát
94d8de2b99
dbus: fix build on non-Linux platforms
...
We do not want systemd there.
This should fix the tarball job systemd assertion problems.
2013-06-13 21:02:00 +02:00
Vladimír Čunát
84bf7818a4
dbus: minor update, fixing DOS CVE-2013-2168
...
I tried building some X apps, all seems fine.
2013-06-13 20:57:41 +02:00
Vladimír Čunát
fa6caedfea
qt48: hopefully a version that works for all possibilities
...
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
2013-06-13 19:18:34 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin
c7536d2fa6
Merge pull request #617 from lovek323/vim_configurable
...
Get vim_configurable compiling on darwin
2013-06-13 05:41:12 -07:00
Vladimír Čunát
34f152e0d3
qt48: hopefully a good fix for parallel builds, finally
...
It caused rare failures, mainly for Qt for creator build.
2013-06-13 13:02:23 +02:00
Peter Simons
21e1ec9079
haskell-hakyll: update to version 4.3.0.0
2013-06-13 10:43:40 +02:00
Peter Simons
01c57234db
haskell-concurrent-extra: update to version 0.7.0.6
2013-06-13 10:43:40 +02:00
Jason "Don" O'Conal
8232b0eef1
pango: add correct cairo include path
2013-06-13 18:11:36 +10:00
Jason "Don" O'Conal
dc0c630e54
gtk2: fix compilation on darwin
...
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
2013-06-13 18:10:53 +10:00
Vladimír Čunát
e931f3b935
libgcrypt: attempt to fix i686-freebsd builds, #616
...
It would probably be better to get newer "as" from somewhere, but I
don't see how.
2013-06-13 10:00:04 +02:00
Jason "Don" O'Conal
930b88c2a9
cairo: add correct include path for pixman.h
2013-06-13 16:47:29 +10:00
Jason "Don" O'Conal
d884c2b639
gdk-pixbuf: add libintlOrEmpty to build inputs
2013-06-13 16:36:47 +10:00
Peter Simons
71439b3e96
Merge pull request #610 from lovek323/sup
...
Add sup expression
2013-06-12 23:33:19 -07:00
Jason "Don" O'Conal
7e52e251e8
atk: add libintlOrEmpty as build input
2013-06-13 16:30:27 +10:00
Jason "Don" O'Conal
150a6a7063
Rename ruby gpgme gem to ruby-gpgme
2013-06-13 14:14:44 +10:00
Jason "Don" O'Conal
a5e65e66b1
sup: separate dependencies
...
create separate expressions for gems requiring native extensions to be
built:
* gpgme
* ncursesw_sup
* xapian_full_alaveteli
2013-06-13 10:45:51 +10:00
Gergely Risko
c51077b222
Add hflags
2013-06-12 21:25:53 +02:00
Song Wenwu
92ba0a0913
gtk+: enable NLS support (merge #611 )
...
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
2013-06-12 10:18:38 +02:00
Peter Simons
acc6039e2c
haskell-iteratee: jailbreak to fix build with recent versions of ListLike
2013-06-12 08:45:34 +02:00
Peter Simons
70b10b6267
haskell-snap-core: update to version 0.9.4.0
2013-06-12 08:45:34 +02:00
Peter Simons
0e169b92ec
haskell-persistent: update to version 1.2.0.2
2013-06-12 08:45:34 +02:00
Peter Simons
a7c884eb18
haskell-acid-state: update to version 0.10.0
2013-06-12 08:45:34 +02:00
Peter Simons
fd1291e985
haskell-ListLike: update to version 4.0.0
2013-06-12 08:45:34 +02:00
Peter Simons
97f45745bd
haskell-Agda: update to version 2.3.2.1
2013-06-12 08:45:33 +02:00
Vladimír Čunát
6b433019fa
libvpx: update
...
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
2013-06-11 18:03:48 +02:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Michael Raskin
55249de924
Update Julia to today's revision
2013-06-11 15:44:56 +04:00
Peter Simons
1db5bd4aa9
haskell-hsdns: update to version 1.6.1
2013-06-11 13:14:28 +02:00
Peter Simons
03a65dbb11
haskell-ghc-vis: update to version 0.7.1
2013-06-10 11:26:50 +02:00
Peter Simons
d829182009
haskell-entropy: update to version 0.2.2.1
2013-06-10 11:26:50 +02:00
Peter Simons
977aaa93f9
haskell-contravariant: update to version 0.4.1
2013-06-10 11:26:50 +02:00
Peter Simons
6a7672d511
haskell-accelerate: update to version 0.13.0.4
2013-06-10 11:26:50 +02:00
Vladimír Čunát
f06f6955bd
qt4: fix build via adding dependency in generated makefile
...
Also reorder attributes into the order in which they are run.
2013-06-10 09:35:35 +02:00
Vladimír Čunát
ce50fe26cb
libgsf: maintenance update, use gdk_pixbuf now
2013-06-10 09:35:35 +02:00
Mathijs Kwik
02b539ef47
add hsshellscript
2013-06-10 08:36:05 +02:00
Michael Raskin
8271de6727
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Peter Simons
cc6dc84603
Merge pull request #604 from iyzsong/renpy
...
Add Ren'Py visual novel engine
2013-06-09 02:10:21 -07:00
Peter Simons
49f1160f6d
haskell-yesod: update to version 1.2.1
2013-06-09 10:47:15 +02:00
Peter Simons
e09f13c188
haskell-yesod-routes: update to version 1.2.0.1
2013-06-09 10:47:15 +02:00
Peter Simons
f702007252
haskell-yesod-platform: update to version 1.2.1
2013-06-09 10:47:15 +02:00
Peter Simons
1467b3bb07
haskell-yesod-persistent: update to version 1.2.1
2013-06-09 10:47:14 +02:00
Peter Simons
b033cdc96e
haskell-yesod-core: update to version 1.2.2
2013-06-09 10:47:14 +02:00
Peter Simons
57fbccae65
haskell-postgresql-simple: update to version 0.3.3.1
2013-06-09 10:47:14 +02:00
Peter Simons
ed3ef0959c
haskell-pipes-concurrency: update to version 1.2.0
2013-06-09 10:47:14 +02:00
Peter Simons
bf46a57a84
haskell-monadcryptorandom: update to version 0.5.2
2013-06-09 10:47:14 +02:00
Peter Simons
827541c00b
haskell-fingertree: update to version 0.1.0.0
2013-06-09 10:47:14 +02:00
Peter Simons
2535b7e5e1
haskell-classy-prelude: update to version 0.5.8
2013-06-09 10:47:14 +02:00
Peter Simons
221648a586
haskell-accelerate: update to version 0.13.0.2
2013-06-09 10:47:14 +02:00
Peter Simons
5aeffdbab3
haskell-accelerate-cuda: update to version 0.13.0.2
2013-06-09 10:47:14 +02:00
Evgeny Egorochkin
dc54358ce9
Change package versions to conform to nixpkgs conventions.
2013-06-09 05:41:44 +03:00
Song Wenwu
e094ccc10c
glew: install libraries to $out/lib instead of $out/lib64
2013-06-09 08:33:34 +08:00
Vladimír Čunát
7db886fdb9
Merge remote-tracking branch 'hydra/master' into x-updates
...
Conflicts (taken from @7c6f434c):
pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Vladimír Čunát
8c4a613f3a
Merge pull request #599 from jcumming/gphoto2.130607
...
(lib)gphoto2: update to 2.5.2
2013-06-08 08:20:28 -07:00
Michael Raskin
a3187cbba2
Update libgphoto2 - fix gphotofs
2013-06-08 16:51:43 +04:00
Peter Simons
c9208b9a23
haskell-bmp: update to version 1.2.5.2
2013-06-07 23:25:28 +02:00
Jack Cummings
b0cef0b6b8
gphoto2-2.5.2 and libgphoto2-2.5.2
2013-06-07 10:58:39 -07:00
Domen Kozar
d4a2a56f3e
gnutls: use lzma version of tarball
2013-06-07 13:39:49 +02:00
Evgeny Egorochkin
9c6f7cc9c1
Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.
2013-06-07 03:15:45 +03:00
Eelco Dolstra
4bd57f56a1
nspr: Update to 4.10
2013-06-06 13:04:26 +02:00
Peter Simons
243a51b82d
heimdal: cosmetic to make syntax highlightig happy
2013-06-06 10:48:58 +02:00
Peter Simons
c65a3e198c
heimdal: remove obsolete 1.3.x version
2013-06-06 10:48:58 +02:00
Christophe Raffalli
55a8c050db
Added heimdal 1.5.2, keeping version 1.3.3
2013-06-06 10:48:58 +02:00
Mathijs Kwik
0bcd97bb0b
popplerQt4: force linking to poppler_glib
...
to fix:
ldd /nix/store/...poppler-qt4-0.22.3/lib/libpoppler-qt4.so
libpoppler.so.36 => not found
2013-06-06 09:13:44 +02:00
Mathijs Kwik
7717bc1573
vaapi-intel: fix compilation
2013-06-06 09:13:43 +02:00
Mathijs Kwik
c78ba70c2f
mesa: propagate libraries
...
- fixes libreoffice -
2013-06-05 22:57:18 +02:00
Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons
6cacb34fec
haskell-bmp: jailbreak version 1.2.5.1 to support binary 0.7.x
2013-06-05 12:17:36 +02:00
Peter Simons
9d8dbacd99
haskell-mongoDB: update to version 1.4.0
2013-06-05 12:17:36 +02:00
Peter Simons
690cefa2b7
haskell-lifted-base: update to version 0.2.1.0
2013-06-05 12:17:36 +02:00
Peter Simons
9b79169e46
haskell-hledger: update to version 0.21.2
2013-06-05 12:17:36 +02:00
Peter Simons
fb11741df6
haskell-hledger-web: update to version 0.21.2
2013-06-05 12:17:36 +02:00
Peter Simons
98d0b364be
haskell-hledger-lib: update to version 0.21.2
2013-06-05 12:17:36 +02:00
Peter Simons
773fc7e9be
haskell-file-embed: update to version 0.0.4.8
2013-06-05 12:17:36 +02:00