public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disnix: bump versions and update module to use its latest features

Browse Source
This commit is contained in:
Sander van der Burg 2014-06-09 23:46:30 +02:00
parent 7334e38af5
commit 6b6f098fd1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/misc/disnix.nix
View File

@ -125,13 +125,14 @@ in
after = [ "dbus.service" ]
++ optional config.services.httpd.enable "httpd.service"
++ optional config.services.mysql.enable "mysql.service"
++ optional config.services.postgresql.enable "postgresql.service"
++ optional config.services.tomcat.enable "tomcat.service"
++ optional config.services.svnserve.enable "svnserve.service"
++ optional config.services.mongodb.enable "mongodb.service";
restartIfChanged = false;
path = [ pkgs.nix pkgs.disnix pkgs.dysnomia ];
path = [ pkgs.nix pkgs.disnix dysnomia ];
environment = {
HOME = "/root";

6
pkgs/tools/package-management/disnix/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }:
stdenv.mkDerivation {
name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea";
name = "disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7";
src = fetchurl {
url = http://hydra.nixos.org/build/9876935/download/4/disnix-0.3pre15e93a364ad9439d8336e659921600d48252045d.tar.gz;
sha256 = "1kgc6cacpp3ly7c62ah6pdprdl1bab08b4ir4dcrrm44x6fa1k63";
url = http://hydra.nixos.org/build/11773951/download/4/disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7.tar.gz;
sha256 = "19hdh2mrlyiq1g3z6lnnqqvripmfcdnm18jpm4anp5iarhnwh3y4";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];

6
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> mongodb != null;
stdenv.mkDerivation {
name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484";
name = "dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82";
src = fetchurl {
url = http://hydra.nixos.org/build/9146265/download/1/dysnomia-0.3pre313a5f99a166fee2e0245dfd25f41ec9ed958075.tar.gz;
sha256 = "0fgbqybr9rfr95fkmv1hpq7al0p1kxa385k6sjc7iwwcxs4cmxf5";
url = http://hydra.nixos.org/build/11407191/download/1/dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82.tar.gz;
sha256 = "1i7yb299bq1z7cy4sk83m5faahj8inh73xn5bi6jcv492zv3kgwz";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";