From ff690faf66d8f37ee6b679fcb7cf37e369624ee3 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Sat, 17 Jun 2023 13:51:05 +0200 Subject: gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?. * gnu/packages/hurd.scm (hurd-target?): Remove. (hurd-system?): Move to... * guix/utils.scm (system-hurd?): ...here. * gnu/packages/*: Update all users, removing (gnu packages hurd) include where now unused. --- guix/utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'guix/utils.scm') diff --git a/guix/utils.scm b/guix/utils.scm index b9657df292..e9af33bdeb 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Philip McGrath +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ package-name->name+version target-linux? target-hurd? + system-hurd? target-mingw? target-x86-32? target-x86-64? @@ -674,6 +676,10 @@ a character other than '@'." (and (string-suffix? "-gnu" target) (not (string-contains target "linux")))) +(define* (system-hurd?) + "Is the current system the GNU(/Hurd) system?" + (and=> (%current-system) target-hurd?)) + (define* (target-mingw? #:optional (target (%current-target-system))) "Is the operating system of TARGET Windows?" (and target -- cgit v1.2.3