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
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 1278859d310c020c98f9
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
