mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Code Issues Wiki Activity
38576 commits 191 branches 125 tags 8.1 GiB
Commit graph

848 commits

Author SHA1 Message Date
Peter Simons 14ecb17f61 haskell-xmobar: update to version 0.18 2013-06-05 12:17:35 +02: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
Peter Simons 5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +02:00
Gergely Risko 02c1dd624f Add vanitygen 2013-05-30 12:41:29 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Peter Simons 93d7adcba3 Merge pull request #561 from offlinehacker/st 
st: Update to 0.4.1 and add support for custom config
 2013-05-29 02:16:56 -07:00
Jaka Hudoklin 431fc8b250 st: Update to 0.4.1 and add support for custom config 2013-05-26 12:18:45 +00:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Peter Simons d35466a1f5 Re-generate Haskell expressions with Hackage4Nix. 2013-05-18 19:32:44 +02:00
Petr Rockai 8151d9594b Add "arbtt" along with its Haskell dependencies. 2013-05-18 13:35:13 +02:00
Lluís Batlle i Rossell d8f9f47e56 Updating xfe (1.34) and fox (1.6.48) 2013-05-17 16:32:25 +02:00
Lluís Batlle i Rossell 6a4350b68f Making xfe find and load icons fine 
I added more dependencies to fox, for that.
I tried to add mesa too, but it wasn't trivial for it to find it, so
I took it out.
 2013-05-16 23:40:26 +02:00
Domen Kozar 6c56602e55 dunst: upgrade, set maintainers, set default config file 2013-05-13 18:48:42 +02:00
Lluís Batlle i Rossell 3810378b79 blender: update to 2.67 2013-05-13 10:03:33 +02:00
Vladimír Čunát 82f5dc59cf lyx: maintenance update, enable check phase 2013-05-13 00:07:15 +02:00
Peter Simons 3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages. 
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
 2013-05-11 00:36:59 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Lluís Batlle i Rossell e64b223c8b freicoin: update to 0.0.2 2013-05-08 22:51:39 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Evgeny Egorochkin b0ad529987 K3b: fix to make it build for KDE4.10. 2013-05-07 11:26:37 +03:00
Peter Simons 15716e3659 haskell-xmobar: update to version 0.17 2013-05-05 23:11:23 +02:00
modulistic 185d102b66 pstree: version bump from 2.33 to 2.36 2013-05-05 21:45:06 +02:00
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates 
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
 2013-05-04 18:28:48 -04:00
Vladimír Čunát 8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Peter Simons d2b9e65019 Merge pull request #491 from ierton/zathura-fix-file 
zathura: fix missing [/bin/]file issue
 2013-04-26 10:14:07 -07:00
Sergey Mironov 492645a347 zathura: fix missing [/bin/]file issue 2013-04-26 15:24:16 +04:00
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Peter Simons 2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Vladimír Čunát 7a25aa94cd gphoto*: update for changed libgphoto version 2013-04-20 12:44:05 +02:00
Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
 2013-04-19 11:48:11 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
aszlig dcff78f580
taskwarrior: Update to version 2.2.0. 
This update roughly includes the following changes:

 * Spanish es-ES translation
 * New configuration option: print.empty.columns
 * Much improved Asian character support
 * More virtual tags
 * Improved bash completion
 * Task modification time
 * Stats show blocked and blocking tasks
 * New 'blocking' report
 * Additional color rules
 * New helper commands for third-party tools
 * 'columns' command searchable
 * New date shortcuts 'socm' and 'eocm'
 * Improved push/pull messages

For a full list of changes, please head over to:

http://taskwarrior.org/projects/taskwarrior/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-04-08 08:51:46 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Peter Simons 62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Peter Simons f3a16d0dd5 update meta.maintainers section 2013-04-01 18:44:33 +02:00
Peter Simons 64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Moritz Ulrich 72a724c0d2 New: yeganesh, a small wrapper around dmenu. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-04-01 12:13:01 +02:00
Domen Kožar c2b44a8da0 Merge pull request #418 from bjornfor/pitz 
pitz: new package
 2013-03-28 09:39:53 -07:00
