Commit graph

641 commits

Author SHA1 Message Date
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
9ac8a16277 vimprobable2, surf: fix the settings-schemas problem
Note that they still segfault.
2013-03-14 16:01:53 +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
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
Bjørn Forsman
224a5ea9da Add evtest, a simple tool for input event debugging 2013-02-20 21:17:32 +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
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +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