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
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
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
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
Vladimír Čunát
7a25aa94cd
gphoto*: update for changed libgphoto version
2013-04-20 12:44:05 +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
f3a16d0dd5
update meta.maintainers section
2013-04-01 18:44:33 +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
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
Moritz Ulrich
c4ffd2cac9
dunst: Add meta.platforms.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-22 13:00:49 +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