summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/guix/guile-json.patch.gzbin0 -> 511 bytes
-rw-r--r--system/guix/guix.SlackBuild21
-rw-r--r--system/guix/guix.info14
3 files changed, 29 insertions, 6 deletions
diff --git a/system/guix/guile-json.patch.gz b/system/guix/guile-json.patch.gz
new file mode 100644
index 0000000000..d31240a1bc
--- /dev/null
+++ b/system/guix/guile-json.patch.gz
Binary files differ
diff --git a/system/guix/guix.SlackBuild b/system/guix/guix.SlackBuild
index 2f1dacbcbf..02c68b9904 100644
--- a/system/guix/guix.SlackBuild
+++ b/system/guix/guix.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=guix
-VERSION=${VERSION:-0.11.0}
+VERSION=${VERSION:-0.12.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -62,6 +62,16 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
+for bin in armhf i686 mips64el x86_64; do
+ case "$bin" in
+ armf ) GVERS=2.0.11 ;;
+ * ) GVERS=2.0.9 ;;
+ esac
+ if [ -f $CWD/guile_${bin}_linux-${GVERS}.tar.xz ]; then
+ cp -a $CWD/guile_${bin}_linux-${GVERS}.tar.xz \
+ gnu/packages/bootstrap/${bin}-linux/guile-${GVERS}.tar.xz
+ fi
+done
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -86,6 +96,11 @@ else
nix=""
fi
+# import: crate: Do not build when guile-json is not available.
+# http://git.savannah.gnu.org/cgit/guix.git/commit/?id=6023041346c79f7ac4105bba2552a82019fae840
+zcat $CWD/guile-json.patch.gz | patch -p1
+autoreconf -fi
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -118,8 +133,8 @@ gzip -9 $PKG/usr/info/*.info*
for i in systemd upstart; do rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/$i; done
-DOCS="ABOUT-NLS AUTHORS CODE-OF-CONDUCT COPYING ChangeLog HACKING INSTALL NEWS \
- README ROADMAP THANKS TODO"
+DOCS="ABOUT-NLS AUTHORS CODE-OF-CONDUCT COPYING HACKING INSTALL NEWS README \
+ ROADMAP THANKS TODO"
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/guix/guix.info b/system/guix/guix.info
index c7da606351..d0ea12a0d0 100644
--- a/system/guix/guix.info
+++ b/system/guix/guix.info
@@ -1,8 +1,16 @@
PRGNAM="guix"
-VERSION="0.11.0"
+VERSION="0.12.0"
HOMEPAGE="https://www.gnu.org/software/guix/"
-DOWNLOAD="ftp://alpha.gnu.org/gnu/guix/guix-0.11.0.tar.gz"
-MD5SUM="f960092661bdac29af235e0c75a2f2c3"
+DOWNLOAD="ftp://alpha.gnu.org/gnu/guix/guix-0.12.0.tar.gz
+ https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_armhf_linux-2.0.11.tar.xz \
+ https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_i686_linux-2.0.9.tar.xz \
+ https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_mips64el_linux-2.0.9.tar.xz \
+ https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_x86_64_linux-2.0.9.tar.xz"
+MD5SUM="f5be9eabf634b1f4762297664698d7aa \
+ 5a4d79dc017156a0199fc95cb53bb71c \
+ 5ef7d4bb6c7d952008476a9a7d5f6e5c \
+ b5154d1da8efc1c078fc05aa7d462c02 \
+ cb87c5fc787c0f8a92dc7ba2607f93f8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""