diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T12·59+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T12·59+0000 |
| commit | 6c31232e1494d1d68a31fb8433dbf593f831dff2 (patch) | |
| tree | 9acd7f0e2279bd971b5ccd1f1eb8cec8b7937003 /corepkgs/nar | |
| parent | 502d94048ae848eda1fcda2d1e72b339eaa653aa (diff) | |
| parent | 63227d434cefaa9faeb14afe28ebeb9b2d449ee2 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'corepkgs/nar')
| -rw-r--r-- | corepkgs/nar/Makefile.am | 11 | ||||
| -rw-r--r-- | corepkgs/nar/nar.nix | 7 | ||||
| -rw-r--r-- | corepkgs/nar/nar.sh.in | 12 |
3 files changed, 0 insertions, 30 deletions
diff --git a/corepkgs/nar/Makefile.am b/corepkgs/nar/Makefile.am deleted file mode 100644 index 103051e22537..000000000000 --- a/corepkgs/nar/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -all-local: nar.sh - -install-exec-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/nar - $(INSTALL_DATA) $(srcdir)/nar.nix $(DESTDIR)$(datadir)/nix/corepkgs/nar - $(INSTALL_PROGRAM) nar.sh $(DESTDIR)$(datadir)/nix/corepkgs/nar - -include ../../substitute.mk - -EXTRA_DIST = nar.nix nar.sh.in diff --git a/corepkgs/nar/nar.nix b/corepkgs/nar/nar.nix deleted file mode 100644 index d3d799998f10..000000000000 --- a/corepkgs/nar/nar.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ system, storePath, hashAlgo }: - -derivation { - name = "nar"; - builder = ./nar.sh; - inherit system storePath hashAlgo; -} diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in deleted file mode 100644 index 1369d3a21fb2..000000000000 --- a/corepkgs/nar/nar.sh.in +++ /dev/null @@ -1,12 +0,0 @@ -#! @shell@ -e - -echo "packing $storePath into $out..." -@coreutils@/mkdir $out -dst=$out/tmp.nar.bz2 -@bindir@/nix-store --dump "$storePath" > tmp - -@bzip2@ < tmp > $dst - -@bindir@/nix-hash --flat --type $hashAlgo --base32 $dst > $out/narbz2-hash - -@coreutils@/mv $out/tmp.nar.bz2 $out/$(@coreutils@/cat $out/narbz2-hash).nar.bz2 |