Commit graph

623 commits

Author SHA1 Message Date
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
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