diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-07-28 17:52:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-28 18:09:44 +0200 |
| commit | 9ca8aa38ecce0b0651a0ff394ee4ce32bdd0bb41 (patch) | |
| tree | fdf181b7a401bbc561c62ac792ece6e564adfbc9 /gnu | |
| parent | 3a53759807b4d139de40266c4875ba5b9d9e1fe7 (diff) | |
gnu: guix: Add dependency on Guile-Git.
* gnu/packages/package-management.scm (guix)[arguments] <wrap-program>:
Add Guile-Git to PATH.
[propagated-inputs]: Add GUILE-GIT.
(guile2.0-guix)[propagated-inputs]: Add GUILE2.0-GIT.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/package-management.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d49b4c3a4f6..3650b5d957f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm | |||
| @@ -187,6 +187,7 @@ | |||
| 187 | (let* ((out (assoc-ref outputs "out")) | 187 | (let* ((out (assoc-ref outputs "out")) |
| 188 | (guile (assoc-ref inputs "guile")) | 188 | (guile (assoc-ref inputs "guile")) |
| 189 | (json (assoc-ref inputs "guile-json")) | 189 | (json (assoc-ref inputs "guile-json")) |
| 190 | (git (assoc-ref inputs "guile-git")) | ||
| 190 | (ssh (assoc-ref inputs "guile-ssh")) | 191 | (ssh (assoc-ref inputs "guile-ssh")) |
| 191 | (gnutls (assoc-ref inputs "gnutls")) | 192 | (gnutls (assoc-ref inputs "gnutls")) |
| 192 | (effective | 193 | (effective |
| @@ -196,6 +197,7 @@ | |||
| 196 | "-c" "(display (effective-version))"))) | 197 | "-c" "(display (effective-version))"))) |
| 197 | (path (string-append | 198 | (path (string-append |
| 198 | json "/share/guile/site/" effective ":" | 199 | json "/share/guile/site/" effective ":" |
| 200 | git "/share/guile/site/" effective ":" | ||
| 199 | ssh "/share/guile/site/" effective ":" | 201 | ssh "/share/guile/site/" effective ":" |
| 200 | gnutls "/share/guile/site/" effective))) | 202 | gnutls "/share/guile/site/" effective))) |
| 201 | 203 | ||
| @@ -252,7 +254,8 @@ | |||
| 252 | (propagated-inputs | 254 | (propagated-inputs |
| 253 | `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co. | 255 | `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co. |
| 254 | ("guile-json" ,guile-json) | 256 | ("guile-json" ,guile-json) |
| 255 | ("guile-ssh" ,guile-ssh))) | 257 | ("guile-ssh" ,guile-ssh) |
| 258 | ("guile-git" ,guile-git))) | ||
| 256 | 259 | ||
| 257 | (home-page "https://www.gnu.org/software/guix/") | 260 | (home-page "https://www.gnu.org/software/guix/") |
| 258 | (synopsis "Functional package manager for installed software packages and versions") | 261 | (synopsis "Functional package manager for installed software packages and versions") |
| @@ -278,7 +281,8 @@ the Nix package manager.") | |||
| 278 | (propagated-inputs | 281 | (propagated-inputs |
| 279 | `(("gnutls" ,gnutls) | 282 | `(("gnutls" ,gnutls) |
| 280 | ("guile-json" ,guile2.0-json) | 283 | ("guile-json" ,guile2.0-json) |
| 281 | ("guile-ssh" ,guile2.0-ssh))))) | 284 | ("guile-ssh" ,guile2.0-ssh) |
| 285 | ("guile-git" ,guile2.0-git))))) | ||
| 282 | 286 | ||
| 283 | (define (source-file? file stat) | 287 | (define (source-file? file stat) |
| 284 | "Return true if FILE is likely a source file, false if it is a typical | 288 | "Return true if FILE is likely a source file, false if it is a typical |
