3
0
Fork 0
forked from mirrors/nixpkgs

* Sync with the trunk.

svn path=/nixpkgs/branches/x-updates/; revision=26054
This commit is contained in:
Eelco Dolstra 2011-02-22 10:00:18 +00:00
commit d47cf5a35e
24 changed files with 257 additions and 413 deletions

View file

@ -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 @@ stdenv.mkDerivation rec {
--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

View file

@ -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";
};
}

View file

@ -33,8 +33,6 @@ recurseIntoAttrs rec {
attica = callPackage ./support/attica { };
automoc4 = callPackage ./support/automoc4 { };
eigen = callPackage ./support/eigen { };
oxygen_icons = callPackage ./support/oxygen-icons { };
@ -45,10 +43,6 @@ recurseIntoAttrs rec {
soprano = callPackage ./support/soprano { };
qca2 = callPackage ./support/qca2 { };
qca2_ossl = callPackage ./support/qca2/ossl.nix { };
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS

View file

@ -1,23 +0,0 @@
{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 = [ which qt4 ];
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 ];
};
}

View file

@ -32,8 +32,6 @@ rec {
attica = callPackage ./support/attica { };
automoc4 = callPackage ./support/automoc4 { };
eigen = callPackage ./support/eigen { };
oxygen_icons = callPackage ./oxygen-icons { };
@ -44,10 +42,6 @@ rec {
soprano = callPackage ./support/soprano { };
qca2 = callPackage ./support/qca2 { };
qca2_ossl = callPackage ./support/qca2/ossl.nix { };
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS

View file

@ -1,85 +0,0 @@
{
stable = false;
packages = builtins.listToAttrs [
{
name = "kdeaccessibility";
value = "0jqfyzy3jvzyv1b6n1r589vk7qs8phng6az5jgsknhjjrhsn40hy";
}
{
name = "kdeadmin";
value = "1kk0xzf6mrhm946rsrpizzpkx59rf8xzxfj5h5lkcrajmq4xr0q8";
}
{
name = "kdeartwork";
value = "0f531rzz5ryq9irkijlb2anxm9zl933yq7q9h9im30s2w4fx31j6";
}
{
name = "kdebase";
value = "0aj5w84clbwhckpfryhcfwjnqamdmjm6mf0nf9g1qdaa2k2sfiqm";
}
{
name = "kdebase-runtime";
value = "0fhzxhj6p8nam4zi9wz998q06j70wvk1zgrb95lblfcjvs5f8ggb";
}
{
name = "kdebase-workspace";
value = "02s2bfid02js0r9400jfk6g74b0m8y7qi95ag7pj3ynn59fz9fv7";
}
{
name = "kdebindings";
value = "0ggq2djhcf74zb3wr2g1i2a72ncxs9h787sf4136ys0frxc4h898";
}
{
name = "kdeedu";
value = "172ix71977i2rm8r2fqdwrs954d0q82xf97hzpvqmjia3hp823iv";
}
{
name = "kdegames";
value = "1srk4vh9n1wh71hamzzvsgwml2j6yi959w61wbqrx9hd0vh3nfcz";
}
{
name = "kdegraphics";
value = "0d93kg8bhg2qwbpjnkgygbc8i6qc3wmdy419h15zafy6v66hfnqi";
}
{
name = "kdelibs";
value = "04n0whn0srfnqb3gr4w4g92s2vwhxhsmik5bkja4zzkkyylpg76b";
}
{
name = "kdemultimedia";
value = "1wclpg44fips943l0yiydr8bg0r0gw1j1ji8jvivcwl8mhq2qxf1";
}
{
name = "kdenetwork";
value = "13r9fpbcsl5a12rlg1cifvply4shmvsmm8c1h6bkgyw55k6m652v";
}
{
name = "kdepimlibs";
value = "1zc07iw6f78zbbnywplavjb4vdvhr14262wfx35zw3w34x3s0czb";
}
{
name = "kdeplasma-addons";
value = "0x46l5840iy6nlfzbgi711rdrrjwaxzglsd9hjs90sswqyiid1zg";
}
{
name = "kdesdk";
value = "0dgvg0pzdwk4cg0v4rmjid0lb25r0gbhciywb2whr0l4g8rnsriz";
}
{
name = "kdetoys";
value = "1kzzwz8gbd0j9758vxb0cpklgcb9szl49lpyv98bb94378syvn87";
}
{
name = "kdeutils";
value = "1c2k8vh7vyjlvq32grs32iwfgg9q9jblm2lwhlkmrl391b38fc0d";
}
{
name = "kdewebdev";
value = "15zj9jwrqfkz94hhjcic8k58d6fwrxa6xacmxpmps80j7qgik0d9";
}
{
name = "oxygen-icons";
value = "15m08kkxyqw00zhi07mqwwkghw2knf9djw2sw32rpiicg7ppfjgx";
}
];
}

View file

@ -1,222 +0,0 @@
[
{
lang = "ar";
sha256 = "19mfcq1ms0k6msir8q1g70myvqiapcf6a2r8wq47achxnpkicia9";
}
{
lang = "bg";
sha256 = "1njbxf5y3pl9nmyj913qinaa3qr4q4v8gvwmg7mfidddrr60yniz";
}
{
lang = "ca";
sha256 = "1yv5220q1d3w4nmix9jzz98fhyk0516v3mr5j4pczf407mrggh3l";
}
{
lang = "ca@valencia";
sha256 = "047rq1g0a7dy0kdna9gd4x906dk6inb61vw0xl6kkb3kzxxp3das";
}
{
lang = "cs";
sha256 = "1cazhfrh9nagxi2grlwldwl4j92xhgj8lmyaxkhb893nj845z108";
}
{
lang = "da";
sha256 = "1cm19gp0qiq6yqdzwpv14swj8g7rkvspqgnn5b2i5f3qqr25d29g";
}
{
lang = "de";
sha256 = "0sr51gpyfdgai8frrr0dw7qyssc39kl3fqkjg8w8zjlsp5x6ddx5";
}
{
lang = "el";
sha256 = "0s6mg2diy84my66zgcs5z8xk13j2a8q71xkrvw4d1z8pbnbw4i66";
}
{
lang = "en_GB";
sha256 = "1n461w69gs9q86kp6xy0980ziry61idr0bk614mv58ip1myzwhgm";
}
{
lang = "eo";
sha256 = "1s7p0d45f30871rikx74rc238z9w239pdb4ay9nfx2618wnsrhkr";
}
{
lang = "es";
sha256 = "1583gkwac4ys2sz8a93km0fabqpasslas5jzkavbz1bn8ps1q0w3";
}
{
lang = "et";
sha256 = "00sbnyqhvsdy9y1f59ir0mpxbj6h5x7gc8hiigfzsymlm14fhf26";
}
{
lang = "eu";
sha256 = "1pk6dmakxzj3qqq506flyipcc1sc954lsf4zsy82ii8ki06zvrvw";
}
{
lang = "fi";
sha256 = "1xcdmmvf8x723ngw5xw714x86xpn66qb3pw6h0x01mlh28lprq7j";
}
{
lang = "fr";
sha256 = "18wbz82cnxk51vj4qpw54xcrplga7vpm7p0cw19cjwph2xs62bjl";
}
{
lang = "fy";
sha256 = "1n3ix81jz9716ai9xm99r2v3n64w0kqvr8iz58zlrns5k9cig1nw";
}
{
lang = "ga";
sha256 = "0gm5ylr0dw6slilf1xdsksx17f7kqxmagdywl3dp2fry2h6z3xrn";
}
{
lang = "gl";
sha256 = "132bchxzm4qkbjcf5ljwniyjiahfwkd3i01sqm57l9ssgkq88f1r";
}
{
lang = "gu";
sha256 = "1sg4c0ijap8aird7fwflzw2w7yhx08b8baw4453nkk28s3l0wbl8";
}
{
lang = "he";
sha256 = "1gjngdh6qwmwfhyxcad1xsyq0l25v88bdg4yl1m5iw5a44rvn9br";
}
{
lang = "hi";
sha256 = "1q5rhiwn5fp8sgdrlqh2gh1f4q60x0s5x79q31fnw4kdk5akkrbs";
}
{
lang = "hr";
sha256 = "0hsdh8pnir8ykdsakbii7jj2nd9g1h03s29bmbg6w4r7q39xif7i";
}
{
lang = "hu";
sha256 = "0zpmndlb0vp3sp7z8g233335kak3ms8gzzgn1dhqch0rs03dx9cb";
}
{
lang = "ia";
sha256 = "01jrkfs4jp8z4554sia73vk4js1sd32a3swhal664vdwnf62cw70";
}
{
lang = "id";
sha256 = "0nylab5ncqdx5s3nnq7lx3fd70crjwihkgp9hv689vz4l8g1si4z";
}
{
lang = "is";
sha256 = "1rj8m2qsfhrv4k99mf5sydz5mhq0anhcfi4na04l1hi7icypbz9d";
}
{
lang = "it";
sha256 = "1f1kd82f3pc4szbfwsyxpn115rp2fbkx98gzxpnaggb3j88vq2k9";
}
{
lang = "ja";
sha256 = "0axl759bpv18dl0pw52hlksgdza1y8f7jfw5zgv6rc9qks1f1f9q";
}
{
lang = "kk";
sha256 = "14xvnj21kqp41ayi6n1a8qbph5llf9izs5qql82lcvph3a7zdjxv";
}
{
lang = "km";
sha256 = "0fywr8c6cz0wp4kx56xfd93mjbgwmnmh6zv0kdq8lr9xzjfjbbvq";
}
{
lang = "kn";
sha256 = "13isz33r2wkir2n53fxvmadk5fp4178rxm3nlr8c0l4fqic5pj1a";
}
{
lang = "ko";
sha256 = "1l18crb73cg5an8isgv0iih1mc3j4ghqnfrx39bbrl5ljym78xfx";
}
{
lang = "lt";
sha256 = "01b50dzhxlczmjqc07ph40bz86020ll1ddzcr0285dqqxcl466hg";
}
{
lang = "lv";
sha256 = "0vcbl1laf0vnpks3mfghxffvnyyl4av4lgkgx9annw625aybwc5w";
}
{
lang = "ml";
sha256 = "06z3ihbd3mjzmr68h5bxnp2zhkfnjx7a4ldkv9hj1m4miwpa9af6";
}
{
lang = "nb";
sha256 = "1zp7803s50y750i59cpfq5n4m4yq7xjyqzrrajk4k2cp3kv7prv0";
}
{
lang = "nds";
sha256 = "1f71gl6v9nasrci17glbllyc1h8iaw69j1vf36pyzzp3jwi6y6pg";
}
{
lang = "nl";
sha256 = "18x4dfffyc11acl90bj5d86xvbjiq9bkszdgnmninaa6zjmmvng9";
}
{
lang = "nn";
sha256 = "0syb3x2mlz7lf6awa1h0lchj7qmwmdmxai2cy0h0ja3jvbh6hrsw";
}
{
lang = "pa";
sha256 = "1dd5bpn409b839blb5zj27gc0mg13r3d36ap80lybivqpga0c5bw";
}
{
lang = "pl";
sha256 = "0cmqh4f846s910jlhgc1vpzwlbry0vc4wwpx5misiybh2didhly9";
}
{
lang = "pt";
sha256 = "01z1bz56r1jpfwl2vhfkb8w667layv2hm163y6x4i940qfiig167";
}
{
lang = "pt_BR";
sha256 = "0swilj7qvsrg66xccjmyzlj4l6k88qghvdcs6m9nha3rv199p35k";
}
{
lang = "ro";
sha256 = "08c8ikxfmxgiwchdhayjflk4773rfan2jmjnbrixmam21x2py5ys";
}
{
lang = "ru";
sha256 = "01nskj9mi28xbg77shnmhc46ilx9qrnsv1rsmpblphqxs3wczpqy";
}
{
lang = "sk";
sha256 = "12ja66s0v85d8w5nk1c0xwfs04wq0ngxmpypc5igky90qxhg3f75";
}
{
lang = "sl";
sha256 = "0qqass959xcc7gg1q76w10alrj1ypxc5hg43hlbjagxy8x1nkd99";
}
{
lang = "sr";
sha256 = "16cq9iz2njvwm4d57f07ay4rzw66pwphblxrdrlk22fvkli1hmps";
}
{
lang = "sv";
sha256 = "05hskmbmr9gzfk7i3xlh6a56inmjgl26cvbkcm967mayfigxcaqp";
}
{
lang = "th";
sha256 = "0n9jbngj3l1crqgqv9am8bl3l3sa3x2ccna4p9ccbjyvl4xgryij";
}
{
lang = "tr";
sha256 = "14lfp80r9vwr4kbway2kzff3qr9dgywal6n68adam7jhagfmxifc";
}
{
lang = "uk";
sha256 = "1ygac3jnjw4y4jfk4r8hba1d9ppb41sq50szbh4s4cw0p77kwi91";
}
{
lang = "wa";
sha256 = "1pg37wyyc2fbjy1pmmk8vchk3jl0x9qahqa8bka3w24piq8k2bal";
}
{
lang = "zh_CN";
sha256 = "1664vjjs2nfldmzwda5p2qv9gayx1jpnr0glm87whgak1yyhwjsb";
}
{
lang = "zh_TW";
sha256 = "05c3m128c92gj6n0jr6d6wwbs142nwyxxj6bf0rq24pdl1m5fdn8";
}
]

View file

@ -34,6 +34,7 @@ kde.package {
meta = {
description = "KDE libraries";
license = "LGPL";
homepage = http://www.kde.org;
kde.module = "kdelibs";
};
}

View file

@ -1,15 +0,0 @@
{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 = {
description = "KDE Meta Object Compiler";
license = "BSD";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

View file

@ -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";

View file

@ -1,32 +0,0 @@
{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}:
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 ];
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 ];
};
}

