Re: Guix upgrade leads to different hashes

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 922 bytes --]

Howdy,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Hi Oleg,
>>
>> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>>
>>> ludo@gnu.org (Ludovic Courtès) writes:
>>>
>>> [...]
>>>
>>>> What does ‘guix package --list-generations’ show?  The output is a diff
>>>> of the contents of each generation.
>>>
>>> My current generation before upgrade was 369.  After upgrade it's 370.
>>> No changes.
>>>
>>> Generation 369	Oct 03 2017 13:07:34
>>>  + emacs-git-auto-commit-mode 4.4.0 out
>>> /gnu/store/kcihgk3k9mgilbly0r7922qgkdgg2ji3-emacs-git-auto-commit-mode-4.4.0
>>>
>>> Generation 370	Oct 04 2017 00:42:07	(current)
>>
>> What about:
>>
>>   diff -u /var/guix/profiles/per-user/ludo/guix-profile-{369,370}-link/manifest
>
> This has some info!

As I see it, it just reversed the order of entries.

Could you check if this patch helps:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 857 bytes --]

diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 4adc70522..0e365018a 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -604,12 +604,12 @@ and upgrades."
     (options->upgrade-predicate opts))
 
   (define upgraded
-    (fold (lambda (entry transaction)
-            (if (upgrade? (manifest-entry-name entry))
-                (transaction-upgrade-entry entry transaction)
-                transaction))
-          transaction
-          (manifest-entries manifest)))
+    (fold-right (lambda (entry transaction)
+                  (if (upgrade? (manifest-entry-name entry))
+                      (transaction-upgrade-entry entry transaction)
+                      transaction))
+                transaction
+                (manifest-entries manifest)))
 
   (define to-install
     (filter-map (match-lambda

[-- Attachment #3: Type: text/plain, Size: 12 bytes --]


Ludo’.