Commit graph

36620 commits

Author SHA1 Message Date
Bjørn Forsman 3227c1d215 ncurses: fix includedir setting
${out} in configureFlags isn't expanded, so ncursesw5-config ends up
expanding ${out} at *runtime*. Here is the relevant ncursesw5-config
snippet showing how includedir gets its value at runtime.

  bindir="${exec_prefix}/bin"
  includedir="${out}/include"
  libdir="${exec_prefix}/lib"
  datadir="${prefix}/share"
  mandir="${prefix}/man"

When running in a plain shell you get this:
  $ ncursesw5-config --cflags
  -I/include/ncursesw -I/include

And when run in a nix-build shell for e.g. gpsd:
  $ ncursesw5-config --cflags
  -I/nix/store/HASH-gpsd-3.10/include/ncursesw -I/nix/store/HASH-gpsd-3.10/include

This is clearly wrong.

Q: How come this has gone undetected for years?
A: It seems few packages use ncursesw5-config to get the compiler
flags. For example, our python curses module builds its own compiler
flags.

Fix this by moving the --includedir setting to preConfigure where shell
variables are expanded.
2013-12-10 19:47:52 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Evgeny Egorochkin 328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Nixpkgs Monitor 08a3ef19cd dropbear: update from 2013.60 to 2013.62 2013-12-10 01:07:30 +02:00
Peter Simons f36d5c162c rtorrent: update to version 0.9.3
This version is dubbed "unstable" and apparently it lacks the man page that
used to come with earlier releases. :-(

We need the latest version, though, because of the recent update to libtorrent.
2013-12-09 22:35:32 +01:00
Vladimír Čunát 5acb97b972 libopus: update 1.0.3 -> 1.1, enable tests 2013-12-09 21:07:56 +01:00
Bjørn Forsman 0856500f3e nixos/libvirtd-service: fix fail-to-start when no machines are configured
Don't fail to start the libvirtd service just because there are no files
that match the /etc/libvirt/qemu/*.xml pattern.
2013-12-09 19:41:44 +01:00
Shea Levy ac21aa9a82 Unpacking jce requires zip
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 13:25:07 -05:00
Shea Levy 9131b45db4 Linux 3.12.4
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 12:01:37 -05:00
Shea Levy 088f472fe5 Add oracle jdk 7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 11:37:40 -05:00
Peter Simons 6dfc18dc00 gnumake: add version 4.0 2013-12-09 16:14:41 +01:00
Peter Simons e2f8c7a208 all-packages.nix: strip trailing whitespace 2013-12-09 16:09:43 +01:00
Peter Simons aa58b5f571 gnumake: clean up directory structure; no functional change 2013-12-09 16:09:33 +01:00
Peter Simons 916af0f39c stellarium: update to version 0.12.4 2013-12-09 12:42:03 +01:00
Nixpkgs Monitor 8f4b7e2133 dosfstools: update from 3.0.21 to 3.0.24 2013-12-09 12:13:11 +02:00
Nixpkgs Monitor a08f5c4314 verilog: update from 0.9.3 to 0.9.7 2013-12-09 11:30:43 +02:00
Nixpkgs Monitor d4a1ab3bc3 libtorrent: update from 0.13.2 to 0.13.3 2013-12-09 11:18:17 +02:00
Nixpkgs Monitor 3da956c7ca amuleGui: update from 2.2.6 to 2.3.1 2013-12-09 11:13:26 +02:00
Nixpkgs Monitor 741b202d72 apparmor: update from 2.8.1 to 2.8.2 2013-12-09 11:04:25 +02:00
Nixpkgs Monitor d8f1146fde clamav: update from 0.97.8 to 0.98 2013-12-09 10:59:48 +02:00
Nixpkgs Monitor a9ce83467e springLobby: update from 0.176 to 0.180 2013-12-09 10:58:16 +02:00
Nixpkgs Monitor 6996067dcf apacheHttpd_2_4: update from 2.4.6 to 2.4.7 2013-12-09 10:49:00 +02:00
Nixpkgs Monitor 7375a3f7dd aprutil: update from 1.5.2 to 1.5.3 2013-12-09 10:48:41 +02:00
Nixpkgs Monitor e523fdfc47 apacheHttpd: update from 2.2.25 to 2.2.26 2013-12-09 10:47:10 +02:00
Nixpkgs Monitor d79177cc20 youtubeDL: update from 2013.10.23.2 to 2013.12.08.1 2013-12-09 10:42:07 +02:00
Moritz Ulrich c727c38b26 rdiff_backup: update from 1.2.8 to 1.3.3 2013-12-09 00:34:48 +00:00
Moritz Ulrich 2d6c240913 winetricks: Update to rev 1078
And add some missing dependencies to the PATH of the script.
2013-12-09 00:34:35 +00:00
Moritz Ulrich 5c59c84bcb audacity: update from 2.0.4 to 2.0.5 2013-12-09 00:24:16 +00:00
Moritz Ulrich 7bd64d6c1f anki: update from 2.0.12 to 2.0.18 2013-12-09 00:24:10 +00:00
Moritz Ulrich b4f93af3c9
Update git and related tools to latest releases.
Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-09 00:15:25 +00:00
Jason \"Don\" O'Conal 0c5f72af58 spotify: fix finding libXdamage.so.1
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-08 23:48:10 +00:00
Pascal Wittmann 799062bcb6 Fixed sbt options 2013-12-08 20:03:17 +01:00
Domen Kožar c1df906704 vlc: specify meta.platforms 2013-12-08 19:19:11 +01:00
Domen Kožar 32cd0be64c vlc: add mkv support 2013-12-08 19:18:59 +01:00
Evgeny Egorochkin a0d8196f60 Use old giflib for packages which lack new versions/compatibility patches for giflib5 2013-12-08 12:36:46 +02:00
Evgeny Egorochkin c5005bfe11 KDE-4.10: Kopete: fix build against giflib5 2013-12-08 12:04:02 +02:00
Michael Raskin 4d33a94fae Passing giflib 4.1.x to OpenSceneGraph for now 2013-12-08 13:20:07 +04:00
Lluís Batlle i Rossell c46d5ed3d7 Noting faac unfree. I think it is unfree, not LGPL. 2013-12-07 23:03:42 +01:00
Bjørn Forsman 4e385fcda7 stdenv/patchShebangs: fix shebang check
patchShebangs has a bug that shows itself on files that have the
executable bit set but have no shebang (i.e. a blank/empty first line).
The shell would then evaluate this:

if [ != '#!' ]; then
  # not evaluated
fi

With proper quoting we get the correct behaviour:

if [ "" != '#!' ]; then
  # this will be evaluated
fi
2013-12-07 21:13:06 +01:00
Vladimír Čunát 50493458bd gnome3.gnome-menus: fix file path, add maintainer
Also some whitespace nitpicks.
2013-12-07 14:04:50 +01:00
Nixpkgs Monitor 1beca24707 sxiv: update from 1.1 to 1.1.1 2013-12-07 14:39:52 +02:00
Evgeny Egorochkin 8c5c4eab54 libgdiplus: fix build against giflib 5.* 2013-12-07 14:34:52 +02:00
Lluís Batlle i Rossell e12695ba85 Fixing ultrastardx linking with lua.
Now it fails to start to me, due to some alsa problems.
2013-12-07 12:24:34 +01:00
Evgeny Egorochkin 1f5d28001e xplanet: fix build against giflib 5.* 2013-12-07 13:13:06 +02:00
Nixpkgs Monitor 2ce67ca947 giflib: update from 4.2.3 to 5.0.5 2013-12-07 13:13:06 +02:00
Nixpkgs Monitor 6b1a3bffd0 xplanet: update from 1.2.2 to 1.3.0 2013-12-07 13:13:06 +02:00
Bjørn Forsman ca26e75a73 nixos/avahi-service: small documentation update 2013-12-07 12:03:50 +01:00
Michael Raskin cf4b259770 Merge pull request #1339 from roelof1967/gnome-menus
new package : gnome-menus 3.x
2013-12-07 01:12:51 -08:00
Roelof Wobben 7f62dd42f3 give gnome-menus a better place 2013-12-07 10:09:25 +01:00
Michael Raskin fa6e689dcb Use fresh libnl for ntrack 2013-12-07 12:36:31 +04:00