about summary refs log tree commit diff
path: root/test/fixdescriptors/pango-1.2.1.fix
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-04-25T15·33+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-04-25T15·33+0000
commit0ef4b6d0f8dcaec093e3db366b6dfb6ba47f73a6 (patch)
treee36801703e1203a057acfc21b3408d3ddb5c9f18 /test/fixdescriptors/pango-1.2.1.fix
parentd6d930a975cf0bfacb8a3117752452b89921b6ee (diff)
* Cleaned up the semantics of Fix expressions.
* Conditionals and variables in Fix expressions.  This allows, e.g.,

    Descr(
    [ Bind("pkgId", "subversion-0.21.0")

    , Bind("httpsClient", Bool(True))
    , Bind("httpServer", Bool(True))

    , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))

    , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
    ...
    ])

  which introduces domain feature variables httpsClient and httpServer
  (i.e., whether Subversion is built with https client and webdav
  server support); the values of the variables influences package
  dependencies and the build scripts.

  The next step is to allow that packages can express constraints on
  each other.  E.g., StrategoXT is dependent on an ATerm library with
  the "gcc" variant enabled.  In fact, this may cause several
  Nix instantiations to be created from a single Fix descriptor.  If
  possible, Fix should try to find the least set of instantiations
  that obeys the constraints.


Diffstat (limited to 'test/fixdescriptors/pango-1.2.1.fix')
-rw-r--r--test/fixdescriptors/pango-1.2.1.fix12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/fixdescriptors/pango-1.2.1.fix b/test/fixdescriptors/pango-1.2.1.fix
index 7ee2486a6dce..419c4f6906c7 100644
--- a/test/fixdescriptors/pango-1.2.1.fix
+++ b/test/fixdescriptors/pango-1.2.1.fix
@@ -1,11 +1,11 @@
 Descr(
-  [ Bind("pkgId", Str("pango-1.2.1"))
-  , Bind("releaseId", Str("1"))
+  [ Bind("pkgId", "pango-1.2.1")
+  , Bind("releaseId", "1")
 
-  , Bind("pkgconfig", Pkg(Fix("./pkgconfig-0.15.0.fix")))
-  , Bind("glib", Pkg(Fix("./glib-2.2.1.fix")))
+  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
+  , Bind("glib", Fix("./glib-2.2.1.fix"))
 
-  , Bind("src", File(Url("ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2")))
-  , Bind("build", File(Local("../build/pango-build.sh")))
+  , 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"))
   ]
 )