diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/python.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b2ec486d7a5..c8129ce46c8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm | |||
| @@ -610,7 +610,7 @@ To function properly, this package should not be installed together with the | |||
| 610 | (define-public micropython | 610 | (define-public micropython |
| 611 | (package | 611 | (package |
| 612 | (name "micropython") | 612 | (name "micropython") |
| 613 | (version "1.14") | 613 | (version "1.15") |
| 614 | (source | 614 | (source |
| 615 | (origin | 615 | (origin |
| 616 | (method url-fetch) | 616 | (method url-fetch) |
| @@ -618,7 +618,7 @@ To function properly, this package should not be installed together with the | |||
| 618 | "releases/download/v" version | 618 | "releases/download/v" version |
| 619 | "/micropython-" version ".tar.xz")) | 619 | "/micropython-" version ".tar.xz")) |
| 620 | (sha256 | 620 | (sha256 |
| 621 | (base32 "0k6ri3rxxnnmvcbi7z7x59r21f4vj9dcf9j64jhj1cgazmb62c4p")) | 621 | (base32 "04sfrfcljhfps340l4wh5ffwkhw1ydraday8nv92nv7gmnrj1l2j")) |
| 622 | (modules '((guix build utils))) | 622 | (modules '((guix build utils))) |
| 623 | (snippet | 623 | (snippet |
| 624 | '(begin | 624 | '(begin |