Bjørn Forsman 4b1042cf02 pitz: new package 
pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/

pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.

TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:

  from IPython.Shell import IPShellEmbed
  ImportError: No module named Shell

A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.

There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
 2013-03-28 17:25:42 +01:00
Peter Simons fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +01:00
Domen Kozar 229616de83 set platforms and correct license to synergy 2013-03-28 13:24:37 +01:00
Cillian de Róiste 49b23b29dd Blender: Tidy up, sort inputs, remove unused OPENJPEG option 2013-03-28 01:00:22 +01:00
Cillian de Róiste ca2a39757c Blender: enable extra features in the Video Sequence Editor 
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
 2013-03-28 00:52:08 +01:00
Cillian de Róiste 64bc336f50 Blender 2.66 WIP 2013-03-27 22:25:33 +01:00
Paolo Capriotti 1ff424afaf Update bitcoin-qt to 0.8.1 2013-03-25 13:50:32 +00:00
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
 2013-03-25 13:43:45 +01:00
Moritz Ulrich c4ffd2cac9 dunst: Add meta.platforms. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-22 13:00:49 +01:00
Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Vladimír Čunát d210a4a8fa goldendict: fix build with gcc47 2013-03-21 00:08:24 +01:00
Moritz Ulrich c2d3d24349 Add dunst, a lightweight notification daemon. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-20 21:35:13 +01:00
Peter Simons 4fcb4a1ca1 gv: update to version 3.7.4 2013-03-18 11:36:16 +01:00
Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +01:00
Vladimír Čunát 9ac8a16277 vimprobable2, surf: fix the settings-schemas problem 
Note that they still segfault.
 2013-03-14 16:01:53 +01:00
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Shea Levy e07a7e6156 Merge branch 'master' of git://github.com/fignuts/nixpkgs 
This updates mysql-workbench. Didn't compile before, compiles now.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:01:04 -05:00
Peter Simons d96af07c9f xmobar: patch to support <freeratio> variable in memory monitor 2013-03-08 13:37:58 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Andrew Morsillo 7d4d40e82b Update mysql workbench version 2013-03-06 20:08:30 +01:00
Vladimír Čunát e6143c35e2 Merge pull request #344 from ierton/zathura-improve 
zathura: fix manpages, include .desktop icon
 2013-03-03 05:21:03 -08:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Jordi cf8d64b458 New wraper for surf 2013-03-01 19:53:42 +01:00
Jordi 0d6f6e6d37 Wraper with glib_network 2013-03-01 19:31:00 +01:00
Vladimír Čunát a606eab76e tangogps: fix bad includes 2013-02-28 14:07:50 +01:00
Sergey Mironov 061627feed zathura: fix man pages; include .desktop icon 2013-02-28 12:08:36 +04:00
Sergey Mironov 7cd4a5b0a1 zathura: set myself as a maintainer 
Conflicts:
	pkgs/applications/misc/zathura/default.nix
 2013-02-28 12:07:46 +04:00
Lluís Batlle i Rossell a5192222e9 surf: updating to 0.6 
it didn't work since the libsoup update, and now it doesn't work either.
Let's see after fixing libsoup.
 2013-02-25 21:08:16 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Peter Simons ce9500ea1d grip: update to version 3.3.1 2013-02-23 20:44:23 +01:00
Rok Garbas 5077600d9a zathura: update to 0.2.2 (also plugins), added correct license and myself as maintainer 2013-02-23 11:39:32 +01:00
Rok Garbas e4236f1ade girara: update to 0.1.5, correct license and add myself as maintainer 2013-02-23 11:38:30 +01:00
Vladimír Čunát dd4a846b0f update evince, seems to work now 2013-02-21 21:19:50 +01:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
 2013-02-21 11:13:30 -05:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Bjørn Forsman 224a5ea9da Add evtest, a simple tool for input event debugging 2013-02-20 21:17:32 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Peter Simons 33b130ee69 ikiwiki: update to version 3.20130212 2013-02-18 11:11:34 +01:00
