nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 20:20:58 +01:00
Code Activity

fixed some hard links

Browse source
This commit is contained in:
Wouter den Breejen 2007-08-16 13:44:53 +00:00
parent 53c907ca09
commit 05297240ea
14 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libext3cow/Makefile.am
View file

@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = libext3cow.la
libext3cow_la_SOURCES = epoch2date.c snapshot.cc tt.c ext3cow_tools.h
libext3cow_la_SOURCES = epoch2date.c snapshot.cc tt.c ext3cow_tools.h ext3cow_fs.h
pkginclude_HEADERS = snapshot.hh
@ -14,4 +14,4 @@ AM_CXXFLAGS = -Wall \
-I$(srcdir)/../libutil
AM_CFLAGS = \
${aterm_include}
${aterm_include}

2
src/libext3cow/ext3cow_tools.h
View file

@ -7,4 +7,4 @@
#include <sys/ioctl.h>
#include <time.h>
#include <sys/time.h>
#include </nix/store/8nirllv1w6qv6c5srjgah2m82bfi1d6k-linux-2.6.21.5/lib/modules/2.6.21.5-default/build/include/linux/ext3cow_fs.h>
#include "ext3cow_fs.h"

3
src/libmain/Makefile.am
View file

@ -5,8 +5,7 @@ libmain_la_SOURCES = shared.cc shared.hh
AM_CXXFLAGS = \
-DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_STORE_STATE_DIR=\"$(storestatedir)\" \
-DNIX_STORE_STATE_REPOS_DIR=\"$(storestatereposdir)\" \
-DNIX_SVN_BIN_DIR=\"$(subversion)\" \
-DNIX_EXT3_COW_HEADER=\"$(ext3cowheader)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \

2
src/libmain/shared.cc
View file

@ -92,7 +92,7 @@ static void initAndRun(int argc, char * * argv)
nixLogDir = canonPath(getEnv("NIX_LOG_DIR", NIX_LOG_DIR));
nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR)); //nix global state dir
nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db");
nixSVNPath = getEnv("NIX_SVN_BIN_DIR", NIX_SVN_BIN_DIR);
nixExt3CowHeader = getEnv("NIX_EXT3_COW_HEADER", NIX_EXT3_COW_HEADER);
nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR));
nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR));

2
src/libstore/globals.cc
View file

@ -14,7 +14,7 @@ string nixDataDir = "/UNINIT";
string nixLogDir = "/UNINIT";
string nixStateDir = "/UNINIT";
string nixDBPath = "/UNINIT";
string nixSVNPath = "/UNINIT";
string nixExt3CowHeader = "/UNINIT";
string nixConfDir = "/UNINIT";
string nixLibexecDir = "/UNINIT";
string nixBinDir = "/UNINIT";

4
src/libstore/globals.hh
View file

@ -27,8 +27,8 @@ extern string nixStateDir;
/* nixDBPath is the path name of our Berkeley DB environment. */
extern string nixDBPath;
/* nixSVNPath is the path name of our SVN environment. */
extern string nixSVNPath;
/* nixExt3CowHeader is the header file used to communicate with ext3cow. */
extern string nixExt3CowHeader;
/* nixConfDir is the directory where configuration files are
stored. */

8
src/nix-env/nix-env.cc
View file

@ -212,7 +212,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems,
it for future modifications of the environment. */
Path manifestFile = store->addTextToStore("env-manifest", atPrint(canonicaliseExpr(makeList(ATreverse(manifest)))), references);
Expr topLevel = makeCall(envBuilder, makeAttrs(ATmakeList4(
Expr topLevel = makeCall(envBuilder, makeAttrs(ATmakeList6(
makeBind(toATerm("system"),
makeStr(thisSystem), makeNoPos()),
makeBind(toATerm("derivations"),
@ -220,7 +220,11 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems,
makeBind(toATerm("stateIdentifiers"),
makeList(ATreverse(stateIdentifiers)), makeNoPos()),
makeBind(toATerm("manifest"),
makeStr(manifestFile, singleton<PathSet>(manifestFile)), makeNoPos())
makeStr(manifestFile, singleton<PathSet>(manifestFile)), makeNoPos()),
makeBind(toATerm("nixBinDir"),
makeStr(nixBinDir), makeNoPos()),
makeBind(toATerm("nixStore"),
makeStr(nixStore), makeNoPos())
)));
/* Instantiate it. */

13
src/nix-state/nix-state.cc
View file

@ -481,9 +481,6 @@ static void opRunComponent(Strings opFlags, Strings opArgs)
//WARNING: we need to watch out for deadlocks!
//add locks ... ?
//svn lock ... ?
//TODO maybe also scan the parameters for state or component hashes?
//program_args
//TODO
Transaction txn;
@ -501,6 +498,9 @@ static void opRunComponent(Strings opFlags, Strings opArgs)
printMsg(lvlError, format("%1%") % padd("", '-', 100));
//printMsg(lvlError, format("ARG %1%") % *i);
root_args += " \"" + *i + "\"";
//TODO also scan the parameters for state or component hashes?
//program_args
}
printMsg(lvlError, format("Command: '%1%'") % (root_componentPath + root_binary + root_args));
@ -689,9 +689,10 @@ void run(Strings args)
printMsg(lvlError, format("P: '%1%'") % *j );
return;
// */
printMsg(lvlError, format("header: '%1%'") % nixExt3CowHeader);
return;
*/
/* test */