Mirror of GNU Guix
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

587 lines
23 KiB

gnu: Remove unused lambda arguments and prefer separate phases over augmented phases. * gnu/packages/compression.scm (sharutils) [arguments]: Remove unused lambda args. * gnu/packages/gl.scm (mesa) [arguments]: Same * gnu/packages/fltk.scm [arguments]: Same. Substitute const check phase with #:tests? #f. Add pre-configure phase. * gnu/packages/ghostscript.scm (ghostscript) [arguments]: Put makefile patches in separate phase. Put so steps oinseparate phases. * gnu/packages/glib.scm (gobject-introspection) [arguments]: Remove unused lambda args. Put patches in pre-configure phase. * gnu/packages/gnupg.scm (gnupg) [arguments]: Put patch in pre-configure phase. (pius) [arguments]: Delete const #t configure and build phases. (signing-party) [arguments]: Factor patches into post-unpack phase. (paperkey) [arguments]: Remove unused lambda args. Factor out patches into pre-check phase. * gnu/packages/icu4c.scm [arguments]: Change source dir after standard unpack phase. Factor configure patches into pre-configure phase. * gnu/packages/lsof.scm [arguments]: Remove unused lambda args. Remove unnecessary apply. * gnu/packages/lvm.scm (lvm2) [arguments]: Factor out patches into pre-configure phase. * gnu/packages/libtiff.scm [arguments]: Same * gnu/packages/maths.scm (hdf5) [arguments]: Same * gnu/packages/gtk.scm (gtk+-2) [arguments]: Same * gnu/packages/mp3.scm (libmad) [arguments]: Same (id3lib) [arguments]: Same * gnu/packages/python.scm (python-2) [arguments]: Same * gnu/packages/texlive.scm (texlive) [arguments]: Same * gnu/packages/pretty-print.scm (a2ps) [arguments]: Same (trueprint) [arguments]: Same (source-highlight) [arguments]: Same. Remove unused lambda args. * gnu/packages/netpbm.scm [arguments]: Remove unused lambda args. Factor out test patches into pre-check phase. Condense calls to substitute* * gnu/packages/openldap.scm [arguments]: Factor out libtool copy into post-configure phases. [synopsis] Remove package name. * gnu/packages/ssh.scm (openssh) [arguments]: Factor out patches into separate phases. * gnu/packages/tcsh.scm [arguments]: Factor out test patches into pre-check phase. * gnu/packages/version-control.scm (git) [arguments]: Factor out patches into post-configure phase. * gnu/packages/vim.scm [arguments]: Same. [synopsis] Remove package name. * gnu/packages/vpn.scm (openconnect) [arguments]: Put configure flags in #:configure-flags
8 years ago
Use #:prefix instead of #:renamer with 'symbol-prefix-proc'. * gnu/packages/abiword.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/backup.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/compression.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/dc.scm, gnu/packages/emacs.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm, gnu/packages/gimp.scm, gnu/packages/gkrellm.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnutls.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm, gnu/packages/gtk.scm, gnu/packages/gv.scm, gnu/packages/image.scm, gnu/packages/indent.scm, gnu/packages/inkscape.scm, gnu/packages/lesstif.scm, gnu/packages/links.scm, gnu/packages/lisp.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/maths.scm, gnu/packages/mp3.scm, gnu/packages/openssl.scm, gnu/packages/ots.scm, gnu/packages/pciutils.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/slim.scm, gnu/packages/ssh.scm, gnu/packages/texlive.scm, gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wv.scm, gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/yasm.scm, gnu/packages/zip.scm, guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm, guix/build/python-build-system.scm, guix/download.scm: Replaces uses of #:renamer and 'symbol-prefix-proc' with #:prefix.
8 years ago
gnu: Move testing packages from python.scm to check.scm. * gnu/packages/python.scm (python-behave-web-api, python2-behave-web-api, python-mock, python2-mock, python-mock-2, python-nose, python2-nose, python-nose2, python2-nose2, python-unittest2, python2-unittest2, python-pytest, python2-pytest, python-pytest-3.0, python2-pytest-3.0, python-pytest-cov, python2-pytest-cov, python-pytest-runner, python2-pytest-runner, python-pytest-mock, python2-pytest-mock, python-pytest-xdist, python2-pytest-xdist, python-scripttest, python2-scripttest, python-testtools, python2-testtools, python-testscenarios, python2-testscenarios, python-testresources, python2-testresources, python-subunit, python2-subunit, python-fixtures, python2-fixtures, python-testrepository, python2-testrepository, python-coverage, python2-coverage, python-cov-core, python2-cov-core, python-testpath, python2-testpath, python-testlib, python2-testlib, python-pytest-cache, python2-pytest-cache, python-pytest-localserver, python-pytest-xprocess, python-pytest-subtesthack, python2-pytest-subtesthack, python-hypothesis, python2-hypothesis, python-lit, python2-lit, python-pytest-pep8, python2-pytest-pep8, python-pytest-flakes, python2-pytest-flakes, python2-coverage-test-runner, python-pylint, python2-pylint, python-paramunittest, python2-python-paramunittest, python-pytest-warnings, python2-pytest-warnings, python-pytest-capturelog, python2-pytest-capturelog, python-pytest-catchlog, python2-pytest-catchlog, python-nosexcover, python2-nosexcover, python-discover, python2-discover, behave, python-rednose, python2-rednose, python-nose-randomly, python2-nose-randomly, python-nose-timer, python2-nose-timer): Move from here... * gnu/packages/check.scm: ...to here. * gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/backup.scm, gnu/packages/bioinformatics.scm, gnu/packages/calendar.scm, gnu/packages/dav.scm, gnu/packages/django.scm, gnu/packages/freedesktop.scm, gnu/packages/haskell.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/ldc.scm, gnu/packages/libffi.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/rdf.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm: Adjust accordingly.
5 years ago
gnu: Separate Python core packages from the rest. * gnu/packages/python.scm: Move hundreds of package definitions from here... * gnu/packages/python-xyz.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/benchmark.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/cluster.scm, gnu/packages/compression.scm, gnu/packages/connman.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/direct-connect.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/docker.scm, gnu/packages/ebook.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/finance.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/freedesktop.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/ham-radio.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/kde-frameworks.scm, gnu/packages/key-mon.scm, gnu/packages/libffi.scm, gnu/packages/libreoffice.scm, gnu/packages/libusb.scm, gnu/packages/lirc.scm, gnu/packages/logging.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/medical.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nutrition.scm, gnu/packages/openldap.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/polkit.scm, gnu/packages/protobuf.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/search.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/simulation.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/virtualization.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wicd.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: Update module references.
3 years ago
gnu: Some cleanup based on lint checkers. * gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm, gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm, gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm, gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm, gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm, gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm, gnu/packages/libdaemon.scm, gnu/packages/libevent.scm, gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm, gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm, gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm, gnu/packages/pkg-config.scm, gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm, gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm, gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm, gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm, gnu/packages/valgrind.scm, gnu/packages/version-control.scm, gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm, gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm, gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust according to lint checkers. * gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri. * /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.
8 years ago
gnu: Some cleanup based on lint checkers. * gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm, gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm, gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm, gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm, gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm, gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm, gnu/packages/libdaemon.scm, gnu/packages/libevent.scm, gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm, gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm, gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm, gnu/packages/pkg-config.scm, gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm, gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm, gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm, gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm, gnu/packages/valgrind.scm, gnu/packages/version-control.scm, gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm, gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm, gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust according to lint checkers. * gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri. * /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.
8 years ago
gnu: Remove unused lambda arguments and prefer separate phases over augmented phases. * gnu/packages/compression.scm (sharutils) [arguments]: Remove unused lambda args. * gnu/packages/gl.scm (mesa) [arguments]: Same * gnu/packages/fltk.scm [arguments]: Same. Substitute const check phase with #:tests? #f. Add pre-configure phase. * gnu/packages/ghostscript.scm (ghostscript) [arguments]: Put makefile patches in separate phase. Put so steps oinseparate phases. * gnu/packages/glib.scm (gobject-introspection) [arguments]: Remove unused lambda args. Put patches in pre-configure phase. * gnu/packages/gnupg.scm (gnupg) [arguments]: Put patch in pre-configure phase. (pius) [arguments]: Delete const #t configure and build phases. (signing-party) [arguments]: Factor patches into post-unpack phase. (paperkey) [arguments]: Remove unused lambda args. Factor out patches into pre-check phase. * gnu/packages/icu4c.scm [arguments]: Change source dir after standard unpack phase. Factor configure patches into pre-configure phase. * gnu/packages/lsof.scm [arguments]: Remove unused lambda args. Remove unnecessary apply. * gnu/packages/lvm.scm (lvm2) [arguments]: Factor out patches into pre-configure phase. * gnu/packages/libtiff.scm [arguments]: Same * gnu/packages/maths.scm (hdf5) [arguments]: Same * gnu/packages/gtk.scm (gtk+-2) [arguments]: Same * gnu/packages/mp3.scm (libmad) [arguments]: Same (id3lib) [arguments]: Same * gnu/packages/python.scm (python-2) [arguments]: Same * gnu/packages/texlive.scm (texlive) [arguments]: Same * gnu/packages/pretty-print.scm (a2ps) [arguments]: Same (trueprint) [arguments]: Same (source-highlight) [arguments]: Same. Remove unused lambda args. * gnu/packages/netpbm.scm [arguments]: Remove unused lambda args. Factor out test patches into pre-check phase. Condense calls to substitute* * gnu/packages/openldap.scm [arguments]: Factor out libtool copy into post-configure phases. [synopsis] Remove package name. * gnu/packages/ssh.scm (openssh) [arguments]: Factor out patches into separate phases. * gnu/packages/tcsh.scm [arguments]: Factor out test patches into pre-check phase. * gnu/packages/version-control.scm (git) [arguments]: Factor out patches into post-configure phase. * gnu/packages/vim.scm [arguments]: Same. [synopsis] Remove package name. * gnu/packages/vpn.scm (openconnect) [arguments]: Put configure flags in #:configure-flags
8 years ago
gnu: Add and use gettext-minimal. * gnu/packages/gettext.scm (gnu-gettext): Rename to... (gettext-minimal): ... this. Adjust synopsis and description. (gnu-gettext): Inherit from it. (po4a): Use 'gettext-minimal' instead of 'gnu-gettext'. * gnu/packages/acl.scm: Likewise. * gnu/packages/admin.scm: Likewise. * gnu/packages/apl.scm: Likewise. * gnu/packages/attr.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/base.scm: Likewise. * gnu/packages/cdrom.scm: Likewise. * gnu/packages/commencement.scm: Likewise. * gnu/packages/crypto.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/disk.scm: Likewise. * gnu/packages/documentation.scm: Likewise. * gnu/packages/education.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/enlightenment.scm: Likewise. * gnu/packages/fcitx.scm: Likewise. * gnu/packages/fontutils.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gkrellm.scm: Likewise. * gnu/packages/glib.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/grub.scm: Likewise. * gnu/packages/gtk.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/ibus.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/iso-codes.scm: Likewise. * gnu/packages/kde-frameworks.scm: Likewise. * gnu/packages/kodi.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/man.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/mono.scm: Likewise. * gnu/packages/mp3.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/nano.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/package-management.scm: Likewise. * gnu/packages/pdf.scm: Likewise. * gnu/packages/sawfish.scm: Likewise. * gnu/packages/statistics.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/vpn.scm: Likewise. * gnu/packages/w3m.scm: Likewise. * gnu/packages/webkit.scm: Likewise. * gnu/packages/wicd.scm: Likewise. * gnu/packages/wine.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xorg.scm: Likewise.
6 years ago
gnu: Remove unused lambda arguments and prefer separate phases over augmented phases. * gnu/packages/compression.scm (sharutils) [arguments]: Remove unused lambda args. * gnu/packages/gl.scm (mesa) [arguments]: Same * gnu/packages/fltk.scm [arguments]: Same. Substitute const check phase with #:tests? #f. Add pre-configure phase. * gnu/packages/ghostscript.scm (ghostscript) [arguments]: Put makefile patches in separate phase. Put so steps oinseparate phases. * gnu/packages/glib.scm (gobject-introspection) [arguments]: Remove unused lambda args. Put patches in pre-configure phase. * gnu/packages/gnupg.scm (gnupg) [arguments]: Put patch in pre-configure phase. (pius) [arguments]: Delete const #t configure and build phases. (signing-party) [arguments]: Factor patches into post-unpack phase. (paperkey) [arguments]: Remove unused lambda args. Factor out patches into pre-check phase. * gnu/packages/icu4c.scm [arguments]: Change source dir after standard unpack phase. Factor configure patches into pre-configure phase. * gnu/packages/lsof.scm [arguments]: Remove unused lambda args. Remove unnecessary apply. * gnu/packages/lvm.scm (lvm2) [arguments]: Factor out patches into pre-configure phase. * gnu/packages/libtiff.scm [arguments]: Same * gnu/packages/maths.scm (hdf5) [arguments]: Same * gnu/packages/gtk.scm (gtk+-2) [arguments]: Same * gnu/packages/mp3.scm (libmad) [arguments]: Same (id3lib) [arguments]: Same * gnu/packages/python.scm (python-2) [arguments]: Same * gnu/packages/texlive.scm (texlive) [arguments]: Same * gnu/packages/pretty-print.scm (a2ps) [arguments]: Same (trueprint) [arguments]: Same (source-highlight) [arguments]: Same. Remove unused lambda args. * gnu/packages/netpbm.scm [arguments]: Remove unused lambda args. Factor out test patches into pre-check phase. Condense calls to substitute* * gnu/packages/openldap.scm [arguments]: Factor out libtool copy into post-configure phases. [synopsis] Remove package name. * gnu/packages/ssh.scm (openssh) [arguments]: Factor out patches into separate phases. * gnu/packages/tcsh.scm [arguments]: Factor out test patches into pre-check phase. * gnu/packages/version-control.scm (git) [arguments]: Factor out patches into post-configure phase. * gnu/packages/vim.scm [arguments]: Same. [synopsis] Remove package name. * gnu/packages/vpn.scm (openconnect) [arguments]: Put configure flags in #:configure-flags
8 years ago
gnu: Remove unused lambda arguments and prefer separate phases over augmented phases. * gnu/packages/compression.scm (sharutils) [arguments]: Remove unused lambda args. * gnu/packages/gl.scm (mesa) [arguments]: Same * gnu/packages/fltk.scm [arguments]: Same. Substitute const check phase with #:tests? #f. Add pre-configure phase. * gnu/packages/ghostscript.scm (ghostscript) [arguments]: Put makefile patches in separate phase. Put so steps oinseparate phases. * gnu/packages/glib.scm (gobject-introspection) [arguments]: Remove unused lambda args. Put patches in pre-configure phase. * gnu/packages/gnupg.scm (gnupg) [arguments]: Put patch in pre-configure phase. (pius) [arguments]: Delete const #t configure and build phases. (signing-party) [arguments]: Factor patches into post-unpack phase. (paperkey) [arguments]: Remove unused lambda args. Factor out patches into pre-check phase. * gnu/packages/icu4c.scm [arguments]: Change source dir after standard unpack phase. Factor configure patches into pre-configure phase. * gnu/packages/lsof.scm [arguments]: Remove unused lambda args. Remove unnecessary apply. * gnu/packages/lvm.scm (lvm2) [arguments]: Factor out patches into pre-configure phase. * gnu/packages/libtiff.scm [arguments]: Same * gnu/packages/maths.scm (hdf5) [arguments]: Same * gnu/packages/gtk.scm (gtk+-2) [arguments]: Same * gnu/packages/mp3.scm (libmad) [arguments]: Same (id3lib) [arguments]: Same * gnu/packages/python.scm (python-2) [arguments]: Same * gnu/packages/texlive.scm (texlive) [arguments]: Same * gnu/packages/pretty-print.scm (a2ps) [arguments]: Same (trueprint) [arguments]: Same (source-highlight) [arguments]: Same. Remove unused lambda args. * gnu/packages/netpbm.scm [arguments]: Remove unused lambda args. Factor out test patches into pre-check phase. Condense calls to substitute* * gnu/packages/openldap.scm [arguments]: Factor out libtool copy into post-configure phases. [synopsis] Remove package name. * gnu/packages/ssh.scm (openssh) [arguments]: Factor out patches into separate phases. * gnu/packages/tcsh.scm [arguments]: Factor out test patches into pre-check phase. * gnu/packages/version-control.scm (git) [arguments]: Factor out patches into post-configure phase. * gnu/packages/vim.scm [arguments]: Same. [synopsis] Remove package name. * gnu/packages/vpn.scm (openconnect) [arguments]: Put configure flags in #:configure-flags
8 years ago
  1. ;;; GNU Guix --- Functional package management for GNU
  2. ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
  3. ;;; Copyright © 2013, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
  4. ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
  5. ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
  6. ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
  7. ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
  8. ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
  9. ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
  10. ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
  11. ;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
  12. ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
  13. ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
  14. ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
  15. ;;;
  16. ;;; This file is part of GNU Guix.
  17. ;;;
  18. ;;; GNU Guix is free software; you can redistribute it and/or modify it
  19. ;;; under the terms of the GNU General Public License as published by
  20. ;;; the Free Software Foundation; either version 3 of the License, or (at
  21. ;;; your option) any later version.
  22. ;;;
  23. ;;; GNU Guix is distributed in the hope that it will be useful, but
  24. ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
  25. ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  26. ;;; GNU General Public License for more details.
  27. ;;;
  28. ;;; You should have received a copy of the GNU General Public License
  29. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
  30. (define-module (gnu packages vpn)
  31. #:use-module ((guix licenses) #:prefix license:)
  32. #:use-module (guix packages)
  33. #:use-module (guix download)
  34. #:use-module (guix git-download)
  35. #:use-module (guix build-system cmake)
  36. #:use-module (guix build-system gnu)
  37. #:use-module (guix build-system linux-module)
  38. #:use-module (guix build-system python)
  39. #:use-module (gnu packages)
  40. #:use-module (gnu packages admin)
  41. #:use-module (gnu packages base)
  42. #:use-module (gnu packages check)
  43. #:use-module (gnu packages autotools)
  44. #:use-module (gnu packages compression)
  45. #:use-module (gnu packages gettext)
  46. #:use-module (gnu packages gnupg)
  47. #:use-module (gnu packages guile)
  48. #:use-module (gnu packages libevent)
  49. #:use-module (gnu packages linux)
  50. #:use-module (gnu packages nss)
  51. #:use-module (gnu packages perl)
  52. #:use-module (gnu packages pkg-config)
  53. #:use-module (gnu packages python)
  54. #:use-module (gnu packages python-xyz)
  55. #:use-module (gnu packages tls)
  56. #:use-module (gnu packages xml))
  57. (define-public gvpe
  58. (package
  59. (name "gvpe")
  60. (version "3.1")
  61. (source (origin
  62. (method url-fetch)
  63. (uri (string-append "mirror://gnu/gvpe/gvpe-"
  64. version ".tar.gz"))
  65. (sha256
  66. (base32
  67. "1cz8n75ksl0l908zc5l3rnfm1hv7130s2w8710799fr5sxrdbszi"))))
  68. (build-system gnu-build-system)
  69. (home-page "http://software.schmorp.de/pkg/gvpe.html")
  70. (native-inputs `(("pkg-config" ,pkg-config)))
  71. (inputs `(("openssl" ,openssl)
  72. ("zlib" ,zlib)))
  73. (synopsis "Secure VPN among multiple nodes over an untrusted network")
  74. (description
  75. "The GNU Virtual Private Ethernet creates a virtual network
  76. with multiple nodes using a variety of transport protocols. It works
  77. by creating encrypted host-to-host tunnels between multiple
  78. endpoints.")
  79. (license license:gpl3+)))
  80. (define-public vpnc
  81. (package
  82. (name "vpnc")
  83. (version "0.5.3")
  84. (source (origin
  85. (method url-fetch)
  86. (uri (string-append "https://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-"
  87. version ".tar.gz"))
  88. (sha256 (base32
  89. "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6"))))
  90. (build-system gnu-build-system)
  91. (inputs `(("libgcrypt" ,libgcrypt)
  92. ("perl" ,perl)
  93. ("vpnc-scripts" ,vpnc-scripts)))
  94. (arguments
  95. `(#:tests? #f ; there is no check target
  96. #:phases
  97. (modify-phases %standard-phases
  98. (add-after 'unpack 'use-store-paths
  99. (lambda* (#:key inputs outputs #:allow-other-keys)
  100. (let ((out (assoc-ref outputs "out"))
  101. (vpnc-scripts (assoc-ref inputs "vpnc-scripts")))
  102. (substitute* "config.c"
  103. (("/etc/vpnc/vpnc-script")
  104. (string-append vpnc-scripts "/etc/vpnc/vpnc-script")))
  105. (substitute* "Makefile"
  106. (("ETCDIR=.*")
  107. (string-append "ETCDIR=" out "/etc/vpnc\n"))
  108. (("PREFIX=.*")
  109. (string-append "PREFIX=" out "\n")))
  110. #t)))
  111. (delete 'configure)))) ; no configure script
  112. (synopsis "Client for Cisco VPN concentrators")
  113. (description
  114. "vpnc is a VPN client compatible with Cisco's EasyVPN equipment.
  115. It supports IPSec (ESP) with Mode Configuration and Xauth. It supports only
  116. shared-secret IPSec authentication with Xauth, AES (256, 192, 128), 3DES,
  117. 1DES, MD5, SHA1, DH1/2/5 and IP tunneling. It runs entirely in userspace.
  118. Only \"Universal TUN/TAP device driver support\" is needed in the kernel.")
  119. (license license:gpl2+) ; some file are bsd-2, see COPYING
  120. (home-page "https://www.unix-ag.uni-kl.de/~massar/vpnc/")))
  121. (define-public vpnc-scripts
  122. (let ((commit "1000e0f6dd7d6bff163169a46359211c1fc3a6d2"))
  123. (package
  124. (name "vpnc-scripts")
  125. (version (string-append "20190116." (string-take commit 7)))
  126. (source (origin
  127. (method git-fetch)
  128. (uri
  129. (git-reference
  130. (url "git://git.infradead.org/users/dwmw2/vpnc-scripts.git")
  131. (commit commit)))
  132. (file-name (git-file-name name version))
  133. (sha256
  134. (base32
  135. "1g41yarz2bl0f73kbjqnywr485ghanbp7nmspklfb0n07yp0z6ak"))))
  136. (build-system gnu-build-system)
  137. (inputs `(("guile" ,guile-2.2) ; for the wrapper scripts
  138. ("coreutils" ,coreutils)
  139. ("grep" ,grep)
  140. ("iproute2" ,iproute) ; for ‘ip’
  141. ("net-tools" ,net-tools) ; for ‘ifconfig’, ‘route’
  142. ("sed" ,sed)
  143. ("which" ,which)))
  144. (arguments
  145. `(#:phases
  146. (modify-phases %standard-phases
  147. (add-after 'unpack 'use-relative-paths
  148. ;; Patch the scripts to work with and use relative paths.
  149. (lambda* _
  150. (for-each (lambda (script)
  151. (substitute* script
  152. (("^PATH=.*") "")
  153. (("(/usr|)/s?bin/") "")
  154. (("\\[ +-x +([^]]+) +\\]" _ command)
  155. (string-append "command -v >/dev/null 2>&1 "
  156. command))))
  157. (find-files "." "^vpnc-script"))
  158. #t))
  159. (delete 'configure) ; no configure script
  160. (replace 'build
  161. (lambda _
  162. (invoke "gcc" "-o" "netunshare" "netunshare.c")))
  163. (replace 'install
  164. ;; There is no Makefile; manually install the relevant files.
  165. (lambda* (#:key outputs #:allow-other-keys)
  166. (let* ((out (assoc-ref outputs "out"))
  167. (etc (string-append out "/etc/vpnc")))
  168. (for-each (lambda (file)
  169. (install-file file etc))
  170. (append (find-files "." "^vpnc-script")
  171. (list "netunshare"
  172. "xinetd.netns.conf")))
  173. #t)))
  174. (add-after 'install 'wrap-scripts
  175. ;; Wrap scripts with paths to their common hard dependencies.
  176. ;; Optional dependencies will need to be installed by the user.
  177. (lambda* (#:key inputs outputs #:allow-other-keys)
  178. (let ((out (assoc-ref outputs "out")))
  179. (for-each
  180. (lambda (script)
  181. (wrap-script (string-append out "/etc/vpnc/" script)
  182. `("PATH" ":" prefix
  183. ,(map (lambda (name)
  184. (let ((input (assoc-ref inputs name)))
  185. (string-append input "/bin:"
  186. input "/sbin")))
  187. (list "coreutils"
  188. "grep"
  189. "iproute2"
  190. "net-tools"
  191. "sed"
  192. "which")))))
  193. (list "vpnc-script-ptrtd"
  194. "vpnc-script-sshd"
  195. "vpnc-script"))
  196. #t))))
  197. #:tests? #f)) ; no tests
  198. (home-page "http://git.infradead.org/users/dwmw2/vpnc-scripts.git")
  199. (synopsis "Network configuration scripts for Cisco VPN clients")
  200. (description
  201. "This set of scripts configures routing and name services when invoked
  202. by the VPNC or OpenConnect Cisco @dfn{Virtual Private Network} (VPN) clients.
  203. The default @command{vpnc-script} automatically configures most common
  204. connections, and provides hooks for performing custom actions at various stages
  205. of the connection or disconnection process.
  206. Alternative scripts are provided for more complicated set-ups, or to serve as an
  207. example for writing your own. For example, @command{vpnc-script-sshd} contains
  208. the entire VPN in a network namespace accessible only through SSH.")
  209. (license license:gpl2+))))
  210. (define-public ocproxy
  211. (package
  212. (name "ocproxy")
  213. (version "1.60")
  214. (source (origin
  215. (method git-fetch)
  216. (uri (git-reference
  217. (url "https://github.com/cernekee/ocproxy.git")
  218. (commit (string-append "v" version))))
  219. (file-name (git-file-name name version))
  220. (sha256
  221. (base32
  222. "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx"))))
  223. (build-system gnu-build-system)
  224. (native-inputs
  225. `(("autoconf" ,autoconf)
  226. ("automake" ,automake)))
  227. (inputs
  228. `(("libevent" ,libevent)))
  229. (home-page "https://github.com/cernekee/ocproxy")
  230. (synopsis "OpenConnect proxy")
  231. (description
  232. "User-level @dfn{SOCKS} and port forwarding proxy for OpenConnect based
  233. on LwIP. When using ocproxy, OpenConnect only handles network activity that
  234. the user specifically asks to proxy, so the @dfn{VPN} interface no longer
  235. \"hijacks\" all network traffic on the host.")
  236. (license license:bsd-3)))
  237. (define-public openconnect
  238. (package
  239. (name "openconnect")
  240. (version "8.08")
  241. (source (origin
  242. (method url-fetch)
  243. (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
  244. "openconnect-" version ".tar.gz"))
  245. (sha256
  246. (base32 "1s3rjdazx1n5izpcgz05p1sirm7kf4z3gh26dq2h2j5xmgmk0jxp"))))
  247. (build-system gnu-build-system)
  248. (propagated-inputs
  249. `(("libxml2" ,libxml2)
  250. ("gnutls" ,gnutls-3.6.13)
  251. ("zlib" ,zlib)))
  252. (inputs
  253. `(("vpnc-scripts" ,vpnc-scripts)))
  254. (native-inputs
  255. `(("gettext" ,gettext-minimal)
  256. ("pkg-config" ,pkg-config)))
  257. (arguments
  258. `(#:configure-flags
  259. `(,(string-append "--with-vpnc-script="
  260. (assoc-ref %build-inputs "vpnc-scripts")
  261. "/etc/vpnc/vpnc-script"))))
  262. (synopsis "Client for Cisco VPN")
  263. (description
  264. "OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
  265. supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco SR500,
  266. 870, 880, 1800, 2800, 3800, 7200 Series and Cisco 7301 Routers,
  267. and probably others.")
  268. (license license:lgpl2.1)
  269. (home-page "https://www.infradead.org/openconnect/")))
  270. (define-public openvpn
  271. (package
  272. (name "openvpn")
  273. (version "2.4.8")
  274. (source (origin
  275. (method url-fetch)
  276. (uri (string-append
  277. "https://swupdate.openvpn.org/community/releases/openvpn-"
  278. version ".tar.xz"))
  279. (sha256
  280. (base32
  281. "149z3agjy03i66mcj5bplim2mh45s2ps1wmxbxczyzw0nxmsd37v"))))
  282. (build-system gnu-build-system)
  283. (arguments
  284. '(#:configure-flags '("--enable-iproute2=yes")))
  285. (native-inputs
  286. `(("iproute2" ,iproute)))
  287. (inputs
  288. `(("lz4" ,lz4)
  289. ("lzo" ,lzo)
  290. ("openssl" ,openssl)
  291. ("linux-pam" ,linux-pam)))
  292. (home-page "https://openvpn.net/")
  293. (synopsis "Virtual private network daemon")
  294. (description
  295. "OpenVPN implements virtual private network (@dfn{VPN}) techniques
  296. for creating secure point-to-point or site-to-site connections in routed or
  297. bridged configurations and remote access facilities. It uses a custom
  298. security protocol that utilizes SSL/TLS for key exchange. It is capable of
  299. traversing network address translators (@dfn{NAT}s) and firewalls.")
  300. (license license:gpl2)))
  301. (define-public tinc
  302. (package
  303. (name "tinc")
  304. (version "1.0.36")
  305. (source (origin
  306. (method url-fetch)
  307. (uri (string-append "https://tinc-vpn.org/packages/"
  308. "tinc-" version ".tar.gz"))
  309. (sha256
  310. (base32
  311. "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0"))))
  312. (build-system gnu-build-system)
  313. (arguments
  314. '(#:configure-flags
  315. '("--sysconfdir=/etc"
  316. "--localstatedir=/var")))
  317. (inputs `(("zlib" ,zlib)
  318. ("lzo" ,lzo)
  319. ("openssl" ,openssl)))
  320. (home-page "https://tinc-vpn.org")
  321. (synopsis "Virtual Private Network (VPN) daemon")
  322. (description
  323. "Tinc is a VPN that uses tunnelling and encryption to create a secure
  324. private network between hosts on the internet.")
  325. (license license:gpl2+)))
  326. (define-public sshuttle
  327. (package
  328. (name "sshuttle")
  329. (version "0.78.5")
  330. (source
  331. (origin
  332. (method url-fetch)
  333. (uri (pypi-uri name version))
  334. (sha256
  335. (base32
  336. "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"))))
  337. (build-system python-build-system)
  338. (arguments
  339. `(#:phases
  340. (modify-phases %standard-phases
  341. (add-after 'unpack 'patch-FHS-file-names
  342. (lambda _
  343. (substitute* "sshuttle/client.py"
  344. (("/usr/bin/env") (which "env")))
  345. (substitute* "sshuttle/ssh.py"
  346. (("/bin/sh") "sh"))
  347. #t)))))
  348. (native-inputs
  349. `(("python-setuptools-scm" ,python-setuptools-scm)
  350. ;; For tests only.
  351. ("python-flake8", python-flake8)
  352. ("python-mock" ,python-mock)
  353. ("python-pytest-cov" ,python-pytest-cov)
  354. ("python-pytest-runner" ,python-pytest-runner)))
  355. (home-page "https://github.com/sshuttle/sshuttle")
  356. (synopsis "VPN that transparently forwards connections over SSH")
  357. (description "sshuttle creates an encrypted virtual private network (VPN)
  358. connection to any remote server to which you have secure shell (SSH) access.
  359. The only requirement is a suitable version of Python on the server;
  360. administrative privileges are required only on the client. Unlike most VPNs,
  361. sshuttle forwards entire sessions, not packets, using kernel transparent
  362. proxying. This makes it faster and more reliable than SSH's own tunneling and
  363. port forwarding features. It can forward both TCP and UDP traffic, including
  364. DNS domain name queries.")
  365. (license license:lgpl2.0))) ; incorrectly identified as GPL in ‘setup.py’
  366. (define-public sshoot
  367. (package
  368. (name "sshoot")
  369. (version "1.2.6")
  370. (source
  371. (origin
  372. (method url-fetch)
  373. (uri (pypi-uri name version))
  374. (sha256
  375. (base32
  376. "1ccgh0hjyxrwkgy3hnxz3hgbjbs0lmfs25d5l5jam0xbpcpj63h0"))))
  377. (build-system python-build-system)
  378. (arguments
  379. '(#:phases
  380. (modify-phases %standard-phases
  381. (add-after 'unpack 'patch-paths
  382. (lambda _
  383. (substitute* "sshoot/tests/test_manager.py"
  384. (("/bin/sh") (which "sh")))
  385. #t)))))
  386. (inputs
  387. `(("python-argcomplete" ,python-argcomplete)
  388. ("python-prettytable" ,python-prettytable)
  389. ("python-pyyaml" ,python-pyyaml)))
  390. ;; For tests only.
  391. (native-inputs
  392. `(("python-fixtures" ,python-fixtures)
  393. ("python-pbr" ,python-pbr)
  394. ("python-testtools" ,python-testtools)))
  395. (home-page "https://github.com/albertodonato/sshoot")
  396. (synopsis "sshuttle VPN session manager")
  397. (description "sshoot provides a command-line interface to manage multiple
  398. @command{sshuttle} virtual private networks. It supports flexible profiles
  399. with configuration options for most of @command{sshuttle}s features.")
  400. (license license:gpl3+)))
  401. (define-public badvpn
  402. (package
  403. (name "badvpn")
  404. (version "1.999.130")
  405. (source
  406. (origin
  407. (method git-fetch)
  408. (uri (git-reference
  409. (url "https://github.com/ambrop72/badvpn.git")
  410. (commit version)))
  411. (file-name (git-file-name name version))
  412. (sha256
  413. (base32 "0rm67xhi7bh3yph1vh07imv5y1pwyldvw3wa5bz471g8mnkc7d3c"))))
  414. (build-system cmake-build-system)
  415. (arguments
  416. '(#:tests? #f)) ; no tests
  417. (inputs
  418. `(("nspr" ,nspr)
  419. ("nss" ,nss)
  420. ("openssl" ,openssl)))
  421. (native-inputs
  422. `(("pkg-config" ,pkg-config)))
  423. (home-page "https://github.com/ambrop72/badvpn")
  424. (synopsis "Peer-to-peer virtual private network (VPN)")
  425. (description "@code{BadVPN} is a collection of virtual private
  426. network (VPN) tools. It includes:
  427. @enumerate
  428. @item NCD programming language.\n
  429. NCD (Network Configuration Daemon) is a daemon and programming/scripting
  430. language for configuration of network interfaces and other aspects of the
  431. operating system.
  432. @item Tun2socks network-layer proxifier.\n
  433. The tun2socks program socksifes TCP connections at the network layer. It
  434. implements a TUN device which accepts all incoming TCP connections (regardless
  435. of destination IP), and forwards the connections through a SOCKS server.
  436. @item Peer-to-peer VPN.\n
  437. The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
  438. (VPN nodes).
  439. @end enumerate")
  440. ;; This project contains a bundled lwIP. lwIP is also released under the
  441. ;; 3-clause BSD license.
  442. (license license:bsd-3)))
  443. (define-public wireguard-linux-compat
  444. (package
  445. (name "wireguard-linux-compat")
  446. (version "1.0.20200401")
  447. (source (origin
  448. (method url-fetch)
  449. (uri (string-append "https://git.zx2c4.com/wireguard-linux-compat/"
  450. "snapshot/wireguard-linux-compat-" version
  451. ".tar.xz"))
  452. (sha256
  453. (base32
  454. "0ymprz3h4b92wlcqm5k5vmcgap8pjv202bgkdx0axmp12n1lmyvx"))))
  455. (build-system linux-module-build-system)
  456. (outputs '("out"
  457. "kernel-patch"))
  458. (arguments
  459. `(#:tests? #f ; No test suite
  460. #:modules ((guix build linux-module-build-system)
  461. (guix build utils)
  462. (ice-9 popen)
  463. (ice-9 textual-ports))
  464. #:phases
  465. (modify-phases %standard-phases
  466. (add-before 'build 'change-directory
  467. (lambda _
  468. (chdir "./src")
  469. #t))
  470. (add-after 'build 'build-patch
  471. (lambda* (#:key outputs #:allow-other-keys)
  472. (let* ((patch-builder "../kernel-tree-scripts/create-patch.sh")
  473. (port (open-input-pipe patch-builder))
  474. (str (get-string-all port)))
  475. (close-pipe port)
  476. (call-with-output-file "wireguard.patch"
  477. (lambda (port)
  478. (format port "~a" str))))
  479. #t))
  480. (add-after 'install 'install-patch
  481. (lambda* (#:key outputs #:allow-other-keys)
  482. (install-file "wireguard.patch"
  483. (assoc-ref %outputs "kernel-patch"))
  484. #t))
  485. ;; So that 'install-license-files' works...
  486. (add-before 'install-license-files 'reset-cwd
  487. (lambda _
  488. (chdir "..")
  489. #t)))))
  490. (home-page "https://git.zx2c4.com/wireguard-linux-compat/")
  491. (synopsis "WireGuard kernel module for Linux 3.10 through 5.5")
  492. (description "This package contains an out-of-tree kernel patch and
  493. a loadable module adding WireGuard to Linux kernel versions 3.10 through 5.5.
  494. WireGuard was added to Linux 5.6.")
  495. (license license:gpl2)))
  496. (define-public wireguard-tools
  497. (package
  498. (name "wireguard-tools")
  499. (version "1.0.20200206")
  500. (source
  501. (origin
  502. (method git-fetch)
  503. (uri (git-reference
  504. (url "https://git.zx2c4.com/wireguard-tools.git")
  505. (commit (string-append "v" version))))
  506. (file-name (git-file-name name version))
  507. (sha256
  508. (base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7"))))
  509. (build-system gnu-build-system)
  510. (arguments
  511. `(#:make-flags
  512. (list "CC=gcc"
  513. "--directory=src"
  514. "WITH_BASHCOMPLETION=yes"
  515. ;; Install the ‘simple and dirty’ helper script wg-quick(8).
  516. "WITH_WGQUICK=yes"
  517. (string-append "PREFIX=" (assoc-ref %outputs "out"))
  518. ;; Currently used only to create an empty /etc/wireguard directory.
  519. (string-append "SYSCONFDIR=no-thanks"))
  520. ;; The test suite is meant to be run interactively. It runs Clang's
  521. ;; scan-build static analyzer and then starts a web server to display the
  522. ;; results.
  523. #:tests? #f
  524. #:phases
  525. (modify-phases %standard-phases
  526. ;; No configure script
  527. (delete 'configure))))
  528. (home-page "https://www.wireguard.com/")
  529. (synopsis "Tools for configuring WireGuard tunnels")
  530. (description
  531. "This package provides the user-space command-line tools for using and
  532. configuring WireGuard tunnels.
  533. WireGuard is a simple and fast general-purpose @acronym{VPN, Virtual Private
  534. Network} that securely encapsulates IP packets over UDP. It aims to be as easy
  535. to configure and deploy as SSH. VPN connections are made simply by exchanging
  536. public keys and can roam across IP addresses.")
  537. (license
  538. (list license:lgpl2.1+ ; src/netlink.h & contrib/embeddable-wg-library
  539. license:gpl2)))) ; everything else
  540. (define-public wireguard
  541. (deprecated-package "wireguard" wireguard-tools))
  542. (define-public xl2tpd
  543. (package
  544. (name "xl2tpd")
  545. (version "1.3.15")
  546. (source (origin
  547. (method git-fetch)
  548. (uri (git-reference
  549. (url "https://github.com/xelerance/xl2tpd")
  550. (commit (string-append "v" version))))
  551. (file-name (git-file-name name version))
  552. (sha256
  553. (base32
  554. "0ppwza8nwm1av1vldw40gin9wrjrs4l9si50jad414js3k8ycaag"))))
  555. (build-system gnu-build-system)
  556. (arguments
  557. `(#:make-flags (list (string-append "PREFIX=" %output)
  558. "CC=gcc")
  559. #:phases (modify-phases %standard-phases
  560. (delete 'configure)) ; no configure script
  561. #:tests? #f)) ; no tests provided
  562. (inputs `(("libpcap" ,libpcap)))
  563. (home-page "https://www.xelerance.com/software/xl2tpd/")
  564. (synopsis "Layer 2 Tunnelling Protocol Daemon (RFC 2661)")
  565. (description
  566. "xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661).
  567. L2TP allows you to tunnel PPP over UDP.")
  568. (license license:gpl2)))