me
/
guix
Archived
1
0
Fork 0

Move (gnu platform) and (gnu platforms ...) to guix/.

* gnu/platform.scm:
* gnu/platforms/arm.scm:
* gnu/platforms/hurd.scm:
* gnu/platforms/mips.scm:
* gnu/platforms/powerpc.scm:
* gnu/platforms/riscv.scm:
* gnu/platforms/s390.scm:
* gnu/platforms/x86.scm: Move to guix/.

* Makefile.am:
* doc/guix.texi (Porting to a New Platform):
* etc/release-manifest.scm:
* gnu/ci.scm:
* gnu/image.scm:
* gnu/local.mk:
* gnu/packages/bioinformatics.scm:
* gnu/packages/bootstrap.scm:
* gnu/packages/cross-base.scm:
* gnu/packages/instrumentation.scm:
* gnu/packages/linux.scm:
* gnu/system/image.scm:
* gnu/system/images/hurd.scm:
* gnu/system/images/novena.scm:
* gnu/system/images/pine64.scm:
* gnu/system/images/pinebook-pro.scm:
* gnu/system/images/rock64.scm:
* guix/scripts/build.scm:
* guix/scripts/system.scm:
* guix/self.scm: Update (gnu platform...) to (guix platform...).

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Josselin Poiret 2022-05-23 22:37:26 +02:00 committed by Mathieu Othacehe
parent d129d962e4
commit dab819d5c4
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
28 changed files with 42 additions and 49 deletions

View File

@ -132,6 +132,14 @@ MODULES = \
guix/workers.scm \
guix/least-authority.scm \
guix/ipfs.scm \
guix/platform.scm \
guix/platforms/arm.scm \
guix/platforms/hurd.scm \
guix/platforms/mips.scm \
guix/platforms/powerpc.scm \
guix/platforms/riscv.scm \
guix/platforms/s390.scm \
guix/platforms/x86.scm \
guix/build-system.scm \
guix/build-system/android-ndk.scm \
guix/build-system/ant.scm \

View File

@ -40448,7 +40448,7 @@ guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs
@end example
For this to work, it is first required to register a new platform as
defined in the @code{(gnu platform)} module. A platform is making the
defined in the @code{(guix platform)} module. A platform is making the
connection between a GNU triplet (@pxref{Specifying Target Triplets, GNU
configuration triplets,, autoconf, Autoconf}), the equivalent
@var{system} in Nix notation, the name of the

View File

