Commit graph

902 commits

Author SHA1 Message Date
Mathijs Kwik
4326c06319 calibre: fix for chroot builds (probably) 2013-08-25 18:16:02 +02:00
Mathijs Kwik
c9318f4d2d calibre: upgrade to 1.0
Upstream insists on using private qt headers.
We do not want nixpkgs' qt to export those.
So I provided a small hack to take them directly from qt's source tarball.
I made sure everything uses the normal system qt and headers, except for the
1 .so file (qt_hack) that needs these private headers.

Because of this, there is barely any increate in size or buildtime.
2013-08-25 14:31:05 +02:00
Domen Kožar
7837b994bf fix eval 2013-08-21 01:23:40 +02:00
Domen Kožar
8cd9be89fd Merge pull request #849 from bencahill/master
nvpy: Add platforms
2013-08-20 15:00:52 -07:00
bencahill
f8240030f1 nvpy: Add platforms 2013-08-20 16:56:26 -05:00
Domen Kožar
e9ec76b8a7 Merge pull request #743 from bencahill/master
Add nvpy, a Simplenote syncing note-taking application
2013-08-20 14:36:41 -07:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
aszlig
a3bd1be27b
redshift: Update to new upstream version 1.7.
Upstream release notes:

 - Add Geoclue location provider by Mathieu Trudel-Lapierre.
 - Allow brightness to be adjusted (-b).
 - Provide option to set color temperature directly (Joe Hillenbrand).
 - Add option to show program version (-V).
 - Add configure.ac option to install ubuntu icons. They will no longer
   be installed by default (Francesco Marella).
 - config: Look in %userprofile%/.config/redshift.conf on windows platform.
 - Fix: w32gdi: Obtain a new DC handle on every adjustment. This fixes a
   bug where redshift stops updating the screen.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-14 20:50:57 +02:00
Peter Simons
e1379d02cb xmobar: disable 'wireless' support
That particular feature depends on iwlib, which is broken in modern Linux kernels
2013-08-14 10:03:03 +02:00
Rok Garbas
3c6b2f7501 vifm: update to 0.7.5 and enabling new options 2013-08-10 02:32:21 +02:00
Domen Kožar
6ad9ad6160 pgadmin: 1.10.0 -> 1.16.1, add to channel 2013-08-08 16:49:38 +02:00
Domen Kožar
12cc79f844 dunst: upgrade to git version to fix 100% CPU problems 2013-08-07 14:08:21 +02:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Jason \"Don\" O'Conal
b43d1c014a sdcv: fix build on darwin (close #744)
* add -lintl flag to NIX_CFLAGS_COMPILE
2013-07-27 20:00:24 +02:00
Domen Kožar
7d032bc892 Merge pull request #780 from grwlf/urxvt-gdkpixbuf
urxvt: Enable Gdk_pixbuf to be able to set custom icons/images
2013-07-26 06:45:22 -07:00
Sergey Mironov
60761e94b8 urxvt: Enable Gdk_pixbuf to be able to set custom icons/images 2013-07-26 17:06:54 +04:00
Domen Kozar
f6a60d6640 calibre: upgrade to 0.9.11 (fixes #777) 2013-07-26 13:18:08 +02:00
Lluís Batlle i Rossell
4e94dafa4e nut: adding libtool enables nut-scanner 2013-07-19 16:33:42 +02:00
Lluís Batlle i Rossell
b57cdc584a Fixing evtest and updating to 1.31.
The fetchgit wasn't a fixed-output, so on chroot, it couldn't connect.
2013-07-19 16:21:15 +02:00
Lluís Batlle i Rossell
328774ab1f Updating qgis (1.8.0 & geos (3.3.8).
I also add libspatialindex and libspatialite, to get the latest qgis building.
2013-07-18 11:43:01 +02:00
Gergely Risko
97b64665f5 Use fetchgit for vanitygen instead of fetchurl, github changed something 2013-07-17 12:16:47 +02:00
Evgeny Egorochkin
fba8b902da fix packages to use mirror://xorg 2013-07-14 05:39:02 +03:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Benjamin Cahill
ba1ed681b6 Add nvpy, a Simplenote syncing note-taking application 2013-07-12 18:09:53 -05:00
Bjørn Forsman
49fccb03e9 slic3r: new package
Slic3r is a G-code generator for 3D printers.

- Math-Clipper and Boost-Geometry-Utils have been bumped to satisfy
  Slic3r.

- Slic3r has problems with perl 5.16 due to a locale issue (comma vs
  period in floating point numbers). So we use perl 5.14.

- The tests fail, so we skip them. According to the author of Slic3r,
  that should be safe:

    "Tests failed because of a typo when the 0.9.10b tag was applied.
    You can safely ignore the test results, Slic3r will work."

  See https://github.com/alexrj/Slic3r/issues/1303

  For reference, the errors look like this:

    Use of uninitialized value $deg in numeric eq (==) at /tmp/nix-build-perl-slic3r-0.9.10b.drv-0/git-export/t/../lib/Slic3r/TriangleMesh.pm line 328.
    # Looks like your test exited with 255 before it could output anything.
2013-07-11 01:35:00 +02:00
Peter Simons
1f6fbcb176 ikiwiki: update to version 3.20130518 2013-07-09 16:08:42 +02:00
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Vladimír Čunát
9cf9b24dc4 kde4.rsibreak: fix broken download and homepage 2013-07-01 08:55:55 +02:00
Rob Vermaas
f01588653c Update get_iplayer to 2.83, and fix the package. 2013-06-29 20:50:44 +02:00
Vladimír Čunát
38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
aszlig
467608f614
synergy: Only pass cryptopp on Linux platforms.
The second failure, and the last one I'm going to try today:

http://hydra.nixos.org/build/5404634

On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.

Latest (failed) build of 1.4.10:

http://hydra.nixos.org/build/5359408

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 13:46:22 +02:00
aszlig
cfd284443e
synergy: Use bundled crypto++ on non-Linux archs.
Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.

This refers to the following build:

http://hydra.nixos.org/build/5404516

Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 13:21:43 +02:00
aszlig
467962b185
synergy: Take over maintenance.
I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:18:21 +02:00
aszlig
9a37a306b8
synergy: Enable unit tests.
Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
d9e0c355a0
synergy: Add support for Xinput2.
This is needed in order to support devices such as gamepads or tablets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
aszlig
ea4afb73d8
synergy: Add support for XrandR.
Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.

The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
aszlig
57dee2a27e
synergy: Update to new upstream version 1.4.12.
This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
Vladimír Čunát
842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Evgeny Egorochkin
88eff1efac Merge pull request #619 from lovek323/sdcv
sdcv: add expression
2013-06-17 16:29:53 -07:00
Vladimír Čunát
6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Peter Simons
12b29fadcb Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-17 10:14:45 +02:00
Jaka Hudoklin
4d76f87c13 Add cgminer: gpu, fpga and asic crypto currencies mining application 2013-06-16 21:51:27 +00: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
Jason "Don" O'Conal
2956b5db46 sdcv: add expression 2013-06-13 22:33:52 +10:00
Peter Simons
6b1ebeccf2 Merge branch 'master' into stdenv-updates.
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02: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
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
Jack Cummings
b0cef0b6b8 gphoto2-2.5.2 and libgphoto2-2.5.2 2013-06-07 10:58:39 -07: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
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
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