Author: sandervanderburg
Date: Wed Oct 20 15:05:22 2010
New Revision: 24387
URL: https://svn.nixos.org/websvn/nix/?rev=24387&sc=1
Log:
Removed nixos postfix as this is not applicable anymore (and has never been)
Added:
disnix/disnix-activation-scripts/
- copied from r24250, disnix/disnix-activation-scripts-nixos/
Modified:
disnix/disnix-activation-scripts/trunk/configure.ac
disnix/disnix-activation-scripts/trunk/release.nix
disnix/disnix/trunk/release.nix
Modified: disnix/disnix-activation-scripts/trunk/configure.ac
==============================================================================
--- disnix/disnix-activation-scripts-nixos/trunk/configure.ac Tue Oct 12
20:53:56 2010 (r24250)
+++ disnix/disnix-activation-scripts/trunk/configure.ac Wed Oct 20 15:05:22
2010 (r24387)
@@ -1,5 +1,5 @@
AC_PREREQ(2.61)
-AC_INIT([disnix-activation-scripts-nixos], m4_esyscmd([echo -n $(cat
./version)$VERSION_SUFFIX]))
+AC_INIT([disnix-activation-scripts], m4_esyscmd([echo -n $(cat
./version)$VERSION_SUFFIX]))
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.7.2 -Wall -Werror])
Modified: disnix/disnix-activation-scripts/trunk/release.nix
==============================================================================
--- disnix/disnix-activation-scripts-nixos/trunk/release.nix Tue Oct 12
20:53:56 2010 (r24250)
+++ disnix/disnix-activation-scripts/trunk/release.nix Wed Oct 20 15:05:22
2010 (r24387)
@@ -3,16 +3,16 @@
let
jobs = rec {
tarball =
- { disnix_activation_scripts_nixos ? {outPath = ./.; rev = 1234;}
+ { disnix_activation_scripts ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
}:
with import nixpkgs {};
releaseTools.sourceTarball {
- name = "disnix-activation-scripts-nixos-tarball";
+ name = "disnix-activation-scripts-tarball";
version = builtins.readFile ./version;
- src = disnix_activation_scripts_nixos;
+ src = disnix_activation_scripts;
inherit officialRelease;
buildInputs = [ ];
@@ -26,7 +26,7 @@
with import nixpkgs { inherit system; };
releaseTools.nixBuild {
- name = "disnix-activation-scripts-nixos";
+ name = "disnix-activation-scripts";
src = tarball;
buildInputs = [ ];
Modified: disnix/disnix/trunk/release.nix
==============================================================================
--- disnix/disnix/trunk/release.nix Wed Oct 20 13:26:47 2010 (r24386)
+++ disnix/disnix/trunk/release.nix Wed Oct 20 15:05:22 2010 (r24387)
@@ -46,7 +46,7 @@
tests =
{ nixos ? /etc/nixos/nixos
- , disnix_activation_scripts ? (import
../../disnix-activation-scripts-nixos/trunk/release.nix {}).build {}
+ , disnix_activation_scripts ? (import
../../disnix-activation-scripts/trunk/release.nix {}).build {}
}:
let
@@ -68,10 +68,7 @@
startOn = "started dbus";
script =
- ''
- export
PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
- export HOME=/root
-
+ ''
${disnix}/bin/disnix-service
--activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
