swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Disnix to use disnix-0.2 release packages

Browse source 
svn path=/nixpkgs/trunk/; revision=26027
This commit is contained in:
Sander van der Burg 2011-02-18 15:58:08 +00:00
parent d6199a2ca1
commit 293caf43c4
4 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
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 ];
};
}

12
pkgs/tools/package-management/disnix/activation-scripts/default.nix
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 ];
};
}

12
pkgs/tools/package-management/disnix/default.nix
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 ];
};
}

12
pkgs/tools/package-management/disnix/disnixos/default.nix
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 ];
};
}