Merge branch 'master' into python-tests
This commit is contained in:
Marius Bakke
commit
8779987bba
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
# Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
# Copyright © 2016 Mark H Weaver <mhw@netris.org>
|
||||
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
|
|
@ -198,6 +198,8 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
|||
|
||||
# Linux-Libre configurations.
|
||||
KCONFIGS = \
|
||||
gnu/packages/linux-libre-4.10-i686.conf \
|
||||
gnu/packages/linux-libre-4.10-x86_64.conf \
|
||||
gnu/packages/linux-libre-4.9-i686.conf \
|
||||
gnu/packages/linux-libre-4.9-x86_64.conf \
|
||||
gnu/packages/linux-libre-4.4-i686.conf \
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@ SYSTEM."
|
|||
'("mips64el-linux-gnu"
|
||||
"mips64el-linux-gnuabi64"
|
||||
"arm-linux-gnueabihf"
|
||||
"aarch64-linux-gnu"
|
||||
"i686-w64-mingw32"))
|
||||
|
||||
(define %guixsd-supported-systems
|
||||
|
|
|
|||
|
|
@ -8611,6 +8611,13 @@ are written.
|
|||
@item @code{lsof} (default: @var{lsof})
|
||||
The lsof package to use.
|
||||
|
||||
@item @code{http-proxy} (default: @code{#f})
|
||||
The HTTP proxy used for downloading fixed-output derivations and
|
||||
substitutes.
|
||||
|
||||
@item @code{tmpdir} (default: @code{#f})
|
||||
A directory path where the @command{guix-daemon} will perform builds.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
|
|
|
|||
11
gnu/local.mk
11
gnu/local.mk
|
|
@ -605,7 +605,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/grub-gets-undeclared.patch \
|
||||
%D%/packages/patches/grub-freetype.patch \
|
||||
%D%/packages/patches/gsl-test-i686.patch \
|
||||
%D%/packages/patches/gst-plugins-base-fix-test-on-32bit.patch \
|
||||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
%D%/packages/patches/guile-arm-fixes.patch \
|
||||
%D%/packages/patches/guile-default-utf8.patch \
|
||||
|
|
@ -634,6 +633,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/hdf-eos5-fortrantests.patch \
|
||||
%D%/packages/patches/higan-remove-march-native-flag.patch \
|
||||
%D%/packages/patches/hop-linker-flags.patch \
|
||||
%D%/packages/patches/hubbub-sort-entities.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/hypre-doc-tables.patch \
|
||||
%D%/packages/patches/hypre-ldflags.patch \
|
||||
|
|
@ -691,7 +691,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libmad-frame-length.patch \
|
||||
%D%/packages/patches/libmad-mips-newgcc.patch \
|
||||
%D%/packages/patches/libpng-CVE-2016-10087.patch \
|
||||
%D%/packages/patches/libssh-0.6.5-CVE-2016-0739.patch \
|
||||
%D%/packages/patches/libtar-CVE-2013-4420.patch \
|
||||
%D%/packages/patches/libtheora-config-guess.patch \
|
||||
%D%/packages/patches/libtiff-CVE-2016-10092.patch \
|
||||
|
|
@ -771,7 +770,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/net-tools-bitrot.patch \
|
||||
%D%/packages/patches/netcdf-date-time.patch \
|
||||
%D%/packages/patches/netcdf-tst_h_par.patch \
|
||||
%D%/packages/patches/netsurf-about.patch \
|
||||
%D%/packages/patches/netsurf-system-utf8proc.patch \
|
||||
%D%/packages/patches/netsurf-y2038-tests.patch \
|
||||
%D%/packages/patches/netsurf-longer-test-timeout.patch \
|
||||
%D%/packages/patches/ngircd-handle-zombies.patch \
|
||||
%D%/packages/patches/ngircd-no-dns-in-tests.patch \
|
||||
%D%/packages/patches/ninja-tests.patch \
|
||||
|
|
@ -902,6 +903,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/serf-comment-style-fix.patch \
|
||||
%D%/packages/patches/serf-deflate-buckets-test-fix.patch \
|
||||
%D%/packages/patches/shadow-4.4-su-snprintf-fix.patch \
|
||||
%D%/packages/patches/shadow-CVE-2017-2616.patch \
|
||||
%D%/packages/patches/slim-session.patch \
|
||||
%D%/packages/patches/slim-config.patch \
|
||||
%D%/packages/patches/slim-sigusr1.patch \
|
||||
|
|
@ -953,8 +955,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/unzip-overflow-long-fsize.patch \
|
||||
%D%/packages/patches/unzip-remove-build-date.patch \
|
||||
%D%/packages/patches/util-linux-tests.patch \
|
||||
%D%/packages/patches/util-linux-CVE-2017-2616.patch \
|
||||
%D%/packages/patches/upower-builddir.patch \
|
||||
%D%/packages/patches/valgrind-enable-arm.patch \
|
||||
%D%/packages/patches/vdirsyncer-test-suite-slow-machines.patch \
|
||||
%D%/packages/patches/vim-CVE-2017-5953.patch \
|
||||
%D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \
|
||||
%D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \
|
||||
%D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \
|
||||
|
|
|
|||
|
|
@ -276,7 +276,8 @@ client and server, a telnet client and server, and an rsh client and server.")
|
|||
(uri (string-append
|
||||
"https://github.com/shadow-maint/shadow/releases/"
|
||||
"download/" version "/shadow-" version ".tar.xz"))
|
||||
(patches (search-patches "shadow-4.4-su-snprintf-fix.patch"))
|
||||
(patches (search-patches "shadow-4.4-su-snprintf-fix.patch"
|
||||
"shadow-CVE-2017-2616.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g7hf55ar2pafg5g3ldx0fwzjk36wf4xb21p4ndanbjm3c2a9ab1"))))
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ streams from live audio.")
|
|||
(define-public ardour
|
||||
(package
|
||||
(name "ardour")
|
||||
(version "5.5")
|
||||
(version "5.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -203,7 +203,7 @@ streams from live audio.")
|
|||
namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
|
||||
(sha256
|
||||
(base32
|
||||
"1a3whv2dhl073pkd803hcp53rdmm31adjwn40qi06lkjb7rgwrlh"))
|
||||
"1fgvjmvdyh61qn8azpmh19ac58ps5sl2dywwshr56v0svakhwwh9"))
|
||||
(file-name (string-append name "-" version))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -416,13 +416,13 @@ detection, and lossless compression.")
|
|||
(define-public borg
|
||||
(package
|
||||
(name "borg")
|
||||
(version "1.0.9")
|
||||
(version "1.0.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "borgbackup" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ciwp9yilcibk0x82y5nn8ps95jrm8rxvff8mjrlp7a2w100i1im"))
|
||||
"1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(for-each
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ can apply to a patch-level 0 Bash."
|
|||
(define-public bash-completion
|
||||
(package
|
||||
(name "bash-completion")
|
||||
(version "2.4")
|
||||
(version "2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -289,7 +289,7 @@ can apply to a patch-level 0 Bash."
|
|||
version "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0"))
|
||||
"1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh"))
|
||||
(patches
|
||||
(search-patches "bash-completion-directories.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
(define-public fio
|
||||
(package
|
||||
(name "fio")
|
||||
(version "2.17")
|
||||
(version "2.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -37,10 +37,10 @@
|
|||
"fio-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kxgad5k2m7y637g3kq8jmhwzlg3c64w9ky7066c5l09bwb6l58h"))))
|
||||
"08kx2mh556xby9saayrbynwrkmh4v8wwrw759nbv025ch3xbw79n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; No tests.
|
||||
'(#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after
|
||||
|
|
|
|||
|
|
@ -84,13 +84,13 @@ data units.")
|
|||
(define-public khal
|
||||
(package
|
||||
(name "khal")
|
||||
(version "0.9.1")
|
||||
(version "0.9.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "khal" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15rxjphjp46lz7gbs39d1ajd9flnhmhqicjh9bjpx3yi5xx4iawr"))))
|
||||
"1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
|||
|
|
@ -314,14 +314,14 @@ no man page, refer to the home page for usage details.")
|
|||
(define-public tomb
|
||||
(package
|
||||
(name "tomb")
|
||||
(version "2.2")
|
||||
(version "2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://files.dyne.org/tomb/"
|
||||
"tomb-" version ".tar.gz"))
|
||||
"Tomb-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11msj38fdmymiqcmwq1883kjqi5zr01ybdjj58rfjjrw4zw2w5y0"))))
|
||||
"1j90ab8x4cf10167yw4cs4frz694gb0qwkhgqiz1ly7mnr8ysmby"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("zsh" ,zsh)
|
||||
|
|
@ -382,7 +382,7 @@ user's graphical desktop.")
|
|||
(define-public scrypt
|
||||
(package
|
||||
(name "scrypt")
|
||||
(version "1.2.0")
|
||||
(version "1.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -390,7 +390,7 @@ user's graphical desktop.")
|
|||
version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p"))))
|
||||
"0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
(define-public curl
|
||||
(package
|
||||
(name "curl")
|
||||
(replacement curl-7.52.1)
|
||||
(replacement curl-7.53.0)
|
||||
(version "7.50.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
|
@ -121,15 +121,15 @@ tunneling, and so on.")
|
|||
"See COPYING in the distribution."))
|
||||
(home-page "https://curl.haxx.se/")))
|
||||
|
||||
(define curl-7.52.1
|
||||
(define curl-7.53.0
|
||||
(package
|
||||
(inherit curl)
|
||||
(source
|
||||
(let ((version "7.52.1"))
|
||||
(let ((version "7.53.0"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.lzma"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r937wplchjxifxqqcjxd9rzp6l9rqqdfjn41x1y4djrh95nsa24")))))))
|
||||
"1k0i31xygb804c61llhin5wbpcscg4gfqmbxcfkpdr1alwh7igrq")))))))
|
||||
|
|
|
|||
|
|
@ -516,7 +516,7 @@ types are supported, as is encryption.")
|
|||
(define-public rocksdb
|
||||
(package
|
||||
(name "rocksdb")
|
||||
(version "5.1.2")
|
||||
(version "5.1.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/rocksdb"
|
||||
|
|
@ -524,7 +524,7 @@ types are supported, as is encryption.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qdbs13al7g45xc2j44wzx0ywrg32q1gsdhk5j6j4952xg91rfmh"))
|
||||
"0ddyj8lh5jk6vx675pdg4jhgs7c12ckw5j31rz85jlrds68ygrry"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages python))
|
||||
|
||||
(define-public radicale
|
||||
|
|
@ -58,14 +59,21 @@ clients.")
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(patches
|
||||
(search-patches "vdirsyncer-test-suite-slow-machines.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
;; vdirsyncer requires itself to be installed in order to build
|
||||
;; the manpage.
|
||||
(replace 'check
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(add-installed-pythonpath inputs outputs)
|
||||
(setenv "DETERMINISTIC_TESTS" "true")
|
||||
(setenv "DAV_SERVER" "radicale")
|
||||
(setenv "REMOTESTORAGE_SERVER" "skip")
|
||||
(zero? (system* "make" "test"))))
|
||||
(add-after 'install 'manpage
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(add-installed-pythonpath inputs outputs)
|
||||
|
|
@ -74,16 +82,7 @@ clients.")
|
|||
"docs/_build/man/vdirsyncer.1"
|
||||
(string-append
|
||||
(assoc-ref outputs "out")
|
||||
"/share/man/man1"))))
|
||||
;; vdirsyncer requires itself to be installed in order to run the test
|
||||
;; suite.
|
||||
(delete 'check)
|
||||
(add-after 'install 'check-later
|
||||
(lambda _
|
||||
(setenv "DETERMINISTIC_TESTS" "true")
|
||||
(setenv "DAV_SERVER" "radicale")
|
||||
(setenv "REMOTESTORAGE_SERVER" "skip")
|
||||
(zero? (system* "make" "test")))))))
|
||||
"/share/man/man1")))))))
|
||||
(native-inputs
|
||||
`(("python-setuptools-scm" ,python-setuptools-scm)
|
||||
("python-sphinx" ,python-sphinx)
|
||||
|
|
|
|||
|
|
@ -139,11 +139,17 @@ tables, and it understands a variety of different formats.")
|
|||
;; no install target
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(man (string-append out "/share/man/man8")))
|
||||
(install-file "gdisk" bin)
|
||||
(install-file "sgdisk" bin)
|
||||
(install-file "cgdisk" bin)
|
||||
(install-file "fixparts" bin)))))))
|
||||
(install-file "fixparts" bin)
|
||||
(install-file "cgdisk.8" man)
|
||||
(install-file "fixparts.8" man)
|
||||
(install-file "gdisk.8" man)
|
||||
(install-file "sgdisk.8" man)))))))
|
||||
(home-page "http://www.rodsbooks.com/gdisk/")
|
||||
(synopsis "Low-level GPT disk partitioning and formatting")
|
||||
(description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that
|
||||
|
|
@ -296,14 +302,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
|
|||
(define-public gparted
|
||||
(package
|
||||
(name "gparted")
|
||||
(version "0.27.0")
|
||||
(version "0.28.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
|
||||
version "/gparted-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1gg7k63jd6128mmzciwqmgixqhyqnninimaqyvjbx1hv0q6gd310"))))
|
||||
(base32 "0cyk8lpimm6wani8khw0szwqkgw5wpq2mfnfxkbgfm2774a1z2bn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; Tests require a network connection.
|
||||
|
|
|
|||
|
|
@ -438,7 +438,7 @@ on stdout instead of using a socket as the Emacsclient does.")
|
|||
(define-public magit
|
||||
(package
|
||||
(name "magit")
|
||||
(version "2.10.1")
|
||||
(version "2.10.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -446,7 +446,7 @@ on stdout instead of using a socket as the Emacsclient does.")
|
|||
version "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a3gsarl0zrk1dydqn93kx7pnwm7pb7av7g17pj5m7b7kc66k7jv"))))
|
||||
"09qcc3a61irxi89x7q82hdy8dk0liiwyz66632wzcd881mhrhx18"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
|
|
@ -574,7 +574,7 @@ support for Git-SVN.")
|
|||
(file-name (string-append "magit-popup-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0s04jnskmggwn69ln05qfwwa32va0q5ri7dwx917wkqz17w5zi62"))))
|
||||
"08b6ypfiq8zavjfq0wcdh26xziwq7rqvvv3lfpib9101146kzx6d"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)))
|
||||
|
|
@ -3410,14 +3410,14 @@ passive voice.")
|
|||
(define-public emacs-org
|
||||
(package
|
||||
(name "emacs-org")
|
||||
(version "20170124")
|
||||
(version "20170210")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/org-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mcnjwvily0xv1xl11dj18lg38llvrxja2j9mwn6vql8n5y1srxi"))))
|
||||
"15415wh3w8d4c8hd7qfrfdjnjb1zppmrkg8cdp7hw2ilyr90c0bn"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://orgmode.org/")
|
||||
(synopsis "Outline-based notes management and organizer")
|
||||
|
|
@ -3501,6 +3501,30 @@ known loosely as deftheme. Many mode-specific customizations are included.")
|
|||
"@code{danneskjold-theme} is a high-contrast theme for Emacs.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-dream-theme
|
||||
(let* ((commit "107a11d74365046f28a1802a2bdb5e69e4a7488b")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-dream-theme")
|
||||
(version (string-append "0.0.0-" revision "." (string-take commit 7)))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/djcb/dream-theme")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0za18nfkq4xqm35k6006vsixcbmvmxqgma4iw5sw37h8vmcsdylk"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/djcb/dream-theme")
|
||||
(synopsis "High-contrast Emacs theme")
|
||||
(description
|
||||
"@code{dream-theme} is a dark, clean theme for Emacs. It is inspired
|
||||
by zenburn, sinburn and similar themes, but slowly diverging from them.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-auto-complete
|
||||
(package
|
||||
(name "emacs-auto-complete")
|
||||
|
|
@ -3790,3 +3814,23 @@ customizable by the user.")
|
|||
Additionally it can display the number of unread emails in the
|
||||
mode-line.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-pretty-mode
|
||||
(package
|
||||
(name "emacs-pretty-mode")
|
||||
(version "2.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/akatov/pretty-mode/"
|
||||
"archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fan7m4vnqs8kpg7r54kx3g7faadkpkf9kzarfv8n57kq8w157pl"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/akatov/pretty-mode")
|
||||
(synopsis "Redisplay parts of the buffer as Unicode symbols")
|
||||
(description
|
||||
"Emacs minor mode for redisplaying parts of the buffer as pretty symbols.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
|||
|
|
@ -526,18 +526,16 @@ interface (API).")
|
|||
(define-public python-pygame
|
||||
(package
|
||||
(name "python-pygame")
|
||||
(version "1.9.1")
|
||||
(version "1.9.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://pygame.org/ftp/pygame-"
|
||||
version "release.tar.gz"))
|
||||
(uri (pypi-uri "pygame" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52"))))
|
||||
"1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:tests? #f ; Tests require pygame to be installed first.
|
||||
`(#:tests? #f ; Tests require pygame to be installed first.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Set the paths to the dependencies manually because
|
||||
|
|
@ -553,6 +551,7 @@ interface (API).")
|
|||
(smpeg-ref (assoc-ref inputs "libsmpeg"))
|
||||
(png-ref (assoc-ref inputs "libpng"))
|
||||
(jpeg-ref (assoc-ref inputs "libjpeg"))
|
||||
(freetype-ref (assoc-ref inputs "freetype"))
|
||||
(v4l-ref (assoc-ref inputs "v4l-utils"))
|
||||
(out-ref (assoc-ref outputs "out")))
|
||||
(substitute* "Setup.in"
|
||||
|
|
@ -582,9 +581,14 @@ interface (API).")
|
|||
(("JPEG = -ljpeg")
|
||||
(string-append "JPEG = -I" jpeg-ref "/include -L"
|
||||
jpeg-ref "/lib -ljpeg")))
|
||||
|
||||
(substitute* "Setup.in"
|
||||
(("FREETYPE = -lfreetype")
|
||||
(string-append "FREETYPE = -I" freetype-ref "/include/freetype2 -L"
|
||||
freetype-ref "/lib -lfreetype")))
|
||||
|
||||
(substitute* "Setup.in"
|
||||
(("^pypm") "#pypm"))
|
||||
(substitute* "src/movie.c")
|
||||
;; Create a path to a header file provided by v4l-utils.
|
||||
(system* "mkdir" "linux")
|
||||
(system* "ln" "--symbolic"
|
||||
|
|
@ -592,7 +596,8 @@ interface (API).")
|
|||
"linux/videodev.h")
|
||||
(system* "ln" "--symbolic" "Setup.in" "Setup")))))))
|
||||
(inputs
|
||||
`(("sdl" ,sdl)
|
||||
`(("freetype" ,freetype)
|
||||
("sdl" ,sdl)
|
||||
("sdl-image" ,sdl-image)
|
||||
("sdl-mixer" ,sdl-mixer)
|
||||
("sdl-ttf" ,sdl-ttf)
|
||||
|
|
@ -619,3 +624,6 @@ to create fully featured games and multimedia programs in the python language.")
|
|||
license:psfl
|
||||
license:public-domain
|
||||
license:lgpl2.1+))))
|
||||
|
||||
(define-public python2-pygame
|
||||
(package-with-python2 python-pygame))
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2016 Rodger Fox <thylakoid@openmailbox.org>
|
||||
;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
|
||||
|
|
@ -175,6 +175,49 @@ You may even apply photos to the faces instead of colors. The game is
|
|||
scriptable with Guile.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public gnushogi
|
||||
(package
|
||||
(name "gnushogi")
|
||||
(version "1.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnushogi/gnushogi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"))))
|
||||
(arguments `(#:tests? #f)) ;; No check target.
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.gnu.org/software/gnushogi/")
|
||||
(synopsis "The game of Shogi (Japanese chess)")
|
||||
(description "GNU Shogi is a program that plays the game Shogi (Japanese
|
||||
Chess). It is similar to standard chess but this variant is far more complicated.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public xshogi
|
||||
(package
|
||||
(name "xshogi")
|
||||
(version "1.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnushogi/xshogi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dns0nhymak44by18sv48m4xb2skiwbi2i3nb9hl6w9iwd2i2brf"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libxaw" ,libxaw)
|
||||
("libxt" ,libxt)))
|
||||
(home-page "http://www.gnu.org/software/gnushogi/")
|
||||
(synopsis "User interface for gnushogi")
|
||||
(description "A graphical user interface for the package @code{gnushogi}.")
|
||||
;; Contains a copy of GPLv3 but the licence notices simply
|
||||
;; state "GNU General Public Licence" without specifying a version.
|
||||
(license license:gpl1+)))
|
||||
|
||||
(define-public abbaye
|
||||
(package
|
||||
(name "abbaye")
|
||||
|
|
@ -1294,7 +1337,7 @@ on the screen and keyboard to display letters.")
|
|||
("ghc-sdl" ,ghc-sdl)
|
||||
("ghc-sdl-image" ,ghc-sdl-image)
|
||||
("ghc-sdl-mixer" ,ghc-sdl-mixer)))
|
||||
(home-page "http://raincat.bysusanlin.com/")
|
||||
(home-page "http://www.bysusanlin.com/raincat/")
|
||||
(synopsis "Puzzle game with a cat in lead role")
|
||||
(description "Project Raincat is a game developed by Carnegie Mellon
|
||||
students through GCS during the Fall 2008 semester. Raincat features game
|
||||
|
|
@ -2082,14 +2125,14 @@ are only two levels to play with, but they are very addictive.")
|
|||
(define-public pioneers
|
||||
(package
|
||||
(name "pioneers")
|
||||
(version "15.3")
|
||||
(version "15.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.sourceforge.net/pio/"
|
||||
"pioneers-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"128s718nnraiznbg2rajjqb7cfkdg24hy6spdd9narb4f4dsbbv9"))))
|
||||
"1p1d18hrfmqcnghip3shkzcs5qkz6j99jvkdkqfi7pqdvjc323cs"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("gtk+" ,gtk+)
|
||||
("librsvg" ,librsvg)
|
||||
|
|
|
|||
|
|
@ -57,7 +57,8 @@
|
|||
focus on accuracy and performance. It uses the International Color
|
||||
Consortium standard (ICC), approved as ISO 15076-1.")
|
||||
(license license:x11)
|
||||
(home-page "http://www.littlecms.com/")))
|
||||
(home-page "http://www.littlecms.com/")
|
||||
(properties '((cpe-name . "little_cms_color_engine")))))
|
||||
|
||||
(define lcms/fixed
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -3972,7 +3972,7 @@ metadata in photo and video files of various formats.")
|
|||
(define-public shotwell
|
||||
(package
|
||||
(name "shotwell")
|
||||
(version "0.25.2")
|
||||
(version "0.25.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
|
@ -3980,7 +3980,7 @@ metadata in photo and video files of various formats.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bih5hr3pvpkx3fck55bnhngn4fl92ryjizc34wb8pwigbkxnaj1"))))
|
||||
"10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(propagated-inputs
|
||||
`(("dconf" ,dconf)))
|
||||
|
|
|
|||
|
|
@ -184,16 +184,14 @@ and support for SSL3 and TLS.")
|
|||
(define-public gnurl
|
||||
(package
|
||||
(name "gnurl")
|
||||
(version "7.52.1")
|
||||
(version "7.53.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
(string-join (string-split version #\.) "_")))
|
||||
(string-append "https://gnunet.org/sites/default/files/"
|
||||
name "-" version-with-underscores ".tar.bz2")))
|
||||
(uri (string-append "https://gnunet.org/sites/default/files/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gn6mvab2vhfj9637ykg1zjzb23fngfnyd24wlgxmjhf49pn334h"))))
|
||||
"1ah2304cm6y7d201vdph170mrwxmg6r72v2zsxzjn0jk68d8kb6d"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ; 1.5 MiB of man3 pages
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
|
||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Petter <petter@mykolab.ch>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -200,7 +200,7 @@ sequential processes (CSP) concurrent programming features added.")
|
|||
(package
|
||||
(inherit go-1.4)
|
||||
(name "go")
|
||||
(version "1.7.4")
|
||||
(version "1.7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -208,7 +208,7 @@ sequential processes (CSP) concurrent programming features added.")
|
|||
name version ".src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k0lnsk5i9swi209wh535lpnpczsh6l8m1pfncmilrdsx48r262c"))))
|
||||
"058q57zmi23rflingzhy1b87yl69mb62ql2psfxqr7q7l89lb0sf"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments go-1.4)
|
||||
((#:phases phases)
|
||||
|
|
@ -282,18 +282,7 @@ sequential processes (CSP) concurrent programming features added.")
|
|||
("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)")
|
||||
("net/lookup_test.go" "(.+)(TestLookupPort.+)")
|
||||
("syscall/exec_linux_test.go"
|
||||
"(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)")
|
||||
;; This test broke when tzdata updated to 2016g:
|
||||
;; https://github.com/golang/go/issues/17276
|
||||
|
||||
;; Applying the upstream patch causes the failure of another
|
||||
;; test, because that test requires upstream's mtimes to be
|
||||
;; preserved, but applying the patch and re-packing the
|
||||
;; tarball causes mtimes to be set to Unix epoch.
|
||||
;; https://github.com/golang/go/issues/17535
|
||||
|
||||
;; TODO Try re-enabling this test for Go > 1.7.3.
|
||||
("time/time_test.go" "(.+)(TestLoadFixed.+)")))
|
||||
"(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)")))
|
||||
|
||||
(substitute* "../misc/cgo/testsanitizers/test.bash"
|
||||
(("(CC=)cc" all var) (string-append var "gcc")))
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ arrays of data.")
|
|||
(define-public gstreamer
|
||||
(package
|
||||
(name "gstreamer")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -107,7 +107,7 @@ arrays of data.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gdnxg5igbhnpjhrzp31w1ww95j805byqd6mj3x29wli54dxrfc5"))))
|
||||
"062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
|
@ -146,7 +146,7 @@ This package provides the core library and elements.")
|
|||
(define-public gst-plugins-base
|
||||
(package
|
||||
(name "gst-plugins-base")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -154,9 +154,11 @@ This package provides the core library and elements.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"040pifl4cgsqqz2si4s1y5khj3zwm39w21siagxwp805swbrcag6"))
|
||||
(patches
|
||||
(search-patches "gst-plugins-base-fix-test-on-32bit.patch"))))
|
||||
"1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn"))
|
||||
; (patches
|
||||
; (search-patches "gst-plugins-base-fix-test-on-32bit.patch"))
|
||||
|
||||
))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(propagated-inputs
|
||||
|
|
@ -203,7 +205,7 @@ for the GStreamer multimedia library.")
|
|||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -212,7 +214,7 @@ for the GStreamer multimedia library.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mar8ss8bvpz699ql4kgndvna8qsv7kj372py4435ffl6hzfj1sf"))))
|
||||
"0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("aalib" ,aalib)
|
||||
|
|
@ -268,14 +270,14 @@ developers consider to have good quality code and correct functionality.")
|
|||
(define-public gst-plugins-bad
|
||||
(package
|
||||
(name "gst-plugins-bad")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rwla1p57yzygb68z2xk5l5kvqzj5w3nxq0davkwk139zd8r6294"))))
|
||||
"0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93"))))
|
||||
(outputs '("out" "doc"))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
@ -345,7 +347,7 @@ par compared to the rest.")
|
|||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
(name "gst-plugins-ugly")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -353,7 +355,7 @@ par compared to the rest.")
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lkb8kznc9wxmhbp7k67b50y27nz8jp2x2flb91xzydz7b89f5f9"))))
|
||||
"0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gst-plugins-base" ,gst-plugins-base)
|
||||
|
|
@ -384,7 +386,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
|||
(define-public gst-libav
|
||||
(package
|
||||
(name "gst-libav")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -392,7 +394,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1aajayv63ardkbmcg7pnh2d87r067325a5wzinwihaw6n5jw2sws"))))
|
||||
"12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--with-system-libav")
|
||||
|
|
@ -422,7 +424,7 @@ compression formats through the use of the libav library.")
|
|||
(define-public python-gst
|
||||
(package
|
||||
(name "python-gst")
|
||||
(version "1.10.3")
|
||||
(version "1.10.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -430,7 +432,7 @@ compression formats through the use of the libav library.")
|
|||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s5437bnk0j5hfg2gwfwq4b68l6vj1lfskxh73v6ikp0vw32vymx"))))
|
||||
"04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; XXX: Factorize python-sitedir with python-build-system.
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
|
||||
;;; Copyright © 2016 Eraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
|
||||
;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -58,6 +59,7 @@
|
|||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages zip)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
|
|
@ -232,7 +234,7 @@ without requiring the source code to be rewritten.")
|
|||
(define-public guile-next
|
||||
(package (inherit guile-2.0)
|
||||
(name "guile-next")
|
||||
(version "2.1.5")
|
||||
(version "2.1.7")
|
||||
(replacement #f)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
|
@ -240,7 +242,7 @@ without requiring the source code to be rewritten.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r9y4hw17dlxahik4zsccfb2f3p2a07wqndfm251bgmam9hln6gi"))
|
||||
"0qf2664bglv5rrj4c99cc7gry7v9x0sqdyzgfg8zi8gm5wbcmqda"))
|
||||
(modules '((guix build utils)))
|
||||
|
||||
;; Remove the pre-built object files. Instead, build everything
|
||||
|
|
@ -322,6 +324,66 @@ applicable."
|
|||
(files '("lib/guile/2.0/site-ccache"
|
||||
"share/guile/site/2.0")))))))
|
||||
|
||||
;; There has not been any release yet.
|
||||
(define-public guildhall
|
||||
(let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "guildhall")
|
||||
(version (string-append "0-" revision "." (string-take commit 9)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ijp/guildhall.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"115bym7bg66h3gs399yb2vkzc2ygriaqsn4zbrg8f054mgy8wzn1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Tests fail without this fix because they try to load the bash
|
||||
;; executable as a Scheme file. See bug report at
|
||||
;; https://github.com/ijp/guildhall/issues/22
|
||||
(add-after 'unpack 'fix-bug-22
|
||||
(lambda _
|
||||
(substitute* "Makefile.am"
|
||||
(("TESTS_ENVIRONMENT=.*")
|
||||
"AM_TESTS_ENVIRONMENT=srcdir=$(abs_top_srcdir)/tests/
|
||||
TEST_EXTENSIONS = .scm
|
||||
SCM_LOG_COMPILER= $(top_builddir)/env $(GUILE)
|
||||
AM_SCM_LOG_FLAGS = --no-auto-compile -s")
|
||||
;; FIXME: one of the database tests fails for unknown
|
||||
;; reasons. It does not fail when run outside of Guix.
|
||||
(("tests/database.scm") ""))
|
||||
#t))
|
||||
(add-before 'configure 'autogen
|
||||
(lambda _
|
||||
(zero? (system* "sh" "autogen.sh")))))))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)))
|
||||
(native-inputs
|
||||
`(("zip" ,zip) ; for tests
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("texinfo" ,texinfo)))
|
||||
(synopsis "Package manager for Guile")
|
||||
(description
|
||||
"Guildhall is a package manager written for Guile Scheme. A guild is
|
||||
an association of independent craftspeople. A guildhall is where they meet.
|
||||
This Guildhall aims to make a virtual space for Guile wizards and journeyfolk
|
||||
to share code.
|
||||
|
||||
On a practical level, Guildhall lets you share Scheme modules and programs
|
||||
over the internet, and install code that has been shared by others. Guildhall
|
||||
can handle dependencies, so when a program requires several libraries, and
|
||||
each of those has further dependencies, all of the prerequisites for the
|
||||
program can be installed in one go.")
|
||||
(home-page "https://github.com/ijp/guildhall")
|
||||
(license license:gpl3+))))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Extensions.
|
||||
|
|
@ -846,10 +908,22 @@ inspired by the SCSH regular expression system.")
|
|||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils)
|
||||
(system base compile))
|
||||
(ice-9 rdelim)
|
||||
(ice-9 popen))
|
||||
|
||||
;; Avoid warnings we can safely ignore
|
||||
(setenv "GUILE_AUTO_COMPILE" "0")
|
||||
|
||||
(let* ((out (assoc-ref %outputs "out"))
|
||||
(module-dir (string-append out "/share/guile/site/2.0"))
|
||||
(effective-version
|
||||
(read-line
|
||||
(open-pipe* OPEN_READ
|
||||
(string-append
|
||||
(assoc-ref %build-inputs "guile")
|
||||
"/bin/guile")
|
||||
"-c" "(display (effective-version))")))
|
||||
(module-dir (string-append out "/share/guile/site/"
|
||||
effective-version))
|
||||
(source (assoc-ref %build-inputs "source"))
|
||||
(doc (string-append out "/share/doc"))
|
||||
(guild (string-append (assoc-ref %build-inputs "guile")
|
||||
|
|
@ -857,7 +931,10 @@ inspired by the SCSH regular expression system.")
|
|||
(gdbm.scm-dest
|
||||
(string-append module-dir "/gdbm.scm"))
|
||||
(gdbm.go-dest
|
||||
(string-append module-dir "/gdbm.go")))
|
||||
(string-append module-dir "/gdbm.go"))
|
||||
(compile-file
|
||||
(lambda (in-file out-file)
|
||||
(system* guild "compile" "-o" out-file in-file))))
|
||||
;; Make installation directories.
|
||||
(mkdir-p module-dir)
|
||||
(mkdir-p doc)
|
||||
|
|
@ -875,8 +952,7 @@ inspired by the SCSH regular expression system.")
|
|||
(assoc-ref %build-inputs "gdbm"))))
|
||||
|
||||
;; compile to the destination
|
||||
(compile-file gdbm.scm-dest
|
||||
#:output-file gdbm.go-dest)))))
|
||||
(compile-file gdbm.scm-dest gdbm.go-dest)))))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)))
|
||||
(propagated-inputs
|
||||
|
|
@ -1580,6 +1656,38 @@ library for GNU Guile based on the actor model.
|
|||
Note that 8sync is only available for Guile 2.2 (guile-next in Guix).")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-fibers
|
||||
(package
|
||||
(name "guile-fibers")
|
||||
(version "1.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://wingolog.org/pub/fibers/fibers-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("guile" ,guile-next)))
|
||||
(synopsis "Lightweight concurrency facility for Guile")
|
||||
(description
|
||||
"Fibers is a Guile library that implements a a lightweight concurrency
|
||||
facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is
|
||||
like a \"goroutine\" from the Go language: a lightweight thread-like
|
||||
abstraction. Systems built with Fibers can scale up to millions of concurrent
|
||||
fibers, tens of thousands of concurrent socket connections, and many parallel
|
||||
cores. The Fibers library also provides Concurrent ML-like channels for
|
||||
communication between fibers.
|
||||
|
||||
Note that Fibers makes use of some Guile 2.1/2.2-specific features and
|
||||
is not available for Guile 2.0.")
|
||||
(home-page "https://github.com/wingo/fibers")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-git
|
||||
(let ((revision "0")
|
||||
(commit "969514aa7224217bc3c1a4c5312a9469ac5f13d5"))
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@
|
|||
(and (string-suffix? "-gnu" triplet)
|
||||
(not (string-contains triplet "linux"))))
|
||||
|
||||
(define (gnumach-source-url version)
|
||||
(string-append "mirror://gnu/gnumach/gnumach-"
|
||||
version ".tar.gz"))
|
||||
|
||||
(define-public gnumach-headers
|
||||
(package
|
||||
(name "gnumach-headers")
|
||||
|
|
@ -42,8 +46,7 @@
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnumach/gnumach-"
|
||||
version ".tar.gz"))
|
||||
(uri (gnumach-source-url version))
|
||||
(sha256
|
||||
(base32
|
||||
"02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
(define-public feh
|
||||
(package
|
||||
(name "feh")
|
||||
(version "2.18")
|
||||
(version "2.18.2")
|
||||
(home-page "https://feh.finalrewind.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"036lgv81d0vmrnmh1z1x360nr5avb2sk5jb1h3g5n6jijm8vzblx"))))
|
||||
"09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (alist-delete 'configure %standard-phases)
|
||||
|
|
|
|||
|
|
@ -46,14 +46,14 @@
|
|||
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||
;; users are ready for the 7-series API.
|
||||
(version "6.9.7-7")
|
||||
(version "6.9.7-9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02x463z31j449pfm8czb7jlpkd3nx4a3yyjxq3bhpjfq13i20d62"))))
|
||||
"1fqvi6h96mfbyw292awiwsqs449sjmw6i9ib53c66nnq1zchw7l3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
|
|
@ -162,11 +162,12 @@ script.")
|
|||
(license (package-license imagemagick))))
|
||||
|
||||
(define-public graphicsmagick
|
||||
(let ((changeset "56c8cae") ; 3e01b
|
||||
(revision "1"))
|
||||
(let ((changeset "6156b4c2992d855ece6079653b3b93c3229fc4b8")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "graphicsmagick")
|
||||
(version (string-append "1.3.25-" revision "." changeset))
|
||||
(version (string-append "1.3.25-" revision "."
|
||||
(string-take changeset 7)))
|
||||
(source (origin
|
||||
(method hg-fetch)
|
||||
(uri (hg-reference
|
||||
|
|
@ -179,7 +180,7 @@ script.")
|
|||
;; "/GraphicsMagick-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s9apvkn0kxr6i4i5wlkfw1prja02rgk689n3cf822zc0dkycxdh"))))
|
||||
"08yfsn8mrqkwpax43vv1crfr55rcf004wwpzsinr5c6m0asqr08b"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
(define-public inkscape
|
||||
(package
|
||||
(name "inkscape")
|
||||
(version "0.92.0")
|
||||
(version "0.92.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://media.inkscape.org/dl/"
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
"inkscape-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q"))))
|
||||
"01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("aspell" ,aspell)
|
||||
|
|
|
|||
|
|
@ -783,7 +783,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public icedtea-7
|
||||
(let* ((version "2.6.8")
|
||||
(let* ((version "2.6.9")
|
||||
(drop (lambda (name hash)
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -800,7 +800,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p95402viz6dnfkhhn18hrvm7wqfvij0xnxvp9nqj3aq3gzk0h45"))
|
||||
"1slmajiakq7sk137vgqq9c93r5s620a46lw2jwbnzxhysjw3wkwf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(substitute* "Makefile.in"
|
||||
|
|
@ -927,25 +927,25 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
|||
(native-inputs
|
||||
`(("openjdk-src"
|
||||
,(drop "openjdk"
|
||||
"1qscircx5z9rnyx4k6lzxbrl5q6f9shag962zl0f52cyrcma5gp6"))
|
||||
"08a4d1sg5m9l99lc7gafc7dmzmf4d8jvij5pffxv8rf6pk7psk24"))
|
||||
("corba-drop"
|
||||
,(drop "corba"
|
||||
"0f25l1db5v9ib4v5wb32wjblb2zzx8f8qgr2g84yg26aq2m8swig"))
|
||||
"12br49cfrqgvms0bnaij7fvnakvb6q8dlpqja64rg5q5r3x4gps8"))
|
||||
("jaxp-drop"
|
||||
,(drop "jaxp"
|
||||
"1z4i404i3rrf5zmch8z2rslqm7vs1wzjhvjf6kgkdvnrka7a86xs"))
|
||||
"07v2y3pll6z2wma94qilgffwyn2n4jna01mrhqwkb27whfpjfkmz"))
|
||||
("jaxws-drop"
|
||||
,(drop "jaxws"
|
||||
"06h49jgf76408j1qhhkksly8fbyw1wisyvgi1csvj2f63bkr6c3m"))
|
||||
"18rw64jjpq14v56d0q1xvz8knl0kf02rcday7fvlaxrbbj19km55"))
|
||||
("jdk-drop"
|
||||
,(drop "jdk"
|
||||
"0qg76gjlnyrjskzz019fi47vqdxpa51sdhcyx4lsa25j5vsih4gc"))
|
||||
"1ig7xipi3vzm6cphy5fdraxi72p27xsg2qb51yqx9qwsmlrv1zj4"))
|
||||
("langtools-drop"
|
||||
,(drop "langtools"
|
||||
"04w82l34z83n8cd901bvmlrdk825nw5ijgny5cn1idnhplzcckh0"))
|
||||
"0sn9qv9nnhaan2smbhrv54lfhwsjhgd3b3h736p5d2hzpw8kicry"))
|
||||
("hotspot-drop"
|
||||
,(drop "hotspot"
|
||||
"153i1panv3mzwh39dc8rxr9hj5920y86a4m8djxsk6qnyd4gamfa"))
|
||||
"16ijxy8br8dla339m4i90wr9xpf7s8z3nrhfyxm7jahr8injpzyl"))
|
||||
,@(fold alist-delete (package-native-inputs icedtea-6)
|
||||
'("openjdk6-src"))))
|
||||
(inputs
|
||||
|
|
|
|||
|
|
@ -27,17 +27,17 @@
|
|||
(define-public jemalloc
|
||||
(package
|
||||
(name "jemalloc")
|
||||
(version "4.2.0")
|
||||
(version "4.4.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.canonware.com/download/jemalloc/"
|
||||
name "-" version ".tar.bz2"))
|
||||
"https://github.com/jemalloc/jemalloc/releases/download/"
|
||||
version "/jemalloc-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jvasihaizawz44j02bri47bd905flns03nkigipys81p6pds5mj"))))
|
||||
"0cxhhybcbi02szavlxzwhvmqvddi7kgy71qxz2nz3lhqjwzadbm7"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.canonware.com/jemalloc/")
|
||||
(home-page "http://jemalloc.net/")
|
||||
(synopsis "General-purpose scalable concurrent malloc implementation")
|
||||
(description
|
||||
"This library providing a malloc(3) implementation that emphasizes
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ and freshness without requiring additional information from the user.")
|
|||
(define-public ldc-bootstrap
|
||||
(package
|
||||
(name "ldc")
|
||||
(version "0.17.2")
|
||||
(version "0.17.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -86,7 +86,7 @@ and freshness without requiring additional information from the user.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0iksl6cvhsiwnlh15b7s9v8f3grxk27jn0vja9n4sad7fvfwmmlc"))))
|
||||
"135rgwwk82ccqp4n3fhqz4696jmvip90fg5ql2kccq5h1r71gb82"))))
|
||||
(build-system cmake-build-system)
|
||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
|
||||
(arguments
|
||||
|
|
@ -140,7 +140,7 @@ and freshness without requiring additional information from the user.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07hh3ic3r755mq9hn9gfr0wlc5y8cr91xz2ydb6gqy4zy8jgp5s9"))
|
||||
"0qywnvnp019mmmr74aw90ir9f03iz0hc7cgzna609agsar0b27jl"))
|
||||
(patches (search-patches "ldc-disable-tests.patch"))))
|
||||
("druntime-src"
|
||||
,(origin
|
||||
|
|
@ -150,7 +150,7 @@ and freshness without requiring additional information from the user.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m1dhday9dl3s04njmd29z7ism2xn2ksb9qlrwzykdgz27b3dk6x"))))
|
||||
"0z418n6x2fxac07sxpi4rl69069qiym4w6r9sjppn91q58qh8hjs"))))
|
||||
("dmd-testsuite-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -159,7 +159,7 @@ and freshness without requiring additional information from the user.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n7gvalxwfmia4gag53r9qhcnk2cqrw3n4icj1yri0zkgc27pm60"))))))
|
||||
"196mkfax5y3yqm3gz7jhqhnkjwrvr2m4a8nc9k41l0511ldzsk9x"))))))
|
||||
(home-page "http://wiki.dlang.org/LDC")
|
||||
(synopsis "LLVM compiler for the D programming language")
|
||||
(description
|
||||
|
|
@ -181,7 +181,7 @@ latest DMD frontend and uses LLVM as backend.")
|
|||
(package
|
||||
(inherit ldc-bootstrap)
|
||||
(name "ldc")
|
||||
(version "1.1.0")
|
||||
(version "1.1.1")
|
||||
;; Beta version needed to compile various scientific tools that require
|
||||
;; the newer beta versions, and won't compile successfully with the
|
||||
;; older stable version.
|
||||
|
|
@ -193,7 +193,7 @@ latest DMD frontend and uses LLVM as backend.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10zkrmx9bcmhfxvgykm3fkjamzc8js96wm032bv0fyil5c9ja2y1"))))
|
||||
"0yjiwg8pnlm2286bwdkwasaqw6ys7lymrqvhh5xyb1adha1ndcav"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
(define-public ola
|
||||
(package
|
||||
(name "ola")
|
||||
(version "0.10.2")
|
||||
(version "0.10.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
(patches (search-patches "ola-readdir-r.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"09zx1c8nkj29shfdzkahrh9397m3mwnsy0gj7jrb63f89f3n2vlq"))))
|
||||
"1yf1yy9n64n73zjq2bwc0gik0dd3n05297hdrrma2qvb0imzm5h1"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -338,8 +338,8 @@ It has been modified to remove all non-free binary blobs.")
|
|||
|
||||
(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
|
||||
|
||||
(define %linux-libre-version "4.9.9")
|
||||
(define %linux-libre-hash "0grk94jym0wz581c7pimia0rszq4h2xqjmf818i4l4qrjd0bnqvk")
|
||||
(define %linux-libre-version "4.10")
|
||||
(define %linux-libre-hash "167zzgkivpqsp07did25wjqsswddzp3gifcdkq7xk00llxlmspla")
|
||||
|
||||
(define-public linux-libre
|
||||
(make-linux-libre %linux-libre-version
|
||||
|
|
@ -347,9 +347,15 @@ It has been modified to remove all non-free binary blobs.")
|
|||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.9
|
||||
(make-linux-libre "4.9.13"
|
||||
"16miggwcwfpm7kx0yz256x887rky9wgmp1grg850lf8sdkiz0a1p"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.4
|
||||
(make-linux-libre "4.4.48"
|
||||
"0g7ram0b5b7p0c6v5m5im6m5pwa348mhkhf67rs036lzvcw1bvyk"
|
||||
(make-linux-libre "4.4.52"
|
||||
"1fzcq9bbsxiij2fh6kgwrp417sy2j5gnbzs0wwlmznj7mvysl7qg"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
|
|
@ -357,7 +363,17 @@ It has been modified to remove all non-free binary blobs.")
|
|||
(make-linux-libre "4.1.38"
|
||||
"165kmzglhg63hn7y4q7r6cb2dpsljxiq1czvgyx0bkd1vd2bcvsa"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
#:configuration-file kernel-config
|
||||
#:patches
|
||||
(list %boot-logo-patch
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "\
|
||||
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4")
|
||||
(file-name "linux-libre-CVE-2017-6074.patch")
|
||||
(sha256
|
||||
(base32
|
||||
"1x40slfz1qxgiaznyy13bwlh34450pkyyrkljpyjlx6c4mrzb1jj"))))))
|
||||
|
||||
(define-public linux-libre-arm-generic
|
||||
(make-linux-libre %linux-libre-version
|
||||
|
|
@ -459,6 +475,7 @@ providing the system administrator with some help in common tasks.")
|
|||
(define-public util-linux
|
||||
(package
|
||||
(name "util-linux")
|
||||
(replacement util-linux/fixed)
|
||||
(version "2.28.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
|
@ -539,6 +556,17 @@ block devices, UUIDs, TTYs, and many other tools.")
|
|||
(license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+
|
||||
license:bsd-4 license:public-domain))))
|
||||
|
||||
(define util-linux/fixed
|
||||
(package
|
||||
(inherit util-linux)
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source util-linux))
|
||||
(patches
|
||||
(append
|
||||
(origin-patches (package-source util-linux))
|
||||
(search-patches "util-linux-CVE-2017-2616.patch")))))))
|
||||
|
||||
(define-public procps
|
||||
(package
|
||||
(name "procps")
|
||||
|
|
@ -805,17 +833,25 @@ images more compressible.")
|
|||
(define-public strace
|
||||
(package
|
||||
(name "strace")
|
||||
(version "4.7")
|
||||
(version "4.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/strace/strace/" version
|
||||
"/strace-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764"))))
|
||||
"1vzhmpcy989i4k12q4cc438yal2ghhm6x7ychscjbhcf2yspqj4q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-/bin/sh
|
||||
(lambda _
|
||||
(substitute* "strace.c"
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t)))))
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(home-page "http://strace.sourceforge.net/")
|
||||
(home-page "https://strace.io/")
|
||||
(synopsis "System call tracer for Linux")
|
||||
(description
|
||||
"strace is a system call tracer, i.e. a debugging tool which prints out a
|
||||
|
|
@ -1007,7 +1043,7 @@ packet filter.")
|
|||
(define-public iproute
|
||||
(package
|
||||
(name "iproute2")
|
||||
(version "4.9.0")
|
||||
(version "4.10.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -1015,7 +1051,7 @@ packet filter.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0"))))
|
||||
"1a59y1zkddvr7z0lh2y9iasbh9wpfc1n39p56xcd6jkhzk0y3c92"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
|
|
@ -1024,6 +1060,7 @@ packet filter.")
|
|||
(string-append "BASH_COMPDIR=" out
|
||||
"/etc/bash_completion.d")
|
||||
(string-append "LIBDIR=" out "/lib")
|
||||
(string-append "HDRDIR=" out "/include")
|
||||
(string-append "SBINDIR=" out "/sbin")
|
||||
(string-append "CONFDIR=" out "/etc")
|
||||
(string-append "DOCDIR=" out "/share/doc/"
|
||||
|
|
|
|||
|
|
@ -283,18 +283,6 @@ communication. It takes an already established TCP connection and creates a
|
|||
secure session between the peers.")
|
||||
(license (package-license lua-5.1))))
|
||||
|
||||
(define-public lua5.1-sec-0.5
|
||||
(package
|
||||
(inherit lua5.1-sec)
|
||||
(version "0.5.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/brunoos/luasec/archive/"
|
||||
"luasec-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01llf5bcrjmqqy6m65avqkajz7h79rvkka6rd131kwr10n75yp3d"))))))
|
||||
|
||||
(define-public lua-lgi
|
||||
(package
|
||||
(name "lua-lgi")
|
||||
|
|
|
|||
|
|
@ -504,20 +504,21 @@ and a QP solver.")
|
|||
(define-public dlib
|
||||
(package
|
||||
(name "dlib")
|
||||
(version "19.1")
|
||||
(version "19.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://dlib.net/files/dlib-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p2pvcdalc6jhb6r99ybvjd9x74sclr0ngswdg9j2xl5pj7knbr4"))
|
||||
"0gfy83av717qymv53yv7ki6mgh6mdw4xcxxbjk8lrs72f8qvnrcw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete ~13MB of bundled dependencies.
|
||||
(delete-file-recursively "dlib/external")
|
||||
(delete-file-recursively "docs/dlib/external")))))
|
||||
(delete-file-recursively "docs/dlib/external")
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -532,8 +533,7 @@ and a QP solver.")
|
|||
(add-after 'disable-asserts 'disable-failing-tests
|
||||
(lambda _
|
||||
;; One test times out on MIPS, so we need to disable it.
|
||||
;; The rest is known to fail on non-x86_64 platforms in the current release.
|
||||
;; Some have been fixed in git; this list should be readjusted next update.
|
||||
;; Others are flaky on some platforms.
|
||||
(let* ((system ,(or (%current-target-system)
|
||||
(%current-system)))
|
||||
(disabled-tests (cond
|
||||
|
|
@ -541,17 +541,16 @@ and a QP solver.")
|
|||
'("object_detector" ; timeout
|
||||
"data_io"))
|
||||
((string-prefix? "armhf" system)
|
||||
'("learning_to_track" "max_cost_assignment"))
|
||||
'("learning_to_track"))
|
||||
((string-prefix? "i686" system)
|
||||
'("optimization" "matrix2" "mpc"))
|
||||
'("optimization"))
|
||||
(else '()))))
|
||||
;; The following test fails due a bug in openblas < 0.2.18.
|
||||
(append! disabled-tests '("empirical_map"))
|
||||
(for-each
|
||||
(lambda (test)
|
||||
(substitute* "dlib/test/makefile"
|
||||
(((string-append "SRC \\+= " test "\\.cpp")) "")) #t)
|
||||
disabled-tests))))
|
||||
(((string-append "SRC \\+= " test "\\.cpp")) "")))
|
||||
disabled-tests)
|
||||
#t)))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; No test target, so we build and run the unit tests here.
|
||||
|
|
@ -562,7 +561,9 @@ and a QP solver.")
|
|||
(zero? (system* "./dtest" "--runall")))))))
|
||||
(add-after 'install 'delete-static-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(delete-file (string-append (assoc-ref outputs "out") "/lib/libdlib.a")))))))
|
||||
(delete-file (string-append (assoc-ref outputs "out")
|
||||
"/lib/libdlib.a"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ operating systems.")
|
|||
(package
|
||||
(inherit mutt)
|
||||
(name "neomutt")
|
||||
(version "20170113")
|
||||
(version "20170225")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -263,7 +263,7 @@ operating systems.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cqr77q263b5qcmdw6g0qixdpk6gmzgzpa03v226nr55v2ips9jg"))))
|
||||
"00ll35g9pcanzrxsjp09vrmq6flml249dipcznrq2z4jy2zd386p"))))
|
||||
(inputs
|
||||
`(("cyrus-sasl" ,cyrus-sasl)
|
||||
("gdbm" ,gdbm)
|
||||
|
|
|
|||
|
|
@ -93,6 +93,29 @@
|
|||
#:use-module (gnu packages zip)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public aris
|
||||
(package
|
||||
(name "aris")
|
||||
(version "2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/" name "/" name "-" version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"1q1887ryqdr9sn0522hc7p16kqwlxxyz5dkmma8ar2nxplhgll7q"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("gtk+" ,gtk+)
|
||||
("libxml2" ,libxml2)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(synopsis "Natural deduction first-order logic interface")
|
||||
(description "Aris is a program for performing logical proofs. It supports
|
||||
propositional and predicate logic, as well as Boolean algebra and
|
||||
arithmetical logic. In addition to its predefined inference and equivalence
|
||||
rules, Aris also supports references to older proofs. Its use of standard
|
||||
logical symbols and its natural deduction interface make it easy to use for
|
||||
beginners.")
|
||||
(license license:gpl3+)
|
||||
(home-page "http://www.gnu.org/software/aris/")))
|
||||
|
||||
(define-public c-graph
|
||||
(package
|
||||
(name "c-graph")
|
||||
|
|
|
|||
|
|
@ -495,14 +495,14 @@ end-to-end encryption support; XML console.")
|
|||
(define-public prosody
|
||||
(package
|
||||
(name "prosody")
|
||||
(version "0.9.10")
|
||||
(version "0.9.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://prosody.im/downloads/source/"
|
||||
"prosody-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8"))))
|
||||
"139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" target
|
||||
|
|
@ -572,8 +572,7 @@ end-to-end encryption support; XML console.")
|
|||
("lua5.1-expat" ,lua5.1-expat)
|
||||
("lua5.1-socket" ,lua5.1-socket)
|
||||
("lua5.1-filesystem" ,lua5.1-filesystem)
|
||||
;; See <https://prosody.im/doc/depends#luasec>.
|
||||
("lua5.1-sec" ,lua5.1-sec-0.5)))
|
||||
("lua5.1-sec" ,lua5.1-sec)))
|
||||
(home-page "https://prosody.im/")
|
||||
(synopsis "Jabber (XMPP) server")
|
||||
(description "Prosody is a modern XMPP communication server. It aims to
|
||||
|
|
|
|||
|
|
@ -1767,14 +1767,14 @@ computer's keyboard.")
|
|||
(define-public qtractor
|
||||
(package
|
||||
(name "qtractor")
|
||||
(version "0.8.0")
|
||||
(version "0.8.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.sourceforge.net/qtractor/"
|
||||
"qtractor-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17v563liyqcvil204ry1qfp09d91944nqz2ig33f5c3pyg4z2427"))))
|
||||
"1pvs9r5ykfaci900p0kz2xc5xsrswnwwbcl2chsvd98f1ns4vwds"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:tests? #f)) ; no "check" target
|
||||
(inputs
|
||||
|
|
@ -1794,7 +1794,7 @@ computer's keyboard.")
|
|||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://qtractor.sourceforge.net/")
|
||||
(home-page "http://qtractor.org/")
|
||||
(synopsis "Audio/MIDI multi-track sequencer")
|
||||
(description
|
||||
"Qtractor is an Audio/MIDI multi-track sequencer application. It uses
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ and up to 1 Mbit/s downstream.")
|
|||
(define-public whois
|
||||
(package
|
||||
(name "whois")
|
||||
(version "5.2.14")
|
||||
(version "5.2.15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -438,7 +438,7 @@ and up to 1 Mbit/s downstream.")
|
|||
name "_" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lmh7168yby1ma8r1svgvmv9hbgjyniy9c64r6lby3zdmd0sy7d4"))))
|
||||
"123ingf699javzh8qm6ny10nl28zbjzasa4k5pcn0qzw1dlnnnks"))))
|
||||
(build-system gnu-build-system)
|
||||
;; TODO: unbundle mkpasswd binary + its po files.
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -2025,3 +2025,258 @@ structured values at speeds sufficient to saturate a gigabit connection. The
|
|||
protocol is also heavily optimized for size, making it ideal for long-term
|
||||
storage of large amounts of data.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-fieldslib
|
||||
(package
|
||||
(name "ocaml-fieldslib")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "fieldslib" version
|
||||
"1rm3bn54bzk2hlq8f3w067ak8s772w4a8f78i3yh79vxfzq8ncvv"))
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/fieldslib/")
|
||||
(synopsis "Syntax extension to record fields")
|
||||
(description "Syntax extension to define first class values representing
|
||||
record fields, to get and set record fields, iterate and fold over all fields
|
||||
of a record and create new record values.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-ppx-core
|
||||
(package
|
||||
(name "ocaml-ppx-core")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "ppx_core" version
|
||||
"0f69l4czhgssnhb5ds2j9dbqjyz8dp1y3i3x0i4h6pxnms20zbxa"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)))
|
||||
(inputs `(("ppx-tools" ,ocaml-ppx-tools)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_core/")
|
||||
(synopsis "Standard library for ppx rewriters")
|
||||
(description "Ppx_core is a standard library for OCaml AST transformers.
|
||||
It contains:
|
||||
@enumerate
|
||||
@item various auto-generated AST traversal using an open recursion scheme
|
||||
@item helpers for building AST fragments
|
||||
@item helpers for matching AST fragments
|
||||
@item a framework for dealing with attributes and extension points.
|
||||
@end enumerate")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-ppx-optcomp
|
||||
(package
|
||||
(name "ocaml-ppx-optcomp")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "ppx_optcomp" version
|
||||
"13an8p2r7sd0d5lv54mlzrxdni47408bwqi3bjcx4m6005170q30"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)))
|
||||
(propagated-inputs
|
||||
`(("ppx-tools" ,ocaml-ppx-tools)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_optcomp/")
|
||||
(synopsis "Optional compilation for OCaml")
|
||||
(description "Ppx_optcomp stands for Optional Compilation. It is a tool
|
||||
used to handle optional compilations of pieces of code depending of the word
|
||||
size, the version of the compiler, ...")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-ppx-driver
|
||||
(package
|
||||
(name "ocaml-ppx-driver")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "ppx_driver" version
|
||||
"011zzr45897j49b7iiybb29k7pspcx36mlnp7nh6pxb8b0ga76fh"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)
|
||||
("ppx-optcomp" ,ocaml-ppx-optcomp)))
|
||||
(propagated-inputs
|
||||
`(("ppx-optcomp" ,ocaml-ppx-optcomp)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_driver/")
|
||||
(synopsis "Feature-full driver for OCaml AST transformers")
|
||||
(description "A driver is an executable created from a set of OCaml AST
|
||||
transformers linked together with a command line frontend. The aim is to
|
||||
provide a tool that can be used to:
|
||||
@enumerate
|
||||
@item easily view the pre-processed version of a file, no need to construct a
|
||||
complex command line: @command{ppx file.ml} will do
|
||||
@item use a single executable to run several transformations: no need to fork
|
||||
many times just for pre-processing
|
||||
@item improved errors for misspelled/misplaced attributes and extension points.
|
||||
@end enumerate")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-cppo
|
||||
(package
|
||||
(name "ocaml-cppo")
|
||||
(version "1.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mjambon/cppo/archive/v" version
|
||||
".tar.gz"))
|
||||
(sha256 (base32
|
||||
"02gma6nw09vfnd6h7bl3n70lwz7m9z2svplxyfh6h5bf4lqgqzjv"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
#:make-flags (list (string-append "BINDIR="
|
||||
(assoc-ref %outputs "out") "/bin"))
|
||||
#:tests? #f))
|
||||
(home-page "https://github.com/mjambon/cppo")
|
||||
(synopsis "Equivalent of the C preprocessor for OCaml programs")
|
||||
(description "Cppo is an equivalent of the C preprocessor for OCaml
|
||||
programs. It allows the definition of simple macros and file inclusion. Cpp ois:
|
||||
@enumerate
|
||||
@item more OCaml-friendly than cpp
|
||||
@item easy to learn without consulting a manual
|
||||
@item reasonably fast
|
||||
@item simple to install and to maintain.
|
||||
@end enumerate")
|
||||
(license license:bsd-3)))
|
||||
|
||||
;; this package is not reproducible. This is related to temporary filenames
|
||||
;; such as findlib_initxxxxx where xxxxx is random.
|
||||
(define-public ocaml-ppx-deriving
|
||||
(package
|
||||
(name "ocaml-ppx-deriving")
|
||||
(version "4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/whitequark/ppx_deriving//archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"1fr16g121j6zinwcprzlhx2py4271n9jzs2m9hq2f3qli2b1p0vl"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("cppo" ,ocaml-cppo)
|
||||
("ounit" ,ocaml-ounit)
|
||||
("opam" ,opam)))
|
||||
(propagated-inputs
|
||||
`(("result" ,ocaml-result)
|
||||
("ppx-tools" ,ocaml-ppx-tools)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'install 'fix-environment
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; the installation procedures looks for the installed module
|
||||
(setenv "OCAMLPATH"
|
||||
(string-append (getenv "OCAMLPATH") ":"
|
||||
(getenv "OCAMLFIND_DESTDIR"))))))))
|
||||
(home-page "https://github.com/whitequark/ppx_deriving/")
|
||||
(synopsis "Type-driven code generation for OCaml >=4.02")
|
||||
(description "Ppx_deriving provides common infrastructure for generating
|
||||
code based on type definitions, and a set of useful plugins for common tasks.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ocaml-ppx-type-conv
|
||||
(package
|
||||
(name "ocaml-ppx-type-conv")
|
||||
(version "113.33.03")
|
||||
(source
|
||||
(janestreet-origin "ppx_type_conv" version
|
||||
"1sp602ads2f250nv4d4rgw54d14k7flyhb4w8ff084f657hhmxv2"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)))
|
||||
(propagated-inputs
|
||||
`(("ppx-deriving" ,ocaml-ppx-deriving)
|
||||
("ppx-tools" ,ocaml-ppx-tools)
|
||||
("result" ,ocaml-result)
|
||||
("ppx-core" ,ocaml-ppx-core)
|
||||
("ppx-driver" ,ocaml-ppx-driver)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_type_conv/")
|
||||
(synopsis "Support Library for type-driven code generators")
|
||||
(description "The type_conv library factors out functionality needed by
|
||||
different preprocessors that generate code from type specifications.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-ppx-inline-test
|
||||
(package
|
||||
(name "ocaml-ppx-inline-test")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "ppx_inline_test" version
|
||||
"0859ni43fl39dd5g6cxfhq0prxmx59bd2bfq8jafp593ba4q0icq"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(propagated-inputs
|
||||
`(("ppx-driver" ,ocaml-ppx-driver)
|
||||
("ppx-tools" ,ocaml-ppx-tools)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_inline_test/")
|
||||
(synopsis "Syntax extension for writing in-line tests in ocaml code")
|
||||
(description "Syntax extension for writing in-line tests in ocaml code.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-ppx-bench
|
||||
(package
|
||||
(name "ocaml-ppx-bench")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "ppx_bench" version
|
||||
"1hky3y17qpb925rymf97wv54di9gaqdmkix7wpkjw14qzl512b68"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(propagated-inputs
|
||||
`(("ppx-driver" ,ocaml-ppx-driver)
|
||||
("ppx-tools" ,ocaml-ppx-tools)
|
||||
("ppx-inline-test" ,ocaml-ppx-inline-test)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_bench/")
|
||||
(synopsis "Syntax extension for writing in-line benchmarks in ocaml code")
|
||||
(description "Syntax extension for writing in-line benchmarks in ocaml code.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocaml-ppx-compare
|
||||
(package
|
||||
(name "ocaml-ppx-compare")
|
||||
(version "113.33.03")
|
||||
(source (janestreet-origin "ppx_compare" version
|
||||
"0bfhi33kq9l4q6zzc6svki2csracz5j4731c3npcy6cs73jynn0z"))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml-js-build-tools)
|
||||
("opam" ,opam)
|
||||
("ppx-core" ,ocaml-ppx-core)))
|
||||
(propagated-inputs
|
||||
`(("ppx-driver" ,ocaml-ppx-driver)
|
||||
("ppx-tools" ,ocaml-ppx-tools)
|
||||
("ppx-core" ,ocaml-ppx-core)
|
||||
("ppx-type-conv" ,ocaml-ppx-type-conv)))
|
||||
(arguments janestreet-arguments)
|
||||
(home-page "https://github.com/janestreet/ppx_compare/")
|
||||
(synopsis "Generation of comparison functions from types")
|
||||
(description "Generation of fast comparison functions from type expressions
|
||||
and definitions. Ppx_compare is a ppx rewriter that derives comparison functions
|
||||
from type representations. The scaffolded functions are usually much faster
|
||||
than ocaml's Pervasives.compare. Scaffolding functions also gives you more
|
||||
flexibility by allowing you to override them for a specific type and more safety
|
||||
by making sure that you only compare comparable values.")
|
||||
(license license:asl2.0)))
|
||||
|
|
|
|||
|
|
@ -445,13 +445,13 @@ transactions from C or Python.")
|
|||
(define-public diffoscope
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version "63")
|
||||
(version "77")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12q5d2nszql1g4jf2ss863v0wpvvhrkaivqzhy6af9m9zwvw0p0k"))))
|
||||
"0wrb6pl88611frxj19kq3vikhbld40fy1ncrskb1iayxsmbfcbn9"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
@ -464,12 +464,7 @@ transactions from C or Python.")
|
|||
(("'python-magic',") ""))))
|
||||
(add-after 'unpack 'embed-tool-references
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "diffoscope/difference.py"
|
||||
(("@tool_required\\('colordiff'\\)") "")
|
||||
(("\\[\"colordiff\"")
|
||||
(string-append "[\"" (which "colordiff") "\"")))
|
||||
(substitute* "diffoscope/comparators/utils.py"
|
||||
(("@tool_required\\('xxd'\\)") "")
|
||||
(substitute* "diffoscope/comparators/utils/compare.py"
|
||||
(("\\['xxd',")
|
||||
(string-append "['" (which "xxd") "',")))
|
||||
(substitute* "diffoscope/comparators/elf.py"
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
This fixes a test failure on i686.
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=5e2e111627871c566ffc6607eda8f4ef4699d040
|
||||
|
||||
From 5e2e111627871c566ffc6607eda8f4ef4699d040 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Thu, 2 Feb 2017 14:56:39 +0200
|
||||
Subject: [PATCH] multifdsink: Make sure to use a 64 bit integer for the
|
||||
units-max property
|
||||
|
||||
---
|
||||
tests/check/elements/multifdsink.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/check/elements/multifdsink.c b/tests/check/elements/multifdsink.c
|
||||
index af138cc92..951b1b9fa 100644
|
||||
--- a/tests/check/elements/multifdsink.c
|
||||
+++ b/tests/check/elements/multifdsink.c
|
||||
@@ -869,7 +869,7 @@ GST_START_TEST (test_client_kick)
|
||||
gint i, initial_buffers = 3, num_buffers = 0;
|
||||
|
||||
sink = setup_multifdsink ();
|
||||
- g_object_set (sink, "units-max", initial_buffers, NULL);
|
||||
+ g_object_set (sink, "units-max", (gint64) initial_buffers, NULL);
|
||||
|
||||
fail_if (pipe (pfd1) == -1);
|
||||
fail_if (pipe (pfd2) == -1);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
Traverse the entities hash's keys in sorted order to ensure reproducibility.
|
||||
|
||||
--- libhubbub-0.3.3/build/make-entities.pl
|
||||
+++ libhubbub-0.3.3/build/make-entities.pl
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
my $trie;
|
||||
|
||||
-foreach my $key (keys %entities) {
|
||||
+foreach my $key (sort keys %entities) {
|
||||
$trie = insert_node($trie, $key, $entities{$key});
|
||||
}
|
||||
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
Fix CVE-2016-0739 (Weak Diffie-Hellman secret generation in
|
||||
dh_generate_x() and dh_generate_y()).
|
||||
|
||||
"Due to a byte/bit confusion, the DH secret was too short. This file was
|
||||
completely reworked and will be commited in a future version."
|
||||
Source:
|
||||
https://git.libssh.org/projects/libssh.git/commit/?id=f8d0026c65fc8a55748ae481758e2cf376c26c86
|
||||
|
||||
This patch was created by upstream for libssh-0.7.3, but applied without
|
||||
modification to libssh-0.6.3 by Debian. In Guix, we apply it without
|
||||
modification to libssh-0.6.5.
|
||||
|
||||
References:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2016-0739
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-0739
|
||||
https://security-tracker.debian.org/tracker/CVE-2016-0739
|
||||
|
||||
---
|
||||
src/dh.c | 22 +++++++++++++++++-----
|
||||
1 file changed, 17 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/dh.c b/src/dh.c
|
||||
index e489a1d..d27b66e 100644
|
||||
--- a/src/dh.c
|
||||
+++ b/src/dh.c
|
||||
@@ -227,15 +227,21 @@ void ssh_crypto_finalize(void) {
|
||||
}
|
||||
|
||||
int dh_generate_x(ssh_session session) {
|
||||
+ int keysize;
|
||||
+ if (session->next_crypto->kex_type == SSH_KEX_DH_GROUP1_SHA1) {
|
||||
+ keysize = 1023;
|
||||
+ } else {
|
||||
+ keysize = 2047;
|
||||
+ }
|
||||
session->next_crypto->x = bignum_new();
|
||||
if (session->next_crypto->x == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBGCRYPT
|
||||
- bignum_rand(session->next_crypto->x, 128);
|
||||
+ bignum_rand(session->next_crypto->x, keysize);
|
||||
#elif defined HAVE_LIBCRYPTO
|
||||
- bignum_rand(session->next_crypto->x, 128, 0, -1);
|
||||
+ bignum_rand(session->next_crypto->x, keysize, -1, 0);
|
||||
#endif
|
||||
|
||||
/* not harder than this */
|
||||
@@ -248,15 +254,21 @@ int dh_generate_x(ssh_session session) {
|
||||
|
||||
/* used by server */
|
||||
int dh_generate_y(ssh_session session) {
|
||||
- session->next_crypto->y = bignum_new();
|
||||
+ int keysize;
|
||||
+ if (session->next_crypto->kex_type == SSH_KEX_DH_GROUP1_SHA1) {
|
||||
+ keysize = 1023;
|
||||
+ } else {
|
||||
+ keysize = 2047;
|
||||
+ }
|
||||
+ session->next_crypto->y = bignum_new();
|
||||
if (session->next_crypto->y == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBGCRYPT
|
||||
- bignum_rand(session->next_crypto->y, 128);
|
||||
+ bignum_rand(session->next_crypto->y, keysize);
|
||||
#elif defined HAVE_LIBCRYPTO
|
||||
- bignum_rand(session->next_crypto->y, 128, 0, -1);
|
||||
+ bignum_rand(session->next_crypto->y, keysize, -1, 0);
|
||||
#endif
|
||||
|
||||
/* not harder than this */
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
--- netsurf-all-3.5/netsurf/gtk/about.c
|
||||
+++ netsurf-all-3.5/netsurf/gtk/about.c
|
||||
@@ -79,11 +79,11 @@
|
||||
switch (response_id) {
|
||||
|
||||
case ABOUT_RESPONSE_ID_LICENCE:
|
||||
- about_open("about:credits");
|
||||
+ about_open("about:licence");
|
||||
break;
|
||||
|
||||
case ABOUT_RESPONSE_ID_CREDITS:
|
||||
- about_open("about:licence");
|
||||
+ about_open("about:credits");
|
||||
break;
|
||||
}
|
||||
|
||||
--- netsurf-all-3.5/netsurf/desktop/version.c
|
||||
+++ netsurf-all-3.5/netsurf/desktop/version.c
|
||||
@@ -20,6 +20,6 @@
|
||||
|
||||
#include "desktop/version.h"
|
||||
|
||||
-const char * const netsurf_version = "3.5 (6th April 1016)";
|
||||
+const char * const netsurf_version = "3.5 (6th April 2016)";
|
||||
const int netsurf_version_major = 3;
|
||||
const int netsurf_version_minor = 5;
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
Increase the timeout on dictionary tests to accommodate slower machines.
|
||||
|
||||
--- netsurf-3.6/test/hashtable.c
|
||||
+++ netsurf-3.6/test/hashtable.c
|
||||
@@ -286,6 +286,7 @@
|
||||
tcase_add_checked_fixture(tc_dict_s,
|
||||
dicts_hashtable_create,
|
||||
dict_hashtable_teardown);
|
||||
+ tcase_set_timeout(tc_dict_s, 30);
|
||||
|
||||
tcase_add_test(tc_dict_s, hashtable_dict_test);
|
||||
|
||||
@@ -297,6 +298,7 @@
|
||||
tcase_add_checked_fixture(tc_dict_l,
|
||||
dictl_hashtable_create,
|
||||
dict_hashtable_teardown);
|
||||
+ tcase_set_timeout(tc_dict_l, 30);
|
||||
|
||||
tcase_add_test(tc_dict_l, hashtable_dict_test);
|
||||
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
Use upstream utf8proc package, as suggested in
|
||||
http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d
|
||||
|
||||
Work around upstream's lack of a pkg-config file and update API.
|
||||
|
||||
--- netsurf-3.6/Makefile
|
||||
+++ netsurf-3.6/Makefile
|
||||
@@ -527,10 +527,9 @@
|
||||
$(eval $(call pkg_config_find_and_add,libcss,CSS))
|
||||
$(eval $(call pkg_config_find_and_add,libdom,DOM))
|
||||
$(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
|
||||
-$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
|
||||
|
||||
# Common libraries without pkg-config support
|
||||
-LDFLAGS += -lz
|
||||
+LDFLAGS += -lz -lutf8proc
|
||||
|
||||
# Optional libraries with pkgconfig
|
||||
|
||||
--- netsurf-3.6/utils/idna.c
|
||||
+++ netsurf-3.6/utils/idna.c
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-#include <libutf8proc/utf8proc.h>
|
||||
+#include <utf8proc.h>
|
||||
|
||||
#include "utils/errors.h"
|
||||
#include "utils/idna.h"
|
||||
@@ -250,7 +250,7 @@
|
||||
return NSERROR_NOMEM;
|
||||
}
|
||||
|
||||
- nfc_size = utf8proc_normalise(nfc_label, nfc_size,
|
||||
+ nfc_size = utf8proc_normalize_utf32(nfc_label, nfc_size,
|
||||
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
|
||||
if (nfc_size < 0) {
|
||||
return NSERROR_NOMEM;
|
||||
@@ -565,7 +565,7 @@
|
||||
}
|
||||
|
||||
/* Perform NFC normalisation */
|
||||
- ucs4_len = utf8proc_normalise(ucs4, u_ucs4_len,
|
||||
+ ucs4_len = utf8proc_normalize_utf32(ucs4, u_ucs4_len,
|
||||
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
|
||||
if (ucs4_len < 0) {
|
||||
free(ucs4);
|
||||
--- netsurf-3.6/test/Makefile
|
||||
+++ netsurf-3.6/test/Makefile
|
||||
@@ -112,11 +112,11 @@
|
||||
-D_XOPEN_SOURCE=600 \
|
||||
-Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \
|
||||
-Dnsgtk \
|
||||
- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc libidn) \
|
||||
+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libidn) \
|
||||
$(LIB_CFLAGS) \
|
||||
$(COV_CFLAGS)
|
||||
|
||||
-TESTLDFLAGS := $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc libidn) -lz \
|
||||
+TESTLDFLAGS := $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libidn) -lz -lutf8proc \
|
||||
$(LIB_LDFLAGS)\
|
||||
$(COV_LDFLAGS)
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
These two test cases fail for us on i686.
|
||||
|
||||
See https://en.wikipedia.org/wiki/Year_2038_problem
|
||||
|
||||
--- netsurf-3.6/test/time.c
|
||||
+++ netsurf-3.6/test/time.c
|
||||
@@ -77,18 +77,10 @@
|
||||
.expected = "Tue, 12 Jun 2001 12:12:12 GMT"
|
||||
},
|
||||
{
|
||||
- .test = "Thu, 16 Jul 2207 12:45:12 GMT",
|
||||
- .expected = "Thu, 16 Jul 2207 12:45:12 GMT"
|
||||
- },
|
||||
- {
|
||||
.test = "Thu, 16 Aug 2007 19:45:12 GMT",
|
||||
.expected = "Thu, 16 Aug 2007 19:45:12 GMT"
|
||||
},
|
||||
{
|
||||
- .test = "Tue, 16 Sep 3456 00:45:12 GMT",
|
||||
- .expected = "Tue, 16 Sep 3456 00:45:12 GMT"
|
||||
- },
|
||||
- {
|
||||
.test = "Sun, 16 Oct 1988 19:45:59 GMT",
|
||||
.expected = "Sun, 16 Oct 1988 19:45:59 GMT"
|
||||
},
|
||||
|
|
@ -2,25 +2,26 @@ Fix CVE-2017-0358:
|
|||
http://seclists.org/oss-sec/2017/q1/259
|
||||
This patch was copied from the above URL.
|
||||
|
||||
diff -ur ntfs-3g.old/src/lowntfs-3g.c ntfs-3g/src/lowntfs-3g.c
|
||||
--- ntfs-3g.old/src/lowntfs-3g.c 2017-02-09 15:01:04.074331542 -0500
|
||||
+++ ntfs-3g/src/lowntfs-3g.c 2017-02-09 15:06:35.757580937 -0500
|
||||
@@ -3827,13 +3827,14 @@
|
||||
struct stat st;
|
||||
pid_t pid;
|
||||
const char *cmd = "/sbin/modprobe";
|
||||
diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
|
||||
index 0bb38f9..c6d1dad 100644
|
||||
--- a/src/lowntfs-3g.c
|
||||
+++ b/src/lowntfs-3g.c
|
||||
@@ -3827,13 +3827,14 @@ static fuse_fstype load_fuse_module(void)
|
||||
struct stat st;
|
||||
pid_t pid;
|
||||
const char *cmd = "/sbin/modprobe";
|
||||
+ char *env = (char*)NULL;
|
||||
struct timespec req = { 0, 100000000 }; /* 100 msec */
|
||||
fuse_fstype fstype;
|
||||
struct timespec req = { 0, 100000000 }; /* 100 msec */
|
||||
fuse_fstype fstype;
|
||||
|
||||
if (!stat(cmd, &st) && !geteuid()) {
|
||||
pid = fork();
|
||||
if (!pid) {
|
||||
if (!stat(cmd, &st) && !geteuid()) {
|
||||
pid = fork();
|
||||
if (!pid) {
|
||||
- execl(cmd, cmd, "fuse", NULL);
|
||||
+ execle(cmd, cmd, "fuse", NULL, &env);
|
||||
_exit(1);
|
||||
} else if (pid != -1)
|
||||
waitpid(pid, NULL, 0);
|
||||
_exit(1);
|
||||
} else if (pid != -1)
|
||||
waitpid(pid, NULL, 0);
|
||||
diff -ur ntfs-3g.old/src/ntfs-3g.c ntfs-3g/src/ntfs-3g.c
|
||||
--- ntfs-3g.old/src/ntfs-3g.c 2017-02-09 15:01:04.074331542 -0500
|
||||
+++ ntfs-3g/src/ntfs-3g.c 2017-02-09 15:06:26.077252571 -0500
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
Fix CVE-2017-2616:
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2616
|
||||
http://seclists.org/oss-sec/2017/q1/490
|
||||
http://seclists.org/oss-sec/2017/q1/474
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://github.com/shadow-maint/shadow/commit/08fd4b69e84364677a10e519ccb25b71710ee686
|
||||
|
||||
From 08fd4b69e84364677a10e519ccb25b71710ee686 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Thu, 23 Feb 2017 09:47:29 -0600
|
||||
Subject: [PATCH] su: properly clear child PID
|
||||
|
||||
If su is compiled with PAM support, it is possible for any local user
|
||||
to send SIGKILL to other processes with root privileges. There are
|
||||
only two conditions. First, the user must be able to perform su with
|
||||
a successful login. This does NOT have to be the root user, even using
|
||||
su with the same id is enough, e.g. "su $(whoami)". Second, SIGKILL
|
||||
can only be sent to processes which were executed after the su process.
|
||||
It is not possible to send SIGKILL to processes which were already
|
||||
running. I consider this as a security vulnerability, because I was
|
||||
able to write a proof of concept which unlocked a screen saver of
|
||||
another user this way.
|
||||
---
|
||||
src/su.c | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/su.c b/src/su.c
|
||||
index f20d230..d86aa86 100644
|
||||
--- a/src/su.c
|
||||
+++ b/src/su.c
|
||||
@@ -379,11 +379,13 @@ static void prepare_pam_close_session (void)
|
||||
/* wake child when resumed */
|
||||
kill (pid, SIGCONT);
|
||||
stop = false;
|
||||
+ } else {
|
||||
+ pid_child = 0;
|
||||
}
|
||||
} while (!stop);
|
||||
}
|
||||
|
||||
- if (0 != caught) {
|
||||
+ if (0 != caught && 0 != pid_child) {
|
||||
(void) fputs ("\n", stderr);
|
||||
(void) fputs (_("Session terminated, terminating shell..."),
|
||||
stderr);
|
||||
@@ -393,9 +395,22 @@ static void prepare_pam_close_session (void)
|
||||
snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n"));
|
||||
|
||||
(void) signal (SIGALRM, kill_child);
|
||||
+ (void) signal (SIGCHLD, catch_signals);
|
||||
(void) alarm (2);
|
||||
|
||||
- (void) wait (&status);
|
||||
+ sigemptyset (&ourset);
|
||||
+ if ((sigaddset (&ourset, SIGALRM) != 0)
|
||||
+ || (sigprocmask (SIG_BLOCK, &ourset, NULL) != 0)) {
|
||||
+ fprintf (stderr, _("%s: signal masking malfunction\n"), Prog);
|
||||
+ kill_child (0);
|
||||
+ } else {
|
||||
+ while (0 == waitpid (pid_child, &status, WNOHANG)) {
|
||||
+ sigsuspend (&ourset);
|
||||
+ }
|
||||
+ pid_child = 0;
|
||||
+ (void) sigprocmask (SIG_UNBLOCK, &ourset, NULL);
|
||||
+ }
|
||||
+
|
||||
(void) fputs (_(" ...terminated.\n"), stderr);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
Fix CVE-2017-2616:
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2616
|
||||
http://seclists.org/oss-sec/2017/q1/474
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://git.kernel.org/cgit/utils/util-linux/util-linux.git/commit/?id=dffab154d29a288aa171ff50263ecc8f2e14a891
|
||||
|
||||
From b018571132cb8c9fece3d75ed240cc74cdb5f0f7 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Wed, 1 Feb 2017 11:58:09 +0100
|
||||
Subject: [PATCH] su: properly clear child PID
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Reported-by: Tobias Stöckmann <tobias@stoeckmann.org>
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
login-utils/su-common.c | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
|
||||
index 0ea4e40bd..b1720f037 100644
|
||||
--- a/login-utils/su-common.c
|
||||
+++ b/login-utils/su-common.c
|
||||
@@ -376,6 +376,9 @@ create_watching_parent (void)
|
||||
}
|
||||
else
|
||||
status = WEXITSTATUS (status);
|
||||
+
|
||||
+ /* child is gone, don't use the PID anymore */
|
||||
+ child = (pid_t) -1;
|
||||
}
|
||||
else if (caught_signal)
|
||||
status = caught_signal + 128;
|
||||
@@ -385,7 +388,7 @@ create_watching_parent (void)
|
||||
else
|
||||
status = 1;
|
||||
|
||||
- if (caught_signal)
|
||||
+ if (caught_signal && child != (pid_t)-1)
|
||||
{
|
||||
fprintf (stderr, _("\nSession terminated, killing shell..."));
|
||||
kill (child, SIGTERM);
|
||||
@@ -395,9 +398,12 @@ create_watching_parent (void)
|
||||
|
||||
if (caught_signal)
|
||||
{
|
||||
- sleep (2);
|
||||
- kill (child, SIGKILL);
|
||||
- fprintf (stderr, _(" ...killed.\n"));
|
||||
+ if (child != (pid_t)-1)
|
||||
+ {
|
||||
+ sleep (2);
|
||||
+ kill (child, SIGKILL);
|
||||
+ fprintf (stderr, _(" ...killed.\n"));
|
||||
+ }
|
||||
|
||||
/* Let's terminate itself with the received signal.
|
||||
*
|
||||
--
|
||||
2.11.1
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
Fix test failures caused by some build machines running more slowly than
|
||||
expected, which manifest like this:
|
||||
|
||||
------
|
||||
> raise FailedHealthCheck(message)
|
||||
E hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Only produced 4 valid examples in 1.08 seconds (1 invalid ones and 0 exceeded maximum size). Try decreasing size of the data you're generating (with e.g.average_size or max_leaves parameters).
|
||||
E See http://hypothesis.readthedocs.org/en/latest/healthchecks.html for more information about this. If you want to disable just this health check, add HealthCheck.too_slowto the suppress_health_check settings for this test.
|
||||
|
||||
/gnu/store/b8d1r8bilvm3jkncgrpvmg3dni9cgcr1-python-hypothesis-3.1.0/lib/python3.5/site-packages/hypothesis/core.py:296: FailedHealthCheck
|
||||
------
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://github.com/pimutils/vdirsyncer/commit/10490a12f13f03495e0945eb9d45d7aed9ab0a6c
|
||||
|
||||
From 10490a12f13f03495e0945eb9d45d7aed9ab0a6c Mon Sep 17 00:00:00 2001
|
||||
From: Markus Unterwaditzer <markus@unterwaditzer.net>
|
||||
Date: Sat, 18 Feb 2017 15:45:06 +0100
|
||||
Subject: [PATCH] Unconditionally disable HealthCheck.too_slow
|
||||
|
||||
---
|
||||
tests/conftest.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||
index e0a07d5..3afd7cd 100644
|
||||
--- a/tests/conftest.py
|
||||
+++ b/tests/conftest.py
|
||||
@@ -26,10 +26,12 @@ def benchmark():
|
||||
else:
|
||||
del pytest_benchmark
|
||||
|
||||
+
|
||||
+settings.suppress_health_check = [HealthCheck.too_slow]
|
||||
+
|
||||
settings.register_profile("ci", settings(
|
||||
max_examples=1000,
|
||||
verbosity=Verbosity.verbose,
|
||||
- suppress_health_check=[HealthCheck.too_slow]
|
||||
))
|
||||
settings.register_profile("deterministic", settings(
|
||||
derandomize=True,
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
Fix CVE-2017-5953:
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5953
|
||||
https://groups.google.com/forum/#!topic/vim_dev/t-3RSdEnrHY
|
||||
|
||||
This change is adapted from the upstream source repository:
|
||||
|
||||
https://github.com/vim/vim/commit/6d3c8586fc81b022e9f06c611b9926108fb878c7
|
||||
|
||||
diff --git a/src/spellfile.c b/src/spellfile.c
|
||||
index c7d87c6..00ef019 100644
|
||||
--- a/src/spellfile.c
|
||||
+++ b/src/spellfile.c
|
||||
@@ -1585,7 +1585,7 @@ spell_read_tree(
|
||||
int prefixtree, /* TRUE for the prefix tree */
|
||||
int prefixcnt) /* when "prefixtree" is TRUE: prefix count */
|
||||
{
|
||||
- int len;
|
||||
+ long len;
|
||||
int idx;
|
||||
char_u *bp;
|
||||
idx_T *ip;
|
||||
@@ -1595,6 +1595,9 @@ spell_read_tree(
|
||||
len = get4c(fd);
|
||||
if (len < 0)
|
||||
return SP_TRUNCERROR;
|
||||
+ if (len >= LONG_MAX / (long)sizeof(int))
|
||||
+ /* Invalid length, multiply with sizeof(int) would overflow. */
|
||||
+ return SP_FORMERROR;
|
||||
if (len > 0)
|
||||
{
|
||||
/* Allocate the byte array. */
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
(define-public pciutils
|
||||
(package
|
||||
(name "pciutils")
|
||||
(version "3.5.2")
|
||||
(version "3.5.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s"))))
|
||||
"0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -5746,6 +5746,26 @@ access the DOM object, create and access Javascript, and generate SMIL
|
|||
animation content.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-switch
|
||||
(package
|
||||
(name "perl-switch")
|
||||
(version "2.17")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/C/CH/CHORNY/Switch-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xbdjdgzfj9zwa4j3ipr8bfk7bcici4hk89hq5d27rhg2isljd9i"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "http://search.cpan.org/dist/Switch")
|
||||
(synopsis "Switch statement for Perl")
|
||||
(description "Switch is a Perl module which implements a generalized case
|
||||
mechanism. The module augments the standard Perl syntax with two new
|
||||
statements: @code{switch} and @code{case}.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-sys-cpu
|
||||
(package
|
||||
(name "perl-sys-cpu")
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||
;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com>
|
||||
;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu>
|
||||
|
|
@ -464,14 +464,14 @@ pidof, tty, taskset, pmap.")
|
|||
(define-public python-passlib
|
||||
(package
|
||||
(name "python-passlib")
|
||||
(version "1.7.0")
|
||||
(version "1.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "passlib" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vdbqsa1a31s98fxkinl052q8nnpvbxnb83qanxfpi2p6c2zdr0b"))))
|
||||
"1q2khqpj9rlcgdmkypjdq1kswvhjf72bq0zk2cv669cc2dj8z51x"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-nose" ,python-nose)))
|
||||
|
|
@ -3495,14 +3495,14 @@ objects.")
|
|||
(define-public python2-fastlmm
|
||||
(package
|
||||
(name "python2-fastlmm")
|
||||
(version "0.2.26")
|
||||
(version "0.2.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "fastlmm" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yxrx9xzai4fyrsi7c2p31kxvpq9czmv1p0wax5ic07m6izbszxg"))))
|
||||
"1q8c34rpmwkfy3r4d5172pzdkpfryj561897z9r3x22gq7813x1m"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2)) ; only Python 2.7 is supported
|
||||
|
|
@ -3733,6 +3733,36 @@ transcendental functions).")
|
|||
(define-public python2-numexpr
|
||||
(package-with-python2 python-numexpr))
|
||||
|
||||
(define-public python-cycler
|
||||
(package
|
||||
(name "python-cycler")
|
||||
(version "0.10.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cycler" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1n69n23fak1gjxlrbhqisi2b9pv3ckrfj98llx3p53953082syyd"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; XXX: The current version requires 'coveralls' which we don't have.
|
||||
;; Enable this for the next release which uses 'python-pytest'.
|
||||
'(#:tests? #f))
|
||||
(propagated-inputs
|
||||
`(("python-six" ,python-six)))
|
||||
(home-page "http://matplotlib.org/cycler/")
|
||||
(synopsis "Composable keyword argument iterator")
|
||||
(description
|
||||
"When using @code{matplotlib} and plotting more than one line, it is
|
||||
common to want to be able to want to be able to cycle over one or more artist
|
||||
styles; but the plotting logic can quickly become involved.
|
||||
To address this and enable easy cycling over arbitrary @code{kwargs}, the
|
||||
@code{Cycler} class was developed.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-cycler
|
||||
(package-with-python2 python-cycler))
|
||||
|
||||
(define-public python-matplotlib
|
||||
(package
|
||||
(name "python-matplotlib")
|
||||
|
|
@ -5563,9 +5593,9 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.")
|
|||
(strip-python2-variant python-beautifulsoup4)))
|
||||
(arguments `(#:python ,python-2))))
|
||||
|
||||
(define-public python2-cssutils
|
||||
(define-public python-cssutils
|
||||
(package
|
||||
(name "python2-cssutils")
|
||||
(name "python-cssutils")
|
||||
(version "1.0.1")
|
||||
(source
|
||||
(origin
|
||||
|
|
@ -5576,12 +5606,9 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.")
|
|||
"0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python2-mock" ,python2-mock) ; for the tests
|
||||
("unzip" ,unzip))) ; for unpacking the source
|
||||
`(("unzip" ,unzip))) ; for unpacking the source
|
||||
(arguments
|
||||
`(#:python ,python-2 ; Otherwise tests fail with a syntax error.
|
||||
#:tests? #f ; The tests apparently download an external URL.
|
||||
))
|
||||
`(#:tests? #f)) ;tests require python-pbr < 1.7.0
|
||||
(home-page "http://cthedot.de/cssutils/")
|
||||
(synopsis
|
||||
"CSS Cascading Style Sheets library for Python")
|
||||
|
|
@ -5591,6 +5618,9 @@ Cascading Style Sheets. Currently it provides a DOM only and no rendering
|
|||
options.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public python2-cssutils
|
||||
(package-with-python2 python-cssutils))
|
||||
|
||||
(define-public python-cssselect
|
||||
(package
|
||||
(name "python-cssselect")
|
||||
|
|
@ -8650,13 +8680,13 @@ processes across test runs.")
|
|||
(define-public python-icalendar
|
||||
(package
|
||||
(name "python-icalendar")
|
||||
(version "3.11.2")
|
||||
(version "3.11.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "icalendar" version))
|
||||
(sha256
|
||||
(base32
|
||||
"17rcy6rb9kqjf4p707ivmx7phjq7ngcz3bf7zriwxrqgrjagj7ag"))))
|
||||
"086jslw8cg2hni79j267p1dy6d27m7q5hi39ni2clh9waqbdf5v3"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-dateutil" ,python-dateutil)
|
||||
|
|
@ -9095,14 +9125,14 @@ document.")
|
|||
(define-public python-botocore
|
||||
(package
|
||||
(name "python-botocore")
|
||||
(version "1.4.62")
|
||||
(version "1.5.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "botocore" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zxczlwqy9bl27d9bc5x99mb5mcsxm350240lp5nx7014xb311lj"))))
|
||||
"1hqvqwhgfcch4knm1l02ynx7qd1igxk3pj34c1x2b0r79jca524n"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; FIXME: Many tests are failing.
|
||||
|
|
@ -9129,14 +9159,14 @@ interface to the Amazon Web Services (AWS) API.")
|
|||
(define-public awscli
|
||||
(package
|
||||
(name "awscli")
|
||||
(version "1.11.43")
|
||||
(version "1.11.47")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1x94jmy8ygld8g4pf35zdankh4dx8g8qn3q9j3hrbawqw0vkrp3y"))))
|
||||
"0p0pila0k99fm87q1gb24wyd34ags0vkh37h1fa6hklq4mi69i1w"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-colorama" ,python-colorama)
|
||||
|
|
@ -13200,3 +13230,26 @@ Sorted dictionaries are also provided. Currently only with @dfn{Key Sorted
|
|||
Order} (KSO, no sorting function can be specified, but a transform can be
|
||||
specified to apply on the key before comparison (e.g. @code{string.lower})).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-pypeg2
|
||||
(package
|
||||
(name "python-pypeg2")
|
||||
(version "2.15.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pyPEG2" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs `(("python-lxml" ,python-lxml)))
|
||||
(arguments
|
||||
;;https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35
|
||||
'(#:tests? #f))
|
||||
(home-page "https://fdik.org/pyPEG/")
|
||||
(synopsis "Parsering Expression Grammars in Python")
|
||||
(description "PyPEG is an intrinsic parser interpreter framework for
|
||||
Python. It is based on Parsing Expression Grammars, PEG. With pyPEG you can
|
||||
parse many formal languages.")
|
||||
(license license:gpl2)))
|
||||
|
|
|
|||
|
|
@ -1215,8 +1215,9 @@ module provides support functions to the automatically generated code.")
|
|||
(patches (search-patches "pyqt-configure.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("python-sip" ,python-sip)
|
||||
("qtbase" ,qtbase))) ; for qmake
|
||||
`(("qtbase" ,qtbase))) ; for qmake
|
||||
(propagated-inputs
|
||||
`(("python-sip" ,python-sip)))
|
||||
(inputs
|
||||
`(("python" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -805,3 +805,42 @@ Using Scheme, a dialect of the Lisp programming language, the book explains
|
|||
core computer science concepts such as abstraction in programming,
|
||||
metalinguistic abstraction, recursion, interpreters, and modular programming.")
|
||||
(license cc-by-sa4.0))))
|
||||
|
||||
(define-public scheme48-rx
|
||||
(let* ((commit "d3231ad13de2b44e3ee173b1c9d09ff165e8b6d5")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "scheme48-rx")
|
||||
(version (string-append "0.0.0-" revision "." (string-take commit 7)))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/scheme/rx")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1nmziaibgmfi346kzidj6xyad0vm7724qymbzgxvdzyrqji6v6yz"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils))
|
||||
(let ((share (string-append %output
|
||||
"/share/scheme48-"
|
||||
,(package-version scheme48)
|
||||
"/rx")))
|
||||
(chdir (assoc-ref %build-inputs "source"))
|
||||
(mkdir-p share)
|
||||
(copy-recursively "." share)))))
|
||||
(native-inputs
|
||||
`(("source" ,source)
|
||||
("scheme48" ,scheme48)))
|
||||
(home-page "https://github.com/scheme/rx/")
|
||||
(synopsis "SRE String pattern-matching library for scheme48")
|
||||
(description
|
||||
"String pattern-matching library for scheme48 based on the SRE
|
||||
regular-expression notation.")
|
||||
(license bsd-3))))
|
||||
|
|
|
|||
|
|
@ -217,10 +217,10 @@ conflict with slocate compatibility.")
|
|||
(version "2.4.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "http://swish-e.org/distribution/"
|
||||
"swish-e-" version ".tar.gz")
|
||||
;; The upstream swish-e.org appears to be down... so
|
||||
;; use debian's copy as a fallback.
|
||||
(uri (list (string-append
|
||||
"https://web.archive.org/web/20160730145202/"
|
||||
"http://swish-e.org/distribution/"
|
||||
"swish-e-" version ".tar.gz")
|
||||
(string-append "http://http.debian.net/debian/pool/"
|
||||
"main/s/swish-e/swish-e_" version
|
||||
".orig.tar.gz")))
|
||||
|
|
@ -264,7 +264,8 @@ conflict with slocate compatibility.")
|
|||
(list (string-append out "/lib/swish-e/swishspider")
|
||||
(string-append out "/bin/swish-filter-test")))
|
||||
#t))))))
|
||||
(home-page "http://swish-e.org")
|
||||
(home-page (string-append "https://web.archive.org/web/20160730145202/"
|
||||
"http://swish-e.org"))
|
||||
(synopsis "Web indexing system")
|
||||
(description
|
||||
"Swish-e is Simple Web Indexing System for Humans - Enhanced. Swish-e
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages scheme)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix download)
|
||||
|
|
@ -90,7 +91,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
|
|||
version "/fish-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kn2n9qr9cksg2cl78f3w0yd24368d35djhi6w5x3gbdxk23ywq3"))
|
||||
"19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q"))
|
||||
(modules '((guix build utils)))
|
||||
;; Don't try to install /etc/fish/config.fish.
|
||||
(snippet
|
||||
|
|
@ -98,12 +99,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
|
|||
((".*INSTALL.*sysconfdir.*fish.*") "")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
;; XXX These are needed to bootstrap the 2.5.0 tarball, and can probably
|
||||
;; be removed along with the ‘bootstrap’ phase on the next update.
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
`(("doxygen" ,doxygen)))
|
||||
(inputs
|
||||
`(("bc" ,bc)
|
||||
("ncurses" ,ncurses)
|
||||
|
|
@ -124,10 +120,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
|
|||
"/bin/bc")))
|
||||
(substitute* "share/functions/fish_update_completions.fish"
|
||||
(("python") (which "python")))
|
||||
#t))
|
||||
(add-before 'configure 'bootstrap
|
||||
(lambda _
|
||||
(zero? (system* "autoreconf" "-vfi")))))))
|
||||
#t)))))
|
||||
(synopsis "The friendly interactive shell")
|
||||
(description
|
||||
"Fish (friendly interactive shell) is a shell focused on interactive use,
|
||||
|
|
@ -349,14 +342,14 @@ ksh, and tcsh.")
|
|||
(define-public xonsh
|
||||
(package
|
||||
(name "xonsh")
|
||||
(version "0.5.3")
|
||||
(version "0.5.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "xonsh" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pb1am26wl21g798lpl091j95900py7jj4g98rs9qkhywiln4z4q"))
|
||||
"1wa5g1gxk4aw8jazp3fqmr7mlkdmnva83x28i9xd3s99lv0qb3dd"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
|
|
@ -382,3 +375,51 @@ primitives that you are used to from Bash and IPython. It works on all major
|
|||
systems including Linux, Mac OSX, and Windows. Xonsh is meant for the daily
|
||||
use of experts and novices alike.")
|
||||
(license bsd-2)))
|
||||
|
||||
(define-public scsh
|
||||
(let ((commit "114432435e4eadd54334df6b37fcae505079b49f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "scsh")
|
||||
(version (string-append "0.0.0-" revision "." (string-take commit 7)))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/scheme/scsh")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'replace-rx
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((rx (assoc-ref inputs "scheme48-rx"))
|
||||
(rxpath (string-append rx "/share/scheme48-"
|
||||
,(package-version scheme48)
|
||||
"/rx")))
|
||||
(delete-file-recursively "rx")
|
||||
(symlink rxpath "rx"))
|
||||
#t))
|
||||
(add-before 'configure 'autoreconf
|
||||
(lambda _
|
||||
(zero? (system* "autoreconf")))))))
|
||||
(inputs
|
||||
`(("scheme48" ,scheme48)
|
||||
("scheme48-rx" ,scheme48-rx)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
(home-page "https://github.com/scheme/scsh")
|
||||
(synopsis "Unix shell embedded in Scheme")
|
||||
(description
|
||||
"Scsh is a Unix shell embedded in Scheme. Scsh has two main
|
||||
components: a process notation for running programs and setting up pipelines
|
||||
and redirections, and a complete syscall library for low-level access to the
|
||||
operating system.")
|
||||
(license bsd-3))))
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "http://cgit.freedesktop.org/spice/usbredir")
|
||||
(url "https://anongit.freedesktop.org/git/spice/usbredir.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
|
|
|
|||
|
|
@ -56,15 +56,15 @@
|
|||
(define-public libssh
|
||||
(package
|
||||
(name "libssh")
|
||||
(version "0.7.3")
|
||||
(version "0.7.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://red.libssh.org/attachments/download/195/libssh-"
|
||||
"https://red.libssh.org/attachments/download/210/libssh-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"165g49i4kmm3bfsjm0n8hm21kadv79g9yjqyq09138jxanz4dvr6"))))
|
||||
"03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("-DWITH_GCRYPT=ON")
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
client and server implementations. With libssh, you can remotely execute
|
||||
programs, transfer files, and use a secure and transparent tunnel for your
|
||||
remote applications.")
|
||||
(home-page "http://www.libssh.org")
|
||||
(home-page "https://www.libssh.org")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public libssh2
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -109,7 +110,7 @@ libenca and several charset conversion libraries and tools.")
|
|||
(define-public utf8proc
|
||||
(package
|
||||
(name "utf8proc")
|
||||
(version "2.0.2")
|
||||
(version "2.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -118,15 +119,38 @@ libenca and several charset conversion libraries and tools.")
|
|||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776"))))
|
||||
(base32 "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs ;test data that is otherwise downloaded with curl
|
||||
`(("NormalizationTest.txt"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.unicode.org/Public/9.0.0/ucd/"
|
||||
"NormalizationTest.txt"))
|
||||
(sha256
|
||||
(base32 "1fxrz0bilsbwl685336aqi88k62i6nqhm62rvy4zhg3bcm4dhj1d"))))
|
||||
("GraphemeBreakTest.txt"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.unicode.org/Public/9.0.0/ucd/"
|
||||
"auxiliary/GraphemeBreakTest.txt"))
|
||||
(sha256
|
||||
(base32 "0qbhyhmf0778lc2hcwlpizrvmdxwpk959v2q2wb8abv09ba7wvn7"))))))
|
||||
(arguments
|
||||
'(#:tests? #f ;no "check" target
|
||||
#:make-flags (list "CC=gcc"
|
||||
'(#:make-flags (list "CC=gcc"
|
||||
(string-append "prefix=" (assoc-ref %outputs "out")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(delete 'configure)
|
||||
(add-before 'check 'check-data
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(for-each (lambda (i)
|
||||
(copy-file (assoc-ref inputs i)
|
||||
(string-append "data/" i)))
|
||||
'("NormalizationTest.txt" "GraphemeBreakTest.txt"))
|
||||
(substitute* "data/GraphemeBreakTest.txt"
|
||||
(("÷") "/")
|
||||
(("×") "+")))))))
|
||||
(home-page "http://julialang.org/utf8proc/")
|
||||
(synopsis "C library for processing UTF-8 Unicode data")
|
||||
(description "utf8proc is a small C library that provides Unicode
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ required structures.")
|
|||
(inherit openssl)
|
||||
(replacement #f)
|
||||
(name "openssl")
|
||||
(version "1.1.0d")
|
||||
(version "1.1.0e")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "ftp://ftp.openssl.org/source/"
|
||||
|
|
@ -417,7 +417,7 @@ required structures.")
|
|||
(patches (search-patches "openssl-1.1.0-c-rehash-in.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pv0zql3r73qpjini90hn29l28d65b7i777zav0larbmi6gbnpkx"))))
|
||||
"0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp"))))
|
||||
(outputs '("out"
|
||||
"doc" ;1.3MiB of man3 pages
|
||||
"static")) ; 5.5MiB of .a files
|
||||
|
|
|
|||
|
|
@ -112,14 +112,14 @@ as well as the classic centralized workflow.")
|
|||
(define-public git
|
||||
(package
|
||||
(name "git")
|
||||
(version "2.11.1")
|
||||
(version "2.12.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05b4jw86w77c3pyh3nm6aw31vhxwzvhnx2x0bcfqmm15wg57k9y0"))))
|
||||
"09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("native-perl" ,perl)
|
||||
|
|
@ -132,7 +132,7 @@ as well as the classic centralized workflow.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cfa3c2r7d86ksswxdl0jqdka9mai3446gg8380921gf779nwj39"))))))
|
||||
"0ws7h04ijqr2l0pp9qbds65v9cd70v0qfpnhqncn9zqfspw5d0wb"))))))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("expat" ,expat)
|
||||
|
|
|
|||
|
|
@ -215,14 +215,14 @@ television and DVD. It is also known as AC-3.")
|
|||
(define-public libx264
|
||||
(package
|
||||
(name "libx264")
|
||||
(version "20161205-2245")
|
||||
(version "20170224-2245")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/pub/x264/snapshots/"
|
||||
"x264-snapshot-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jjzdwag59kqlk09bb2pykm1ss8bw3p9q7bsks2kjgdwbj121a44"))))
|
||||
"0paw8vzsy2qh5jf6xg2i1risjwyvmxgfnivly4gh0bib62cp4vib"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
|
@ -263,7 +263,7 @@ H.264 (MPEG-4 AVC) video streams.")
|
|||
(define-public x265
|
||||
(package
|
||||
(name "x265")
|
||||
(version "2.1")
|
||||
(version "2.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -271,7 +271,7 @@ H.264 (MPEG-4 AVC) video streams.")
|
|||
"x265_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hx6sr9l7586gs4qds2sj0i1m5brxkaqq3cwmibhfb559fpvkz48"))
|
||||
"07z4ydxg0lk6j43h0wlh2xddb91cy4y4mny2ln71d4278b1hllj7"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(delete-file-recursively "source/compat/getopt"))))
|
||||
|
|
@ -294,7 +294,7 @@ designed to encode video or images into an H.265 / HEVC encoded bitstream.")
|
|||
(define-public libass
|
||||
(package
|
||||
(name "libass")
|
||||
(version "0.13.4")
|
||||
(version "0.13.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -302,7 +302,7 @@ designed to encode video or images into an H.265 / HEVC encoded bitstream.")
|
|||
version "/libass-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq"))))
|
||||
"0b9cj5xfsa7zwlk5m146fhv102v51iqs3rapq0n2xrz30k8p9a7q"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
|
@ -837,7 +837,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
|
|||
(define-public mpv
|
||||
(package
|
||||
(name "mpv")
|
||||
(version "0.23.0")
|
||||
(version "0.24.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -845,7 +845,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1629v5l0rmphxra7chmfm7bnn59zc1mp529b9m2zqzaqf1czxvla"))
|
||||
"059zblcj98fhrns1rwa66mf4km68czpam4nnk8q9qny31bx58654"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system waf-build-system)
|
||||
(native-inputs
|
||||
|
|
@ -975,7 +975,7 @@ access to mpv's powerful playback capabilities.")
|
|||
(define-public youtube-dl
|
||||
(package
|
||||
(name "youtube-dl")
|
||||
(version "2017.02.07")
|
||||
(version "2017.02.22")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://yt-dl.org/downloads/"
|
||||
|
|
@ -983,7 +983,7 @@ access to mpv's powerful playback capabilities.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1grq3aqa1zc0xdq1y6vqnk0y0vcd1j2jjn85696hw98mi0w1am73"))))
|
||||
"0abir0039igwz0830vdqknngs3hmr474j6xzh33v57p3y4imgx2i"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; The problem here is that the directory for the man page and completion
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
(uri (string-append "https://github.com/vim/vim/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(patches (search-patches "vim-CVE-2017-5953.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"04samk2bakyixbxyc3p0g6ypls45105sikibg0wc6lmak9bqjs85"))))
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
|
||||
|
|
@ -51,6 +51,7 @@
|
|||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages apr)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages autotools)
|
||||
|
|
@ -64,11 +65,13 @@
|
|||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnu-doc)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages base)
|
||||
|
|
@ -76,6 +79,7 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages valgrind)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages curl)
|
||||
|
|
@ -126,14 +130,14 @@ and its related documentation.")
|
|||
(define-public nginx
|
||||
(package
|
||||
(name "nginx")
|
||||
(version "1.11.9")
|
||||
(version "1.11.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://nginx.org/download/nginx-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0j2pcara9ir2xj3m2mjzf7wz46mdy51c0kal61cp0ldm2qgvf8nw"))))
|
||||
"0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("pcre" ,pcre)
|
||||
("openssl" ,openssl)
|
||||
|
|
@ -3727,49 +3731,389 @@ can easily be invoked on a single file. Your partner can access the file with
|
|||
tools they trust (e.g. wget).")
|
||||
(license l:gpl2+)))
|
||||
|
||||
(define-public netsurf
|
||||
(define netsurf-buildsystem
|
||||
(package
|
||||
(name "netsurf")
|
||||
(version "3.5")
|
||||
(name "netsurf-buildsystem")
|
||||
(version "1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.netsurf-browser.org/"
|
||||
"netsurf/releases/source-full/netsurf-all-"
|
||||
version ".tar.gz"))
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
"buildsystem-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vdldzcv42wykajmw8vbql0f1yd44gbx30kywfrrh2x3064ly609"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "Makefile"
|
||||
;; Do not clobber PKG_CONFIG_PATH from the environment
|
||||
(("PKG_CONFIG_PATH = \\$")
|
||||
"PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$")
|
||||
;; Honor make variables
|
||||
(("shell cc") "shell $(CC)"))))
|
||||
(patches (search-patches "netsurf-about.patch"))))
|
||||
"0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("perl" ,perl)))
|
||||
(arguments
|
||||
'(#:make-flags (list (string-append "PREFIX=" %output))
|
||||
#:tests? #f ;no tests
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build))))
|
||||
(home-page "http://www.netsurf-browser.org")
|
||||
(synopsis "Build system for the Netsurf project")
|
||||
(description
|
||||
"This package provides the shared build system for Netsurf project
|
||||
libraries.")
|
||||
(license l:expat)))
|
||||
|
||||
(define netsurf-buildsystem-arguments
|
||||
`(#:make-flags `("COMPONENT_TYPE=lib-shared"
|
||||
"CC=gcc" "BUILD_CC=gcc"
|
||||
,(string-append "PREFIX=" %output)
|
||||
,(string-append "NSSHARED="
|
||||
(assoc-ref %build-inputs
|
||||
"netsurf-buildsystem")
|
||||
"/share/netsurf-buildsystem"))
|
||||
#:test-target "test"
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
|
||||
(define-public libparserutils
|
||||
(package
|
||||
(name "libparserutils")
|
||||
(version "0.2.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("perl" ,perl))) ;for test harness
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/libparserutils/")
|
||||
(synopsis "Parser building library")
|
||||
(description
|
||||
"LibParserUtils is a library for building efficient parsers, written in
|
||||
C. It is developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public hubbub
|
||||
(package
|
||||
(name "hubbub")
|
||||
(version "0.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
"lib" name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86"))
|
||||
(patches (search-patches "hubbub-sort-entities.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("doxygen" ,doxygen)
|
||||
("json-c" ,json-c)
|
||||
("perl" ,perl)))
|
||||
(propagated-inputs
|
||||
`(("libparserutils" ,libparserutils))) ;for libhubbub.pc
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/hubbub/")
|
||||
(synopsis "HTML5 compliant parsing library")
|
||||
(description
|
||||
"Hubbub is an HTML5 compliant parsing library, written in C, which can
|
||||
parse both valid and invalid web content. It is developed as part of the
|
||||
NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libwapcaplet
|
||||
(package
|
||||
(name "libwapcaplet")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cs1dd2afjgc3wf5gqg434hv6jdabrp9qvlpl4dp53nhkyfywna3"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("check" ,check))) ;for tests
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/libwapcaplet/")
|
||||
(synopsis "String internment library")
|
||||
(description
|
||||
"LibWapcaplet provides a reference counted string internment system
|
||||
designed to store small strings and allow rapid comparison of them. It is
|
||||
developed as part of the Netsurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libcss
|
||||
(package
|
||||
(name "libcss")
|
||||
(version "0.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("perl" ,perl)))
|
||||
(propagated-inputs ;needed for libcss.pc
|
||||
`(("libparserutils" ,libparserutils)
|
||||
("libwapcaplet" ,libwapcaplet)))
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/libcss/")
|
||||
(synopsis "CSS parser and selection library")
|
||||
(description
|
||||
"LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,
|
||||
written in C. It is developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libdom
|
||||
(package
|
||||
(name "libdom")
|
||||
(version "0.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qy7c8b229aiamyqqjgp6m1jlzc3fpl8s9dk33kxzkj70na8l7hv"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("perl" ,perl) ;for test harness
|
||||
("perl-libxml" ,perl-libxml)
|
||||
("perl-switch" ,perl-switch)
|
||||
("perl-xml-xpath" ,perl-xml-xpath)))
|
||||
(inputs
|
||||
`(("libparserutils" ,libparserutils)
|
||||
("libwapcaplet" ,libwapcaplet)))
|
||||
(propagated-inputs
|
||||
`(("expat" ,expat) ;needed for headers and linking
|
||||
("hubbub" ,hubbub))) ;for libdom.pc
|
||||
(arguments
|
||||
`(#:tests? #f ;TODO: re-enable. tests take a looong time.
|
||||
,@netsurf-buildsystem-arguments))
|
||||
(home-page "http://www.netsurf-browser.org/projects/libdom/")
|
||||
(synopsis "Implementation of the W3C DOM")
|
||||
(description
|
||||
"LibDOM is an implementation of the W3C DOM, written in C. It is
|
||||
developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libsvgtiny
|
||||
(package
|
||||
(name "libsvgtiny")
|
||||
(version "0.1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w5hab9x1saz4lq2s9w47x1r64fbzcsl5bvdjph9c9dq68qv3f8a"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("gperf" ,gperf)))
|
||||
(inputs
|
||||
`(("libwapcaplet" ,libwapcaplet)))
|
||||
(propagated-inputs
|
||||
`(("libdom" ,libdom))) ;for libsvgtiny.pc
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/libsvgtiny/")
|
||||
(synopsis "Library for parsing SVG files")
|
||||
(description
|
||||
"Libsvgtiny takes some SVG as input and returns a list of paths and texts
|
||||
which can be rendered easily, as defined in
|
||||
@url{http://www.w3.org/TR/SVGMobile/}. It is developed as part of the NetSurf
|
||||
project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libnsbmp
|
||||
(package
|
||||
(name "libnsbmp")
|
||||
(version "0.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y4a0gn4l6lq4z9183wix0mdsgalqyw24k19k8jr8sz4h3lb7jrb"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/libnsbmp/")
|
||||
(synopsis "Decoding library for BMP and ICO files")
|
||||
(description
|
||||
"Libnsbmp is a decoding library for BMP and ICO image file formats,
|
||||
written in C. It is developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libnsgif
|
||||
(package
|
||||
(name "libnsgif")
|
||||
(version "0.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ldsyscsgqwc8g5481h9nqmwirpp1pp57hmss450hr0mqra26g0k"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/projects/libnsgif/")
|
||||
(synopsis "Decoding library for GIF files")
|
||||
(description
|
||||
"Libnsgif is a decoding library for the GIF image file format, written in
|
||||
C. It is developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libnsutils
|
||||
(package
|
||||
(name "libnsutils")
|
||||
(version "0.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wrxn4rcn7xrfnkmf60jafqn3n1kicgsdpnakd821q56bmqvzf0m"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/")
|
||||
(synopsis "Utility library for NetSurf")
|
||||
(description
|
||||
"Libnsutils provides a small number of useful utility routines. It is
|
||||
developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public libnspsl
|
||||
(package
|
||||
(name "libnspsl")
|
||||
(version "0.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x3frscrp9bzxlm9ama5laxjr3zi8cg20r8lhsamw4x4zyyk145y"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
(home-page "http://www.netsurf-browser.org/")
|
||||
(synopsis "Library to generate a static Public Suffix List")
|
||||
(description
|
||||
"Libnspsl is a library to generate a static code representation of the
|
||||
Public Suffix List. It is developed as part of the NetSurf project.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public nsgenbind
|
||||
(package
|
||||
(name "nsgenbind")
|
||||
(version "0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/libs/releases/"
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"078gpbfcs96bgcba0ygha0ph9jzqr6ry5s3a8p6sl61px2908s66"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("bison" ,bison)
|
||||
("flex" ,flex)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments netsurf-buildsystem-arguments
|
||||
((#:make-flags flags)
|
||||
`(delete "COMPONENT_TYPE=lib-shared" ,flags))))
|
||||
(home-page "http://www.netsurf-browser.org/")
|
||||
(synopsis "Generate JavaScript to DOM bindings")
|
||||
(description
|
||||
"@code{nsgenbind} is a tool to generate JavaScript to DOM bindings from
|
||||
w3c webidl files and a binding configuration file.")
|
||||
(license l:expat)))
|
||||
|
||||
(define-public netsurf
|
||||
(package
|
||||
(name "netsurf")
|
||||
(version "3.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.netsurf-browser.org/netsurf/"
|
||||
"releases/source/netsurf-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"174sjx0566agckwmlj4w2cip5qbxdiafyhlp185a1qprxx84pbjr"))
|
||||
(patches (search-patches "netsurf-system-utf8proc.patch"
|
||||
"netsurf-y2038-tests.patch"
|
||||
"netsurf-longer-test-timeout.patch"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("nsgenbind" ,nsgenbind)
|
||||
("libidn" ,libidn) ;only for tests
|
||||
("check" ,check)
|
||||
("perl" ,perl)
|
||||
("perl-html-parser" ,perl-html-parser)
|
||||
("flex" ,flex)
|
||||
("bison" ,bison)))
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+-2)
|
||||
("gperf" ,gperf)
|
||||
("curl" ,curl)
|
||||
`(("curl" ,curl)
|
||||
("gtk+" ,gtk+-2)
|
||||
("openssl" ,openssl)
|
||||
("utf8proc" ,utf8proc)
|
||||
("libpng" ,libpng)
|
||||
("libjpeg" ,libjpeg)
|
||||
("expat" ,expat)))
|
||||
("libcss" ,libcss)
|
||||
("libdom" ,libdom)
|
||||
("libnsbmp" ,libnsbmp)
|
||||
("libnsgif" ,libnsgif)
|
||||
("libnspsl" ,libnspsl)
|
||||
("libnsutils" ,libnsutils)
|
||||
("libsvgtiny" ,libsvgtiny)
|
||||
("miscfiles" ,miscfiles)))
|
||||
(arguments
|
||||
`(#:make-flags `("CC=gcc" "BUILD_CC=gcc"
|
||||
,(string-append "PREFIX=" %output))
|
||||
#:parallel-build? #f ;parallel builds not supported
|
||||
#:tests? #f ;no way to easily run from release tarball
|
||||
,(string-append "PREFIX=" %output)
|
||||
,(string-append "NSSHARED="
|
||||
(assoc-ref %build-inputs
|
||||
"netsurf-buildsystem")
|
||||
"/share/netsurf-buildsystem"))
|
||||
#:test-target "test"
|
||||
#:modules ((ice-9 rdelim)
|
||||
(ice-9 match)
|
||||
(srfi srfi-1)
|
||||
|
|
@ -3777,18 +4121,11 @@ tools they trust (e.g. wget).")
|
|||
,@%glib-or-gtk-build-system-modules)
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(call-with-output-file "netsurf/Makefile.config"
|
||||
(lambda (port)
|
||||
(format port "~
|
||||
NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/~@
|
||||
")))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(add-after 'build 'adjust-welcome
|
||||
(lambda _
|
||||
;; First, fix some unended tags and simple substitutions
|
||||
(substitute* "netsurf/gtk/res/welcome.html"
|
||||
(substitute* "frontends/gtk/res/welcome.html"
|
||||
(("<(img|input)([^>]*)>" _ tag contents)
|
||||
(string-append "<" tag contents " />"))
|
||||
(("Licence") "License") ;prefer GNU spelling
|
||||
|
|
@ -3799,7 +4136,7 @@ tools they trust (e.g. wget).")
|
|||
(("Google Search") "DuckDuckGo Search")
|
||||
(("name=\"btnG\"") ""))
|
||||
;; Remove default links so it doesn't seem we're endorsing them
|
||||
(with-atomic-file-replacement "netsurf/gtk/res/welcome.html"
|
||||
(with-atomic-file-replacement "frontends/gtk/res/welcome.html"
|
||||
(lambda (in out)
|
||||
;; Leave the DOCTYPE header as is
|
||||
(display (read-line in 'concat) out)
|
||||
|
|
@ -3815,22 +4152,28 @@ tools they trust (e.g. wget).")
|
|||
(x x)))
|
||||
out)))
|
||||
#t))
|
||||
(add-before 'check 'patch-check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* '("test/bloom.c" "test/hashtable.c")
|
||||
(("/usr/share/dict/words")
|
||||
(string-append (assoc-ref inputs "miscfiles") "/share/web2")))
|
||||
#t))
|
||||
(add-after 'install 'install-more
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(desktop (string-append out "/share/applications/"
|
||||
"netsurf.desktop")))
|
||||
(mkdir-p (dirname desktop))
|
||||
(copy-file "netsurf/gtk/res/netsurf-gtk.desktop"
|
||||
(copy-file "frontends/gtk/res/netsurf-gtk.desktop"
|
||||
desktop)
|
||||
(substitute* desktop
|
||||
(("netsurf-gtk") (string-append out "/bin/netsurf"))
|
||||
(("netsurf.png") (string-append out "/share/netsurf/"
|
||||
"netsurf.xpm")))
|
||||
(install-file "netsurf/Docs/netsurf-gtk.1"
|
||||
(install-file "Docs/netsurf-gtk.1"
|
||||
(string-append out "/share/man/man1/"))
|
||||
#t))))))
|
||||
(home-page "https://www.netsurf-browser.org")
|
||||
(home-page "http://www.netsurf-browser.org")
|
||||
(synopsis "Web browser")
|
||||
(description
|
||||
"NetSurf is a lightweight web browser that has its own layout and
|
||||
|
|
@ -4066,3 +4409,68 @@ Tidy also provides @code{libtidy}, a C static and dynamic library that
|
|||
developers can integrate into their applications to make use of the
|
||||
functions of Tidy.")
|
||||
(license l:bsd-3)))
|
||||
|
||||
(define-public qutebrowser
|
||||
(package
|
||||
(name "qutebrowser")
|
||||
(version "0.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/The-Compiler/"
|
||||
"qutebrowser/releases/download/v" version "/"
|
||||
"qutebrowser-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("asciidoc" ,asciidoc)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("docbook-xml" ,docbook-xml)
|
||||
("libxml2" ,libxml2) ;for xmllint
|
||||
("libxslt" ,libxslt))) ;for xsltproc
|
||||
(inputs
|
||||
`(("python-colorama" ,python-colorama)
|
||||
("python-cssutils" ,python-cssutils)
|
||||
("python-jinja2" ,python-jinja2)
|
||||
("python-markupsafe" ,python-markupsafe)
|
||||
("python-pygments" ,python-pygments)
|
||||
("python-pypeg2" ,python-pypeg2)
|
||||
("python-pyyaml" ,python-pyyaml)
|
||||
("python-pyqt" ,python-pyqt)
|
||||
("qtwebkit" ,qtwebkit)))
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'install-more
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(app (string-append out "/share/applications"))
|
||||
(hicolor (string-append out "/share/icons/hicolor")))
|
||||
(system* "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc")
|
||||
(install-file "doc/qutebrowser.1"
|
||||
(string-append out "/share/man/man1"))
|
||||
|
||||
(for-each
|
||||
(lambda (i)
|
||||
(let ((src (format #f "icons/qutebrowser-~dx~d.png" i i))
|
||||
(dest (format #f "~a/~dx~d/apps/qutebrowser.png"
|
||||
hicolor i i)))
|
||||
(mkdir-p (dirname dest))
|
||||
(copy-file src dest)))
|
||||
'(16 24 32 48 64 128 256 512))
|
||||
(install-file "icons/qutebrowser.svg"
|
||||
(string-append hicolor "/scalable/apps"))
|
||||
|
||||
(substitute* "qutebrowser.desktop"
|
||||
(("Exec=qutebrowser")
|
||||
(string-append "Exec=" out "/bin/qutebrowser")))
|
||||
(install-file "qutebrowser.desktop" app)
|
||||
#t))))))
|
||||
(home-page "https://qutebrowser.org/")
|
||||
(synopsis "Minimal, keyboard-focused, vim-like web browser")
|
||||
(description "qutebrowser is a keyboard-focused browser with a minimal
|
||||
GUI. It is based on PyQt5 and QtWebKit.")
|
||||
(license l:gpl3+)))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -53,14 +53,14 @@
|
|||
(define-public webkitgtk
|
||||
(package
|
||||
(name "webkitgtk")
|
||||
(version "2.14.4")
|
||||
(version "2.14.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.webkitgtk.org/releases/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1b73rcyfqjyg5rqw6f4760b2h1kixwva88clp2wl9vnl3psjvbni"))))
|
||||
"17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
|
|
@ -437,7 +438,7 @@ of the screen selected by mouse.")
|
|||
(define-public slop
|
||||
(package
|
||||
(name "slop")
|
||||
(version "4.3.21")
|
||||
(version "5.3.35")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -446,15 +447,14 @@ of the screen selected by mouse.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z0p4a3p5mc6fjh5f8js9ppb0maxyvfxpiw2n6nqc5nim1kv6bim"))))
|
||||
"12fkwardd33xbaisjv93r49jh1dmqw323zjsd9m8kxcyv1rimsig"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments '(#:tests? #f)) ; no "check" target
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no "check" target
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("libxrandr" ,libxrandr)
|
||||
`(("glm" ,glm)
|
||||
("libxext" ,libxext)
|
||||
("imlib2" ,imlib2)
|
||||
("glew" ,glew)
|
||||
("libxrender" ,libxrender)
|
||||
("mesa" ,mesa)))
|
||||
(home-page "https://github.com/naelstrof/slop")
|
||||
(synopsis "Select a region and print its bounds to stdout")
|
||||
|
|
@ -469,7 +469,7 @@ selection's dimensions to stdout.")
|
|||
(define-public maim
|
||||
(package
|
||||
(name "maim")
|
||||
(version "3.4.47")
|
||||
(version "4.4.59")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -478,27 +478,20 @@ selection's dimensions to stdout.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv"))))
|
||||
"0h8z4wm7zgxj1vlp98n12dyiwjwphhnl6yh8aaz3krm5v2kyy6hc"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no "check" target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-source
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((slop (string-append (assoc-ref inputs "slop")
|
||||
"/bin/slop")))
|
||||
;; "slop" command is hardcoded in the source; replace it
|
||||
;; with the full file name.
|
||||
(substitute* "src/main.cpp"
|
||||
(("^( +slopcommand.*)\"slop\"" all front)
|
||||
(string-append front "\"" slop "\"")))))))))
|
||||
'(#:tests? #f)) ; no "check" target
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("libxrandr" ,libxrandr)
|
||||
`(("glm" ,glm)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libxcomposite" ,libxcomposite)
|
||||
("libxfixes" ,libxfixes)
|
||||
("imlib2" ,imlib2)
|
||||
("slop" ,slop)))
|
||||
("libxrandr" ,libxrandr)
|
||||
("mesa" ,mesa)
|
||||
("slop" ,slop)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://github.com/naelstrof/maim")
|
||||
(synopsis "Screenshot utility for X Window System")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -624,14 +624,14 @@ a schema.")
|
|||
(define-public perl-xml-compile-soap
|
||||
(package
|
||||
(name "perl-xml-compile-soap")
|
||||
(version "3.20")
|
||||
(version "3.21")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/"
|
||||
"XML-Compile-SOAP-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qplb77qr97pc9yis51jmphl9gbq9xyf8abldpxkwvdn6iqlbgx5"))))
|
||||
"0rxidh7kjyhnw2y789bqbwccnp8n0m3xskn524y9c752s64qpjcz"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-file-slurp-tiny" ,perl-file-slurp-tiny)
|
||||
|
|
@ -652,14 +652,14 @@ used.")
|
|||
(define-public perl-xml-compile-wsdl11
|
||||
(package
|
||||
(name "perl-xml-compile-wsdl11")
|
||||
(version "3.05")
|
||||
(version "3.06")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/"
|
||||
"XML-Compile-WSDL11-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a50in1qrbzx3924wvrhgfm5fcxz5cd95f3z9z2xgln27q1zssc4"))))
|
||||
"0vbq05cpynm3jj81fw1k4nsb3wv4zngi6blvi1jhdarmh2rfg1x2"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-log-report" ,perl-log-report)
|
||||
|
|
@ -741,7 +741,7 @@ the form of functions.")
|
|||
(define-public pugixml
|
||||
(package
|
||||
(name "pugixml")
|
||||
(version "1.7")
|
||||
(version "1.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -749,17 +749,10 @@ the form of functions.")
|
|||
version "/pugixml-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jpml475kbhs1aqwa48g2cbfxlrb9qp115m2j9yryxhxyr30vqgv"))))
|
||||
"0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:out-of-source? #f
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before
|
||||
'configure 'chdir
|
||||
(lambda _
|
||||
(chdir "scripts")
|
||||
#t)))))
|
||||
`(#:tests? #f)) ; no tests
|
||||
(home-page "http://pugixml.org")
|
||||
(synopsis "Light-weight, simple and fast XML parser for C++ with XPath support")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -2906,32 +2906,6 @@ the same level of support for generic VGA or 8514/A adapters.")
|
|||
"xf86-video-mga is a Matrox video driver for the Xorg X server.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public xf86-video-modesetting
|
||||
(package
|
||||
(name "xf86-video-modesetting")
|
||||
(version "0.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://xorg/individual/driver/xf86-video-modesetting-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libdrm" ,libdrm)
|
||||
("xf86driproto" ,xf86driproto)
|
||||
("libx11" ,libx11)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
(synopsis "\"Modesetting\" video driver for X server")
|
||||
(description
|
||||
"This is a generic \"modesetting\" video driver, that relies on the Linux
|
||||
kernel mode setting (KMS).")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public xf86-video-neomagic
|
||||
(package
|
||||
(name "xf86-video-neomagic")
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
|
|
@ -1114,7 +1114,11 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
|||
(log-file guix-configuration-log-file ;string
|
||||
(default "/var/log/guix-daemon.log"))
|
||||
(lsof guix-configuration-lsof ;<package>
|
||||
(default lsof)))
|
||||
(default lsof))
|
||||
(http-proxy guix-http-proxy ;string | #f
|
||||
(default #f))
|
||||
(tmpdir guix-tmpdir ;string | #f
|
||||
(default #f)))
|
||||
|
||||
(define %default-guix-configuration
|
||||
(guix-configuration))
|
||||
|
|
@ -1125,7 +1129,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
|||
(($ <guix-configuration> guix build-group build-accounts
|
||||
authorize-key? keys
|
||||
use-substitutes? substitute-urls extra-options
|
||||
log-file lsof)
|
||||
log-file lsof http-proxy tmpdir)
|
||||
(list (shepherd-service
|
||||
(documentation "Run the Guix daemon.")
|
||||
(provision '(guix-daemon))
|
||||
|
|
@ -1142,7 +1146,13 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
|||
|
||||
;; Add 'lsof' (for the GC) to the daemon's $PATH.
|
||||
#:environment-variables
|
||||
(list (string-append "PATH=" #$lsof "/bin"))
|
||||
(list (string-append "PATH=" #$lsof "/bin")
|
||||
#$@(if http-proxy
|
||||
(list (string-append "http_proxy=" http-proxy))
|
||||
'())
|
||||
#$@(if tmpdir
|
||||
(list (string-append "TMPDIR=" tmpdir))
|
||||
'()))
|
||||
|
||||
#:log-file #$log-file))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ Section \"Files\"
|
|||
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
|
||||
ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
|
||||
ModulePath \"" xf86-video-ati "/lib/xorg/modules/drivers\"
|
||||
ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
|
||||
ModulePath \"" xf86-video-cirrus "/lib/xorg/modules/drivers\"
|
||||
ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
|
||||
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
|
||||
|
|
@ -147,7 +146,6 @@ EndSection
|
|||
(list xf86-video-vesa
|
||||
xf86-video-fbdev
|
||||
xf86-video-ati
|
||||
xf86-video-modesetting
|
||||
xf86-video-cirrus
|
||||
xf86-video-intel
|
||||
xf86-video-mach64
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
(use-modules (gnu) (gnu system nss))
|
||||
(use-service-modules desktop)
|
||||
(use-package-modules wm ratpoison certs)
|
||||
(use-package-modules wm ratpoison certs suckless)
|
||||
|
||||
(operating-system
|
||||
(host-name "antelope")
|
||||
|
|
@ -33,8 +33,8 @@
|
|||
|
||||
;; Add a bunch of window managers; we can choose one at
|
||||
;; the log-in screen with F1.
|
||||
(packages (cons* ratpoison i3-wm xmonad ;window managers
|
||||
nss-certs ;for HTTPS access
|
||||
(packages (cons* ratpoison i3-wm i3status dmenu ;window managers
|
||||
nss-certs ;for HTTPS access
|
||||
%base-packages))
|
||||
|
||||
;; Use the "desktop" services, which include the X11
|
||||
|
|
|
|||
|
|
@ -91,9 +91,7 @@
|
|||
(grep* "sourceLibrary" "dub.sdl") ; note: format is different!
|
||||
(grep* "sourceLibrary" "dub.json"))
|
||||
#t
|
||||
(let ((status (zero? (apply system* `("dub" "build" ,@dub-build-flags)))))
|
||||
(system* "dub" "run") ; might fail for "targetType": "library"
|
||||
status)))
|
||||
(zero? (apply system* `("dub" "build" ,@dub-build-flags)))))
|
||||
|
||||
(define* (check #:key tests? #:allow-other-keys)
|
||||
(if tests?
|
||||
|
|
|
|||
|
|
@ -418,7 +418,10 @@ GnuTLS itself and its dependencies. See <http://bugs.gnu.org/22774>."
|
|||
;; hash of the expected result.
|
||||
#:verify-certificate? #f)))))
|
||||
|
||||
(mlet %store-monad ((guile (package->derivation guile system)))
|
||||
(mlet %store-monad ((guile (package->derivation
|
||||
(or guile
|
||||
(@@ (gnu packages bootstrap) %bootstrap-guile))
|
||||
system)))
|
||||
(gexp->derivation file-name builder
|
||||
#:guile-for-build guile
|
||||
#:system system
|
||||
|
|
|
|||
|
|
@ -21,12 +21,13 @@
|
|||
#:use-module (ice-9 regex)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (srfi srfi-34)
|
||||
#:use-module (srfi srfi-35)
|
||||
#:use-module (guix import json)
|
||||
#:use-module (guix import hackage)
|
||||
#:use-module (guix memoization)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix upstream)
|
||||
#:use-module (guix ui)
|
||||
#:export (stackage->guix-package
|
||||
%stackage-updater))
|
||||
|
||||
|
|
@ -49,6 +50,9 @@
|
|||
((_ ("packages" pkg ...)) pkg)
|
||||
(_ '())))
|
||||
|
||||
(define (leave-with-message fmt . args)
|
||||
(raise (condition (&message (message (apply format #f fmt args))))))
|
||||
|
||||
(define stackage-lts-info-fetch
|
||||
;; "Retrieve the information about the LTS Stackage release VERSION."
|
||||
(memoize
|
||||
|
|
@ -59,7 +63,7 @@
|
|||
(lts-info (json-fetch url)))
|
||||
(if lts-info
|
||||
(reverse lts-info)
|
||||
(leave (_ "LTS release version not found: ~A~%") version))))))
|
||||
(leave-with-message "LTS release version not found: ~a" version))))))
|
||||
|
||||
(define (stackage-package-name pkg-info)
|
||||
(assoc-ref pkg-info "name"))
|
||||
|
|
@ -99,7 +103,7 @@ included in the Stackage LTS release."
|
|||
(hackage->guix-package name-version
|
||||
#:include-test-dependencies?
|
||||
include-test-dependencies?)
|
||||
(leave (_ "package not found: ~A~%") package-name))))
|
||||
(leave-with-message "~a: Stackage package not found" package-name))))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
|
|||
|
|
@ -98,15 +98,16 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n"))
|
|||
(reverse opts))))
|
||||
(match args
|
||||
((package-name)
|
||||
(let ((sexp (stackage->guix-package
|
||||
package-name
|
||||
#:include-test-dependencies?
|
||||
(assoc-ref opts 'include-test-dependencies?)
|
||||
#:lts-version (assoc-ref opts 'lts-version))))
|
||||
(unless sexp
|
||||
(leave (_ "failed to download cabal file for package '~a'~%")
|
||||
package-name))
|
||||
sexp))
|
||||
(with-error-handling
|
||||
(let ((sexp (stackage->guix-package
|
||||
package-name
|
||||
#:include-test-dependencies?
|
||||
(assoc-ref opts 'include-test-dependencies?)
|
||||
#:lts-version (assoc-ref opts 'lts-version))))
|
||||
(unless sexp
|
||||
(leave (_ "failed to download cabal file for package '~a'~%")
|
||||
package-name))
|
||||
sexp)))
|
||||
(()
|
||||
(leave (_ "too few arguments~%")))
|
||||
((many ...)
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <cstring>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
|
|
@ -2008,7 +2009,11 @@ void DerivationGoal::startBuilder()
|
|||
char stack[32 * 1024];
|
||||
int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD;
|
||||
if (!fixedOutput) flags |= CLONE_NEWNET;
|
||||
pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
|
||||
|
||||
/* Ensure proper alignment on the stack. On aarch64, it has to be 16
|
||||
bytes. */
|
||||
pid = clone(childEntry, (char *)(((uintptr_t)stack + 16) & ~0xf),
|
||||
flags, this);
|
||||
if (pid == -1)
|
||||
throw SysError("cloning builder process");
|
||||
} else
|
||||
|
|
|
|||
Loading…
Reference in New Issue