View file

@ -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 @@ stdenv.mkDerivation rec {
};
# 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/;

View file

@ -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 = ".";

View file

@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
};
buildInputs = [ which qt4 ];
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\

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}:
{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl, which}:
stdenv.mkDerivation rec {
version = "2.0.0-beta3";
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
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";

View file

@ -7,9 +7,10 @@ stdenv.mkDerivation rec {
sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
};
buildInputs = [ cmake qt4 ];
meta = {
meta = with stdenv.lib; {
homepage = http://techbase.kde.org/Development/Tools/Automoc4;
description = "KDE Meta Object Compiler";
license = "BSD";
maintainers = [ stdenv.lib.maintainers.sander ];
license = licenses.bsd2;
maintainers = [ maintainers.sander maintainers.urkud ];
};
}

View file

@ -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

View file

@ -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";
}

View file

@ -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 @@ stdenv.mkDerivation {
'';
buildPhase = "ant";
installPhase = "ant install";
meta = {
description = "A SOAP interface and client for Disnix";
license = "MIT";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

View file

@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null;
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.mkDerivation {
++ 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 ];
};
}

View file

@ -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 ];
};
}

View file

@ -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 ];
};
}

View file

@ -1155,6 +1155,8 @@ let
qt = qt4;
};
radvd = callPackage ../tools/networking/radvd { };
rtmpdump = callPackage ../tools/video/rtmpdump { };
recutils = callPackage ../tools/misc/recutils { };
@ -1236,6 +1238,8 @@ let
slsnif = callPackage ../tools/misc/slsnif { };
smartmontools = callPackage ../tools/system/smartmontools { };
smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
fusesmb = callPackage ../tools/filesystems/fusesmb { };
@ -2492,6 +2496,8 @@ let
&& 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 @@ let
# 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 @@ let
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 @@ let
neon = neon029;
};
openstack_compute = callPackage ../applications/virtualization/openstack-compute { };
opera = callPackage ../applications/networking/browsers/opera {
qt = qt3;
};

View file

@ -171,6 +171,31 @@ rec {
};
});
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 @@ rec {
};
};
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 @@ rec {
};
});
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";