* Updated Fix descriptors to reflect the new Fix abstract syntax.

svn path=/nix/trunk/test/; revision=55

14 files changed, 31 insertions, 31 deletions

diff --git a/fixdescriptors/aterm-2.0.fix b/fixdescriptors/aterm-2.0.fix
index 8b1ba85605830..2fdf43434f19d 100644
--- a/fixdescriptors/aterm-2.0.fix
+++ b/fixdescriptors/aterm-2.0.fix
@@ -4,7 +4,7 @@ Descr(
 
   , Bind("createGCC", True)
 
-  , Bind("src", Source(Url("http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")))
-  , Bind("build", Source("../build/aterm-build.sh"))
+  , Bind("src", Url("853474e4bcf4a85f7d38a0676b36bded", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz"))
+  , Bind("build", Local("../build/aterm-build.sh"))
   ]
 )
diff --git a/fixdescriptors/atk-1.2.0.fix b/fixdescriptors/atk-1.2.0.fix
index ab302a5ed7f41..9f880be114569 100644
--- a/fixdescriptors/atk-1.2.0.fix
+++ b/fixdescriptors/atk-1.2.0.fix
@@ -5,7 +5,7 @@ Descr(
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
   , Bind("glib", Fix("./glib-2.2.1.fix"))
 
-  , Bind("src", Source(Url("ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2")))
-  , Bind("build", Source("../build/atk-build.sh"))
+  , Bind("src", Url("06a84758129554ae044af8865ecb6f1c", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2"))
+  , Bind("build", Local("../build/atk-build.sh"))
   ]
 )
diff --git a/fixdescriptors/glib-2.2.1.fix b/fixdescriptors/glib-2.2.1.fix
index 86a266707a3f1..9dc0f4e2927e3 100644
--- a/fixdescriptors/glib-2.2.1.fix
+++ b/fixdescriptors/glib-2.2.1.fix
@@ -4,7 +4,7 @@ Descr(
 
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
 
-  , Bind("src", Source(Url("ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2")))
-  , Bind("build", Source("../build/glib-build.sh"))
+  , Bind("src", Url("42406a17819080326e105f8333963b97", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2"))
+  , Bind("build", Local("../build/glib-build.sh"))
   ]
 )
diff --git a/fixdescriptors/gnet-1.1.8.fix b/fixdescriptors/gnet-1.1.8.fix
index 526c2e865300c..ef1f1b1da726d 100644
--- a/fixdescriptors/gnet-1.1.8.fix
+++ b/fixdescriptors/gnet-1.1.8.fix
@@ -5,7 +5,7 @@ Descr(
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
   , Bind("glib", Fix("./glib-2.2.1.fix"))
 
-  , Bind("src", Source(Url("http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz")))
-  , Bind("build", Source("../build/gnet-build.sh"))
+  , Bind("src", Url("da2b5de278e96a5b907c2e2304bf6542", "http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz"))
+  , Bind("build", Local("../build/gnet-build.sh"))
   ]
 )
diff --git a/fixdescriptors/gtk+-2.2.1.fix b/fixdescriptors/gtk+-2.2.1.fix
index 7fc3da2d78d92..9563df0a928c9 100644
--- a/fixdescriptors/gtk+-2.2.1.fix
+++ b/fixdescriptors/gtk+-2.2.1.fix
@@ -7,7 +7,7 @@ Descr(
   , Bind("atk", Fix("./atk-1.2.0.fix"))
   , Bind("pango", Fix("./pango-1.2.1.fix"))
 
-  , Bind("src", Source(Url("ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2")))
-  , Bind("build", Source("../build/gtk+-build.sh"))
+  , Bind("src", Url("dfd5755fddb26a46c96bfaa813280ac4", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2"))
+  , Bind("build", Local("../build/gtk+-build.sh"))
   ]
 )
diff --git a/fixdescriptors/gtkspell-2.0.2.fix b/fixdescriptors/gtkspell-2.0.2.fix
index 3cb0b0bf12a75..ef7e185c92e0d 100644
--- a/fixdescriptors/gtkspell-2.0.2.fix
+++ b/fixdescriptors/gtkspell-2.0.2.fix
@@ -9,7 +9,7 @@ Descr(
   , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
   , Bind("pspell", Fix("./pspell-.12.2.fix"))
 
-  , Bind("src", Source(Url("http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz")))
-  , Bind("build", Source("../build/gtkspell-build.sh"))
+  , Bind("src", Url("385daba9bebfdc7fdbdf524e07deb920", "http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz"))
+  , Bind("build", Local("../build/gtkspell-build.sh"))
   ]
 )
diff --git a/fixdescriptors/httpd-2.0.45.fix b/fixdescriptors/httpd-2.0.45.fix
index bb8365b450b13..e0db5ab2ef4a2 100644
--- a/fixdescriptors/httpd-2.0.45.fix
+++ b/fixdescriptors/httpd-2.0.45.fix
@@ -4,7 +4,7 @@ Descr(
 
   , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
 
-  , Bind("src", Source(Url("http://apache.cs.uu.nl/dist/httpd/httpd-2.0.45.tar.gz")))
-  , Bind("build", Source("../build/httpd-build.sh"))
+  , Bind("src", Url("1f33e9a2e2de06da190230fa72738d75", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.45.tar.gz"))
+  , Bind("build", Local("../build/httpd-build.sh"))
   ]
 )
diff --git a/fixdescriptors/openssl-0.9.7b.fix b/fixdescriptors/openssl-0.9.7b.fix
index a0df665e5db45..f55d0cca1ef9c 100644
--- a/fixdescriptors/openssl-0.9.7b.fix
+++ b/fixdescriptors/openssl-0.9.7b.fix
@@ -2,7 +2,7 @@ Descr(
   [ Bind("pkgId", "openssl-0.9.7b")
   , Bind("releaseId", "1")
 
-  , Bind("src", Source(Url("http://www.openssl.org/source/openssl-0.9.7b.tar.gz")))
-  , Bind("build", Source("../build/openssl-build.sh"))
+  , Bind("src", Url("fae4bec090fa78e20f09d76d55b6ccff", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz"))
+  , Bind("build", Local("../build/openssl-build.sh"))
   ]
 )
diff --git a/fixdescriptors/pan-0.13.95.fix b/fixdescriptors/pan-0.14.0.fix
index c9e5b9ab6d301..1fbee11795a22 100644
--- a/fixdescriptors/pan-0.13.95.fix
+++ b/fixdescriptors/pan-0.14.0.fix
@@ -1,6 +1,6 @@
 Descr(
-  [ Bind("pkgId", "pan-0.13.95")
-  , Bind("releaseId", "2")
+  [ Bind("pkgId", "pan-0.14.0")
+  , Bind("releaseId", "1")
 
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
   , Bind("glib", Fix("./glib-2.2.1.fix"))
@@ -11,7 +11,7 @@ Descr(
   , Bind("pspell", Fix("./pspell-.12.2.fix"))
   , Bind("gtkspell", Fix("./gtkspell-2.0.2.fix"))
 
-  , Bind("src", Source(Url("http://pan.rebelbase.com/download/releases/0.13.95/SOURCE/pan-0.13.95.tar.bz2")))
-  , Bind("build", Source("../build/pan-build-2.sh"))
+  , Bind("src", Url("b2702adadb84c2e0d52d2bb029c05206", "http://pan.rebelbase.com/download/releases/0.14.0/SOURCE/pan-0.14.0.tar.bz2"))
+  , Bind("build", Local("../build/pan-build-2.sh"))
   ]
 )
diff --git a/fixdescriptors/pango-1.2.1.fix b/fixdescriptors/pango-1.2.1.fix
index 419c4f6906c7a..886616d0d0eb3 100644
--- a/fixdescriptors/pango-1.2.1.fix
+++ b/fixdescriptors/pango-1.2.1.fix
@@ -5,7 +5,7 @@ Descr(
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
   , Bind("glib", Fix("./glib-2.2.1.fix"))
 
-  , Bind("src", Source(Url("ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2")))
-  , Bind("build", Source("../build/pango-build.sh"))
+  , Bind("src", Url("6b354ef14e75739a92b5b78f4ca3165a", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2"))
+  , Bind("build", Local("../build/pango-build.sh"))
   ]
 )
diff --git a/fixdescriptors/pkgconfig-0.15.0.fix b/fixdescriptors/pkgconfig-0.15.0.fix
index 28fe34a4b6336..bf895b0f507b7 100644
--- a/fixdescriptors/pkgconfig-0.15.0.fix
+++ b/fixdescriptors/pkgconfig-0.15.0.fix
@@ -2,7 +2,7 @@ Descr(
   [ Bind("pkgId", "pkgconfig-0.15.0")
   , Bind("releaseId", "1")
 
-  , Bind("src", Source(Url("http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz")))
-  , Bind("build", Source("../build/pkgconfig-build.sh"))
+  , Bind("src", Url("a7e4f60a6657dbc434334deb594cc242", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz"))
+  , Bind("build", Local("../build/pkgconfig-build.sh"))
   ]
 )
diff --git a/fixdescriptors/pspell-.12.2.fix b/fixdescriptors/pspell-.12.2.fix
index 61741407982ce..945cb62a88e58 100644
--- a/fixdescriptors/pspell-.12.2.fix
+++ b/fixdescriptors/pspell-.12.2.fix
@@ -2,7 +2,7 @@ Descr(
   [ Bind("pkgId", "pspell-.12.2")
   , Bind("releaseId", "1")
 
-  , Bind("src", Source(Url("http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz")))
-  , Bind("build", Source("../build/pspell-build.sh"))
+  , Bind("src", Url("cfd3816b2372932a1b71c0ce4e9f881e", "http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz"))
+  , Bind("build", Local("../build/pspell-build.sh"))
   ]
 )
diff --git a/fixdescriptors/subversion-0.21.0.fix b/fixdescriptors/subversion-0.21.0.fix
index dfe1f2482a7c3..de2edbcbbd2b8 100644
--- a/fixdescriptors/subversion-0.21.0.fix
+++ b/fixdescriptors/subversion-0.21.0.fix
@@ -10,7 +10,7 @@ Descr(
 
   , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
 
-  , Bind("src", Source(Url("http://subversion.tigris.org/files/documents/15/3712/subversion-0.21.0.tar.gz")))
-  , Bind("build", Source("../build/subversion-build.sh"))
+  , Bind("src", Url("b2ad91127fb652e764b750f4c0002528", "http://subversion.tigris.org/files/documents/15/3712/subversion-0.21.0.tar.gz"))
+  , Bind("build", Local("../build/subversion-build.sh"))
   ]
 )
diff --git a/fixdescriptors/system.fix b/fixdescriptors/system.fix
index 5e9f497d14919..7ca8c8797c4ef 100644
--- a/fixdescriptors/system.fix
+++ b/fixdescriptors/system.fix
@@ -1,6 +1,6 @@
 Descr(
   [ Bind("pkgId", Str("system"))
-  , Bind("releaseId", Str("2"))
+  , Bind("releaseId", Str("3"))
 
   , Bind("actATerm", Fix("./aterm-2.0.fix"))
   , Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
@@ -11,9 +11,9 @@ Descr(
   , Bind("actGnet", Fix("./gnet-1.1.8.fix"))
   , Bind("actPspell", Fix("./pspell-.12.2.fix"))
   , Bind("actGtkspell", Fix("./gtkspell-2.0.2.fix"))
-  , Bind("actPan", Fix("./pan-0.13.95.fix"))
+  , Bind("actPan", Fix("./pan-0.14.0.fix"))
   , Bind("actSubversion", Fix("./subversion-0.21.0.fix"))
 
-  , Bind("build", Source("../../scripts/nix-populate"))
+  , Bind("build", Local("../../scripts/nix-populate"))
   ]
 )