From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: Reproducible profiles Date: Thu, 14 May 2015 21:19:44 -0400 Message-ID: <87pp62iqmn.fsf@fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt4I7-00023r-AU for guix-devel@gnu.org; Thu, 14 May 2015 21:19:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yt4I5-0006lT-Qc for guix-devel@gnu.org; Thu, 14 May 2015 21:19:55 -0400 Received: from mail.fsf.org ([208.118.235.13]:53018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt4I5-0006lP-NG for guix-devel@gnu.org; Thu, 14 May 2015 21:19:53 -0400 Received: from jumpgate.fsf.org ([74.94.156.211]:34903 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Yt4I4-0008VZ-GY for guix-devel@gnu.org; Thu, 14 May 2015 21:19:53 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Hey folks, Lately I've been wanting to version control the list of packages that I install in my user profile so that I can sync it amongst many machines. So, I took a stab at adding a new '--apply' option to 'guix package' that reads in a package list from a Scheme file and creates a new generation of the profile with only those packages are installed. Here's an example configuration: (use-modules (gnu)) (use-package-modules base less guile emacs admin ruby mail pumpio man) (list ruby coreutils less man-db notmuch guile-2.0 emacs dmd offlineimap pumpa) Below is a naive patch that does the job, but is unideal because it doesn't do some nice things like display the diff between generations before building. I'm looking for some guidance to make this option mesh better with the rest of the 'guix package' utility. Any help is appreciated. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-package-Add-apply-option.patch >From b5348fb46fc5b6167099ed817aad8587bfbad20a Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 14 May 2015 21:11:57 -0400 Subject: [PATCH] package: Add --apply option. --- guix/scripts/package.scm | 104 +++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 15f3e13..bb76fc3 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -426,6 +426,9 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n")) (display (_ " -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP")) (display (_ " + --apply=FILE create a new generation with only the packages listed + in FILE installed")) + (display (_ " --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP")) (display (_ " --roll-back roll back to the previous generation")) @@ -517,6 +520,10 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n")) (lambda (opt name arg result arg-handler) (values (alist-cons 'roll-back? #t result) #f))) + (option '("apply") #t #f + (lambda (opt name arg result arg-handler) + (values (alist-cons 'apply (load arg) result) + arg-handler))) (option '(#\l "list-generations") #f #t (lambda (opt name arg result arg-handler) (values (cons `(query list-generations ,(or arg "")) @@ -783,6 +790,50 @@ more information.~%")) (define dry-run? (assoc-ref opts 'dry-run?)) (define profile (assoc-ref opts 'profile)) + (define (build-and-use-profile manifest) + (let* ((bootstrap? (assoc-ref opts 'bootstrap?))) + + (when (equal? profile %current-profile) + (ensure-default-profile)) + + (let* ((prof-drv (run-with-store (%store) + (profile-derivation + manifest + #:hooks (if bootstrap? + '() + %default-profile-hooks)))) + (prof (derivation->output-path prof-drv))) + (show-what-to-build (%store) (list prof-drv) + #:use-substitutes? + (assoc-ref opts 'substitutes?) + #:dry-run? dry-run?) + + (cond + (dry-run? #t) + ((and (file-exists? profile) + (and=> (readlink* profile) (cut string=? prof <>))) + (format (current-error-port) (_ "nothing to be done~%"))) + (else + (let* ((number (generation-number profile)) + + ;; Always use NUMBER + 1 for the new profile, + ;; possibly overwriting a "previous future + ;; generation". + (name (generation-file-name profile + (+ 1 number)))) + (and (build-derivations (%store) (list prof-drv)) + (let* ((entries (manifest-entries manifest)) + (count (length entries))) + (switch-symlinks name prof) + (switch-symlinks profile name) + (unless (string=? profile %current-profile) + (register-gc-root (%store) name)) + (format #t (N_ "~a package in profile~%" + "~a packages in profile~%" + count) + count) + (display-search-paths entries profile))))))))) + ;; First roll back if asked to. (cond ((and (assoc-ref opts 'roll-back?) (not dry-run?)) @@ -817,60 +868,25 @@ more information.~%")) (alist-delete 'delete-generations opts))) (_ #f)) opts)) + ((and (assoc-ref opts 'apply) + (not dry-run?)) + (let* ((packages (assoc-ref opts 'apply)) + (manifest (make-manifest + (map package->manifest-entry packages)))) + (build-and-use-profile manifest))) (else (let* ((manifest (profile-manifest profile)) (install (options->installable opts manifest)) (remove (options->removable opts manifest)) - (bootstrap? (assoc-ref opts 'bootstrap?)) (transaction (manifest-transaction (install install) (remove remove))) (new (manifest-perform-transaction manifest transaction))) - (when (equal? profile %current-profile) - (ensure-default-profile)) - (unless (and (null? install) (null? remove)) - (let* ((prof-drv (run-with-store (%store) - (profile-derivation - new - #:hooks (if bootstrap? - '() - %default-profile-hooks)))) - (prof (derivation->output-path prof-drv))) - (show-manifest-transaction (%store) manifest transaction - #:dry-run? dry-run?) - (show-what-to-build (%store) (list prof-drv) - #:use-substitutes? - (assoc-ref opts 'substitutes?) - #:dry-run? dry-run?) - - (cond - (dry-run? #t) - ((and (file-exists? profile) - (and=> (readlink* profile) (cut string=? prof <>))) - (format (current-error-port) (_ "nothing to be done~%"))) - (else - (let* ((number (generation-number profile)) - - ;; Always use NUMBER + 1 for the new profile, - ;; possibly overwriting a "previous future - ;; generation". - (name (generation-file-name profile - (+ 1 number)))) - (and (build-derivations (%store) (list prof-drv)) - (let* ((entries (manifest-entries new)) - (count (length entries))) - (switch-symlinks name prof) - (switch-symlinks profile name) - (unless (string=? profile %current-profile) - (register-gc-root (%store) name)) - (format #t (N_ "~a package in profile~%" - "~a packages in profile~%" - count) - count) - (display-search-paths entries - profile)))))))))))) + (show-manifest-transaction (%store) manifest transaction + #:dry-run? dry-run?) + (build-and-use-profile new)))))) (define (process-query opts) ;; Process any query specified by OPTS. Return #t when a query was -- 2.1.4 --=-=-= Content-Type: text/plain Thanks! -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate --=-=-=--