mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
Merge branch 'master' into core-updates
This commit is contained in:
Ludovic Courtès
commit
0cf2b6f2db
43 changed files with 642 additions and 343 deletions
|
|
@ -513,6 +513,7 @@ ready to use it.
|
|||
* Setting Up the Daemon:: Preparing the build daemon's environment.
|
||||
* Invoking guix-daemon:: Running the build daemon.
|
||||
* Application Setup:: Application-specific setup.
|
||||
* Upgrading Guix:: Upgrading Guix and its build daemon.
|
||||
@end menu
|
||||
|
||||
@node Binary Installation
|
||||
|
|
@ -794,22 +795,6 @@ GNU Coding Standards}). The @command{configure} script protects against
|
|||
unintended misconfiguration of @var{localstatedir} so you do not
|
||||
inadvertently corrupt your store (@pxref{The Store}).
|
||||
|
||||
@cindex Nix, compatibility
|
||||
When a working installation of @url{https://nixos.org/nix/, the Nix package
|
||||
manager} is available, you
|
||||
can instead configure Guix with @code{--disable-daemon}. In that case,
|
||||
Nix replaces the three dependencies above.
|
||||
|
||||
Guix is compatible with Nix, so it is possible to share the same store
|
||||
between both. To do so, you must pass @command{configure} not only the
|
||||
same @code{--with-store-dir} value, but also the same
|
||||
@code{--localstatedir} value. The latter is essential because it
|
||||
specifies where the database that stores metadata about the store is
|
||||
located, among other things. The default values for Nix are
|
||||
@code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}.
|
||||
Note that @code{--disable-daemon} is not required if
|
||||
your goal is to share the store with Nix.
|
||||
|
||||
@node Running the Test Suite
|
||||
@section Running the Test Suite
|
||||
|
||||
|
|
@ -1777,6 +1762,40 @@ invoke the actual linker with this new set of arguments. You can instruct the
|
|||
wrapper to refuse to link against libraries not in the store by setting the
|
||||
@code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}.
|
||||
|
||||
@node Upgrading Guix
|
||||
@section Upgrading Guix
|
||||
|
||||
@cindex Upgrading Guix, on a foreign distro
|
||||
|
||||
To upgrade Guix, run:
|
||||
|
||||
@example
|
||||
guix pull
|
||||
@end example
|
||||
|
||||
@xref{Invoking guix pull}, for more information.
|
||||
|
||||
@cindex upgrading Guix for the root user, on a foreign distro
|
||||
@cindex upgrading the Guix daemon, on a foreign distro
|
||||
@cindex @command{guix pull} for the root user, on a foreign distro
|
||||
|
||||
On a foreign distro, you can upgrade the build daemon by running:
|
||||
|
||||
@example
|
||||
sudo -i guix pull
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
followed by (assuming your distro uses the systemd service management
|
||||
tool):
|
||||
|
||||
@example
|
||||
systemctl restart guix-daemon.service
|
||||
@end example
|
||||
|
||||
On Guix System, upgrading the daemon is achieved by reconfiguring the
|
||||
system (@pxref{Invoking guix system, @code{guix system reconfigure}}).
|
||||
|
||||
@c TODO What else?
|
||||
|
||||
@c *********************************************************************
|
||||
|
|
|
|||
|
|
@ -674,6 +674,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/a2ps-CVE-2001-1593.patch \
|
||||
%D%/packages/patches/a2ps-CVE-2014-0466.patch \
|
||||
%D%/packages/patches/a2ps-CVE-2015-8107.patch \
|
||||
%D%/packages/patches/abcl-fix-build-xml.patch \
|
||||
%D%/packages/patches/abiword-explictly-cast-bools.patch \
|
||||
%D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
|
||||
%D%/packages/patches/adb-add-libraries.patch \
|
||||
|
|
@ -764,7 +765,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/dbus-helper-search-path.patch \
|
||||
%D%/packages/patches/dbus-c++-gcc-compat.patch \
|
||||
%D%/packages/patches/dbus-c++-threading-mutex.patch \
|
||||
%D%/packages/patches/dealii-mpi-deprecations.patch \
|
||||
%D%/packages/patches/debops-constants-for-external-program-names.patch \
|
||||
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
|
||||
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
|
||||
|
|
@ -1098,7 +1098,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/lxsession-use-gapplication.patch \
|
||||
%D%/packages/patches/make-glibc-compat.patch \
|
||||
%D%/packages/patches/make-impure-dirs.patch \
|
||||
%D%/packages/patches/mame-rapidjson-fix.patch \
|
||||
%D%/packages/patches/mariadb-client-test-32bit.patch \
|
||||
%D%/packages/patches/mars-install.patch \
|
||||
%D%/packages/patches/mars-sfml-2.3.patch \
|
||||
|
|
|
|||
|
|
@ -2852,11 +2852,10 @@ (define-public neofetch
|
|||
(license license:expat)))
|
||||
|
||||
(define-public screenfetch
|
||||
;; First commit supporting current Guix System.
|
||||
(let ((commit "e3ec82dd464e81e4d10bef218b3016e3044c766c"))
|
||||
(let ((commit "e7b94fc3c529b9b97f32b71fd4bc05fb1d0f5864"))
|
||||
(package
|
||||
(name "screenfetch")
|
||||
(version (git-version "3.8.0" "1" commit))
|
||||
(version (git-version "3.8.0" "2" commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -2865,7 +2864,7 @@ (define-public screenfetch
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lzs1l5xgj9mn4b59lhkfgqnyiivf8svd1iwjabzrax90rdmxfwj"))))
|
||||
"13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ (define-public cmh
|
|||
(define-public giac
|
||||
(package
|
||||
(name "giac")
|
||||
(version "1.5.0-63")
|
||||
(version "1.5.0-65")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; "~parisse/giac" is not used because the maintainer regularly
|
||||
|
|
@ -356,7 +356,7 @@ (define-public giac
|
|||
"source/giac_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jp7awyp8j8w6fhn802z8ddbq1fxhkyk9xdf0mq0mm0chpkylwqk"))))
|
||||
"1g2fp9vgy0gqjmi6mlc3ldfn8ryq3h4mfd7rcq5hs6ry21hblv30"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((ice-9 ftw)
|
||||
|
|
@ -987,7 +987,7 @@ (define-public eigen-for-tensorflow
|
|||
(define-public xtensor
|
||||
(package
|
||||
(name "xtensor")
|
||||
(version "0.20.5")
|
||||
(version "0.20.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -995,7 +995,7 @@ (define-public xtensor
|
|||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0kkc4ar7p2d94jnclmrh46dwv7ldy9lx630vm9gci3pp4hnhbj9f"))
|
||||
"1rw04bdi7mzp362dhkxr9m4rafnvb47xjsi9p3fp4vfif8v0jij8"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
|
|
@ -1005,7 +1005,7 @@ (define-public xtensor
|
|||
`(#:configure-flags
|
||||
'("-DBUILD_TESTS=ON")
|
||||
#:test-target "xtest"))
|
||||
(home-page "http://quantstack.net/xtensor")
|
||||
(home-page "https://quantstack.net/xtensor")
|
||||
(synopsis "C++ tensors with broadcasting and lazy computing")
|
||||
(description "xtensor is a C++ library meant for numerical analysis with
|
||||
multi-dimensional array expressions.
|
||||
|
|
|
|||
|
|
@ -7367,13 +7367,13 @@ (define-public r-s4vectors
|
|||
(define-public r-iranges
|
||||
(package
|
||||
(name "r-iranges")
|
||||
(version "2.18.2")
|
||||
(version "2.18.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "IRanges" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dc35844c1mfj07hvy6yn4wag6qdggbgl9gjcg3wpkh9hkm60a5n"))))
|
||||
"05rw2b2bwns443n7d6lf97zdv1jbqdii2nprhs6x852w73m2a2g3"))))
|
||||
(properties
|
||||
`((upstream-name . "IRanges")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -7731,13 +7731,13 @@ (define-public r-biostrings
|
|||
(define-public r-rsamtools
|
||||
(package
|
||||
(name "r-rsamtools")
|
||||
(version "2.0.0")
|
||||
(version "2.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Rsamtools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nv5idyjk75mvl4np5sig0xa6qygm1ivj33k041ffyj19q8jf7ij"))))
|
||||
"0wzp5vsmqs7h44r7lcw8fnz5x9bcdcfiqq8d3h62wwibyk2lg0w1"))))
|
||||
(properties
|
||||
`((upstream-name . "Rsamtools")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -8283,14 +8283,14 @@ (define-public r-r4rna
|
|||
(define-public r-rhtslib
|
||||
(package
|
||||
(name "r-rhtslib")
|
||||
(version "1.16.1")
|
||||
(version "1.16.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Rhtslib" version))
|
||||
(sha256
|
||||
(base32
|
||||
"178zbrm221rwhbjk7j2v9g5ra44k0xg7c5abhd810m3g7snma8k8"))))
|
||||
"07qaqj2hypmrg40m3pci082bzar6wi10dh77r4a8x74dfppcwdzf"))))
|
||||
(properties `((upstream-name . "Rhtslib")))
|
||||
(build-system r-build-system)
|
||||
;; Without this a temporary directory ends up in the Rhtslib.so binary,
|
||||
|
|
@ -9165,14 +9165,14 @@ (define-public r-protgenerics
|
|||
(define-public r-mzr
|
||||
(package
|
||||
(name "r-mzr")
|
||||
(version "2.18.0")
|
||||
(version "2.18.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "mzR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0g5r6yk4gyz0xdwlmrcij4zv7apdgsgygr043095l33hard6nsl5"))
|
||||
"1pr1pcrg3r3pccm5ag6l8ic6rpqbk9jnlb9mm7g4ak5jwrajbzjq"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -9193,7 +9193,8 @@ (define-public r-mzr
|
|||
-lboost_iostreams -lboost_thread -lboost_filesystem -lboost_chrono\n")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(;; XXX Boost 1.69 will not work here.
|
||||
`(;; Our default boost package won't work here, unfortunately, even with
|
||||
;; mzR version 2.18.1.
|
||||
("boost" ,boost-for-mysql) ; use this instead of the bundled boost sources
|
||||
("zlib" ,zlib)))
|
||||
(propagated-inputs
|
||||
|
|
@ -10267,14 +10268,14 @@ (define-public r-gqtlstats
|
|||
(define-public r-gviz
|
||||
(package
|
||||
(name "r-gviz")
|
||||
(version "1.28.1")
|
||||
(version "1.28.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Gviz" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0chsb3ijwd8zh588s1vqgfassn2rzax5rhqrhl0ini6pi4ilchp2"))))
|
||||
"0347r1ly0vzpilflzbyzsjdf4cday294lw3fxzx61clblrmws1ki"))))
|
||||
(properties `((upstream-name . "Gviz")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ (define-public json-modern-cxx
|
|||
(define-public xtl
|
||||
(package
|
||||
(name "xtl")
|
||||
(version "0.6.4")
|
||||
(version "0.6.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
|
|
@ -257,7 +257,7 @@ (define-public xtl
|
|||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0rwdw43fq7c581m6frzsd06h71sf7abk7danwa3cp6wd6cgkwdbk"))
|
||||
"0dds2fzyis42b1c3biqr3ir9l96csyyfkwrkm3fqjksdhgdklzmj"))
|
||||
(file-name (git-file-name name version))))
|
||||
(native-inputs
|
||||
`(("googletest" ,googletest)
|
||||
|
|
|
|||
|
|
@ -98,14 +98,14 @@ (define-public r-clipr
|
|||
(define-public r-ellipsis
|
||||
(package
|
||||
(name "r-ellipsis")
|
||||
(version "0.2.0.1")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ellipsis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hx9l043433bwm1np9sypph77c7y9dddpz0wrhbkcv01x32jhr8f"))))
|
||||
"01z9gq311nzwv3a0sa49jhm5ylqd59srip4vjkrf23hzgb5i9y0b"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-rlang" ,r-rlang)))
|
||||
|
|
@ -371,14 +371,14 @@ (define-public r-reprex
|
|||
(define-public r-callr
|
||||
(package
|
||||
(name "r-callr")
|
||||
(version "3.3.1")
|
||||
(version "3.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "callr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rvrlg86fxr5nadvqa0dr1iifqjs4d1rc32v76m3ccvx6m3xlq5z"))))
|
||||
"12dbqzjngbyaqdyw0yq1blyfx8pagcvx1vqj2jm451hs25nhdrnh"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-r6" ,r-r6)
|
||||
|
|
@ -582,14 +582,14 @@ (define-public r-htmlwidgets
|
|||
(define-public r-htmltable
|
||||
(package
|
||||
(name "r-htmltable")
|
||||
(version "1.13.1")
|
||||
(version "1.13.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "htmlTable" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1l44b33xgj2698k6nz17r8fl0ink14ryzng803apm9d6bnv357v8"))))
|
||||
"0h6jslchlx1dzqqdb70c3n9xlapcym9ykycvr0hc4q3450y8qmvh"))))
|
||||
(properties `((upstream-name . "htmlTable")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -615,13 +615,13 @@ (define-public r-htmltable
|
|||
(define-public r-curl
|
||||
(package
|
||||
(name "r-curl")
|
||||
(version "4.0")
|
||||
(version "4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "curl" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0wb1j87fa2nd4a9x1w2nmc453nzvx6qiq8dviwc4jr36hsf9ra89"))))
|
||||
"0xh227gvb056wlipjxxbf555z1i1qcs7rr1igvs6k6645y9irrlp"))))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -2996,14 +2996,14 @@ (define-public r-broom
|
|||
(define-public r-recipes
|
||||
(package
|
||||
(name "r-recipes")
|
||||
(version "0.1.6")
|
||||
(version "0.1.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "recipes" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ndz9h0zvdj141r63l8047wbhaj0x8fwzzyq7b8mh78pvrrdpq2i"))))
|
||||
"1gw8x7vqj7k18mfpiqinyfwzv9i5r0pb51k7xcfxsjap6m9nks98"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-dplyr" ,r-dplyr)
|
||||
|
|
@ -4048,14 +4048,14 @@ (define-public r-uuid
|
|||
(define-public r-tinytex
|
||||
(package
|
||||
(name "r-tinytex")
|
||||
(version "0.15")
|
||||
(version "0.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tinytex" version))
|
||||
(sha256
|
||||
(base32
|
||||
"145dmgq7h55mmqqlnnj153j484x2a9s1fbvjbjkdyqzpnz9qh2ax"))))
|
||||
"1dadq9l0527v038b1k1dyfs0dklsgxnmplls3qhqprfgskif8mga"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-xfun" ,r-xfun)))
|
||||
|
|
@ -4166,21 +4166,20 @@ (define-public r-sna
|
|||
(define-public r-ttr
|
||||
(package
|
||||
(name "r-ttr")
|
||||
(version "0.23-4")
|
||||
(version "0.23-5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "TTR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"18mzyv6cmxmqyqsfwlx2b2k055887mfgc2jgj8xkn8c6m56n05zb"))))
|
||||
"0fxipnyxaz55n4camrk9cs71x9w4dsmjrihysv8i1s6khf825rg6"))))
|
||||
(properties `((upstream-name . "TTR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-curl" ,r-curl)
|
||||
("r-xts" ,r-xts)
|
||||
("r-zoo" ,r-zoo)))
|
||||
(native-inputs `(("gfortran" ,gfortran)))
|
||||
(home-page "https://github.com/joshuaulrich/TTR")
|
||||
(synopsis "Technical trading rules")
|
||||
(description
|
||||
|
|
@ -4753,14 +4752,14 @@ (define-public r-import
|
|||
(define-public r-shinyace
|
||||
(package
|
||||
(name "r-shinyace")
|
||||
(version "0.4.0")
|
||||
(version "0.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "shinyAce" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hvih5g0pswlnz5rf3blx5yqw11ssxvm8w4klxddp1ap20ncbgl1"))))
|
||||
"1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"))))
|
||||
(properties `((upstream-name . "shinyAce")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -6250,14 +6249,14 @@ (define-public r-sjlabelled
|
|||
(define-public r-sjmisc
|
||||
(package
|
||||
(name "r-sjmisc")
|
||||
(version "2.8.1")
|
||||
(version "2.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "sjmisc" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1a30n3cyd9h9ilaiai9ywy53f03nikafc47rvpws2c2vghc8mbn7"))))
|
||||
"0rl0bmk91wc4dxdgy008fl0dwkx3ffvys30vgpnr78lb4pk45nb2"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-dplyr" ,r-dplyr)
|
||||
|
|
@ -6265,7 +6264,8 @@ (define-public r-sjmisc
|
|||
("r-magrittr" ,r-magrittr)
|
||||
("r-purrr" ,r-purrr)
|
||||
("r-rlang" ,r-rlang)
|
||||
("r-sjlabelled" ,r-sjlabelled)))
|
||||
("r-sjlabelled" ,r-sjlabelled)
|
||||
("r-tidyselect" ,r-tidyselect)))
|
||||
(home-page "https://github.com/strengejacke/sjmisc")
|
||||
(synopsis "Data and variable transformation functions")
|
||||
(description
|
||||
|
|
@ -7025,14 +7025,14 @@ (define-public r-mosaicdata
|
|||
(define-public r-raster
|
||||
(package
|
||||
(name "r-raster")
|
||||
(version "3.0-2")
|
||||
(version "3.0-7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "raster" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z4qh3ag1iyly4zjvzi3x2namkndkqn3cjb3ac22xd11sq5gdgiz"))))
|
||||
"0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-rcpp" ,r-rcpp)
|
||||
|
|
@ -8215,14 +8215,14 @@ (define-public r-glmmtmb
|
|||
(define-public r-bayestestr
|
||||
(package
|
||||
(name "r-bayestestr")
|
||||
(version "0.2.5")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "bayestestR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"08d3bsb6li59n17bx1zrqnlnvniyb3vls9kl856km4chx3b2ff82"))))
|
||||
"0r453zb106hj9w53jjgckxqajjf7shlrgv10gjxsv8if6qybdz5b"))))
|
||||
(properties `((upstream-name . "bayestestR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -8916,14 +8916,14 @@ (define-public r-weights
|
|||
(define-public r-rcppannoy
|
||||
(package
|
||||
(name "r-rcppannoy")
|
||||
(version "0.0.12")
|
||||
(version "0.0.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "RcppAnnoy" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1b0fmip9c4i0my1yjrvqy8jxfiiqcggq2kms135q0b53njxnqwwg"))))
|
||||
"1jibp9b07c5ka1kif0nl7f168hxfvysj32wnmnxg85l663hmvm8j"))))
|
||||
(properties `((upstream-name . "RcppAnnoy")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -8943,14 +8943,14 @@ (define-public r-rcppannoy
|
|||
(define-public r-rcpphnsw
|
||||
(package
|
||||
(name "r-rcpphnsw")
|
||||
(version "0.1.0")
|
||||
(version "0.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "RcppHNSW" version))
|
||||
(sha256
|
||||
(base32
|
||||
"158a069n42pbnjrlmvqsr6bm2cfp9hxpnk3nhp3dwi9qjlq4r9bm"))))
|
||||
"0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"))))
|
||||
(properties `((upstream-name . "RcppHNSW")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs `(("r-rcpp" ,r-rcpp)))
|
||||
|
|
@ -9550,14 +9550,14 @@ (define-public r-colorramps
|
|||
(define-public r-tidytree
|
||||
(package
|
||||
(name "r-tidytree")
|
||||
(version "0.2.7")
|
||||
(version "0.2.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tidytree" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15ky7hj7w08jx94wm0yikckca0apwv3jy5svd77dpzgb2lr9ff9a"))))
|
||||
"1hkddl8kj1g01dy7xiracx81f6b405b3ga2qp4wlrl552b9xxpby"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-ape" ,r-ape)
|
||||
|
|
@ -12772,14 +12772,14 @@ (define-public r-classint
|
|||
(define-public r-spdata
|
||||
(package
|
||||
(name "r-spdata")
|
||||
(version "0.3.0")
|
||||
(version "0.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "spData" version))
|
||||
(sha256
|
||||
(base32
|
||||
"162cqb331ki43jx4r8lpkjpn2l712figd896rnawg9j1jmjyl96y"))))
|
||||
"190msrrpn226x27pcnck4ac34f9k4xcn26cyz2apdri2nzkr6zbw"))))
|
||||
(properties `((upstream-name . "spData")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/Nowosad/spData")
|
||||
|
|
@ -12846,14 +12846,14 @@ (define-public r-deldir
|
|||
(define-public r-sf
|
||||
(package
|
||||
(name "r-sf")
|
||||
(version "0.7-7")
|
||||
(version "0.8-0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "sf" version))
|
||||
(sha256
|
||||
(base32
|
||||
"192hw52x1qlif8zyai1kff1wiyr3yl5f7jj1rk3k0nr8das0qy6i"))))
|
||||
"05dyq0vcz2f1fl03hk3v1a4nz4s84yyqw4rc9w9cwfq71gvm9qwf"))))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("gdal" ,gdal)
|
||||
|
|
@ -12880,14 +12880,14 @@ (define-public r-sf
|
|||
(define-public r-spdep
|
||||
(package
|
||||
(name "r-spdep")
|
||||
(version "1.1-2")
|
||||
(version "1.1-3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "spdep" version))
|
||||
(sha256
|
||||
(base32
|
||||
"06mk81kc1ml2wjc8wwwgr0wasjcr4mwrxpfa8vfc373bmnha635s"))))
|
||||
"1f8cjffqqc6rnb3n4qym70ca6nz2kvrsd3g587wrqdr79nnbwnrk"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-boot" ,r-boot)
|
||||
|
|
@ -13343,14 +13343,14 @@ (define-public r-bookdown
|
|||
(define-public r-optparse
|
||||
(package
|
||||
(name "r-optparse")
|
||||
(version "1.6.2")
|
||||
(version "1.6.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "optparse" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zrp6jakjhawrwfri270ym83vj5a7nvjk0w6b41z41ahw2da99dm"))))
|
||||
"0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-getopt" ,r-getopt)))
|
||||
|
|
@ -14994,14 +14994,14 @@ (define-public r-umap
|
|||
(define-public r-uwot
|
||||
(package
|
||||
(name "r-uwot")
|
||||
(version "0.1.3")
|
||||
(version "0.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "uwot" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mq6qi8q9xslh1b99srj480s2a08pfv4bs9m2ykyijj44j9fcdj9"))))
|
||||
"1y9wpzs92d1fl2x5figfywd48lkyhwx37j542z0rf6ckrl46n89n"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-dqrng" ,r-dqrng)
|
||||
|
|
@ -15502,14 +15502,14 @@ (define-public r-assertr
|
|||
(define-public r-parameters
|
||||
(package
|
||||
(name "r-parameters")
|
||||
(version "0.1.0")
|
||||
(version "0.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "parameters" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12v301va1l3xydicbf0k04anxlmyjclbbjfg0riprryhkxwwk8g5"))))
|
||||
"1mgggb3l67wgjiccq4y84wbs2dw9qk01akd553yiwbwky9rpawgh"))))
|
||||
(properties `((upstream-name . "parameters")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -15614,14 +15614,14 @@ (define-public r-lifecycle
|
|||
(define-public r-assertable
|
||||
(package
|
||||
(name "r-assertable")
|
||||
(version "0.2.6")
|
||||
(version "0.2.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "assertable" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jjd6ylh26fykzzv1q2lbajzfj07lyxwb3b3xmr2zdg2fp5b2w4c"))))
|
||||
"1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-data-table" ,r-data-table)))
|
||||
|
|
|
|||
|
|
@ -1856,7 +1856,7 @@ (define-public emacs-mmm-mode
|
|||
(define-public emacs-tablist
|
||||
(package
|
||||
(name "emacs-tablist")
|
||||
(version "0.70")
|
||||
(version "1.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -1865,7 +1865,7 @@ (define-public emacs-tablist
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns"))))
|
||||
"0pzsdg0rm59daw34ppss79cg05z9wnr8nkmdcc48nkd0p69ip2yy"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/politza/tablist")
|
||||
(synopsis "Extension for @code{tabulated-list-mode}")
|
||||
|
|
@ -3627,8 +3627,8 @@ (define-public emacs-company-math
|
|||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-compdef
|
||||
(let ((commit "fc08a9b049c3718fc7d6c6ee2140759aff031bc9")
|
||||
(revision "1"))
|
||||
(let ((commit "67104a38763cc819644f711248b170a43bce151b")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-compdef")
|
||||
(version (git-version "0.2" revision commit))
|
||||
|
|
@ -3640,7 +3640,7 @@ (define-public emacs-compdef
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1dwf4rlj19d80yp656c7nkp6hb3mabv808r6ix3hpv6rjjs38vhl"))))
|
||||
(base32 "1f6y6cr67gps9jp5hd20xszfd3k26v70g6z4g5db6wdkvlnc2wkg"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://gitlab.com/jjzmajic/compdef")
|
||||
(synopsis "Set local completion backends")
|
||||
|
|
@ -3649,6 +3649,31 @@ (define-public emacs-compdef
|
|||
@code{use-package}.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-handle
|
||||
(let ((commit "0180a33c92b53d042c3e248a047e15337122d922")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-handle")
|
||||
(version (git-version "0.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/jjzmajic/handle.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ldrdfxspkq0m07l98hhj9nydgj9qi557mnnpd3v4xrwqwhyr4nc"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://gitlab.com/jjzmajic/handle")
|
||||
(synopsis "Handle generic functions across related major modes")
|
||||
(description "This package provides generic functions that specialize on
|
||||
major modes and intended purpose rather than on arguments. Different
|
||||
callables for tasks like expression evaluation, definition-jumping, and more
|
||||
can now be grouped accordingly and tried in sequence until one of them
|
||||
succeeds.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-nswbuff
|
||||
(let ((commit "362da7f3687e2eb5bb11667347de85f4a9d002bc")
|
||||
(revision "1"))
|
||||
|
|
@ -4740,7 +4765,7 @@ (define-public emacs-solaire-mode
|
|||
(define-public emacs-prescient
|
||||
(package
|
||||
(name "emacs-prescient")
|
||||
(version "3.2")
|
||||
(version "3.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -4749,7 +4774,7 @@ (define-public emacs-prescient
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks"))))
|
||||
"1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-company" ,emacs-company)
|
||||
|
|
@ -5086,6 +5111,9 @@ (define-public emacs-hydra
|
|||
(base32
|
||||
"0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("make" "test")))
|
||||
(home-page "https://github.com/abo-abo/hydra")
|
||||
(synopsis "Make Emacs bindings that stick around")
|
||||
(description
|
||||
|
|
@ -5957,6 +5985,59 @@ (define-public emacs-projectile
|
|||
.projectile file in it.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-skeletor
|
||||
(let ((commit "47c5b761aee8452716c97a69949ac2f675affe13")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-skeletor")
|
||||
(version (git-version "1.6.1" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/chrisbarrett/skeletor.el.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12bdgykfh4mwsqdazxjdvha62h3q3v33159ypy91f6x59y01fi0n"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-s" ,emacs-s)
|
||||
("emacs-f" ,emacs-f)
|
||||
("emacs-dash" ,emacs-dash)
|
||||
("emacs-let-alist" ,emacs-let-alist)))
|
||||
(native-inputs
|
||||
`(("emacs-ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:include (cons "^project-skeletons\\/" %default-include)
|
||||
;; XXX: one failing test involving initializing a git repo
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'make-test-writable
|
||||
(lambda _
|
||||
(make-file-writable "test/skeletor-test.el")
|
||||
#t))
|
||||
(add-before 'check 'remove-git-test
|
||||
(lambda _
|
||||
(emacs-batch-edit-file "test/skeletor-test.el"
|
||||
`(progn
|
||||
(progn
|
||||
(goto-char (point-min))
|
||||
(re-search-forward
|
||||
"ert-deftest initialises-git-repo")
|
||||
(beginning-of-line)
|
||||
(kill-sexp))
|
||||
(basic-save-buffer)))
|
||||
#t)))
|
||||
#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
(home-page "https://github.com/chrisbarrett/skeletor.el")
|
||||
(synopsis "Project skeletons for Emacs")
|
||||
(description "This package provides project templates and automates the
|
||||
mundane parts of setting up a new project, such as version control, licenses,
|
||||
and tooling.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-elfeed
|
||||
(package
|
||||
(name "emacs-elfeed")
|
||||
|
|
@ -11586,7 +11667,7 @@ (define-public emacs-ts
|
|||
(define-public emacs-org-ql
|
||||
(package
|
||||
(name "emacs-org-ql")
|
||||
(version "0.2")
|
||||
(version "0.2.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -11594,7 +11675,7 @@ (define-public emacs-org-ql
|
|||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0mq0aj0a3a5gi9nz0ncpzsh731d92n86b0iinvx1m45dcal06h9y"))
|
||||
"1xyabg9fhpip6426za6wjrn0msnaf10c5fzzaawwagk7zmjf9b48"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -12502,8 +12583,8 @@ (define-public emacs-beginend
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-mbsync
|
||||
(let ((commit "f549eccde6033449d24cd5b6148599484850c403")
|
||||
(revision "2"))
|
||||
(let ((commit "8f80c267cab1acb0d5bdd5b0059f5d1790d499ff")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "emacs-mbsync")
|
||||
(version (git-version "0.1.2" revision commit))
|
||||
|
|
@ -12516,7 +12597,7 @@ (define-public emacs-mbsync
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pdj41rq3pq4jdb5pma5j495xj7w7jgn8pnz1z1zwg75pn7ydfp0"))))
|
||||
"1dwlpcczsa6b7bwv5149by0qmk8v2y7bjad02k4fy25yxznqzci9"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/dimitri/mbsync-el")
|
||||
(synopsis "Interface to mbsync for Emacs")
|
||||
|
|
@ -13636,7 +13717,7 @@ (define-public emacs-wordgen
|
|||
(define-public emacs-on-screen
|
||||
(package
|
||||
(name "emacs-on-screen")
|
||||
(version "1.3.2")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -13644,11 +13725,9 @@ (define-public emacs-on-screen
|
|||
"http://elpa.gnu.org/packages/on-screen-" version ".el"))
|
||||
(file-name (string-append name "-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv"))))
|
||||
(base32 "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page
|
||||
"https://github.com/michael-heerdegen/on-screen.el")
|
||||
(home-page "https://github.com/michael-heerdegen/on-screen.el")
|
||||
(synopsis "Guide your eyes while scrolling")
|
||||
(description
|
||||
"Scrolling can be distracting because your eyes may lose
|
||||
|
|
@ -14538,6 +14617,11 @@ (define-public emacs-helm-company
|
|||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)
|
||||
("emacs-company" ,emacs-company)))
|
||||
(native-inputs
|
||||
`(("emacs-ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
(home-page "https://github.com/Sodel-the-Vociferous/helm-company")
|
||||
(synopsis "Helm interface for company-mode")
|
||||
(description
|
||||
|
|
@ -15276,18 +15360,16 @@ (define-public emacs-helm-org-contacts
|
|||
(define-public emacs-dired-du
|
||||
(package
|
||||
(name "emacs-dired-du")
|
||||
(version "0.5.1")
|
||||
(version "0.5.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://elpa.gnu.org/packages/dired-du-"
|
||||
version ".tar"))
|
||||
"https://elpa.gnu.org/packages/dired-du-" version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"1091scnrjh0a4gja4z6jxic6ghy1yryv46qk9c76pmh50cpw6766"))))
|
||||
(base32 "0vhph7vcicsiq28b10h3b4dvnhckcy4gccpdgsad5j7pwa5k26m1"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/dired-du.html")
|
||||
(home-page "https://elpa.gnu.org/packages/dired-du.html")
|
||||
(synopsis "Dired with recursive directory sizes")
|
||||
(description
|
||||
"Display the recursive size of directories in Dired.
|
||||
|
|
@ -16640,7 +16722,7 @@ (define-public emacs-docker-tramp
|
|||
(define-public emacs-docker
|
||||
(package
|
||||
(name "emacs-docker")
|
||||
(version "1.2.0")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -16649,7 +16731,7 @@ (define-public emacs-docker
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"15kd86kaq1x6giz855q9w6zvnyc742j309j0pmm86rwx398g4rq1"))))
|
||||
"1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw"))))
|
||||
(inputs
|
||||
`(("emacs-undercover" ,emacs-undercover)))
|
||||
(propagated-inputs
|
||||
|
|
@ -16671,10 +16753,10 @@ (define-public emacs-docker
|
|||
|
||||
(define-public emacs-dockerfile-mode
|
||||
;; Latest upstream release is too old.
|
||||
(let ((commit "7223d92718f78fa3ab15667cdb2ed90cfeb579e7"))
|
||||
(let ((commit "ed73e82dcc636dad00d1a8c3b32a49136d25ee60"))
|
||||
(package
|
||||
(name "emacs-dockerfile-mode")
|
||||
(version (git-version "1.2" "1" commit))
|
||||
(version (git-version "1.2" "2" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -16684,7 +16766,7 @@ (define-public emacs-dockerfile-mode
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hmipgl4rk6aih11i8mnspwdijjiwk2y0wns6lzs8bgkvy3c064r"))))
|
||||
"0lri2rnx4lr23vqfphkpq39cd4xfgzkvz1xsz7ccdvl4qj0k7fdl"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-s" ,emacs-s)))
|
||||
|
|
@ -17557,12 +17639,11 @@ (define-public emacs-counsel-etags
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-org-download
|
||||
(let ((commit "ac72bf8fce3e855da60687027b6b8601cf1de480")
|
||||
(version "0.1.0")
|
||||
(revision "1"))
|
||||
(let ((commit "10c9d7c8eed928c88a896310c882e3af4d8d0f61")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-org-download")
|
||||
(version (git-version version revision commit))
|
||||
(version (git-version "0.1.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -17570,7 +17651,7 @@ (define-public emacs-org-download
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb"))
|
||||
"0i8wlx1i7y1vn5lqwjifvymvszg28a07vwqcm4jslf1v2ajs1lsl"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
|
|
|
|||
|
|
@ -1001,14 +1001,14 @@ (define-public picprog
|
|||
(define-public fc-host-tools
|
||||
(package
|
||||
(name "fc-host-tools")
|
||||
(version "10")
|
||||
(version "11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.freecalypso.org/pub/GSM/"
|
||||
"FreeCalypso/fc-host-tools-r" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ybjqkz1cpnxni66p3valv1bva39vpwzdcc4040lqzx6py9h7h8b"))))
|
||||
"0s87lp6gd8i8ivrdd7mnnalysr65035nambcm992rgla7sk76sj1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests exist.
|
||||
|
|
@ -1017,12 +1017,7 @@ (define-public fc-host-tools
|
|||
(string-append "INCLUDE_INSTALL_DIR=" %output "include/rvinterf"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'handle-tarbomb
|
||||
(lambda _
|
||||
(chdir "..") ; url-fetch/tarbomb doesn't work for some reason.
|
||||
#t))
|
||||
(add-after 'handle-tarbomb 'patch-installation-paths
|
||||
(add-after 'unpack 'patch-installation-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* '("Makefile"
|
||||
"rvinterf/etmsync/fsiomain.c"
|
||||
|
|
@ -1039,13 +1034,16 @@ (define-public fc-host-tools
|
|||
(string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
|
||||
(("\\$\\{INSTALL_PREFIX\\}/loadtools")
|
||||
(string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
|
||||
(("\\$\\{INSTALL_PREFIX\\}/target-bin")
|
||||
(string-append (assoc-ref outputs "out") "/lib/freecalypso/target-bin"))
|
||||
(("/opt/freecalypso")
|
||||
(assoc-ref outputs "out")))
|
||||
#t)))))
|
||||
#t))
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)))
|
||||
(synopsis "Freecalypso host tools")
|
||||
(description "This package provides some tools for debugging Freecalypso phones.
|
||||
(description "This package provides some tools for debugging FreeCalypso phones and the FreeCalypso FCDEV3B dev board.
|
||||
|
||||
@enumerate
|
||||
@item fc-e1decode: Decodes a binary Melody E1 file into an ASCII source file.
|
||||
|
|
@ -1120,10 +1118,10 @@ (define-public fc-host-tools
|
|||
that can be issued through the RVTMUX (debug trace) serial channel.
|
||||
This program is our test mode shell for sending Test Mode commands to targets
|
||||
and displaying decoded target responses.
|
||||
@item fcup-smsend Send a short message via SMS
|
||||
@item fcup-smsendmult Send multiple short messages via SMS in one go
|
||||
@item fcup-smsendpdu Send multiple short messages given in PDU format via SMS
|
||||
@item sms-pdu-decode Decode PDU format messages
|
||||
@item fcup-smsend: Send a short message via SMS
|
||||
@item fcup-smsendmult: Send multiple short messages via SMS in one go
|
||||
@item fcup-smsendpdu: Send multiple short messages given in PDU format via SMS
|
||||
@item sms-pdu-decode: Decode PDU format messages
|
||||
@end enumerate")
|
||||
(home-page "https://www.freecalypso.org/")
|
||||
(license license:public-domain)))
|
||||
|
|
|
|||
|
|
@ -1183,7 +1183,7 @@ (define-public scummvm
|
|||
(define-public mame
|
||||
(package
|
||||
(name "mame")
|
||||
(version "0.212")
|
||||
(version "0.214")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1193,11 +1193,7 @@ (define-public mame
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0p3zcb9l624dsy2gyv23ppp1k1iwd1vrg8cbn5v4fx1s44mx7f5c"))
|
||||
(patches
|
||||
;; FIXME: Remove once 0.213 is out. Applied upstream as
|
||||
;; 0b5b13cf1e28550b49c387dec93f9801f029e313.
|
||||
(search-patches "mame-rapidjson-fix.patch"))
|
||||
"129yk3ybcviscy2xk1mkkzxm4h4nh5p6ndfgqbmcx547p1s6hbja"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
|
|
|
|||
|
|
@ -6124,7 +6124,7 @@ (define-public frotz-sdl
|
|||
(define-public libmanette
|
||||
(package
|
||||
(name "libmanette")
|
||||
(version "0.2.2")
|
||||
(version "0.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/libmanette/"
|
||||
|
|
@ -6132,7 +6132,7 @@ (define-public libmanette
|
|||
"libmanette-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb"))))
|
||||
"1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ; for glib-compile-resources
|
||||
|
|
|
|||
|
|
@ -3118,15 +3118,15 @@ (define-public geoclue
|
|||
(define-public geocode-glib
|
||||
(package
|
||||
(name "geocode-glib")
|
||||
(version "3.26.0")
|
||||
(version "3.26.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/geocode-glib/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"geocode-glib-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"))))
|
||||
"076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -3455,16 +3455,15 @@ (define-public devhelp
|
|||
(define-public cogl
|
||||
(package
|
||||
(name "cogl")
|
||||
(version "1.22.2")
|
||||
(version "1.22.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(uri (string-append "mirror://gnome/sources/cogl/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"cogl-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"))))
|
||||
(base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"))))
|
||||
;; NOTE: mutter exports a bundled fork of cogl, so when making changes to
|
||||
;; cogl, corresponding changes may be appropriate in mutter as well.
|
||||
(build-system gnu-build-system)
|
||||
|
|
@ -3710,15 +3709,15 @@ (define-public gom
|
|||
(define-public libgnome-games-support
|
||||
(package
|
||||
(name "libgnome-games-support")
|
||||
(version "1.4.2")
|
||||
(version "1.4.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(uri (string-append "mirror://gnome/sources/libgnome-games-support/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"libgnome-games-support-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088"))))
|
||||
"1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
@ -4627,15 +4626,15 @@ (define-public yelp-tools
|
|||
(define-public libgee
|
||||
(package
|
||||
(name "libgee")
|
||||
(version "0.20.1")
|
||||
(version "0.20.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(uri (string-append "mirror://gnome/sources/libgee/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"libgee-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"))))
|
||||
"0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -8185,7 +8184,7 @@ (define-public evolution
|
|||
(define-public gthumb
|
||||
(package
|
||||
(name "gthumb")
|
||||
(version "3.8.0")
|
||||
(version "3.8.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/gthumb/"
|
||||
|
|
@ -8193,7 +8192,7 @@ (define-public gthumb
|
|||
"gthumb-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f"))))
|
||||
"184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
|
|
@ -478,6 +478,14 @@ (define-public guile2.0-gcrypt
|
|||
`(("guile" ,guile-2.0)
|
||||
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||
|
||||
(define-public guile3.0-gcrypt
|
||||
(package
|
||||
(inherit guile-gcrypt)
|
||||
(name "guile3.0-gcrypt")
|
||||
(inputs
|
||||
`(("guile" ,guile-next)
|
||||
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||
|
||||
(define-public python-gpg
|
||||
(package
|
||||
(name "python-gpg")
|
||||
|
|
|
|||
|
|
@ -31,12 +31,13 @@ (define-module (gnu packages gpodder)
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt))
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages video))
|
||||
|
||||
(define-public gpodder
|
||||
(package
|
||||
(name "gpodder")
|
||||
(version "3.10.9")
|
||||
(version "3.10.10")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -45,7 +46,7 @@ (define-public gpodder
|
|||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"1sdmr1sq1d4p492zp9kq3npl7p56yr0pr470z9r6xxcylax5mhfq"))
|
||||
"1phgd3xly6ddrxpx5glgfs1ya4xq2qbcx5d9l3d6i4dlhji1dmja"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
|
|
@ -58,6 +59,7 @@ (define-public gpodder
|
|||
("python-html5lib" ,python-html5lib)
|
||||
("python-mygpoclient" ,python-mygpoclient)
|
||||
("python-podcastparser" ,python-podcastparser)
|
||||
("youtube-dl" ,youtube-dl)
|
||||
("xdg-utils" ,xdg-utils)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -171,7 +171,7 @@ (define-public gama
|
|||
(define-public gpxsee
|
||||
(package
|
||||
(name "gpxsee")
|
||||
(version "7.8")
|
||||
(version "7.12")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -180,7 +180,7 @@ (define-public gpxsee
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j"))))
|
||||
"0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -1591,9 +1591,6 @@ (define-public guile-reader
|
|||
(home-page "https://www.nongnu.org/guile-reader/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile2.2-reader
|
||||
(deprecated-package "guile2.2-reader" guile-reader))
|
||||
|
||||
(define-public guile-ncurses
|
||||
(package
|
||||
(name "guile-ncurses")
|
||||
|
|
@ -1689,9 +1686,6 @@ (define-public guile2.0-lib
|
|||
(name "guile2.0-lib")
|
||||
(inputs `(("guile" ,guile-2.0)))))
|
||||
|
||||
(define-public guile2.2-lib
|
||||
(deprecated-package "guile2.2-lib" guile-lib))
|
||||
|
||||
(define-public guile-minikanren
|
||||
(package
|
||||
(name "guile-minikanren")
|
||||
|
|
@ -1728,8 +1722,11 @@ (define-public guile2.0-minikanren
|
|||
(name "guile2.0-minikanren")
|
||||
(native-inputs `(("guile" ,guile-2.0)))))
|
||||
|
||||
(define-public guile2.2-minikanren
|
||||
(deprecated-package "guile2.2-minikanren" guile-minikanren))
|
||||
(define-public guile3.0-minikanren
|
||||
(package
|
||||
(inherit guile-minikanren)
|
||||
(name "guile3.0-minikanren")
|
||||
(native-inputs `(("guile" ,guile-next)))))
|
||||
|
||||
(define-public guile-irregex
|
||||
(package
|
||||
|
|
@ -1777,8 +1774,11 @@ (define-public guile2.0-irregex
|
|||
(name "guile2.0-irregex")
|
||||
(native-inputs `(("guile" ,guile-2.0)))))
|
||||
|
||||
(define-public guile2.2-irregex
|
||||
(deprecated-package "guile2.2-irregex" guile-irregex))
|
||||
(define-public guile3.0-irregex
|
||||
(package
|
||||
(inherit guile-irregex)
|
||||
(name "guile3.0-irregex")
|
||||
(native-inputs `(("guile" ,guile-next)))))
|
||||
|
||||
(define-public haunt
|
||||
(package
|
||||
|
|
@ -1850,9 +1850,6 @@ (define-public guile2.0-haunt
|
|||
(name "guile2.0-haunt")
|
||||
(inputs `(("guile" ,guile-2.0)))))
|
||||
|
||||
(define-public guile2.2-haunt
|
||||
(deprecated-package "guile2.2-haunt" haunt))
|
||||
|
||||
(define-public guile-redis
|
||||
(package
|
||||
(name "guile-redis")
|
||||
|
|
@ -1883,9 +1880,6 @@ (define-public guile2.0-redis
|
|||
,@(alist-delete "guile"
|
||||
(package-native-inputs guile-redis))))))
|
||||
|
||||
(define-public guile2.2-redis
|
||||
(deprecated-package "guile2.2-redis" guile-redis))
|
||||
|
||||
(define-public guile-commonmark
|
||||
(package
|
||||
(name "guile-commonmark")
|
||||
|
|
@ -1919,9 +1913,6 @@ (define-public guile2.0-commonmark
|
|||
(name "guile2.0-commonmark")
|
||||
(inputs `(("guile" ,guile-2.0)))))
|
||||
|
||||
(define-public guile2.2-commonmark
|
||||
(deprecated-package "guile2.2-commonmark" guile-commonmark))
|
||||
|
||||
(define-public mcron
|
||||
(package
|
||||
(name "mcron")
|
||||
|
|
|
|||
|
|
@ -357,6 +357,10 @@ (define package-for-guile-2.0
|
|||
(package-input-rewriting `((,guile-2.2 . ,guile-2.0))
|
||||
(guile-variant-package-name "guile2.0")))
|
||||
|
||||
(define package-for-guile-3.0
|
||||
(package-input-rewriting `((,guile-2.2 . ,guile-next))
|
||||
(guile-variant-package-name "guile3.0")))
|
||||
|
||||
(define-public guile-for-guile-emacs
|
||||
(package (inherit guile-2.2)
|
||||
(name "guile-for-guile-emacs")
|
||||
|
|
@ -433,9 +437,6 @@ (define-public guile-json-1
|
|||
;; This is the 1.x branch of Guile-JSON.
|
||||
guile-json)
|
||||
|
||||
(define-public guile2.2-json
|
||||
(deprecated-package "guile2.2-json" guile-json))
|
||||
|
||||
(define-public guile2.0-json
|
||||
(package-for-guile-2.0 guile-json))
|
||||
|
||||
|
|
@ -453,6 +454,9 @@ (define-public guile-json-3
|
|||
(base32
|
||||
"14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
|
||||
|
||||
(define-public guile3.0-json
|
||||
(package-for-guile-3.0 guile-json-3))
|
||||
|
||||
;; There are two guile-gdbm packages, one using the FFI and one with
|
||||
;; direct C bindings, hence the verbose name.
|
||||
|
||||
|
|
@ -505,8 +509,8 @@ (define-public guile-gdbm-ffi
|
|||
(define-public guile2.0-gdbm-ffi
|
||||
(package-for-guile-2.0 guile-gdbm-ffi))
|
||||
|
||||
(define-public guile2.2-gdbm-ffi
|
||||
(deprecated-package "guile2.2-gdbm-ffi" guile-gdbm-ffi))
|
||||
(define-public guile3.0-gdbm-ffi
|
||||
(package-for-guile-3.0 guile-gdbm-ffi))
|
||||
|
||||
(define-public guile-sqlite3
|
||||
(package
|
||||
|
|
@ -569,6 +573,9 @@ (define-public guile-bytestructures
|
|||
(define-public guile2.0-bytestructures
|
||||
(package-for-guile-2.0 guile-bytestructures))
|
||||
|
||||
(define-public guile3.0-bytestructures
|
||||
(package-for-guile-3.0 guile-bytestructures))
|
||||
|
||||
(define-public guile-git
|
||||
(package
|
||||
(name "guile-git")
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
|
||||
;;; Copyright © 2017, 2019 Carlo Zancanaro <carlo@zancanaro.id.au>
|
||||
;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
|
|
@ -11140,3 +11140,67 @@ (define-public java-jgit-4.2
|
|||
`(("java-javaewah" ,java-javaewah)
|
||||
("java-jsch" ,java-jsch)
|
||||
("java-slf4j-api" ,java-slf4j-api)))))
|
||||
|
||||
(define-public abcl
|
||||
(package
|
||||
(name "abcl")
|
||||
(version "1.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://abcl.org/releases/"
|
||||
version "/abcl-src-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj"))
|
||||
(patches
|
||||
(search-patches
|
||||
"abcl-fix-build-xml.patch"))))
|
||||
(build-system ant-build-system)
|
||||
(native-inputs
|
||||
`(("java-junit" ,java-junit)))
|
||||
(arguments
|
||||
`(#:build-target "abcl.jar"
|
||||
#:test-target "abcl.test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((share (string-append (assoc-ref outputs "out")
|
||||
"/share/java/"))
|
||||
(bin (string-append (assoc-ref outputs "out")
|
||||
"/bin/")))
|
||||
(mkdir-p share)
|
||||
(install-file "dist/abcl.jar" share)
|
||||
(install-file "dist/abcl-contrib.jar" share)
|
||||
(mkdir-p bin)
|
||||
(with-output-to-file (string-append bin "abcl")
|
||||
(lambda _
|
||||
(let ((classpath (string-append
|
||||
share "abcl.jar"
|
||||
":"
|
||||
share "abcl-contrib.jar")))
|
||||
(display (string-append
|
||||
"#!" (which "sh") "\n"
|
||||
"if [[ -z $CLASSPATH ]]; then\n"
|
||||
" cp=\"" classpath "\"\n"
|
||||
"else\n"
|
||||
" cp=\"" classpath ":$CLASSPATH\"\n"
|
||||
"fi\n"
|
||||
"exec " (which "java")
|
||||
" -cp $cp org.armedbear.lisp.Main $@\n")))))
|
||||
(chmod (string-append bin "abcl") #o755)
|
||||
#t))))))
|
||||
(home-page "https://abcl.org/")
|
||||
(synopsis "Common Lisp Implementation on the JVM")
|
||||
(description
|
||||
"@dfn{Armed Bear Common Lisp} (ABCL) is a full implementation of the Common
|
||||
Lisp language featuring both an interpreter and a compiler, running in the
|
||||
JVM. It supports JSR-223 (Java scripting API): it can be a scripting engine
|
||||
in any Java application. Additionally, it can be used to implement (parts of)
|
||||
the application using Java to Lisp integration APIs.")
|
||||
(license (list license:gpl2+
|
||||
;; named-readtables is released under 3 clause BSD
|
||||
license:bsd-3
|
||||
;; jfli is released under CPL 1.0
|
||||
license:cpl1.0))))
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -562,6 +563,13 @@ (define* (kernel-config-veyron arch #:key variant)
|
|||
(define %default-extra-linux-options
|
||||
`(;; Some very mild hardening.
|
||||
("CONFIG_SECURITY_DMESG_RESTRICT" . #t)
|
||||
;; All kernels should have NAMESPACES options enabled
|
||||
("CONFIG_NAMESPACES" . #t)
|
||||
("CONFIG_UTS_NS" . #t)
|
||||
("CONFIG_IPC_NS" . #t)
|
||||
("CONFIG_USER_NS" . #t)
|
||||
("CONFIG_PID_NS" . #t)
|
||||
("CONFIG_NET_NS" . #t)
|
||||
;; Modules required for initrd:
|
||||
("CONFIG_NET_9P" . m)
|
||||
("CONFIG_NET_9P_VIRTIO" . m)
|
||||
|
|
@ -5985,3 +5993,43 @@ (define-public inputattach
|
|||
(description "inputattach dispatches input events from several device
|
||||
types and interfaces and translates so that the X server can use them.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public ell
|
||||
(package
|
||||
(name "ell")
|
||||
(version "0.23")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.kernel.org/pub/scm/libs/ell/ell.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qhlcwhn0gj877yss2ymx1aczghlddzb5v9mm1dgp2zliii3jy10"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-dbus-tests
|
||||
(lambda _
|
||||
(substitute* '("unit/test-dbus-message-fds.c"
|
||||
"unit/test-dbus-properties.c"
|
||||
"unit/test-dbus.c")
|
||||
(("/usr/bin/dbus-daemon") (which "dbus-daemon")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("libtool" ,libtool)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("pkgconfig" ,pkg-config)
|
||||
("automake" ,automake)))
|
||||
(home-page "https://01.org/ell")
|
||||
(synopsis "Embedded Linux Library")
|
||||
(description "The Embedded Linux* Library (ELL) provides core, low-level
|
||||
functionality for system daemons. It typically has no dependencies other than
|
||||
the Linux kernel, C standard library, and libdl (for dynamic linking). While
|
||||
ELL is designed to be efficient and compact enough for use on embedded Linux
|
||||
platforms, it is not limited to resource-constrained systems.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
|
|
|||
|
|
@ -327,14 +327,14 @@ (define-public clisp
|
|||
(define-public sbcl
|
||||
(package
|
||||
(name "sbcl")
|
||||
(version "1.5.6")
|
||||
(version "1.5.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
|
||||
version "-source.tar.bz2"))
|
||||
(sha256
|
||||
(base32 "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a"))
|
||||
(base32 "11cl839512898shxcgjmnn1178pwc8vcfaypmzxm1wzkwasjyx2l"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Add sbcl-bundle-systems to 'default-system-source-registry'.
|
||||
|
|
|
|||
|
|
@ -2887,14 +2887,13 @@ (define-public imapfilter
|
|||
(define-public urlscan
|
||||
(package
|
||||
(name "urlscan")
|
||||
(version "0.9.2")
|
||||
(version "0.9.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "urlscan" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zldck7vnp7z04aacbx3cprf5kzha4gfhjmss4iv2lh5nccxjfzx"))))
|
||||
(base32 "1q0vxv9haap01vz1cbkzss62cgwb9365lv5vnkg2gbpx4g5y7a9l"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-urwid" ,python-urwid)))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
(define-module (gnu packages markup)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
|
|
@ -224,22 +225,22 @@ (define-public cmark
|
|||
(define-public smu
|
||||
(package
|
||||
(name "smu")
|
||||
(version "1.4")
|
||||
(version "1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/Gottox/smu/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Gottox/smu.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iazl45rkz8ngsb5hpykl76w0ngvdvqqhym1qz5wykgmrzk293rp"))))
|
||||
(base32 "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (list "CC=gcc"
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))
|
||||
#:tests? #f ;No tests included
|
||||
#:tests? #f ; no tests included
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
|
||||
;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2018, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
;;; Copyright © 2018 Nadya Voronova <voronovank@gmail.com>
|
||||
;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
|
||||
|
|
@ -3645,7 +3645,7 @@ (define-public lpsolve
|
|||
(define-public dealii
|
||||
(package
|
||||
(name "dealii")
|
||||
(version "9.0.1")
|
||||
(version "9.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -3653,8 +3653,7 @@ (define-public dealii
|
|||
"download/v" version "/dealii-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r7f8rhl3xr94imd372plizdcbqk0a70w73lwc3vw912dxk0sbyz"))
|
||||
(patches (search-patches "dealii-mpi-deprecations.patch"))
|
||||
"0xhjv0gzswpjbc43xbrpwfc5848g508l01855nszx3g5gwzlhnzw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
|
||||
|
|
@ -4116,7 +4115,7 @@ (define-public jacal
|
|||
(define-public z3
|
||||
(package
|
||||
(name "z3")
|
||||
(version "4.8.4")
|
||||
(version "4.8.6")
|
||||
(home-page "https://github.com/Z3Prover/z3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
|
@ -4125,7 +4124,7 @@ (define-public z3
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"))))
|
||||
"1sywcqj5y8yp28m4cdvzsgw74kd6zr1s3y1x17ky8pr9prvpvl6x"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -4316,7 +4315,7 @@ (define-public elemental
|
|||
(define-public mcrl2
|
||||
(package
|
||||
(name "mcrl2")
|
||||
(version "201707.1.15162")
|
||||
(version "201908.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.mcrl2.org/download/devel/mcrl2-"
|
||||
|
|
@ -4324,9 +4323,7 @@ (define-public mcrl2
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ziww2fchsklm25hl9p2mngssxfh9w07nc114cncqaxfibqp2p8f"))))
|
||||
(native-inputs
|
||||
`(("subversion" ,subversion)))
|
||||
"1i4xgl2d5fgiz1mwi50cyfkrrcpm8nxfayfjgmhq7chs58wlhfsz"))))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("glu" ,glu)
|
||||
|
|
@ -4344,6 +4341,15 @@ (define-public mcrl2
|
|||
(home-page "https://mcrl2.org")
|
||||
(license license:boost1.0)))
|
||||
|
||||
(define-public mcrl2-minimal
|
||||
(package
|
||||
(inherit mcrl2)
|
||||
(name "mcrl2-minimal")
|
||||
(inputs
|
||||
`(("boost" ,boost)))
|
||||
(arguments
|
||||
'(#:configure-flags '("-DMCRL2_ENABLE_GUI_TOOLS=OFF")))))
|
||||
|
||||
(define-public r-subplex
|
||||
(package
|
||||
(name "r-subplex")
|
||||
|
|
|
|||
|
|
@ -491,14 +491,14 @@ (define-public pidgin-otr
|
|||
(define-public znc
|
||||
(package
|
||||
(name "znc")
|
||||
(version "1.7.4")
|
||||
(version "1.7.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://znc.in/releases/archive/znc-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi"))))
|
||||
"08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
|
|
@ -2325,7 +2325,7 @@ (define-public net-snmp
|
|||
(define-public ubridge
|
||||
(package
|
||||
(name "ubridge")
|
||||
(version "0.9.15")
|
||||
(version "0.9.16")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -2334,7 +2334,7 @@ (define-public ubridge
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0fl07zyall04map6v2l1bclqh8y3rrhsx61s2v0sr8b00j201jg4"))))
|
||||
(base32 "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
|
|||
50
gnu/packages/patches/abcl-fix-build-xml.patch
Normal file
50
gnu/packages/patches/abcl-fix-build-xml.patch
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
ABCL's build calls the hostname command, and needs the internet to download
|
||||
JUnit. Neither of these are really required, though, so we can patch them out
|
||||
to make it build.
|
||||
|
||||
We also remove the Implemetation-Build property that ends up in the manifest
|
||||
file, because it stores information about the time of the build, which makes
|
||||
it non-deterministic.
|
||||
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -327,7 +327,7 @@ from ${abcl.home.dir}
|
||||
<property name="abcl.build.path"
|
||||
value="${build.classes.dir}/org/armedbear/lisp/build"/>
|
||||
<target name="abcl.stamp"
|
||||
- depends="abcl.compile,abcl.stamp.version,abcl.stamp.hostname">
|
||||
+ depends="abcl.compile,abcl.stamp.version">
|
||||
<mkdir dir="${abcl.build.path}/.."/>
|
||||
<loadfile property="abcl.version"
|
||||
srcFile="${abcl.version.path}"/>
|
||||
@@ -455,11 +455,6 @@ from ${abcl.home.dir}
|
||||
value="${abcl.version}-${abcl.version.src}"/>
|
||||
</target>
|
||||
|
||||
- <target name="abcl.stamp.hostname" if="unix">
|
||||
- <exec executable="hostname" outputproperty="abcl.hostname"/>
|
||||
- <echo>abcl.hostname: ${abcl.hostname}</echo>
|
||||
- </target>
|
||||
-
|
||||
<target name="abcl.system.uptodate">
|
||||
<condition property="abcl.system.needs-update.p">
|
||||
<and>
|
||||
@@ -500,8 +495,6 @@ from ${abcl.home.dir}
|
||||
value="ABCL"/>
|
||||
<attribute name="Implementation-Version"
|
||||
value="${abcl.implementation.version}"/>
|
||||
- <attribute name="Implementation-Build"
|
||||
- value="${build}"/>
|
||||
</section>
|
||||
</manifest>
|
||||
<metainf dir="${src.dir}/META-INF">
|
||||
@@ -1019,8 +1012,7 @@ ${basedir}/../cl-bench
|
||||
</unzip>
|
||||
</target>
|
||||
|
||||
- <target name="abcl.test.compile"
|
||||
- depends="abcl.test.pre-compile">
|
||||
+ <target name="abcl.test.compile" >
|
||||
<mkdir dir="${abcl.test.classes.dir}"/>
|
||||
<javac destdir="${abcl.test.classes.dir}"
|
||||
classpathref="abcl.test.compile.classpath"
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From 40538ad31a71495649d174b0f7be5f7135d0a905 Mon Sep 17 00:00:00 2001
|
||||
From: David Wells <drwells@email.unc.edu>
|
||||
Date: Sat, 2 Feb 2019 10:00:38 -0500
|
||||
Subject: [PATCH] Avoid calling a deprecated MPI function.
|
||||
|
||||
This was deprecated a long time ago (1996) and is not present in the
|
||||
latest version of openMPI (4.0): see
|
||||
|
||||
https://www.open-mpi.org/faq/?category=mpi-removed
|
||||
|
||||
Credit goes to Pratik Nayak for finding this issue.
|
||||
---
|
||||
source/base/mpi.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/base/mpi.cc b/source/base/mpi.cc
|
||||
index bd1f7f9846a..b8cd45e7c26 100644
|
||||
--- a/source/base/mpi.cc
|
||||
+++ b/source/base/mpi.cc
|
||||
@@ -448,7 +448,7 @@ namespace Utilities
|
||||
MPI_Aint displacements[] = {0, offsetof(MinMaxAvg, min_index)};
|
||||
MPI_Datatype types[] = {MPI_DOUBLE, MPI_INT};
|
||||
|
||||
- ierr = MPI_Type_struct(2, lengths, displacements, types, &type);
|
||||
+ ierr = MPI_Type_create_struct(2, lengths, displacements, types, &type);
|
||||
AssertThrowMPI(ierr);
|
||||
|
||||
ierr = MPI_Type_commit(&type);
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From 0b5b13cf1e28550b49c387dec93f9801f029e313 Mon Sep 17 00:00:00 2001
|
||||
From: Julian Sikorski <belegdol+github@gmail.com>
|
||||
Date: Mon, 5 Aug 2019 21:16:54 +0200
|
||||
Subject: [PATCH] Fix building using system rapidjson
|
||||
|
||||
---
|
||||
scripts/target/mame/arcade.lua | 1 +
|
||||
src/mame/video/midtunit.cpp | 4 ++--
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
|
||||
index 964daa3572f..ef30ae3c2c2 100644
|
||||
--- a/scripts/target/mame/arcade.lua
|
||||
+++ b/scripts/target/mame/arcade.lua
|
||||
@@ -930,6 +930,7 @@ function createMAMEProjects(_target, _subtarget, _name)
|
||||
ext_includedir("flac"),
|
||||
ext_includedir("glm"),
|
||||
ext_includedir("jpeg"),
|
||||
+ ext_includedir("rapidjson"),
|
||||
}
|
||||
|
||||
end
|
||||
diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp
|
||||
index b4cb98abacf..b307f3f722b 100644
|
||||
--- a/src/mame/video/midtunit.cpp
|
||||
+++ b/src/mame/video/midtunit.cpp
|
||||
@@ -20,8 +20,8 @@
|
||||
#include "emuopts.h" // Used by PNG logging
|
||||
#include "png.h" // Used by PNG logging
|
||||
|
||||
-#include "rapidjson/include/rapidjson/prettywriter.h" // Used by JSON logging
|
||||
-#include "rapidjson/include/rapidjson/stringbuffer.h" // Used by JSON logging
|
||||
+#include <rapidjson/prettywriter.h> // Used by JSON logging
|
||||
+#include <rapidjson/stringbuffer.h> // Used by JSON logging
|
||||
|
||||
DEFINE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device, "tunitvid", "Midway T-Unit Video")
|
||||
DEFINE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device, "wunitvid", "Midway W-Unit Video")
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2016, 2019 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
|
||||
|
|
@ -1116,3 +1116,45 @@ (define-public paps
|
|||
rendering of the file. The rendering is done by creating outline curves
|
||||
through the Pango @code{ft2} backend.")
|
||||
(license license:lgpl2.0+))))
|
||||
|
||||
(define-public stapler
|
||||
(package
|
||||
(name "stapler")
|
||||
(version "0.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hellerbarde/stapler")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"06w7xanzr7cicqik62g7zqs57j4y6fc7hflrc1rlmphxx40hkg6r"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("python2-pypdf2" ,python2-pypdf2)))
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-pypdf-version-requirement
|
||||
;; A PyPDF2 version requirement of 1.25.1 is hard-coded in
|
||||
;; setup.py. Relax it to work with any version of PyPDF2.
|
||||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
(("PyPDF2==1.25.1") "PyPDF2"))
|
||||
#t)))))
|
||||
(home-page "https://github.com/hellerbarde/stapler")
|
||||
(synopsis "PDF manipulation tool")
|
||||
(description "Stapler is a pure Python alternative to PDFtk, a tool for
|
||||
manipulating PDF documents from the command line. It supports
|
||||
|
||||
@itemize
|
||||
@item cherry-picking pages and concatenating them into a new file
|
||||
@item splitting a PDF document into single pages each in its own file
|
||||
@item merging PDF documents with their pages interleaved
|
||||
@item displaying metadata in a PDF document
|
||||
@item displaying the mapping between logical and physical page numbers
|
||||
@end itemize")
|
||||
(license license:bsd-3)))
|
||||
|
|
|
|||
|
|
@ -802,15 +802,14 @@ (define-public perl-carp-assert-more
|
|||
(define-public perl-carp-clan
|
||||
(package
|
||||
(name "perl-carp-clan")
|
||||
(version "6.07")
|
||||
(version "6.08")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
|
||||
"Carp-Clan-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a"))))
|
||||
(base32 "0237xx3rqa72sr4vdvws9r1m453h5f25bl85mdjmmk128kir4py7"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-test-exception" ,perl-test-exception)))
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ (define-module (gnu packages ssh)
|
|||
(define-public libssh
|
||||
(package
|
||||
(name "libssh")
|
||||
(version "0.8.7")
|
||||
(version "0.9.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -78,7 +78,7 @@ (define-public libssh
|
|||
(commit (string-append "libssh-" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1iqik1ba0g008k1mb1n85iih1azi7giy0c485jnlmsrjxik4q3j2"))
|
||||
"0hxws8vl56cbjwchmj0x78ywv2b8spv6h90sgma1vj1y9dybgs7s"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "debug"))
|
||||
|
|
@ -314,9 +314,6 @@ (define-public guile-ssh
|
|||
libssh library.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile2.2-ssh
|
||||
(deprecated-package "guile2.2-ssh" guile-ssh))
|
||||
|
||||
(define-public guile2.0-ssh
|
||||
(package
|
||||
(inherit guile-ssh)
|
||||
|
|
|
|||
|
|
@ -612,14 +612,14 @@ (define-public r-nlme
|
|||
(define-public r-mgcv
|
||||
(package
|
||||
(name "r-mgcv")
|
||||
(version "1.8-28")
|
||||
(version "1.8-29")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mgcv" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1snkpnkkigwrj9zm31j1nlivv9ls56imz263cv167hnmghiahpmm"))))
|
||||
"1236gz25nap1aprbvcrqvmmnl6f8cvbjy8dcl4j968cpalqax5ww"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-matrix" ,r-matrix)
|
||||
|
|
@ -805,13 +805,13 @@ (define-public r-dichromat
|
|||
(define-public r-digest
|
||||
(package
|
||||
(name "r-digest")
|
||||
(version "0.6.20")
|
||||
(version "0.6.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "digest" version))
|
||||
(sha256
|
||||
(base32 "1irhk2jaj9cg57cxprgyn1if06x121xwcxh1fzzn3148bl5lnrq5"))))
|
||||
(base32 "0qycqchmv59fb6jp369d82mcx9xgbv70m18qzam0vrs8zkmajb17"))))
|
||||
(build-system r-build-system)
|
||||
;; Vignettes require r-knitr, which requires r-digest, so we have to
|
||||
;; disable them and the tests.
|
||||
|
|
@ -1451,13 +1451,13 @@ (define-public r-yaml
|
|||
(define-public r-knitr
|
||||
(package
|
||||
(name "r-knitr")
|
||||
(version "1.24")
|
||||
(version "1.25")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "knitr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12bvs9fd61m7k7bq321qzrh2ccl9rq653s1anrvfb9s5ni1j0378"))))
|
||||
"0lsc201a4f6xksmsklhr6gmhl0mxih0xhlcdvhs2ypzcx1pvkpnv"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-evaluate" ,r-evaluate)
|
||||
|
|
@ -1503,13 +1503,13 @@ (define-public r-knitrbootstrap
|
|||
(define-public r-microbenchmark
|
||||
(package
|
||||
(name "r-microbenchmark")
|
||||
(version "1.4-6")
|
||||
(version "1.4-7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "microbenchmark" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1sn1fxgzakm5iqbgc35g3k4yi0iqrkmwz33cvdrphrzh1lxnmi3s"))))
|
||||
"1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/microbenchmark/")
|
||||
(synopsis "Accurate timing functions for R")
|
||||
|
|
@ -2438,13 +2438,13 @@ (define-public r-rstudioapi
|
|||
(define-public r-devtools
|
||||
(package
|
||||
(name "r-devtools")
|
||||
(version "2.2.0")
|
||||
(version "2.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "devtools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"05fag25mkqy13yja8x32aqr9c0ah9rbm8cfjcsmy1dv5h4j8cxa1"))))
|
||||
"0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-callr" ,r-callr)
|
||||
|
|
@ -2463,8 +2463,9 @@ (define-public r-devtools
|
|||
("r-pkgbuild" ,r-pkgbuild)
|
||||
("r-pkgload" ,r-pkgload)
|
||||
("r-rcmdcheck" ,r-rcmdcheck)
|
||||
("r-roxygen2" ,r-roxygen2)
|
||||
("r-remotes" ,r-remotes)
|
||||
("r-rlang" ,r-rlang)
|
||||
("r-roxygen2" ,r-roxygen2)
|
||||
("r-rstudioapi" ,r-rstudioapi)
|
||||
("r-rversions" ,r-rversions)
|
||||
("r-sessioninfo" ,r-sessioninfo)
|
||||
|
|
@ -2780,13 +2781,13 @@ (define-public r-gridextra
|
|||
(define-public r-pkgconfig
|
||||
(package
|
||||
(name "r-pkgconfig")
|
||||
(version "2.0.2")
|
||||
(version "2.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "pkgconfig" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jk9ip549xphb3anfixqv1yx5kidnndqgy9v3qjpmgmds5a7g695"))))
|
||||
"0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/gaborcsardi/pkgconfig")
|
||||
(synopsis "Private configuration for R packages")
|
||||
|
|
@ -2947,13 +2948,13 @@ (define-public r-xnomial
|
|||
(define-public r-lambda-r
|
||||
(package
|
||||
(name "r-lambda-r")
|
||||
(version "1.2.3")
|
||||
(version "1.2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "lambda.r" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cc6pszs6yccn0hgjpyn9gspv9aiva9d91ba0640i5m0l5xy7n0c"))))
|
||||
"1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"))))
|
||||
(properties `((upstream-name . "lambda.r")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -3174,13 +3175,13 @@ (define-public r-domc
|
|||
(define-public r-dt
|
||||
(package
|
||||
(name "r-dt")
|
||||
(version "0.8")
|
||||
(version "0.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "DT" version))
|
||||
(sha256
|
||||
(base32
|
||||
"08cfmv3d5awvd9h8648bvidcg2ak5pvl2p6vqwqwy1l82ia506ch"))))
|
||||
"17han4560jv8mmfn4f8adrwh0x25fxz2qwd0sv7vv4iky5and8a7"))))
|
||||
(properties
|
||||
`((upstream-name . "DT")))
|
||||
(build-system r-build-system)
|
||||
|
|
|
|||
|
|
@ -89,18 +89,14 @@ (define-public dos2unix
|
|||
(define-public recode
|
||||
(package
|
||||
(name "recode")
|
||||
(version "3.7.5")
|
||||
(version "3.7.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rrthomas/recode/releases/"
|
||||
"download/v" version "/recode-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1sl99dfx2b76paq86wv3a0lcy66f1hylf6iy04rzwxj7ccwpsk30"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin
|
||||
(delete-file "tests/Recode.c")
|
||||
#t))))
|
||||
(base32 "0m59sd1ca0zw1aydpc3m8sw03nc885knmccqryg7byzmqs585ia6"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("python" ,python)
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
||||
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
||||
|
|
@ -244,9 +244,6 @@ (define-public gnutls
|
|||
(properties '((ftp-server . "ftp.gnutls.org")
|
||||
(ftp-directory . "/gcrypt/gnutls")))))
|
||||
|
||||
(define-public gnutls/guile-2.2
|
||||
(deprecated-package "guile2.2-gnutls" gnutls))
|
||||
|
||||
(define-public gnutls/guile-2.0
|
||||
;; GnuTLS for Guile 2.0.
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -1671,7 +1671,7 @@ (define-public you-get
|
|||
(define-public youtube-viewer
|
||||
(package
|
||||
(name "youtube-viewer")
|
||||
(version "3.5.4")
|
||||
(version "3.5.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -1680,7 +1680,7 @@ (define-public youtube-viewer
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1j782m9rximybamd0qsc43hi7hgk333x9gy3ypzb61s0sifs0i6m"))))
|
||||
"0zz0r3vd2pg9zzykhrq0vnvqp5842dbgsg8cfygw9vzb9j8mlq0a"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-module-build" ,perl-module-build)))
|
||||
|
|
|
|||
|
|
@ -1050,7 +1050,7 @@ (define-public python-vagrant
|
|||
(define-public bubblewrap
|
||||
(package
|
||||
(name "bubblewrap")
|
||||
(version "0.3.1")
|
||||
(version "0.3.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/projectatomic/bubblewrap/"
|
||||
|
|
@ -1058,7 +1058,7 @@ (define-public bubblewrap
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny"))))
|
||||
"1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -1078,6 +1078,9 @@ (define-public bubblewrap
|
|||
;; Some tests try to access /usr, but that doesn't exist.
|
||||
;; Give them /gnu instead.
|
||||
(("/usr") "/gnu")
|
||||
(("--ro-bind /bin /bin") "--ro-bind /gnu /bin")
|
||||
(("--ro-bind /sbin /sbin") "--ro-bind /gnu /sbin")
|
||||
(("--ro-bind /lib /lib") "--ro-bind /gnu /lib")
|
||||
((" */bin/bash") (which "bash"))
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("findmnt") (which "findmnt"))))
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu>
|
||||
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
|
||||
;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -83,6 +84,7 @@ (define-module (gnu packages xdisorg)
|
|||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
|
|
@ -1322,6 +1324,46 @@ (define-public dzen
|
|||
(home-page "https://github.com/robm/dzen")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public xftwidth
|
||||
(package
|
||||
(name "xftwidth")
|
||||
(version "20170402")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "http://github.com/vixus0/xftwidth")
|
||||
(commit "35ff963908d41a8a6a7101c434c88255728025ee")))
|
||||
(sha256
|
||||
(base32
|
||||
"1jwl25785li24kbp0m1wxfwk4dgxkliynn03nsj813cjr34kq16h"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("freetype" ,freetype)
|
||||
("libx11" ,libx11)
|
||||
("fontconfig" ,fontconfig)
|
||||
("libxft" ,libxft)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-makefile ; /usr/bin doesn't show up in PATH
|
||||
(lambda _ (substitute* "Makefile" (("usr/") "")) #t))
|
||||
(delete 'check) ; no check included in Makefile
|
||||
(delete 'configure))
|
||||
#:make-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "DESTDIR=" out)))))
|
||||
(synopsis "Calculator for determining pixel widths of displayed text using Xft fonts")
|
||||
(description "xftwidth is a small C program for calculating the pixel
|
||||
widths of displayed text using Xft fonts. It is especially useful in scripts
|
||||
for displaying text in graphical panels, menus, popups, and notification
|
||||
windows generated using dzen. These scripts are often used in conjunction with
|
||||
minimalistic tiling window managers such as herbstluftwm and bspwm.")
|
||||
(home-page "http://github.com/vixus0/xftwidth")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public xcb-util-xrm
|
||||
(package
|
||||
(name "xcb-util-xrm")
|
||||
|
|
|
|||
|
|
@ -838,7 +838,7 @@ (define-public font-sun-misc
|
|||
(define-public font-util
|
||||
(package
|
||||
(name "font-util")
|
||||
(version "1.3.1")
|
||||
(version "1.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -847,8 +847,7 @@ (define-public font-util
|
|||
version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"))))
|
||||
(base32 "10i2a8b3d1h3w7klsqf31iz7zbd6l8wglil54fkhdb1385281n1s"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
|
|
|
|||
|
|
@ -169,11 +169,12 @@ (define* (compile-files source-directory build-directory files
|
|||
files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"."
|
||||
(define progress-lock (make-mutex))
|
||||
(define total (length files))
|
||||
(define completed 0)
|
||||
(define progress 0)
|
||||
|
||||
(define (build file)
|
||||
(with-mutex progress-lock
|
||||
(report-compilation file total completed))
|
||||
(report-compilation file total progress)
|
||||
(set! progress (+ 1 progress)))
|
||||
|
||||
;; Exit as soon as something goes wrong.
|
||||
(exit-on-exception
|
||||
|
|
@ -185,9 +186,7 @@ (define (build file)
|
|||
#:output-file (string-append build-directory "/"
|
||||
(scm->go relative))
|
||||
#:opts (append warning-options
|
||||
(optimization-options relative)))))))
|
||||
(with-mutex progress-lock
|
||||
(set! completed (+ 1 completed))))
|
||||
(optimization-options relative))))))))
|
||||
|
||||
(with-augmented-search-path %load-path source-directory
|
||||
(with-augmented-search-path %load-compiled-path build-directory
|
||||
|
|
|
|||
|
|
@ -243,7 +243,8 @@ (define (machine-slot-file machine slot)
|
|||
;; of these; if we fail, that means all the build slots are already taken.
|
||||
;; Inspired by Nix's build-remote.pl.
|
||||
(string-append (string-append %state-directory "/offload/"
|
||||
(build-machine-name machine)
|
||||
(build-machine-name machine) ":"
|
||||
(number->string (build-machine-port machine))
|
||||
"/" (number->string slot))))
|
||||
|
||||
(define (acquire-build-slot machine)
|
||||
|
|
|
|||
|
|
@ -304,7 +304,7 @@ (define* (display-channel-news profile
|
|||
(new
|
||||
(let ((count (length new)))
|
||||
(format (current-error-port)
|
||||
(N_ " ~*One new channel:~%"
|
||||
(N_ " ~a new channel:~%"
|
||||
" ~a new channels:~%" count)
|
||||
count)
|
||||
(for-each display-channel new))))
|
||||
|
|
|
|||
40
guix/ui.scm
40
guix/ui.scm
|
|
@ -867,6 +867,17 @@ (define (profile-hook-derivation? drv)
|
|||
('profile-hook #t)
|
||||
(_ #f)))
|
||||
|
||||
(define (colorize-store-file-name file)
|
||||
"Colorize FILE, a store file name, such that the hash part is less prominent
|
||||
that the rest."
|
||||
(let ((len (string-length file))
|
||||
(prefix (+ (string-length (%store-prefix)) 32 2)))
|
||||
(if (< len prefix)
|
||||
file
|
||||
(string-append (colorize-string (string-take file prefix)
|
||||
(color DARK))
|
||||
(string-drop file prefix)))))
|
||||
|
||||
(define* (show-what-to-build store drv
|
||||
#:key dry-run? (use-substitutes? #t)
|
||||
(mode (build-mode normal)))
|
||||
|
|
@ -890,6 +901,11 @@ (define substitutable-info
|
|||
(substitution-oracle store inputs #:mode mode)
|
||||
(const #f)))
|
||||
|
||||
(define colorized-store-item
|
||||
(if (color-output? (current-error-port))
|
||||
colorize-store-file-name
|
||||
identity))
|
||||
|
||||
(let*-values (((build download)
|
||||
(derivation-build-plan store inputs
|
||||
#:mode mode
|
||||
|
|
@ -935,7 +951,7 @@ (define display-download-size?
|
|||
(N_ "~:[The following derivation would be built:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following derivations would be built:~%~{ ~a~%~}~;~]"
|
||||
(length build))
|
||||
(null? build) build)
|
||||
(null? build) (map colorized-store-item build))
|
||||
(if display-download-size?
|
||||
(format (current-error-port)
|
||||
;; TRANSLATORS: "MB" is for "megabyte"; it should be
|
||||
|
|
@ -943,29 +959,31 @@ (define display-download-size?
|
|||
(G_ "~:[~,1h MB would be downloaded:~%~{ ~a~%~}~;~]")
|
||||
(null? download)
|
||||
download-size
|
||||
(map substitutable-path download))
|
||||
(map (compose colorized-store-item substitutable-path)
|
||||
download))
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following file would be downloaded:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following files would be downloaded:~%~{ ~a~%~}~;~]"
|
||||
(length download))
|
||||
(null? download)
|
||||
(map substitutable-path download)))
|
||||
(map (compose colorized-store-item substitutable-path)
|
||||
download)))
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following graft would be made:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following grafts would be made:~%~{ ~a~%~}~;~]"
|
||||
(length graft))
|
||||
(null? graft) graft)
|
||||
(null? graft) (map colorized-store-item graft))
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following profile hook would be built:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following profile hooks would be built:~%~{ ~a~%~}~;~]"
|
||||
(length hook))
|
||||
(null? hook) hook))
|
||||
(null? hook) (map colorized-store-item hook)))
|
||||
(begin
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following derivation will be built:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following derivations will be built:~%~{ ~a~%~}~;~]"
|
||||
(length build))
|
||||
(null? build) build)
|
||||
(null? build) (map colorized-store-item build))
|
||||
(if display-download-size?
|
||||
(format (current-error-port)
|
||||
;; TRANSLATORS: "MB" is for "megabyte"; it should be
|
||||
|
|
@ -973,23 +991,25 @@ (define display-download-size?
|
|||
(G_ "~:[~,1h MB will be downloaded:~%~{ ~a~%~}~;~]")
|
||||
(null? download)
|
||||
download-size
|
||||
(map substitutable-path download))
|
||||
(map (compose colorized-store-item substitutable-path)
|
||||
download))
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following file will be downloaded:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following files will be downloaded:~%~{ ~a~%~}~;~]"
|
||||
(length download))
|
||||
(null? download)
|
||||
(map substitutable-path download)))
|
||||
(map (compose colorized-store-item substitutable-path)
|
||||
download)))
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following graft will be made:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following grafts will be made:~%~{ ~a~%~}~;~]"
|
||||
(length graft))
|
||||
(null? graft) graft)
|
||||
(null? graft) (map colorized-store-item graft))
|
||||
(format (current-error-port)
|
||||
(N_ "~:[The following profile hook will be built:~%~{ ~a~%~}~;~]"
|
||||
"~:[The following profile hooks will be built:~%~{ ~a~%~}~;~]"
|
||||
(length hook))
|
||||
(null? hook) hook)))
|
||||
(null? hook) (map colorized-store-item hook))))
|
||||
|
||||
(check-available-space installed-size)
|
||||
|
||||
|
|
|
|||
|
|
@ -1648,7 +1648,7 @@ HookReply DerivationGoal::tryBuildHook()
|
|||
set<int> fds;
|
||||
fds.insert(hook->fromHook.readSide);
|
||||
fds.insert(hook->builderOut.readSide);
|
||||
worker.childStarted(shared_from_this(), hook->pid, fds, false, false);
|
||||
worker.childStarted(shared_from_this(), hook->pid, fds, false, true);
|
||||
|
||||
if (settings.printBuildTrace)
|
||||
printMsg(lvlError, format("@ build-started %1% - %2% %3% %4%")
|
||||
|
|
|
|||
Loading…
Reference in a new issue