diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/packages/xdisorg.scm | |
parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.zip |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r-- | gnu/packages/xdisorg.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 424eb91827..912d1ca28b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2223,7 +2223,7 @@ tools to complement clipnotify.") (file-name (git-file-name name version)) (sha256 (base32 - "12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys")))) + "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9")))) (build-system gnu-build-system) (arguments `(#:phases |