@ -23,7 +23,7 @@
(use-modules (gnu packages)
(guix packages)
(guix profiles)
((gnu platform) #:select (targets))
((guix platform) #:select (targets))
((gnu services xorg) #:select (%default-xorg-modules))
(guix utils)
(srfi srfi-1)

View File

@ -55,7 +55,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages package-management)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (gnu system)
#:use-module (gnu system image)
#:use-module (gnu system vm)

View File

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu image)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (guix records)
#:export (partition
partition?

View File

@ -89,7 +89,6 @@ GNU_SYSTEM_MODULES = \
%D%/home/services/utils.scm \
%D%/home/services/xdg.scm \
%D%/image.scm \
%D%/platform.scm \
%D%/packages.scm \
%D%/packages/abduco.scm \
%D%/packages/abiword.scm \
@ -631,13 +630,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/zile.scm \
%D%/packages/zwave.scm \
\
%D%/platforms/arm.scm \
%D%/platforms/mips.scm \
%D%/platforms/powerpc.scm \
%D%/platforms/riscv.scm \
%D%/platforms/s390.scm \
%D%/platforms/x86.scm \
\
%D%/services.scm \
%D%/services/admin.scm \
%D%/services/audio.scm \

View File

@ -161,7 +161,7 @@
#:use-module (gnu packages wget)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match))

View File

@ -26,7 +26,7 @@
(define-module (gnu packages bootstrap)
#:use-module (guix licenses)
#:use-module (gnu packages)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system)

View File

@ -30,7 +30,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages hurd)
#:use-module (gnu packages mingw)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)

View File

@ -42,7 +42,7 @@
#:use-module (gnu packages swig)
#:use-module (gnu packages tbb)
#:use-module (gnu packages xml)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)

View File

@ -158,7 +158,7 @@
#:use-module (gnu packages groff)
#:use-module (gnu packages selinux)
#:use-module (gnu packages swig)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)

View File

@ -32,7 +32,7 @@
#:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
#:use-module (gnu image)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu system)

View File

@ -23,7 +23,7 @@
#:use-module (gnu bootloader grub)
#:use-module (gnu image)
#:use-module (gnu packages ssh)
#:use-module (gnu platforms hurd)
#:use-module (guix platforms hurd)
#:use-module (gnu services)
#:use-module (gnu services ssh)
#:use-module (gnu system)

View File

@ -22,7 +22,7 @@
#:use-module (gnu bootloader u-boot)
#:use-module (gnu image)
#:use-module (gnu packages linux)
#:use-module (gnu platforms arm)
#:use-module (guix platforms arm)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu system)

View File

@ -21,7 +21,7 @@
#:use-module (gnu bootloader u-boot)
#:use-module (gnu image)
#:use-module (gnu packages linux)
#:use-module (gnu platforms arm)
#:use-module (guix platforms arm)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu system)

View File

@ -21,7 +21,7 @@
#:use-module (gnu bootloader u-boot)
#:use-module (gnu image)
#:use-module (gnu packages linux)
#:use-module (gnu platforms arm)
#:use-module (guix platforms arm)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu system)

View File

@ -21,7 +21,7 @@
#:use-module (gnu bootloader u-boot)
#:use-module (gnu image)
#:use-module (gnu packages linux)
#:use-module (gnu platforms arm)
#:use-module (guix platforms arm)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu services networking)

View File

@ -16,7 +16,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platform)
(define-module (guix platform)
#:use-module (guix discovery)
#:use-module (guix memoization)
#:use-module (guix records)
@ -78,7 +78,7 @@
(define (platform-modules)
"Return the list of platform modules."
(all-modules (map (lambda (entry)
`(,entry . "gnu/platforms"))
`(,entry . "guix/platforms"))
%load-path)
#:warn warn-about-load-error))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms arm)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms arm)
#:use-module (guix platform)
#:use-module (guix records)
#:export (armv7-linux
aarch64-linux))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms hurd)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms hurd)
#:use-module (guix platform)
#:use-module (guix records)
#:export (hurd))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms mips)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms mips)
#:use-module (guix platform)
#:use-module (guix records)
#:export (mips64-linux))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms powerpc)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms powerpc)
#:use-module (guix platform)
#:use-module (guix records)
#:export (powerpc-linux
powerpc64le-linux))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms riscv)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms riscv)
#:use-module (guix platform)
#:use-module (guix records)
#:export (riscv64-linux))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms s390)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms s390)
#:use-module (guix platform)
#:use-module (guix records)
#:export (s390x-linux))

View File

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu platforms x86)
#:use-module (gnu platform)
#:use-module (gnu packages linux)
(define-module (guix platforms x86)
#:use-module (guix platform)
#:use-module (guix records)
#:export (i686-linux
x86_64-linux

View File

@ -48,7 +48,7 @@
#:use-module (srfi srfi-35)
#:use-module (srfi srfi-37)
#:use-module (gnu packages)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module ((guix status) #:select (with-status-verbosity))
#:use-module ((guix progress) #:select (current-terminal-columns))
#:use-module ((guix build syscalls) #:select (terminal-columns))

View File

@ -66,7 +66,7 @@
(device-module-aliases matching-modules)
#:use-module (gnu system linux-initrd)
#:use-module (gnu image)
#:use-module (gnu platform)
#:use-module (guix platform)
#:use-module (gnu system)
#:use-module (gnu bootloader)
#:use-module (gnu system file-systems)

View File

@ -888,7 +888,7 @@ itself."
,@(scheme-modules* source "gnu/system")
,@(scheme-modules* source "gnu/services")
,@(scheme-modules* source "gnu/machine")
,@(scheme-modules* source "gnu/platforms/"))
,@(scheme-modules* source "guix/platforms/"))
(list *core-package-modules* *package-modules*
*extra-modules* *core-modules*)
#:extensions dependencies