Vladimír Čunát 26e4a5561c blender: add the forgotten patch 2013-02-16 18:38:52 +01:00
Vladimír Čunát 08abf5a84a blender: minor update to work with libpng-1.6 
also other fixes needed in order to build
 2013-02-16 18:13:05 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát ee9a5d864c calibre: make build by minor upgrade + new dependencies 
0.9.* won't build: https://bugs.launchpad.net/calibre/+bug/1094719
 2013-02-13 09:18:27 +01:00
Vladimír Čunát 35a927149f Merge branch 'master' into x-updates 
Conflicts (both messed with mesa):
	pkgs/top-level/all-packages.nix
 2013-02-02 21:11:00 +01:00
Vladimír Čunát c4daf6d2b5 djvulibre: minor update, refactored dependencies 2013-01-29 14:55:14 +01:00
Eelco Dolstra 8317cd1f14 kde-3: Remove 
KDE 3 hasn't built in a long time.  Also remove six, the only package
with a dependency on KDE 3.
 2013-01-29 12:43:53 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Vladimír Čunát 9397f5b25f goldendict: fix missing pkgconfig 2013-01-21 17:49:37 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Jack Cummings 3fe43187fb urxvt-9.16 2013-01-11 09:28:52 -08:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Vladimír Čunát 5ce7642487 Lyx: a bug-fix update. 2013-01-09 00:53:51 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd 
Conflicts:
	pkgs/tools/networking/network-manager/default.nix
 2013-01-03 13:44:47 +01:00
Vladimír Čunát b794d22834 Lyx minor update to 2.0.5. 2013-01-01 16:33:56 +01:00
Lluís Batlle i Rossell 30e0edd812 Adding freicoin 0.0.1 2012-12-29 10:46:54 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions 
Pet peeve...
 2012-12-28 19:54:15 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 99f7c4e324 Merge branch 'master' into systemd 2012-12-27 01:28:25 +01:00
Peter Simons 03f42614e8 ikiwiki: update to version 3.20121212 2012-12-23 12:43:41 +01:00
Shea Levy 3fa853ec24 st: Use official release tarball 2012-12-18 11:13:12 -05:00
Eelco Dolstra fd6941ad48 nut: Update to 2.6.5 and fix building against systemd 
http://hydra.nixos.org/build/3473781
 2012-12-12 16:17:47 +01:00
Lluís Batlle i Rossell 0f7dee47a1 librecad: adding its 2.0 beta version too 2012-12-11 09:53:25 +01:00
aszlig acafaf9b23
rxvt-unicode: Add path to terminfo file. 
On NixOS, we have set TERMINFO_DIRS to the user environment, so urxvt and curses
programs running within urxvt are able to find the terminfo file. Unfortunately
this isn't the case if you're not using NixOS.

Of course we now no longer need the longDescription, which suggests to issue

export TERMINFO=~/.nix-profile/share/terminfo

... which to my eyes essentially is a workaround. So please correct me when I'm
wrong, but i think it's better if software is working as-is rather than
requiring additional configuration (except if it really makes sense or breaks
purity).

Thanks to Eelis in #nixos for reporting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-06 03:30:06 +01:00
Peter Simons 1a1b91e0d6 haskell-xmobar: update to version 0.16 2012-12-03 16:12:04 +01:00
Ambrus Kaposi 3899bd04fd update ikiwiki version (old URL is not available anymore) 2012-11-30 12:42:44 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Lluís Batlle i Rossell 2671e32c20 qcad: removing it. it didn't build since long and librecad replaces it. 
I think librecad is a good replacement for the super-outdated qcad community
edition. And afaik, librecad started by taking the qcad code and putting it
more up to date.
 2012-11-28 11:45:58 +01:00
