Bumped Disnix versions and added them to release.nix
svn path=/nixpkgs/trunk/; revision=25899
This commit is contained in:
parent
6ca6fd8fc6
commit
cd2df27b1c
@ -3,8 +3,8 @@
|
||||
stdenv.mkDerivation {
|
||||
name = "DisnixWebService-0.2";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/792274/download/3/DisnixWebService-0.2.tar.bz2;
|
||||
sha256 = "1ccgrab896cs7bg5m99iam4cyvdj9q3gkmjkg9awqb710l9168sh";
|
||||
url = http://hydra.nixos.org/build/895081/download/4/DisnixWebService-0.2.tar.bz2;
|
||||
sha256 = "1kxb5r52b0dd4z5v56j64iqvpcsxzw37ib7cp5fknj40qphay8wl";
|
||||
};
|
||||
buildInputs = [ apacheAnt ];
|
||||
PREFIX = ''''${env.out}'';
|
||||
|
@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null;
|
||||
assert enableEjabberdDump -> ejabberd != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnix-activation-scripts-0.2pre25619";
|
||||
name = "disnix-activation-scripts-0.2pre25895";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/860730/download/1/disnix-activation-scripts-0.2pre25619.tar.gz;
|
||||
sha256 = "0lfix5mh0hcdb6jwz6pi92zi4k0xnvdksw17q8bj7x7vqpscq5s6";
|
||||
url = http://hydra.nixos.org/build/895077/download/1/disnix-activation-scripts-0.2pre25895.tar.gz;
|
||||
sha256 = "0c6mi7v6jpjlhamcpf7i1axnrzidwbaayvq8glqfkza0c94yg4j9";
|
||||
};
|
||||
|
||||
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
|
||||
|
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnix-0.2pre25538";
|
||||
name = "disnix-0.2pre25894";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/856742/download/4/disnix-0.2pre25538.tar.gz;
|
||||
sha256 = "14cb5rhapsda2s22ys3d0i6qsfw4gnvc9483f5if3xr4hg6fgq0x";
|
||||
url = http://hydra.nixos.org/build/895051/download/4/disnix-0.2pre25894.tar.gz;
|
||||
sha256 = "0f8d2hnz67ykksw6l6izf06r9w7dkmlfb4dv6waxz9r7ylaardg2";
|
||||
};
|
||||
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
|
||||
++ stdenv.lib.optional (!stdenv.isLinux) libiconv
|
||||
|
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, disnix, socat, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnixos-0.1pre25628";
|
||||
name = "disnixos-0.1pre25636";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/861183/download/1/disnixos-0.1pre25628.tar.gz;
|
||||
sha256 = "1wbd8x3j8mspv5v2w5vmfadby52337xpyhjll15a2wik1d8f19bk";
|
||||
url = http://hydra.nixos.org/build/895070/download/3/disnixos-0.1pre25636.tar.gz;
|
||||
sha256 = "0pizbqzjb7kicb5ghqbmsg7rab3akk6yga4bfnrh3ly2yg6qgw6k";
|
||||
};
|
||||
buildInputs = [ socat pkgconfig disnix ];
|
||||
dontStrip = true;
|
||||
|
@ -65,6 +65,9 @@ with (import ./release-lib.nix);
|
||||
dico = linux;
|
||||
dietlibc = linux;
|
||||
diffutils = all;
|
||||
disnix = all;
|
||||
disnixos = linux;
|
||||
DisnixWebService = linux;
|
||||
docbook5 = all;
|
||||
docbook5_xsl = all;
|
||||
docbook_xml_dtd_42 = all;
|
||||
|
Loading…
Reference in New Issue
Block a user