From 668eaa89604f9e2b0046e4ef8c24e35cafff582f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 31 Oct 2003 17:12:09 +0000 Subject: [PATCH] * More prototyping. svn path=/nixpkgs/trunk/; revision=449 --- pkgs-ng/fetchurl/builder.sh | 4 ++++ pkgs-ng/fetchurl/default.fix | 8 ++++++++ pkgs-ng/stdenv/builder.sh | 4 ++++ pkgs-ng/stdenv/default.fix | 5 +++++ pkgs-ng/system/all-packages.fix | 5 ++--- 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100755 pkgs-ng/fetchurl/builder.sh create mode 100644 pkgs-ng/fetchurl/default.fix create mode 100755 pkgs-ng/stdenv/builder.sh create mode 100644 pkgs-ng/stdenv/default.fix diff --git a/pkgs-ng/fetchurl/builder.sh b/pkgs-ng/fetchurl/builder.sh new file mode 100755 index 00000000000..a7e68487d2b --- /dev/null +++ b/pkgs-ng/fetchurl/builder.sh @@ -0,0 +1,4 @@ +#! /bin/sh + +echo FOO +exit 1 \ No newline at end of file diff --git a/pkgs-ng/fetchurl/default.fix b/pkgs-ng/fetchurl/default.fix new file mode 100644 index 00000000000..5354ece885d --- /dev/null +++ b/pkgs-ng/fetchurl/default.fix @@ -0,0 +1,8 @@ +{stdenv}: {url, md5}: derivation + { name = "fetchurl" + , system = stdenv.system + , builder = ./builder.sh + , stdenv = stdenv + , url = url + , md5 = md5 + } diff --git a/pkgs-ng/stdenv/builder.sh b/pkgs-ng/stdenv/builder.sh new file mode 100755 index 00000000000..363067568b6 --- /dev/null +++ b/pkgs-ng/stdenv/builder.sh @@ -0,0 +1,4 @@ +#! /bin/sh + +echo BAR +exit 1 \ No newline at end of file diff --git a/pkgs-ng/stdenv/default.fix b/pkgs-ng/stdenv/default.fix new file mode 100644 index 00000000000..b46eeee8029 --- /dev/null +++ b/pkgs-ng/stdenv/default.fix @@ -0,0 +1,5 @@ +{system}: derivation + { name = "stdenv" + , system = system + , builder = ./builder.sh + } diff --git a/pkgs-ng/system/all-packages.fix b/pkgs-ng/system/all-packages.fix index cc7c7cc415b..ec27319bb6f 100644 --- a/pkgs-ng/system/all-packages.fix +++ b/pkgs-ng/system/all-packages.fix @@ -4,12 +4,11 @@ } , fetchurl = (import ../fetchurl) - { system = system + { stdenv = stdenv } , aterm = (import ../aterm) - { system = system - , fetchurl = fetchurl + { fetchurl = fetchurl , stdenv = stdenv } } \ No newline at end of file