diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/shells.scm | |
parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
download | guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/shells.scm')
-rw-r--r-- | gnu/packages/shells.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index dda670d237..3a48bc7dbf 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> -;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -834,14 +834,20 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.9.7") + (version "0.9.9") (source + ;; oil's sources contain a modified version of CPython 2.7.13. + ;; According to https://www.oilshell.org/blog/2017/05/05.html + ;; this bundles version of CPython had certain unused parts removed + ;; and its build system has been replaced by a custom one. + ;; This would probably make it quite complicated to replace the + ;; bundled CPython with the one from the python2 package. (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "09ill1wks8gmixfc648wx25wx0wzlgkjj34bbpglx496i6yp81aw")))) + (base32 "1ymszq0wy7sy709yqx8dpmv7b37fkc57bdg02ah2gnjbvbk6s2z1")))) (build-system gnu-build-system) (arguments (list #:strip-binaries? #f ; strip breaks the binary |