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
..
bootstrap
patches	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
abduco.scm
abiword.scm
acct.scm
acl.scm
admin.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
adns.scm
aidc.scm
algebra.scm	gnu: giac-xcas: Update to 1.2.2-75.	2016-07-18 22:39:09 +02:00
animation.scm
anthy.scm
apl.scm
apr.scm
aspell.scm
assembly.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
attr.scm
audacity.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
audio.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
augeas.scm
autogen.scm
autotools.scm	gnu: automake: Adjust test to ignore new gzip warnings.	2016-06-14 09:41:38 +02:00
avahi.scm
avr.scm
backup.scm	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
base.scm	gnu: glibc-2.21: Fix substitutes in glibc-2.21.	2016-07-11 16:52:40 +03:00
bash.scm
bdw-gc.scm
bioinformatics.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
bison.scm
bittorrent.scm	gnu: aria2: Update to 1.25.0.	2016-07-20 06:49:44 +03:00
boost.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
bootstrap.scm
busybox.scm	gnu: busybox: Use 'modify-phases'.	2016-06-30 19:11:45 +03:00
c.scm
calcurse.scm
calendar.scm
ccache.scm	gnu: ccache: Update to 3.2.5.	2016-07-10 06:48:27 +03:00
cdrom.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
certs.scm	gnu: nss-certs: Stop inheriting from nss package.	2016-07-22 17:10:11 +02:00
check.scm	Merge branch 'master' into core-updates	2016-06-12 22:09:26 -04:00
ci.scm	gnu: Use full SHA1 commit ids.	2016-06-05 00:05:38 +02:00
cmake.scm	gnu: cmake: Update to 3.5.2.	2016-06-22 06:51:53 +03:00
code.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
commencement.scm	Revert "gnu: Default to GCC 5."	2016-06-07 10:52:04 +02:00
compression.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
conkeror.scm	gnu: conkeror: Update to 1.0.3	2016-07-03 20:30:08 +03:00
conky.scm	gnu: conky: Update to 1.10.3.	2016-07-09 20:50:38 +08:00
connman.scm
cook.scm
cpio.scm
cppi.scm
cross-base.scm	gnu: cross-gcc-arguments: Disable libitm, libvtv and libsanitizer.	2016-07-05 14:55:21 +03:00
crypto.scm	gnu: Add encfs.	2016-07-16 14:41:39 +02:00
cryptsetup.scm
cups.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
curl.scm
cyrus-sasl.scm
databases.scm	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
datamash.scm
datastructures.scm	gnu: Add ssdeep.	2016-07-19 23:03:30 +02:00
dav.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
dc.scm
debug.scm	Revert "gnu: julia: Build with zlib."	2016-07-20 11:37:01 +03:00
dejagnu.scm
dico.scm
dictionaries.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
dillo.scm
disk.scm	Update e-mail address for Tobias Geerinckx-Rice.	2016-07-15 14:29:22 +02:00
djvu.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
dns.scm
docbook.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
docker.scm
documentation.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
dunst.scm
dvtm.scm
ebook.scm	gnu: calibre: Update to 2.62.0.	2016-07-19 20:47:25 +03:00
ed.scm
elf.scm
emacs.scm	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
enchant.scm
engineering.scm	gnu: geda-gaf: Update to 1.9.2.	2016-07-16 17:19:26 +02:00
enlightenment.scm	gnu: enlightenment: Update to 0.21.1.	2016-07-22 18:24:22 +03:00
entr.scm
erlang.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
fcitx.scm
feh.scm
figlet.scm
file.scm
finance.scm	gnu: bitcoin-core: Update to 0.12.1.	2016-06-16 18:06:42 +03:00
firmware.scm
fish.scm	gnu: fish: Update to 2.3.0.	2016-06-11 12:53:09 +08:00
flashing-tools.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
flex.scm
fltk.scm
fonts.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
fontutils.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
freedesktop.scm	gnu: libinput: Update to 1.4.0.	2016-07-18 14:49:49 +03:00
freeipmi.scm
fribidi.scm
ftp.scm
fvwm.scm
game-development.scm	gnu: Add allegro-5.0.	2016-07-20 22:19:34 +02:00
games.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
gawk.scm
gcal.scm
gcc.scm	Revert "gnu: Default to GCC 5."	2016-06-07 10:52:04 +02:00
gd.scm	gnu: gd: Fix failing test on i686.	2016-07-18 12:36:01 -04:00
gdb.scm
geeqie.scm	gnu: exiv2: Update to 0.25.	2016-07-03 12:55:02 +03:00
geo.scm	gnu: Add gnome-maps.	2016-06-15 13:18:32 -04:00
gettext.scm	gnu: gettext: Update to 0.19.8.	2016-06-09 20:46:07 +03:00
ghostscript.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
gimp.scm	gnu: gimp: Fix CVE-2016-4994.	2016-07-02 10:13:55 -04:00
gkrellm.scm
gl.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
glib.scm	gnu: telepathy-glib: Enable vala bindings.	2016-06-15 13:18:30 -04:00
gnome.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
gnu-doc.scm
gnu-pw-mgr.scm
gnucash.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
gnunet.scm	gnurl: Update to 7.48.0.	2016-07-04 10:01:12 +03:00
gnupg.scm	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
gnustep.scm
gnuzilla.scm	gnu: mozjs: Disable parallel build.	2016-07-22 17:44:31 -04:00
golang.scm	gnu: Add Go 1.4.	2016-06-27 14:09:10 +02:00
gperf.scm
gprolog.scm
gps.scm	gnu: gpsbabel: Build with modular qt.	2016-06-16 18:06:42 +03:00
graphics.scm	gnu: openimageio: Update to 1.6.15.	2016-07-03 06:44:49 +03:00
graphviz.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
groff.scm
grub.scm	gnu: grub: Update to 2.02~beta3.	2016-07-13 23:26:04 +02:00
gsasl.scm
gstreamer.scm	gnu: python-gst: Update to 1.8.2.	2016-07-18 14:11:21 +03:00
gtk.scm
guile-wm.scm
guile.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
gv.scm
gxmessage.scm
haskell.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
hexedit.scm	gnu: Add hexedit.	2016-07-21 14:06:05 -04:00
hugs.scm
hurd.scm	gnu: hurd: Move configure flags from "hurd-minimal" to "hurd-headers".	2016-06-07 22:28:24 +03:00
ibus.scm
icu4c.scm
idutils.scm
image.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
imagemagick.scm	gnu: imagemagick: Update to 6.9.5-0.	2016-07-01 20:27:09 -04:00
indent.scm
inklingreader.scm
inkscape.scm
irc.scm	gnu: quassel: Build with modular qt.	2016-07-07 12:23:39 +03:00
iso-codes.scm
java.scm	gnu: icedtea-6: Generate keystore.	2016-07-22 17:10:25 +02:00
jemalloc.scm
jrnl.scm
julia.scm	gnu: julia: Build with zlib.	2016-07-20 11:37:01 +03:00
kde-frameworks.scm	gnu: oxygen-icons: Build with qtbase.	2016-06-15 20:23:58 +03:00
kde.scm	gnu: snorenotify: Build with modular qt.	2016-07-07 12:23:39 +03:00
key-mon.scm
kodi.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
language.scm
ld-wrapper.in
ldc.scm
lego.scm
less.scm
lesstif.scm
libbsd.scm
libcanberra.scm
libdaemon.scm
libedit.scm
libevent.scm
libffcall.scm
libffi.scm
libftdi.scm
libidn.scm
libphidget.scm
libreoffice.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
libsigsegv.scm
libunistring.scm
libunwind.scm
libupnp.scm
libusb.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
links.scm
linux-libre-4.1-i686.conf
linux-libre-4.1-x86_64.conf
linux-libre-4.4-i686.conf
linux-libre-4.4-x86_64.conf
linux-libre-4.6-i686.conf
linux-libre-4.6-x86_64.conf
linux.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
lirc.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
lisp.scm	Update name for ng0.	2016-07-03 23:48:32 +02:00
llvm.scm	gnu: llvm: Build without debugging symbols.	2016-07-18 20:28:21 -05:00
logging.scm	gnu: Add glog.	2016-06-29 11:13:03 +02:00
lout.scm
lsof.scm
lua.scm
lxde.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
lxqt.scm	gnu: libqtxdg: Move qtbase to propagated-inputs.	2016-06-17 09:14:12 +03:00
lynx.scm
m4.scm
machine-learning.scm
mail.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
make-bootstrap.scm
man.scm	gnu: help2man: Update to 1.47.4.	2016-07-10 21:34:37 +03:00
markdown.scm	gnu: hoedown: Update to 3.0.7.	2016-07-17 16:20:47 +03:00
marst.scm
mate.scm
maths.scm	gnu: gnuplot: Update to upstream's re-release of 5.0.4.	2016-07-22 18:24:22 +03:00
mc.scm
mcrypt.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
messaging.scm	gnu: pidgin: Update to 2.11.0 [security fixes].	2016-07-16 11:54:20 -04:00
mg.scm
mit-krb5.scm	gnu: mit-krb5: Disable tests on all 32-bit platforms.	2016-06-30 10:47:24 +02:00
moe.scm
moreutils.scm
mp3.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
mpd.scm	gnu: mpd: Update to 0.19.17.	2016-07-12 01:54:47 -04:00
mpi.scm	gnu: openmpi: Make binaries reproducible.	2016-07-20 21:16:24 -05:00
mtools.scm
multiprecision.scm
music.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
nano.scm
ncdu.scm
ncurses.scm
netpbm.scm	gnu: netpbm: Remove timestamps from build products.	2016-06-17 15:41:48 +02:00
nettle.scm
networking.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
ninja.scm	gnu: ninja: Update to 1.7.1.	2016-07-03 12:00:25 +03:00
node.scm	gnu: node: Make sure 'npm' remains a symlink after 'patch-shebangs'.	2016-06-29 10:06:18 +02:00
noweb.scm
ntp.scm	gnu: openntpd: Update to 6.0p1.	2016-06-16 18:06:42 +03:00
nutrition.scm
nvi.scm
ocaml.scm	gnu: unison: Install unison-fsmonitor.	2016-06-12 23:55:16 +02:00
ocr.scm	gnu: tesseract-ocr: Update to 3.04.01.	2016-07-21 17:18:42 +03:00
onc-rpc.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
openbox.scm
openldap.scm	gnu: openldap: Use bdb-5.3.	2016-06-19 22:20:43 +03:00
openstack.scm	gnu: python-oslosphinx: Update to 4.3.0.	2016-07-07 06:54:06 +03:00
orpheus.scm
ots.scm
owncloud.scm	gnu: owncloud-client: Remove some bundled libs.	2016-06-30 10:56:57 +03:00
package-management.scm	gnu: diffoscope: Update to 54.	2016-07-15 11:40:02 -04:00
parallel.scm	gnu: parallel: Update to 20160622.	2016-07-12 14:47:50 +10:00
password-utils.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
patchutils.scm
pciutils.scm
pcre.scm	Merge branch 'master' into core-updates	2016-06-07 11:54:03 +02:00
pdf.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
pem.scm
perl.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
photo.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
pkg-config.scm
plotutils.scm	gnu: asymptote: Update to 2.38	2016-06-13 18:05:54 +02:00
polkit.scm
popt.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
pretty-print.scm
protobuf.scm	gnu: Add python-protobuf.	2016-07-22 02:22:49 -04:00
pth.scm
pulseaudio.scm	gnu: pulseaudio: Enable support for Bluetooth.	2016-06-28 08:35:39 +02:00
pumpio.scm	gnu: pumpa: Remove extra input.	2016-07-06 21:22:36 +03:00
pv.scm
python.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
qemu.scm
qt.scm	gnu: Add qtscript.	2016-07-07 12:23:39 +03:00
ragel.scm
rails.scm
ratpoison.scm
rc.scm
rdesktop.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
rdf.scm
readline.scm	gnu: Add rlwrap.	2016-07-17 08:56:03 +03:00
rrdtool.scm
rsync.scm
ruby.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
rush.scm
samba.scm	gnu: ldb: Update to 1.1.26.	2016-07-10 06:48:27 +03:00
sawfish.scm
scanner.scm
scheme.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
screen.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
scribus.scm	gnu: scribus: Build with modular qt.	2016-06-16 18:06:42 +03:00
sdl.scm
search.scm
serialization.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
serveez.scm
shellutils.scm
shishi.scm
skarnet.scm
skribilo.scm
slang.scm
slim.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
smalltalk.scm	gnu: smalltalk: Don't use bundled libraries.	2016-07-03 14:56:37 +03:00
speech.scm
ssh.scm	gnu: lsh: Move to (gnu packages ssh)	2016-07-15 17:57:28 +02:00
stalonetray.scm	gnu: stalonetray: Update to 0.8.3.	2016-07-17 16:14:46 +03:00
statistics.scm	gnu: Add r-domc.	2016-07-07 10:46:39 +02:00
suckless.scm	gnu: st: Update to 0.6	2016-06-09 21:57:43 +03:00
swig.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
sxiv.scm
synergy.scm
task-management.scm
tbb.scm
tcl.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
tcsh.scm
telephony.scm
terminals.scm
tex.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
texinfo.scm
textutils.scm	gnu: Update URLs for sourceforge.net.	2016-07-22 11:47:12 -04:00
time.scm
tls.scm	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
tmux.scm	gnu: Add Tmux Themepack.	2016-07-10 15:18:17 -04:00
tor.scm
tre.scm
tv.scm
unrtf.scm
upnp.scm
uucp.scm
valgrind.scm
version-control.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
video.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
vim.scm
vpn.scm
vtk.scm
w3m.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
wdiff.scm
web.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
webkit.scm
wget.scm	gnu: wget: Update to 1.18.	2016-06-13 23:13:16 +02:00
wicd.scm
wine.scm
wm.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
wordnet.scm
wv.scm
wxwidgets.scm	gnu: Update URLs for sourceforge.net.	2016-07-21 18:09:40 -04:00
xdisorg.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
xfce.scm	gnu: Add orage.	2016-06-27 12:58:06 -04:00
xfig.scm
xiph.scm	gnu: opus: Update to 1.1.3.	2016-07-22 14:02:13 -04:00
xml.scm	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
xnee.scm
xorg.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
yubico.scm
zile.scm
zip.scm
zsh.scm