Author: eelco
Date: Tue Feb 21 23:29:21 2012
New Revision: 32468
URL: https://nixos.org/websvn/nix/?rev=32468&sc=1
Log:
* Sync with the trunk.
Added:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/gui.nix
- copied unchanged from r32466,
nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/gui.nix
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/clapack/
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/liblapack/blas-link.patch
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/digikam/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/paraview/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xfig/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/octave/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/SDL/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/dimensional/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/fclabels/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/happstack/happstack-server.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/hxt/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/smallcheck/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-core/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-form/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/atlas/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/liblapack/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/soqt/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/hlint/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/andyetitmoves/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/vdrift/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/default.nix
nixpkgs/branches/stdenv-updates/pkgs/servers/monitoring/zabbix/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/nbd/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/typesetting/tex/texlive/moderncv.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/digikam/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/digikam/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/digikam/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi,
boost,
-shared_desktop_ontologies, marble, clapack, mysql }:
+shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.5.0";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/paraview/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/paraview/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/paraview/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -3,7 +3,7 @@
, mpich2
, python
, libxml2
-, mesa
+, mesa, libXt
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@
enableParallelBuilding = true;
- buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
+ buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
meta = {
homepage = "http://www.paraview.org/";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xfig/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xfig/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xfig/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -6,7 +6,7 @@
name = "xfig-${version}";
src = fetchurl {
- url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz";;
+ url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz";
sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
};
@@ -40,5 +40,6 @@
meta = {
description = "An interactive drawing tool for X11";
homepage = http://xfig.org;
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }:
stdenv.mkDerivation rec {
- name = "svn2git-2.2.0";
+ name = "svn2git-2.1.0-20111206";
src = fetchgit {
url = https://github.com/nirvdrum/svn2git;
- rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
- sha256 =
"6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
+ rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
+ sha256 =
"26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
};
buildInputs = [ ruby makeWrapper ];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/octave/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/octave/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/octave/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,13 +1,19 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick}:
+libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
+fftw, fftwSinglePrec, zlib, curl }:
-stdenv.mkDerivation {
- name = "octave-3.2.4";
+stdenv.mkDerivation rec {
+ name = "octave-3.4.3";
src = fetchurl {
- url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
- sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
+ url = "mirror://gnu/octave/${name}.tar.bz2";
+ sha256 = "0j61kpfbv8l8rw3r9cwcmskvvav3q2f6plqdq3lnb153jg61klcl";
};
- buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
- graphicsmagick ];
- configureFlags = "--enable-readline --enable-dl";
+
+ buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
+ graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
+ fftw fftwSinglePrec ];
+
+ enableParallelBuilding = true;
+
+ configureFlags = [ "--enable-readline" "--enable-dl" ];
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/SDL/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/SDL/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/SDL/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SDL";
- version = "0.6.2";
- sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly";
+ version = "0.6.3";
+ sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp";
extraLibraries = [ SDL ];
meta = {
description = "Binding to libSDL";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/conduit/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "0.2.1";
- sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9";
+ version = "0.2.2";
+ sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j";
buildDepends = [
liftedBase monadControl text transformers transformersBase
];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/dimensional/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/dimensional/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/dimensional/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dimensional";
- version = "0.10.1.2";
- sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn";
+ version = "0.10.2";
+ sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn";
buildDepends = [ numtype time ];
meta = {
homepage = "http://dimensional.googlecode.com/";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/fclabels/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/fclabels/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/fclabels/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fclabels";
- version = "1.1.0.2";
- sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r";
+ version = "1.1.1.0";
+ sha256 = "1xkgqib7ya3l6m9bz5ly6x9k0n71jiydk8ss38rvn9j5gryv3las";
buildDepends = [ mtl transformers ];
meta = {
description = "First class accessor labels";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/happstack/happstack-server.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/happstack/happstack-server.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/happstack/happstack-server.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,18 +1,19 @@
-{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData
-, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec
-, sendfile, syb, text, time, utf8String, xhtml, zlib
+{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
+, filepath, hslogger, html, monadControl, mtl, network, parsec
+, sendfile, syb, text, time, transformers, transformersBase
+, utf8String, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "happstack-server";
- version = "6.2.5";
- sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg";
+ version = "6.6.3";
+ sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9";
isLibrary = true;
isExecutable = true;
buildDepends = [
- blazeHtml extensibleExceptions filepath happstackData happstackUtil
- hslogger html MaybeT mtl network parsec sendfile syb text time
- utf8String xhtml zlib
+ base64Bytestring blazeHtml extensibleExceptions filepath hslogger
+ html monadControl mtl network parsec sendfile syb text time
+ transformers transformersBase utf8String xhtml zlib
];
meta = {
homepage = "http://happstack.com";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/hxt/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/hxt/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/hxt/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hxt";
- version = "9.2.0";
- sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc";
+ version = "9.2.1";
+ sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
buildDepends = [
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
hxtUnicode mtl network parsec
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/smallcheck/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/smallcheck/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/smallcheck/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "smallcheck";
- version = "0.6";
- sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v";
+ version = "0.6.1";
+ sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
buildDepends = [ dlist ];
meta = {
homepage = "https://github.com/feuerbach/smallcheck";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-core/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-core/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-core/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "0.10.1";
- sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0";
+ version = "0.10.2.1";
+ sha256 = "00cw31k6fkffryiqji33x56hqxivwg2c3rgaqmplph9zjpndvgb2";
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
conduit cookie failure fastLogger hamlet httpTypes liftedBase
@@ -17,6 +17,7 @@
shakespeareI18n shakespeareJs text time transformers
transformersBase vector wai waiExtra waiLogger yesodRoutes
];
+ noHaddock = true;
meta = {
homepage = "http://www.yesodweb.com/";;
description = "Creation of type-safe, RESTful web applications";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-form/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-form/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/yesod-form/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
- version = "0.4.1";
- sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s";
+ version = "0.4.2";
+ sha256 = "0vl938ngf8lbpylra9wmywgcdffi9prhbz45d6cl1hra9hlsavj6";
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/atlas/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/atlas/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/atlas/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gfortran }:
stdenv.mkDerivation {
- name = "atlas-3.9.11";
+ name = "atlas-3.9.67";
src = fetchurl {
- url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
- sha256 =
"d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
+ url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
+ sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
};
# configure outside of the source directory
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/liblapack/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/liblapack/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/science/math/liblapack/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,66 +1,23 @@
-{ stdenv, fetchurl, gfortran, blas }:
+{ stdenv, fetchurl, gfortran, atlas, cmake }:
stdenv.mkDerivation {
- name = "liblapack-3.2.1";
+ name = "liblapack-3.4.0";
src = fetchurl {
- url = "http://www.netlib.org/lapack/lapack-3.2.1.tgz";;
- sha256 =
"5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d";
+ url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz";;
+ sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7";
};
- buildInputs = [gfortran blas];
- patches = [ ./blas-link.patch ];
+ propagatedBuildInputs = [ atlas ];
+ buildInputs = [ gfortran cmake ];
- configurePhase = ''
- echo >make.inc "SHELL = ${stdenv.shell}"
- echo >>make.inc "PLAT ="
- echo >>make.inc "FORTRAN = gfortran"
- echo >>make.inc "OPTS = -O2 -fPIC"
- echo >>make.inc "DRVOPTS = \$(OPTS)"
- echo >>make.inc "NOOPT = -O0 -fPIC"
- echo >>make.inc "LOADER = gfortran"
- echo >>make.inc "LOADOPTS ="
- echo >>make.inc "TIMER = INT_ETIME"
- echo >>make.inc "ARCH = gfortran"
- echo >>make.inc "ARCHFLAGS = -shared -o"
- echo >>make.inc "RANLIB = echo"
- echo >>make.inc "BLASLIB = -lblas"
- echo >>make.inc "LAPACKLIB = liblapack.so.3"
- echo >>make.inc "TMGLIB = libtmglib.so.3"
- echo >>make.inc "EIGSRCLIB = libeigsrc.so.3"
- echo >>make.inc "LINSRCLIB = liblinsrc.so.3"
- '';
+ cmakeFlags = [
+ "-DUSE_OPTIMIZED_BLAS=ON"
+ "-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a"
+ "-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a"
+ "-DCMAKE_Fortran_FLAGS=-fPIC"
+ ];
- buildPhase = ''
- make clean
- make lib
- echo >make.inc "SHELL = ${stdenv.shell}"
- echo >>make.inc "PLAT ="
- echo >>make.inc "FORTRAN = gfortran"
- echo >>make.inc "OPTS = -O2 -fPIC"
- echo >>make.inc "DRVOPTS = \$(OPTS)"
- echo >>make.inc "NOOPT = -O0 -fPIC"
- echo >>make.inc "LOADER = gfortran"
- echo >>make.inc "LOADOPTS = "
- echo >>make.inc "TIMER = INT_ETIME"
- echo >>make.inc "ARCH = ar rcs"
- echo >>make.inc "RANLIB = ranlib"
- echo >>make.inc "BLASLIB = "
- echo >>make.inc "ARCHFLAGS ="
- echo >>make.inc "LAPACKLIB = liblapack.a"
- echo >>make.inc "TMGLIB = tmglib.a"
- echo >>make.inc "EIGSRCLIB = eigsrc.a"
- echo >>make.inc "LINSRCLIB = linsrc.a"
- make clean
- make lib
- '';
-
- installPhase = ''
- mkdir -p "$out/lib"
- install -m755 *.a* "$out/lib"
- install -m755 *.so* "$out/lib"
- ln -sf liblapack.so.3 "$out/lib/liblapack.so"
- ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
- '';
+ enableParallelBuilding = true;
meta = {
description = "Linear Algebra PACKage";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/soqt/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/soqt/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/soqt/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coin3d, qt4 }:
+{ fetchurl, stdenv, coin3d, qt4, pkgconfig }:
stdenv.mkDerivation rec {
name = "soqt-${version}";
@@ -11,6 +11,8 @@
buildInputs = [ coin3d qt4 ];
+ buildNativeInputs = [ pkgconfig ];
+
meta = {
homepage = http://www.coin3d.org/;
license = "GPLv2+";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/hlint/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/hlint/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/haskell/hlint/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.8.23";
- sha256 = "0cbjnzs9ddk4z7kxh935x1kvr566afcvk98z3174f3xp5sbz79wr";
+ version = "1.8.24";
+ sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified: nixpkgs/branches/stdenv-updates/pkgs/games/andyetitmoves/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/andyetitmoves/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/andyetitmoves/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -33,7 +33,7 @@
else
"0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
}
else
- abort "And Yet It Moves nix package only supports linux and intel
cpu's.";
+ throw "And Yet It Moves nix package only supports linux and intel
cpu's.";
phases = "unpackPhase installPhase";
Modified: nixpkgs/branches/stdenv-updates/pkgs/games/vdrift/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/vdrift/default.nix Tue Feb
21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/vdrift/default.nix Tue Feb
21 23:29:21 2012 (r32468)
@@ -1,16 +1,16 @@
{ fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis,
- asio, boost, SDL_gfx }:
+ asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }:
stdenv.mkDerivation rec {
- name = "vdrift-2010-06-30";
+ name = "vdrift-2011-10-22";
src = fetchurl {
url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
- sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j";
+ sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s";
};
buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
- SDL_gfx ];
+ SDL_gfx pkgconfig bullet curl libarchive ];
buildPhase = ''
sed -i -e s,/usr/local,$out, SConstruct
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,17 +1,15 @@
-{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
+{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }:
-let
+stdenv.mkDerivation rec {
version = "0.7.3";
+
+ name = "wpa_supplicant-${version}";
+
src = fetchurl {
url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";;
sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
};
-in
-
-(stdenv.mkDerivation rec {
- name = "wpa_supplicant-${version}";
- inherit src;
-
+
preBuild = ''
cd wpa_supplicant
cp -v defconfig .config
@@ -23,24 +21,25 @@
substituteInPlace Makefile --replace /usr/local $out
'';
- buildInputs = [openssl dbus_libs libnl1];
+ buildInputs = [ openssl dbus_libs libnl1 ];
buildNativeInputs = [ pkgconfig ];
- # Upstream patch required for NetworkManager-0.9
- patches = [ (fetchurl {
- url =
"http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";;
- name = "wpa_supplicant-nm-0.9.patch";
- sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
- })
- # wpa_supplicant crashes when controlled through dbus (wicd/nm)
- # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
- (fetchurl {
- url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";;
- name = "dbus-assertion-fix.patch";
- sha256 =
"6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
- })
- ];
+ patches =
+ [ # Upstream patch required for NetworkManager-0.9
+ (fetchurl {
+ url =
"http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";;
+ name = "wpa_supplicant-nm-0.9.patch";
+ sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
+ })
+ # wpa_supplicant crashes when controlled through dbus (wicd/nm)
+ # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
+ (fetchurl {
+ url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";;
+ name = "dbus-assertion-fix.patch";
+ sha256 =
"6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+ })
+ ];
postInstall = ''
mkdir -p $out/share/man/man5 $out/share/man/man8
@@ -50,7 +49,7 @@
cp -v dbus/*service $out/share/dbus-1/system-services
sed -e "s@/sbin/wpa_supplicant@$out&@" -i
$out/share/dbus-1/system-services/*
cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
- '';
+ ''; # */
meta = {
homepage = http://hostap.epitest.fi/wpa_supplicant/;
@@ -58,41 +57,4 @@
maintainers = with stdenv.lib.maintainers; [marcweber urkud];
platforms = stdenv.lib.platforms.linux;
};
-}) // {
-gui = stdenv.mkDerivation {
- name = "wpa_gui-${version}";
-
- inherit src;
-
- buildInputs = [ qt4 ];
-
- buildNativeInputs = [ inkscape ];
-
- prePatch = "cd wpa_supplicant/wpa_gui-qt4";
-
- configurePhase = ''
- lrelease wpa_gui.pro
- qmake'';
-
-# We do not install .xpm icons. First of all, I don't know where they should
-# be install. Second, this allows us to drop imagemagick build-time dependency.
- postBuild = ''
- sed -e '/ICONS.*xpm/d' -i icons/Makefile
- make -C icons
- '';
-
- installPhase = ''
- mkdir -pv $out/bin
- cp -v wpa_gui $out/bin
- mkdir -pv $out/share/applications
- cp -v wpa_gui.desktop $out/share/applications
- mkdir -pv $out/share/icons
- cp -av icons/hicolor $out/share/icons
- '';
-
- meta = {
- description = "Qt4 wpa_supplicant client";
- inherit (qt4.meta) platforms;
- };
-};
}
Copied:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/gui.nix
(from r32466, nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/gui.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/wpa_supplicant/gui.nix
Tue Feb 21 23:29:21 2012 (r32468, copy of r32466,
nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/gui.nix)
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }:
+
+stdenv.mkDerivation {
+ name = "wpa_gui-${wpa_supplicant.version}";
+
+ inherit (wpa_supplicant) src;
+
+ buildInputs = [ qt4 ];
+
+ buildNativeInputs = [ inkscape ];
+
+ prePatch = "cd wpa_supplicant/wpa_gui-qt4";
+
+ configurePhase =
+ ''
+ lrelease wpa_gui.pro
+ qmake
+ '';
+
+ # We do not install .xpm icons. First of all, I don't know where they should
+ # be install. Second, this allows us to drop imagemagick build-time
dependency.
+ postBuild =
+ ''
+ sed -e '/ICONS.*xpm/d' -i icons/Makefile
+ make -C icons
+ '';
+
+ installPhase =
+ ''
+ mkdir -pv $out/bin
+ cp -v wpa_gui $out/bin
+ mkdir -pv $out/share/applications
+ cp -v wpa_gui.desktop $out/share/applications
+ mkdir -pv $out/share/icons
+ cp -av icons/hicolor $out/share/icons
+ '';
+
+ meta = {
+ description = "Qt-based GUI for wpa_supplicant";
+ inherit (qt4.meta) platforms;
+ };
+}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/servers/monitoring/zabbix/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/servers/monitoring/zabbix/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/servers/monitoring/zabbix/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -2,11 +2,11 @@
let
- version = "1.8.7";
+ version = "1.8.10";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d";
+ sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr";
};
preConfigure =
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -8,11 +8,13 @@
sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6";
};
+ configureFlags = "--sysconfdir=/etc";
+
makeFlags = "PREFIX=\${out}";
# Hack to make installation succeed. dhcpcd will still use /var/db
# at runtime.
- installFlags = "DBDIR=\${TMPDIR}/db";
+ installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
meta = {
description = "A client for the Dynamic Host Configuration Protocol
(DHCP)";
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/networking/nbd/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/networking/nbd/default.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/networking/nbd/default.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -1,21 +1,22 @@
{ stdenv, fetchurl, pkgconfig, glib }:
let
- name = "nbd-2.9.25";
+ name = "nbd-3.0";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.bz2";
- sha256 =
"179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4";
+ sha256 =
"f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93";
};
- patches = [
./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ];
-
buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc)
stdenv.glibc.kernelHeaders;
- postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
+ postInstall = ''
+ mkdir -p "$out/share/doc/${name}"
+ cp README "$out/share/doc/${name}/README"
+ '';
# The test suite doesn't succeed on Hydra.
doCheck = false;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/typesetting/tex/texlive/moderncv.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/typesetting/tex/texlive/moderncv.nix
Tue Feb 21 23:02:36 2012 (r32467)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/typesetting/tex/texlive/moderncv.nix
Tue Feb 21 23:29:21 2012 (r32468)
@@ -3,7 +3,7 @@
name = "moderncv-2012.01.16";
src = fetchurl {
url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";;
- sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";
+ sha256 =
"5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";
};
buildInputs = [texLive unzip];
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
21 23:29:21 2012 (r32468)
@@ -2639,10 +2639,7 @@
maude = callPackage ../development/interpreters/maude { };
octave = callPackage ../development/interpreters/octave {
- # Needed because later gm versions require an initialization the actual
octave is not
- # doing.
- #
http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html
- graphicsmagick = graphicsmagick137;
+ fltk = fltk13;
};
# mercurial (hg) bleeding edge version
@@ -3269,8 +3266,6 @@
clanlib = callPackage ../development/libraries/clanlib { };
- clapack = callPackage ../development/libraries/clapack { };
-
classads = callPackage ../development/libraries/classads { };
classpath = callPackage ../development/libraries/java/classpath {
@@ -4600,7 +4595,11 @@
soprano = callPackage ../development/libraries/soprano { };
- soqt = callPackage ../development/libraries/soqt { };
+ soqt = callPackage ../development/libraries/soqt {
+ qt4 = qt47;
+ };
+
+ soqtQt48 = soqt.override { qt4 = qt48; };
speechd = callPackage ../development/libraries/speechd { };
@@ -6100,7 +6099,7 @@
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
- wpa_supplicant_gui = pkgs.wpa_supplicant.gui;
+ wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix
{ };
xf86_input_multitouch =
callPackage ../os-specific/linux/xf86-input-multitouch { };
@@ -7015,7 +7014,7 @@
merkaartor = callPackage ../applications/misc/merkaartor { };
meshlab = callPackage ../applications/graphics/meshlab {
- qt = qt4;
+ qt = qt47;
};
midori = builderDefsPackage (import
../applications/networking/browsers/midori) {
@@ -7173,8 +7172,11 @@
};
paraview = callPackage ../applications/graphics/paraview {
+ qt4 = qt47;
};
+ paraviewQt48 = paraview.override { qt4 = qt48; };
+
pdftk = callPackage ../tools/typesetting/pdftk { };
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Tue Feb
21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Tue Feb
21 23:29:21 2012 (r32468)
@@ -139,7 +139,7 @@
GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok
html = self.html_1_0_1_2; # 7.4.1 ok
- HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok
+ HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok
network = self.network_2_3_0_11; # 7.4.1 ok
OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok
parallel = self.parallel_3_2_0_2; # 7.4.1 ok
@@ -907,7 +907,7 @@
HUnit_1_2_2_1 = callPackage
../development/libraries/haskell/HUnit/1.2.2.1.nix {};
HUnit_1_2_2_3 = callPackage
../development/libraries/haskell/HUnit/1.2.2.3.nix {};
HUnit_1_2_4_2 = callPackage
../development/libraries/haskell/HUnit/1.2.4.2.nix {};
- HUnit = self.HUnit_1_2_0_3;
+ HUnit = self.HUnit_1_2_4_2;
hxt = callPackage ../development/libraries/haskell/hxt {};
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb
21 23:02:36 2012 (r32467)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb
21 23:29:21 2012 (r32468)
@@ -1822,6 +1822,35 @@
};
});
+ skype4py = buildPythonPackage (rec {
+ name = "Skype4Py-1.0.32.0";
+
+ src = fetchurl {
+ url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
+ sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b";
+ };
+
+ unpackPhase = ''
+ tar xf $src
+ find . -type d -exec chmod +rx {} \;
+ sourceRoot=`pwd`/`ls -d S*`
+ '';
+
+ doCheck = false;
+
+ propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject
];
+
+ meta = {
+ description = "High-level, platform independent Skype API wrapper for
Python";
+
+ # The advertisement says https://developer.skype.com/wiki/Skype4Py
+ # but that url does not work. This following web page points to the
+ # download link and has some information about the package.
+ homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0;
+
+ license = "BSD";
+ };
+ });
sphinx = buildPythonPackage (rec {
name = "Sphinx-1.0.7";
@@ -1888,6 +1917,32 @@
};
};
+ taskcoach = buildPythonPackage rec {
+ name = "TaskCoach-1.3.7";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
+ sha256 = "069hyxc8ypn51a8imfkfqdalp1l4pv09swj2v3bi4hjscq9af6i8";
+ };
+
+ propagatedBuildInputs = [ wxPython ];
+
+ # I don't know why I need to add these libraries. Shouldn't they
+ # be part of wxPython?
+ postInstall = ''
+ libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib
+ wrapProgram $out/bin/taskcoach.py \
+ --prefix LD_LIBRARY_PATH : $libspaths
+ '';
+
+ doCheck = false;
+
+ meta = {
+ homepage = http://taskcoach.org/;
+ description = "Todo manager to keep track of personal tasks and todo
lists";
+ license = "GPLv3+";
+ };
+ };
tempita = buildPythonPackage rec {
version = "0.4";
@@ -2059,6 +2114,28 @@
wxGTK = pkgs.wxGTK28;
};
+ xlib = buildPythonPackage (rec {
+ name = "xlib-0.15rc1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2";
+ sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m";
+ };
+
+ # Tests require `pyutil' so disable them to avoid circular references.
+ doCheck = false;
+
+ propagatedBuildInputs = [ pkgs.xlibs.libX11 ];
+
+ meta = {
+ description = "Fully functional X client library for Python programs";
+
+ homepage = http://python-xlib.sourceforge.net/;
+
+ license = "GPLv2+";
+ };
+ });
+
zbase32 = buildPythonPackage (rec {
name = "zbase32-1.1.2";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