Lluís Batlle i Rossell 66e980ba31 librecad: updating to 1.0.2, and making it install 
The expression was unfinished, not installing anything.
 2012-11-28 11:40:18 +01:00
Rok Garbas ee6f7e294e zathura: Update to 0.2.1 (also update plugins to latest) 2012-11-25 18:55:54 +01:00
Lluís Batlle i Rossell 40aa82192d st: update to 0.3 2012-11-21 10:12:01 +01:00
Peter Simons 2f55f31f49 Merge pull request #155 from bbenoist/newpkgs 
New pkgs: qtcreator fox xfe gmrun geany
 2012-11-20 12:43:06 -08:00
Peter Simons f9ec7d36ce wmname: add version 0.1 
Run "wmname LG3D" to fix Java GUIs running in the ratpoison window manager.
This probably applies to other tiling window managers, too.
 2012-11-17 12:57:25 +01:00
Lluís Batlle i Rossell da5aecb73b Making taskwarrior and podofo have cmake as buildNativeInput. 
Otherwise they can't be crossbuilt.
 2012-11-08 19:38:25 +01:00
Eelco Dolstra 704f7d6a2c adobe-reader: Unpack to $out/libexec/adobe-reader 
This prevents polluting Nix profiles.
 2012-11-08 16:31:08 +01:00
Eelco Dolstra 892180306d adobe-reader: Update to 9.5.1 2012-11-08 16:31:08 +01:00
Rickard Nilsson 7afafe0b6d dmenu: Add option config.dmenu.enableXft for enabling xft font support (turned off by default). 2012-11-07 16:03:37 +01:00
Peter Simons 263ca3e886 jbidwatcher: update to version 2.5.2 2012-10-26 10:35:07 +02:00
aszlig 6dd94d680a
Merge minor updates from jcumming. 
This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020'
of git://github.com/jcumming/nixpkgs.

Octopus merge of @jcumming's minor updates, apart flrom updating the version, a
few other changes were made to these packages as well:

 * libarchive: Now depends on xz.
 * libgphoto: License changed to LGPL 2.1 plus.

And he did an overhaul of some of the meta blocks as well.

Changes during this merge:

 * Inline and reword stray comment into meta tag in
   1db34880d7 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-10-21 12:26:29 +02:00
Jack Cummings 1db34880d7 - gphoto2-2.4.14, libgphoto2-2.4.14 2012-10-20 21:59:25 -07:00
Peter Simons 278601befb Merge pull request #154 from ecarreras/synergy-foss 
Synergy foss
 2012-10-18 03:18:40 -07:00
Baptist BENOIST ca264f8da0 Add gmrun-0.9.2 
Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:13 +02:00
Baptist BENOIST 829ad425d3 Add xfe-1.33 and fox-1.6.9 
This specific version of fox is required by xfe

Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:12 +02:00
Eduard Carreras 9962055627 Remove pwd to know where I am 2012-10-15 20:01:45 +02:00
Eduard Carreras 1bf9b9bc7b fix align 2012-10-15 20:00:20 +02:00
Eduard Carreras 94471a459f Updated synergy to 1.4.10-foss 2012-10-15 14:26:44 +02:00
Peter Simons f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
Michael Raskin 0bf1789b6a Use newly-added taskwarrior as an update to existing taskwarrior attribute 2012-10-11 10:50:53 +04:00
Eelco Dolstra c1719a5835 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-05 17:57:45 -04:00
Mathijs Kwik 73f79401b1 eaglemode: remove unused xineLib dependency 
It seems the resulting output path has no reference to libxine, so it
does not get used. Probably it needs some hard-coded link-paths as
eaglemode wants to use dlopen for some things.

