me
/
guix
Archived
1
0
Fork 0
Code

Revert "home: Add 'home-generation-base'." 

This reverts commit 5df8f7802e.
This commit or the next one appears to have broken ‘guix pull’.
master
Tobias Geerinckx-Rice 2022-07-17 02:00:00 +02:00
parent 24c0518dd4
commit 670818a404
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/home.scm
View File

@ -1,6 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,8 +27,7 @@
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix store) #:use-module (guix store)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:export (home-environment #:export (home-environment
home-environment? home-environment?
this-home-environment this-home-environment
@ -40,9 +38,7 @@
home-environment-services home-environment-services
home-environment-location home-environment-location
home-environment-with-provenance home-environment-with-provenance))
home-generation-base))
;;; Comment: ;;; Comment:
;;; ;;;
@ -118,21 +114,3 @@ of HOME-PROVENANCE-SERVICE-TYPE to its services."
(run-with-store store (home-environment-derivation he) (run-with-store store (home-environment-derivation he)
#:system system #:system system
#:target target))))) #: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)))))