From 713335fa610713dc9491fc4848f5f5842423b143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2016 16:56:47 +0100 Subject: [PATCH] derivations: Add 'raw-derivation'. * guix/derivations.scm (raw-derivation): New procedure. * guix/download.scm (raw-derivation): Remove. * guix/gexp.scm (raw-derivation): Remove. --- guix/derivations.scm | 4 ++++ guix/download.scm | 3 --- guix/gexp.scm | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index e378a7cb034184a6cc5c5f966634c5cb5bc3888c..7ed9bd61d3d77440dd65c5d576389dab4fb0b0cd 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -86,6 +86,7 @@ derivation-path->output-path derivation-path->output-paths derivation + raw-derivation map-derivation @@ -1306,3 +1307,6 @@ ALLOWED-REFERENCES, DISALLOWED-REFERENCES, LOCAL-BUILD?, and SUBSTITUTABLE?." (define built-derivations (store-lift build-derivations)) + +(define raw-derivation + (store-lift derivation)) diff --git a/guix/download.scm b/guix/download.scm index 64a1d2f0849a1fac051b32fb4703141462bfe595..e2e5cee77733b6b320cb24ad89d639b31902e6ed 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -322,9 +322,6 @@ the daemon." result)) store))))) -(define raw-derivation - (store-lift derivation)) - (define* (built-in-download file-name url #:key system hash-algo hash mirrors content-addressed-mirrors diff --git a/guix/gexp.scm b/guix/gexp.scm index 05178a5ecc72cda7c7cf449a995d01d60f79eefd..fd5dc492334a75ad109350c8f26c8b8da469c402 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -453,9 +453,6 @@ whether this should be considered a \"native\" input or not." '())) (gexp-references gexp))))) -(define raw-derivation - (store-lift derivation)) - (define* (lower-inputs inputs #:key system target) "Turn any package from INPUTS into a derivation for SYSTEM; return the