diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-12-12 15:03:35 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-12-12 15:03:35 +0100 |
| commit | 302a84a593e4be417d739caf4e5385df536e3943 (patch) | |
| tree | 3e9e908e52e3d4a141552d8fda9a7fbe2d41637c /gnu/packages | |
| parent | 3677b97030e5954fa26bdb435e0d3379a1a4ec43 (diff) | |
| parent | 6dbdb5fcf5640c126ac65479b835aba83aea2a6d (diff) | |
Merge branch 'version-1.4.0'
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/package-management.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/texinfo.scm | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index daa83f8d0c..5a09b1fcf8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -164,9 +164,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "1.4.0rc1") - (commit "9ccc94afb266428b7feeba805617d31eb8afb23c") - (revision 1)) + (let ((version "1.4.0rc2") + (commit "7866294e32f1e758d06fce4e1b1035eca3a7d772") + (revision 0)) (package (name "guix") @@ -182,7 +182,7 @@ (commit commit))) (sha256 (base32 - "1asx4jqjdp56r9m693ikrzxn4vaga846v2j6956xkavyj19x42nh")) + "0np4fw5kq882nrkfgsvvwgcxqwvm6bzn3dbdf8p48nr7mfrm3rz9")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 5ecbb1e4cd..1dd6d47fdd 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -75,7 +75,8 @@ %standard-phases) ;; XXX: Work around <https://issues.guix.gnu.org/59616>. - #:tests? ,(not (hurd-target?)))) + #:tests? ,(and (not (hurd-target?)) + (not (%current-target-system))))) (inputs (list ncurses perl)) ;; When cross-compiling, texinfo will build some of its own binaries with ;; the native compiler. This means ncurses is needed both in both inputs |