If anyone wants to use eaglemode's xine support and fix this issue,
please make it optional.
 2012-10-04 13:53:08 +02:00
Michael Raskin 8e38efac32 Update/fix MuPDF 2012-10-04 10:37:54 +04:00
Eelco Dolstra 7d9593db6d xterm: Update to 281 and fix the fontconfig dependency 2012-09-28 16:23:56 -04:00
Eelco Dolstra 7f053d6157 Remove HAL 
It's obsolete.  There was only one package still using it (nut) but it
builds fine without it.
 2012-09-28 12:15:12 -04:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
viric 383336a563 Merge pull request #128 from MarcWeber/fixes/blender 
fix blender build and enable parallel building
 2012-09-21 06:06:43 -07:00
Marc Weber 8cb034fd30 fix blender build and enable parallel building 2012-09-19 22:41:15 +02:00
Eelco Dolstra e6077fbc46 Remove getConfig helper function 
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
 2012-09-19 13:56:56 -04:00
Eelco Dolstra d9c0fc6a51 Fix Nixpkgs evaluation 
http://hydra.nixos.org/build/3020333
 2012-09-13 09:56:19 -04:00
Peter Simons b6f5f5976a ikiwiki: update to version 3.20120725 2012-09-06 18:13:44 +02:00
Rob Vermaas c9f46b2d40 Merge pull request #105 from ierton/zathura 
Zathura
 2012-09-02 04:10:30 -07:00
