mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
Merge remote-tracking branch 'signed/master' into core-updates
This commit is contained in:
Mathieu Othacehe
commit
c206f1914e
54 changed files with 2859 additions and 2213 deletions
|
|
@ -6405,9 +6405,11 @@ tool. This build system runs @code{scons} to build the package,
|
|||
the package.
|
||||
|
||||
Additional flags to be passed to @code{scons} can be specified with the
|
||||
@code{#:scons-flags} parameter. The version of Python used to run SCons
|
||||
can be specified by selecting the appropriate SCons package with the
|
||||
@code{#:scons} parameter.
|
||||
@code{#:scons-flags} parameter. The default build and install targets
|
||||
can be overridden with @code{#:build-targets} and
|
||||
@code{#:install-targets} respectively. The version of Python used to
|
||||
run SCons can be specified by selecting the appropriate SCons package
|
||||
with the @code{#:scons} parameter.
|
||||
@end defvr
|
||||
|
||||
@defvr {Scheme Variable} haskell-build-system
|
||||
|
|
|
|||
|
|
@ -261,6 +261,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/imagemagick.scm \
|
||||
%D%/packages/inklingreader.scm \
|
||||
%D%/packages/inkscape.scm \
|
||||
%D%/packages/installers.scm \
|
||||
%D%/packages/ipfs.scm \
|
||||
%D%/packages/irc.scm \
|
||||
%D%/packages/iso-codes.scm \
|
||||
|
|
@ -793,7 +794,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch \
|
||||
%D%/packages/patches/emacs-exec-path.patch \
|
||||
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
||||
%D%/packages/patches/emacs-helm-org-ql.patch \
|
||||
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
|
||||
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
|
||||
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
|
||||
|
|
@ -977,6 +977,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \
|
||||
%D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \
|
||||
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
|
||||
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
|
||||
%D%/packages/patches/ilmbase-fix-tests.patch \
|
||||
%D%/packages/patches/ilmbase-openexr-pkg-config.patch \
|
||||
%D%/packages/patches/inkscape-poppler-0.76.patch \
|
||||
|
|
@ -1148,6 +1149,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/nfs-utils-missing-headers.patch \
|
||||
%D%/packages/patches/ngircd-handle-zombies.patch \
|
||||
%D%/packages/patches/nm-plugin-path.patch \
|
||||
%D%/packages/patches/nsis-env-passthru.patch \
|
||||
%D%/packages/patches/nss-freebl-stubs.patch \
|
||||
%D%/packages/patches/nss-increase-test-timeout.patch \
|
||||
%D%/packages/patches/nss-pkgconfig.patch \
|
||||
|
|
@ -1188,7 +1190,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
||||
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
||||
%D%/packages/patches/p7zip-remove-unused-code.patch \
|
||||
%D%/packages/patches/parted-glibc-compat.patch \
|
||||
%D%/packages/patches/patchelf-page-size.patch \
|
||||
%D%/packages/patches/patchelf-rework-for-arm.patch \
|
||||
%D%/packages/patches/patchutils-test-perms.patch \
|
||||
|
|
@ -1330,7 +1331,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \
|
||||
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
|
||||
%D%/packages/patches/steghide-fixes.patch \
|
||||
%D%/packages/patches/strace-ipc-tests.patch \
|
||||
%D%/packages/patches/streamlink-update-test.patch \
|
||||
%D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \
|
||||
%D%/packages/patches/supercollider-boost-1.70-build-fix.patch \
|
||||
|
|
|
|||
|
|
@ -117,14 +117,14 @@ (define-public yasm
|
|||
(define-public lightning
|
||||
(package
|
||||
(name "lightning")
|
||||
(version "2.1.2")
|
||||
(version "2.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/lightning/lightning-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"))))
|
||||
"1jgxbq2cm51dzi3zhz38mmgwdcgs328mfl8iviw8dxn6dn36p1gd"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("zlib" ,zlib)))
|
||||
(synopsis "Library for generating assembly code at runtime")
|
||||
|
|
|
|||
|
|
@ -1109,7 +1109,7 @@ (define-public g2reverb
|
|||
(define-public fluidsynth
|
||||
(package
|
||||
(name "fluidsynth")
|
||||
(version "2.0.6")
|
||||
(version "2.0.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -1118,7 +1118,7 @@ (define-public fluidsynth
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a"))))
|
||||
"1h1dj3wmjwzny2hgr41k3p67w4kxvzn365kkqwyfd6yk0v3rahic"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target
|
||||
|
|
@ -2771,22 +2771,14 @@ (define-public soxr
|
|||
(define-public twolame
|
||||
(package
|
||||
(name "twolame")
|
||||
(version "0.3.13")
|
||||
(version "0.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/twolame/twolame/" version
|
||||
"/twolame-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))
|
||||
(modules '((guix build utils)))
|
||||
;; The tests break with Perl 5.24:
|
||||
;; https://github.com/njh/twolame/issues/21
|
||||
;; TODO: Remove this snippet when upgrading twolame.
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "tests/test.pl" (("\\(@_\\)") "($_[0])"))
|
||||
#t))))
|
||||
(base32 "0zf8sxqb02w07ah55b1y7ab643zmpbhn62spa9pqra0rc17l4dfc"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libsndfile" ,libsndfile)))
|
||||
|
|
|
|||
|
|
@ -354,6 +354,25 @@ (define-public cxxtest
|
|||
and it supports a very flexible form of test discovery.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public doctest
|
||||
(package
|
||||
(name "doctest")
|
||||
(version "2.3.5")
|
||||
(home-page "https://github.com/onqtam/doctest")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg"))))
|
||||
(build-system cmake-build-system)
|
||||
(synopsis "C++ test framework")
|
||||
(description
|
||||
"doctest is a single-header testing framework for C++11 and later. It
|
||||
has been designed to be fast, light and unintrusive.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-gopkg.in-check.v1
|
||||
(let ((commit "788fd78401277ebd861206a03c884797c6ec5541")
|
||||
(revision "1"))
|
||||
|
|
@ -816,6 +835,22 @@ (define-public python-pytest-runner
|
|||
(define-public python2-pytest-runner
|
||||
(package-with-python2 python-pytest-runner))
|
||||
|
||||
;; python-bleach 3.1.0 requires this ancient version of pytest-runner.
|
||||
;; Remove once no longer needed.
|
||||
(define-public python-pytest-runner-2
|
||||
(package/inherit
|
||||
python-pytest-runner
|
||||
(version "2.12.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-runner" version))
|
||||
(sha256
|
||||
(base32
|
||||
"11ivjj9hfphkv4yfb2g74av4yy86y8gcbf7gbif0p1hcdfnxg3w6"))))))
|
||||
|
||||
(define-public python2-pytest-runner-2
|
||||
(package-with-python2 python-pytest-runner-2))
|
||||
|
||||
(define-public python-pytest-mock
|
||||
(package
|
||||
(name "python-pytest-mock")
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -206,7 +206,7 @@ (define-public fifo-map
|
|||
(define-public json-modern-cxx
|
||||
(package
|
||||
(name "json-modern-cxx")
|
||||
(version "3.1.2")
|
||||
(version "3.7.0")
|
||||
(home-page "https://github.com/nlohmann/json")
|
||||
(source
|
||||
(origin
|
||||
|
|
@ -215,30 +215,34 @@ (define-public json-modern-cxx
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi"))
|
||||
"0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap"))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "./third_party")
|
||||
(delete-file-recursively "./test/thirdparty")
|
||||
(delete-file-recursively "./benchmarks/thirdparty")
|
||||
;; Splits catch and fifo_map
|
||||
;; Delete bundled software. Preserve doctest_compatibility.h, which
|
||||
;; is a wrapper library added by this package.
|
||||
(install-file "./test/thirdparty/doctest/doctest_compatibility.h" "/tmp")
|
||||
(for-each delete-file-recursively
|
||||
'("./third_party" "./test/thirdparty" "./benchmarks/thirdparty"))
|
||||
(install-file "/tmp/doctest_compatibility.h" "./test/thirdparty/doctest")
|
||||
|
||||
;; Adjust for the unbundled fifo_map and doctest.
|
||||
(substitute* "./test/thirdparty/doctest/doctest_compatibility.h"
|
||||
(("#include \"doctest\\.h\"")
|
||||
"#include <doctest/doctest.h>"))
|
||||
(with-directory-excursion "test/src"
|
||||
(let ((files (find-files "." ".*\\.cpp")))
|
||||
(substitute* files
|
||||
(("#include ?\"(catch.hpp)\"" all catch-hpp)
|
||||
(string-append "#include <catch/" catch-hpp ">")))
|
||||
(let ((files (find-files "." "\\.cpp$")))
|
||||
(substitute* files
|
||||
(("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp)
|
||||
(string-append
|
||||
"#include <fifo_map/" fifo-map-hpp ">")))))
|
||||
#t))))
|
||||
(native-inputs
|
||||
`(("amalgamate" ,amalgamate)))
|
||||
`(("amalgamate" ,amalgamate)
|
||||
("doctest" ,doctest)))
|
||||
(inputs
|
||||
`(("catch2" ,catch-framework2)
|
||||
("fifo-map" ,fifo-map)))
|
||||
`(("fifo-map" ,fifo-map)))
|
||||
(build-system cmake-build-system)
|
||||
(synopsis "JSON parser and printer library for C++")
|
||||
(description "JSON for Modern C++ is a C++ JSON library that provides
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
|
||||
|
|
@ -51,6 +51,7 @@ (define-public curl
|
|||
(package
|
||||
(name "curl")
|
||||
(version "7.65.3")
|
||||
(replacement curl-7.66.0)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
|
|
@ -142,6 +143,18 @@ (define-public curl
|
|||
"See COPYING in the distribution."))
|
||||
(home-page "https://curl.haxx.se/")))
|
||||
|
||||
(define curl-7.66.0
|
||||
(package
|
||||
(inherit curl)
|
||||
(version "7.66.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hcqxpibhknhjy56wcxz5vd6m9ggx3ykwp3wp5wx05ih36481d6v"))))))
|
||||
|
||||
(define-public kurly
|
||||
(package
|
||||
(name "kurly")
|
||||
|
|
|
|||
|
|
@ -264,21 +264,21 @@ (define-public american-fuzzy-lop
|
|||
(license asl2.0))))
|
||||
|
||||
(define-public stress-make
|
||||
(let ((commit "506e6cfd98d165f22bee91c408b7c20117a682c4")
|
||||
(revision "0")) ;No official source distribution
|
||||
(let ((commit "9e92dff8f0157f012aaf31de5b8b8112ad720100")
|
||||
(revision "1")) ;No official source distribution
|
||||
(package
|
||||
(name "stress-make")
|
||||
(version (string-append "1.0-" revision "." (string-take commit 7)))
|
||||
(version (git-version "1.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/losalamos/stress-make.git")
|
||||
(url "https://github.com/lanl/stress-make.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1j330yqhc7plwin04qxbh8afpg5nfnw1xvnmh8rk6mmqg9w6ik70"))))
|
||||
"1z1yiwnqyzv3v6152fnjbfh2lr8q8fi5xxfdclnr8l8sd4c1rasp"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
|
@ -308,8 +308,12 @@ (define-public stress-make
|
|||
(which "sh"))))))
|
||||
(add-before 'configure 'repack-make
|
||||
(lambda _
|
||||
(invoke "tar" "cJf" "./make.tar.xz" ,make-dir)))))))
|
||||
(home-page "https://github.com/losalamos/stress-make")
|
||||
(invoke "tar" "cJf" "./make.tar.xz" ,make-dir)))
|
||||
(add-before 'build 'setup-go
|
||||
;; The Go cache is required starting in Go 1.12, and it needs
|
||||
;; to be writable.
|
||||
(lambda _ (setenv "GOCACHE" "/tmp/go-cache") #t))))))
|
||||
(home-page "https://github.com/lanl/stress-make")
|
||||
(synopsis "Expose race conditions in Makefiles")
|
||||
(description
|
||||
"Stress Make is a customized GNU Make that explicitly manages the order
|
||||
|
|
@ -320,7 +324,7 @@ (define-public stress-make
|
|||
conditions.")
|
||||
;; stress-make wrapper is under BSD-3-modifications-must-be-indicated,
|
||||
;; and patched GNU Make is under its own license.
|
||||
(license (list (non-copyleft "COPYING.md")
|
||||
(license (list (non-copyleft "LICENSE.md")
|
||||
(package-license gnu-make))))))
|
||||
|
||||
(define-public zzuf
|
||||
|
|
|
|||
|
|
@ -78,26 +78,25 @@ (define-module (gnu packages disk)
|
|||
(define-public parted
|
||||
(package
|
||||
(name "parted")
|
||||
(version "3.2")
|
||||
(version "3.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/parted/parted-"
|
||||
version ".tar.xz"))
|
||||
(patches (search-patches "parted-glibc-compat.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"))))
|
||||
"0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after
|
||||
'unpack 'fix-locales-and-python
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "tests/t0251-gpt-unicode.sh"
|
||||
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
|
||||
(substitute* "tests/msdos-overlap"
|
||||
(("/usr/bin/python") (which "python"))))))))
|
||||
(add-after 'unpack 'fix-locales-and-python
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "tests/t0251-gpt-unicode.sh"
|
||||
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
|
||||
(substitute* "tests/msdos-overlap"
|
||||
(("/usr/bin/python") (which "python")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("lvm2" ,lvm2)
|
||||
("readline" ,readline)
|
||||
|
|
@ -105,6 +104,7 @@ (define-public parted
|
|||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
;; For the tests.
|
||||
("e2fsprogs" ,e2fsprogs)
|
||||
("perl" ,perl)
|
||||
("python" ,python-2)))
|
||||
(home-page "https://www.gnu.org/software/parted/")
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
(define-module (gnu packages distributed)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
|
@ -47,8 +48,9 @@ (define-public boinc-client
|
|||
(uri (git-reference
|
||||
(url "https://github.com/boinc/boinc.git")
|
||||
(commit (string-append "client_release/"
|
||||
"7.16/"
|
||||
version))))
|
||||
(version-major+minor version)
|
||||
"/" version))))
|
||||
(file-name (git-file-name "boinc" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w2qimcwyjhapk3z7zyq7jkls23hsnmm35iw7m4s4if04fp70dx0"))))
|
||||
|
|
@ -72,12 +74,10 @@ (define-public boinc-client
|
|||
(description "BOINC is a platform for high-throughput computing on a large
|
||||
scale (thousands or millions of computers). It can be used for volunteer
|
||||
computing (using consumer devices) or grid computing (using organizational
|
||||
resources). It supports virtualized, parallel, and GPU-based applications.
|
||||
|
||||
BOINC is distributed under the LGPL open source license. It can be used for
|
||||
commercial purposes, and applications need not be open source.")
|
||||
resources). It supports virtualized, parallel, and GPU-based applications.")
|
||||
(home-page "https://boinc.berkeley.edu/")
|
||||
(license license:gpl3+)))
|
||||
;; BOINC is distributed as LGPL3+, with some individual modules under GPL3+.
|
||||
(license (list license:lgpl3+ license:gpl3+))))
|
||||
|
||||
(define-public boinc-server
|
||||
(package (inherit boinc-client)
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ (define-module (gnu packages django)
|
|||
(define-public python-django
|
||||
(package
|
||||
(name "python-django")
|
||||
(version "1.11.21")
|
||||
(version "1.11.25")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0adhcw8sx2mgwk9y2j760y96pqbip1ni3sf2v2ls5zxc9x93wwms"))))
|
||||
"0rpgx212n8gh61nwizkyldvskna808xpcvawmavk5mc5c9cfh52k"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:modules ((srfi srfi-1)
|
||||
|
|
|
|||
|
|
@ -578,14 +578,14 @@ (define-public yadifa
|
|||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "2.8.2")
|
||||
(version "2.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
|
||||
"knot-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0dx1lp4w33rpa54nns41k4vfdfin6naaskwh132r4qs0l9hl7lh0"))
|
||||
(base32 "18i1kdyaqaskjyhmq888wml4d2p4ic1sbjynlb6ggfxsxzm38x6z"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
|||
|
|
@ -265,21 +265,28 @@ (define-public emacs-with-editor
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-magit
|
||||
;; Version 2.90.1 has trouble loading the transient library,
|
||||
;; so we use a more recent commit that fixes it.
|
||||
(let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94"))
|
||||
;; `magit-setup-buffer' macro introduced in c761d28d and required in
|
||||
;; `emacs-forge'.
|
||||
(let ((commit "c761d28d49e5238037512b898db0ec9b40d85770"))
|
||||
(package
|
||||
(name "emacs-magit")
|
||||
(version (git-version "2.90.1" "1" commit))
|
||||
(version (git-version "2.90.1" "2" commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/magit")
|
||||
(url "https://github.com/magit/magit.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv"))))
|
||||
"16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Fix syntax error
|
||||
(substitute* "lisp/magit-extras.el"
|
||||
(("rev\\)\\)\\)\\)\\)\\)") "rev)))))"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
|
|
@ -318,6 +325,39 @@ (define-public emacs-magit
|
|||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch
|
||||
(lambda _
|
||||
(chmod "lisp/magit-extras.el" #o644)
|
||||
(emacs-batch-edit-file "lisp/magit-extras.el"
|
||||
`(progn (progn
|
||||
(goto-char (point-min))
|
||||
(re-search-forward "(defun magit-copy-buffer-revision ()")
|
||||
(forward-sexp 2)
|
||||
(kill-sexp)
|
||||
(insert ,(format #f "~S"
|
||||
'(if (use-region-p)
|
||||
(copy-region-as-kill nil nil 'region)
|
||||
(when-let ((rev (cl-case major-mode
|
||||
((magit-cherry-mode
|
||||
magit-log-select-mode
|
||||
magit-reflog-mode
|
||||
magit-refs-mode
|
||||
magit-revision-mode
|
||||
magit-stash-mode
|
||||
magit-stashes-mode)
|
||||
(car magit-refresh-args))
|
||||
((magit-diff-mode magit-log-mode)
|
||||
(let ((r (caar magit-refresh-args)))
|
||||
(if (string-match "\\.\\.\\.?\\(.+\\)" r)
|
||||
(match-string 1 r)
|
||||
r)))
|
||||
(magit-status-mode "HEAD"))))
|
||||
(when (magit-commit-p rev)
|
||||
(setq rev (magit-rev-parse rev))
|
||||
(push (list rev default-directory) magit-revision-stack)
|
||||
(kill-new (message "%s" rev))))))))
|
||||
(basic-save-buffer)))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(add-before
|
||||
'build 'patch-exec-paths
|
||||
|
|
@ -524,39 +564,41 @@ (define-public emacs-graphql
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-ghub
|
||||
(package
|
||||
(name "emacs-ghub")
|
||||
(version "3.2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/ghub")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install 'make-info
|
||||
(lambda _
|
||||
(invoke "make" "info"))))))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)
|
||||
("graphql" ,emacs-graphql)
|
||||
("treepy" ,emacs-treepy)))
|
||||
(home-page "https://github.com/magit/ghub")
|
||||
(synopsis "Emacs client libraries for the APIs of various Git forges")
|
||||
(description
|
||||
"Ghub provides basic support for using the APIs of various Git forges from
|
||||
;; We need a newer commit to avoid problems in emacs-forge.
|
||||
(let ((commit "cf0b13aeba4df3798e49c205cac2d8fefd53a137")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-ghub")
|
||||
(version (git-version "3.2.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/ghub")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fzayvcysk80vv4q332axcjf80x6gsnpcbl0svmpb017ii6wxhid"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install 'make-info
|
||||
(lambda _
|
||||
(invoke "make" "info"))))))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)
|
||||
("treepy" ,emacs-treepy)))
|
||||
(home-page "https://github.com/magit/ghub")
|
||||
(synopsis "Emacs client libraries for the APIs of various Git forges")
|
||||
(description
|
||||
"Ghub provides basic support for using the APIs of various Git forges from
|
||||
Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab,
|
||||
Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a
|
||||
handful of functions that are not resource-specific.")
|
||||
(license license:gpl3+)))
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-scribble-mode
|
||||
(let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2")
|
||||
|
|
@ -610,8 +652,8 @@ (define-public emacs-shroud
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-unpackaged-el
|
||||
(let ((commit "c0d58cf81e531b2b6fa1bd5dd612dc1b93d4d186")
|
||||
(revision "2"))
|
||||
(let ((commit "746801a677ada6cd6fa076e423aa0953779f3fad")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "emacs-unpackaged-el")
|
||||
(version (git-version "0" revision commit))
|
||||
|
|
@ -624,7 +666,7 @@ (define-public emacs-unpackaged-el
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0y3sgvd51l4pb3acps92bazfk49da6nim1f1hyxzy1ravg4kbw83"))))
|
||||
"0jvb2ci0h0lj368qhbff3pzkxj3nhlligpbkjzi525k9rkjgm7l8"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
|
|
@ -2946,29 +2988,35 @@ (define-public emacs-robot-mode
|
|||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-rspec
|
||||
(package
|
||||
(name "emacs-rspec")
|
||||
(version "1.11")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pezra/rspec-mode.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/pezra/rspec-mode")
|
||||
(synopsis "Provides a rspec mode for working with RSpec")
|
||||
(description
|
||||
"The Emacs RSpec mode provides keybindings for Ruby source files, e.g. to
|
||||
(let ((commit "66ea7cc9699d6edc6115daa024818adbd85efc20")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-rspec")
|
||||
(version (git-version "1.11" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pezra/rspec-mode.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0b11s8r0pi7ah54km4yg4fqff8wkk409d25qnlwm1l94pdwjd1c8"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:include (cons "^snippets\\/rspec-mode\\/" %default-include)
|
||||
#:tests? #t
|
||||
#:test-command '("make" "test")))
|
||||
(home-page "https://github.com/pezra/rspec-mode")
|
||||
(synopsis "Provides a rspec mode for working with RSpec")
|
||||
(description
|
||||
"The Emacs RSpec mode provides keybindings for Ruby source files, e.g. to
|
||||
verify the spec associated with the current buffer, or entire project, as well
|
||||
as moving between the spec files, and corresponding code files.
|
||||
|
||||
Also included are keybindings for spec files and Dired buffers, as well as
|
||||
snippets for yasnippet.")
|
||||
(license license:gpl3+)))
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-smart-mode-line
|
||||
(package
|
||||
|
|
@ -3306,14 +3354,14 @@ (define-public emacs-ob-ipython
|
|||
(define-public emacs-debbugs
|
||||
(package
|
||||
(name "emacs-debbugs")
|
||||
(version "0.19")
|
||||
(version "0.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/debbugs-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4"))))
|
||||
"03mmb1zvbqlsznl5agq8k3xrlcz310vnsa2zn0y8myanm4ra51zm"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
|
||||
(propagated-inputs
|
||||
|
|
@ -4978,15 +5026,14 @@ (define-public emacs-test-simple
|
|||
(define-public emacs-load-relative
|
||||
(package
|
||||
(name "emacs-load-relative")
|
||||
(version "1.3")
|
||||
(version "1.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/load-relative-"
|
||||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps"))))
|
||||
(base32 "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://github.com/rocky/emacs-load-relative")
|
||||
(synopsis "Emacs Lisp relative file loading related functions")
|
||||
|
|
@ -5266,12 +5313,11 @@ (define-public emacs-ivy-yasnippet
|
|||
(define-public emacs-ivy-rich
|
||||
;; The latest release version has a small mistake that has since been fixed,
|
||||
;; so we use a more recent commit.
|
||||
(let ((commit "f6bfa293c6df0b43cc411876b665816ec3f03d08")
|
||||
(version "0.1.4")
|
||||
(revision "1"))
|
||||
(let ((commit "7a667b135983a1f3ad33d6db8514638e2a3bdfb3")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-ivy-rich")
|
||||
(version (git-version version revision commit))
|
||||
(version (git-version "0.1.4" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -5280,7 +5326,7 @@ (define-public emacs-ivy-rich
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1s8nwwb1z6lkc58g02pi8w99qms948k8d02lw8k8cq47dw87i219"))))
|
||||
(base32 "1v5j6pak2j1wjw19y7rx9rhxif0bj2h47xyl2knfcl6fi4qiqm9y"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-ivy" ,emacs-ivy)))
|
||||
|
|
@ -6595,26 +6641,29 @@ (define-public emacs-web-mode
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-wgrep
|
||||
(package
|
||||
(name "emacs-wgrep")
|
||||
(version "2.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mhayashi1120/Emacs-wgrep")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/mhayashi1120/Emacs-wgrep")
|
||||
(synopsis "Edit a grep buffer and apply those changes to the files")
|
||||
(description
|
||||
"Emacs wgrep allows you to edit a grep buffer and apply those changes
|
||||
;; Tag is missing, so we use the commit directly.
|
||||
;; https://github.com/mhayashi1120/Emacs-wgrep/issues/64
|
||||
(let ((commit "379afd89ebd76f63842c8589127d66096a8bb595"))
|
||||
(package
|
||||
(name "emacs-wgrep")
|
||||
(version "2.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mhayashi1120/Emacs-wgrep")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/mhayashi1120/Emacs-wgrep")
|
||||
(synopsis "Edit a grep buffer and apply those changes to the files")
|
||||
(description
|
||||
"Emacs wgrep allows you to edit a grep buffer and apply those changes
|
||||
to the file buffer. Several backends are supported beside the classic grep:
|
||||
ack, ag, helm and pt.")
|
||||
(license license:gpl3+)))
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-helm
|
||||
(package
|
||||
|
|
@ -6889,14 +6938,14 @@ (define-public emacs-cider
|
|||
CIDER).")
|
||||
(license license:gpl3+)))
|
||||
|
||||
;; There hasn't been a tag or release since 2015, so we take the latest
|
||||
;; There hasn't been a tag or release since 2016, so we take the latest
|
||||
;; commit.
|
||||
(define-public emacs-sly
|
||||
(let ((commit "486bfbe95612bcdc0960c490207970a188e0fbb9")
|
||||
(revision "1"))
|
||||
(let ((commit "29dccc0735283897a6dbd97e0b6828a45c2985e2")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-sly")
|
||||
(version (string-append "1.0.0-" revision "." (string-take commit 9)))
|
||||
(version (git-version "1.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -6906,14 +6955,45 @@ (define-public emacs-sly
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l"))))
|
||||
"0d0skgyqn422130xn8lrdp04m5cjk3sl18w6lf2wrmrndc1crqxk"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
`(#:include (cons "^lib\\/" %default-include)
|
||||
`(#:include (cons* "^contrib\\/" "^lib\\/" "^slynk\\/" %default-include)
|
||||
#:phases
|
||||
;; The package provides autoloads.
|
||||
(modify-phases %standard-phases
|
||||
(delete 'make-autoloads))))
|
||||
(delete 'make-autoloads)
|
||||
(add-before 'install 'install-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(info-dir (string-append out "/share/info"))
|
||||
(doc-dir (string-append out "/share/doc/"
|
||||
,name "-" ,version))
|
||||
(doc-files '(;; "doc/sly-refcard.pdf" ; See sly-refcard.pdf below.
|
||||
"README.md" "NEWS.md" "PROBLEMS.md"
|
||||
"CONTRIBUTING.md")))
|
||||
(with-directory-excursion "doc"
|
||||
(substitute* "Makefile"
|
||||
(("infodir=/usr/local/info")
|
||||
(string-append "infodir=" info-dir))
|
||||
;; Don't rebuild contributors.texi since we are not in
|
||||
;; the git repo.
|
||||
(("contributors.texi: Makefile texinfo-tabulate.awk")
|
||||
"contributors.texi:"))
|
||||
(invoke "make" "html/index.html")
|
||||
(invoke "make" "sly.info")
|
||||
;; TODO: We need minimal texlive with "preprint" package
|
||||
;; (for fullpage.sty). (invoke "make" "sly-refcard.pdf")
|
||||
(install-file "sly.info" info-dir)
|
||||
(copy-recursively "html" (string-append doc-dir "/html")))
|
||||
(for-each (lambda (f)
|
||||
(install-file f doc-dir)
|
||||
(delete-file f))
|
||||
doc-files)
|
||||
(delete-file-recursively "doc")
|
||||
#t))))))
|
||||
(home-page "https://github.com/joaotavora/sly")
|
||||
(synopsis "Sylvester the Cat's Common Lisp IDE")
|
||||
(description
|
||||
|
|
@ -6922,13 +7002,13 @@ (define-public emacs-sly
|
|||
|
||||
@enumerate
|
||||
@item Completely redesigned REPL based on Emacs's own full-featured
|
||||
@code{comint.el}
|
||||
@item Live code annotations via a new @code{sly-stickers} contrib
|
||||
@code{comint.el}.
|
||||
@item Live code annotations via a new @code{sly-stickers} contrib.
|
||||
@item Consistent interactive button interface. Everything can be copied to
|
||||
the REPL.
|
||||
@item Multiple inspectors with independent history
|
||||
@item Regexp-capable @code{M-x sly-apropos}
|
||||
@item Contribs are first class SLY citizens and enabled by default
|
||||
@item Multiple inspectors with independent history.
|
||||
@item Regexp-capable @code{M-x sly-apropos}.
|
||||
@item Contribs are first class SLY citizens and enabled by default.
|
||||
@item Use ASDF to loads contribs on demand.
|
||||
@end enumerate
|
||||
|
||||
|
|
@ -6936,6 +7016,75 @@ (define-public emacs-sly
|
|||
xref, etc...) are still available, but with better integration.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-sly-quicklisp
|
||||
(let ((commit "01ebe3976a244309f2e277c09206831135a0b66c")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-sly-quicklisp")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(home-page "https://github.com/joaotavora/sly-quicklisp")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vfqmvayf35g6y3ljsm3rlzv5jm50qikhh4lv2zkkswj6gkkb1cv"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-sly" ,emacs-sly)))
|
||||
(arguments
|
||||
`(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
|
||||
#:phases
|
||||
;; The package provides autoloads.
|
||||
(modify-phases %standard-phases
|
||||
(delete 'make-autoloads))))
|
||||
(synopsis "Quicklisp support for SLY")
|
||||
(description
|
||||
"@command{sly-quicklisp} is an external contrib for SLY that provides a
|
||||
sly-quickload command that prompts the user for a package to install. ")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-sly-asdf
|
||||
(let ((commit "355739e42c91b9b2339f84453292b938b6d17b0d")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-sly-asdf")
|
||||
(version (git-version "0.1.0" revision commit))
|
||||
(home-page "https://github.com/mmgeorge/sly-asdf")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1plkqh4dj35c3cf8ykan8fcvqmxcdqragh4j6xg0sls27mjjz1bq"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-sly" ,emacs-sly)))
|
||||
(arguments
|
||||
`(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-autoload
|
||||
;; TODO: Reported upstream: https://github.com/mmgeorge/sly-asdf/pull/11
|
||||
(lambda _
|
||||
(substitute* "sly-asdf.el"
|
||||
(("\\(add-to-list 'sly-contribs 'sly-asdf 'append\\)")
|
||||
"(with-eval-after-load 'sly
|
||||
(add-to-list 'sly-contribs 'sly-asdf 'append))")))))))
|
||||
(synopsis "ASDF contrib for SLY")
|
||||
(description
|
||||
"@command{sly-asdf} is an external contrib for SLY that provides
|
||||
additional support for working with ASDF projects.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-lua-mode
|
||||
(let ((commit "95c64bb5634035630e8c59d10d4a1d1003265743")
|
||||
(revision "2"))
|
||||
|
|
@ -7007,11 +7156,11 @@ (define-public emacs-evil
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-evil-collection
|
||||
(let ((commit "986ca7eb0b75eccd843bdad2f7fdb48f4ca6ac22")
|
||||
(revision "10"))
|
||||
(let ((commit "bf4200a57c81c2302a3bf5b2058d74c6f90a3e6c")
|
||||
(revision "11"))
|
||||
(package
|
||||
(name "emacs-evil-collection")
|
||||
(version (git-version "0.0.2" revision commit))
|
||||
(version (git-version "0.0.3" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -7020,10 +7169,13 @@ (define-public emacs-evil-collection
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"172sx5w50x5wrs5w0sb6rkbj3q22s7mmsnk4c6pwknhbz3vwlvwz"))))
|
||||
"01xw0m5gj14ly42y8ikvldpab5my28sylf6l9gvwd5cf909bd445"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-evil" ,emacs-evil)))
|
||||
`(("emacs-evil" ,emacs-evil)
|
||||
("emacs-annalist" ,emacs-annalist)))
|
||||
(arguments
|
||||
`(#:include (cons* "^modes\\/" %default-include)))
|
||||
(home-page "https://github.com/emacs-evil/evil-collection")
|
||||
(synopsis "Collection of Evil bindings for many major and minor modes")
|
||||
(description "This is a collection of Evil bindings for the parts of
|
||||
|
|
@ -10349,20 +10501,17 @@ (define-public emacs-easy-kill
|
|||
(define-public emacs-csv-mode
|
||||
(package
|
||||
(name "emacs-csv-mode")
|
||||
(version "1.7")
|
||||
(version "1.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/csv-mode-"
|
||||
(uri (string-append "https://elpa.gnu.org/packages/csv-mode-"
|
||||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6"))))
|
||||
(base32 "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page
|
||||
"http://elpa.gnu.org/packages/csv-mode.html")
|
||||
(synopsis
|
||||
"Major mode for editing comma/char separated values")
|
||||
(home-page "https://elpa.gnu.org/packages/csv-mode.html")
|
||||
(synopsis "Major mode for editing comma/char separated values")
|
||||
(description
|
||||
"This Emacs package implements CSV mode, a major mode for editing records
|
||||
in a generalized CSV (character-separated values) format.")
|
||||
|
|
@ -10657,20 +10806,22 @@ (define-public groovy-emacs-modes
|
|||
(deprecated-package "groovy-emacs-modes" emacs-groovy-modes))
|
||||
|
||||
(define-public emacs-org-tree-slide
|
||||
(let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134")
|
||||
(revision "0"))
|
||||
(let ((commit "036a36eec1cf712d3db155572aed325daa372eb5")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-org-tree-slide")
|
||||
(version (git-version "0.1" revision commit))
|
||||
(home-page "https://github.com/takaxp/org-tree-slide")
|
||||
(version (git-version "2.8.4" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit commit)))
|
||||
(uri (git-reference
|
||||
(url "https://github.com/takaxp/org-tree-slide.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf"))
|
||||
"1r8ncx25xmxicgciyv5przp68y8qgy40fm10ba55awvql4xcm0yk"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/takaxp/org-tree-slide")
|
||||
(synopsis "Presentation tool for org-mode")
|
||||
(description
|
||||
"Org-tree-slide provides a slideshow mode to view org-mode files. Use
|
||||
|
|
@ -11347,31 +11498,33 @@ (define-public emacs-emacsql
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-closql
|
||||
(package
|
||||
(name "emacs-closql")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emacscollective/closql.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xhpfjjkjqfc1k2rj77cscclz5r7gpvv3hi202x178vdcpipjwar"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-emacsql" ,emacs-emacsql)))
|
||||
(home-page "https://github.com/emacscollective/closql")
|
||||
(synopsis "Store EIEIO objects using EmacSQL")
|
||||
(description
|
||||
"This package allows to store uniform EIEIO objects in an EmacSQL
|
||||
;; Take a commit newer than 1.0.0 release because of Emacs upgrade to 26.3.
|
||||
(let ((commit "70b98dbae53611d10a461d9b4a6f71086910dcef"))
|
||||
(package
|
||||
(name "emacs-closql")
|
||||
(version (git-version "1.0.0" "1" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emacscollective/closql.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wvhrihg663f61yzc7f0vha2abjdnlwbk0gjcwakdfk1bhwf5ikh"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-emacsql" ,emacs-emacsql)))
|
||||
(home-page "https://github.com/emacscollective/closql")
|
||||
(synopsis "Store EIEIO objects using EmacSQL")
|
||||
(description
|
||||
"This package allows to store uniform EIEIO objects in an EmacSQL
|
||||
database. SQLite is used as backend. This library imposes some restrictions
|
||||
on what kind of objects can be stored; it isn't intended to store arbitrary
|
||||
objects. All objects have to share a common superclass and subclasses cannot
|
||||
add any additional instance slots.")
|
||||
(license license:gpl3)))
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public emacs-epkg
|
||||
;; The release version is to old for the current database scheme.
|
||||
|
|
@ -11745,7 +11898,7 @@ (define-public emacs-peg
|
|||
|
||||
(define-public emacs-org-ql
|
||||
(let ((commit "949a06c3ab50482b749fd2d4350837a197660d96")
|
||||
(revision "2"))
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "emacs-org-ql")
|
||||
(version (git-version "0.3.1" revision commit))
|
||||
|
|
@ -11757,9 +11910,6 @@ (define-public emacs-org-ql
|
|||
(sha256
|
||||
(base32
|
||||
"0apcg63xm0242mjgsgw0jrcda4p4iqj7fy3sgh0p7khi4hrs5ch0"))
|
||||
(patches
|
||||
(search-patches
|
||||
"emacs-helm-org-ql.patch"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -11776,7 +11926,15 @@ (define-public emacs-org-ql
|
|||
(native-inputs
|
||||
`(("emacs-buttercup" ,emacs-buttercup)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'require-helm
|
||||
(lambda _
|
||||
(substitute* "helm-org-ql.el"
|
||||
(("^;;;; Requirements")
|
||||
";;;; Requirements\n(require 'helm)\n(require 'helm-org)"))
|
||||
#t)))
|
||||
#:tests? #t
|
||||
#:test-command '("buttercup" "-L" ".")))
|
||||
(home-page "https://github.com/alphapapa/org-ql/")
|
||||
(synopsis "Query language for Org buffers")
|
||||
|
|
@ -12424,15 +12582,14 @@ (define-public emacs-m-buffer-el
|
|||
(define-public emacs-let-alist
|
||||
(package
|
||||
(name "emacs-let-alist")
|
||||
(version "1.0.5")
|
||||
(version "1.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://elpa.gnu.org/packages/let-alist-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw"))))
|
||||
(base32 "0szj7vnjzz4zci5fvz7xqgcpi4pzdyyf4qi2s8xar2hi7v3yaawr"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://elpa.gnu.org/packages/let-alist.html")
|
||||
(synopsis "Easily let-bind values of an assoc-list by their names")
|
||||
|
|
@ -13389,14 +13546,14 @@ (define-public emacs-highlight-numbers
|
|||
(define-public emacs-darkroom
|
||||
(package
|
||||
(name "emacs-darkroom")
|
||||
(version "0.1")
|
||||
(version "0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/darkroom-"
|
||||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak"))))
|
||||
"1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://elpa.gnu.org/packages/darkroom.html")
|
||||
(synopsis "Remove visual distractions and focus on writing")
|
||||
|
|
@ -13526,8 +13683,8 @@ (define-public emacs-faceup
|
|||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-racket-mode
|
||||
(let ((commit "5300aa004f08535c3fac99f1af78462f129aca81")
|
||||
(revision "3"))
|
||||
(let ((commit "2a9a102a097d04fbcd2a443fec84078036c2e277")
|
||||
(revision "4"))
|
||||
(package
|
||||
(name "emacs-racket-mode")
|
||||
(version (git-version "0.0.2" revision commit))
|
||||
|
|
@ -13540,7 +13697,7 @@ (define-public emacs-racket-mode
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray"))))
|
||||
"1n71dxxh62jixq20b5haapv651dxc0zyrxpl1d0yqsg8ncp726bl"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:include '("\\.el$" "\\.rkt$")))
|
||||
|
|
@ -15565,11 +15722,11 @@ (define-public emacs-magit-todos
|
|||
|
||||
(define-public emacs-git-annex
|
||||
;; Unreleased version has a fontification fix.
|
||||
(let ((commit "ebdb44aef1883f1b2b8058e05d30fb9315b03707")
|
||||
(revision "1"))
|
||||
(let ((commit "1324d3f23c534fe79391a2c256bb8803054e383b")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-git-annex")
|
||||
(version (string-append "1.1-" revision "." (string-take commit 8)))
|
||||
(version (git-version "1.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -15579,7 +15736,7 @@ (define-public emacs-git-annex
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh"))))
|
||||
"1lfky2nsrlndlbvk6vwbswnvbvkz1sxgg0n3r5q6xykdkjym0lrh"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/jwiegley/git-annex-el")
|
||||
(synopsis "Emacs integration for git-annex")
|
||||
|
|
@ -16215,6 +16372,42 @@ (define-public emacs-arduino-mode
|
|||
(home-page "https://github.com/bookest/arduino-mode")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-annalist
|
||||
(let ((commit "e0601539c9ac0171a684ea3ff6266d215d1d08e6")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-annalist")
|
||||
(version (git-version "1.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/noctuid/annalist.el.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"10bmimdzpi6cql4sb2hbgdvrza83xbac50bi9qng4z662pfnlaam"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("emacs-buttercup" ,emacs-buttercup)
|
||||
("emacs-lispy" ,emacs-lispy)
|
||||
("emacs-evil" ,emacs-evil)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'fix-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("cask exec ") ""))
|
||||
#t)))
|
||||
#:tests? #t
|
||||
#:test-command '("make" "test")))
|
||||
(home-page "https://github.com/noctuid/annalist.el")
|
||||
(synopsis "Record and display information with Org headings and tables")
|
||||
(description "This package allows for keybindings, settings, hooks, and
|
||||
advice to be recorded and displayed.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-general
|
||||
(let ((commit "f38fb2294bd29261374b772f765730f2fa168b3e")
|
||||
(revision "3"))
|
||||
|
|
@ -17096,6 +17289,85 @@ (define-public emacs-transient
|
|||
a suffix) we prefer to call it just a \"transient\".")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-forge
|
||||
(let ((commit "a6721c071226ae8da6852e9330f2bdcba92a4577"))
|
||||
(package
|
||||
(name "emacs-forge")
|
||||
(version (git-version "0.1.0" "1" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/forge.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gzr1di29a9szkzm6kjznq7c8md71cm5761pznf08nmmk63dl3zm"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
(propagated-inputs
|
||||
`(("emacs-closql" ,emacs-closql)
|
||||
("emacs-dash" ,emacs-dash)
|
||||
("emacs-emacsql-sqlite" ,emacs-emacsql)
|
||||
("emacs-ghub" ,emacs-ghub)
|
||||
("emacs-let-alist" ,emacs-let-alist)
|
||||
("emacs-magit" ,emacs-magit)
|
||||
("emacs-markdown-mode" ,emacs-markdown-mode)
|
||||
("emacs-transient" ,emacs-transient)))
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
#:modules ((srfi srfi-26)
|
||||
(guix build gnu-build-system)
|
||||
((guix build emacs-build-system) #:prefix emacs:)
|
||||
(guix build utils)
|
||||
(guix build emacs-utils))
|
||||
#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build emacs-build-system)
|
||||
(guix build emacs-utils))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'install)
|
||||
(add-after 'unpack 'delete-doc-targets
|
||||
(lambda _
|
||||
(substitute* "./Makefile"
|
||||
(("lisp docs") "lisp"))))
|
||||
(add-after 'delete-doc-targets 'emacs-set-emacs-load-path
|
||||
(assoc-ref emacs:%standard-phases 'set-emacs-load-path))
|
||||
(add-after 'emacs-set-emacs-load-path 'chdir-lisp
|
||||
(lambda _
|
||||
(chdir "lisp")))
|
||||
(add-after 'chdir-lisp 'emacs-install
|
||||
(assoc-ref emacs:%standard-phases 'install))
|
||||
(add-after 'emacs-install 'emacs-make-autoloads
|
||||
(assoc-ref emacs:%standard-phases 'make-autoloads))
|
||||
(add-after 'build 'install-elc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(el-dir (string-append
|
||||
out "/share/emacs/site-lisp/guix.d/forge-"
|
||||
,version)))
|
||||
(for-each (cut install-file <> el-dir)
|
||||
(find-files "." "\\.elc"))
|
||||
#t)))
|
||||
(add-after 'install-elc 'install-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(info (string-append out "/share/info")))
|
||||
(with-directory-excursion "../docs"
|
||||
(invoke "makeinfo" "forge.texi")
|
||||
(install-file "forge.info" info)
|
||||
#t)))))))
|
||||
(home-page "https://github.com/magit/ghub/")
|
||||
(synopsis "Access Git forges from Magit")
|
||||
(description
|
||||
"Work with Git forges, such as Github and Gitlab, from the comfort of
|
||||
Magit and the rest of Emacs.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-matcha
|
||||
(let ((commit "c7df5cf5cdac9ae369e241342389ccda0205eab9"))
|
||||
(package
|
||||
|
|
@ -18054,7 +18326,7 @@ (define-public emacs-semantic-refactor
|
|||
(define-public emacs-nhexl-mode
|
||||
(package
|
||||
(name "emacs-nhexl-mode")
|
||||
(version "1.2")
|
||||
(version "1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -18062,10 +18334,9 @@ (define-public emacs-nhexl-mode
|
|||
"https://elpa.gnu.org/packages/nhexl-mode-"
|
||||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf"))))
|
||||
(base32 "1fcy4ybr12dvswmzaqkv4798snb1x1y7ldxwrsgjv5sx7bb5j60z"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/nhexl-mode.html")
|
||||
(home-page "https://elpa.gnu.org/packages/nhexl-mode.html")
|
||||
(synopsis "Minor mode to edit files via hex-dump format")
|
||||
(description
|
||||
"This package implements NHexl mode, a minor mode for editing files
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -49,12 +50,13 @@ (define-module (gnu packages emacs)
|
|||
#:use-module (gnu packages gd)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome) ; for librsvg
|
||||
#:use-module (gnu packages gnome) ; for librsvg
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages linux) ; alsa-lib
|
||||
#:use-module (gnu packages linux) ; alsa-lib
|
||||
#:use-module (gnu packages mail) ; for mailutils
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages texinfo)
|
||||
|
|
@ -146,6 +148,10 @@ (define-public emacs
|
|||
`(("gnutls" ,gnutls)
|
||||
("ncurses" ,ncurses)
|
||||
|
||||
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
|
||||
;; only via insecure channels. This is not needed for (modern) IMAP.
|
||||
("mailutils" ,mailutils)
|
||||
|
||||
;; TODO: Add the optional dependencies.
|
||||
("libx11" ,libx11)
|
||||
("gtk+" ,gtk+)
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ (define-module (gnu packages enlightenment)
|
|||
(define-public efl
|
||||
(package
|
||||
(name "efl")
|
||||
(version "1.23.0")
|
||||
(version "1.23.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -75,7 +75,7 @@ (define-public efl
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iawq5k1ggas41h3vrwc0y98hf83vr0vh3phfgw22iij3cb2b5nd"))))
|
||||
"0q9g4j7k10s1a8rv2ca9v9lydh7ml3zsrqvgncc4qhvdl76208nn"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("check" ,check)
|
||||
|
|
@ -365,7 +365,7 @@ (define-public enlightenment
|
|||
(define-public python-efl
|
||||
(package
|
||||
(name "python-efl")
|
||||
(version "1.22.0")
|
||||
(version "1.23.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -373,7 +373,7 @@ (define-public python-efl
|
|||
"python/python-efl-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63"))
|
||||
"16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"))
|
||||
(modules '((guix build utils)))
|
||||
;; Remove files generated by Cython
|
||||
(snippet
|
||||
|
|
|
|||
|
|
@ -316,7 +316,6 @@ (define-public apfs-fuse
|
|||
(install-file "apfs-dump-quick" bin)
|
||||
(install-file "apfs-fuse" bin)
|
||||
(install-file "libapfs.a" lib)
|
||||
(install-file "../source/LICENSE" doc)
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||
;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -1414,3 +1415,26 @@ (define-public perl-file-mimeinfo
|
|||
their MIME type.
|
||||
@end itemize")
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public uchardet
|
||||
(package
|
||||
(name "uchardet")
|
||||
(version "0.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.freedesktop.org/software/"
|
||||
name "/releases/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/uchardet/")
|
||||
(synopsis "Encoding detector library")
|
||||
(description "uchardet is an encoding detector library, which takes a
|
||||
sequence of bytes in an unknown character encoding without any additional
|
||||
information, and attempts to determine the encoding of the text. Returned
|
||||
encoding names are iconv-compatible.")
|
||||
|
||||
;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the
|
||||
;; combination is GPL 2.0+.
|
||||
(license license:gpl2+)))
|
||||
|
|
|
|||
|
|
@ -6828,13 +6828,12 @@ (define-public arx-libertatis
|
|||
("innoextract" ,innoextract)))
|
||||
(home-page "https://arx-libertatis.org/")
|
||||
(synopsis "Port of Arx Fatalis, a first-person role-playing game")
|
||||
(description "Arx Libertatis is a cross-platform, open source port of Arx
|
||||
Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by
|
||||
Arkane Studios. This port however does not include the game data, so you need
|
||||
to obtain a copy of the original Arx Fatalis or its demo to play Arx
|
||||
Libertatis. Arx Fatalis features crafting, melee and ranged combat, as well
|
||||
as a unique casting system where the player draws runes in real time to effect
|
||||
the desired spell.")
|
||||
(description "Arx Libertatis is a cross-platform port of Arx Fatalis, a 2002
|
||||
first-person role-playing game / dungeon crawler developed by Arkane Studios.
|
||||
This port however does not include the game data, so you need to obtain a copy
|
||||
of the original Arx Fatalis or its demo to play Arx Libertatis. Arx Fatalis
|
||||
features crafting, melee and ranged combat, as well as a unique casting system
|
||||
where the player draws runes in real time to effect the desired spell.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public edgar
|
||||
|
|
|
|||
|
|
@ -839,7 +839,7 @@ (define-public dbus-c++
|
|||
(define-public appstream-glib
|
||||
(package
|
||||
(name "appstream-glib")
|
||||
(version "0.7.15")
|
||||
(version "0.7.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://people.freedesktop.org/~hughsient/"
|
||||
|
|
@ -847,7 +847,7 @@ (define-public appstream-glib
|
|||
"appstream-glib-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17ram4j3cvs78si0gi1labarr91pw68zn8kam41cqbvlwdyr89vy"))))
|
||||
"14jr1psx5kxywdprgbqn79w309yz8lrqlsq7288hfrf87gbr1wh4"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
|
|
|||
|
|
@ -1397,7 +1397,7 @@ (define-public librsvg
|
|||
(define-public librsvg-next
|
||||
(package
|
||||
(name "librsvg")
|
||||
(version "2.44.12")
|
||||
(version "2.46.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
|
@ -1405,7 +1405,7 @@ (define-public librsvg-next
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"))))
|
||||
"1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -1423,6 +1423,7 @@ (define-public librsvg-next
|
|||
(lambda _
|
||||
(for-each patch-shebang '("tap-driver.sh" "tap-test"))
|
||||
(patch-/usr/bin/file "configure")
|
||||
(patch-makefile-SHELL "po/Makefile.in.in")
|
||||
#t))
|
||||
(add-before 'configure 'pre-configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
|
@ -1460,9 +1461,9 @@ (define-public librsvg-next
|
|||
#t)))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
;; This is the minimum supported Rust version in Librsvg 2.44.
|
||||
("rust" ,rust-1.27)
|
||||
("cargo" ,rust-1.27 "cargo")
|
||||
;; This is the minimum supported Rust version in Librsvg 2.46.
|
||||
("rust" ,rust-1.34)
|
||||
("cargo" ,rust-1.34 "cargo")
|
||||
("vala" ,vala)
|
||||
("glib" ,glib "bin") ; glib-mkenums, etc.
|
||||
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
|
||||
|
|
@ -2690,7 +2691,7 @@ (define-public rest
|
|||
(define-public libsoup
|
||||
(package
|
||||
(name "libsoup")
|
||||
(version "2.66.2")
|
||||
(version "2.68.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/libsoup/"
|
||||
|
|
@ -2698,7 +2699,7 @@ (define-public libsoup
|
|||
"libsoup-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"))))
|
||||
"0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
|
@ -2706,7 +2707,7 @@ (define-public libsoup
|
|||
(guix build meson-build-system)
|
||||
(ice-9 popen))
|
||||
|
||||
#:configure-flags '("-Ddoc=true")
|
||||
#:configure-flags '("-Dgtk_doc=true")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'adjust-tests
|
||||
|
|
@ -2716,6 +2717,16 @@ (define-public libsoup
|
|||
(substitute* "tests/socket-test.c"
|
||||
((".*/sockets/unconnected.*") ""))
|
||||
|
||||
;; These fail because "subdomain.localhost" does not resolve in
|
||||
;; the build environment.
|
||||
(substitute* "tests/hsts-test.c"
|
||||
((".*/hsts/basic.*") "")
|
||||
((".*/hsts/subdomains.*") "")
|
||||
((".*/hsts/superdomain.*") "")
|
||||
((".*/hsts/utf8-address.*") ""))
|
||||
(substitute* "tests/hsts-db-test.c"
|
||||
((".*/hsts-db/subdomains.*") ""))
|
||||
|
||||
;; Generate a self-signed certificate that has "localhost" as its
|
||||
;; 'dnsName'. Failing to do that, and starting with GnuTLS
|
||||
;; 3.5.12, tests such as "ssl-tests" fail:
|
||||
|
|
@ -2784,10 +2795,12 @@ (define-public libsoup
|
|||
("httpd" ,httpd)))
|
||||
(propagated-inputs
|
||||
;; libsoup-2.4.pc refers to all these.
|
||||
`(("glib" ,glib)
|
||||
`(("brotli" ,google-brotli)
|
||||
("glib" ,glib)
|
||||
("libpsl" ,libpsl)
|
||||
("libxml2" ,libxml2)
|
||||
("sqlite" ,sqlite)))
|
||||
("sqlite" ,sqlite)
|
||||
("zlib" ,zlib)))
|
||||
(inputs
|
||||
`(("glib-networking" ,glib-networking)
|
||||
("mit-krb5" ,mit-krb5)))
|
||||
|
|
@ -3395,21 +3408,21 @@ (define-public aisleriot
|
|||
(define-public amtk
|
||||
(package
|
||||
(name "amtk")
|
||||
(version "5.0.0")
|
||||
(version "5.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(uri (string-append "mirror://gnome/sources/amtk/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"amtk-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j"))))
|
||||
"09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--enable-gtk-doc")))
|
||||
(native-inputs
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||
("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||
("gtk-doc" ,gtk-doc)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
|
@ -4134,7 +4147,7 @@ (define-public eog-plugins
|
|||
;; 'XDG_DATA_DIRS' appropriately set.
|
||||
(package
|
||||
(name "eog-plugins")
|
||||
(version "3.26.3")
|
||||
(version "3.26.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/eog-plugins/"
|
||||
|
|
@ -4142,7 +4155,7 @@ (define-public eog-plugins
|
|||
"eog-plugins-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06fnjs2p18ad5vk07z685cx26sc7d3azywss00w9xvz794b2i1g3"))))
|
||||
"0pd7fqa4ciy5844k5s1c6rlsqkk8pxd8cchxjcjhxlsngm9lynnx"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://wiki.gnome.org/Apps/EyeOfGnome/Plugins")
|
||||
(synopsis "Extensions for the Eye of GNOME image viewer")
|
||||
|
|
@ -4709,15 +4722,15 @@ (define-public gexiv2
|
|||
(define-public shotwell
|
||||
(package
|
||||
(name "shotwell")
|
||||
(version "0.30.4")
|
||||
(version "0.30.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(uri (string-append "mirror://gnome/sources/shotwell/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"shotwell-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yiz3j0y2yg6985y3alb3hpkfbv68n8ibys5gpwcjdhmhf3czg5p"))))
|
||||
"1m9i8r4gyd2hzlxjjwfyck4kz7gdg2vz2k6l6d0ga9hdfq2l4p9l"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
'(#:glib-or-gtk? #t))
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Petter <petter@mykolab.ch>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -136,6 +136,7 @@ (define-public libgcrypt
|
|||
(package
|
||||
(name "libgcrypt")
|
||||
(version "1.8.4")
|
||||
(replacement libgcrypt-1.8.5)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
|
||||
|
|
@ -168,6 +169,18 @@ (define-public libgcrypt
|
|||
(properties '((ftp-server . "ftp.gnupg.org")
|
||||
(ftp-directory . "/gcrypt/libgcrypt")))))
|
||||
|
||||
(define-public libgcrypt-1.8.5
|
||||
(package
|
||||
(inherit libgcrypt)
|
||||
(version "1.8.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv"))))))
|
||||
|
||||
(define-public libassuan
|
||||
(package
|
||||
(name "libassuan")
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ (define-public darcs
|
|||
(define-public git-annex
|
||||
(package
|
||||
(name "git-annex")
|
||||
(version "7.20190912")
|
||||
(version "7.20191009")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -253,7 +253,7 @@ (define-public git-annex
|
|||
"git-annex/git-annex-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"))))
|
||||
"10ycvjl9b3aa81zdz239ngjbbambfjrzds1a23wdlbjkn12nsg4g"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
116
gnu/packages/installers.scm
Normal file
116
gnu/packages/installers.scm
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages installers)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system scons)
|
||||
#:use-module (guix utils))
|
||||
|
||||
(define (make-nsis machine target-arch nsis-target-type)
|
||||
(let ((triplet (string-append machine "-" "w64-mingw32")))
|
||||
(package
|
||||
(name (string-append "nsis-" machine))
|
||||
(version "3.04")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-"
|
||||
version "-src.tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0"))
|
||||
(patches (search-patches "nsis-env-passthru.patch"))))
|
||||
(build-system scons-build-system)
|
||||
(native-inputs `(("xgcc" ,(cross-gcc triplet #:libc (cross-libc triplet)))
|
||||
("xbinutils" ,(cross-binutils triplet))
|
||||
("mingw-w64" ,(cross-libc triplet))))
|
||||
(inputs `(("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:scons ,scons-python2
|
||||
#:modules ((srfi srfi-1)
|
||||
(guix build utils)
|
||||
(guix build scons-build-system))
|
||||
#:tests? #f
|
||||
#:scons-flags `("UNICODE=yes"
|
||||
"SKIPUTILS=MakeLangId,Makensisw,NSIS Menu,SubStart,zip2exe"
|
||||
"SKIPDOC=COPYING"
|
||||
"STRIP_CP=no"
|
||||
,(string-append "PREFIX=" %output)
|
||||
,(string-append "TARGET_ARCH=" ,target-arch)
|
||||
,(string-append "XGCC_W32_PREFIX=" ,triplet "-")
|
||||
,(string-append "PREFIX_PLUGINAPI_INC=" (assoc-ref %build-inputs "mingw-w64") "/include/")
|
||||
,(string-append "PREFIX_PLUGINAPI_LIB=" (assoc-ref %build-inputs "mingw-w64") "/lib/"))
|
||||
#:build-targets '("makensis"
|
||||
"stubs"
|
||||
"plugins"
|
||||
"utils")
|
||||
#:install-targets '("install-stubs"
|
||||
"install-plugins"
|
||||
"install-data"
|
||||
"install-utils"
|
||||
"install-compiler"
|
||||
"install-conf")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'build 'fix-env
|
||||
(lambda _
|
||||
(define* (filter-delimited-string delimited-string predicate #:optional (delimiter #\:))
|
||||
;; Given a DELIMITED-STRING delimited by DELIMITER,
|
||||
;; only keep items that satisfy PREDICATE
|
||||
(string-join
|
||||
(filter predicate (string-split delimited-string delimiter))
|
||||
(string delimiter)))
|
||||
(define (mingw-path? path)
|
||||
(string-prefix? (assoc-ref %build-inputs "mingw-w64") path))
|
||||
(for-each
|
||||
(lambda (env-name)
|
||||
(let ((env-val (getenv env-name)))
|
||||
;; Remove all mingw-w64 paths from env vars meant
|
||||
;; for native toolchain
|
||||
(setenv env-name
|
||||
(filter-delimited-string env-val (negate mingw-path?)))
|
||||
;; Add the removed paths back into
|
||||
;; CROSS_-prefixed version of env vars
|
||||
(setenv (string-append "CROSS_" env-name)
|
||||
(filter-delimited-string env-val mingw-path?))))
|
||||
'("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_PATH"))))
|
||||
(add-before 'build 'fix-target-detection
|
||||
(lambda _
|
||||
;; NSIS target detection is screwed up, manually
|
||||
;; change it ourselves
|
||||
(substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI")
|
||||
(string-append "m_target_type=" ,nsis-target-type))))))))
|
||||
(home-page "http://nsis.sourceforge.net/")
|
||||
(synopsis "A professional open source system to create Windows installers")
|
||||
(description
|
||||
"NSIS (Nullsoft Scriptable Install System) is a professional open
|
||||
source system to create Windows installers. It is designed to be as small and
|
||||
flexible as possible and is therefore very suitable for internet
|
||||
distribution.")
|
||||
(license (license:non-copyleft "file://COPYING"
|
||||
"See COPYING in the distribution.")))))
|
||||
|
||||
(define-public nsis-x86_64
|
||||
(make-nsis "x86_64" "amd64" "TARGET_AMD64"))
|
||||
|
||||
(define-public nsis-i686
|
||||
(make-nsis "i686" "x86" "TARGET_X86UNICODE"))
|
||||
|
|
@ -118,9 +118,7 @@ (define-public python-jupyter-kernel-test
|
|||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(version ((@@ (guix build python-build-system)
|
||||
get-python-version)
|
||||
(assoc-ref inputs "python")))
|
||||
(version (python-version (assoc-ref inputs "python")))
|
||||
(pydir (string-append out "/lib/python"
|
||||
version "/site-packages/"
|
||||
"jupyter_kernel_test")))
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ (define-public fstrcmp
|
|||
(define-public kodi
|
||||
(package
|
||||
(name "kodi")
|
||||
(version "18.3")
|
||||
(version "18.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -280,7 +280,7 @@ (define-public kodi
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld"))
|
||||
"1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7"))
|
||||
(patches (search-patches "kodi-skip-test-449.patch"
|
||||
"kodi-set-libcurl-ssl-parameters.patch"))
|
||||
(snippet
|
||||
|
|
|
|||
|
|
@ -1090,7 +1090,7 @@ (define-public util-linux
|
|||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"static")) ; >2 MiB of static .a libraries
|
||||
"static")) ;>2 MiB of static .a libraries
|
||||
(arguments
|
||||
`(#:configure-flags (list "--disable-use-tty-group"
|
||||
"--enable-fs-paths-default=/run/current-system/profile/sbin"
|
||||
|
|
@ -1102,45 +1102,42 @@ (define-public util-linux
|
|||
(assoc-ref %outputs "out")
|
||||
"/etc/bash_completion.d"))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before
|
||||
'build 'set-umount-file-name
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Tell 'eject' the right file name of 'umount'.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "sys-utils/eject.c"
|
||||
(("\"/bin/umount\"")
|
||||
(string-append "\"" out "/bin/umount\"")))
|
||||
#t)))
|
||||
(add-before
|
||||
'check 'pre-check
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(net (assoc-ref inputs "net-base")))
|
||||
;; Change the test to refer to the right file.
|
||||
(substitute* "tests/ts/misc/mcookie"
|
||||
(("/etc/services")
|
||||
(string-append net "/etc/services")))
|
||||
#t)))
|
||||
(add-after
|
||||
'install 'move-static-libraries
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(static (assoc-ref outputs "static")))
|
||||
(mkdir-p (string-append static "/lib"))
|
||||
(with-directory-excursion out
|
||||
(for-each (lambda (file)
|
||||
(rename-file file
|
||||
(string-append static "/"
|
||||
file)))
|
||||
(find-files "lib" "\\.a$"))
|
||||
(add-before 'build 'set-umount-file-name
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Tell 'eject' the right file name of 'umount'.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "sys-utils/eject.c"
|
||||
(("\"/bin/umount\"")
|
||||
(string-append "\"" out "/bin/umount\"")))
|
||||
#t)))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(net (assoc-ref inputs "net-base")))
|
||||
;; Change the test to refer to the right file.
|
||||
(substitute* "tests/ts/misc/mcookie"
|
||||
(("/etc/services")
|
||||
(string-append net "/etc/services")))
|
||||
#t)))
|
||||
(add-after 'install 'move-static-libraries
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(static (assoc-ref outputs "static")))
|
||||
(mkdir-p (string-append static "/lib"))
|
||||
(with-directory-excursion out
|
||||
(for-each (lambda (file)
|
||||
(rename-file file
|
||||
(string-append static "/"
|
||||
file)))
|
||||
(find-files "lib" "\\.a$"))
|
||||
|
||||
;; Remove references to the static library from the '.la'
|
||||
;; files so that Libtool does the right thing when both
|
||||
;; the shared and static library is available.
|
||||
(substitute* (find-files "lib" "\\.la$")
|
||||
(("old_library=.*") "old_library=''\n")))
|
||||
;; Remove references to the static library from the '.la'
|
||||
;; files so that Libtool does the right thing when both
|
||||
;; the shared and static library is available.
|
||||
(substitute* (find-files "lib" "\\.la$")
|
||||
(("old_library=.*") "old_library=''\n")))
|
||||
|
||||
#t))))))
|
||||
#t))))))
|
||||
(inputs `(("zlib" ,zlib)
|
||||
("ncurses" ,ncurses)
|
||||
|
||||
|
|
@ -1150,7 +1147,7 @@ (define-public util-linux
|
|||
'())))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("net-base" ,net-base))) ;for tests
|
||||
("net-base" ,net-base))) ;for tests
|
||||
(home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
|
||||
(synopsis "Collection of utilities for the Linux kernel")
|
||||
(description "Util-linux is a diverse collection of Linux kernel
|
||||
|
|
@ -1285,7 +1282,7 @@ (define-public usbutils
|
|||
(define-public e2fsprogs
|
||||
(package
|
||||
(name "e2fsprogs")
|
||||
(version "1.45.2")
|
||||
(version "1.45.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -1294,7 +1291,7 @@ (define-public e2fsprogs
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02g0cm72sgz709s9pkg4mvj56m7bgs7rwnyc2cp7cvg3j6pcjlj9"))))
|
||||
"00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("util-linux" ,util-linux)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
|
|
@ -1465,18 +1462,15 @@ (define-public zerofree
|
|||
(define-public strace
|
||||
(package
|
||||
(name "strace")
|
||||
(version "5.2")
|
||||
(version "5.3")
|
||||
(home-page "https://strace.io")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append home-page "/files/" version
|
||||
"/strace-" version ".tar.xz"))
|
||||
;; XXX Remove the 'regenerate-tests' phase below when
|
||||
;; "strace-ipc-tests.patch" is no longer applied.
|
||||
(patches (search-patches "strace-ipc-tests.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"))))
|
||||
"0ix06z4vnc49mv76f22kixz8dsh7daqv9mpgwcgl0mlnfjc124vc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
@ -1485,14 +1479,7 @@ (define-public strace
|
|||
(lambda _
|
||||
(substitute* "strace.c"
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))
|
||||
(add-before 'configure 'regenerate-tests
|
||||
;; XXX Remove this phase when "strace-ipc-tests.patch" is no longer
|
||||
;; applied in the 'source' field above. This phase is needed to
|
||||
;; regenerate many other files from tests/gen_tests.in, which is
|
||||
;; modified by the aforementioned patch.
|
||||
(lambda _
|
||||
(invoke "tests/gen_tests.sh"))))
|
||||
#t)))
|
||||
;; Don't fail if the architecture doesn't support different personalities.
|
||||
#:configure-flags '("--enable-mpers=check")
|
||||
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>.
|
||||
|
|
|
|||
|
|
@ -109,9 +109,9 @@ (define-public fann
|
|||
(home-page "http://leenissen.dk/fann/wp/")
|
||||
(synopsis "Fast Artificial Neural Network")
|
||||
(description
|
||||
"FANN is a free open source neural network library, which implements
|
||||
multilayer artificial neural networks in C with support for both fully
|
||||
connected and sparsely connected networks.")
|
||||
"FANN is a neural network library, which implements multilayer
|
||||
artificial neural networks in C with support for both fully connected and
|
||||
sparsely connected networks.")
|
||||
(license license:lgpl2.1))))
|
||||
|
||||
(define-public libsvm
|
||||
|
|
@ -794,7 +794,7 @@ (define-public dlib
|
|||
(define-public python-scikit-learn
|
||||
(package
|
||||
(name "python-scikit-learn")
|
||||
(version "0.20.3")
|
||||
(version "0.20.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -804,7 +804,7 @@ (define-public python-scikit-learn
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08aaby5zphfxy83mggg35bwyka7wk91l2qijh8kk0bl08dikq8dl"))))
|
||||
"08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -1306,12 +1306,12 @@ (define-public grpc
|
|||
("python" ,python-wrapper)))
|
||||
(home-page "https://grpc.io")
|
||||
(synopsis "High performance universal RPC framework")
|
||||
(description "gRPC is a modern open source high performance @dfn{Remote
|
||||
Procedure Call} (RPC) framework that can run in any environment. It can
|
||||
efficiently connect services in and across data centers with pluggable support
|
||||
for load balancing, tracing, health checking and authentication. It is also
|
||||
applicable in last mile of distributed computing to connect devices, mobile
|
||||
applications and browsers to backend services.")
|
||||
(description "gRPC is a modern high performance @dfn{Remote Procedure Call}
|
||||
(RPC) framework that can run in any environment. It can efficiently connect
|
||||
services in and across data centers with pluggable support for load balancing,
|
||||
tracing, health checking and authentication. It is also applicable in last
|
||||
mile of distributed computing to connect devices, mobile applications and
|
||||
browsers to backend services.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
;; Note that Tensorflow includes a "third_party" directory, which seems to not
|
||||
|
|
|
|||
|
|
@ -140,14 +140,14 @@ (define-module (gnu packages mail)
|
|||
(define-public mailutils
|
||||
(package
|
||||
(name "mailutils")
|
||||
(version "3.6")
|
||||
(version "3.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/mailutils/mailutils-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07phzpwrnkdclx6jvirljk9zcavl8wh02kpx3mfba9msr99kpqj6"))))
|
||||
"1gwajsl39f1dkzrjld0dm9px8hrj7l7rwzazz00h5rwghk9mhwhq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -1279,7 +1279,7 @@ (define-public mate-utils
|
|||
("pkg-config" ,pkg-config)
|
||||
("scrollkeeper" ,scrollkeeper)
|
||||
("xorgproto" ,xorgproto)
|
||||
("yelp-tools" ,yelp-tools)))
|
||||
("yelp-tools" ,yelp-tools/fixed)))
|
||||
(inputs
|
||||
`(("atk" ,atk)
|
||||
("cairo" ,cairo)
|
||||
|
|
|
|||
|
|
@ -159,16 +159,16 @@ (define-public mescc-tools-0.5.2
|
|||
(version "0.5.2"))
|
||||
(package
|
||||
(name "mescc-tools")
|
||||
(version (string-append version "-" revision "." (string-take commit 7)))
|
||||
(version (git-version version revision commit))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/"
|
||||
name "-" commit
|
||||
".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.nongnu.org/r/mescc-tools.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1h6j57wyf91i42b26f8msbv6451cw3nm4nmpl1fckp9c7vi8mwkh"))))
|
||||
"1nc6rnax66vmhqsjg0kgx23pihdcxmww6v325ywf59vsq1jqjvff"))))
|
||||
(build-system gnu-build-system)
|
||||
(supported-systems '("i686-linux" "x86_64-linux"))
|
||||
(arguments
|
||||
|
|
@ -191,15 +191,14 @@ (define-public mescc-tools
|
|||
(name "mescc-tools")
|
||||
(version "0.6.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/"
|
||||
name "-Release_" version
|
||||
".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.nongnu.org/r/mescc-tools.git")
|
||||
(commit (string-append "Release_" version))))
|
||||
(file-name (string-append "mescc-tools-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n"))))
|
||||
"1cgxcdza6ws725x84i31la7jxmlk5a3nsij5shz1zljg0i36kj99"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments mescc-tools-0.5.2)
|
||||
((#:make-flags _)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2017, 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -123,7 +123,8 @@ (define-public id3lib
|
|||
(modules '((guix build utils)))
|
||||
;; Don't use bundled zlib
|
||||
(snippet '(begin (delete-file-recursively "zlib") #t))
|
||||
(patches (search-patches "id3lib-CVE-2007-4460.patch"))))
|
||||
(patches (search-patches "id3lib-CVE-2007-4460.patch"
|
||||
"id3lib-UTF16-writing-bug.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("zlib" ,zlib)))
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org>
|
||||
;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 nee <nee.git@hidamari.blue>
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
|
||||
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
|
||||
;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
|
||||
;;; Copyright © 2019 David Wilson <david@daviwil.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -593,12 +594,17 @@ (define-public easytag
|
|||
"prefix=~@*~a~@
|
||||
libdir=${prefix}/lib~@
|
||||
includedir=${prefix}/include~@
|
||||
|
||||
Name: libid3tag~@
|
||||
Description:~@
|
||||
Version:~@
|
||||
Libs: -L${libdir} -lid3tag -lz~@
|
||||
Cflags: -I${includedir}~%"
|
||||
libid3tag)))
|
||||
(setenv "PKG_CONFIG_PATH"
|
||||
(string-append (getenv "PKG_CONFIG_PATH")
|
||||
":" (getcwd) "/pkgconfig")))))
|
||||
":" (getcwd) "/pkgconfig"))
|
||||
#t)))
|
||||
(add-after 'unpack 'patch-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile.in"
|
||||
|
|
@ -606,7 +612,8 @@ (define-public easytag
|
|||
;; script with /bin/sh hard-coded.
|
||||
(("/bin/sh") (which "sh"))
|
||||
;; Don't create 'icon-theme.cache'.
|
||||
(("gtk-update-icon-cache") "true")))))))
|
||||
(("gtk-update-icon-cache") "true"))
|
||||
#t)))))
|
||||
(home-page "https://wiki.gnome.org/Apps/EasyTAG")
|
||||
(synopsis "Simple application for viewing and editing tags in audio files")
|
||||
(description
|
||||
|
|
@ -4622,3 +4629,82 @@ (define-public mloop
|
|||
@item Adjust tempo; Playback speed of loops can be adjusted on the fly.
|
||||
@end itemize\n")
|
||||
(license license:gpl2))))
|
||||
|
||||
(define-public pragha
|
||||
(package
|
||||
(name "pragha")
|
||||
(version "1.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/pragha-music-player/pragha/"
|
||||
"releases/download/v" version "/pragha-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"19kbhq99bkimx3aqrdzln0vlr4slkpx6kq66j731jvqyq76nlkp5"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("grilo" ,grilo)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("gst-plugins-good" ,gst-plugins-good)
|
||||
("gtk+" ,gtk+)
|
||||
("libcddb" ,libcddb)
|
||||
("libcdio" ,libcdio)
|
||||
("libcdio-paranoia" ,libcdio-paranoia)
|
||||
("libgudev" ,libgudev)
|
||||
("libnotify" ,libnotify)
|
||||
("libpeas" ,libpeas)
|
||||
("libsoup" ,libsoup)
|
||||
("sqlite" ,sqlite)
|
||||
("taglib" ,taglib)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
|
||||
(wrap-program (string-append out "/bin/pragha")
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
|
||||
#t))))))
|
||||
(home-page "https://pragha-music-player.github.io")
|
||||
(synopsis "Music player")
|
||||
(description "Pragha is a lightweight music player based on Gtk and
|
||||
sqlite. It is constructed to be fast, light, and simultaneously tries to be
|
||||
complete without obstructing your daily work.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public playerctl
|
||||
(package
|
||||
(name "playerctl")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/altdesktop/playerctl.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1f3njnpd52djx3dmhh9a8p5a67f0jmr1gbk98icflr2q91149gjz"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dintrospection=false" "-Dgtk-doc=false")))
|
||||
(inputs `(("python-pygobject" ,python-pygobject)))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)))
|
||||
(synopsis "Control MPRIS-supporting media player applications")
|
||||
(description
|
||||
"Playerctl is a command-line utility and library for controlling media
|
||||
players that implement the MPRIS D-Bus Interface Specification. Playerctl
|
||||
makes it easy to bind player actions, such as play and pause, to media keys.
|
||||
You can also get metadata about the playing track such as the artist and title
|
||||
for integration into status line generators or other command-line tools.")
|
||||
(home-page "https://github.com/altdesktop/playerctl")
|
||||
(license license:lgpl3+)))
|
||||
|
|
|
|||
|
|
@ -551,14 +551,15 @@ (define-public iodine
|
|||
(define-public whois
|
||||
(package
|
||||
(name "whois")
|
||||
(version "5.5.1")
|
||||
(version "5.5.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://debian/pool/main/w/whois/"
|
||||
"whois_" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "10mc7iqhdnvd1kk8gnnhihd5ga2rw3sz69n3nd6x8fb65qpq13gf"))))
|
||||
(base32
|
||||
"1h55zs3cj4w9b0hq0x3z7s2mn46v0jyc39gz320ra4hwr0xlsnf0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ (define-public guix
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1j2d9anxgybv86pxcn1zdv121hb4nmjjp5ngx365fnd0mcg8q1iw"))
|
||||
"0yx19hxvmkr6ar65ym87xd83n6hz02mr7ibwis7i8wah85ypfq26"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
From 3918944856834ef4a7ed613243a1612424d2daba Mon Sep 17 00:00:00 2001
|
||||
From: Brian Leung <leungbk@mailfence.com>
|
||||
Date: Thu, 10 Oct 2019 06:54:33 +0200
|
||||
Subject: [PATCH] Use require statements.
|
||||
|
||||
---
|
||||
helm-org-ql.el | 19 ++-----------------
|
||||
1 file changed, 2 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/helm-org-ql.el b/helm-org-ql.el
|
||||
index 26beab9..113b7f2 100644
|
||||
--- a/helm-org-ql.el
|
||||
+++ b/helm-org-ql.el
|
||||
@@ -35,23 +35,8 @@
|
||||
(require 'org-ql)
|
||||
(require 'org-ql-search)
|
||||
|
||||
-;; (require 'helm)
|
||||
-;; (require 'helm-org)
|
||||
-
|
||||
-;;;; Compatibility
|
||||
-
|
||||
-;; Declare Helm functions since Helm may not be installed.
|
||||
-(declare-function helm "ext:helm")
|
||||
-(declare-function helm-run-after-exit "ext:helm")
|
||||
-(declare-function helm-window "ext:helm-lib")
|
||||
-(declare-function helm-buffer-get "ext:helm-lib")
|
||||
-(declare-function helm-make-source "ext:helm-source")
|
||||
-(declare-function helm-org-goto-marker "ext:helm-org")
|
||||
-
|
||||
-;; Silence byte-compiler about variables.
|
||||
-(defvar helm-map)
|
||||
-(defvar helm-pattern)
|
||||
-(defvar helm-input-idle-delay)
|
||||
+(require 'helm)
|
||||
+(require 'helm-org)
|
||||
|
||||
;;;; Variables
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
39
gnu/packages/patches/id3lib-UTF16-writing-bug.patch
Normal file
39
gnu/packages/patches/id3lib-UTF16-writing-bug.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
|
||||
--- id3lib-3.8.3.orig/ChangeLog 2003-03-02 01:23:00.000000000 +0100
|
||||
+++ id3lib-3.8.3/ChangeLog 2006-02-22 00:33:59.946214472 +0100
|
||||
@@ -1,3 +1,8 @@
|
||||
+2006-02-17 Jerome Couderc
|
||||
+
|
||||
+ * Patch from Spoon to fix UTF-16 writing bug
|
||||
+ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
|
||||
+
|
||||
2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org>
|
||||
|
||||
* THANKS (1.20): added more people
|
||||
diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
|
||||
--- id3lib-3.8.3.orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100
|
||||
+++ id3lib-3.8.3/src/io_helpers.cpp 2006-02-22 00:35:02.926639992 +0100
|
||||
@@ -363,11 +363,22 @@
|
||||
// Write the BOM: 0xFEFF
|
||||
unicode_t BOM = 0xFEFF;
|
||||
writer.writeChars((const unsigned char*) &BOM, 2);
|
||||
+ // Patch from Spoon : 2004-08-25 14:17
|
||||
+ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
|
||||
+ // Wrong code
|
||||
+ //for (size_t i = 0; i < size; i += 2)
|
||||
+ //{
|
||||
+ // unicode_t ch = (data[i] << 8) | data[i+1];
|
||||
+ // writer.writeChars((const unsigned char*) &ch, 2);
|
||||
+ //}
|
||||
+ // Right code
|
||||
+ unsigned char *pdata = (unsigned char *) data.c_str();
|
||||
for (size_t i = 0; i < size; i += 2)
|
||||
{
|
||||
- unicode_t ch = (data[i] << 8) | data[i+1];
|
||||
+ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
|
||||
writer.writeChars((const unsigned char*) &ch, 2);
|
||||
}
|
||||
+ // End patch
|
||||
}
|
||||
return writer.getCur() - beg;
|
||||
}
|
||||
12
gnu/packages/patches/nsis-env-passthru.patch
Normal file
12
gnu/packages/patches/nsis-env-passthru.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- nsis-3.04-src/SConstruct 2019-05-30 14:53:30.276775332 -0400
|
||||
+++ nsis-3.04-src/SConstruct 2019-05-30 14:54:17.901232914 -0400
|
||||
@@ -77,6 +77,9 @@
|
||||
if not toolset and not path:
|
||||
defenv = Environment(TARGET_ARCH = arch)
|
||||
|
||||
+import os;
|
||||
+defenv['ENV'] = os.environ
|
||||
+
|
||||
Export('defenv')
|
||||
|
||||
######################################################################
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Include <sys/sysmacros.h> for "major" and "minor".
|
||||
|
||||
Taken from upstream:
|
||||
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=ba5e0451b51c983e40afd123b6e0d3eddb55e610
|
||||
|
||||
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
|
||||
index 31b98ab..7e86b51 100644
|
||||
--- a/libparted/arch/linux.c
|
||||
+++ b/libparted/arch/linux.c
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <sys/utsname.h> /* for uname() */
|
||||
#include <scsi/scsi.h>
|
||||
#include <assert.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#ifdef ENABLE_DEVICE_MAPPER
|
||||
#include <libdevmapper.h>
|
||||
#endif
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
Fix a test failure on some systems.
|
||||
|
||||
Taken from upstream:
|
||||
https://github.com/strace/strace/commit/4377e3a1535a0ec3a42da8a1366ad6943f4efa0e
|
||||
|
||||
diff --git a/tests/gen_tests.in b/tests/gen_tests.in
|
||||
index 4a506b94c..4fdf4722c 100644
|
||||
--- a/tests/gen_tests.in
|
||||
+++ b/tests/gen_tests.in
|
||||
@@ -168,16 +168,16 @@ ipc_msg-Xabbrev +ipc.sh -Xabbrev -a26
|
||||
ipc_msg-Xraw +ipc.sh -Xraw -a16
|
||||
ipc_msg-Xverbose +ipc.sh -Xverbose -a34
|
||||
ipc_msgbuf-Xabbrev +ipc_msgbuf.test -Xabbrev
|
||||
-ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a22
|
||||
+ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a20
|
||||
ipc_msgbuf-Xverbose +ipc_msgbuf.test -Xverbose
|
||||
ipc_sem +ipc.sh -a29
|
||||
ipc_sem-Xabbrev +ipc.sh -Xabbrev -a29
|
||||
ipc_sem-Xraw +ipc.sh -Xraw -a19
|
||||
ipc_sem-Xverbose +ipc.sh -Xverbose -a36
|
||||
-ipc_shm +ipc.sh -a29
|
||||
-ipc_shm-Xabbrev +ipc.sh -Xabbrev -a29
|
||||
+ipc_shm +ipc.sh -a26
|
||||
+ipc_shm-Xabbrev +ipc.sh -Xabbrev -a26
|
||||
ipc_shm-Xraw +ipc.sh -Xraw -a19
|
||||
-ipc_shm-Xverbose +ipc.sh -Xverbose -a36
|
||||
+ipc_shm-Xverbose +ipc.sh -Xverbose -a34
|
||||
kcmp -a22
|
||||
kcmp-y -a22 -y -e trace=kcmp
|
||||
kern_features -a16
|
||||
|
|
@ -2197,14 +2197,14 @@ (define-public python2-unidecode
|
|||
(define-public python-pyjwt
|
||||
(package
|
||||
(name "python-pyjwt")
|
||||
(version "1.5.3")
|
||||
(version "1.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "PyJWT" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rxsg14i33vm2i6lz0my628108c81k43v10n4h3p0gx62xdyf2sh"))
|
||||
"15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -7742,20 +7742,21 @@ (define-public python2-nbformat
|
|||
(define-public python-bleach
|
||||
(package
|
||||
(name "python-bleach")
|
||||
(version "1.4.3")
|
||||
(version "3.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "bleach" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj"))))
|
||||
"1yhrgrhkln8bd6gn3imj69g1h4xqah9gaz9q26crqr6gmmvpzprz"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-html5lib" ,python-html5lib-0.9)
|
||||
`(("python-webencodings" ,python-webencodings)
|
||||
("python-six" ,python-six)))
|
||||
(native-inputs
|
||||
`(("python-nose" ,python-nose)))
|
||||
`(("python-pytest" ,python-pytest)
|
||||
("python-pytest-runner" ,python-pytest-runner-2)))
|
||||
(home-page "https://github.com/jsocol/bleach")
|
||||
(synopsis "Whitelist-based HTML-sanitizing tool")
|
||||
(description "Bleach is an easy whitelist-based HTML-sanitizing tool.")
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@ (define-module (gnu packages re2c)
|
|||
(define-public re2c
|
||||
(package
|
||||
(name "re2c")
|
||||
(version "1.1.1")
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/skvadrik/" name
|
||||
"/releases/download/" version "/"
|
||||
name "-" version ".tar.gz"))
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ksifjn18v6nra935dpqllmvkqgcdsggfjgmj77282x0gqrrfrc5"))))
|
||||
"05xq0571mkgr20v827jm63nhsirr8arghg4fszzswrmrnl3dfk0s"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://re2c.org/")
|
||||
(synopsis "Lexer generator for C/C++")
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ (define-module (gnu packages tbb)
|
|||
(define-public tbb
|
||||
(package
|
||||
(name "tbb")
|
||||
(version "2019_U8")
|
||||
(version "2019_U9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -37,7 +37,7 @@ (define-public tbb
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z0kh1a5g28gckcxlv3x7qqskh5fsl8knf2ypbbvk7z9ln9k3wfq"))
|
||||
"1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ (define-public tcl
|
|||
;; likely related to name resolution), but that doesn't cause
|
||||
;; `make' to fail.
|
||||
#:test-target "test"))
|
||||
(home-page "http://www.tcl.tk/")
|
||||
(home-page "https://www.tcl.tk/")
|
||||
(synopsis "The Tcl scripting language")
|
||||
(description "The Tcl (Tool Command Language) scripting language.")
|
||||
(license license:tcl/tk)))
|
||||
|
|
|
|||
|
|
@ -392,6 +392,7 @@ (define-public openssl-1.0
|
|||
(inherit openssl)
|
||||
(name "openssl")
|
||||
(version "1.0.2s")
|
||||
(replacement openssl-1.0.2t)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "https://www.openssl.org/source/openssl-"
|
||||
|
|
@ -473,6 +474,27 @@ (define-public openssl-1.0
|
|||
,version "/misc"))
|
||||
#t)))))))))
|
||||
|
||||
(define openssl-1.0.2t
|
||||
(package
|
||||
(inherit openssl)
|
||||
(version "1.0.2t")
|
||||
(source (origin
|
||||
(inherit (package-source openssl-1.0))
|
||||
(uri (list (string-append "https://www.openssl.org/source/openssl-"
|
||||
version ".tar.gz")
|
||||
(string-append "ftp://ftp.openssl.org/source/"
|
||||
"openssl-" version ".tar.gz")
|
||||
(string-append "ftp://ftp.openssl.org/source/old/"
|
||||
(string-trim-right version char-set:letter)
|
||||
"/openssl-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openssl-1.0)
|
||||
;; Parallel build is not supported in 1.0.x.
|
||||
((#:parallel-build? _ #f) #f)))))
|
||||
|
||||
(define-public libressl
|
||||
(package
|
||||
(name "libressl")
|
||||
|
|
|
|||
|
|
@ -2637,14 +2637,14 @@ (define-public mps-youtube
|
|||
(define-public handbrake
|
||||
(package
|
||||
(name "handbrake")
|
||||
(version "1.2.0")
|
||||
(version "1.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.handbrake.fr/releases/"
|
||||
version "/HandBrake-" version "-source.tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi"))
|
||||
"0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove "contrib" and source not necessary for
|
||||
|
|
|
|||
|
|
@ -466,15 +466,14 @@ (define-public fcgiwrap
|
|||
(define-public starman
|
||||
(package
|
||||
(name "starman")
|
||||
(version "0.4014")
|
||||
(version "0.4015")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/"
|
||||
"Starman-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sbb5rb3vs82rlh1fjkgkcmj5pj62b4y9si4ihh45sl9m8c2qxx5"))))
|
||||
(base32 "1y1kn4929k299fbf6sw9lxcsdlq9fvq777p6yrzk591rr9xhkx8h"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-libwww" ,perl-libwww)
|
||||
|
|
@ -6544,6 +6543,7 @@ (define-public nghttp2
|
|||
(package
|
||||
(name "nghttp2")
|
||||
(version "1.39.1")
|
||||
(replacement nghttp2-1.39.2)
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -6622,6 +6622,19 @@ (define-public nghttp2
|
|||
@end itemize\n")
|
||||
(license license:expat)))
|
||||
|
||||
(define nghttp2-1.39.2
|
||||
(package
|
||||
(inherit nghttp2)
|
||||
(version "1.39.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/nghttp2/nghttp2/"
|
||||
"releases/download/v" version "/"
|
||||
"nghttp2-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2"))))))
|
||||
|
||||
(define-public hpcguix-web
|
||||
(let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508")
|
||||
(revision "4"))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015, 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
(define-module (gnu packages xiph)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages curl)
|
||||
|
|
@ -41,6 +42,7 @@ (define-module (gnu packages xiph)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:export (libogg
|
||||
libvorbis
|
||||
|
|
@ -185,15 +187,17 @@ (define speexdsp
|
|||
(define ao
|
||||
(package
|
||||
(name "ao")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.xiph.org/releases/ao/libao-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"))))
|
||||
;; We need a few commits on top of 1.2.2 to fix CVE-2017-11548.
|
||||
(version "1.2.2-5-g20dc8ed")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.xiph.org/libao.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1d1b3g2a7jd43c32242yq6nfysqsmp7rjslhvbrmpgk119l5fnbj"))))
|
||||
(build-system gnu-build-system)
|
||||
;; FIXME: Add further backends, see the summary printed after configure.
|
||||
;; XXX: Should back-ends be pushed to different outputs? For instance,
|
||||
|
|
@ -203,7 +207,10 @@ (define ao
|
|||
`(("alsa-lib" ,alsa-lib)
|
||||
("pulseaudio" ,pulseaudio)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(synopsis "Cross platform audio library")
|
||||
(description
|
||||
"Libao is a cross-platform audio library that allows programs to
|
||||
|
|
@ -230,6 +237,7 @@ (define ao
|
|||
@end enumerate
|
||||
")
|
||||
(license license:gpl2+)
|
||||
(properties '((cpe-name . "libao")))
|
||||
(home-page "https://www.xiph.org/ao/")))
|
||||
|
||||
(define flac
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
|
||||
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
|
||||
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
||||
|
|
@ -67,6 +67,7 @@ (define-public expat
|
|||
(package
|
||||
(name "expat")
|
||||
(version "2.2.7")
|
||||
(replacement expat-2.2.9)
|
||||
(source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -88,6 +89,23 @@ (define-public expat
|
|||
things the parser might find in the XML document (like start tags).")
|
||||
(license license:expat)))
|
||||
|
||||
(define expat-2.2.9
|
||||
(package
|
||||
(inherit expat)
|
||||
(version "2.2.9")
|
||||
(source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "mirror://sourceforge/expat/expat/"
|
||||
version "/expat-" version ".tar.xz")
|
||||
(string-append
|
||||
"https://github.com/libexpat/libexpat/releases/download/R_"
|
||||
(string-map dot->underscore version)
|
||||
"/expat-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy")))))))
|
||||
|
||||
(define-public libebml
|
||||
(package
|
||||
(name "libebml")
|
||||
|
|
|
|||
|
|
@ -4394,14 +4394,14 @@ (define-public xwd
|
|||
redisplay, printing, editing, formatting, archiving, image processing,
|
||||
etc. The target window is selected by clicking the pointer in the
|
||||
desired window. The keyboard bell is rung once at the beginning of the
|
||||
dump and twice whenthe dump is completed.")
|
||||
dump and twice when the dump is completed.")
|
||||
(license license:x11)))
|
||||
|
||||
|
||||
(define-public xwininfo
|
||||
(package
|
||||
(name "xwininfo")
|
||||
(version "1.1.4")
|
||||
(version "1.1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4411,7 +4411,7 @@ (define-public xwininfo
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"))))
|
||||
"03h8clirhw5ki1xxp18xbf5vynm7r0dwspsgfin6cxn4vx0m8h3s"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -57,12 +57,16 @@ (define %default-modules
|
|||
'((guix build gnu-build-system)
|
||||
(guix build utils)))
|
||||
|
||||
(define* (package-with-explicit-inputs p inputs
|
||||
#:optional
|
||||
(loc (current-source-location))
|
||||
#:key (native-inputs '())
|
||||
guile)
|
||||
"Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take INPUTS and
|
||||
(define* (package-with-explicit-inputs/deprecated p inputs
|
||||
#:optional
|
||||
(loc (current-source-location))
|
||||
#:key (native-inputs '())
|
||||
guile)
|
||||
"This variant is deprecated because it is inefficient: it memoizes only
|
||||
temporarily instead of memoizing across all transformations where INPUTS is
|
||||
the same.
|
||||
|
||||
Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take INPUTS and
|
||||
NATIVE-INPUTS as explicit inputs instead of the implicit default, and return
|
||||
it. INPUTS and NATIVE-INPUTS can be either input lists or thunks; in the
|
||||
latter case, they will be called in a context where the `%current-system' and
|
||||
|
|
@ -124,6 +128,47 @@ (define rewritten-input
|
|||
,@(map rewritten-input
|
||||
(filtered (package-inputs p)))))))))
|
||||
|
||||
(define* (package-with-explicit-inputs* inputs #:optional guile)
|
||||
"Return a procedure that rewrites the given package and all its dependencies
|
||||
so that they use INPUTS (a thunk) instead of implicit inputs."
|
||||
(define (duplicate-filter package-inputs)
|
||||
(let ((names (match (inputs)
|
||||
(((name _ ...) ...)
|
||||
name))))
|
||||
(fold alist-delete package-inputs names)))
|
||||
|
||||
(define (add-explicit-inputs p)
|
||||
(if (and (eq? (package-build-system p) gnu-build-system)
|
||||
(not (memq #:implicit-inputs? (package-arguments p))))
|
||||
(package
|
||||
(inherit p)
|
||||
(inputs (append (inputs)
|
||||
(duplicate-filter (package-inputs p))))
|
||||
(arguments
|
||||
(ensure-keyword-arguments (package-arguments p)
|
||||
`(#:implicit-inputs? #f
|
||||
#:guile ,guile))))
|
||||
p))
|
||||
|
||||
(define (cut? p)
|
||||
(and (eq? (package-build-system p) gnu-build-system)
|
||||
(memq #:implicit-inputs? (package-arguments p))))
|
||||
|
||||
(package-mapping add-explicit-inputs cut?))
|
||||
|
||||
(define package-with-explicit-inputs
|
||||
(case-lambda*
|
||||
((inputs #:optional guile)
|
||||
(package-with-explicit-inputs* inputs guile))
|
||||
((p inputs #:optional (loc (current-source-location))
|
||||
#:key (native-inputs '()) guile)
|
||||
;; deprecated
|
||||
(package-with-explicit-inputs/deprecated p inputs
|
||||
loc
|
||||
#:native-inputs
|
||||
native-inputs
|
||||
#:guile guile))))
|
||||
|
||||
(define (package-with-extra-configure-variable p variable value)
|
||||
"Return a version of P with VARIABLE=VALUE specified as an extra `configure'
|
||||
flag, recursively. An example is LDFLAGS=-static. If P already has configure
|
||||
|
|
|
|||
|
|
@ -76,7 +76,9 @@ (define* (scons-build store name inputs
|
|||
#:key
|
||||
(tests? #t)
|
||||
(scons-flags ''())
|
||||
(build-targets ''())
|
||||
(test-target "test")
|
||||
(install-targets ''("install"))
|
||||
(phases '(@ (guix build scons-build-system)
|
||||
%standard-phases))
|
||||
(outputs '("out"))
|
||||
|
|
@ -101,8 +103,10 @@ (define builder
|
|||
source))
|
||||
#:scons-flags ,scons-flags
|
||||
#:system ,system
|
||||
#:build-targets ,build-targets
|
||||
#:test-target ,test-target
|
||||
#:tests? ,tests?
|
||||
#:install-targets ,install-targets
|
||||
#:phases ,phases
|
||||
#:outputs %outputs
|
||||
#:search-paths ',(map search-path-specification->sexp
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ (define-module (guix build scons-build-system)
|
|||
;;
|
||||
;; Code:
|
||||
|
||||
(define* (build #:key outputs (scons-flags '()) (parallel-build? #t) #:allow-other-keys)
|
||||
(define* (build #:key outputs (build-targets '()) (scons-flags '()) (parallel-build? #t) #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(mkdir-p out)
|
||||
(apply invoke "scons"
|
||||
|
|
@ -37,7 +37,8 @@ (define* (build #:key outputs (scons-flags '()) (parallel-build? #t) #:allow-oth
|
|||
(list "-j" (number->string
|
||||
(parallel-job-count)))
|
||||
(list))
|
||||
scons-flags))))
|
||||
scons-flags
|
||||
build-targets))))
|
||||
|
||||
(define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys)
|
||||
"Run the test suite of a given SCons application."
|
||||
|
|
@ -46,9 +47,9 @@ (define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys)
|
|||
(format #t "test suite not run~%"))
|
||||
#t)
|
||||
|
||||
(define* (install #:key outputs (scons-flags '()) #:allow-other-keys)
|
||||
(define* (install #:key outputs (install-targets '("install")) (scons-flags '()) #:allow-other-keys)
|
||||
"Install a given SCons application."
|
||||
(apply invoke "scons" "install" scons-flags))
|
||||
(apply invoke "scons" (append scons-flags install-targets)))
|
||||
|
||||
(define %standard-phases
|
||||
(modify-phases gnu:%standard-phases
|
||||
|
|
|
|||
|
|
@ -1508,7 +1508,7 @@ (define* (load-path-expression modules #:optional (path %load-path)
|
|||
(gexp (eval-when (expand load eval)
|
||||
;; Augment the load paths and delete duplicates. Do that
|
||||
;; without loading (srfi srfi-1) or anything.
|
||||
(let ((extensions '((ungexp-native-splicing extensions)))
|
||||
(let ((extensions '((ungexp-splicing extensions)))
|
||||
(prepend (lambda (items lst)
|
||||
;; This is O(N²) but N is typically small.
|
||||
(let loop ((items items)
|
||||
|
|
|
|||
Loading…
Reference in a new issue