diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/education.scm | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4fee50e5ff..536962dabc 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -330,7 +330,7 @@ easy.") (define-public snap (package (name "snap") - (version "6.6.0") + (version "6.9.0") (source (origin (method git-fetch) @@ -339,7 +339,7 @@ easy.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1k0j0sp6zz2hnh7zc7f086zc3sld01h7sk277j6fak914yv6slzy")))) + (base32 "1wppz57lrrribrfnaiv6jrrf703w7i6ja0dnz8yx8naxhbsglwyf")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -368,8 +368,7 @@ easy.") (call-with-output-file script (lambda (port) (format port "#!~a\n~a '~a'" bash xdg-open snap))) - (chmod script #o555))) - #t))) + (chmod script #o555)))))) (inputs `(("bash" ,bash-minimal) ("js-filesaver" ,js-filesaver) |