lix-project/lix
20
58
Fork 31
Code Issues 364 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Make <nix/unpack-channel.nix> a builtin builder

Browse source 
This was the last function using a shell script, so this allows us to
get rid of tar, coreutils, bash etc.
This commit is contained in:
Eelco Dolstra 2019-03-27 23:40:35 +01:00
parent e60f6bd4ce
commit 045708db43
9 changed files with 55 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
corepkgs/config.nix.in
View file

@ -1,3 +1,4 @@
# FIXME: remove this file?
let
fromEnv = var: def:
let val = builtins.getEnv var; in
@ -17,13 +18,4 @@ in rec {
nixLocalstateDir = "@localstatedir@";
nixSysconfDir = "@sysconfdir@";
nixStoreDir = fromEnv "NIX_STORE_DIR" "@storedir@";
# If Nix is installed in the Nix store, then automatically add it as
# a dependency to the core packages. This ensures that they work
# properly in a chroot.
chrootDeps =
if dirOf nixPrefix == builtins.storeDir then
[ (builtins.storePath nixPrefix) ]
else
[ ];
}

35
corepkgs/unpack-channel.nix
View file

@ -1,39 +1,12 @@
with import <nix/config.nix>;
let
builder = builtins.toFile "unpack-channel.sh"
''
mkdir $out
cd $out
xzpat="\.xz\$"
gzpat="\.gz\$"
if [[ "$src" =~ $xzpat ]]; then
${xz} -d < $src | ${tar} xf - ${tarFlags}
elif [[ "$src" =~ $gzpat ]]; then
${gzip} -d < $src | ${tar} xf - ${tarFlags}
else
${bzip2} -d < $src | ${tar} xf - ${tarFlags}
fi
if [ * != $channelName ]; then
mv * $out/$channelName
fi
'';
in
{ name, channelName, src }:
derivation {
system = builtins.currentSystem;
builder = shell;
args = [ "-e" builder ];
inherit name channelName src;
builder = "builtin:unpack-channel";
PATH = "${nixBinDir}:${coreutils}";
system = "builtin";
inherit name channelName src;
# No point in doing this remotely.
preferLocalBuild = true;
inherit chrootDeps;
}

5
nix-rust/src/lib.rs
View file

@ -33,7 +33,7 @@ pub extern "C" fn unpack_tarfile(source: Source, dest_dir: &str) -> bool {
for file in tar.entries().unwrap() {
let mut file = file.unwrap();
let dest_file = dest_dir.join(file.header().path().unwrap());
let dest_file = dest_dir.join(file.path().unwrap());
fs::create_dir_all(dest_file.parent().unwrap()).unwrap();
@ -55,6 +55,9 @@ pub extern "C" fn unpack_tarfile(source: Source, dest_dir: &str) -> bool {
.unwrap();
io::copy(&mut file, &mut f).unwrap();
}
tar::EntryType::Symlink => {
std::os::unix::fs::symlink(file.header().link_name().unwrap().unwrap(), dest_file).unwrap();
}
t => panic!("Unsupported tar entry type '{:?}'.", t),
}
}

2
src/libstore/build.cc
View file

@ -3128,6 +3128,8 @@ void DerivationGoal::runChild()
builtinFetchurl(drv2, netrcData);
else if (drv->builder == "builtin:buildenv")
builtinBuildenv(drv2);
else if (drv->builder == "builtin:unpack-channel")
builtinUnpackChannel(drv2);
else
throw Error(format("unsupported builtin function '%1%'") % string(drv->builder, 8));
_exit(0);

1
src/libstore/builtins.hh
View file

@ -7,5 +7,6 @@ namespace nix {
// TODO: make pluggable.
void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData);
void builtinBuildenv(const BasicDerivation & drv);
void builtinUnpackChannel(const BasicDerivation & drv);
}

39
src/libstore/builtins/unpack-channel.cc Normal file
View file

@ -0,0 +1,39 @@
#include "rust.hh"
#include "builtins.hh"
#include "compression.hh"
namespace nix {
void builtinUnpackChannel(const BasicDerivation & drv)
{
auto getAttr = [&](const string & name) {
auto i = drv.env.find(name);
if (i == drv.env.end()) throw Error("attribute '%s' missing", name);
return i->second;
};
Path out = getAttr("out");
auto channelName = getAttr("channelName");
auto src = getAttr("src");
createDirs(out);
auto source = sinkToSource([&](Sink & sink) {
auto decompressor =
hasSuffix(src, ".bz2") ? makeDecompressionSink("bzip2", sink) :
hasSuffix(src, ".xz") ? makeDecompressionSink("xz", sink) :
makeDecompressionSink("none", sink);
readFile(src, *decompressor);
decompressor->finish();
});
unpack_tarfile(*source, out);
auto entries = readDirectory(out);
if (entries.size() != 1)
throw Error("channel tarball '%s' contains more than one file", src);
if (rename((out + "/" + entries[0].name).c_str(), (out + "/" + channelName).c_str()) == -1)
throw SysError("renaming channel directory");
}
}

2
src/libstore/local.mk
View file

@ -6,7 +6,7 @@ libstore_DIR := $(d)
libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc)
libstore_LIBS = libutil
libstore_LIBS = libutil libnixrust
libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
ifneq ($(OS), FreeBSD)

41
src/nix/test.cc → src/libstore/rust.hh
View file

@ -1,9 +1,4 @@
#include "command.hh"
#include "store-api.hh"
#include "common-args.hh"
#include "compression.hh"
using namespace nix;
#include "serialise.hh"
namespace rust {
@ -47,37 +42,3 @@ struct Source
extern "C" {
bool unpack_tarfile(rust::Source source, rust::StringSlice dest_dir);
}
struct CmdTest : StoreCommand
{
CmdTest()
{
}
std::string name() override
{
return "test";
}
std::string description() override
{
return "bla bla";
}
void run(ref<Store> store) override
{
auto source = sinkToSource([&](Sink & sink) {
auto decompressor = makeDecompressionSink("bzip2", sink);
readFile("./nix-2.2.tar.bz2", *decompressor);
decompressor->finish();
});
std::string destDir = "./dest";
deletePath(destDir);
unpack_tarfile(*source, destDir);
}
};
static RegisterCommand r(make_ref<CmdTest>());

4
src/nix/local.mk
View file

@ -15,9 +15,9 @@ nix_SOURCES := \
$(wildcard src/nix-prefetch-url/*.cc) \
$(wildcard src/nix-store/*.cc) \
nix_LIBS = libexpr libmain libstore libutil libnixrust
nix_LIBS = libexpr libmain libstore libutil
nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system -Lnix-rust/target/release
nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system
$(foreach name, \
nix-build nix-channel nix-collect-garbage nix-copy-closure nix-daemon nix-env nix-hash nix-instantiate nix-prefetch-url nix-shell nix-store, \