Author: eelco
Date: Tue Feb 22 10:00:18 2011
New Revision: 26054
URL: https://svn.nixos.org/websvn/nix/?rev=26054&sc=1
Log:
* Sync with the trunk.
Added:
nixpkgs/branches/x-updates/pkgs/applications/virtualization/openstack-compute/
- copied from r26053,
nixpkgs/trunk/pkgs/applications/virtualization/openstack-compute/
nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/
- copied from r26053, nixpkgs/trunk/pkgs/development/libraries/qca2/
nixpkgs/branches/x-updates/pkgs/development/tools/misc/automoc4/
- copied from r26053, nixpkgs/trunk/pkgs/development/tools/misc/automoc4/
nixpkgs/branches/x-updates/pkgs/tools/filesystems/smbnetfs/
- copied from r26053, nixpkgs/trunk/pkgs/tools/filesystems/smbnetfs/
nixpkgs/branches/x-updates/pkgs/tools/networking/radvd/
- copied from r26053, nixpkgs/trunk/pkgs/tools/networking/radvd/
Replaced:
nixpkgs/branches/x-updates/pkgs/applications/virtualization/openstack-compute/default.nix
- copied unchanged from r26053,
nixpkgs/trunk/pkgs/applications/virtualization/openstack-compute/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/default.nix
- copied unchanged from r26053,
nixpkgs/trunk/pkgs/development/libraries/qca2/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/ossl.nix
- copied unchanged from r26053,
nixpkgs/trunk/pkgs/development/libraries/qca2/ossl.nix
nixpkgs/branches/x-updates/pkgs/development/tools/misc/automoc4/default.nix
- copied unchanged from r26053,
nixpkgs/trunk/pkgs/development/tools/misc/automoc4/default.nix
nixpkgs/branches/x-updates/pkgs/tools/filesystems/smbnetfs/default.nix
- copied unchanged from r26053,
nixpkgs/trunk/pkgs/tools/filesystems/smbnetfs/default.nix
nixpkgs/branches/x-updates/pkgs/tools/networking/radvd/default.nix
- copied unchanged from r26053,
nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix
Deleted:
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.5/support/automoc4/
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.5/support/qca2/
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.90.nix
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/l10n/manifest-4.5.90.nix
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/automoc4/
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/qca2/
Modified:
nixpkgs/branches/x-updates/ (props changed)
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/misc/mysql-workbench/default.nix
nixpkgs/branches/x-updates/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/x-updates/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.5/default.nix
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/default.nix
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/libs/default.nix
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/soprano/default.nix
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/javascript/jquery-ui/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/documentation/haddock/haddock-2.1.0.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/x-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/x-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/shells/bash/default.nix (props changed)
nixpkgs/branches/x-updates/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/x-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/default.nix
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/x-updates/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/misc/mysql-workbench/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/misc/mysql-workbench/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/applications/misc/mysql-workbench/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "5.2.30";
+ version = "5.2.31a";
name = "${pname}-${version}";
src = fetchurl {
url =
"http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";;
- sha256 = "0dlhnq7pv2ccgm0d7a3hzf9jxa09jzw36h0ljs9vw9q5nyd5kq71";
+ sha256 = "0mvjpin2qmnr8ksiknpcmlqjh5r3mafjcjdrnzbccyxc6r55xiy3";
};
buildInputs = [ autoconf automake boost file gettext glib glibc
gnome_keyring gtk gtkmm intltool
@@ -29,6 +29,7 @@
--prefix LD_LIBRARY_PATH : "${python}/lib" \
--prefix LD_LIBRARY_PATH : "$(cat
${stdenv.gcc}/nix-support/orig-gcc)/lib64" \
--prefix PATH : "${gnome_keyring}/bin" \
+ --prefix PATH : "${python}/bin" \
--set PYTHONPATH $PYTHONPATH \
--run '
# The gnome-keyring-daemon must be running. To allow for environments like
Copied:
nixpkgs/branches/x-updates/pkgs/applications/virtualization/openstack-compute/default.nix
(from r26053,
nixpkgs/trunk/pkgs/applications/virtualization/openstack-compute/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/applications/virtualization/openstack-compute/default.nix
Tue Feb 22 10:00:18 2011 (r26054, copy of r26053,
nixpkgs/trunk/pkgs/applications/virtualization/openstack-compute/default.nix)
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python, setuptools, pythonPackages }:
+
+let version = "2011.1"; in
+
+stdenv.mkDerivation {
+ name = "openstack-compute-2011.1";
+
+ src = fetchurl {
+ url = http://launchpad.net/nova/bexar/2011.1/+download/nova-2011.1.tar.gz;
+ sha256 = "1g8f75mzjpkzhqk91hga5wpjh8d0kbc9fxxjk0px0qjk20qrmb45";
+ };
+
+ buildInputs =
+ [ python setuptools pythonPackages.gflags pythonPackages.netaddr
pythonPackages.eventlet
+ ];
+
+ preConfigure = "export HOME=$(pwd)";
+
+ buildPhase = "python setup.py build";
+
+ installPhase =
+ ''
+ p=$(toPythonPath $out)
+ export PYTHONPATH=$p:$PYTHONPATH
+ mkdir -p $p
+ python setup.py install --prefix=$out
+ '';
+
+ meta = {
+ homepage = http://nova.openstack.org/;
+ description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric
controller";
+ };
+}
Modified: nixpkgs/branches/x-updates/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/desktops/kde-4.5/default.nix Tue Feb
22 09:53:01 2011 (r26053)
+++ nixpkgs/branches/x-updates/pkgs/desktops/kde-4.5/default.nix Tue Feb
22 10:00:18 2011 (r26054)
@@ -33,8 +33,6 @@
attica = callPackage ./support/attica { };
- automoc4 = callPackage ./support/automoc4 { };
-
eigen = callPackage ./support/eigen { };
oxygen_icons = callPackage ./support/oxygen-icons { };
@@ -45,10 +43,6 @@
soprano = callPackage ./support/soprano { };
- qca2 = callPackage ./support/qca2 { };
-
- qca2_ossl = callPackage ./support/qca2/ossl.nix { };
-
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS
Modified: nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/default.nix Tue Feb
22 09:53:01 2011 (r26053)
+++ nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/default.nix Tue Feb
22 10:00:18 2011 (r26054)
@@ -32,8 +32,6 @@
attica = callPackage ./support/attica { };
- automoc4 = callPackage ./support/automoc4 { };
-
eigen = callPackage ./support/eigen { };
oxygen_icons = callPackage ./oxygen-icons { };
@@ -44,10 +42,6 @@
soprano = callPackage ./support/soprano { };
- qca2 = callPackage ./support/qca2 { };
-
- qca2_ossl = callPackage ./support/qca2/ossl.nix { };
-
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS
Modified: nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/libs/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/libs/default.nix Tue Feb
22 09:53:01 2011 (r26053)
+++ nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/libs/default.nix Tue Feb
22 10:00:18 2011 (r26054)
@@ -34,6 +34,7 @@
meta = {
description = "KDE libraries";
license = "LGPL";
+ homepage = http://www.kde.org;
kde.module = "kdelibs";
};
}
Modified:
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -3,8 +3,9 @@
stdenv.mkDerivation rec {
name = "polkit-qt-1-0.99.0";
- buildInputs = [ cmake qt4 automoc4 ];
+ buildInputs = [ qt4 automoc4 ];
propagatedBuildInputs = [ polkit glib ];
+ buildNativeInputs = [ cmake pkgconfig ];
src = fetchurl {
url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
Modified:
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/soprano/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/soprano/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/desktops/kde-4.6/support/soprano/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
+{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc, pkgconfig}:
stdenv.mkDerivation rec {
name = "soprano-2.6.0";
@@ -9,7 +9,8 @@
};
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
- buildInputs = [ cmake qt4 cluceneCore redland libiodbc ];
+ buildInputs = [ qt4 cluceneCore redland libiodbc ];
+ buildNativeInputs = [ cmake pkgconfig ];
meta = {
homepage = http://soprano.sourceforge.net/;
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/javascript/jquery-ui/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/development/libraries/javascript/jquery-ui/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/javascript/jquery-ui/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "jquery-ui-1.8.7";
+ name = "jquery-ui-1.8.9";
src = fetchurl {
url = "http://jqueryui.com/download/${name}.custom.zip";;
- sha256 = "17j6cmzri6gkrhp4qfnr73sql8qiyxzadrii4ljj62i6vhkb1x2i";
+ sha256 = "1fnn5xwj57bdf9z786iymcxa7c4qf6mv4jm5m7q52j72by8gf011";
};
sourceRoot = ".";
Copied: nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/default.nix
(from r26053, nixpkgs/trunk/pkgs/development/libraries/qca2/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/default.nix
Tue Feb 22 10:00:18 2011 (r26054, copy of r26053,
nixpkgs/trunk/pkgs/development/libraries/qca2/default.nix)
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, which, qt4}:
+
+stdenv.mkDerivation {
+ name = "qca-2.0.2";
+ src = fetchurl {
+ url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
+ sha256 =
"49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
+ };
+ buildInputs = [ qt4 ];
+ buildNativeInputs = [ which ];
+ preBuild = ''
+ sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
+ EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5)
encoding\
+ EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5)
encoding\
+ EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5)
encoding\
+ EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5)
encoding'
+ '';
+ meta = with stdenv.lib; {
+ description = "Qt Cryptographic Architecture";
+ license = "LGPL";
+ homepage = http://delta.affinix.com/qca;
+ maintainers = [ maintainers.sander maintainers.urkud ];
+ };
+}
Copied: nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/ossl.nix
(from r26053, nixpkgs/trunk/pkgs/development/libraries/qca2/ossl.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/qca2/ossl.nix Tue Feb
22 10:00:18 2011 (r26054, copy of r26053,
nixpkgs/trunk/pkgs/development/libraries/qca2/ossl.nix)
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl, which}:
+
+stdenv.mkDerivation rec {
+ version = "2.0.0-beta3";
+ name = "qca-ossl-${version}";
+ src = fetchurl {
+ url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2";;
+ sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08";
+ };
+ # SVN version has stabilized and has a lot of fixes for fresh OpenSSL
+ # Take the main source from there
+ svn_src = fetchsvn {
+ url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl
;
+ rev = 1115936;
+ sha256 =
"ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
+ };
+ buildInputs = [ qt4 qca2 openssl ];
+ buildNativeInputs = [ which ];
+ dontAddPrefix = true;
+ configureFlags="--no-separate-debug-info --with-qca=${qca2}
+ --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
+ preConfigure=''
+ cp ${svn_src}/qca-ossl.cpp .
+
+ configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
+ '';
+ meta = with stdenv.lib; {
+ description = "Qt Cryptographic Architecture OpenSSL plugin";
+ license = "LGPL";
+ homepage = http://delta.affinix.com/qca;
+ maintainers = [ maintainers.urkud ];
+ };
+}
Copied:
nixpkgs/branches/x-updates/pkgs/development/tools/misc/automoc4/default.nix
(from r26053, nixpkgs/trunk/pkgs/development/tools/misc/automoc4/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/development/tools/misc/automoc4/default.nix
Tue Feb 22 10:00:18 2011 (r26054, copy of r26053,
nixpkgs/trunk/pkgs/development/tools/misc/automoc4/default.nix)
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4}:
+
+stdenv.mkDerivation rec {
+ name = "automoc4-0.9.88";
+ src = fetchurl {
+ url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2";
+ sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
+ };
+ buildInputs = [ cmake qt4 ];
+ meta = with stdenv.lib; {
+ homepage = http://techbase.kde.org/Development/Tools/Automoc4;
+ description = "KDE Meta Object Compiler";
+ license = licenses.bsd2;
+ maintainers = [ maintainers.sander maintainers.urkud ];
+ };
+}
Copied: nixpkgs/branches/x-updates/pkgs/tools/filesystems/smbnetfs/default.nix
(from r26053, nixpkgs/trunk/pkgs/tools/filesystems/smbnetfs/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/tools/filesystems/smbnetfs/default.nix
Tue Feb 22 10:00:18 2011 (r26054, copy of r26053,
nixpkgs/trunk/pkgs/tools/filesystems/smbnetfs/default.nix)
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , fuse, samba, pkgconfig
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="smbnetfs";
+ dirBaseName="SMBNetFS";
+ version="0.5.3a";
+ name="${baseName}-${version}";
+ project="${baseName}";
+
url="mirror://sourceforge/project/${project}/${baseName}/${dirBaseName}-${version}/${name}.tar.bz2";
+ hash="0fzlw11y2vkxmjzz3qcypqlvz074v6a3pl4pyffbniqal64qgrsw";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "A FUSE FS for mounting Samba shares";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.gpl2;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs";;
+ };
+ };
+}) x
+
Copied: nixpkgs/branches/x-updates/pkgs/tools/networking/radvd/default.nix
(from r26053, nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/tools/networking/radvd/default.nix Tue Feb
22 10:00:18 2011 (r26054, copy of r26053,
nixpkgs/trunk/pkgs/tools/networking/radvd/default.nix)
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, bison, flex }:
+
+stdenv.mkDerivation rec {
+ name = "radvd-1.7";
+
+ src = fetchurl {
+ url = "http://www.litech.org/radvd/dist/${name}.tar.gz";;
+ sha256 = "04rlz5fhparridjm32wcq9h1s3vxyiac7d3l6cvfgrlxixikgrzq";
+ };
+
+ buildInputs = [ bison flex ];
+
+ meta.homepage = http://www.litech.org/radvd/;
+ meta.description = "IPv6 Router Advertisement Daemon";
+}
Modified:
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -3,8 +3,8 @@
stdenv.mkDerivation {
name = "DisnixWebService-0.2";
src = fetchurl {
- url =
http://hydra.nixos.org/build/895081/download/4/DisnixWebService-0.2.tar.bz2;
- sha256 = "1kxb5r52b0dd4z5v56j64iqvpcsxzw37ib7cp5fknj40qphay8wl";
+ url =
http://hydra.nixos.org/build/910953/download/4/DisnixWebService-0.2.tar.bz2;
+ sha256 = "1469l2ykhdjmplkw01x64f7aq9rms05ig9sagyb8l2zksjm6lla8";
};
buildInputs = [ apacheAnt ];
PREFIX = ''''${env.out}'';
@@ -18,4 +18,10 @@
'';
buildPhase = "ant";
installPhase = "ant install";
+
+ meta = {
+ description = "A SOAP interface and client for Disnix";
+ license = "MIT";
+ maintainers = [ stdenv.lib.maintainers.sander ];
+ };
}
Modified:
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/activation-scripts/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -16,10 +16,10 @@
assert enableEjabberdDump -> ejabberd != null;
stdenv.mkDerivation {
- name = "disnix-activation-scripts-0.2pre25895";
+ name = "disnix-activation-scripts-0.2";
src = fetchurl {
- url =
http://hydra.nixos.org/build/895077/download/1/disnix-activation-scripts-0.2pre25895.tar.gz;
- sha256 = "0c6mi7v6jpjlhamcpf7i1axnrzidwbaayvq8glqfkza0c94yg4j9";
+ url =
http://hydra.nixos.org/build/910903/download/1/disnix-activation-scripts-0.2.tar.gz;
+ sha256 = "0r7yqvh3jnbvpb6lmr10lm4r5pvi4jaw0c6rhlyl5q6nh3mxymnd";
};
preConfigure = if enableEjabberdDump then "export
PATH=$PATH:${ejabberd}/sbin" else "";
@@ -39,4 +39,10 @@
++ stdenv.lib.optional enableMySQLDatabase mysql
++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
++ stdenv.lib.optional enableSubversionRepository subversion;
+
+ meta = {
+ description = "Provides various activation types for Disnix";
+ license = "MIT";
+ maintainers = [ stdenv.lib.maintainers.sander ];
+ };
}
Modified:
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++ nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -1,14 +1,20 @@
{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt,
nixUnstable, gettext, libiconv}:
stdenv.mkDerivation {
- name = "disnix-0.2pre25894";
+ name = "disnix-0.2.1";
src = fetchurl {
- url =
http://hydra.nixos.org/build/895051/download/4/disnix-0.2pre25894.tar.gz;
- sha256 = "0f8d2hnz67ykksw6l6izf06r9w7dkmlfb4dv6waxz9r7ylaardg2";
+ url = http://hydra.nixos.org/build/923387/download/4/disnix-0.2.1.tar.gz;
+ sha256 = "1kablxlg7mxajg2r96im2xr3xjgwmqi2gahxyhn2mvb6555dn5h8";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv
++ stdenv.lib.optional (!stdenv.isLinux) gettext;
dontStrip = true;
NIX_STRIP_DEBUG = true;
+
+ meta = {
+ description = "A distributed deployment extension for Nix";
+ license = "LGPLv2.1+";
+ maintainers = [ stdenv.lib.maintainers.sander ];
+ };
}
Modified:
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Tue Feb 22 09:53:01 2011 (r26053)
+++
nixpkgs/branches/x-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Tue Feb 22 10:00:18 2011 (r26054)
@@ -1,12 +1,18 @@
{stdenv, fetchurl, disnix, socat, pkgconfig}:
stdenv.mkDerivation {
- name = "disnixos-0.1pre25636";
+ name = "disnixos-0.1";
src = fetchurl {
- url =
http://hydra.nixos.org/build/895070/download/3/disnixos-0.1pre25636.tar.gz;
- sha256 = "0pizbqzjb7kicb5ghqbmsg7rab3akk6yga4bfnrh3ly2yg6qgw6k";
+ url = http://hydra.nixos.org/build/910925/download/3/disnixos-0.1.tar.gz;
+ sha256 = "0gd0jnc8n50g55lv4ha9nim9s2gv7mi4qdz4j3rnaws86sfgh8x2";
};
buildInputs = [ socat pkgconfig disnix ];
dontStrip = true;
NIX_STRIP_DEBUG = true;
+
+ meta = {
+ description = "Provides complementary NixOS infrastructure deployment to
NixOS";
+ license = "LGPLv2.1+";
+ maintainers = [ stdenv.lib.maintainers.sander ];
+ };
}
Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Tue Feb 22
09:53:01 2011 (r26053)
+++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Tue Feb 22
10:00:18 2011 (r26054)
@@ -1155,6 +1155,8 @@
qt = qt4;
};
+ radvd = callPackage ../tools/networking/radvd { };
+
rtmpdump = callPackage ../tools/video/rtmpdump { };
recutils = callPackage ../tools/misc/recutils { };
@@ -1236,6 +1238,8 @@
slsnif = callPackage ../tools/misc/slsnif { };
smartmontools = callPackage ../tools/system/smartmontools { };
+
+ smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
fusesmb = callPackage ../tools/filesystems/fusesmb { };
@@ -2492,6 +2496,8 @@
&& stdenv.system != "i386-sunos";
};
+ automoc4 = callPackage ../development/tools/misc/automoc4 { };
+
avrdude = callPackage ../development/tools/misc/avrdude { };
binutils = callPackage ../development/tools/misc/binutils {
@@ -2686,7 +2692,8 @@
# couldn't find the source yet
seleniumRCBin = callPackage ../development/tools/selenium/remote-control {
- jre = jdk; };
+ jre = jdk;
+ };
scons = callPackage ../development/tools/build-managers/scons { };
@@ -3962,6 +3969,10 @@
ptlib = callPackage ../development/libraries/ptlib {};
+ qca2 = callPackage ../development/libraries/qca2 {};
+
+ qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {};
+
qjson = callPackage ../development/libraries/qjson { };
qt3 = callPackage ../development/libraries/qt-3 {
@@ -6437,6 +6448,8 @@
neon = neon029;
};
+ openstack_compute = callPackage
../applications/virtualization/openstack-compute { };
+
opera = callPackage ../applications/networking/browsers/opera {
qt = qt3;
};
Modified: nixpkgs/branches/x-updates/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/python-packages.nix Tue Feb
22 09:53:01 2011 (r26053)
+++ nixpkgs/branches/x-updates/pkgs/top-level/python-packages.nix Tue Feb
22 10:00:18 2011 (r26054)
@@ -171,6 +171,31 @@
};
});
+
+ eventlet = buildPythonPackage rec {
+ name = "eventlet-0.9.14";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/e/eventlet/${name}.tar.gz";;
+ md5 = "dfc96ed14b27392fdc529abcafeed880";
+ };
+
+ buildInputs = [ nose httplib2 ];
+
+ propagatedBuildInputs = [ greenlet ];
+
+ # It tries to scribble in ~/.python-eggs.
+ preConfigure = "export HOME=$(pwd)";
+
+ doCheck = false; # !!! fix; test requires ssl support in Python
+
+ meta = {
+ homepage = http://pypi.python.org/pypi/eventlet/;
+ description = "A concurrent networking library for Python";
+ };
+ };
+
+
flup = buildPythonPackage (rec {
name = "flup-1.0.2";
@@ -249,6 +274,54 @@
};
};
+
+ gflags = buildPythonPackage rec {
+ name = "gflags-1.5.1";
+
+ src = fetchurl {
+ url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz";;
+ sha256 = "1p8blsc3z1wasi9dhbjij7m2czps17dll3cpj37v97fv5ww7al9v";
+ };
+
+ meta = {
+ homepage = http://code.google.com/p/python-gflags/;
+ description = "A module for command line handling, similar to Google's
gflags for C++";
+ };
+ };
+
+
+ greenlet = buildPythonPackage rec {
+ name = "greenlet-0.3.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/greenlet/${name}.tar.gz";;
+ md5 = "8d75d7f3f659e915e286e1b0fa0e1c4d";
+ };
+
+ meta = {
+ homepage = http://pypi.python.org/pypi/greenlet;
+ description = "Module for lightweight in-process concurrent programming";
+ };
+ };
+
+
+ httplib2 = buildPythonPackage rec {
+ name = "httplib2-0.6.0";
+
+ src = fetchurl {
+ url = "http://httplib2.googlecode.com/files/${name}.tar.gz";;
+ sha256 = "134pldyxayc0x4akzzvkciz2kj1w2dsim1xvd9b1qrpmba70dpjq";
+ };
+
+ doCheck = false; # doesn't have a test
+
+ meta = {
+ homepage = http://code.google.com/p/httplib2/;
+ description = "A comprehensive HTTP client library";
+ };
+ };
+
+
jinja2 = buildPythonPackage {
name = "jinja2-2.2.1";
@@ -438,6 +511,24 @@
};
});
+
+ netaddr = buildPythonPackage rec {
+ name = "netaddr-0.7.5";
+
+ src = fetchurl {
+ url = "https://github.com/downloads/drkjam/netaddr/${name}.tar.gz";;
+ sha256 = "0ssxic389rdc79zkz8dxcjpqdi5qs80h12khkag410cl9cwk11f2";
+ };
+
+ doCheck = false; # there is no test command
+
+ meta = {
+ homepage = https://github.com/drkjam/netaddr/;
+ description = "A network address manipulation library for Python";
+ };
+ };
+
+
nevow = buildPythonPackage (rec {
name = "nevow-${version}";
version = "0.10.0";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
