Author: urkud
Date: Mon Feb 13 19:47:36 2012
New Revision: 32265
URL: https://nixos.org/websvn/nix/?rev=32265&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/stdenv-updates/pkgs/applications/office/calligra/
- copied from r32264, nixpkgs/trunk/pkgs/applications/office/calligra/
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/commands.patch
- copied unchanged from r32264,
nixpkgs/trunk/pkgs/development/libraries/consolekit/commands.patch
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/HDBC/HDBC.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/attoparsec/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/cmdargs/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/crypto-conduit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/highlighting-kate/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/http-conduit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/numeric-prelude/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/pandoc/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/persistent-template/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/system-fileio/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/texmath/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/wai-logger/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-auth/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-routes/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ogre/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/HaRe/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/freeciv/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/stuntrally/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -35,7 +35,8 @@
mkdir -p "$out/lib/"
[ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
[ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
- for mandir in man1 man3 manCg manCgFX
+ for mandir in man1 man3 \
+ ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX
do
mkdir -p "$out/share/man/$mandir/"
cp -v share/man/$mandir/* "$out/share/man/$mandir/"
Copied:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/commands.patch
(from r32264,
nixpkgs/trunk/pkgs/development/libraries/consolekit/commands.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/commands.patch
Mon Feb 13 19:47:36 2012 (r32265, copy of r32264,
nixpkgs/trunk/pkgs/development/libraries/consolekit/commands.patch)
@@ -0,0 +1,33 @@
+This patch adds shutdown commands specific to NixOS, as NixOS does not have
+a /sbin or /usr/sbin directory. In order not to have a dependency on the
+package that provides "shutdown" when in an environment other than NixOS,
+we'll make it depend on /var/run/current-system.
+
+Note: this patch does not compromise system security. Other systems than
+NixOS should have already shutdown in the earlier directories being searched,
+and otherwise /var/run is writable only be root.
+
+--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13
11:29:57.352902568 +0100
++++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13
11:43:27.593317712 +0100
+@@ -7,6 +7,9 @@
+ elif [ -x "/usr/sbin/shutdown" ] ; then
+ /usr/sbin/shutdown -r now
+ exit $?
++elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
++ /var/run/current-system/sw/sbin/shutdown -r now
++ exit $?
+ else
+ exit 1
+ fi
+--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13
11:30:06.228950934 +0100
++++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13
11:44:12.664563304 +0100
+@@ -7,6 +7,9 @@
+ elif [ -x "/usr/sbin/shutdown" ] ; then
+ /usr/sbin/shutdown -h now
+ exit $?
++elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
++ /var/run/current-system/sw/sbin/shutdown -h now
++ exit $?
+ else
+ exit 1
+ fi
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/consolekit/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -11,7 +11,9 @@
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
patches = [ ./0001-Don-t-daemonize-when-activated.patch
- ./0002-Don-t-take-bus-name-until-ready.patch ];
+ ./0002-Don-t-take-bus-name-until-ready.patch
+ ./commands.patch # adds shutdown commands for NixOS to the list of
shutdown commands
+ ];
# For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to
work
NIX_LDFLAGS = "-lgcc_s";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/HDBC/HDBC.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/HDBC/HDBC.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/HDBC/HDBC.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "HDBC";
- version = "2.3.1.0";
- sha256 = "1y3qcc0ids9k3af4qkhabwg82q03a21wl4vdqhj1h0zmf08b3m6k";
+ version = "2.3.1.1";
+ sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7";
isLibrary = true;
isExecutable = true;
buildDepends = [ convertible mtl text time utf8String ];
meta = {
- homepage = "https://github.com/jgoerzen/hdbc/wiki";;
+ homepage = "https://github.com/hdbc/hdbc";;
description = "Haskell Database Connectivity";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/attoparsec/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/attoparsec/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/attoparsec/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec";
- version = "0.10.1.0";
- sha256 = "1wlil4zxnyrygvkgmap8kcqf4f6rc08ais20alyy4ggzmx73sl9q";
+ version = "0.10.1.1";
+ sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0";
buildDepends = [ deepseq text ];
meta = {
homepage = "https://github.com/bos/attoparsec";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/cmdargs/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/cmdargs/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/cmdargs/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
- version = "0.9.2";
- sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr";
+ version = "0.9.3";
+ sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "0.2.0";
- sha256 = "0ljbxm6rxcxfw51kcjkmb041kz7k6frgc9l6gvfh2s9zrip8zq5v";
+ version = "0.2.1";
+ sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9";
buildDepends = [
liftedBase monadControl text transformers transformersBase
];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/crypto-conduit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/crypto-conduit/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/crypto-conduit/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -10,5 +10,9 @@
description = "Conduit interface for cryptographic operations (from
crypto-api)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
};
})
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/highlighting-kate/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/highlighting-kate/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/highlighting-kate/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
- version = "0.5.0.2";
- sha256 = "012hr5ci9j4fwnrc1ypx6ca562vzqlfk5phjs4xl3llxv8afdhgl";
+ version = "0.5.0.4";
+ sha256 = "1kn73gcjhndb5wbdy9hbjgar1bdcmy8cy831ib4ik1fn62zmvxrf";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/http-conduit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/http-conduit/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/http-conduit/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -1,19 +1,19 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cookie, cprngAes, dataDefault, failure, httpTypes
-, liftedBase, monadControl, network, regexCompat, socks, text, time
-, tls, tlsExtra, transformers, transformersBase, utf8String
+, liftedBase, monadControl, mtl, network, regexCompat, socks, text
+, time, tls, tlsExtra, transformers, transformersBase, utf8String
, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
- version = "1.2.5";
- sha256 = "0mb85akb7mgdhjkmp041lhqir2gys9bjixn2v1i848mijw1zx8zr";
+ version = "1.2.6";
+ sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
- cprngAes dataDefault failure httpTypes liftedBase monadControl
+ cprngAes dataDefault failure httpTypes liftedBase monadControl mtl
network regexCompat socks text time tls tlsExtra transformers
transformersBase utf8String zlibConduit
];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/numeric-prelude/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "numeric-prelude";
- version = "0.3";
- sha256 = "0zxqfsgyg7gf051qjzv57bb1cvrbzlvvyyl2d3gmikyy6h3pis1f";
+ version = "0.3.0.1";
+ sha256 = "14hi0l4pga4srrfypx4alsyq34y5wsanis6216cds3zjw6db3frg";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/pandoc/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/pandoc/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/pandoc/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pandoc";
- version = "1.9.1";
- sha256 = "00xwy1afy4cn7z2drsc4dnqd4g45i45v9f3jm9j6i32pz27y8s2a";
+ version = "1.9.1.1";
+ sha256 = "1npyc99f90fhbfddr6x5dlnwdc3i1pnhg4xiv12fmf1cl8xlcpyl";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/persistent-template/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/persistent-template/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/persistent-template/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "0.8.1";
- sha256 = "0av1rzqz80lzirk9l45jiwj4zar6ncy0q9x7dqhsrklyxk4jzv6v";
+ version = "0.8.1.1";
+ sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/system-fileio/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/system-fileio/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/system-fileio/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "system-fileio";
- version = "0.3.4";
- sha256 = "184f5bb3qhag6cwmk0zc2ldkwnkzbv82pv7hy541j8jqqi5wprih";
+ version = "0.3.5";
+ sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2";
buildDepends = [ systemFilepath text time ];
meta = {
homepage = "https://john-millikin.com/software/haskell-filesystem/";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/texmath/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/texmath/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/texmath/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
- version = "0.6.0.2";
- sha256 = "04b642xbbgivbnpc8srqirdf71n5b6h5ir6rw0z2xpiv0znk6vh2";
+ version = "0.6.0.3";
+ sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/wai-logger/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/wai-logger/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/wai-logger/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai-logger";
- version = "0.1.2";
- sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9";
+ version = "0.1.3";
+ sha256 = "0h9m2vnm81q1zdj0gv3d9vzd2mlm1343div591695fq52ks26cfc";
buildDepends = [
blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
time wai
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-auth/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
- version = "0.8.1";
- sha256 = "10jhvkyxf8j55yzc05p0fmmjsd8fb1sns86vlsl0108947b2pp8v";
+ version = "0.8.1.1";
+ sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac";
buildDepends = [
aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail
persistent persistentTemplate pureMD5 pwstoreFast random SHA
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-routes/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-routes/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-routes/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -10,5 +10,9 @@
description = "Efficient routing for Yesod";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
};
})
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ogre/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ogre/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ogre/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -5,6 +5,7 @@
, xproto, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, xf86vidmodeproto, libICE
, renderproto, libXrender
+ , nvidia_cg_toolkit
, ...}:
builderDefsPackage
(a :
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/HaRe/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/HaRe/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/HaRe/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HaRe";
- version = "0.6.0.1";
- sha256 = "cd3fa312c7fa6a5f761bbc3ebdbc6300e83ba9e285047acded6269d2164d67f8";
+ version = "0.6.0.2";
+ sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2";
isLibrary = false;
isExecutable = true;
buildDepends = [ hint mtl network syb ];
Modified: nixpkgs/branches/stdenv-updates/pkgs/games/freeciv/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/freeciv/default.nix Mon Feb
13 19:34:42 2012 (r32264)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/freeciv/default.nix Mon Feb
13 19:47:36 2012 (r32265)
@@ -1,15 +1,26 @@
-{ stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype
-, pkgconfig, fontconfig, libzip, zip, zlib }:
+{ stdenv, fetchurl, zlib, bzip2, pkgconfig
+, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype
+, gtkClient ? false, gtk
+, server ? true, readline }:
+let
+ inherit (stdenv.lib) optional optionals;
+ client = sdlClient || gtkClient;
+in
stdenv.mkDerivation rec {
- name = "freeciv-2.2.7";
+ name = "freeciv-2.3.1";
src = fetchurl {
- url = "mirror://sf/freeciv/${name}.tar.bz2";
- sha256 =
"993dd1685dad8012225fdf434673515a194fa072b3d5bfb04952a98fb862d319";
+ url = "mirror://sourceforge/freeciv/${name}.tar.bz2";
+ sha256 = "1n3ak0y9hj9kha0r3cdbi8zb47vrgal1jsbblamqgwwwgzy8cri3";
};
- buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype pkgconfig
fontconfig libzip zip zlib] ;
+ buildNativeInputs = [ pkgconfig ];
+
+ buildInputs = [ zlib bzip2 ]
+ ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ]
+ ++ optional gtkClient gtk
+ ++ optional server readline;
meta = with stdenv.lib; {
description = "multiplayer (or single player), turn-based strategy game.";
Modified: nixpkgs/branches/stdenv-updates/pkgs/games/stuntrally/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/stuntrally/default.nix Mon Feb
13 19:34:42 2012 (r32264)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/stuntrally/default.nix Mon Feb
13 19:47:36 2012 (r32265)
@@ -1,6 +1,5 @@
-{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis,
pkgconfig }:
-
-throw "Stunt Rally needs ogre with cg support at runtime - we have to package
nvidia cg"
+{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis,
pkgconfig
+, makeWrapper }:
stdenv.mkDerivation rec {
name = "stunt-rally-1.4";
@@ -10,7 +9,14 @@
sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq";
};
- buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig ];
+ buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig
makeWrapper ];
+
+ # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but
+ # the cmake code I saw is not ready for that. Therefore, we use the env var.
+ postInstall = ''
+ wrapProgram $out/bin/stuntrally --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE
+ wrapProgram $out/bin/sr-editor --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE
+ '';
enableParallelBuilding = true;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
Mon Feb 13 19:34:42 2012 (r32264)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
Mon Feb 13 19:47:36 2012 (r32265)
@@ -16,10 +16,10 @@
assert enableEjabberdDump -> ejabberd != null;
stdenv.mkDerivation {
- name = "disnix-activation-scripts-0.3pre29887";
+ name = "disnix-activation-scripts-0.3pre30423";
src = fetchurl {
- url =
http://hydra.nixos.org/build/1461490/download/1/disnix-activation-scripts-0.3pre29887.tar.gz;
- sha256 = "034mx096iz9dqjsrxh6jkvcwch399gfsahrm6vfnswz9jfvfdcw0";
+ url =
http://hydra.nixos.org/build/1842091/download/1/disnix-activation-scripts-0.3pre30423.tar.gz;
+ sha256 = "11b569bflknjbjddam4mv07bpmihbfx5acxzxzhnshj6x8sv6064";
};
preConfigure = if enableEjabberdDump then "export
PATH=$PATH:${ejabberd}/sbin" else "";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Feb
13 19:34:42 2012 (r32264)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Feb
13 19:47:36 2012 (r32265)
@@ -8179,6 +8179,8 @@
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
+ calligra = callPackage ../applications/office/calligra { };
+
digikam = callPackage ../applications/graphics/digikam {
boost = boost147;
};
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Mon Feb
13 19:34:42 2012 (r32264)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Mon Feb
13 19:47:36 2012 (r32265)
@@ -1597,10 +1597,7 @@
happyMeta = callPackage ../development/tools/haskell/happy-meta {};
- # 2012-02-09: Disabled because this package is clearly, and it won't compile
with
- # any recent version of GHC. We should delete it unless anyone
- # complains.
- # HaRe = callPackage ../development/tools/haskell/HaRe {};
+ HaRe = callPackage ../development/tools/haskell/HaRe {};
hlint = callPackage ../development/tools/haskell/hlint {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
