bitcoin-core
diff --git a/‎contrib/guix/libexec/build.sh‎
Lines changed: 2 additions & 1 deletion b/‎contrib/guix/libexec/build.sh‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎contrib/guix/libexec/prelude.bash‎
Lines changed: 1 addition & 1 deletion b/‎contrib/guix/libexec/prelude.bash‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎contrib/guix/manifest.scm‎
Lines changed: 15 additions & 16 deletions b/‎contrib/guix/manifest.scm‎
Lines changed: 15 additions & 16 deletions
diff --git a/‎contrib/guix/patches/gcc-broken-longjmp.patch‎
Lines changed: 0 additions & 70 deletions b/‎contrib/guix/patches/gcc-broken-longjmp.patch‎
Lines changed: 0 additions & 70 deletions
@@ -52,7 +52,8 @@ BASEPREFIX="${PWD}/depends"
 store_path() {
     grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \
         | head --lines=1 \
-        | sed --expression='s|^[[:space:]]*"||' \
+        | sed --expression='s|\x29*$||' \
+              --expression='s|^[[:space:]]*"||' \
               --expression='s|"[[:space:]]*$||'
 }
 
 
@@ -51,7 +51,7 @@ fi
 time-machine() {
     # shellcheck disable=SC2086
     guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
-                      --commit=998eda3067c7d21e0d9bb3310d2f5a14b8f1c681 \
+                      --commit=160f78a4d92205df986ed9efcce7d3aac188cb24 \
                       --cores="$JOBS" \
                       --keep-failed \
                       --fallback \
 
@@ -57,16 +57,16 @@ FILE-NAME found in ./patches relative to the current file."
          ;; 2. Build cross-compiled kernel headers with XGCC-SANS-LIBC, derived
          ;; from BASE-KERNEL-HEADERS
          (xkernel (cross-kernel-headers target
-                                        base-kernel-headers
-                                        xgcc-sans-libc
-                                        xbinutils))
+                                        #:linux-headers base-kernel-headers
+                                        #:xgcc xgcc-sans-libc
+                                        #:xbinutils xbinutils))
          ;; 3. Build a cross-compiled libc with XGCC-SANS-LIBC and XKERNEL,
          ;; derived from BASE-LIBC
          (xlibc (cross-libc target
-                            base-libc
-                            xgcc-sans-libc
-                            xbinutils
-                            xkernel))
+                            #:libc base-libc
+                            #:xgcc xgcc-sans-libc
+                            #:xbinutils xbinutils
+                            #:xheaders xkernel))
          ;; 4. Build a cross-compiling gcc targeting XLIBC, derived from
          ;; BASE-GCC
          (xgcc (cross-gcc target
@@ -113,8 +113,7 @@ desirable for building Bitcoin Core release binaries."
 (define (gcc-mingw-patches gcc)
   (package-with-extra-patches gcc
     (search-our-patches "gcc-remap-guix-store.patch"
-                        "vmov-alignment.patch"
-                        "gcc-broken-longjmp.patch")))
+                        "vmov-alignment.patch")))
 
 (define (make-mingw-pthreads-cross-toolchain target)
   "Create a cross-compilation toolchain package for TARGET"
@@ -145,8 +144,7 @@ chain for " target " development."))
 
 (define (make-nsis-for-gcc-10 base-nsis)
   (package-with-extra-patches base-nsis
-    (search-our-patches "nsis-gcc-10-memmove.patch"
-                        "nsis-disable-installer-reloc.patch")))
+    (search-our-patches "nsis-gcc-10-memmove.patch")))
 
 ;; While LIEF is packaged in Guix, we maintain our own package,
 ;; to simplify building, and more easily apply updates.
@@ -243,7 +241,7 @@ thus should be able to compile on most platforms where these exist.")
 (define-public python-oscrypto
   (package
     (name "python-oscrypto")
-    (version "1.2.1")
+    (version "1.3.0")
     (source
      (origin
        (method git-fetch)
@@ -253,7 +251,7 @@ thus should be able to compile on most platforms where these exist.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1d4d8s4z340qhvb3g5m5v3436y3a71yc26wk4749q64m09kxqc3l"))
+         "1v5wkmzcyiqy39db8j2dvkdrv2nlsc48556h73x4dzjwd6kg4q0a"))
        (patches (search-our-patches "oscrypto-hard-code-openssl.patch"))))
     (build-system python-build-system)
     (native-search-paths
@@ -539,7 +537,8 @@ inspecting signatures in Mach-O binaries.")
               (patches (search-our-patches "glibc-2.27-riscv64-Use-__has_include-to-include-asm-syscalls.h.patch"
                                            "glibc-2.27-fcommon.patch"
                                            "glibc-2.27-guix-prefix.patch"
-                                           "glibc-2.27-no-librt.patch"))))
+                                           "glibc-2.27-no-librt.patch"
+                                           "glibc-2.27-powerpc-ldbrx.patch"))))
     (arguments
       (substitute-keyword-arguments (package-arguments glibc)
         ((#:configure-flags flags)
@@ -586,7 +585,7 @@ inspecting signatures in Mach-O binaries.")
         xz
         ;; Build tools
         gnu-make
-        libtool-2.4.7
+        libtool
         autoconf-2.71
         automake
         pkg-config
@@ -595,7 +594,7 @@ inspecting signatures in Mach-O binaries.")
         gcc-toolchain-10
         (list gcc-toolchain-10 "static")
         ;; Scripting
-        python-minimal ;; (3.9)
+        python-minimal ;; (3.10)
         ;; Git
         git-minimal
         ;; Tests
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ BASEPREFIX="${PWD}/depends"`
`52`	`52`	`store_path() {`
`53`	`53`	`grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \`
`54`	`54`	`\| head --lines=1 \`
`55`		`- \| sed --expression='s\|^[[:space:]]*"\|\|' \`
	`55`	`+ \| sed --expression='s\|\x29*$\|\|' \`
	`56`	`+ --expression='s\|^[[:space:]]*"\|\|' \`
`56`	`57`	`--expression='s\|"[[:space:]]*$\|\|'`
`57`	`58`	`}`
`58`	`59`