diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-17 18:00:28 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-17 18:00:28 -0500 |
commit | 129b9b16d9b588316cc997cf8f4fefe30961a417 (patch) | |
tree | bc1dc50e83af6e9afb2ee24cd32f5e42e039642e /guix/scripts/pull.scm | |
parent | 5f9c92dd6285a1ef326cf5aa99781f1f3acbd245 (diff) | |
parent | 9113de2ca2db195908e3262b3752f8392ada8630 (diff) | |
download | guix-patches-129b9b16d9b588316cc997cf8f4fefe30961a417.tar guix-patches-129b9b16d9b588316cc997cf8f4fefe30961a417.tar.gz |
Merge remote-tracking branch 'origin/version-1.2.0' into master
Conflicts:
gnu/packages/bioinformatics.scm
The python-pysam package fixed in master was kept instead of the update done
in the version-1.2.0 branch.
Diffstat (limited to 'guix/scripts/pull.scm')
-rw-r--r-- | guix/scripts/pull.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index bb1b560a22..7fd8b3f1a4 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -385,7 +385,7 @@ previous generation. Return true if there are news to display." (and=> (relative-generation profile -1) (cut generation-file-name profile <>))) - (when previous + (and previous (let ((old-channels (profile-channels previous)) (new-channels (profile-channels profile))) ;; Find the channels present in both PROFILE and PREVIOUS, and print |