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
|
8fe0f0007b
|
Merge pull request #618 from orbitz/add-riak-1.3.1-fix-rebar-shebang
Fixes rebar shebang, also fixes source of leveldb zip to be the canonica...
|
2013-06-13 05:49:03 -07:00 |
|
Malcolm Matalka
|
ebaf0c01d3
|
Fixes rebar shebang, also fixes source of leveldb zip to be the canonical one from github
|
2013-06-13 14:45:41 +02:00 |
|
Michael Raskin
|
ed51d54610
|
Merge pull request #606 from fignuts/master
Add keepass password manager and update mono DLLMap.
|
2013-06-13 05:42:53 -07:00 |
|
Michael Raskin
|
27bbff463f
|
Merge pull request #601 from craff/ocaml/upgrade_and_new
Ocaml/upgrade and new
|
2013-06-13 05:41:59 -07: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 |
|
Jason "Don" O'Conal
|
6baad4d4d6
|
vim_configurable: fix compilation on darwin
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
|
2013-06-13 22:20:54 +10:00 |
|
Sander van der Burg
|
e5c7533b6c
|
titaniumsdk: Bump to version 3.1.1
|
2013-06-13 13:58:32 +02:00 |
|
Vladimír Čunát
|
ca67fccbfe
|
pyGtkGlade: fix eval
I didn't expect the file to be imported on two places.
|
2013-06-13 13:12:39 +02:00 |
|
Vladimír Čunát
|
84262c18e3
|
pygtk: propagate gtk (fixes solfege build)
|
2013-06-13 13:02:24 +02:00 |
|
Vladimír Čunát
|
3d1491c166
|
kde410.kdepimlibs: add pkgconfig
Accidentally noticed the request in logs.
|
2013-06-13 13:02:24 +02: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 |
|
Peter Simons
|
7b3ebfe8c5
|
haskell-haddock: add version 2.13.2.1
|
2013-06-13 10:43:35 +02:00 |
|
Mathijs Kwik
|
0813e7b748
|
firefox-21: make "use system cairo" optional, defaulting to false
|
2013-06-13 10:21:47 +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 |
|
Peter Simons
|
128166a1f0
|
Merge pull request #613 from errge/hflags
Add hflags
|
2013-06-12 23:30:04 -07:00 |
|
Peter Simons
|
740c2bdf47
|
Merge pull request #615 from lovek323/ghostscript
ghostscript: add libiconvOrEmpty to build inputs
|
2013-06-12 23:28:44 -07:00 |
|
Jason "Don" O'Conal
|
b31db11a69
|
ghostscript: add libiconvOrEmpty to build inputs
|
2013-06-13 15:52:55 +10:00 |
|
Jason "Don" O'Conal
|
6f50a9d4f0
|
sup: use libiconvOrEmpty instead of plain old libiconv
|
2013-06-13 14:21:20 +10:00 |
|
Jason "Don" O'Conal
|
b62aa175a2
|
gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc platforms)
|
2013-06-13 14:17: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 |
|
Jason "Don" O'Conal
|
ee00c7aa4e
|
Add gpgme build input for sup
|
2013-06-13 10:45:42 +10:00 |
|
Jason "Don" O'Conal
|
593228f18d
|
Compile libusb with gccApple on darwin
|
2013-06-13 10:42:38 +10:00 |
|
Jason "Don" O'Conal
|
4fe22e28cb
|
Add sup expression
|
2013-06-13 10:42:30 +10:00 |
|
Lluís Batlle i Rossell
|
4970ec637e
|
Adding psmouse-alps, a touchpad kernel driver.
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
|
2013-06-12 22:55:58 +02:00 |
|
Lluís Batlle i Rossell
|
ce9f40f5a7
|
gnunet-svn: updating to latest
|
2013-06-12 22:55:58 +02:00 |
|
Lluís Batlle i Rossell
|
f2256276af
|
irssi_otr: update to latest master
|
2013-06-12 22:55:57 +02:00 |
|
Gergely Risko
|
c51077b222
|
Add hflags
|
2013-06-12 21:25:53 +02:00 |
|
Eelco Dolstra
|
6dbb6f78bb
|
subversion: Update to 1.7.10
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
|
2013-06-12 15:56:40 +02:00 |
|
Lluís Batlle i Rossell
|
ceea8a18fc
|
weechat: update to 0.4.1
|
2013-06-12 14:19:00 +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 |
|
Domen Kozar
|
808cadd390
|
tesseract: simplify
|
2013-06-12 00:50:52 +02:00 |
|
Domen Kozar
|
1b64fc9360
|
tesseract: upgrade to 3.02.02 and add some languages
|
2013-06-11 19:22:30 +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 |
|
Vladimír Čunát
|
f724a5314b
|
flac: update, enable tests
Fix includes in VLC.
Tried a few other programs using it, seems fine.
|
2013-06-11 15:48:42 +02:00 |
|