quick fixes

Author: tobtoht

contrib/guix/guix-build

@@ -276,7 +276,7 @@ mkdir -p "$LOGDIR_BASE"
 # - we bump the time-machine and Guix has a new version of Rust.
 # - Cargo.lock in src/fcmp_pp/fcmp_pp_rust is updated.
 RUST_DEPS_VERSION=0
-RUST_DEPS_HASH="cl6rwas8aq0ij31x0b9x94v8crzxwi6z"
+RUST_DEPS_HASH="pklc0wbsmdg0h4z7xkbww7wlar849sp7"
 RUST_DEPS_ARCHIVE="rust_deps-${RUST_DEPS_VERSION}.tar.gz"
 RUST_DEPS_STORE_ITEM="/gnu/store/${RUST_DEPS_HASH}-${RUST_DEPS_ARCHIVE}"
 if [ ! -f "${RUST_DEPS_STORE_ITEM}" ]; then
@@ -285,6 +285,7 @@ if [ ! -f "${RUST_DEPS_STORE_ITEM}" ]; then
                              --pure \
                              --network \
                              --no-cwd \
+                             --writable-root \
                              --user="user" \
                              --share="$PWD"=/monero \
                              -- env RUST_DEPS_ARCHIVE="$RUST_DEPS_ARCHIVE" \

contrib/guix/manifest.scm

@@ -84,7 +84,7 @@ chain for " target " development."))
       (home-page (package-home-page xgcc))
       (license (package-license xgcc)))))
 
-(define base-gcc gcc-12)
+(define base-gcc gcc-14)
 (define base-linux-kernel-headers linux-libre-headers-6.1)
 
 (define* (make-monero-cross-toolchain  target
@@ -275,25 +275,25 @@ chain for " target " development."))
     (cond ((string-suffix? "-mingw32" target)
            (list
              zip ; used to create release archives
-             gcc-toolchain-12
+             gcc-toolchain-14
              (make-mingw-pthreads-cross-toolchain target)))
           ((string-contains target "-linux-gnu")
            (list
-             gcc-toolchain-12
-             (list gcc-toolchain-12 "static")
+             gcc-toolchain-14
+             (list gcc-toolchain-14 "static")
              (make-monero-cross-toolchain target)))
           ((string-contains target "freebsd")
            (list
              xz ; used to unpack freebsd_base
-             gcc-toolchain-12
-             (list gcc-toolchain-12 "static")
-             clang-toolchain-18
+             gcc-toolchain-14
+             (list gcc-toolchain-14 "static")
+             clang-toolchain-19
              binutils))
           ((string-contains target "android")
             (list
               unzip ; used to unpack android_ndk
-              gcc-toolchain-12
-              (list gcc-toolchain-12 "static")))
+              gcc-toolchain-14
+              (list gcc-toolchain-14 "static")))
           ((string-contains target "darwin")
            (list
              libtool

contrib/guix/rust/cargo.scm

@@ -1,6 +1,6 @@
 (use-modules (gnu packages)
              ((gnu packages bash) #:select (bash-minimal))
-             ((gnu packages certs) #:select (nss-certs))
+             ((gnu packages nss) #:select (nss-certs))
              (gnu packages compression)
              (gnu packages curl)
              (gnu packages moreutils)

contrib/guix/rust/stubs

@@ -1,24 +0,0 @@
-allocator-api2
-cc
-dlmalloc
-fortanix-sgx-abi
-getopts
-gimli-0.28.1
-hermit-abi
-r-efi
-r-efi-alloc
-rand
-rand_xorshift
-unicode-width
-unwinding
-wasi
-windows-sys
-windows-targets
-windows_aarch64_gnullvm
-windows_aarch64_msvc
-windows_i686_gnu
-windows_i686_gnullvm
-windows_i686_msvc
-windows_x86_64_gnu
-windows_x86_64_gnullvm
-windows_x86_64_msvc