diff options
author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-14 10:03:19 +0200 |
---|---|---|
committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-14 10:03:19 +0200 |
commit | c206f1914e9299b3f9a8b8be295a02f14acc67b3 (patch) | |
tree | 7cd0441f380b53e64badd6ee063bbf7ccbdf27a5 /gnu/packages/disk.scm | |
parent | 4d14902b9402a83db444d8d6818d0a4f438ce8c4 (diff) | |
parent | 396b05f04ed5c5ad6141bd1b4f70f51561a97aad (diff) | |
download | patches-c206f1914e9299b3f9a8b8be295a02f14acc67b3.tar patches-c206f1914e9299b3f9a8b8be295a02f14acc67b3.tar.gz |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'gnu/packages/disk.scm')
-rw-r--r-- | gnu/packages/disk.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 4de0745190..8421682924 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -78,26 +78,25 @@ (define-public parted (package (name "parted") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parted/parted-" version ".tar.xz")) - (patches (search-patches "parted-glibc-compat.patch")) (sha256 (base32 - "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5")))) + "0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after - 'unpack 'fix-locales-and-python - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "tests/t0251-gpt-unicode.sh" - (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales - (substitute* "tests/msdos-overlap" - (("/usr/bin/python") (which "python")))))))) + (add-after 'unpack 'fix-locales-and-python + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/t0251-gpt-unicode.sh" + (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales + (substitute* "tests/msdos-overlap" + (("/usr/bin/python") (which "python"))) + #t))))) (inputs `(("lvm2" ,lvm2) ("readline" ,readline) @@ -105,6 +104,7 @@ (native-inputs `(("gettext" ,gettext-minimal) ;; For the tests. + ("e2fsprogs" ,e2fsprogs) ("perl" ,perl) ("python" ,python-2))) (home-page "https://www.gnu.org/software/parted/") |