mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
disnix: 0.6 -> 0.7
This commit is contained in:
parent
5b946fdafc
commit
a26c51116d
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "DisnixWebService-0.6";
|
||||
name = "DisnixWebService-0.7";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2;
|
||||
sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz";
|
||||
url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz;
|
||||
sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g";
|
||||
};
|
||||
buildInputs = [ apacheAnt jdk ];
|
||||
PREFIX = ''''${env.out}'';
|
||||
|
|
|
@ -1,21 +1,19 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnix-0.6.1";
|
||||
name = "disnix-0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz;
|
||||
sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj";
|
||||
url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz;
|
||||
sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
description = "A Nix-based distributed service deployment tool";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.sander ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,15 @@
|
|||
{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnixos-0.5";
|
||||
name = "disnixos-0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz;
|
||||
sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq";
|
||||
url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz;
|
||||
sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7";
|
||||
};
|
||||
|
||||
buildInputs = [ socat pkgconfig dysnomia disnix getopt ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
description = "Provides complementary NixOS infrastructure deployment to Disnix";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
|
|
|
@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
|
|||
assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dysnomia-0.6.1";
|
||||
name = "dysnomia-0.7";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz;
|
||||
sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi";
|
||||
url = https://github.com/svanderburg/dysnomia/files/842819/dysnomia-0.7.tar.gz;
|
||||
sha256 = "0nlb7fvndnxs878aah30cac4gqf2w9qq4bdpqj4m0j3d9nhpak2j";
|
||||
};
|
||||
|
||||
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
|
||||
|
|
Loading…
Reference in a new issue