kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

guix gc: '--delete-generations' now deletes old Home generations.

Browse Source 
This reverts commit 24c0518dd404cbb3c434fb6704f4f551bbc78693,
thereby reinstating ba22560627f848f40891a56355ff26b6de1380bc, with an
additional fix in (guix self).

Fixes <https://issues.guix.gnu.org/56722>.
Reported by "(" <paren@disroot.org>.

* guix/scripts/gc.scm (guix-gc)[delete-generations]: Add call to
'home-generation-base'.
* guix/self.scm (compiled-guix)[*core-cli-modules*]: Remove (guix
scripts gc).
* doc/guix.texi (Invoking guix gc): Document the change.
This commit is contained in:
Ludovic Courtès 2022-07-31 23:03:36 +02:00
parent 61db74a687
commit 4de445f3da
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guix.texi
View File

@ -4362,7 +4362,8 @@ nothing and exit immediately.
@item --delete-generations[=@var{duration}] @item --delete-generations[=@var{duration}]
@itemx -d [@var{duration}] @itemx -d [@var{duration}]
Before starting the garbage collection process, delete all the generations Before starting the garbage collection process, delete all the generations
older than @var{duration}, for all the user profiles; when run as root, this older than @var{duration}, for all the user profiles and home environment
generations; when run as root, this
applies to all the profiles @emph{of all the users}. applies to all the profiles @emph{of all the users}.
For example, this command deletes all the generations of all your profiles For example, this command deletes all the generations of all your profiles

6
guix/scripts/gc.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2013, 2015-2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -26,6 +26,7 @@
profile-generations profile-generations
generation-number) generation-number)
#:autoload (guix scripts package) (delete-generations) #:autoload (guix scripts package) (delete-generations)
#:autoload (gnu home) (home-generation-base)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -260,7 +261,8 @@ is deprecated; use '-D'~%"))
(filter-map (lambda (root) (filter-map (lambda (root)
(and (or (zero? (getuid)) (and (or (zero? (getuid))
(user-owned? root)) (user-owned? root))
(generation-profile root))) (or (generation-profile root)
(home-generation-base root))))
(gc-roots))))) (gc-roots)))))
(for-each (lambda (profile) (for-each (lambda (profile)
(delete-old-generations store profile pattern)) (delete-old-generations store profile pattern))

1
guix/self.scm
View File

@ -929,6 +929,7 @@ itself."
(('guix 'scripts 'deploy) #t) (('guix 'scripts 'deploy) #t)
(('guix 'scripts 'home . _) #t) (('guix 'scripts 'home . _) #t)
(('guix 'scripts 'import . _) #t) (('guix 'scripts 'import . _) #t)
(('guix 'scripts 'gc) #t) ;autoloads (gnu home)
(('guix 'pack) #t) (('guix 'pack) #t)
(_ #f)) (_ #f))
(scheme-modules* source "guix/scripts")) (scheme-modules* source "guix/scripts"))