From eb7e848f4b9826e6e61ceaca873a1be8c8b9f507 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 22 Nov 2010 12:01:45 +0000 Subject: [PATCH 01/10] subversion: enable key-chain services on Darwin to fix pysvn build svn path=/nixpkgs/trunk/; revision=24805 --- pkgs/applications/version-management/subversion/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8f7ec37823ae..0c94d96a999d 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} + ${if stdenv.isDarwin then "--enable-keychain" else ""} --with-zlib=${zlib} --with-sqlite=${sqlite} ''; From 1af46c1160976ab4ca7df4e59803385f96cef4c3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Nov 2010 12:45:59 +0000 Subject: [PATCH 02/10] * Qt doesn't build on Darwin. svn path=/nixpkgs/trunk/; revision=24807 --- pkgs/development/libraries/qt-4.x/4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix index 3253e58e7c21..904e29beae9b 100644 --- a/pkgs/development/libraries/qt-4.x/4.6/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.6/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } From 1c86c832c1c02946216e8eb36c855073b6bde72e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Nov 2010 14:23:06 +0000 Subject: [PATCH 03/10] add google v8 engine svn path=/nixpkgs/trunk/; revision=24809 --- pkgs/development/libraries/v8/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/v8/default.nix diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix new file mode 100644 index 000000000000..766b6f382683 --- /dev/null +++ b/pkgs/development/libraries/v8/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchsvn, python, scons, makeWrapper }: + +let + system = stdenv.system; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else abort "not supported"; +in +stdenv.mkDerivation rec { + name = "v8-r${toString src.rev}"; + src = fetchsvn { + url = http://v8.googlecode.com/svn/trunk ; + sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb"; + rev = 5865; + }; + + buildInputs = [python scons makeWrapper]; + + buildPhase = '' + export CXX=`type -p g++` + scons snapshot=on importenv=PATH arch=${arch} + scons snapshot=on library=shared importenv=PATH arch=${arch} + scons sample=shell snapshot=on importenv=PATH arch=${arch} + ''; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/lib + + cp -v libv8.* $out/lib + cp -v shell $out/bin/v8-shell + cp -vR include $out/ + wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib + + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac1aab8064c7..4baa02184aa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4045,6 +4045,8 @@ let swt = callPackage ../development/libraries/java/swt { }; + v8 = callPackage ../development/libraries/v8 { }; + xalanj = xalanJava; xalanJava = callPackage ../development/libraries/java/xalanj { ant = apacheAntGcj; # for bootstrap purposes From a2df7f46eae2b03a7b872d561ffe9d67493a0cb6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Nov 2010 14:32:43 +0000 Subject: [PATCH 04/10] v8: no abort svn path=/nixpkgs/trunk/; revision=24810 --- pkgs/development/libraries/v8/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 766b6f382683..9e60f1ce8ba1 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -2,8 +2,9 @@ let system = stdenv.system; - arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else abort "not supported"; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; in +assert system == "i686-linux" || system == "x86_64-linux"; stdenv.mkDerivation rec { name = "v8-r${toString src.rev}"; src = fetchsvn { From 70408359ca8ed7842d314c153a62a1448565a488 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Nov 2010 14:50:52 +0000 Subject: [PATCH 05/10] update ecj version svn path=/nixpkgs/trunk/; revision=24811 --- pkgs/development/eclipse/ecj/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index cf82b76fb471..53343f00ca55 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, ant, gcj }: let - version = "3.5.1"; - date = "200909170800"; + version = "3.6.1"; + date = "201009090800"; isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj"; javaExec = if isGCJ then "gij" else "java"; javaFlags = if isGCJ then "--cp" else "-cp"; @@ -12,7 +12,7 @@ in src = fetchurl { url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.zip"; - sha256 = "1vnl2mavisc567bip736xzsvvbjif5279wc4a7pbdik5wlir8qr7"; + sha256 = "0xfsig2pzd9wy524wp11s7pc7cj81s28g1485995b44d9qbi17h8"; }; buildInputs = [ unzip ant gcj ]; From 5f0674d59dc427a9ea44f663a91a926662ee1fd8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Nov 2010 14:51:25 +0000 Subject: [PATCH 06/10] update java-front svn path=/nixpkgs/trunk/; revision=24812 --- pkgs/development/compilers/strategoxt/0.18.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index dd2620cfc4c1..a8abdf53d276 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -73,11 +73,11 @@ rec { }; javafront = stdenv.mkDerivation (rec { - name = "java-front-0.9"; + name = "java-front-0.9.1"; src = fetchurl { - url = "http://hydra.nixos.org/build/79602/download/1/java-front-0.9.1pre19993.tar.gz"; - sha256 = "e07e7d9ecc4a57c24d7af309d576d6eda75cb07a9d3d06594edfded366863c9c"; + url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz"; + sha256 = "ef85d3af962fcd54e028ea501e64220b86af335a49143f2819bd3f4789bef7e6"; }; buildInputs = [pkgconfig aterm sdf strategoxt]; From c2916439fe0974fa4cdae7f96d0e9764facf8dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 22 Nov 2010 15:19:23 +0000 Subject: [PATCH 07/10] Added multiplate. svn path=/nixpkgs/trunk/; revision=24813 --- .../libraries/haskell/multiplate/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/multiplate/default.nix diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix new file mode 100644 index 000000000000..3354a5873d0b --- /dev/null +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "multiplate"; + version = "0.0.1"; + sha256 = "06bdj0r83arxxl6vqif9dmna140qcgvjizcyhvyqymsid605hrp4"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Lightweight generic library for mutually recursive datatypes"; + license = "MIT"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4721c9151b1d..d514dc617dda 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -445,6 +445,8 @@ rec { mtl = callPackage ../development/libraries/haskell/mtl {}; + multiplate = callPackage ../development/libraries/haskell/multiplate {}; + multirec = callPackage ../development/libraries/haskell/multirec {}; multiset = callPackage ../development/libraries/haskell/multiset {}; From 8cd20e6f6180b347cbef20a97e4fe81f662775a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Nov 2010 19:10:15 +0000 Subject: [PATCH 08/10] Adding valkyrie, a frontend for some valgrind 3.6 tools. svn path=/nixpkgs/trunk/; revision=24815 --- .../tools/analysis/valkyrie/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/analysis/valkyrie/default.nix diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix new file mode 100644 index 000000000000..3a0879d6edfd --- /dev/null +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, qt4 }: + +stdenv.mkDerivation rec { + name = "valkyrie-2.0.0"; + + src = fetchurl { + url = "http://valgrind.org/downloads/${name}.tar.bz2"; + sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; + }; + + buildInputs = [ qt4 ]; + + configurePhase = "qmake PREFIX=$out"; + + meta = { + homepage = http://www.valgrind.org/; + description = "Qt4-based GUI for the Valgrind 3.6.x series"; + + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4baa02184aa0..267ea51b828c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2541,6 +2541,8 @@ let valgrind = callPackage ../development/tools/analysis/valgrind { }; + valkyrie = callPackage ../development/tools/analysis/valkyrie { }; + xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) { flex = flex2535; qt = qt3; From 6162fffede124bb74fcd4d53726e404e5308b069 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 23 Nov 2010 07:46:18 +0000 Subject: [PATCH 09/10] Adding IOtop svn path=/nixpkgs/trunk/; revision=24818 --- pkgs/os-specific/linux/iotop/default.nix | 46 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/os-specific/linux/iotop/default.nix diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix new file mode 100644 index 000000000000..54a6cf8e457b --- /dev/null +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , python, makeWrapper + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="iotop"; + version="0.4.1"; + name="${baseName}-${version}"; + url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2"; + hash="1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["installPythonPackage" "wrapBinContentsPython"]; + + meta = { + description = "A tool to find out the processes doing the most IO"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://guichaz.free.fr/iotop/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 267ea51b828c..9bc67ccf21b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4508,6 +4508,10 @@ let ifplugd = callPackage ../os-specific/linux/ifplugd { }; + iotop = callPackage ../os-specific/linux/iotop { + python = pythonFull; + }; + iproute = callPackage ../os-specific/linux/iproute { }; iputils = ( From 9813c8feb6dfe263866f3d84d9176ecdff63dde2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 23 Nov 2010 07:52:57 +0000 Subject: [PATCH 10/10] Adding untie - a tool for manipulating namespaces svn path=/nixpkgs/trunk/; revision=24819 --- pkgs/os-specific/linux/untie/default.nix | 46 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/os-specific/linux/untie/default.nix diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix new file mode 100644 index 000000000000..441f041e6bec --- /dev/null +++ b/pkgs/os-specific/linux/untie/default.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="untie"; + version="0.3"; + name="${baseName}-${version}"; + url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2"; + hash="154c3550af3d3513022a15381bbc2693f5dd7789bf0a4320635991b8f6b3648c"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["doMakeInstall"]; + makeFlags=["PREFIX=$out"]; + + meta = { + description = "A tool to run processes untied from some of the namespaces"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://guichaz.free.fr/untie"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc67ccf21b7..c8ea857fb45c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5047,6 +5047,8 @@ let tunctl = true; mconsole = true; }; + untie = callPackage ../os-specific/linux/untie {}; + upstart = callPackage ../os-specific/linux/upstart { }; usbutils = callPackage ../os-specific/linux/usbutils { };