Peter Simons 430e7454e9 haskell-mathblog: drop obsolete package; it doesn't build with current versions of GHC 2012-08-27 11:29:45 +02:00
Ludovic Courtès 0ac1cf106d gpsbabel: Update to 1.4.3. 2012-08-19 15:50:50 +02:00
Eelco Dolstra f27f8a1177 xpdf: Don't use t1lib 
t1lib has multiple unpatched vulnerabilities (see
e.g. http://rhn.redhat.com/errata/RHSA-2012-0062.html).
 2012-08-16 16:31:44 -04:00
Sergey Mironov 51ccf1f213 zathura: fix broken links in meta information 2012-08-16 18:33:25 +04:00
Sergey Mironov d339184bbf zathura: version 0.1.2 with plugins 
Expression handles new modular structure of zathura and adds support for djvu,
pdf and ps plugins.
 2012-08-16 18:25:52 +04:00
Sergey Mironov b229c3e09f gxneur: add frontend for XNEUR keyboard layout switcher 2012-08-15 01:10:23 +04:00
Peter Simons f20913e51f ikiwiki: support OpenID via HTTPS 
Also enable Perl LWPxParanoidAgent for "additional security".
 2012-08-10 18:57:57 +02:00
Peter Simons 397f1d73ee ikiwiki: enable OpenID support 
* added perl-Crypt-DH-GMP-0.00010
 * added perl-Devel-CheckLib-0.98
 * added perl-HTTP-Message-6.03
 * added perl-IO-CaptureOutput-1.1102
 * added perl-Net-OpenID-Common-1.14
 * added perl-Net-OpenID-Consumer-1.13
 2012-08-10 18:44:01 +02:00
Vladimír Čunát 740cd9b5f4 LyX: add support for spell checking via enchant. 
Also comment on testing of other config options.
 2012-08-07 16:06:13 +02:00
Lluís Batlle 3d2e1508ee surf: updating to 0.5, and making it build. 
It needed webkit_gtk2.
 2012-08-05 16:16:55 +02:00
Vladimír Čunát 98614c72c1 LyX: a minor update. 2012-08-05 14:30:45 +02:00
Lluís Batlle 7620bd06cf Adding 'st-0.2.1' 2012-08-05 12:44:01 +02:00
Peter Simons 9e334221fc ikiwiki: enable pass phrase authentication support 2012-07-29 21:39:49 +02:00
Peter Simons 5c924ed7c5 ikiwiki: fix test suite in the presence of enabled Git support 2012-07-27 10:25:06 +02:00
Shea Levy 7d64f1a93e epdfview: Fix build with glib-2.32.4 2012-07-15 11:06:04 -04:00
Peter Simons 40ef76f4a4 ikiwiki: make docutils support optional 2012-07-14 15:47:05 +02:00
Peter Simons 3d416ed030 ikiwiki: update to version 3.20120629 2012-07-14 14:51:08 +02:00
Shea Levy a6c8986ee0 dwm: Bump to 4.5 2012-07-10 06:38:41 -04:00
Shea Levy 57e1ad943e hello: Update to 2.8 2012-07-09 04:06:36 -04:00
Peter Simons 08b29c6f96 blender: update to version 2.63a 2012-07-07 11:31:32 +02:00
Lluís Batlle i Rossell 5592b1f9b1 eaglemode: update to 0.84.0 
It failds to build with xine-lib, but it goes on as it's
not a strong requirement. Then, the final path is not dependant
on xine anymore. I hope next releases fix this.
 2012-07-02 23:04:12 +02:00
Ludovic Courtès cb0d79e60f viking: Update to 1.3. 2012-07-02 22:52:37 +02:00
Peter Simons 6e936640b0 bitcoin: update to version 0.6.3 (and build with boost 1.50.0) 2012-06-28 18:04:29 +02:00
Lluís Batlle 743cf1ec50 Removing the old unstable taskwarrior; the stable version is on 2.x already. 2012-06-22 15:53:42 +02:00
Lluís Batlle d13e682491 Updating taskwarrior. 2012-06-22 14:51:41 +02:00
Vladimír Čunát ef188787a0 A minor LyX update. 
svn path=/nixpkgs/trunk/; revision=34550
 2012-06-18 15:41:18 +00:00
Vladimír Čunát 1a33b4b654 Fixing stardict broken by my mistake. 
svn path=/nixpkgs/trunk/; revision=34549
 2012-06-18 15:37:35 +00:00
Vladimír Čunát 1a856c200d Updated transmission to 2.52. 
svn path=/nixpkgs/trunk/; revision=34545
 2012-06-18 15:18:45 +00:00
Joachim Schiele 0de49e8c04 StarDict is a Cross-Platform and international dictionary Software. Now it is available on NixOS. See https://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications if you want to get it running. 
svn path=/nixpkgs/trunk/; revision=34531
 2012-06-17 18:41:00 +00:00
Peter Simons 84547c5307 Fix xfontsel to find the app defaults file. 
svn path=/nixpkgs/trunk/; revision=34443
 2012-06-11 07:16:51 +00:00
Andres Löh 8cf7f46ea0 Patching xmobar-0.15 to accept mtl-2.1. 
svn path=/nixpkgs/trunk/; revision=34354
 2012-06-05 08:09:06 +00:00
Peter Simons 4fdbd75e4f Updated Haskell packages. 
- ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
 2012-06-04 09:24:14 +00:00
Peter Simons 678c30c050 xmobar: re-generated expression with the latest version of Cabal2Nix 
This change enables wireless support unconditionally.

svn path=/nixpkgs/trunk/; revision=34327
 2012-06-03 18:52:38 +00:00
Cillian de Roiste b5d937ce33 Updating the bitcoin client to 0.6.2 
svn path=/nixpkgs/trunk/; revision=34323
 2012-06-02 18:00:39 +00:00
Mathijs Kwik b82a8f6319 xmobar: enable optional wireless support 
svn path=/nixpkgs/trunk/; revision=34268
 2012-05-29 07:44:01 +00:00
Peter Simons d628fd3d34 ikiwiki: updated to version 3.20120516 
svn path=/nixpkgs/trunk/; revision=34212
 2012-05-22 19:46:33 +00:00
Rickard Nilsson 3724758a96 Fixed stupid syntax error in gnome-terminator's default.nix. 
svn path=/nixpkgs/trunk/; revision=34196
 2012-05-21 15:45:03 +00:00
Rickard Nilsson 61ef2ff439 gnome-terminator 0.96. 
svn path=/nixpkgs/trunk/; revision=34195
 2012-05-21 15:08:16 +00:00
Russell O'Connor bc43657f1e Updating calibre to 0.8.51 
svn path=/nixpkgs/trunk/; revision=34075
 2012-05-12 20:56:47 +00:00
Russell O'Connor ff1fa88e3d Adding pdftohtml to the PATH for calibre. 
svn path=/nixpkgs/trunk/; revision=34074
 2012-05-12 20:34:01 +00:00
Karn Kallio e96679b973 Apply patch from Michel Alexandre Salim advancing mysql workbench version to 5.2.39. 
svn path=/nixpkgs/trunk/; revision=33996
 2012-05-06 02:59:25 +00:00
Lluís Batlle i Rossell 7a4c5e084c Updating calibre, and adding sourceforge as a backup url, suggested by roconnor. 
svn path=/nixpkgs/trunk/; revision=33983
 2012-05-04 19:01:51 +00:00
Eelco Dolstra 5287bbf3a8 * Don't build mysql-workbench on i686-linux since it just hangs 
(http://hydra.nixos.org/build/2482930).

svn path=/nixpkgs/trunk/; revision=33939
 2012-04-27 09:31:11 +00:00
Peter Simons 2e44afa7bb ikiwiki: updated to version 3.20120419 
svn path=/nixpkgs/trunk/; revision=33924
 2012-04-26 08:09:31 +00:00
Lluís Batlle i Rossell f5da2fe902 Updating calibre 
svn path=/nixpkgs/trunk/; revision=33922
 2012-04-25 21:31:09 +00:00
Michael Raskin 6c1bc77673 Updating VUE 
svn path=/nixpkgs/trunk/; revision=33808
 2012-04-17 13:05:20 +00:00
Florian Friesdorf 29c20c72b1 rxvt-unicode 9.15 (thx garbas) 
svn path=/nixpkgs/trunk/; revision=33534
 2012-04-02 10:24:25 +00:00
Cillian de Roiste cbb7aef23c Fixing the url (Thanks to Shea Levy) 
svn path=/nixpkgs/trunk/; revision=33490
 2012-03-30 10:38:07 +00:00
Yury G. Kudryashov f943cf8d81 nut-2.6.3: add freeipmi support 
svn path=/nixpkgs/trunk/; revision=33478
 2012-03-29 20:44:20 +00:00
Yury G. Kudryashov c6c798df43 Add nut-2.6.3 without HAL support 
I'm not a nut user, so I didn't touch the default nut expression, and set
meta.priority to 10.

svn path=/nixpkgs/trunk/; revision=33477
 2012-03-29 19:01:42 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use. 
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
 2012-03-24 10:21:28 +00:00
Eelco Dolstra 73ce1dd4bb * Adobe Reader: install .desktop file in the right place. 
svn path=/nixpkgs/trunk/; revision=33297
 2012-03-20 14:41:24 +00:00
Yury G. Kudryashov 0d90c06ba1 Remove some packages with Qt3 dependency 
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
 2012-03-19 18:31:02 +00:00
Piotr Pietraszkiewicz fbfa56c165 bumped bibletime to v2.9.1 which has the side effect that it builds again 
svn path=/nixpkgs/trunk/; revision=33245
 2012-03-18 23:52:58 +00:00
Lluís Batlle i Rossell 5475f367a5 Adding patch for grip (sent by Ilja Honkonen). 
I reworked the spacing.


svn path=/nixpkgs/trunk/; revision=33229
 2012-03-18 09:24:42 +00:00
Yury G. Kudryashov 776bedbb5f Remove some files not reachable from all-packages.nix 
List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
 2012-03-17 17:20:30 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00