From 78127c3b86b929e6e989bf26b84abcb05f63b118 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 22 Feb 2011 11:54:42 +0000 Subject: [PATCH 01/45] Move qimageblitz outside of kde-4.x svn path=/nixpkgs/trunk/; revision=26056 --- pkgs/desktops/kde-4.5/default.nix | 2 -- pkgs/desktops/kde-4.6/default.nix | 2 -- .../kde-4.6/support/qimageblitz/default.nix | 21 ------------------- .../libraries}/qimageblitz/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 pkgs/desktops/kde-4.6/support/qimageblitz/default.nix rename pkgs/{desktops/kde-4.5/support => development/libraries}/qimageblitz/default.nix (100%) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 31c998048de..e9838739133 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -43,8 +43,6 @@ recurseIntoAttrs rec { soprano = callPackage ./support/soprano { }; - qimageblitz = callPackage ./support/qimageblitz { }; - ### LIBS kdelibs = callPackage ./libs { }; diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix index 2e7704dfe08..3d882f81bce 100644 --- a/pkgs/desktops/kde-4.6/default.nix +++ b/pkgs/desktops/kde-4.6/default.nix @@ -42,8 +42,6 @@ rec { soprano = callPackage ./support/soprano { }; - qimageblitz = callPackage ./support/qimageblitz { }; - ### LIBS kdelibs = callPackage ./libs { }; diff --git a/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix deleted file mode 100644 index bb3d0220b43..00000000000 --- a/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4}: - -let - pn = "qimageblitz"; - v = "0.0.4"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; - src = fetchurl { - url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2"; - sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; - }; - buildInputs = [ cmake qt4 ]; - - meta = { - description = "Graphical effect and filter library for KDE4"; - license = "BSD"; - homepage = "http://${pn}.sourceforge.net"; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix similarity index 100% rename from pkgs/desktops/kde-4.5/support/qimageblitz/default.nix rename to pkgs/development/libraries/qimageblitz/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f209ea531..d7a5981256c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3982,6 +3982,8 @@ let qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; + qimageblitz = callPackage ../development/libraries/qimageblitz {}; + qjson = callPackage ../development/libraries/qjson { }; qt3 = callPackage ../development/libraries/qt-3 { From 0646cfee1eb78d64f0e32e3a5bc35932695cf8f2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 22 Feb 2011 11:54:49 +0000 Subject: [PATCH 02/45] Move strigi outside of kde-4.x svn path=/nixpkgs/trunk/; revision=26057 --- pkgs/desktops/kde-4.5/default.nix | 2 -- pkgs/desktops/kde-4.6/default.nix | 2 -- .../kde-4.6/support/strigi/default.nix | 29 ------------------- .../libraries}/strigi/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 pkgs/desktops/kde-4.6/support/strigi/default.nix rename pkgs/{desktops/kde-4.5/support => development/libraries}/strigi/default.nix (99%) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index e9838739133..a42b45c76ea 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -39,8 +39,6 @@ recurseIntoAttrs rec { polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; - strigi = callPackage ./support/strigi { }; - soprano = callPackage ./support/soprano { }; ### LIBS diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix index 3d882f81bce..bbd6a00e51d 100644 --- a/pkgs/desktops/kde-4.6/default.nix +++ b/pkgs/desktops/kde-4.6/default.nix @@ -38,8 +38,6 @@ rec { polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; - strigi = callPackage ./support/strigi { }; - soprano = callPackage ./support/soprano { }; ### LIBS diff --git a/pkgs/desktops/kde-4.6/support/strigi/default.nix b/pkgs/desktops/kde-4.6/support/strigi/default.nix deleted file mode 100644 index 7a4cb3b664c..00000000000 --- a/pkgs/desktops/kde-4.6/support/strigi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, expat, exiv2 -, cluceneCore -}: - -stdenv.mkDerivation rec { - name = "strigi-${version}"; - version = "0.7.2"; - - src = fetchurl { - url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; - sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w"; - }; - includeAllQtDirs=true; - - CLUCENE_HOME = cluceneCore; - - # Dependencies such as SQLite and FAM are unreliable in this release - buildInputs = [ - cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore - ]; - - meta = { - homepage = http://strigi.sourceforge.net; - description = "A very fast and efficient crawler to index data on your harddrive"; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix similarity index 99% rename from pkgs/desktops/kde-4.5/support/strigi/default.nix rename to pkgs/development/libraries/strigi/default.nix index 7a4cb3b664c..eeed7b271cd 100644 --- a/pkgs/desktops/kde-4.5/support/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w"; }; includeAllQtDirs=true; - + CLUCENE_HOME = cluceneCore; - + # Dependencies such as SQLite and FAM are unreliable in this release buildInputs = [ cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7a5981256c..0292338d076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4111,6 +4111,8 @@ let stlport = callPackage ../development/libraries/stlport { }; + strigi = callPackage ../development/libraries/strigi {}; + suitesparse = callPackage ../development/libraries/suitesparse { }; sword = callPackage ../development/libraries/sword { }; From 4a5b7854a859f4d6ac6b720d82496711a449ab14 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 22 Feb 2011 11:54:56 +0000 Subject: [PATCH 03/45] Move eigen outside of kde-4.x Michael, sorry for overriding your work but I want to maintain it... svn path=/nixpkgs/trunk/; revision=26058 --- pkgs/desktops/kde-4.5/default.nix | 2 - .../kde-4.5/support/eigen/default.nix | 20 ------ pkgs/desktops/kde-4.6/default.nix | 2 - .../kde-4.6/support/eigen/default.nix | 20 ------ pkgs/development/libraries/eigen/default.nix | 61 +++++-------------- 5 files changed, 16 insertions(+), 89 deletions(-) delete mode 100644 pkgs/desktops/kde-4.5/support/eigen/default.nix delete mode 100644 pkgs/desktops/kde-4.6/support/eigen/default.nix diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index a42b45c76ea..d09b4ae3f53 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -33,8 +33,6 @@ recurseIntoAttrs rec { attica = callPackage ./support/attica { }; - eigen = callPackage ./support/eigen { }; - oxygen_icons = callPackage ./support/oxygen-icons { }; polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; diff --git a/pkgs/desktops/kde-4.5/support/eigen/default.nix b/pkgs/desktops/kde-4.5/support/eigen/default.nix deleted file mode 100644 index e72de6c1b25..00000000000 --- a/pkgs/desktops/kde-4.5/support/eigen/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, cmake}: - -let - v = "2.0.15"; -in -stdenv.mkDerivation { - name = "eigen-${v}"; - src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; - name = "eigen-${v}.tar.bz2"; - sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79"; - }; - buildInputs = [ cmake ]; - meta = { - description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; - license = "LGPL"; - homepage = http://eigen.tuxfamily.org ; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - }; -} diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix index bbd6a00e51d..b117535494a 100644 --- a/pkgs/desktops/kde-4.6/default.nix +++ b/pkgs/desktops/kde-4.6/default.nix @@ -32,8 +32,6 @@ rec { attica = callPackage ./support/attica { }; - eigen = callPackage ./support/eigen { }; - oxygen_icons = callPackage ./oxygen-icons { }; polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; diff --git a/pkgs/desktops/kde-4.6/support/eigen/default.nix b/pkgs/desktops/kde-4.6/support/eigen/default.nix deleted file mode 100644 index e72de6c1b25..00000000000 --- a/pkgs/desktops/kde-4.6/support/eigen/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, cmake}: - -let - v = "2.0.15"; -in -stdenv.mkDerivation { - name = "eigen-${v}"; - src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; - name = "eigen-${v}.tar.bz2"; - sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79"; - }; - buildInputs = [ cmake ]; - meta = { - description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; - license = "LGPL"; - homepage = http://eigen.tuxfamily.org ; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - }; -} diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index bd705fac983..c475682c672 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,49 +1,20 @@ -x@{builderDefsPackage - , cmake - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{stdenv, fetchurl, cmake}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="eigen"; - version="2.0.15"; - name="${baseName}-${version}"; - ext="tar.bz2"; - project="${baseName}"; - url="http://bitbucket.org/${project}/${baseName}/get/${version}.${ext}"; - hash="c68509b80ec2570d025a98e6c4279062b801593c5165ba3d683852e7dbff1569"; - }; +let + v = "2.0.15"; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - name="${sourceInfo.name}.${sourceInfo.ext}"; +stdenv.mkDerivation { + name = "eigen-${v}"; + src = fetchurl { + url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + name = "eigen-${v}.tar.bz2"; + sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79"; }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - phaseNames = ["doCmake" "doMakeInstall"]; - - meta = { - description = "A C++ linear algebra template header"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.lgpl3Plus; + buildNativeInputs = [ cmake ]; + meta = with stdenv.lib; { + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = licenses.lgpl3Plus; + homepage = http://eigen.tuxfamily.org ; + maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; }; - passthru = { - updateInfo = { - downloadPage = "http://eigen.tuxfamily.org/index.php?title=Main_Page"; - }; - }; -}) x +} From eba1278e8450ebec7fb6792d563450481ef1458f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 22 Feb 2011 13:39:56 +0000 Subject: [PATCH 04/45] guile-2-test: Update to 2.0. svn path=/nixpkgs/trunk/; revision=26059 --- pkgs/top-level/guile-2-test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix index 562b251d4c6..802277d474a 100644 --- a/pkgs/top-level/guile-2-test.nix +++ b/pkgs/top-level/guile-2-test.nix @@ -10,7 +10,7 @@ let allPackages { inherit system; config.packageOverrides = pkgs: { - guile = pkgs.guile_1_9; + guile = pkgs.guile_2_0; }; }; From 7201a275db2a82faaee1abdc6bd4c97cf5a5fa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 22 Feb 2011 13:40:01 +0000 Subject: [PATCH 05/45] GNU AutoGen 5.11.6. svn path=/nixpkgs/trunk/; revision=26060 --- pkgs/development/tools/misc/autogen/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 4dd84e4f1e9..00eb6d404ef 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,17 +1,24 @@ { fetchurl, stdenv, guile, which }: -let version = "5.9.8"; in +let version = "5.11.6"; in stdenv.mkDerivation { name = "autogen-${version}"; src = fetchurl { - url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.bz2"; - sha256 = "0y3ygzhzzv7sa0ndvszpfqwcjg4hcb35bcp8qqsndmr6mh6v6cnn"; + url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz"; + sha256 = "013xy0f3hv1cw62nwh4r1x46zs9sndydaz31kd6889dp5p0snfkw"; }; buildInputs = [ guile which ]; + patchPhase = + '' for i in $(find -name \*.in) + do + sed -i "$i" -e's|/usr/bin/||g' + done + ''; + # The tests rely on being able to find `libopts.a'. configureFlags = "--enable-static"; From 04d74baeb054bf51b31f35f22619fe27d59fe9bb Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 22 Feb 2011 19:00:45 +0000 Subject: [PATCH 06/45] * Update dmtcp to version 1.2.0. * Remove patch 'dont_check_uid' that was introduced to allow building hol_light binaries under root, but we will avoid it in the future). svn path=/nixpkgs/trunk/; revision=26062 --- pkgs/os-specific/linux/dmtcp/default.nix | 8 ++--- .../linux/dmtcp/dont_check_uid.patch | 35 ------------------- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 pkgs/os-specific/linux/dmtcp/dont_check_uid.patch diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 39759b03496..c863be14461 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -4,18 +4,16 @@ stdenv.mkDerivation rec { name = "dmtcp-${version}"; - version = "1.1.8"; + version = "1.2.0"; buildInputs = [ perl python ]; src = fetchurl { url = "mirror://sourceforge/dmtcp/dmtcp_${version}.tar.gz"; - sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2"; + sha256 = "1pw3m4l1xf887xagd0yrrnb35s372j0kvjziyy3gmx9fxpga1jzb"; }; - patches = [ ./dont_check_uid.patch ]; - - postPatch = '' + preConfigure = '' substituteInPlace dmtcp/src/dmtcp_coordinator.cpp \ --replace /bin/bash /bin/sh substituteInPlace utils/gdb-add-symbol-file \ diff --git a/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch b/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch deleted file mode 100644 index 23f4a254037..00000000000 --- a/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nuar dmtcp_1.1.8/dmtcp/src/dmtcp_restart.cpp dmtcp_1.1.8.dont_check_uid/dmtcp/src/dmtcp_restart.cpp ---- dmtcp_1.1.8/dmtcp/src/dmtcp_restart.cpp 2010-07-01 06:42:54.000000000 +0200 -+++ dmtcp_1.1.8.dont_check_uid/dmtcp/src/dmtcp_restart.cpp 2010-09-06 23:50:51.000000000 +0200 -@@ -662,14 +662,6 @@ - sprintf(error_msg, "\ndmtcp_restart: ckpt image %s", restorename); - perror(error_msg); - doAbort = true; -- } else if (buf.st_uid != getuid()) { /*Could also run if geteuid() matches*/ -- printf("\nProcess uid (%d) doesn't match uid (%d) of\n" \ -- "checkpoint image (%s).\n" \ -- "This is dangerous. Aborting for security reasons.\n" \ -- "If you still want to do this (at your own risk),\n" \ -- " then modify dmtcp/src/%s:%d and re-compile.\n", -- getuid(), buf.st_uid, restorename, __FILE__, __LINE__ - 6); -- doAbort = true; - } - if (doAbort) - abort(); -diff -Nuar dmtcp_1.1.8/mtcp/mtcp_restart.c dmtcp_1.1.8.dont_check_uid/mtcp/mtcp_restart.c ---- dmtcp_1.1.8/mtcp/mtcp_restart.c 2010-07-01 06:42:53.000000000 +0200 -+++ dmtcp_1.1.8.dont_check_uid/mtcp/mtcp_restart.c 2010-09-07 01:49:20.000000000 +0200 -@@ -157,13 +157,6 @@ - sprintf(error_msg, "\nmtcp_restart: ckpt image %s", restorename); - perror(error_msg); - abort(); -- } else if (buf.st_uid != getuid()) { /*Could also run if geteuid() matches*/ -- mtcp_printf("\nProcess uid (%d) doesn't match uid (%d) of\n" \ -- "checkpoint image (%s).\n" \ -- "This is dangerous. Aborting for security reasons.\n" \ -- "If you still want to do this, modify mtcp/%s:%d and re-compile.\n", -- getuid(), buf.st_uid, restorename, __FILE__, __LINE__ - 5); -- abort(); - } - } - From a297ef596627310eeb4e4db44e165dd7c202d8b9 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 22 Feb 2011 20:57:17 +0000 Subject: [PATCH 07/45] Add lsscsi svn path=/nixpkgs/trunk/; revision=26063 --- pkgs/os-specific/linux/lsscsi/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/linux/lsscsi/default.nix diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix new file mode 100644 index 00000000000..886f6c799a4 --- /dev/null +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +assert stdenv.isLinux; + +stdenv.mkDerivation { + name = "lsscsi-0.24"; + + src = fetchurl { + url = "http://sg.danny.cz/scsi/lsscsi-0.24.tgz"; + sha256 = "0c718w80vi9a0w48q8xmlnbyqzxfd8lax5dcbqg8gvg4l2zaba2c"; + }; + + preConfigure = '' + substituteInPlace Makefile.in --replace /usr "$out" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0292338d076..ac6fcab167e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4704,6 +4704,8 @@ let then utillinuxng else null; + lsscsi = callPackage ../os-specific/linux/lsscsi { }; + e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; eject = callPackage ../os-specific/linux/eject { }; From 3c10d32ad002eaf62585d39fd1bcad669d9b422c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 22 Feb 2011 21:07:36 +0000 Subject: [PATCH 08/45] Oops... Fix alphabetical order in all-packages.nix svn path=/nixpkgs/trunk/; revision=26064 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac6fcab167e..4a475788937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4704,8 +4704,6 @@ let then utillinuxng else null; - lsscsi = callPackage ../os-specific/linux/lsscsi { }; - e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; eject = callPackage ../os-specific/linux/eject { }; @@ -5207,6 +5205,8 @@ let libvolume_id = callPackage ../os-specific/linux/libvolume_id { }; + lsscsi = callPackage ../os-specific/linux/lsscsi { }; + lvm2 = callPackage ../os-specific/linux/lvm2 { }; # In theory GNU Mach doesn't have to be cross-compiled. However, since it From e86ac7fc39dd65e2a794e2dd389dca82258aaa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:07 +0000 Subject: [PATCH 09/45] gnupdate: Fix the MIT Scheme quirk. * maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Fix the mit-scheme quirk. svn path=/nixpkgs/trunk/; revision=26073 --- maintainers/scripts/gnu/gnupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index afe6f3cc046..4e72077ce7f 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -567,7 +567,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ ("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f) ("grub" "alpha.gnu.org" "/gnu" #t) ("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f) - ("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg") + ("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f) ("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f) ("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f))) From ad32df17958d6d44857697cc325fdcfdcc395240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:11 +0000 Subject: [PATCH 10/45] gnupdate: Add a quirk for Source-Highlight. * maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add "source-highlight". svn path=/nixpkgs/trunk/; revision=26074 --- maintainers/scripts/gnu/gnupdate | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 4e72077ce7f..b008a756211 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -569,6 +569,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ ("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f) ("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f) ("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f) + ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f) ("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f))) (let ((quirk (assoc project quirks))) From 7a99d54ca7707345061f0dd882b520426a737485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:15 +0000 Subject: [PATCH 11/45] gnupdate: Handle recursive FTP directory structures; handle funky file names. This patch allows projects with per-version sub-directories to be handled (e.g., MIT Scheme, MyServer, IceCat, etc.) It also makes sure alpha releases are discarded (e.g., "gnupg-2.1.0beta3") as well as unrelated files (e.g., "TeXmacs-600dpi-fonts.tar.gz"). * maintainers/scripts/gnu/gnupdate (ftp-list): Return a list of entries where each entry indicates the file type in addition to the file name. (releases): Adjust accordingly. Recurse into sub-directories and return a list of name/directory pairs. Catch `ftp-error' instead of everything. [release-rx]: Adjust to work with TeXmacs. [alpha-rx]: New variable. [sans-extension]: New procedure. (latest-release): Adjust accordingly. (%package-name-rx): New variable. (package/version): Use it. (packages-to-update): Adjust accordingly. Use the directory returned by `latest-release'. [unpack]: New procedure. (fetch-gnu): Add a `directory' parameter; use it. svn path=/nixpkgs/trunk/; revision=26075 --- maintainers/scripts/gnu/gnupdate | 187 ++++++++++++++++++++----------- 1 file changed, 119 insertions(+), 68 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index b008a756211..c5d0d9dc088 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -478,8 +478,14 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ (throw 'ftp-error conn "LIST" code))))) (else (loop (read-line s) - (let ((file (car (reverse (string-tokenize line))))) - (cons file result))))))) + (match (reverse (string-tokenize line)) + ((file _ ... permissions) + (let ((type (case (string-ref permissions 0) + ((#\d) 'directory) + (else 'file)))) + (cons (list file type) result))) + ((file _ ...) + (cons (cons file 'file) result)))))))) (lambda () (close s) (let-values (((code message) (%ftp-listen (ftp-connection-socket conn)))) @@ -597,28 +603,59 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ (or (assoc-ref quirks project) project)) (define (releases project) - ;; TODO: Handle project release trees like that of IceCat and MyServer. + "Return the list of releases of PROJECT as a list of release name/directory +pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). " ;; TODO: Parse something like fencepost.gnu.org:/gd/gnuorg/packages-ftp. (define release-rx - (make-regexp (string-append "^" project "-[0-9].*\\.tar\\."))) + (make-regexp (string-append "^" project + "-([0-9]|[^-])*(-src)?\\.tar\\."))) - (catch #t + (define alpha-rx + (make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\.")) + + (define (sans-extension tarball) + (let ((end (string-contains tarball ".tar"))) + (substring tarball 0 end))) + + (catch 'ftp-error (lambda () (let-values (((server directory) (ftp-server/directory project))) - (let* ((conn (ftp-open server)) - (files (ftp-list conn directory))) - (ftp-close conn) - (map (lambda (tarball) - (let ((end (string-contains tarball ".tar"))) - (substring tarball 0 end))) + (define conn (ftp-open server)) - ;; Filter out signatures, deltas, and files which are potentially - ;; not releases of PROJECT (e.g., in /gnu/guile, filter out - ;; guile-oops and guile-www). - (filter (lambda (file) - (and (not (string-suffix? ".sig" file)) - (regexp-exec release-rx file))) - files))))) + (let loop ((directories (list directory)) + (result '())) + (if (null? directories) + (begin + (ftp-close conn) + result) + (let* ((directory (car directories)) + (files (ftp-list conn directory)) + (subdirs (filter-map (lambda (file) + (match file + ((name 'directory . _) name) + (_ #f))) + files))) + (loop (append (map (cut string-append directory "/" <>) + subdirs) + (cdr directories)) + (append + ;; Filter out signatures, deltas, and files which are potentially + ;; not releases of PROJECT (e.g., in /gnu/guile, filter out + ;; guile-oops and guile-www; in mit-scheme, filter out + ;; binaries). + (filter-map (lambda (file) + (match file + ((file 'file . _) + (and (not (string-suffix? ".sig" file)) + (regexp-exec release-rx file) + (not (regexp-exec alpha-rx file)) + (let ((s (sans-extension file))) + (and (regexp-exec + %package-name-rx s) + (cons s directory))))) + (_ #f))) + files) + result))))))) (lambda (key subr message . args) (format (current-error-port) "failed to get release list for `~A': ~A ~A~%" @@ -634,53 +671,64 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ (> (strverscmp (string->pointer a) (string->pointer b)) 0)))) (define (latest-release project) - ;; Return "FOO-X.Y" or #f. + "Return (\"FOO-X.Y\" . \"/bar/foo\") or #f." (let ((releases (releases project))) (and (not (null? releases)) (fold (lambda (release latest) - (if (version-string>? release latest) + (if (version-string>? (car release) (car latest)) release latest)) - "" + '("" . "") releases)))) +(define %package-name-rx + ;; Regexp for a package name, e.g., "foo-X.Y". Since TeXmacs uses + ;; "TeXmacs-X.Y-src", the `-src' suffix is allowed. + (make-regexp "^(.*)-(([0-9]|\\.)+)(-src)?")) + (define (package/version name+version) - (let ((hyphen (string-rindex name+version #\-))) - (if (not hyphen) + "Return the package name and version number extracted from NAME+VERSION." + (let ((match (regexp-exec %package-name-rx name+version))) + (if (not match) (values name+version #f) - (let ((name (substring name+version 0 hyphen)) - (version (substring name+version (+ hyphen 1) - (string-length name+version)))) - (values name version))))) + (values (match:substring match 1) (match:substring match 2))))) (define (file-extension file) (let ((dot (string-rindex file #\.))) (and dot (substring file (+ 1 dot) (string-length file))))) (define (packages-to-update gnu-packages) + (define (unpack latest) + (call-with-values (lambda () + (package/version (car latest))) + (lambda (name version) + (list name version (cdr latest))))) + (fold (lambda (pkg result) (call-with-package pkg (lambda (attribute name+version location meta src) (let-values (((name old-version) (package/version name+version))) (let ((latest (latest-release (nixpkgs->gnu-name name)))) - (cond ((not latest) - (format #t "~A [unknown latest version]~%" - name+version) - result) - ((string=? name+version latest) + (if (not latest) + (begin + (format #t "~A [unknown latest version]~%" + name+version) + result) + (match (unpack latest) + ((_ (? (cut string=? old-version <>)) _) (format #t "~A [up to date]~%" name+version) result) - (else - (let-values (((project new-version) - (package/version latest)) - ((old-name old-hash old-urls) + ((project new-version directory) + (let-values (((old-name old-hash old-urls) (src->values src))) - (format #t "~A -> ~A [~A]~%" name+version latest + (format #t "~A -> ~A [~A]~%" + name+version (car latest) (and (pair? old-urls) (car old-urls))) (let* ((url (and (pair? old-urls) (car old-urls))) - (new-hash (fetch-gnu project new-version + (new-hash (fetch-gnu project directory + new-version (if url (file-extension url) "gz")))) @@ -688,39 +736,38 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ old-version old-hash new-version new-hash location) - result)))))))))) + result))))))))))) '() gnu-packages)) -(define (fetch-gnu project version archive-type) - (let-values (((server directory) - (ftp-server/directory project))) - (let* ((base (string-append project "-" version ".tar." archive-type)) - (url (string-append "ftp://" server "/" directory "/" base)) - (sig (string-append base ".sig")) - (sig-url (string-append url ".sig"))) - (let-values (((hash path) (nix-prefetch-url url))) - (pk 'prefetch-url url hash path) - (and hash path - (begin - (false-if-exception (delete-file sig)) - (system* "wget" sig-url) - (if (file-exists? sig) - (let ((ret (system* "gpg" "--verify" sig path))) - (false-if-exception (delete-file sig)) - (if (and ret (= 0 (status:exit-val ret))) - hash - (begin - (format (current-error-port) - "signature verification failed for `~a'~%" - base) - (format (current-error-port) - "(could be because the public key is not in your keyring)~%") - #f))) - (begin - (format (current-error-port) - "no signature for `~a'~%" base) - hash)))))))) +(define (fetch-gnu project directory version archive-type) + (let* ((server (ftp-server/directory project)) + (base (string-append project "-" version ".tar." archive-type)) + (url (string-append "ftp://" server "/" directory "/" base)) + (sig (string-append base ".sig")) + (sig-url (string-append url ".sig"))) + (let-values (((hash path) (nix-prefetch-url url))) + (pk 'prefetch-url url hash path) + (and hash path + (begin + (false-if-exception (delete-file sig)) + (system* "wget" sig-url) + (if (file-exists? sig) + (let ((ret (system* "gpg" "--verify" sig path))) + (false-if-exception (delete-file sig)) + (if (and ret (= 0 (status:exit-val ret))) + hash + (begin + (format (current-error-port) + "signature verification failed for `~a'~%" + base) + (format (current-error-port) + "(could be because the public key is not in your keyring)~%") + #f))) + (begin + (format (current-error-port) + "no signature for `~a'~%" base) + hash))))))) ;;; @@ -823,3 +870,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ (_ #f))) updates) #t)) + +;;; Local Variables: +;;; eval: (put 'call-with-package 'scheme-indent-function 1) +;;; End: From b70494961b8320fccc61d96175f26a34d921682b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:21 +0000 Subject: [PATCH 12/45] gnupdate: Display FTP exceptions more nicely. * maintainers/scripts/gnu/gnupdate (releases): Display MESSAGE and ARGS with ~S. svn path=/nixpkgs/trunk/; revision=26076 --- maintainers/scripts/gnu/gnupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index c5d0d9dc088..f5ddab1a675 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -658,7 +658,7 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). result))))))) (lambda (key subr message . args) (format (current-error-port) - "failed to get release list for `~A': ~A ~A~%" + "failed to get release list for `~A': ~S ~S~%" project message args) '()))) From 918a142f2af19c0c0373a72c36d30eb2e2ed5749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:24 +0000 Subject: [PATCH 13/45] gnupdate: Update the list of ignored attributes. * maintainers/scripts/gnu/gnupdate (%ignored-package-attributes): Update. svn path=/nixpkgs/trunk/; revision=26077 --- maintainers/scripts/gnu/gnupdate | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index f5ddab1a675..f4cb9f504eb 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -504,7 +504,6 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ "automake17x" "automake19x" "automake110x" - "automake" ;; = 1.10.x "bison1875" "bison23" "bison" ;; = 2.3 @@ -522,7 +521,10 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ "glibc25" "glibc27" "glibc29" - "guile_1_9" + "guile_1_8" + "icecat3Xul" ;; redundant with `icecat' + "icecatWrapper" + "icecatXulrunner3" )) (define (gnu? package) From f1f647e6fc4a9642839c6bd5516f8e4ddf8adeaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:28 +0000 Subject: [PATCH 14/45] GNU Xnee 3.09. svn path=/nixpkgs/trunk/; revision=26078 --- pkgs/tools/X11/xnee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 229c0a32eb4..7ecb5cd22b5 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -2,11 +2,11 @@ , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }: stdenv.mkDerivation rec { - name = "xnee-3.08"; + name = "xnee-3.09"; src = fetchurl { url = "mirror://gnu/xnee/${name}.tar.gz"; - sha256 = "0lyznw4j7l2zrd46423cq2ahsp55s8j3phprgkrv0sm18y232yf7"; + sha256 = "08171scqiqzgmbq03rwjvlsakvw9cqrr7h3b743j14z4jzbasi8i"; }; patchPhase = From 20111bb05ac108ba2c151646664ba7201cc480a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:32 +0000 Subject: [PATCH 15/45] GNU Source-Highlight 3.1.4. svn path=/nixpkgs/trunk/; revision=26079 --- pkgs/tools/text/source-highlight/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 35dc7a8a8e6..ae46d212f01 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -2,27 +2,31 @@ let name = "source-highlight"; - version = "3.1.3"; + version = "3.1.4"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; - sha256 = "2d819f2ffdc8bb23a87635bdfbc51545db22605a8e544f66f86054b8075af0b5"; + sha256 = "1jd30ansx2pld196lik6r85aifdhd0cav701vasf4ws8kc8zkcxc"; }; + # Help it find Boost::Regex. + preConfigure = + '' export ax_cv_boost_regex=yes + export link_regex=yes + export BOOST_REGEX_LIB=-lboost_regex + ''; + buildInputs = [boost]; - doCheck = false; # The test suite fails with a trivial - # error, so I'll disable it for now. - # Whoever bumps this build to the next - # version, please re-enable it though! + doCheck = true; meta = { - description = "render source code with syntax highlighting"; + description = "GNU Source-Highlight, source code renderer with syntax highlighting"; homepage = "http://www.gnu.org/software/src-highlite/"; license = "GPLv3+"; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; longDescription = '' From 2fafe4612c3e4ad2a803edba97332fd64b9d91ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 17:36:36 +0000 Subject: [PATCH 16/45] GNU IceCat 3.6.13. svn path=/nixpkgs/trunk/; revision=26080 --- pkgs/applications/networking/browsers/icecat-3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 6be0ce4b4f3..b1551ce778b 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -9,13 +9,13 @@ # http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 . #assert stdenv.isLinux -> (wirelesstools != null); -let version = "3.6.9"; in +let version = "3.6.13"; in stdenv.mkDerivation { name = "icecat-${version}"; src = fetchurl { url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz"; - sha256 = "041rdhhcaak0w0lg0wd1fdl9vlk9a466sh6y17dfz389nswyy8wr"; + sha256 = "0lnpny34sryi55clwcnn80ya7124ips11y18ba36bc2sqwiniigb"; }; buildInputs = From ca1aa628b92024ca0682a99a4f817c81a019d160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Feb 2011 21:24:37 +0000 Subject: [PATCH 17/45] GNU FreeIPMI 1.0.2. svn path=/nixpkgs/trunk/; revision=26084 --- pkgs/tools/system/freeipmi/default.nix | 75 ++++++++++++-------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 7e527ab731a..7711aea3f13 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,48 +1,39 @@ -x@{builderDefsPackage - , libgcrypt, readline - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ fetchurl, stdenv, libgcrypt, readline }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="freeipmi"; - version="1.0.1"; - name="${baseName}-${version}"; - url="http://download.gluster.com/pub/${baseName}/${version}/${name}.tar.gz"; - hash="11j0jvarxvzj89c2fg49ghz75gljdkacid6631q313kc1bd2l0ms"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "freeipmi-1.0.2"; + + src = fetchurl { + url = "mirror://gnu/freeipmi/${name}.tar.gz"; + sha256 = "1v7f9y6dsb6bg5yribq1i66s6kr4hq6g95fhh9k7h1dgcf2qgpyj"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ libgcrypt readline ]; + + doCheck = true; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { - description = "IPMI utility"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.gnu.org/software/freeipmi/download.html"; - }; - }; -}) x + description = "GNU FreeIPMI, an implementation of the Intelligent Platform Management Interface"; + longDescription = + '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on + the IPMI v1.5/2.0 specification. The IPMI specification defines a + set of interfaces for platform management and is implemented by a + number vendors for system management. The features of IPMI that + most users will be interested in are sensor monitoring, system event + monitoring, power control, and serial-over-LAN (SOL). The FreeIPMI + tools and libraries listed below should provide users with the + ability to access and utilize these and many other features. A + number of useful features for large HPC or cluster environments have + also been implemented into FreeIPMI. See the README or FAQ for more + info. + ''; + + homepage = http://www.gnu.org/software/freeipmi/; + + license = "GPLv3+"; + + maintainers = with stdenv.lib.maintainers; [ raskin ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} From f073bf2a3e3fec1904c08438de48b8c1dc031c15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 24 Feb 2011 11:25:16 +0000 Subject: [PATCH 18/45] esniper 2.24.0 is a simple, lightweight tool for sniping eBay auctions. svn path=/nixpkgs/trunk/; revision=26086 --- pkgs/applications/networking/default.nix | 36 ++++++++++++++ .../networking/esniper/default.nix | 31 ++++++++++++ pkgs/top-level/all-packages.nix | 48 ++++++++++--------- 3 files changed, 92 insertions(+), 23 deletions(-) create mode 100644 pkgs/applications/networking/default.nix create mode 100644 pkgs/applications/networking/esniper/default.nix diff --git a/pkgs/applications/networking/default.nix b/pkgs/applications/networking/default.nix new file mode 100644 index 00000000000..a4787c24b9e --- /dev/null +++ b/pkgs/applications/networking/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, clisp, texinfo, perl }: + +let + name = "maxima"; + version = "5.23.2"; +in +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; + sha256 = "0x6fl7lm2jmybd5n3l5qpyvcj9f5zfwizk7wkbpgkjimh58n5skv"; + }; + + preConfigure = '' + configureFlags="--infodir=$out/share/info --mandir=$out/share/man" + ''; + + buildInputs = [clisp texinfo perl]; + + meta = { + description = "Maxima computer algebra system"; + homepage = "http://maxima.sourceforge.net"; + license = "GPLv2"; + + longDescription = '' + Maxima is a fairly complete computer algebra system written in + lisp with an emphasis on symbolic computation. It is based on + DOE-MACSYMA and licensed under the GPL. Its abilities include + symbolic integration, 3D plotting, and an ODE solver. + ''; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix new file mode 100644 index 00000000000..601167c0d4a --- /dev/null +++ b/pkgs/applications/networking/esniper/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, openssl, curl }: + +let + name = "esniper"; +in +stdenv.mkDerivation { + name = "${name}-2.24.0"; + + src = fetchurl { + url = "mirror://sourceforge/${name}/${name}-2-24-0.tgz"; + sha256 = "0h3nlw64x2dczfd4nmz890pk9372iwfzwyyb8zyhiaymb34z5c52"; + }; + + buildInputs = [openssl curl]; + + postInstall = '' + sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe" + chmod 555 "$out/bin/snipe" + ''; + + meta = { + description = "Simple, lightweight tool for sniping eBay auctions"; + homepage = "http://esnipe.rsourceforge.net"; + license = "GPLv2"; + + platforms = stdenv.lib.platforms.alld; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a475788937..600e1b37c50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -71,7 +71,7 @@ let else configExpr; # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) - platform = if platform_ != null then platform_ + platform = if platform_ != null then platform_ else getConfig [ "platform" ] (import ./platforms.nix).pc; # Return an attribute from the Nixpkgs configuration file, or @@ -275,7 +275,7 @@ let inherit stdenv subversion openssh; sshSupport = true; }; - + fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; fetchsvnssh = import ../build-support/fetchsvnssh { @@ -755,7 +755,7 @@ let gt5 = callPackage ../tools/system/gt5 { }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; - + gtkvnc = callPackage ../tools/admin/gtk-vnc {}; gupnp = callPackage ../development/libraries/gupnp { @@ -779,7 +779,7 @@ let hddtemp = callPackage ../tools/misc/hddtemp { }; hdf5 = callPackage ../tools/misc/hdf5 { }; - + hevea = callPackage ../tools/typesetting/hevea { }; highlight = callPackage ../tools/text/highlight { }; @@ -788,8 +788,8 @@ let httpfs2 = callPackage ../tools/filesystems/httpfs { }; - hydra = callPackage ../development/tools/misc/hydra { - nix = nixSqlite; + hydra = callPackage ../development/tools/misc/hydra { + nix = nixSqlite; }; iasl = callPackage ../development/compilers/iasl { }; @@ -1238,7 +1238,7 @@ let slsnif = callPackage ../tools/misc/slsnif { }; smartmontools = callPackage ../tools/system/smartmontools { }; - + smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; fusesmb = callPackage ../tools/filesystems/fusesmb { }; @@ -1333,7 +1333,7 @@ let }; vde2 = callPackage ../tools/networking/vde2 { }; - + verilog = callPackage ../applications/science/electronics/verilog {}; vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; @@ -2093,12 +2093,12 @@ let findlib = callPackage ../development/tools/ocaml/findlib { }; gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; - + lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (gnome) libgnomecanvas libglade gtksourceview; }; - lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { + lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { gtkmathview = callPackage ../development/libraries/gtkmathview { }; }; @@ -3884,7 +3884,7 @@ let ode = builderDefsPackage (import ../development/libraries/ode) { }; - + ogre = callPackage ../development/libraries/ogre {}; openal = callPackage ../development/libraries/openal { }; @@ -4319,7 +4319,7 @@ let ### DEVELOPMENT / LIBRARIES / JAVASCRIPT jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; - + ### DEVELOPMENT / PERL MODULES @@ -5155,9 +5155,9 @@ let linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36); linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37); - linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); - linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); - linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); + linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); + linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); + linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); # The current default kernel / kernel modules. linux = linux_2_6_32; @@ -5772,7 +5772,7 @@ let darcs = haskellPackages.darcs; - darktable = callPackage ../applications/graphics/darktable { + darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf gnome_keyring libglade; }; @@ -5914,6 +5914,8 @@ let espeak = callPackage ../applications/audio/espeak { }; + esniper = callPackage ../applications/networking/esniper { }; + evopedia = callPackage ../applications/misc/evopedia { }; # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide @@ -5988,7 +5990,7 @@ let }; firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo = x.cairo_1_10_0;})); - in p.callPackage + in p.callPackage ../applications/networking/browsers/firefox/4.0.nix { inherit (p.gtkLibs) gtk pango; inherit (p.gnome) libIDL; @@ -6974,7 +6976,7 @@ let crrcsim = callPackage ../games/crrcsim {}; - dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { + dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { gnomegtk = pkgsi686Linux.gnome.gtk; }; @@ -7229,7 +7231,7 @@ let xf86vidmodeproto; }; - oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { + oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { inherit (gtkLibs) glib gtk; }; @@ -7345,7 +7347,7 @@ let leo2 = callPackage ../applications/science/logic/leo2 {}; matita = callPackage ../applications/science/logic/matita { - inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http + inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre; camlp5 = ocamlPackages.camlp5_transitional; }; @@ -7451,9 +7453,9 @@ let electricsheep = callPackage ../misc/screensavers/electricsheep { }; foldingathome = callPackage ../misc/foldingathome { }; - + foo2zjs = callPackage ../misc/drivers/foo2zjs {}; - + foomatic_filters = callPackage ../misc/drivers/foomatic-filters {}; freestyle = callPackage ../misc/freestyle { @@ -7549,7 +7551,7 @@ let }; disnixos = callPackage ../tools/package-management/disnix/disnixos { }; - + DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; latex2html = callPackage ../misc/tex/latex2html/default.nix { From a35dcdb2819e0ed429fe4a2204803a7bdfcd0e3b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 11:59:30 +0000 Subject: [PATCH 19/45] * libvirt updated to 0.8.8. svn path=/nixpkgs/trunk/; revision=26088 --- pkgs/development/libraries/libvirt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 7199e61d6bc..2b107c74bce 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python }: -let version = "0.8.3"; in +let version = "0.8.8"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "07vsk4g1nxvxc8yr6cdvwp9kvwgm2g7lh6aaggfkxb2775n87q9m"; + sha256 = "04z1757qpi3ssnjv5h2qnw1sds2m50yxk67cbdam6w4i50vyl2h3"; }; buildInputs = [ libxml2 gnutls devicemapper perl python ]; @@ -21,5 +21,6 @@ stdenv.mkDerivation { homepage = http://libvirt.org/; description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)."; license = "LGPLv2+"; + platforms = stdenv.lib.platforms.linux; }; } From 049d5697c062e1394d8b09db324e27a88fd83978 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 24 Feb 2011 12:04:00 +0000 Subject: [PATCH 20/45] Adding a patch which fixes vpnc svn path=/nixpkgs/trunk/; revision=26089 --- pkgs/os-specific/linux/iproute/default.nix | 4 +++- pkgs/os-specific/linux/iproute/vpnc.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/iproute/vpnc.patch diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index ba0f1d4fd0f..806efdcba6d 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2"; sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla"; }; - + + patches = [ ./vpnc.patch ]; + preConfigure = '' patchShebangs ./configure diff --git a/pkgs/os-specific/linux/iproute/vpnc.patch b/pkgs/os-specific/linux/iproute/vpnc.patch new file mode 100644 index 00000000000..0a65f3e5df5 --- /dev/null +++ b/pkgs/os-specific/linux/iproute/vpnc.patch @@ -0,0 +1,15 @@ +vpnc fails with "RTNETLINK answers: No such device" +Patch from: https://bugs.gentoo.org/attachment.cgi?id=245736 +In reference to: https://bugs.gentoo.org/show_bug.cgi?id=331447 + +--- iproute2-2.6.35.old/ip/iproute.c 2010-09-02 16:00:21.805000124 +0200 ++++ iproute2-2.6.35/ip/iproute.c 2010-09-02 16:00:40.782000125 +0200 +@@ -160,7 +160,7 @@ + if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN) + ip6_multiple_tables = 1; + +- if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED)) ++ if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED)) + return 0; + + if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) { From 76b07fbc18cd51b115a474ffe2ab4d3e6c6e1fec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 13:11:51 +0000 Subject: [PATCH 21/45] * Linux 2.6.32.29. svn path=/nixpkgs/trunk/; revision=26090 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index e46de7672fc..a95072d9ed3 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.28"; + version = "2.6.32.29"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2"; - sha256 = "0dzaj5k0sfzkr0klv52plfs66rf0hrbi2a9fs61smcwhc6yxnjdh"; + sha256 = "1xwsmrlnhla8k612lz3jq9bl4c3b620m4pr74gv0rwsiksmh2l6c"; }; config = configWithPlatform stdenv.platform; From 6bab14437c6d0c4965db053cf17e4232c5322d63 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 13:36:18 +0000 Subject: [PATCH 22/45] * libvirt: use /var and set the correct paths to ip/iptables. svn path=/nixpkgs/trunk/; revision=26091 --- .../development/libraries/libvirt/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 2b107c74bce..d0201771484 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python }: +{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python, iproute, iptables }: let version = "0.8.8"; in @@ -10,13 +10,18 @@ stdenv.mkDerivation { sha256 = "04z1757qpi3ssnjv5h2qnw1sds2m50yxk67cbdam6w4i50vyl2h3"; }; - buildInputs = [ libxml2 gnutls devicemapper perl python ]; + buildInputs = [ libxml2 gnutls devicemapper perl python iproute iptables ]; + + configureFlags = + '' + --localstatedir=/var + IP_PATH=${iproute}/sbin/ip + IPTABLES_PATH=${iptables}/sbin/iptables + IP6TABLES_PATH=${iptables}/sbin/ip6tables + ''; + + installFlags = "localstatedir=$(TMPDIR)/var"; - # xen currently disabled in nixpkgs - configureFlags = '' - --without-xen - ''; - meta = { homepage = http://libvirt.org/; description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)."; From 9bbe78533eba5b12489f42f9a19a866a17a55c65 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 15:42:51 +0000 Subject: [PATCH 23/45] * Add readline support to libvirt. svn path=/nixpkgs/trunk/; revision=26097 --- pkgs/development/libraries/libvirt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index d0201771484..8d66009288f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python, iproute, iptables }: +{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python +, iproute, iptables, readline }: let version = "0.8.8"; in @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "04z1757qpi3ssnjv5h2qnw1sds2m50yxk67cbdam6w4i50vyl2h3"; }; - buildInputs = [ libxml2 gnutls devicemapper perl python iproute iptables ]; + buildInputs = [ libxml2 gnutls devicemapper perl python iproute iptables readline ]; configureFlags = '' From a9ca5acac3b08c31da4245908b04d80b2952057d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 16:20:47 +0000 Subject: [PATCH 24/45] * Grrr, we should really mirror jquery-ui. svn path=/nixpkgs/trunk/; revision=26099 --- pkgs/development/libraries/javascript/jquery-ui/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index 3174b9b76f1..2334a04f9b8 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.8.9"; + name = "jquery-ui-1.8.10"; src = fetchurl { url = "http://jqueryui.com/download/${name}.custom.zip"; - sha256 = "1fnn5xwj57bdf9z786iymcxa7c4qf6mv4jm5m7q52j72by8gf011"; + sha256 = "0yglab9zmxr1il2rmxxd7gycpfaavgpi03h8nc5b2yx2kz80jlik"; }; sourceRoot = "."; @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://jqueryui.com/; description = "A library of JavaScript widgets and effects"; + platforms = stdenv.lib.platforms.all; }; } From 60e9fc7991d4a3677c49291128de20bcca38d4f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 16:24:54 +0000 Subject: [PATCH 25/45] * Fix a typo in the `platforms' attribute. svn path=/nixpkgs/trunk/; revision=26100 --- pkgs/applications/networking/esniper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 601167c0d4a..5590e8f1156 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = "http://esnipe.rsourceforge.net"; license = "GPLv2"; - platforms = stdenv.lib.platforms.alld; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; }; } From df45fa18bb5591da51b58f96f3d337c27b325ac2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 16:25:10 +0000 Subject: [PATCH 26/45] * qemu-kvm updated to 0.14.0. svn path=/nixpkgs/trunk/; revision=26101 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 4a1d84d20d0..012e9bb46a7 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "qemu-kvm-0.13.0"; + name = "qemu-kvm-0.14.0"; src = fetchurl { url = "mirror://sourceforge/kvm/${name}.tar.gz"; - sha256 = "0lxym4p2bvqcb37h3wbjd81w4jrj4dn5kivdxcpx27iwgq6n1ckd"; + sha256 = "0d86bj1sipg9br8xks9527cjc482gf9813h8rm690yswcprsyqig"; }; patches = [ ./smb-tmpdir.patch ]; From 3c2ba9df1ae2a0631ab3144600a34eba56cdd606 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 24 Feb 2011 18:08:16 +0000 Subject: [PATCH 27/45] Dropped file that was checked in by accident. Thanks, Ludo, for catching this mistake. svn path=/nixpkgs/trunk/; revision=26102 --- pkgs/applications/networking/default.nix | 36 ------------------------ 1 file changed, 36 deletions(-) delete mode 100644 pkgs/applications/networking/default.nix diff --git a/pkgs/applications/networking/default.nix b/pkgs/applications/networking/default.nix deleted file mode 100644 index a4787c24b9e..00000000000 --- a/pkgs/applications/networking/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, clisp, texinfo, perl }: - -let - name = "maxima"; - version = "5.23.2"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "0x6fl7lm2jmybd5n3l5qpyvcj9f5zfwizk7wkbpgkjimh58n5skv"; - }; - - preConfigure = '' - configureFlags="--infodir=$out/share/info --mandir=$out/share/man" - ''; - - buildInputs = [clisp texinfo perl]; - - meta = { - description = "Maxima computer algebra system"; - homepage = "http://maxima.sourceforge.net"; - license = "GPLv2"; - - longDescription = '' - Maxima is a fairly complete computer algebra system written in - lisp with an emphasis on symbolic computation. It is based on - DOE-MACSYMA and licensed under the GPL. Its abilities include - symbolic integration, 3D plotting, and an ODE solver. - ''; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} From 377b97a37b928c6eb01c6e74c81f89cdc72c4316 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Feb 2011 21:48:32 +0000 Subject: [PATCH 28/45] * Drop the unnecessary boot=on flag. svn path=/nixpkgs/trunk/; revision=26104 --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8442d8bd1b1..cfd057110fe 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -218,7 +218,7 @@ rec { -net nic,model=virtio \ -chardev socket,id=samba,path=./samba \ -net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \ - -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \ + -drive file=$diskImage,if=virtio,cache=writeback,werror=report \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ -append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \ From 05d5478c9bba37953b650ca5e356f508bca0bb3d Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 24 Feb 2011 22:19:27 +0000 Subject: [PATCH 29/45] acpi: 0.09 -> 1.5 (picked from debian) svn path=/nixpkgs/trunk/; revision=26105 --- pkgs/os-specific/linux/acpi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 666f2d9475b..84ee4486807 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpi-0.09"; + name = "acpi-1.5"; src = fetchurl { - url = "http://grahame.angrygoats.net/source/acpi/${name}.tar.gz"; - sha256 = "11iwzbm3gcn9ljvxl4cjj9fc1n135hx45rhrsprnnkqppndf3vn1"; + url = "http://ftp.de.debian.org/debian/pool/main/a/acpi/acpi_1.5.orig.tar.gz"; + sha256 = "1pb020j627ldjm1askqfzp6cjxrs79ail8svihanv7pgbg5r3zsp"; }; meta = { From 67dae3543fd9d72d056feb697087c8e904841c31 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 24 Feb 2011 22:19:32 +0000 Subject: [PATCH 30/45] update chrome svn path=/nixpkgs/trunk/; revision=26106 --- .../networking/browsers/chromium/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3f3aeaaf297..b8ec890315d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,17 +8,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; - version = "74731"; + version = "75853"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-12/${version}/chrome-linux.zip"; - sha256 = "1g1xi8l02mv53r7g3x6w93i0rqdx09k8x7bypm9g51w315k6yssj"; + url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-23/${version}/chrome-linux.zip"; + sha256 = "1bh507j1pm3qrkj8afzhmqicza5nms6f4dc9848xjgcvj9x2qii7"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-12/${version}/chrome-linux.zip"; - sha256 = "163z2b7c7plf0ys18mj0g5ppkdfw9sr8i089hy2h7l0xscp18s11"; + url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-23/${version}/chrome-linux.zip"; + sha256 = "0rq888yvw5zsh0c3jnp115y4sl1q5kn4pz8flnwhrh35ca15lchn"; } else throw "Chromium is not supported on this platform."; From ecf72a57204e11d1363f864ae59e4a232c14a6cc Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 24 Feb 2011 22:19:37 +0000 Subject: [PATCH 31/45] git: 1.7.4 -> 1.7.4.1 svn path=/nixpkgs/trunk/; revision=26107 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 5dca2a4e651..e0d7d26b83d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.4"; + name = "git-1.7.4.1"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "0lggpkna2icrfwh2iysb4pgx3d5b5l64bnz34rgs6ipvbng0n9lf"; + sha256 = "06ydc1dr8ndiqc7rkh0xxiffyfq22gwfdzdds7cbqsprr30szic5"; }; patches = [ ./docbook2texi.patch ]; From a5dae2652e0db4b0ae0aec6100539892e08cdd02 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 24 Feb 2011 22:19:42 +0000 Subject: [PATCH 32/45] kernel: 2.6.37 -> 2.6.37.1 svn path=/nixpkgs/trunk/; revision=26108 --- pkgs/os-specific/linux/kernel/linux-2.6.37.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.37.nix b/pkgs/os-specific/linux/kernel/linux-2.6.37.nix index de6cb182381..11659fafd76 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.37.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.37.nix @@ -191,11 +191,11 @@ in import ./generic.nix ( rec { - version = "2.6.37"; + version = "2.6.37.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0fiq3v3y1sb0438h93z3jx7ygxc7ksxgxfx3az7kjis10lc0kgzd"; + sha256 = "0wyl8ki7m6f037glcg77nx5r1bn5mmm1xskvv5xz7g7h20kvlwhw"; }; config = configWithPlatform stdenv.platform; From f54652ea564accdcf6a22bece4e000d98b920074 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 24 Feb 2011 22:19:47 +0000 Subject: [PATCH 33/45] ledger: update to 2.6.3. svn path=/nixpkgs/trunk/; revision=26109 --- pkgs/applications/office/ledger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 14121e6281f..99b768c58e1 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -5,7 +5,7 @@ let pname = "ledger"; - version = "2.6.1"; + version = "2.6.3"; name = "${pname}-${version}"; in @@ -14,8 +14,8 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "96830d77d3aa6bf6c5778f5dd52169f9b5203fb7daad0e12831abeb35b14f27a"; + url = "https://github.com/downloads/jwiegley/ledger/ledger-${version}.tar.gz"; + sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; }; buildInputs = [ emacs gmp pcre ]; From 583053d018843c3d48e474c038b8aff05471d413 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Feb 2011 13:24:41 +0000 Subject: [PATCH 34/45] * libvirt: enable some more features. svn path=/nixpkgs/trunk/; revision=26111 --- pkgs/development/libraries/libvirt/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8d66009288f..aa080f39875 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python -, iproute, iptables, readline }: +{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python +, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess }: let version = "0.8.8"; in @@ -11,16 +11,18 @@ stdenv.mkDerivation { sha256 = "04z1757qpi3ssnjv5h2qnw1sds2m50yxk67cbdam6w4i50vyl2h3"; }; - buildInputs = [ libxml2 gnutls devicemapper perl python iproute iptables readline ]; + buildInputs = + [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 + utillinux udev libpciaccess + ]; - configureFlags = + preConfigure = '' - --localstatedir=/var - IP_PATH=${iproute}/sbin/ip - IPTABLES_PATH=${iptables}/sbin/iptables - IP6TABLES_PATH=${iptables}/sbin/ip6tables + PATH=${iproute}/sbin:${iptables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH ''; + configureFlags = "--localstatedir=/var"; + installFlags = "localstatedir=$(TMPDIR)/var"; meta = { From 55050ba5c66bfbc209ff9f6311fdedf216ae585f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Feb 2011 14:48:53 +0000 Subject: [PATCH 35/45] * iptables updated to 1.4.10. svn path=/nixpkgs/trunk/; revision=26113 --- pkgs/os-specific/linux/iptables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 2f447f72ab2..a1dace598fe 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.8"; + name = "iptables-1.4.10"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - sha256 = "342926b3f9635f89f479660835b0ba518ccd465552e41c29aa83c5af7d506496"; + md5 = "f382fe693f0b59d87bd47bea65eca198"; }; # Install header files required by miniupnpd. From f5430786552a147b005b069f63f002816e397c19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Feb 2011 15:56:10 +0000 Subject: [PATCH 36/45] * Install the libvirt-guests boot script for saving/restoring VMs across host reboots. svn path=/nixpkgs/trunk/; revision=26120 --- pkgs/development/libraries/libvirt/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index aa080f39875..e5429bf0995 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python -, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess }: +, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext }: let version = "0.8.8"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 - utillinux udev libpciaccess + utillinux udev libpciaccess gettext ]; preConfigure = @@ -21,10 +21,16 @@ stdenv.mkDerivation { PATH=${iproute}/sbin:${iptables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH ''; - configureFlags = "--localstatedir=/var"; + configureFlags = "--localstatedir=/var --with-init-script=redhat"; installFlags = "localstatedir=$(TMPDIR)/var"; + postInstall = + '' + substituteInPlace $out/etc/rc.d/init.d/libvirt-guests \ + --replace "$out/bin" "${gettext}/bin" + ''; + meta = { homepage = http://libvirt.org/; description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)."; From 9e204fec072f05d2710b3d4c6fc3b7379bda39f6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 27 Feb 2011 18:56:15 +0000 Subject: [PATCH 37/45] Update SBCL svn path=/nixpkgs/trunk/; revision=26124 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 6521bb8c72a..945176d5ac7 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.45"; - name="sbcl-1.0.45"; - hash="1asl4qy2mizj239cmgnw2dza03h7j3ysrkdavc5gnv9y4gn9miyi"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2"; + version="1.0.46"; + name="sbcl-1.0.46"; + hash="1sdm0gf9vajk65hn07xl0j084fkk7rsjrpqk8sa8183gbkgag79n"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.46/sbcl-1.0.46-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.46/sbcl-1.0.46-source.tar.bz2"; } From e5e98b9984eaa3d85faecf72a9816e1bf8416c24 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 28 Feb 2011 20:56:01 +0000 Subject: [PATCH 38/45] Updating veracity; adding parts of needed infrastructure for tests. Currently, a test run would fail svn path=/nixpkgs/trunk/; revision=26126 --- .../version-management/veracity/default.nix | 21 +++++++++++++++++-- .../veracity/src-for-default.nix | 8 +++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 3005da5aba6..88ab7d08bca 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -19,12 +19,21 @@ rec { inherit (s) name; inherit buildInputs; - phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doDeploy"]; + phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"]; dump0 = (a.doDump "0"); + doTest = a.fullDepEntry '' + sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f) + mkdir pseudo-home + export HOME=$PWD/pseudo-home + echo make test + '' ["doMake" "minInit"]; + prepare_sgneeds = a.fullDepEntry ('' + ensureDir "$out/sgneeds/include/spidermonkey" for d in bin include lib; do + ensureDir "$out/sgneeds/$d" ensureDir "$out/sgneeds/$d" for p in "${spidermonkey_1_8_0rc1}"; do for f in "$p"/"$d"/*; do @@ -32,6 +41,11 @@ rec { done done done + for p in "${spidermonkey_1_8_0rc1}/include" "${spidermonkey_1_8_0rc1}/include/js"; do + for f in "$p"/*; do + ln -sf "$f" "$out"/sgneeds/include/spidermonkey/ + done + done ensureDir "$out/sgneeds/include/sgbrings" ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js" @@ -41,6 +55,9 @@ rec { done export SGNEEDS_DIR="$out"/sgneeds/ + export VVTHIRDPARTY="$out"/sgneeds/ + + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/sgneeds/include" '') ["minInit" "defEnsureDir"]; prepareMakefiles = a.fullDepEntry '' @@ -48,7 +65,7 @@ rec { mkdir build cd build export NIX_LDFLAGS="$NIX_LDFLAGS -lssl" - cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity* + cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity* '' ["minInit" "addInputs" "doUnpack"]; doDeploy = a.fullDepEntry '' diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index eb80ffb5179..9fb27df0757 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.7.10383"; - name="veracity-0.5.7.10383"; - hash="1826zr2nwd6qknvv6mw7a2x93fwi4wpabfq4ijy6am3cl55hdy51"; + version="0.5.7.10397"; + name="veracity-0.5.7.10397"; + hash="09w1qj4wklaf7mw0vavzyqpagcd0cwqppdl8vaqqi0irddgivnq8"; url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10383.tar.gz"; + advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10397.tar.gz"; } From b13e4ebdefefd687adfaf8b05e9695dc6168672b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 1 Mar 2011 11:56:41 +0000 Subject: [PATCH 39/45] Updated ghc HEAD expression to 7.0.2-rc2. svn path=/nixpkgs/trunk/; revision=26127 --- pkgs/development/compilers/ghc/head.nix | 46 +++---------------------- 1 file changed, 4 insertions(+), 42 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index e24e1aaebcb..f69d4144d05 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: stdenv.mkDerivation rec { - version = "6.13.20100917"; + version = "7.0.1.20110217"; + label = "7.0.2-rc2"; name = "ghc-${version}"; @@ -9,8 +10,8 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; src = fetchurl { - url = "${homepage}/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "0b5pg6688yfzd5zfaffjp21y933vp94h94ds85gwi156f4g3bkij"; + url = "${homepage}/dist/${label}/${name}-src.tar.bz2"; + sha256 = "18jbw5na4v8v2vzswbi8xfd73mx8zv1diym0bg5bns5337q76lzi"; }; buildInputs = [ghc perl gmp ncurses]; @@ -42,43 +43,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; - # TODO: requires a comment as to what it does and why it is needed. - passthru = { - corePackages = [ - [ "Cabal" "1.8.0.2" ] - [ "array" "0.3.0.0" ] - [ "base" "3.0.3.2" ] - [ "base" "4.2.0.0" ] - [ "bin-package-db" "0.0.0.0" ] - [ "bytestring" "0.9.1.5" ] - [ "containers" "0.3.0.0" ] - [ "directory" "1.0.1.0" ] - [ "dph-base" "0.4.0" ] - [ "dph-par" "0.4.0" ] - [ "dph-prim-interface" "0.4.0" ] - [ "dph-prim-par" "0.4.0" ] - [ "dph-prim-seq" "0.4.0" ] - [ "dph-seq" "0.4.0" ] - [ "extensible-exceptions" "0.1.1.1" ] - [ "ffi" "1.0" ] - [ "filepath" "1.1.0.3" ] - [ "ghc" "6.12.1" ] - [ "ghc-binary" "0.5.0.2" ] - [ "ghc-prim" "0.2.0.0" ] - [ "haskell98" "1.0.1.1" ] - [ "hpc" "0.5.0.4" ] - [ "integer-gmp" "0.2.0.0" ] - [ "old-locale" "1.0.0.2" ] - [ "old-time" "1.0.0.3" ] - [ "pretty" "1.0.1.1" ] - [ "process" "1.0.1.2" ] - [ "random" "1.0.0.2" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.2" ] - [ "template-haskell" "2.4.0.0" ] - [ "time" "1.1.4" ] - [ "unix" "2.4.0.0" ] - [ "utf8-string" "0.3.4" ] - ]; - }; } From e1cf8f90e6dc53ed136a88b3125e45b6dd729640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Mar 2011 17:18:15 +0000 Subject: [PATCH 40/45] Adding GNU Triangulated Surface library svn path=/nixpkgs/trunk/; revision=26132 --- pkgs/development/libraries/gts/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/gts/default.nix diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix new file mode 100644 index 00000000000..b3038d5eadd --- /dev/null +++ b/pkgs/development/libraries/gts/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, glib, pkgconfig }: + + +stdenv.mkDerivation rec { + name = "gts-${version}"; + version = "0.7.6"; + + src = fetchurl { + url = "mirror://sourceforge/gts/${name}.tar.gz"; + sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; + }; + + buildInputs = [ glib pkgconfig ]; + + meta = { + homepage = http://gts.sourceforge.net/; + license = "LGPLv2+"; + description = "GNU Triangulated Surface Library"; + + longDescription = '' + Library intended to provide a set of useful functions to deal with + 3D surfaces meshed with interconnected triangles. + ''; + + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 600e1b37c50..c580756a09e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3303,6 +3303,8 @@ let gtkspell = callPackage ../development/libraries/gtkspell { }; + gts = callPackage ../development/libraries/gts { }; + # TODO : Add MIT Kerberos and let admin choose. kerberos = heimdal; From 6381040f0a1ab31265c19ed7b76a0f53761fce4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Mar 2011 17:18:20 +0000 Subject: [PATCH 41/45] Adding coin3d and soqt svn path=/nixpkgs/trunk/; revision=26133 --- pkgs/development/libraries/coin3d/default.nix | 22 +++++++++++++++++++ pkgs/development/libraries/soqt/default.nix | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/coin3d/default.nix create mode 100644 pkgs/development/libraries/soqt/default.nix diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix new file mode 100644 index 00000000000..f676c9abaa0 --- /dev/null +++ b/pkgs/development/libraries/coin3d/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv, mesa }: + +stdenv.mkDerivation rec { + name = "coin3d-${version}"; + version = "3.1.3"; + + src = fetchurl { + url = "http://ftp.coin3d.org/coin/src/all/Coin-${version}.tar.gz"; + sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q"; + }; + + buildInputs = [ mesa ]; + + meta = { + homepage = http://www.coin3d.org/; + license = "GPLv2+"; + description = "High-level, retained-mode toolkit for effective 3D graphics development."; + + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix new file mode 100644 index 00000000000..f5a7724c506 --- /dev/null +++ b/pkgs/development/libraries/soqt/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv, coin3d, qt4 }: + +stdenv.mkDerivation rec { + name = "soqt-${version}"; + version = "1.5.0"; + + src = fetchurl { + url = "http://ftp.coin3d.org/coin/src/all/SoQt-${version}.tar.gz"; + sha256 = "14dbh8ynzjcgwgxjc6530c5plji7vn62kbdf447w0dp53564p8zn"; + }; + + buildInputs = [ coin3d qt4 ]; + + meta = { + homepage = http://www.coin3d.org/; + license = "GPLv2+"; + description = "Glue between Coin high-level 3D visualization library and Qt"; + + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} From f58e7158e04657ef089164882461e726fa6b5642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Mar 2011 17:18:24 +0000 Subject: [PATCH 42/45] Updating ODE. svn path=/nixpkgs/trunk/; revision=26134 --- pkgs/development/libraries/ode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 2cc240c7ec3..31b2aa7dad9 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.attrByPath ["version"] "0.10.1" args; + version = lib.attrByPath ["version"] "0.11.1" args; buildInputs = with args; [ ]; @@ -11,7 +11,7 @@ in rec { src = fetchurl { url = "http://downloads.sourceforge.net/opende/ode-${version}.tar.bz2"; - sha256 = "0bm7kmm7qvrbk40pgaszqr66pjfvnln8vjzdmcdl2h1dxi3b4dln"; + sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47"; }; inherit buildInputs; From d11c00e5a5ea121f218501931ccc9195c696bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Mar 2011 17:18:30 +0000 Subject: [PATCH 43/45] Adding xercesc, the references to coin3d and soqt, and trying to add freecad (that still does not build). svn path=/nixpkgs/trunk/; revision=26135 --- .../applications/graphics/freecad/default.nix | 45 +++++++++++++++++++ .../development/libraries/xercesc/default.nix | 17 +++++++ pkgs/top-level/all-packages.nix | 8 ++++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/graphics/freecad/default.nix create mode 100644 pkgs/development/libraries/xercesc/default.nix diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix new file mode 100644 index 00000000000..0dc942c202d --- /dev/null +++ b/pkgs/applications/graphics/freecad/default.nix @@ -0,0 +1,45 @@ +{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, +boost, zlib, +python, swig, gfortran, soqt, autoconf, automake, libtool }: + +throw "It does not build still" + +stdenv.mkDerivation rec { + name = "freecad-${version}"; + version = "0.11.3729"; + + src = fetchurl { +/* + url = "mirror://sourceforge/free-cad/freecad-${version}.tar.gz"; + sha256 = "0q9jhnhkjsq9iy4kqi4xh2ljack4b2jj4pjm4dylv4z2d9gg5p4l"; +*/ + url = "mirror://sourceforge/free-cad/freecad-${version}.dfsg.tar.gz"; + sha256 = "0sjcbadzzgdjr5bk51nr3nq0siyvfdq0913dqlhv9xr42vha3j8r"; + }; + + buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost + zlib python swig gfortran soqt /*autoconf automake libtool*/ ]; + +/* + # Using autotools + patchPhase = '' + sed -i -e 's/boost_\([a-z_]\+\)-mt/boost_\1/' \ + configure + ''; + + configureFlags = [ "--with-eigen2-include=${eigen}/include/eigen2" + "--with-boost-include=${boost}/include" + "--with-boost-lib=${boost}/lib" + "--with-qt4-dir=${qt4}" + ]; +*/ + + # Using cmake + + patchPhase = '' + sed -i -e '/Idf/d' -e '/Start/d' src/Mod/CMakeLists.txt + ''; + + cmakeFlags = [ "-Wno-dev" ]; + +} diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix new file mode 100644 index 00000000000..f5c9ba8a698 --- /dev/null +++ b/pkgs/development/libraries/xercesc/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "xerces-c-${version}"; + version = "3.1.1"; + + src = fetchurl { + url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; + sha256 = "0dl7jr26vlh5p3hps86xrwyafq6f21schc9q4zyxb48b3vvqa9x4"; + }; + + meta = { + homepage = http://xerces.apache.org/xerces-c/; + description = "Validating XML parser written in a portable subset of C++"; + license = "ASL2.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c580756a09e..813a9475d11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2875,6 +2875,8 @@ let inherit (gnome) gtk; }; + coin3d = callPackage ../development/libraries/coin3d { }; + commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; confuse = callPackage ../development/libraries/confuse { }; @@ -4091,6 +4093,8 @@ let # optional }; + soqt = callPackage ../development/libraries/soqt { }; + speechd = callPackage ../development/libraries/speechd { }; speex = callPackage ../development/libraries/speex { }; @@ -4214,6 +4218,8 @@ let xautolock = callPackage ../misc/screensavers/xautolock { }; + xercesc = callPackage ../development/libraries/xercesc {}; + xercesJava = callPackage ../development/libraries/java/xerces { ant = apacheAntGcj; # for bootstrap purposes javac = gcj; @@ -6021,6 +6027,8 @@ let flite = callPackage ../applications/misc/flite { }; + freecad = callPackage ../applications/graphics/freecad { }; + freemind = callPackage ../applications/misc/freemind { jdk = jdk; jre = jdk; From 53a7f858718d512c5bc7e46de9d3c2c7885e34f1 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 2 Mar 2011 18:49:56 +0000 Subject: [PATCH 44/45] cmake-2.8.4 svn path=/nixpkgs/trunk/; revision=26137 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 84a41db541a..3e0b485e62e 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -5,7 +5,7 @@ let os = stdenv.lib.optionalString; inherit (stdenv.lib) optional; majorVersion = "2.8"; - minorVersion = "3"; + minorVersion = "4"; version = "${majorVersion}.${minorVersion}"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "1262bz0c0g5c57ba7rbbrs72xa42xs26fwf72mazmkmmhqkx17k8"; + sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr"; }; buildInputs = [ curl expat zlib bzip2 libarchive ] From efb12635d37c4f12183a013e3fddde0411bc37b3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 2 Mar 2011 18:50:00 +0000 Subject: [PATCH 45/45] Qca2: do not separate debug info svn path=/nixpkgs/trunk/; revision=26138 --- pkgs/development/libraries/qca2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 1ddbf40d15e..46b7d26bdfc 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' ''; + + configureFlags = "--no-separate-debug-info"; meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL";