From: Amelia Coutard <eliottulio.coutard@gmail.com>
Date: Tue, 12 Dec 2023 14:57:09 +0000 (+0100)
Subject: Updated gcc for isos, updated isos, and simplified isos package
X-Git-Url: https://git.ameliathe1st.gay/?a=commitdiff_plain;h=2724bcd218e3dcd3958486f1513334f5ee368139;p=canal-guix.git

Updated gcc for isos, updated isos, and simplified isos package
---

diff --git a/README b/README
index 8921148..df19ef1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is a guix channel for my projects, hosted at https://www.ameliathe1st.gay.
+This is a guix channel for my projects, and other random packages I need, hosted at https://www.ameliathe1st.gay.
 
 Project list:
 	- isos
diff --git a/amy/packages/isos.scm b/amy/packages/isos.scm
index da8d7e9..048116a 100644
--- a/amy/packages/isos.scm
+++ b/amy/packages/isos.scm
@@ -19,6 +19,7 @@
   #:use-module ((guix licenses)
                 #:select (gpl3+))
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages commencement)
   #:use-module (gnu packages bootloaders)
@@ -45,6 +46,7 @@
 
 (define isos-gcc-system
   (let ((%gcc (cross-gcc isos-target-triplet
+                         #:xgcc gcc-13
                          #:xbinutils isos-binutils
                          #:libc #f)))
     (package
@@ -76,26 +78,24 @@
 (define isos
   (package
     (name "isos")
-    (version "0.1")
+    (version "0.1-3ae74c837b0667ee04907c264062fd7a24182536")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://git.ameliathe1st.gay/isos.git")
-             (commit "18009efb295141fd1ddef8f9bc3ade62a12f85df")));(string-append "v" version))))
+             (commit "3ae74c837b0667ee04907c264062fd7a24182536"))) ;(string-append "v" version))))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
-        (base32 "1gzv0ddra030cpcxzmhznn16civqqrlg03gm5gfdkna922309p27"))))
+        (base32 "04axs6l0rl101ik0rvcprcakdi60khpnzzq98g9jv7fz0i3ijrww"))))
     (arguments
      (list
       #:configure-flags #~(list (string-append "--c++-includes-stdlib="
-                                               #$gcc-toolchain "/include"))))
+                                               #$gcc-toolchain-13 "/include"))))
     (build-system gnu-build-system)
     (native-inputs (list util-linux
-                         isos-binutils
                          isos-gcc-system
                          isos-gcc-user
-                         gcc-toolchain
                          grub
                          xorriso))
     (inputs (list))