diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-07-17 02:00:00 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-07-17 02:00:00 +0200 |
| commit | 670818a4049edb8a77a5b596fbc7558bde57165c (patch) | |
| tree | d195e00e0c0b5bfc63c0fb9f71a93e768a4465bc /gnu/home.scm | |
| parent | 24c0518dd404cbb3c434fb6704f4f551bbc78693 (diff) | |
| download | guix-patches-670818a4049edb8a77a5b596fbc7558bde57165c.tar guix-patches-670818a4049edb8a77a5b596fbc7558bde57165c.tar.gz | |
Revert "home: Add 'home-generation-base'."
This reverts commit 5df8f7802e8b45855e8f84830677001dc631e4f7.
This commit or the next one appears to have broken ‘guix pull’.
Diffstat (limited to 'gnu/home.scm')
| -rw-r--r-- | gnu/home.scm | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/gnu/home.scm b/gnu/home.scm index 4ddbafe412..a9f0a469a5 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -1,6 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> -;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,8 +27,7 @@ #:use-module (guix diagnostics) #:use-module (guix gexp) #:use-module (guix store) - #:use-module (ice-9 match) - #:use-module (ice-9 regex) + #:export (home-environment home-environment? this-home-environment @@ -40,9 +38,7 @@ home-environment-services home-environment-location - home-environment-with-provenance - - home-generation-base)) + home-environment-with-provenance)) ;;; Comment: ;;; @@ -118,21 +114,3 @@ of HOME-PROVENANCE-SERVICE-TYPE to its services." (run-with-store store (home-environment-derivation he) #:system system #:target target))))) - -(define %profile-generation-rx - ;; Regexp that matches profile generation. - (make-regexp "(.*)-([0-9]+)-link$")) - -(define (home-generation-base file) - "If FILE is a Home generation GC root such as \"guix-home-42-link\", -return its corresponding base---e.g., \"guix-home\". Otherwise return #f. - -This is similar to the 'generation-profile' procedure but applied to Home -generations." - (match (regexp-exec %profile-generation-rx file) - (#f #f) - (m (let ((profile (match:substring m 1))) - ;; Distinguish from a "real" profile and from a system generation. - (and (file-exists? (string-append profile "/on-first-login")) - (file-exists? (string-append profile "/profile/manifest")) - profile))))) |