diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/commencement.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/hurd.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/gnumach-version.patch | 23 |
4 files changed, 29 insertions, 5 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1ab0c37bf5..38a25cef18 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,6 +1463,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnulib-bootstrap.patch \ + %D%/packages/patches/gnumach-version.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ce40f0cea6..1cfaaae1e7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2639,6 +2639,7 @@ memoized as a function of '%current-system'." (source (origin (inherit (package-source gnumach-headers)) + (patches '()) (method (git-fetch-from-tarball (origin diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9c1681f236..a22d0cadce 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -57,21 +57,20 @@ version ".tar.gz")) (define-public gnumach-headers - (let ((revision "0") - (commit "2556fdece900d67529d5eda01f1bdaae4ffe96b0")) + (let ((commit "v1.8+git20240714")) (package (name "gnumach-headers") - (version (git-version "1.8" revision commit)) + (version (string-drop commit 1)) (source (origin (method git-fetch) (uri (git-reference (url "https://git.savannah.gnu.org/git/hurd/gnumach.git") (commit commit))) + (patches (search-patches "gnumach-version.patch")) (file-name (git-file-name "gnumach" version)) (sha256 - (base32 - "1lzsbix0l4jhab38pvwnmk7ip1lsn7m5smhnrciqajsqnadsnlzs")))) + (base32 "0ykav1kx0bgxcxw04bpcsh5s4531fzdkahjgrlsfs2h3w3vfkga0")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/gnumach-version.patch b/gnu/packages/patches/gnumach-version.patch new file mode 100644 index 0000000000..aec3c86a16 --- /dev/null +++ b/gnu/packages/patches/gnumach-version.patch @@ -0,0 +1,23 @@ +Upstream-status: Taken from Debian upstream: + <https://salsa.debian.org/hurd-team/gnumach/-/raw/master/debian/patches/12_version_suffix.patch> + +Index: gnumach/configure.ac +=================================================================== +--- gnumach.orig/configure.ac ++++ gnumach/configure.ac +@@ -19,6 +19,7 @@ AC_PREREQ([2.57]) + m4_include([version.m4]) + AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], + [AC_PACKAGE_TARNAME]) ++AC_SUBST([PACKAGE_VERSION_SUFFIX]) + AC_CONFIG_SRCDIR([kern/ipc_kobject.c]) + + if test -z "${CFLAGS+set}"; then +Index: gnumach/version.c.in +=================================================================== +--- gnumach.orig/version.c.in ++++ gnumach/version.c.in +@@ -1,2 +1,2 @@ + /* @configure_input@ */ +-const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@"; ++const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@@PACKAGE_VERSION_SUFFIX@"; |