From 114e76b2a412b682e982baa8797109b31eb1bb9b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Jul 2003 19:50:24 +0000 Subject: [PATCH] * New-style Fix expressions. svn path=/nixpkgs/trunk/; revision=114 --- {build => pkgs/aterm}/aterm-build.sh | 0 pkgs/aterm/aterm.fix | 9 +++++++++ pkgs/fetchurl/fetchurl.fix | 8 ++++++++ pkgs/fetchurl/fetchurl.sh | 3 +++ {build => pkgs/system}/populate-linkdirs.pl | 0 5 files changed, 20 insertions(+) rename {build => pkgs/aterm}/aterm-build.sh (100%) create mode 100644 pkgs/aterm/aterm.fix create mode 100644 pkgs/fetchurl/fetchurl.fix create mode 100644 pkgs/fetchurl/fetchurl.sh rename {build => pkgs/system}/populate-linkdirs.pl (100%) diff --git a/build/aterm-build.sh b/pkgs/aterm/aterm-build.sh similarity index 100% rename from build/aterm-build.sh rename to pkgs/aterm/aterm-build.sh diff --git a/pkgs/aterm/aterm.fix b/pkgs/aterm/aterm.fix new file mode 100644 index 00000000000..604ecb498df --- /dev/null +++ b/pkgs/aterm/aterm.fix @@ -0,0 +1,9 @@ +Package( + [ ("src", App(IncludeFix("fetchurl/expr.fix"), + [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz") + , ("hash", "653b1bb8140ee0206b00aab126ef412e") + ]) + , ("build", Relative("aterm-build.sh")) + , ("id", "aterm-2.0") + ] +) diff --git a/pkgs/fetchurl/fetchurl.fix b/pkgs/fetchurl/fetchurl.fix new file mode 100644 index 00000000000..c6a708cfe8e --- /dev/null +++ b/pkgs/fetchurl/fetchurl.fix @@ -0,0 +1,8 @@ +Function(["url", "hash"], + Package( + [ ("build", Relative("fetchurl/fetchurl.sh")) + , ("url", Var("url")) + , ("hash", Var("hash")) + ] + ) +) diff --git a/pkgs/fetchurl/fetchurl.sh b/pkgs/fetchurl/fetchurl.sh new file mode 100644 index 00000000000..a92092c6ee0 --- /dev/null +++ b/pkgs/fetchurl/fetchurl.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +wget "$url" -O "$out" diff --git a/build/populate-linkdirs.pl b/pkgs/system/populate-linkdirs.pl similarity index 100% rename from build/populate-linkdirs.pl rename to pkgs/system/populate-linkdirs.pl