about summary refs log tree commit diff
path: root/corepkgs
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-07-10T13·41+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-07-10T13·41+0000
commitd072485d2895d01dbbab1d899418726e3349343f (patch)
tree237c23cdb613d363e9205f89d51cac8433cf3b85 /corepkgs
parent5d4b90b689b09965be39c69aceddaf0b165598d0 (diff)
* Get `nix-push' working again. It now uses Nix/Fix to create Nix
  archives (using the package in corepkgs/nar).
* queryPathByHash -> expandHash, and it takes an argument specifying
  the target path (which may be empty).
* Install the core Fix packages in $prefix/share/fix.  TODO: bootstrap
  Nix and install Nix as a Fix package.

Diffstat (limited to 'corepkgs')
-rw-r--r--corepkgs/Makefile.am8
-rw-r--r--corepkgs/nar/nar.fix8
-rw-r--r--corepkgs/nar/nar.sh3
3 files changed, 19 insertions, 0 deletions
diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am
new file mode 100644
index 000000000000..9ce9c8c790eb
--- /dev/null
+++ b/corepkgs/Makefile.am
@@ -0,0 +1,8 @@
+install-data-local:
+	$(INSTALL) -d $(datadir)/fix
+	$(INSTALL) -d $(datadir)/fix/fetchurl
+	$(INSTALL_DATA) fetchurl/fetchurl.fix $(datadir)/fix/fetchurl
+	$(INSTALL_DATA) fetchurl/fetchurl.sh $(datadir)/fix/fetchurl
+	$(INSTALL) -d $(datadir)/fix/nar
+	$(INSTALL_DATA) nar/nar.fix $(datadir)/fix/nar
+	$(INSTALL_DATA) nar/nar.sh $(datadir)/fix/nar
diff --git a/corepkgs/nar/nar.fix b/corepkgs/nar/nar.fix
new file mode 100644
index 000000000000..3db6a48a0838
--- /dev/null
+++ b/corepkgs/nar/nar.fix
@@ -0,0 +1,8 @@
+Function(["path", "name"],
+  Package(
+    [ ("name", Var("name"))
+    , ("build", Relative("nar/nar.sh"))
+    , ("path", Var("path"))
+    ]
+  )
+)
\ No newline at end of file
diff --git a/corepkgs/nar/nar.sh b/corepkgs/nar/nar.sh
new file mode 100644
index 000000000000..6ffcf63224a8
--- /dev/null
+++ b/corepkgs/nar/nar.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+/tmp/nix/bin/nix --dump --file "$path" > $out || exit 1