diff options
Diffstat (limited to 'system/guix')
| -rw-r--r-- | system/guix/README | 2 | ||||
| -rw-r--r-- | system/guix/config/rc.guix | 16 | ||||
| -rw-r--r-- | system/guix/guix.SlackBuild | 35 | ||||
| -rw-r--r-- | system/guix/guix.info | 6 | ||||
| -rw-r--r-- | system/guix/slack-desc | 2 |
5 files changed, 31 insertions, 30 deletions
diff --git a/system/guix/README b/system/guix/README index 5cd0bae740..4613a6ec6d 100644 --- a/system/guix/README +++ b/system/guix/README @@ -2,7 +2,7 @@ GNU Guix provides state-of-the-art package management features such as transacti upgrades and roll-backs, reproducible build environments, unprivileged package management, and per-user profiles. It uses low-level mechanisms from the Nix package manager, but packages are defined as native Guile modules, using extensions to the -Scheme language - which makes it nicely hackable. +Scheme language—which makes it nicely hackable. Guix may be run in single or multi-user mode (which requires the guix-daemon). To have the guix daemon start and stop with your host, add to /etc/rc.d/rc.local: diff --git a/system/guix/config/rc.guix b/system/guix/config/rc.guix index a3d80ac6d7..b07ebce7aa 100644 --- a/system/guix/config/rc.guix +++ b/system/guix/config/rc.guix @@ -20,13 +20,13 @@ GUIX_LOG=/var/log/guix.log GUIX_OPTS=--build-users-group=guixbuild if [ -f /etc/default/$BASE ]; then - . /etc/default/$BASE + . /etc/default/$BASE fi # Check guix is present if [ ! -x $GUIX ]; then - echo "$GUIX not present or not executable" - exit 1 + echo "$GUIX not present or not executable" + exit 1 fi guix_start() { @@ -44,7 +44,6 @@ guix_start() { fi } -# Stop guix: guix_stop() { echo "stopping $BASE ..." # If there is no PID file, ignore this request... @@ -54,10 +53,9 @@ guix_stop() { rm -f ${GUIX_PIDFILE} } -# Restart guix: guix_restart() { - guix_stop - guix_start + guix_stop + guix_start } case "$1" in @@ -72,9 +70,9 @@ case "$1" in ;; 'status') if [ -f ${GUIX_PIDFILE} ] && ps -o cmd $(cat ${GUIX_PIDFILE}) | grep -q $BASE ; then - echo "status of $BASE: running" + echo "status of $BASE: running" else - echo "status of $BASE: stopped" + echo "status of $BASE: stopped" fi ;; *) diff --git a/system/guix/guix.SlackBuild b/system/guix/guix.SlackBuild index bed37f5e06..2f1dacbcbf 100644 --- a/system/guix/guix.SlackBuild +++ b/system/guix/guix.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Guix -# Copyright 2015 Hunter Sezen California, USA +# Copyright 2015-2016 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=guix -VERSION=${VERSION:-0.9.0} +VERSION=${VERSION:-0.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -72,18 +72,19 @@ find -L . \ # To share the store with nix SHARE=${SHARE:-no} if [ "${SHARE:-yes}" = "yes" ]; then - share="--with-store-dir=/nix/store" - var="--localstatedir=/nix/var" + share="--with-store-dir=/nix/store" + var="--localstatedir=/nix/var" else - var="--localstatedir=/var" + var="--localstatedir=/var" fi # To use the nix-daemon instead of the guix-daemon NIX=${NIX:-no} -if [ "${NIX:-yes}" = "yes" ]; then nix="--disable-daemon"; else nix=""; fi - -# https://www.mail-archive.com/guix-commits@gnu.org/msg12674.html -zcat $CWD/pypi-guile-json.diff.gz | patch -p1 +if [ "${NIX:-yes}" = "yes" ]; then + nix="--disable-daemon" +else + nix="" +fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -98,7 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \ --host=$ARCH-slackware-linux \ $nix \ $share \ - $var \ + $var make make install DESTDIR=$PKG @@ -115,11 +116,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* -rm -fr $PKG/usr/lib${LIBDIRSUFFIX}/systemd +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" mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README ROADMAP THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/guix/guix.info b/system/guix/guix.info index cd3816044e..c7da606351 100644 --- a/system/guix/guix.info +++ b/system/guix/guix.info @@ -1,8 +1,8 @@ PRGNAM="guix" -VERSION="0.9.0" +VERSION="0.11.0" HOMEPAGE="https://www.gnu.org/software/guix/" -DOWNLOAD="ftp://alpha.gnu.org/gnu/guix/guix-0.9.0.tar.gz" -MD5SUM="224e0a3cab26a2b95c65be738e4ae7f6" +DOWNLOAD="ftp://alpha.gnu.org/gnu/guix/guix-0.11.0.tar.gz" +MD5SUM="f960092661bdac29af235e0c75a2f2c3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/guix/slack-desc b/system/guix/slack-desc index 300b41f6bf..857fcb0e2a 100644 --- a/system/guix/slack-desc +++ b/system/guix/slack-desc @@ -13,7 +13,7 @@ guix: as transactional upgrades and roll-backs, reproducible build guix: environments, unprivileged package management, and per-user profiles. guix: It uses low-level mechanisms from the Nix package manager, but guix: packages are defined as native Guile modules, using extensions to the -guix: Scheme language - which makes it nicely hackable. +guix: Scheme language—which makes it nicely hackable. guix: guix: Homepage: https://www.gnu.org/software/guix/ guix: |