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
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
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
Mathijs Kwik
0813e7b748
firefox-21: make "use system cairo" optional, defaulting to false
2013-06-13 10:21:47 +02: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
6f50a9d4f0
sup: use libiconvOrEmpty instead of plain old libiconv
2013-06-13 14:21:20 +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
4fe22e28cb
Add sup expression
2013-06-13 10:42:30 +10: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
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
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
Mathijs Kwik
c1bec6fb5b
firefox-21: use more system libraries
...
Conflicts:
pkgs/applications/networking/browsers/firefox/21.0.nix
2013-06-11 14:05:15 +02:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Mathijs Kwik
1fb979b4f5
firefox-21: fix search box not working when built on xulrunner
2013-06-11 09:32:39 +02:00
Mathijs Kwik
ad5970b680
firefox-21: fix building with system cairo
2013-06-11 09:32:38 +02:00
Michael Raskin
46cd2d0d68
Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins
...
vim: supporting multiple sources & complicated plugins
2013-06-10 23:06:56 -07:00
Mathijs Kwik
9aa7f55017
firefox: use system jpeg library
2013-06-10 09:04:07 +02:00
Mathijs Kwik
5fb93bd27e
firefox: enable the (enabled by default) elf hack
...
It's supposed to speed things up but had some troubles in the past
that seem to have been fixed
2013-06-10 08:58:54 +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
Andrew Morsillo
e1bd332758
Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass).
2013-06-09 23:17:09 +02:00
Evgeny Egorochkin
c96c105c5c
Merge pull request #600 from bencahill/master
...
Add pianobar, a command-line Pandora client
2013-06-08 14:36:39 -07:00
Peter Simons
3c05bb799f
Merge pull request #603 from craff/emacs-mode/tuareg+update
...
Added tuareg emacs mode and fixed some other emacs mode.
2013-06-08 14:21:44 -07:00
Benjamin Cahill
9350c1d5ce
pianobar: Change license and clean up code
...
The license was set to unfree so that Hydra doesn't build it; this is
for potential problems arising from the Pandora TOS.
2013-06-08 14:13:36 -05: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
Jack Cummings
bbbf625b7d
Cherry-picking gphoto update by Jack Cummings, too
2013-06-08 19:32:52 +04:00
Christophe Raffalli
a69cd62f71
Added tuareg emacs mode and fixed some other emacs mode.
...
ecb emacs mode is commented out because it's dependency appears not to compile.
2013-06-08 12:42:46 +02:00
Benjamin Cahill
00e720471b
Add pianobar, a command-line Pandora client
2013-06-07 20:52:34 -05:00
Jack Cummings
b0cef0b6b8
gphoto2-2.5.2 and libgphoto2-2.5.2
2013-06-07 10:58:39 -07:00
aszlig
62176d3b4e
chromium: Update stable and beta channels.
...
These new versions are introduced with this commit:
stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta: 27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)
Unfortunately the tarball for the dev version 29.0.1530.2 isn't available at the
moment, so we're going to update it later.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-07 14:39:00 +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
Lluís Batlle i Rossell
fad6bc90b3
Adding ZNC, irc bouncer.
2013-06-06 23:08:59 +02:00
Eelco Dolstra
ebe6b96698
firefox: Update to 21.0
...
Only problem was that the chrome resources were not in the right place
(and you only see that by running with the -jsconsole flag).
2013-06-06 13:07:54 +02:00
Eelco Dolstra
34dbf4face
Remove Firefox 19
2013-06-06 11:59:05 +02:00
Christophe Raffalli
a7b8017583
Added imapfilter
2013-06-06 10:48:57 +02:00
Mathijs Kwik
a479aafb75
Revert "Fixing LibreOffice configure for now"
...
This reverts commit 9e4bee5270
.
2013-06-05 22:51:21 +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
14ecb17f61
haskell-xmobar: update to version 0.18
2013-06-05 12:17:35 +02:00
Vladimír Čunát
341aadaba1
kdenlive+mlt: enabling some subcomponents, parallel builds
2013-06-05 00:30:44 +02:00
Michael Raskin
9e4bee5270
Fixing LibreOffice configure for now
2013-06-04 20:00:13 +04:00
Vladimír Čunát
7cfdfda910
audacity: minor update, prefer system-wide libs
...
- Using system-wide libs where we have them (except for portaudio, which
I couldn't make work).
- Add the soxr library (now the preferred way of audio resampling).
2013-06-04 11:37:43 +02:00
Evgeny Egorochkin
8d167adaf4
Merge pull request #551 from MarcWeber/submit/alchemy
...
adding alchemy painting application
2013-06-03 15:45:12 -07:00
Peter Simons
7b21e19a82
git-annex: generate build instructions with cabal2nix
2013-06-03 22:09:34 +02:00
Peter Simons
823765e305
haskell-mode: update to current version from git
2013-06-03 10:51:27 +02:00