From abebac46017f626f25b5c84bdcc1013c3d17632f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 12 Jan 2015 23:32:34 +0100
Subject: [PATCH] monads: Remove 'derivation-expression'.

* guix/monads.scm (lower-inputs, derivation-expression): Remove.
* tests/monads.scm (derivation-expression, "mlet* +
  derivation-expression"): Remove.
---
 guix/monads.scm  | 20 --------------------
 tests/monads.scm | 21 ---------------------
 2 files changed, 41 deletions(-)

diff --git a/guix/monads.scm b/guix/monads.scm
index 63c9cd8cfd..20fee79602 100644
--- a/guix/monads.scm
+++ b/guix/monads.scm
@@ -389,26 +389,6 @@ cross-compilation target triplet."
           (string-append out "/" file)
           out))))
 
-(define (lower-inputs inputs)
-  "Turn any package from INPUTS into a derivation; return the corresponding
-input list as a monadic value."
-  ;; XXX: This procedure is bound to disappear with 'derivation-expression'.
-  (with-monad %store-monad
-    (sequence %store-monad
-              (map (match-lambda
-                    ((name (? package? package) sub-drv ...)
-                     (mlet %store-monad ((drv (package->derivation package)))
-                       (return `(,name ,drv ,@sub-drv))))
-                    ((name (? string? file))
-                     (return `(,name ,file)))
-                    (tuple
-                     (return tuple)))
-                   inputs))))
-
-(define derivation-expression
-  ;; XXX: This procedure is superseded by 'gexp->derivation'.
-  (store-lift build-expression->derivation))
-
 (define package->derivation
   (store-lift package-derivation))
 
diff --git a/tests/monads.scm b/tests/monads.scm
index bac9feb97a..9c3cdd20a7 100644
--- a/tests/monads.scm
+++ b/tests/monads.scm
@@ -156,27 +156,6 @@
                       (call-with-input-file b get-string-all))))
     #:guile-for-build (package-derivation %store %bootstrap-guile)))
 
-(define derivation-expression
-  (@@ (guix monads) derivation-expression))
-
-(test-assert "mlet* + derivation-expression"
-  (run-with-store %store
-    (mlet* %store-monad ((guile  (package-file %bootstrap-guile "bin/guile"))
-                         (gdrv   (package->derivation %bootstrap-guile))
-                         (exp -> `(let ((out (assoc-ref %outputs "out")))
-                                    (mkdir out)
-                                    (symlink ,guile
-                                             (string-append out "/guile-rocks"))))
-                         (drv    (derivation-expression "rocks" exp
-                                                        #:inputs
-                                                        `(("g" ,gdrv))))
-                         (out -> (derivation->output-path drv))
-                         (built? (built-derivations (list drv))))
-      (return (and built?
-                   (equal? guile
-                           (readlink (string-append out "/guile-rocks"))))))
-    #:guile-for-build (package-derivation %store %bootstrap-guile)))
-
 (test-assert "mapm"
   (every (lambda (monad run)
            (with-monad monad