Ludovic Courtès
d4bd876267
gnu: hop: Update hash of source tarball, which was modified in place.
...
Fixes <https://bugs.gnu.org/30804 >.
Reported by Tobias Geerinckx-Rice <me@tobias.gr>.
* gnu/packages/scheme.scm (hop)[source]: Update sha256.
2018-04-24 09:53:23 +02:00
Christopher Lemmer Webber
75afbd2478
gnu: racket: Patch xform compilation errors.
...
* gnu/packages/patches/gnu/packages/patches/racket-fix-xform-issue.patch:
Renamed from gnu/packages/patches/racket-minus_zero_p-disable-xform.patch.
Switch to upstream patch in Racket.
* gnu/packages/scheme.scm (racket): Update to renamed patch.
2018-04-02 10:38:08 -05:00
Christopher Lemmer Webber
02283a6130
gnu: racket: Update to 6.12.
...
* gnu/packages/patches/racket-minus_zero_p-disable-xform.patch: New file.
* gnu/packages/scheme.scm (racket): Update version and patch.
2018-04-02 10:38:08 -05:00
Tobias Geerinckx-Rice
e2f9847be0
gnu: Add tinyscheme.
...
* gnu/packages/scheme.scm (tinyscheme): New public variable.
2018-03-21 18:38:23 +01:00
ng0
4a78fd4617
Correct name and Email for ng0.
...
* .mailmap: Correct name and Email for ng0.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm,
gnu/packages/cdrom.scm, gnu/packages/check.scm,
gnu/packages/cinnamon.scm, gnu/packages/compression.scm,
gnu/packages/crypto.scm, gnu/packages/databases.scm,
gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/emacs.scm, gnu/packages/enlightenment.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm,
gnu/packages/forth.scm, gnu/packages/fvwm.scm,
gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,
gnu/packages/guile.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm,
gnu/packages/image-viewers.scm, gnu/packages/image.scm,
gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm,
gnu/packages/mail.scm, gnu/packages/markup.scm,
gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm,
gnu/packages/music.scm, gnu/packages/ncurses.scm,
gnu/packages/networking.scm, gnu/packages/nickle.scm,
gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-crypto.scm, gnu/packages/python-web.scm,
gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/ruby.scm, gnu/packages/rust.scm,
gnu/packages/scheme.scm, gnu/packages/serialization.scm,
gnu/packages/shells.scm, gnu/packages/ssh.scm,
gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm,
gnu/packages/tls.scm, gnu/packages/tor.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm,
gnu/packages/xfce.scm, gnu/packages/xml.scm,
gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm,
guix/licenses.scm: Likewise.
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
2018-03-20 17:17:58 +01:00
Tobias Geerinckx-Rice
387428def1
gnu: gambit-c: Update to 4.8.9.
...
* gnu/packages/scheme.scm (gambit-c): Update to 4.8.9.
2018-03-11 06:42:57 +01:00
Tobias Geerinckx-Rice
e39631a9e1
gnu: mit-scheme: Update phase style.
...
* gnu/packages/scheme.scm (mit-scheme)[arguments]: Use INVOKE and end
phases with #t.
2018-02-22 17:24:36 +01:00
Kei Kebreau
3d8cbdc40e
gnu: bigloo: Fix source hash.
...
Fixes <https://bugs.gnu.org/30436 >.
* gnu/packages/scheme.scm (bigloo)[source]: Fix hash.
2018-02-16 14:42:34 -05:00
Kei Kebreau
26ecbaf866
gnu: bigloo: Update to 4.3b.
...
* gnu/packages/scheme.scm (bigloo): Update to 4.3b.
[arguments]: Add "--disable-patch" to configure flags. Add substitution to
compile Bigloo with the correct runpath. Substitute 'invoke' for '*system*'.
2018-02-05 17:13:56 -05:00
Tobias Geerinckx-Rice
0e0015f26c
gnu: sicp: Use HTTPS for home page.
...
* gnu/packages/scheme.scm (sicp)[home-page]: Use HTTPS.
2017-12-26 02:02:01 +01:00
Tobias Geerinckx-Rice
7108ad5b75
gnu: scheme48-rx: Update to 0.0.0-2.dd9037f.
...
* gnu/packages/scheme.scm (scheme48-rx): Update to 0.0.0-2.dd9037f.
2017-12-25 01:14:21 +01:00
Tobias Geerinckx-Rice
2705a97ec4
gnu: sicp: Update to 20170703-1.225c172.
...
* gnu/packages/scheme.scm (sicp): Update to 20170703-1.225c172.
2017-12-25 01:02:21 +01:00
Tobias Geerinckx-Rice
30fd958e98
gnu: slib: Update home page.
...
* gnu/packages/scheme.scm (slib)[home-page]: Update URL.
2017-12-25 01:02:21 +01:00
Kei Kebreau
595b175103
gnu: scmutils: Update to 20160827.
...
* gnu/packages/scheme.scm (scmutils): Update to 20160827.
[arguments]: Fix indentation.
2017-12-24 14:02:06 -05:00
Kei Kebreau
c154c97f90
gnu: gambit-c: Update to 4.8.8.
...
* gnu/packages/scheme.scm (gambit-c): Update to 4.8.8.
2017-12-24 10:04:32 -05:00
Kei Kebreau
7815d09f77
gnu: racket: Update to 6.11.
...
* gnu/packages/scheme.scm (racket): Update to 6.11.
2017-12-23 20:47:21 -05:00
Kei Kebreau
79bffa3ec8
gnu: chicken: Update to 4.13.0.
...
* gnu/packages/scheme.scm (chicken): Update to 4.13.0.
[source]: Remove obsolete patches.
* gnu/packages/patches/chicken-CVE-2017-6949.patch,
gnu/packages/patches/chicken-CVE-2017-11343.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2017-12-23 09:18:43 -05:00
Kei Kebreau
dc1d3cdef7
gnu: Use 'modify-phases' syntax.
...
* gnu/packages/admin.scm (mingetty, clusterssh, wpa-supplicant-minimal,
wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use
'modify-phases' syntax.
* gnu/packages/algebra.scm (arb)[arguments]: Likewise.
* gnu/packages/apr.scm (apr-util)[arguments]: Likewise.
* gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano,
lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound,
zita-convolver, zita-alsa-pcmi)[arguments]: Likewise.
* gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise.
* gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express,
flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise.
* gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise.
* gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise.
* gnu/packages/compression.scm (sharutils)[arguments]: Likewise.
* gnu/packages/conky.scm (conky)[arguments]: Likewise.
* gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise.
* gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise.
* gnu/packages/display-managers.scm (slim)[arguments]: Likewise.
* gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise.
* gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise.
* gnu/packages/engineering.scm (pcb)[arguments]: Likewise.
* gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise.
* gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise.
* gnu/packages/fltk.scm (fltk)[arguments]: Likewise.
* gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise.
* gnu/packages/gd.scm (perl-gd)[arguments]: Likewise.
* gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise.
* gnu/packages/glib.scm (glibmm)[arguments]: Likewise.
* gnu/packages/gl.scm (glew)[arguments]: Likewise.
* gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs,
libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise.
* gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise.
* gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise.
* gnu/packages/graphics.scm (agg)[arguments]: Likewise.
* gnu/packages/gtk.scm (ganv, girara, gtksourceview-2, guile-present,
python2-pycairo)[arguments]: Likewise.
* gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise.
* gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise.
* gnu/packages/hugs.scm (hugs)[arguments]: Likewise.
* gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal)
[arguments]: Likewise.
* gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise.
* gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise.
* gnu/packages/linux.scm (bridge-utils, iw, fuse, unionfs-fuse/static,
lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, module-init-tools)
[arguments]: Likewise.
* gnu/packages/lisp.scm (ccl)[arguments]: Likewise.
* gnu/packages/lout.scm (lout)[arguments]: Likewise.
* gnu/packages/lua.scm (luajit)[arguments]: Likewise.
* gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise.
* gnu/packages/mail.scm (exim)[arguments]: Likewise.
* gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise.
* gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun)
[arguments]: Likewise.
* gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise.
* gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise.
* gnu/packages/music.scm (solfege)[arguments]: Likewise.
* gnu/packages/noweb.scm (noweb)[arguments]: Likewise.
* gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]:
Likewise.
* gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu,
zathura-pdf-poppler, zathura, podofo, fbida)[arguments]: Likewise.
* gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]:
Likewise.
* gnu/packages/photo.scm (gphoto2)[arguments]: Likewise.
* gnu/packages/popt.scm (popt)[arguments]: Likewise.
* gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]:
Likewise.
* gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise.
* gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy,
python-sqlalchemy, python-docopt)[arguments]: Likewise.
* gnu/packages/rdf.scm (lrdf)[arguments]: Likewise.
* gnu/packages/regex.scm (tre)[arguments]: Likewise.
* gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise.
* gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise.
* gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise.
* gnu/packages/scheme.scm (racket)[arguments]: Likewise.
* gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise.
* gnu/packages/serveez.scm (serveez)[arguments]: Likewise.
* gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise.
* gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise.
* gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise.
* gnu/packages/tcl.scm (expect)[arguments]: Likewise.
* gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise.
* gnu/packages/textutils.scm (recode, libgtextutils)[arguments]:
Likewise.
* gnu/packages/time.scm (time)[arguments]: Likewise.
* gnu/packages/tor.scm (privoxy)[arguments]: Likewise.
* gnu/packages/uucp.scm (uucp)[arguments]: Likewise.
* gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise.
* gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise.
* gnu/packages/web.scm (tinyproxy)[arguments]: Likewise.
* gnu/packages/wicd.scm (wicd)[arguments]: Likewise.
* gnu/packages/wm.scm (bspwm)[arguments]: Likewise.
* gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise.
* gnu/packages/xfce.scm (xfconf)[arguments]: Likewise.
* gnu/packages/xfig.scm (transfig)[arguments]: Likewise.
* gnu/packages/xorg.scm (imake)[arguments]: Likewise.
2017-09-20 20:58:04 -04:00
Leo Famulari
144c8db9bd
gnu: chicken: Fix CVE-2017-11343.
...
* gnu/packages/patches/chicken-CVE-2017-11343.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/scheme.scm (chicken)[source]: Use it.
2017-07-17 23:47:00 -04:00
Kei Kebreau
082725b502
gnu: hop: Update to 3.1.0-pre2.
...
* gnu/packages/scheme.scm (hop): Update to 3.1.0-pre2.
[source]: Remove unnecessary patch.
[arguments]: Enable tests; disable parallel building; specify BIGLOO in
make-flags.
[inputs]: Add libgc, libunistring, libuv, pcre and sqlite.
* gnu/local.mk (dist_patch_DATA): Remove unnecessary patch.
* gnu/packages/patches/hop-linker-flags.patch: Delete file.
2017-07-10 19:35:44 -04:00
Kei Kebreau
5e3ea571c5
gnu: bigloo: Update to 4.3a.
...
* gnu/packages/scheme.scm (bigloo): Update to 4.3a.
[source]: Remove old patch. Add snippet.
[arguments]: Adjust the build phases accordingly.
[inputs]: Add libgc, libunistring, libuv, openssl, pcre and sqlite.
2017-07-10 19:35:44 -04:00
7c028db561
gnu: mit-scheme: Remove aarch64-linux from supported-systems.
...
* gnu/packages/scheme.scm (mit-scheme)[supported-systems]: Specify
exactly i686, x86_64 and armhf.
2017-06-26 13:13:09 +03:00
Arun Isaac
148585c240
gnu: Move contents of zip module into compression module.
...
* gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to...
* gnu/packages/compression.scm: ...here.
* gnu/packages/zip.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file.
* po/packages/POTFILES.in: Unregister deleted file.
* gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression,
docbook, documentation, fonts, fpga, game-development, games, gl, gnome,
gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice,
markup, maths, mc, monitoring, music, php, pretty-print, python, scheme,
smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml,
zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm:
Adapt module import.
2017-06-20 18:10:35 +05:30
Clément Lassieur
01d71f6222
gnu: sicp: Add the HTML version.
...
* gnu/packages/scheme.scm (sicp)[arguments]: Copy the HTML directory to the
output.
2017-06-01 11:04:37 +02:00
Arun Isaac
af3f64477c
gnu: racket: Update to 6.8.
...
* gnu/packages/scheme.scm (racket): Update to 6.8.
2017-04-16 02:50:41 +05:30
Marius Bakke
84157bb8bf
Merge branch 'master' into core-updates
...
Most conflicts are from 6fd52309b8
.
2017-03-30 22:59:53 +02:00
Tobias Geerinckx-Rice
6fd52309b8
gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.
...
All HTTP gnu.org (and supported subdomain) HOME-PAGEs changed to HTTPS.
2017-03-30 01:30:16 +02:00
Julien Lepiller
23bd8f556e
gnu: bigloo: Fix build failure in ld.
...
* gnu/packages/scheme.scm (bigloo)[arguments]<#:configure-flags>: Add --cflags=-fPIC.
2017-03-26 10:42:51 +02:00
Kei Kebreau
359e9c4215
gnu: chicken: Update to 4.12.0.
...
* gnu/packages/scheme.scm (chicken): Update to 4.12.0.
2017-03-22 15:31:17 -04:00
John Darrington
8c48d0eb33
gnu: Add scm.
...
* gnu/packages/scheme.scm (scm): New variable.
2017-03-02 18:17:22 +01:00
John Darrington
07ef08a736
gnu: Add slib.
...
* gnu/packages/scheme.scm (slib): New variable.
2017-03-02 18:17:18 +01:00
ng0
8a0c2552b4
gnu: Add scheme48-rx.
...
* gnu/packages/scheme.scm (scheme48-rx): New variable.
2017-02-16 15:43:56 -06:00
Tobias Geerinckx-Rice
58f91e4d03
download: url-fetch/tarball: Make ‘name’ truly optional.
...
* guix/download.scm (url-fetch/tarbomb): Fall back to ‘file-name’ if
‘name’ is #f, like the regular ‘url-fetch’ does.
* gnu/packages/bioinformatics.scm (muscle)[source]: Remove ‘file-name’.
* gnu/packages/engineering.scm (fastcap)[source]: Likewise.
* gnu/packages/scheme.scm (scmutils)[source]: Likewise.
2017-02-01 15:53:32 +01:00
Kei Kebreau
6a37872cd2
gnu: chicken: Fix CVE-2016-{6830,6831}.
...
* gnu/packages/patches/chicken-CVE-2016-6830+CVE-2016-6831.patch: New file.
* gnu/local.mk (dist_patch_DATA): Use it.
* gnu/packages/scheme.scm (chicken)[source]: Use it.
2017-01-03 08:35:02 -05:00
Kei Kebreau
b9b6db45e8
gnu: chicken: Update to 4.11.1.
...
* gnu/packages/scheme.scm (chicken): Update to 4.11.1.
2017-01-03 08:34:54 -05:00
Tobias Geerinckx-Rice
50995554f8
gnu: chibi-scheme: Replace dead Google Code home-page.
...
* gnu/packages/scheme.scm (chibi-scheme)[home-page]: Update it.
2016-12-14 21:59:39 +01:00
9ba88890f7
gnu: gambit-c: Update to 4.8.5.
...
* gnu/packages/scheme.scm (gambit-c): Update to 4.8.5.
[source]: Update source tarball name.
2016-10-23 14:37:36 +03:00
27668c79de
gnu: gambit-c: Use 'modify-phases' syntax.
...
* gnu/packages/scheme.scm (gambit-c)[arguments]: Use 'modify-phases'
syntax.
2016-10-23 14:37:36 +03:00
71dcdaf31f
gnu: gambit-c: Update to 4.7.9.
...
* gnu/packages/scheme.scm (gambit-c): Update to 4.7.9.
2016-10-23 14:37:36 +03:00
fb685df8f8
gnu: bigloo: Use 'modify-phases' syntax.
...
* gnu/packages/scheme.scm (bigloo)[arguments]: Use 'modify-phases' syntax.
2016-10-23 14:37:36 +03:00
04014de6f5
gnu: hop: Use 'modify-phases' syntax.
...
* gnu/packages/scheme.scm (hop)[arguments]: Use 'modify-phases' syntax.
2016-10-23 14:37:35 +03:00
eccd1d24c9
gnu: hop: Update to 2.5.1.
...
* gnu/packages/scheme.scm (hop): Update to 2.5.1.
[source]: Remove patch.
* gnu/packages/patches/hop-bigloo-4.0b.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-10-23 14:37:28 +03:00
Federico Beffa
13bbc0cc94
gnu: chez-scheme: Move to new module.
...
* gnu/packages/scheme.scm (chez-scheme, nanopass, stex): Move variables ...
* gnu/packages/chez.scm (chez-scheme, nanopass, stex): ... here. New module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add new file.
2016-10-19 08:44:11 +02:00
Federico Beffa
f7616df4af
gnu: chez-scheme: Fix i686 build.
...
* gnu/packages/scheme.scm (chez-scheme): Add 'configure-flags', generalize
'configure' phase and simplify 'install-doc' phase.
2016-10-19 08:44:11 +02:00
Federico Beffa
4b86dde0d6
gnu: chez-scheme: Add search-path.
...
* gnu/packages/scheme.scm (chez-scheme)[native-search-paths]: New field.
2016-10-19 08:44:11 +02:00
c84253f757
gnu: chez-scheme: Remove arm support.
...
* gnu/packages/scheme.scm (chez-scheme)[supported-systems]: Remove arm.
2016-09-20 22:04:15 +03:00
ng0
c2c84add54
gnu: racket: Update to 6.6
...
* gnu/packages/scheme.scm (racket): Update to 6.6.
2016-09-19 11:53:30 +02:00
Ludovic Courtès
4a187c556d
gnu: chibi-scheme: Use 'modify-phases'.
...
* gnu/packages/scheme.scm (chibi-scheme)[arguments]: Use
'modify-phases'.
2016-09-15 18:56:41 +02:00
Ludovic Courtès
d8eb912132
gnu: Use 'ghostscript-gs' in packages that need the 'gs' command.
...
Fixes a regression introduced in
eb354bdacb
.
Reported by Andreas Enge <andreas@enge.fr>.
* gnu/packages/gv.scm (gv)[propagated-inputs]: Change from GHOSTSCRIPT/X
to GHOSTSCRIPT-GS/X.
* gnu/packages/music.scm (lilypond): Use GHOSTSCRIPT-GS instead of
GHOSTSCRIPT.
* gnu/packages/ocaml.scm (unison): Likewise.
* gnu/packages/plotutils.scm (asymptote): Likewise.
* gnu/packages/scheme.scm (chez-scheme): Likewise.
2016-07-25 11:37:43 +02:00
Leo Famulari
d227260d2f
Merge branch 'master' into core-updates
...
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
2016-07-22 18:58:31 -04:00