Merge remote-tracking branch 'origin/master' into staging
commit
438a0de332
|
@ -7,8 +7,6 @@
|
|||
(;; primary: "D963 A5A3 8A80 3D52 4461 F914 7483 0A27 6C32 8EC2"
|
||||
("2841 9AC6 5038 7440 C7E9 2FFA 2208 D209 58C1 DEB0"
|
||||
(name "abcdw"))
|
||||
("4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F"
|
||||
(name "alezost"))
|
||||
("50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F"
|
||||
(name "ambrevar"))
|
||||
("AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3"
|
||||
|
@ -20,9 +18,6 @@
|
|||
(;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
|
||||
"A3A4 B419 0074 087C A7DE 5698 BC45 CA67 E2F8 D007"
|
||||
(name "bavier"))
|
||||
(;; primary: "8929 BBC5 73CD 9206 3DDD 979D 3D36 CAA0 116F 0F99"
|
||||
"1C9B F005 1A1A 6A44 5257 599A A949 03A1 66A1 8FAE"
|
||||
(name "bricewge"))
|
||||
(;; primary: "0401 7A2A 6D9A 0CCD C81D 8EC2 96AB 007F 1A7E D999"
|
||||
"09CD D25B 5244 A376 78F6 EEA8 0CC5 2153 1979 91A5"
|
||||
(name "carl"))
|
||||
|
@ -65,8 +60,6 @@
|
|||
(;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0"
|
||||
"B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08"
|
||||
(name "lfam"))
|
||||
("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D"
|
||||
(name "marusich"))
|
||||
("BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"
|
||||
(name "mbakke"))
|
||||
("D919 0965 CE03 199E AF28 B3BE 7CEF 2984 7562 C516"
|
||||
|
@ -78,8 +71,6 @@
|
|||
(;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B"
|
||||
"F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79"
|
||||
(name "nckx"))
|
||||
("E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"
|
||||
(name "niedzejkob"))
|
||||
("ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D"
|
||||
(name "ngz"))
|
||||
("CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817"
|
||||
|
@ -87,9 +78,6 @@
|
|||
(;; primary: "41CA 12EA DE0C F33F 6885 A58F 5719 6E37 E00B 77FD"
|
||||
"72D5 3D81 8CB6 F4A1 7258 374C A8FC 9E44 7F4F 7D54"
|
||||
(name "planglois"))
|
||||
(;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600"
|
||||
"C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A"
|
||||
(name "pgarlick"))
|
||||
(;; primary: "7E9F 5BF6 1680 4367 127B 7A87 F9E6 9FB8 5A75 54F1"
|
||||
"A420 7B56 C255 109F 2CB3 157E 4990 97AE 5EA8 15D9"
|
||||
(name "podiki"))
|
||||
|
|
|
@ -776,9 +776,8 @@ the word @code{python}.
|
|||
Some modules are compatible with only one version of Python, others with
|
||||
both. If the package Foo is compiled with Python 3, we name it
|
||||
@code{python-foo}. If it is compiled with Python 2, we name it
|
||||
@code{python2-foo}. Packages should be added when they are necessary;
|
||||
we don't add Python 2 variants of the package unless we are going to use
|
||||
them.
|
||||
@code{python2-foo}. Python 2 packages are being removed from the
|
||||
distribution; please do no not submit any new Python 2 packages.
|
||||
|
||||
If a project already contains the word @code{python}, we drop this;
|
||||
for instance, the module python-dateutil is packaged under the names
|
||||
|
|
|
@ -8210,6 +8210,9 @@ Add @var{package}s to the front of the input list.
|
|||
|
||||
@item (append @var{package}@dots{})
|
||||
Add @var{package}s to the end of the input list.
|
||||
|
||||
@item (replace @var{name} @var{replacement})
|
||||
Replace the package called @var{name} with @var{replacement}.
|
||||
@end table
|
||||
|
||||
The example below removes the GMP and ACL inputs of Coreutils and adds
|
||||
|
@ -33501,7 +33504,7 @@ The group to run mpd as.
|
|||
This is a list of symbols naming Shepherd services that this service
|
||||
will depend on.
|
||||
|
||||
@item @code{environment-variables} (default: @code{()}) (type: list-of-string)
|
||||
@item @code{environment-variables} (default: @code{("PULSE_CLIENTCONFIG=/etc/pulse/client.conf" "PULSE_CONFIG=/etc/pulse/daemon.conf")}) (type: list-of-strings)
|
||||
A list of strings specifying environment variables.
|
||||
|
||||
@item @code{log-file} (default: @code{"/var/log/mpd/log"}) (type: maybe-string)
|
||||
|
@ -33532,7 +33535,7 @@ The location of the sticker database.
|
|||
@item @code{default-port} (default: @code{6600}) (type: maybe-integer)
|
||||
The default port to run mpd on.
|
||||
|
||||
@item @code{endpoints} (type: maybe-list-of-string)
|
||||
@item @code{endpoints} (type: maybe-list-of-strings)
|
||||
The addresses that mpd will bind to. A port different from @var{default-port}
|
||||
may be specified, e.g. @code{localhost:6602} and IPv6 addresses must be
|
||||
enclosed in square brackets when a different port is used.
|
||||
|
@ -33808,10 +33811,10 @@ Whether to preserve caches between service restarts.
|
|||
Available @code{mympd-ip-acl} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{allow} (default: @code{()}) (type: list-of-string)
|
||||
@item @code{allow} (default: @code{()}) (type: list-of-strings)
|
||||
Allowed IP addresses.
|
||||
|
||||
@item @code{deny} (default: @code{()}) (type: list-of-string)
|
||||
@item @code{deny} (default: @code{()}) (type: list-of-strings)
|
||||
Disallowed IP addresses.
|
||||
|
||||
@end table
|
||||
|
|
|
@ -436,6 +436,21 @@ importer."
|
|||
"Reproducible Builds tooling and issues that affect any guix packages."
|
||||
#:scope (list "gnu/packages/diffoscope.scm")))
|
||||
|
||||
(define-team gnome
|
||||
(team 'gnome
|
||||
#:name "Gnome team"
|
||||
#:description
|
||||
"The Gnome desktop environment, along with core technologies such as
|
||||
GLib/GIO, GTK, GStreamer and Webkit."
|
||||
#:scope (list "gnu/packages/glib.scm"
|
||||
"gnu/packages/gstreamer.scm"
|
||||
"gnu/packages/gtk.scm"
|
||||
"gnu/packages/gnome.scm"
|
||||
"gnu/packages/gnome-xyz.scm"
|
||||
"gnu/packages/webkit.scm"
|
||||
"guix/build/glib-or-gtk-build-system.scm"
|
||||
"guix/build/meson-build-system.scm")))
|
||||
|
||||
(define-team xfce
|
||||
(team 'xfce
|
||||
#:name "Xfce team"
|
||||
|
@ -511,7 +526,7 @@ importer."
|
|||
|
||||
(define-member (person "Liliana Marie Prikler"
|
||||
"liliana.prikler@gmail.com")
|
||||
emacs games)
|
||||
emacs games gnome)
|
||||
|
||||
(define-member (person "Ricardo Wurmus"
|
||||
"rekado@elephly.net")
|
||||
|
@ -543,7 +558,7 @@ importer."
|
|||
|
||||
(define-member (person "Raghav Gururajan"
|
||||
"rg@raghavgururajan.name")
|
||||
mentors)
|
||||
gnome mentors)
|
||||
|
||||
(define-member (person "宋文武"
|
||||
"iyzsong@envs.net")
|
||||
|
@ -553,6 +568,10 @@ importer."
|
|||
"vagrant@reproducible-builds.org")
|
||||
reproduciblebuilds)
|
||||
|
||||
(define-member (person "Zhu Zihao"
|
||||
"all_but_last@163.com")
|
||||
localization xfce)
|
||||
|
||||
|
||||
(define (find-team name)
|
||||
(or (hash-ref %teams (string->symbol name))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2022 ( <paren@disroot.org>
|
||||
;;; Copyright © 2023 conses <contact@conses.eu>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -37,7 +38,10 @@
|
|||
home-dbus-service-type
|
||||
|
||||
home-unclutter-configuration
|
||||
home-unclutter-service-type))
|
||||
home-unclutter-service-type
|
||||
|
||||
home-xmodmap-configuration
|
||||
home-xmodmap-service-type))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
|
@ -1136,6 +1136,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/fp16-implicit-double.patch \
|
||||
%D%/packages/patches/fp16-system-libraries.patch \
|
||||
%D%/packages/patches/fpc-reproducibility.patch \
|
||||
%D%/packages/patches/fpm-newer-clamp-fix.patch \
|
||||
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
|
||||
%D%/packages/patches/freeimage-unbundle.patch \
|
||||
%D%/packages/patches/fuse-glibc-2.34.patch \
|
||||
|
@ -1201,7 +1202,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \
|
||||
%D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \
|
||||
%D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \
|
||||
%D%/packages/patches/geeqie-clutter.patch \
|
||||
%D%/packages/patches/gemmi-fix-pegtl-usage.patch \
|
||||
%D%/packages/patches/gemmi-fix-sajson-types.patch \
|
||||
%D%/packages/patches/genimage-mke2fs-test.patch \
|
||||
|
@ -1299,6 +1299,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
|
||||
%D%/packages/patches/guile-fibers-fd-finalizer-leak.patch \
|
||||
%D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
|
||||
%D%/packages/patches/guile-fix-invalid-unicode-handling.patch \
|
||||
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
|
||||
%D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \
|
||||
%D%/packages/patches/guile-present-coding.patch \
|
||||
|
@ -1820,6 +1821,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
|
||||
%D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
|
||||
%D%/packages/patches/rottlog-direntry.patch \
|
||||
%D%/packages/patches/ruby-hiredis-use-system-hiredis.patch \
|
||||
%D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \
|
||||
%D%/packages/patches/ruby-anystyle-data-immutable-install.patch \
|
||||
%D%/packages/patches/ruby-anystyle-fix-dictionary-populate.patch \
|
||||
|
|
|
@ -226,7 +226,7 @@ the real span of the lattice.")
|
|||
(define-public pari-gp
|
||||
(package
|
||||
(name "pari-gp")
|
||||
(version "2.15.2")
|
||||
(version "2.15.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -234,7 +234,7 @@ the real span of the lattice.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pg0przhb3cgyn0rwkx2mx7a7fpy6bxxl72bk98pca723q8jhimh"))))
|
||||
"0s4jasvb3ghvxp9s2ifmr0lk7ckj9529zg28icmdgbyd723abxdd"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list (texlive-updmap.cfg
|
||||
(list texlive-amsfonts))))
|
||||
|
|
|
@ -734,7 +734,7 @@ purposes developed at Queen Mary, University of London.")
|
|||
(define-public ardour
|
||||
(package
|
||||
(name "ardour")
|
||||
(version "7.2")
|
||||
(version "7.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -751,7 +751,7 @@ purposes developed at Queen Mary, University of London.")
|
|||
namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
|
||||
(sha256
|
||||
(base32
|
||||
"1gv0wkzyx59lbnaf5iz9yva4akrd2zkhsmdk8wda3wz06zmk4w1r"))
|
||||
"0bkhrgswhc9y1ly8nfg8hpwad77cgbr663dgj86h3aisljc4cdkw"))
|
||||
(file-name (string-append name "-" version))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -692,10 +692,12 @@ source.")))
|
|||
(search-input-file (or native-inputs inputs)
|
||||
"/opt/racket-vm/bin/racket")
|
||||
"../rktboot/main.rkt"
|
||||
#$@(if (racket-cs-native-supported-system?)
|
||||
#~()
|
||||
(let ((m (nix-system->pbarch-machine-type)))
|
||||
#~("--machine" #$m)))))))))))))
|
||||
;; Temporary handling of builds on non-x86 architectures,
|
||||
;; see https://github.com/racket/racket/issues/3948
|
||||
;; Autodetect in rktboot only addresses x86 archs, so far.
|
||||
#$@(let ((m (or (racket-cs-native-supported-system?)
|
||||
(nix-system->pbarch-machine-type))))
|
||||
#~("--machine" #$m))))))))))))
|
||||
(supported-systems
|
||||
(package-supported-systems chez-scheme-for-racket))
|
||||
(home-page "https://github.com/racket/ChezScheme")
|
||||
|
|
|
@ -3246,6 +3246,28 @@ re-imagining of @code{httr} that uses a pipe-based interface and solves more
|
|||
of the problems that API wrapping packages face.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-jsonify
|
||||
(package
|
||||
(name "r-jsonify")
|
||||
(version "1.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "jsonify" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bxgyj5b1hnijq5315g050giixy4k5mjz2zdx8yil0igb5ifji9p"))))
|
||||
(properties `((upstream-name . "jsonify")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-rapidjsonr r-rcpp))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://cran.r-project.org/package=jsonify")
|
||||
(synopsis
|
||||
"Convert between R objects and JavaScript Object Notation (JSON)")
|
||||
(description
|
||||
"This package enables conversions between R objects and JavaScript Object
|
||||
Notation (JSON) using the rapidjsonr library.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-jsonlite
|
||||
(package
|
||||
(name "r-jsonlite")
|
||||
|
@ -5498,6 +5520,81 @@ freedom to design figures for better understanding complex patterns behind
|
|||
multi-dimensional data.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-ctrdata
|
||||
(package
|
||||
(name "r-ctrdata")
|
||||
(version "1.11.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ctrdata" version))
|
||||
(sha256
|
||||
(base32
|
||||
"076v3bll8s6m61wcbwgrgrm34g0wa7gsc90mbwxwap1xfxyzjjsg"))))
|
||||
(properties `((upstream-name . "ctrdata")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-clipr
|
||||
r-curl
|
||||
r-dplyr
|
||||
r-httr
|
||||
r-jsonlite
|
||||
r-lubridate
|
||||
r-nodbi
|
||||
r-rvest
|
||||
r-stringi
|
||||
r-xml2))
|
||||
(native-inputs (list r-r-rsp))
|
||||
(home-page "https://cran.r-project.org/package=ctrdata")
|
||||
(synopsis "Retrieve and analyze clinical trials in public registers")
|
||||
(description
|
||||
"This package provides a system for querying, retrieving and analyzing
|
||||
protocol- and results-related information on clinical trials from three public
|
||||
registers, the European Union Clinical Trials Register (EUCTR),
|
||||
ClinicalTrials.gov (CTGOV) and the ISRCTN. Trial information is downloaded,
|
||||
converted and stored in a database. Functions are included to identify
|
||||
deduplicated records, to easily find and extract variables (fields) of
|
||||
interest even from complex nesting as used by the registers, and to update
|
||||
previous queries. The package can be used for meta-analysis and
|
||||
trend-analysis of the design and conduct as well as for results of clinical
|
||||
trials.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-ctrialsgov
|
||||
(package
|
||||
(name "r-ctrialsgov")
|
||||
(version "0.2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ctrialsgov" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hdh1fdfaja8amf7fkvk1c6yif703132bvacq0j9pk5jr97czgpw"))))
|
||||
(properties `((upstream-name . "ctrialsgov")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-dbi
|
||||
r-dplyr
|
||||
r-ggplot2
|
||||
r-htmlwidgets
|
||||
r-lubridate
|
||||
r-matrix
|
||||
r-plotly
|
||||
r-purrr
|
||||
r-rlang
|
||||
r-stringi
|
||||
r-tibble))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://cran.r-project.org/package=ctrialsgov")
|
||||
(synopsis
|
||||
"Query data from U.S. National Library of Medicine's Clinical Trials Database")
|
||||
(description
|
||||
"This package provides tools to query the U.S. National Library of
|
||||
Medicine's Clinical Trials database. Functions are provided for a variety of
|
||||
techniques for searching the data using range queries, categorical filtering,
|
||||
and by searching for full-text keywords. Minimal graphical tools are also
|
||||
provided for interactively exploring the constructed data.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-powerlaw
|
||||
(package
|
||||
(name "r-powerlaw")
|
||||
|
@ -12217,6 +12314,34 @@ functions also support labelled data, and all integrate seamlessly into a
|
|||
tidyverse workflow.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public r-nodbi
|
||||
(package
|
||||
(name "r-nodbi")
|
||||
(version "0.9.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "nodbi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hn0wy2ry9l3wwqrshmf82cxigkm16wycwprv458bcvb5k6ayy5m"))))
|
||||
(properties `((upstream-name . "nodbi")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-dbi
|
||||
r-jqr
|
||||
r-jsonify
|
||||
r-jsonlite
|
||||
r-stringi
|
||||
r-uuid))
|
||||
(home-page "https://docs.ropensci.org/nodbi/")
|
||||
(synopsis "NoSQL database connector")
|
||||
(description
|
||||
"This is a package for simplified document database access and
|
||||
manipulation, providing a common API across supported NoSQL databases
|
||||
Elasticsearch, CouchDB, MongoDB as well as SQLite/JSON1, PostgreSQL, and
|
||||
DuckDB.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-nortest
|
||||
(package
|
||||
(name "r-nortest")
|
||||
|
|
|
@ -868,6 +868,8 @@ BLAKE.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "04z631v0vzl52g73v390ask5fnzi5wg83lcjkjhpmmymaz0jn152"))))
|
||||
;; "This code requires at least SSE2".
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (list (string-append "CC=" ,(cc-for-target))
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
|
||||
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
;;; Copyright © 2018, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
|
||||
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
|
||||
|
@ -2472,6 +2472,66 @@ protocol is supported.")
|
|||
(home-page "https://github.com/redis/hiredis")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ruby-hiredis
|
||||
(package
|
||||
(name "ruby-hiredis")
|
||||
(version "0.6.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/redis/hiredis-rb")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"05y4g7frhym59m9x208zpvg2qvqvfjlgqmygxj8sqgl07n0ww1ks"))
|
||||
(patches (search-patches
|
||||
"ruby-hiredis-use-system-hiredis.patch"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;require native extension
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-hiredis-include-directory
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/hiredis_ext/extconf.rb"
|
||||
;; Adjust the hiredis include directory.
|
||||
(("\\$CFLAGS << \" -I/usr/include/hiredis\"")
|
||||
(format #f "$CFLAGS << \" -I~a\""
|
||||
(search-input-directory inputs "include/hiredis"))))))
|
||||
(add-after 'unpack 'disable-building-c-extension
|
||||
(lambda _
|
||||
;; FIXME: The produced native extension appears to segfault when
|
||||
;; run; disable building it until a solution is found (see:
|
||||
;; https://github.com/redis/hiredis-rb/issues/93).
|
||||
(substitute* "ext/hiredis_ext/extconf.rb"
|
||||
(("build_hiredis = true")
|
||||
"build_hiredis = false"))))
|
||||
;; FIXME: Un-comment phase after the extension can be made to run
|
||||
;; without crashing (see above).
|
||||
;; (add-after 'build 'build-ext
|
||||
;; (lambda _
|
||||
;; (setenv "CC" #$(cc-for-target))
|
||||
;; (invoke "rake" "compile")))
|
||||
(add-before 'check 'start-redis
|
||||
(lambda _
|
||||
(invoke "redis-server" "--daemonize" "yes")))
|
||||
(add-after 'install 'delete-mkmf.log
|
||||
(lambda _
|
||||
;; This build log captures non-deterministic file names (see:
|
||||
;; https://github.com/rubygems/rubygems/issues/6259).
|
||||
(for-each delete-file (find-files #$output "^mkmf\\.log$")))))))
|
||||
(native-inputs (list redis ruby-rake-compiler))
|
||||
(inputs (list hiredis))
|
||||
(synopsis "Ruby wrapper for hiredis")
|
||||
(description "@code{hiredis-rb} is a Ruby extension that wraps
|
||||
@code{hiredis}, a minimalist C client for Redis. Both the synchronous
|
||||
connection API and a separate protocol reader are supported. It is primarily
|
||||
intended to speed up parsing multi bulk replies.")
|
||||
(home-page "https://github.com/redis/hiredis-rb")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ruby-redis
|
||||
(package
|
||||
(name "ruby-redis")
|
||||
|
|
|
@ -256,6 +256,7 @@
|
|||
#:use-module (gnu packages erlang)
|
||||
#:use-module (gnu packages statistics)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
#:use-module (gnu packages web-browsers)
|
||||
#:use-module (gnu packages wget)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (srfi srfi-1)
|
||||
|
@ -582,7 +583,7 @@ a generic Scheme interaction mode for the GNU Emacs editor.")
|
|||
(define-public emacs-geiser-chez
|
||||
(package
|
||||
(name "emacs-geiser-chez")
|
||||
(version "0.17")
|
||||
(version "0.18")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -591,7 +592,7 @@ a generic Scheme interaction mode for the GNU Emacs editor.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "03fc9ahb0pmznkcnxzgpni4clj1zgky6vaqkc94nf8b8swniwkm9"))))
|
||||
(base32 "19yv5brhzf10hsazmm8s1b058d434hv60a52s08m3kxyrkwr5sca"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
'(#:include (cons "^src/" %default-include)
|
||||
|
@ -645,21 +646,19 @@ server}. The main advantage compared to @code{vc-hg} is speed.")
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-telephone-line
|
||||
(let ((commit "6f3455a365912e8f0c45a2240ea79507dee45ade")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "emacs-telephone-line")
|
||||
(version (git-version "0.5" revision commit))
|
||||
(version "0.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/dbordak/telephone-line")
|
||||
(commit commit)))
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1hnd6wnc52sc0ckriqnhaz64pyjk027y0dpcmh2zhpd27i8d4hmq"))))
|
||||
(base32 "1pv6hlzks02bvxkfyg8m04l36clg39h5w7nq2k6ppi5bh4d4kmc8"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/dbordak/telephone-line")
|
||||
(synopsis "Implementation of Powerline for Emacs")
|
||||
|
@ -667,7 +666,7 @@ server}. The main advantage compared to @code{vc-hg} is speed.")
|
|||
"Telephone Line is a new implementation of Powerline for Emacs with
|
||||
optional baked-in Evil support, antialiased separators, and an easy
|
||||
configuration language which makes it trivial to write your own themes.")
|
||||
(license license:gpl3+))))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-inspector
|
||||
(let ((commit "0b2cf2f00a827f06bda717da8250eafec4108fb3")) ;version bump
|
||||
|
@ -7253,7 +7252,7 @@ It is not intended as a user interface.")
|
|||
(define-public emacs-sqlite3-api
|
||||
(package
|
||||
(name "emacs-sqlite3-api")
|
||||
(version "0.16")
|
||||
(version "0.17")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -7262,7 +7261,7 @@ It is not intended as a user interface.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2"))))
|
||||
"1y36818nd47mzfi3xcp31nr8n0izzmdyiqfx9hgp7ag98rbm7wlx"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -7903,14 +7902,14 @@ user.")
|
|||
(define-public emacs-subed
|
||||
(package
|
||||
(name "emacs-subed")
|
||||
(version "1.2.0")
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.nongnu.org/nongnu/subed-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cdgnwd1saqc07xizdpaadnnl88w0hwc39jklhql1m2a0ii52lck"))))
|
||||
"09a3ggnqsm4lxqhj0z9z3df6qzibvv9lpwqij2gpiifbb4lkvj4b"))))
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #t
|
||||
|
@ -9698,6 +9697,30 @@ insertion mode. When enabled all keys are implicitly prefixed with
|
|||
sgml/html integration, and indentation (working with sgml).")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-jit-spell
|
||||
(package
|
||||
(name "emacs-jit-spell")
|
||||
(version "0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/jit-spell-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"10h2nbp6lap26arwifhzs119mkfj76fvjsix3iccjjvfdi88wdn9"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs (list emacs-compat))
|
||||
(home-page "https://github.com/astoff/jit-spell")
|
||||
(synopsis "Just-in-time spell checking")
|
||||
(description
|
||||
"This package highlights all misspelled words in a window, just like a
|
||||
word processor or web browser does. This behavior is different from the
|
||||
built-in Flyspell package, which only checks words as the cursor moves over
|
||||
them. Moreover, unlike Flyspell, Jit-spell communicates with the
|
||||
spell-checking subprocess entirely asynchronously, which can lead to a
|
||||
noticeable performance improvement.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-company-cabal
|
||||
;; The latest version is 0.3.0, but no release has been provided after 0.2.1.
|
||||
(let ((commit "62112a7259e24bd6c08885629a185afe512b7d3d")
|
||||
|
@ -14123,7 +14146,7 @@ implementation.")
|
|||
(define-public emacs-cider
|
||||
(package
|
||||
(name "emacs-cider")
|
||||
(version "1.6.0")
|
||||
(version "1.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -14132,7 +14155,7 @@ implementation.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1a3xbfn1id8dcy3178kmdnzcvh7lq2pdwwg4axhncw6jq9hqiqja"))))
|
||||
(base32 "0jqjgygdvny1vhjbx7k0l492fhamwndsjcbb2mccwp9j47k4qar9"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
'(#:exclude ;don't exclude 'cider-test.el'
|
||||
|
@ -14615,7 +14638,7 @@ extensions.")
|
|||
(define-public emacs-evil-collection
|
||||
(package
|
||||
(name "emacs-evil-collection")
|
||||
(version "0.0.8")
|
||||
(version "0.0.9")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -14624,12 +14647,22 @@ extensions.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "159i3qvjnp7jiffwpr517nnxcy3w3g40302vyzxvz6mb6qay6f2c"))))
|
||||
(base32 "1y1ig4shqaaiiwqm5pv8hvh8ynr6irhffkgmpyzmhdaaicxnfazc"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-evil emacs-annalist))
|
||||
(arguments
|
||||
`(#:include (cons* "^modes\\/" %default-include)))
|
||||
(list
|
||||
#:include #~(cons* "^modes\\/" %default-include)
|
||||
#:tests? #true
|
||||
#:test-command #~(list "emacs" "-Q" "--batch"
|
||||
"-L" "."
|
||||
"-L" "./test"
|
||||
"-l" "evil-collection-test.el"
|
||||
"-l" "evil-collection-magit-tests.el"
|
||||
"-f" "ert-run-tests-batch-and-exit")))
|
||||
(native-inputs
|
||||
(list emacs-magit))
|
||||
(propagated-inputs
|
||||
(list emacs-annalist emacs-evil))
|
||||
(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
|
||||
|
@ -17217,7 +17250,7 @@ in Emacs.")
|
|||
(define-public emacs-php-mode
|
||||
(package
|
||||
(name "emacs-php-mode")
|
||||
(version "1.24.2")
|
||||
(version "1.24.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -17226,12 +17259,22 @@ in Emacs.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "13lkzvamr86409whr8as4721gx9xrlfkmxvv941775mryliqk6j6"))))
|
||||
(base32 "01yw10z1kf38nz4z3gmpx56wmc7a7caf4nk6rccg0w4kklqw1h94"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-source-directory
|
||||
(list
|
||||
#:tests? #true
|
||||
#:test-command #~(list "emacs" "-Q" "--batch"
|
||||
"-l" "../tests/php-mode-test.el"
|
||||
"-f" "ert-run-tests-batch-and-exit")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'prepare-testing-bed
|
||||
(lambda _
|
||||
;; This file is necessary for `php-project-root' test.
|
||||
(call-with-output-file "tests/project/1/.git"
|
||||
(const #t))))
|
||||
(add-after 'prepare-testing-bed 'enter-source-directory
|
||||
(lambda _
|
||||
(chdir "lisp"))))))
|
||||
(propagated-inputs (list emacs-projectile))
|
||||
|
@ -17408,14 +17451,14 @@ the center of the screen and not at the bottom.")
|
|||
(define-public emacs-posframe
|
||||
(package
|
||||
(name "emacs-posframe")
|
||||
(version "1.4.0")
|
||||
(version "1.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"posframe-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j"))))
|
||||
(base32 "02kw3d6760015q61sryw8k3zqdnzhcwwyfjfysbfs07cljkqpjnh"))))
|
||||
(build-system emacs-build-system)
|
||||
;; emacs-minimal does not include the function font-info.
|
||||
(arguments
|
||||
|
@ -18809,7 +18852,7 @@ multiplexer.")
|
|||
(define-public emacs-plz
|
||||
(package
|
||||
(name "emacs-plz")
|
||||
(version "0.3")
|
||||
(version "0.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -18818,11 +18861,12 @@ multiplexer.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ack4rajjdmb3fqz5v394rqpvn9mfvbkrxra27yrcqz97mma1ki7"))))
|
||||
(base32 "0sfgbq6nn9prxqg5qs576rlpszbhp70yj3d8r7hqckrd5s0sbk13"))))
|
||||
(build-system emacs-build-system)
|
||||
(inputs (list curl))
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;require internet access
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'substitute-curl-path
|
||||
|
@ -21763,7 +21807,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
|
|||
(define-public emacs-citar
|
||||
(package
|
||||
(name "emacs-citar")
|
||||
(version "1.2.0")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -21772,7 +21816,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"186h6wbjwh7ws3jmc81wx2cv7gbppl2j3gwdq67crhml5xjc4fh7"))))
|
||||
"12chdrmkggnpci1kdkkrz4a2bnsbzc8pra318zbnn3qxinlpngyy"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -21811,7 +21855,7 @@ citations.")
|
|||
(define-public emacs-citar-org-roam
|
||||
(package
|
||||
(name "emacs-citar-org-roam")
|
||||
(version "0.3")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -21820,9 +21864,9 @@ citations.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ldfs7g7ixnrwj23draiph4vy6xq7qgw18vhi7vbw6wvkh9fcv9r"))))
|
||||
(base32 "0h1lrx5fg51qpyxh3lrb7x392a5rr8q5a7dihscfzhr38ba1pfh6"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs (list emacs-org-roam emacs-citar))
|
||||
(propagated-inputs (list emacs-citar emacs-org-roam))
|
||||
(home-page "https://github.com/emacs-citar/citar-org-roam")
|
||||
(synopsis "Emacs package to provide tighter Citar and Org-Roam integration")
|
||||
(description "\
|
||||
|
@ -26894,6 +26938,31 @@ scratch, and you think the Spacemacs theme looks good.
|
|||
(base32 "11lwckqcgzsahrkkm5wk1ph4kc7d4yz05r7251g8c9f0q6vdj9dp"))
|
||||
(file-name (git-file-name name version)))))))
|
||||
|
||||
(define-public emacs-column-enforce-mode
|
||||
(let ((commit "14a7622f2268890e33536ccd29510024d51ee96f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-column-enforce-mode")
|
||||
(version (git-version "1.0.4" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url
|
||||
"https://github.com/jordonbiondo/column-enforce-mode")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vxra5vk78yns2sw89m41bggczqg1akq6xvzfs9kylhkg5yz3g7g"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/jordonbiondo/column-enforce-mode")
|
||||
(synopsis "Highlight text that extends beyond a certain column")
|
||||
(description
|
||||
"Column Enforce mode highlights text that extends beyond a certain
|
||||
column. It can be used to enforce 80 column rule. It can also be configured
|
||||
for any @var{N}-column rule.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-column-marker
|
||||
(package
|
||||
(name "emacs-column-marker")
|
||||
|
@ -27141,6 +27210,16 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)")
|
|||
#:test-command #~(list "make" "test")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-spy-on-test
|
||||
(lambda _
|
||||
(substitute* "buttercup.el"
|
||||
;; The spy-on test fails with native compilation, which was
|
||||
;; fixed in v1.30 but with a variable name for Emacs newer
|
||||
;; than 28.2. Add in the same fix with the current variable
|
||||
;; name. Upstream bug and fix:
|
||||
;; <https://github.com/jorgenschaefer/emacs-buttercup/issues/236>
|
||||
(("\\(native-comp-enable-subr-trampolines nil\\)" all)
|
||||
(string-append all " (comp-enable-subr-trampolines nil)")))))
|
||||
(add-after 'install 'install-bin
|
||||
(lambda _
|
||||
(install-file "bin/buttercup"
|
||||
|
@ -27632,6 +27711,37 @@ Nix expressions. It supports syntax highlighting, indenting and refilling of
|
|||
comments.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public emacs-nyxt
|
||||
(package
|
||||
(name "emacs-nyxt")
|
||||
(version "0.1.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~conses/nyxt.el")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hgb10pk5m3v2gsl4h6i821nyzksss0rk4hhjnfb7nm98lalzbl6"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-file-name
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(emacs-substitute-variables "nyxt.el"
|
||||
("nyxt-path"
|
||||
(search-input-file inputs "/bin/nyxt"))))))))
|
||||
(inputs (list nyxt))
|
||||
(propagated-inputs (list emacs-sly))
|
||||
(home-page "https://git.sr.ht/~conses/nyxt.el")
|
||||
(synopsis "Interact with Nyxt from Emacs")
|
||||
(description "This package consists of custom logic to interact with Nyxt
|
||||
from Emacs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-libmpdel
|
||||
(package
|
||||
(name "emacs-libmpdel")
|
||||
|
@ -30941,7 +31051,7 @@ it forcibly
|
|||
(define-public emacs-elpher
|
||||
(package
|
||||
(name "emacs-elpher")
|
||||
(version "3.4.2")
|
||||
(version "3.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -30950,7 +31060,7 @@ it forcibly
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c6pid2ip2c2lpww42wxgq4qflx1m8vxilyva03h8xzgr39kwq64"))))
|
||||
(base32 "04m226by90mv4rxxy6is8appxnvxq4npr585k2y2l1vmrj0qwn49"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -31402,7 +31512,7 @@ contains a track position, playback will start at the specified position.")
|
|||
(define-public emacs-org-jira
|
||||
(package
|
||||
(name "emacs-org-jira")
|
||||
(version "4.4.0")
|
||||
(version "4.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -31412,14 +31522,24 @@ contains a track position, playback will start at the specified position.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1s91l4ibjvvc7rfvd8gldxqrcgjq00q83fdww217ck2ps5yrzyjl"))))
|
||||
"1pkqyvziwp2573hnr8s41chsbm40564f76i3l8ynjr7955nccsms"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #true
|
||||
#:test-command #~(list "emacs" "-Q" "--batch"
|
||||
"-l" "jiralib.el"
|
||||
"-l" "org-jira-sdk.el"
|
||||
"-l" "org-jira.el"
|
||||
"-l" "t/org-jira-t.el"
|
||||
"-l" "t/jiralib-t.el"
|
||||
"-f" "ert-run-tests-batch-and-exit")))
|
||||
(propagated-inputs
|
||||
(list emacs-request emacs-s emacs-dash emacs-org))
|
||||
(list emacs-dash emacs-org emacs-request))
|
||||
(home-page "https://github.com/ahungry/org-jira")
|
||||
(synopsis "Syncing between Jira and Org-mode")
|
||||
(synopsis "Syncing between Jira and Org mode")
|
||||
(description
|
||||
"This package provides an extension to org-mode for syncing issues with
|
||||
"This package provides an extension to Org mode for syncing issues with
|
||||
JIRA issue servers.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
@ -35060,7 +35180,7 @@ complementary packages.")
|
|||
(define-public emacs-wisp-mode
|
||||
(package
|
||||
(name "emacs-wisp-mode")
|
||||
(version "1.0.10")
|
||||
(version "1.0.11")
|
||||
(source
|
||||
(origin
|
||||
(method hg-fetch)
|
||||
|
@ -35069,7 +35189,7 @@ complementary packages.")
|
|||
(changeset (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "13xlagkjmnzv0fn6bwb3vrqn6arxx1g2m1b4wg2rzm7dadlpgmpn"))))
|
||||
(base32 "1w2wx5001aiwky25kvk190d1bgz6g856nm5hhaggsyb1h9f5ws17"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://www.draketo.de/software/wisp")
|
||||
(synopsis "Syntax highlighting and indentation support for Wisp files")
|
||||
|
|
|
@ -435,6 +435,80 @@ significantly increases the risk of irreversible data loss!")
|
|||
(license (list license:gpl2 ; fsattr/src/e4attr.* → sbin/fsattr
|
||||
license:gpl3+)))) ; the rest
|
||||
|
||||
(define-public gocryptfs
|
||||
(package
|
||||
(name "gocryptfs")
|
||||
(version "2.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rfjakob/gocryptfs")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1m0xk5imkx81i1l4wv1j1xh9ckp0gqssq4v46pkkcq2xlv2dvxlr"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/rfjakob/gocryptfs"
|
||||
#:build-flags
|
||||
#~(list
|
||||
"-ldflags" (string-append
|
||||
"-X main.GitVersion=" #$version
|
||||
" -X main.GitVersionFuse=" #$(package-version
|
||||
go-github-com-hanwen-go-fuse-v2)
|
||||
" -X main.BuildDate=" "[reproducible]"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; after 'check phase, should maybe unmount leftover mounts as in
|
||||
;; https://github.com/rfjakob/gocryptfs/blob/a55b3cc15a6d9bce116a90f33df4bc99d9dd6a10/test.bash#L28
|
||||
(replace 'build
|
||||
(lambda arguments
|
||||
(for-each
|
||||
(lambda (directory)
|
||||
(apply (assoc-ref %standard-phases 'build)
|
||||
(append arguments (list #:import-path directory))))
|
||||
(list
|
||||
"github.com/rfjakob/gocryptfs"
|
||||
"github.com/rfjakob/gocryptfs/gocryptfs-xray"
|
||||
"github.com/rfjakob/gocryptfs/contrib/statfs"
|
||||
"github.com/rfjakob/gocryptfs/contrib/findholes"
|
||||
"github.com/rfjakob/gocryptfs/contrib/atomicrename")))))))
|
||||
(native-inputs (list
|
||||
go-github-com-hanwen-go-fuse-v2
|
||||
go-github-com-aperturerobotics-jacobsa-crypto
|
||||
go-github-com-jacobsa-oglematchers
|
||||
go-github-com-jacobsa-oglemock
|
||||
go-github-com-jacobsa-ogletest
|
||||
go-github-com-jacobsa-reqtrace
|
||||
go-github-com-pkg-xattr
|
||||
go-github-com-rfjakob-eme
|
||||
go-github-com-sabhiram-go-gitignore
|
||||
go-github-com-spf13-pflag
|
||||
go-golang-org-x-crypto
|
||||
go-golang-org-x-net
|
||||
go-golang-org-x-sys
|
||||
go-golang-org-x-term
|
||||
openssl
|
||||
pkg-config))
|
||||
(home-page "https://github.com/rfjakob/gocryptfs")
|
||||
(synopsis "Encrypted overlay filesystem")
|
||||
(description
|
||||
"Gocryptfs is an encrypted overlay filesystem written in Go. It
|
||||
features a file-based encryption that is implemented as a mountable
|
||||
FUSE filesystem.
|
||||
|
||||
Gocryptfs was inspired by EncFS and strives to fix its security issues
|
||||
while providing good performance. Gocryptfs is as fast as EncFS in the
|
||||
default mode and significantly faster than paranoia mode in EncFS,
|
||||
which provides a security level comparable to Gocryptfs.
|
||||
|
||||
On CPUs without AES-NI, gocryptfs uses OpenSSL through a thin wrapper
|
||||
called stupidgcm. This provides a 4x speedup compared to Go's builtin
|
||||
AES-GCM implementation.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public gphotofs
|
||||
(package
|
||||
(name "gphotofs")
|
||||
|
|
|
@ -1782,7 +1782,12 @@ following three utilities are included with the library:
|
|||
;; exist.
|
||||
(substitute* "src/Makefile.test.include"
|
||||
(("test/utilprocess_tests.cpp")
|
||||
""))))
|
||||
""))
|
||||
;; Disable PaymentServer failing test because it's using
|
||||
;; an expired SSL certificate.
|
||||
(substitute* "src/qt/test/test_main.cpp"
|
||||
(("if \\(QTest::qExec\\(&test2\\) != 0\\)")
|
||||
"if (QTest::qExec(&test2) == 0)"))))
|
||||
(add-before 'check 'set-home
|
||||
(lambda _
|
||||
;; Tests write to $HOME
|
||||
|
|
|
@ -2072,7 +2072,7 @@ for Inria, a public research institute in computer science and mathematics.")
|
|||
(define-public font-sil-gentium
|
||||
(package
|
||||
(name "font-sil-gentium")
|
||||
(version "5.000")
|
||||
(version "6.200")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -2080,7 +2080,7 @@ for Inria, a public research institute in computer science and mathematics.")
|
|||
version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m7189870hha217n1vgpmf89mwggrxkh679ffi1lxpnjggqi2n9k"))))
|
||||
"0wxhsxv7xqsfbrywax0lcbmyfbrvrcm5g4c7a2v4j4cng4xi08cv"))))
|
||||
;; Note: The zip file provides TTF files only, but the developer release,
|
||||
;; which contains additional files, has a 'SOURCES.txt' file that says
|
||||
;; that "the primary source files for the fonts are the fonts themselves".
|
||||
|
@ -2098,7 +2098,7 @@ italics shapes. This package provides only TrueType files (TTF).")
|
|||
(define-public font-sil-andika
|
||||
(package
|
||||
(name "font-sil-andika")
|
||||
(version "5.000")
|
||||
(version "6.200")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -2106,7 +2106,7 @@ italics shapes. This package provides only TrueType files (TTF).")
|
|||
version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"01zm7p32gxfwmv7h3cfj2vx59846w2y6rxqy67grn2dyjh8pljv0"))))
|
||||
"0z7qvjlidn3m2k40mwnm3azf3wd8pi1yvy2q30p5vkyyzhipb6nc"))))
|
||||
;; As for Gentium (see above), the TTF files are considered source.
|
||||
(build-system font-build-system)
|
||||
(synopsis "Sans serif font designed especially for literacy use")
|
||||
|
@ -2121,7 +2121,7 @@ confused with one another. This package provides only TrueType files (TTF).")
|
|||
(define-public font-sil-charis
|
||||
(package
|
||||
(name "font-sil-charis")
|
||||
(version "5.000")
|
||||
(version "6.200")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -2129,7 +2129,7 @@ confused with one another. This package provides only TrueType files (TTF).")
|
|||
version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zcvw37f1a7gkml3yfm6hxh93844llm7xj4w52600qq3ndrm8gjy"))))
|
||||
"1pksr5wc9grdj75md4phr1a0gpjxk7xlmhv2nybsd2hbfrssl2ab"))))
|
||||
;; As for Gentium (see above), the TTF files are considered source.
|
||||
(build-system font-build-system)
|
||||
(synopsis "Serif font for the Cyrillic and Latin alphabets")
|
||||
|
|
|
@ -484,7 +484,7 @@ display servers. It supports many different languages and emoji.")
|
|||
"1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto))
|
||||
(list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto))
|
||||
(inputs
|
||||
(list bash-minimal ;for 'wrap-program'
|
||||
coreutils
|
||||
|
|
|
@ -13297,7 +13297,7 @@ profiler via Sysprof, debugging support, and more.")
|
|||
(define-public komikku
|
||||
(package
|
||||
(name "komikku")
|
||||
(version "1.14.0")
|
||||
(version "1.15.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -13307,7 +13307,7 @@ profiler via Sysprof, debugging support, and more.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pknm3xz2hai8y6ynlyz7y1k1kaay7mkpm1svx66ggjhz8jzcrj5"))))
|
||||
"0yd4274qxpv0wg1lm6daip2nd135qq07pfl5wrm2rqlzs5mvqs3n"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -13351,6 +13351,7 @@ profiler via Sysprof, debugging support, and more.")
|
|||
python-lxml
|
||||
python-magic
|
||||
python-natsort
|
||||
python-piexif
|
||||
python-pillow
|
||||
python-pure-protobuf
|
||||
python-pycairo
|
||||
|
|
|
@ -857,7 +857,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
(package
|
||||
(inherit go-1.18)
|
||||
(name "go")
|
||||
(version "1.19.5")
|
||||
(version "1.19.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -867,7 +867,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ah4l01h8qj0vj9668bdgr5m69fq16dz1fjlj332vhysxc6bkc27"))))
|
||||
"0rrpfhv6vdwqs0jnld0iqsky5wlirir05czf34kvsf2db21nzdi9"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments go-1.18)
|
||||
((#:phases phases)
|
||||
|
@ -884,7 +884,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
(package
|
||||
(inherit go-1.19)
|
||||
(name "go")
|
||||
(version "1.20")
|
||||
(version "1.20.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -893,7 +893,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0a7wjzv14kaqg5l7ambv5zj4rj7sgah9yhcg6k6da6ygm6bs4dv3"))))
|
||||
"0ir0x17i9067i48ffskwlmbx1j4kfhch46zl8cwl88y23aw59qa2"))))
|
||||
(native-inputs
|
||||
;; Go 1.20 and later requires Go 1.17 as the bootstrap toolchain.
|
||||
;; See 'src/cmd/dist/notgo117.go' in the source code distribution,
|
||||
|
@ -1158,6 +1158,183 @@ form that bypasses network filtering, allowing the application to work on
|
|||
networks where it would otherwise be blocked or heavily throttled.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-hanwen-go-fuse-v2
|
||||
(let ((commit "915cf5413cdef5370ae3f953f8eb4cd9ac176d5c")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-hanwen-go-fuse-v2")
|
||||
(version (git-version "2.2.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hanwen/go-fuse")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ik0yvs9m40vxccpb0rpxc22fyqmcgyysc7w0yl9kn3jyr6qa1d5"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/hanwen/go-fuse/v2"))
|
||||
(native-inputs (list
|
||||
go-golang-org-x-sys
|
||||
go-golang-org-x-sync
|
||||
go-github-com-kylelemons-godebug))
|
||||
(home-page "https://github.com/hanwen/go-fuse")
|
||||
(synopsis "Go bindings for FUSE filesystems")
|
||||
(description
|
||||
"This is a repository containing Go bindings for writing FUSE file systems.")
|
||||
(license license:bsd-3))))
|
||||
|
||||
(define-public go-github-com-aperturerobotics-jacobsa-crypto
|
||||
(let ((commit "b1eb679742a8deed015a4406384eea6bd985d08a")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-aperturerobotics-jacobsa-crypto")
|
||||
(version (git-version "1.0.1" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/aperturerobotics/jacobsa-crypto")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"16dxigj8m6q18xqsy72iq287rh4fw0y0b9yqlw0qkclb8379n1z2"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/aperturerobotics/jacobsa-crypto"
|
||||
;; Source-only package.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Source-only package.
|
||||
(delete 'build))))
|
||||
(home-page "https://github.com/aperturerobotics/jacobsa-crypto")
|
||||
(synopsis "Cryptography missing from the Go standard library")
|
||||
(description
|
||||
"This repository contains Go packages related to cryptographic standards that are
|
||||
not included in the Go standard library.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-jacobsa-oglematchers
|
||||
(let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-jacobsa-oglematchers")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jacobsa/oglematchers")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/jacobsa/oglematchers"
|
||||
;; break loop with with go-github-com-jacobsa-ogletest
|
||||
#:tests? #f))
|
||||
(home-page "https://github.com/jacobsa/oglematchers")
|
||||
(synopsis "Matchers for Go testing framework")
|
||||
(description
|
||||
"Package oglematchers provides a set of matchers useful in a testing or mocking
|
||||
framework. These matchers are inspired by and mostly compatible with Google
|
||||
Test for C++ and Google JS Test.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-jacobsa-oglemock
|
||||
(let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-jacobsa-oglemock")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jacobsa/oglemock")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"14yxf8ykwdwkcccksl6741xgzcf8qykyi58kp4maxpgscqhdl8rq"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/jacobsa/oglemock"
|
||||
;; break loop with with go-github-com-jacobsa-ogletest
|
||||
#:tests? #f))
|
||||
(native-inputs (list
|
||||
go-github-com-jacobsa-oglematchers))
|
||||
(home-page "https://github.com/jacobsa/oglemock")
|
||||
(synopsis "Mocking framework for unit tests")
|
||||
(description
|
||||
"Package oglemock provides a mocking framework for unit tests.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-jacobsa-ogletest
|
||||
(let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-jacobsa-ogletest")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jacobsa/ogletest")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/jacobsa/ogletest"
|
||||
;; These tests should be made working
|
||||
#:tests? #f))
|
||||
(native-inputs (list
|
||||
go-github-com-jacobsa-oglematchers
|
||||
go-github-com-jacobsa-oglemock
|
||||
go-github-com-jacobsa-reqtrace
|
||||
go-golang-org-x-net))
|
||||
(home-page "https://github.com/jacobsa/ogletest")
|
||||
(synopsis "Expressive unit tests")
|
||||
(description
|
||||
"Package ogletest provides a framework for writing expressive unit tests. It
|
||||
integrates with the builtin testing package, so it works with the gotest
|
||||
command. Unlike the testing package which offers only basic capabilities for
|
||||
signalling failures, it offers ways to express expectations and get nice failure
|
||||
messages automatically.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-jacobsa-reqtrace
|
||||
(let ((commit "245c9e0234cb2ad542483a336324e982f1a22934")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-jacobsa-reqtrace")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jacobsa/reqtrace")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zfyijig10896v42rvxka1n4wn6lijqz40y2281187l7mq8vv5jn"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/jacobsa/reqtrace"))
|
||||
(inputs (list
|
||||
go-golang-org-x-net))
|
||||
(home-page "https://github.com/jacobsa/reqtrace")
|
||||
(synopsis "Simple request tracing framework")
|
||||
(description
|
||||
"Package reqtrace contains a very simple request tracing framework.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-kataras-golog
|
||||
(package
|
||||
(name "go-github-com-kataras-golog")
|
||||
|
@ -1229,6 +1406,59 @@ terminals.")
|
|||
aid data snapshotting.")
|
||||
(license license:isc)))
|
||||
|
||||
(define-public go-github-com-pkg-xattr
|
||||
(package
|
||||
(name "go-github-com-pkg-xattr")
|
||||
(version "0.4.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pkg/xattr")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qg4zh0d8m4adaiicsd0cpw0w6g8sk01f4jz7jyxgirh1wfcsqyz"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/pkg/xattr"))
|
||||
(native-inputs (list go-golang-org-x-sys))
|
||||
(home-page "https://github.com/pkg/xattr")
|
||||
(synopsis "Support for extended file system attributes")
|
||||
(description
|
||||
"Package xattr provides support for extended attributes on Linux, Darwin and
|
||||
FreeBSD. Extended attributes are name:value pairs permanently associated with
|
||||
files or directories. They are similar to the environment strings associated with
|
||||
a process. An attribute may be defined or undefined. If defined, its value may
|
||||
be empty or non-empty. You can find more details here:
|
||||
@@url{https://en.wikipedia.org/wiki/Extended_file_attributes,
|
||||
https://en.wikipedia.org/wiki/Extended_file_attributes}
|
||||
.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public go-github-com-rfjakob-eme
|
||||
(package
|
||||
(name "go-github-com-rfjakob-eme")
|
||||
(version "1.1.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rfjakob/eme")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yrbhvy0337mf12fp8p4sy8ry8r3w2qfdf8val5hj07p2lri0cqk"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/rfjakob/eme"))
|
||||
(home-page "https://github.com/rfjakob/eme")
|
||||
(synopsis "EME for Go")
|
||||
(description
|
||||
"EME (ECB-Mix-ECB or, clearer, Encrypt-Mix-Encrypt) is a wide-block encryption
|
||||
mode developed by Halevi and Rogaway.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-shadowsocks-go-shadowsocks2
|
||||
(package
|
||||
(name "go-github-com-shadowsocks-go-shadowsocks2")
|
||||
|
@ -3118,11 +3348,11 @@ the official package.")
|
|||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-golang-org-x-net
|
||||
(let ((commit "ba9fcec4b297b415637633c5a6e8fa592e4a16c3")
|
||||
(revision "4"))
|
||||
(let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-golang-org-x-net")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(version (git-version "0.5.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3131,14 +3361,16 @@ the official package.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"))))
|
||||
"1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "golang.org/x/net"
|
||||
; Source-only package
|
||||
(list
|
||||
#:import-path "golang.org/x/net"
|
||||
;; Source-only package
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Source-only package
|
||||
(delete 'build))))
|
||||
(synopsis "Go supplemental networking libraries")
|
||||
(description "This package provides supplemental Go networking libraries.")
|
||||
|
@ -3218,11 +3450,11 @@ packages.")
|
|||
(license license:bsd-3))))
|
||||
|
||||
(define-public go-golang-org-x-sys
|
||||
(let ((commit "ed5796bab16455f104b6a384d51b7f9990cb9806")
|
||||
(revision "8"))
|
||||
(let ((commit "b60007cc4e6f966b1c542e343d026d06723e5653")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-golang-org-x-sys")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(version (git-version "0.4.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3231,14 +3463,16 @@ packages.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"081vs5bg91mwg5bdmlcvy2qyrvg766aicj47smcwfk4bbh0nc0qa"))))
|
||||
"0fr2d6fnpbqx6n89sg9lsinqkdaw49y068kqj2g0cxlhbh69hzii"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "golang.org/x/sys"
|
||||
(list
|
||||
#:import-path "golang.org/x/sys"
|
||||
;; Source-only package
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Source-only package
|
||||
(delete 'build))))
|
||||
(synopsis "Go support for low-level system interaction")
|
||||
(description "This package provides supplemental libraries offering Go
|
||||
|
|
|
@ -310,6 +310,43 @@ more.")
|
|||
currently does not do much, but it might in the future.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile-openai
|
||||
(let ((commit "252f2d5660bb546015d18c60be96d3cf60c4dcfa")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "guile-openai")
|
||||
(version (git-version "0.1" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/flatwhatson/guile-openai")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qv0kr30d1x7ap1b0h03gl5pzp20xw4qd6b3l5v4iz4ka8qna9gi"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:scheme-file-regexp
|
||||
#~(lambda (file info)
|
||||
(let ((name (basename file)))
|
||||
(and (string-suffix? ".scm" name)
|
||||
(not (string=? (basename file) "guix.scm")))))))
|
||||
(inputs (list guile-3.0-latest))
|
||||
(propagated-inputs
|
||||
(list guile-colorized
|
||||
guile-gnutls
|
||||
guile-json-4
|
||||
guile-picture-language))
|
||||
(home-page "https://gitlab.com/flatwhatson/guile-openai")
|
||||
(synopsis "Guile implementation of the OpenAI API")
|
||||
(description
|
||||
"Guile OpenAI is an implementation of the OpenAI API in Guile Scheme,
|
||||
providing a convenient interface for interactive programming with their AI
|
||||
models.")
|
||||
(license license:agpl3+))))
|
||||
|
||||
;; There are no releases yet of this package.
|
||||
(define-public guile-pipe
|
||||
(let ((commit "0746ec38d19d844dff0c6f62f209b2b6c8d8872e")
|
||||
|
|
|
@ -398,7 +398,9 @@ without requiring the source code to be rewritten.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03bm1mnfc9kkg2ls942a0js7bxrdzmcffgrgg6anwdmjfan2a9hs"))))
|
||||
"03bm1mnfc9kkg2ls942a0js7bxrdzmcffgrgg6anwdmjfan2a9hs"))
|
||||
(patches (search-patches
|
||||
"guile-fix-invalid-unicode-handling.patch"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments guile-3.0)
|
||||
;; Guile 3.0.9 is bit-reproducible when built in parallel, thanks to
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -34,8 +36,10 @@
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages hardware)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages nss)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages rsync)
|
||||
|
@ -45,13 +49,60 @@
|
|||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module ((guix licenses)
|
||||
#:prefix license:))
|
||||
|
||||
(define-public haproxy
|
||||
(package
|
||||
(name "haproxy")
|
||||
(version "2.7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.haproxy.org/download/"
|
||||
(version-major+minor version)
|
||||
"/src/haproxy-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ; there are only regression tests, using varnishtest
|
||||
#:make-flags
|
||||
#~(list "LUA_LIB_NAME=lua"
|
||||
"TARGET=linux-glibc"
|
||||
"USE_LUA=1"
|
||||
"USE_OPENSSL=1"
|
||||
"USE_PCRE2=1"
|
||||
"USE_PCRE2_JIT=1"
|
||||
"USE_PROMEX=1"
|
||||
"USE_ZLIB=1"
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
(string-append "DOCDIR=" #$output "/share/" #$name)
|
||||
(string-append "LUA_INC=" #$(this-package-input "lua") "/include")
|
||||
(string-append "LUA_LIB=" #$(this-package-input "lua") "/lib")
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
(list lua openssl pcre2 zlib))
|
||||
(home-page "https://www.haproxy.org/")
|
||||
(synopsis "Reliable, high performance TCP/HTTP load balancer")
|
||||
(description "HAProxy offers @acronym{HA, high availability}, load
|
||||
balancing, and proxying for TCP and HTTP-based applications. It is particularly
|
||||
suited to Web sites crawling under very high loads while needing persistence or
|
||||
Layer 7 processing. Supporting tens of thousands of connections is clearly
|
||||
realistic with today's hardware.")
|
||||
(license (list license:gpl2+
|
||||
license:lgpl2.1
|
||||
license:lgpl2.1+))))
|
||||
|
||||
(define-public libqb
|
||||
(package
|
||||
(name "libqb")
|
||||
|
|
|
@ -690,7 +690,10 @@ things like:
|
|||
@item structure from motion
|
||||
@item augmented reality
|
||||
@item machine learning
|
||||
@end itemize\n")
|
||||
@end itemize\n
|
||||
|
||||
This package includes the Python bindings for OpenCV, which are also known as
|
||||
the OpenCV-Python library.")
|
||||
(home-page "https://opencv.org/")
|
||||
(license license:bsd-3)))
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 dissent <disseminatedissent@protonmail.com>
|
||||
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
|
||||
;;; Copyright © 2022 Cairn <cairn@pm.me>
|
||||
;;;
|
||||
|
@ -67,6 +67,7 @@
|
|||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages djvu)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gawk)
|
||||
|
@ -101,6 +102,7 @@
|
|||
#:use-module (gnu packages upnp)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages vim)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xml)
|
||||
|
@ -231,7 +233,7 @@ actions.")
|
|||
(define-public geeqie
|
||||
(package
|
||||
(name "geeqie")
|
||||
(version "1.6")
|
||||
(version "2.0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -239,43 +241,31 @@ actions.")
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1i9yd8lddp6b9s9vjjjzbpqj4bvwidxc6kiba6vdrk7dda5akyky"))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "geeqie-clutter.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; Enable support for a "map" pane using GPS data.
|
||||
`(#:configure-flags '("CFLAGS=-O2 -g -fcommon"
|
||||
"--enable-map"
|
||||
"--enable-gtk3")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'correctly-locate-aux-scripts
|
||||
;; The git checkout has symlinks under the auxdir
|
||||
;; directory pointing to /usr/share/automake-1.16/depcomp
|
||||
;; and /usr/share/automake-1.16/install-sh, which causes
|
||||
;; the configure phase to fail (see:
|
||||
;; https://github.com/BestImageViewer/geeqie/issues/936).
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((automake (assoc-ref inputs "automake")))
|
||||
(delete-file "auxdir/depcomp")
|
||||
(symlink (car (find-files automake "depcomp"))
|
||||
"auxdir/depcomp")
|
||||
(delete-file "auxdir/install-sh")
|
||||
(symlink (car (find-files automake "install-sh"))
|
||||
"auxdir/install-sh")))))))
|
||||
"199s0f3khnycr5vhk2ww3xnnasz7dzwxdl89pxjadq6rpgprfqyh"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system meson-build-system)
|
||||
(inputs
|
||||
(list clutter
|
||||
libchamplain
|
||||
lcms
|
||||
(list djvulibre
|
||||
exiv2
|
||||
ffmpegthumbnailer
|
||||
gtk+
|
||||
gspell
|
||||
lcms
|
||||
libarchive
|
||||
libchamplain
|
||||
libheif
|
||||
libjpeg
|
||||
libpng
|
||||
gtk+))
|
||||
libraw
|
||||
libtiff
|
||||
poppler
|
||||
libwebp))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
`(,glib "bin") ; glib-gettextize
|
||||
(list `(,glib "bin") ; glib-gettextize
|
||||
intltool
|
||||
pkg-config))
|
||||
pkg-config
|
||||
xxd
|
||||
yelp-tools))
|
||||
(home-page "https://www.geeqie.org/")
|
||||
(synopsis "Lightweight GTK+ based image viewer")
|
||||
(description
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
;;; Copyright © 2022 Stefan <stefan-guix@vodafonemail.de>
|
||||
;;; Copyright © 2022, 2023 Demis Balbach <db@minikn.xyz>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -482,7 +483,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
;; The current "stable" kernels. That is, the most recently released major
|
||||
;; versions that are still supported upstream.
|
||||
|
||||
(define-public linux-libre-6.2-version "6.2.7")
|
||||
(define-public linux-libre-6.2-version "6.2.8")
|
||||
(define-public linux-libre-6.2-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.2
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -492,12 +493,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "0ir5vvbdh6dly5ld8mfp7285g8k88w5bb32hj4wmgyqsbfqc6rf2")))
|
||||
(define-public linux-libre-6.2-pristine-source
|
||||
(let ((version linux-libre-6.2-version)
|
||||
(hash (base32 "138dpmj8qr5fcji99kmi3sj34ah21bgqgzsz2lbhn37v059100s3")))
|
||||
(hash (base32 "0rgn8k9rhk819bazcaz7fbk5ba1hph02izqrw06ag0rgsj3svl7y")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.2)))
|
||||
|
||||
(define-public linux-libre-6.1-version "6.1.20")
|
||||
(define-public linux-libre-6.1-version "6.1.21")
|
||||
(define-public linux-libre-6.1-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.1
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -507,7 +508,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "0cchdhjra74zanyk14brv2l2dvxpg8dn58rn477lgfb44mcnhq33")))
|
||||
(define-public linux-libre-6.1-pristine-source
|
||||
(let ((version linux-libre-6.1-version)
|
||||
(hash (base32 "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn")))
|
||||
(hash (base32 "0fnr2pw4pi0vnkpv8hfipya09cgdz6ghks7p6vdl2d71dawb2g5k")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.1)))
|
||||
|
@ -515,7 +516,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
;; The "longterm" kernels — the older releases with long-term upstream support.
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
(define-public linux-libre-5.15-version "5.15.103")
|
||||
(define-public linux-libre-5.15-version "5.15.104")
|
||||
(define-public linux-libre-5.15-gnu-revision "gnu")
|
||||
(define deblob-scripts-5.15
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -525,12 +526,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "03hwhwbcicwyx5i30d6m715kwgrxz4h21xhk55wnawlk8zhx3r35")))
|
||||
(define-public linux-libre-5.15-pristine-source
|
||||
(let ((version linux-libre-5.15-version)
|
||||
(hash (base32 "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8")))
|
||||
(hash (base32 "0m3bscml2mvafbj5k9a3qa8akfxms8wfpzsr687lfblr17735ibi")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.15)))
|
||||
|
||||
(define-public linux-libre-5.10-version "5.10.175")
|
||||
(define-public linux-libre-5.10-version "5.10.176")
|
||||
(define-public linux-libre-5.10-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.10
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -540,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1g4vabfswxzf9ahxc06k2ffksf84kcr2csx4m5kx680w0jqqnk80")))
|
||||
(define-public linux-libre-5.10-pristine-source
|
||||
(let ((version linux-libre-5.10-version)
|
||||
(hash (base32 "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2")))
|
||||
(hash (base32 "14zpdrrrpgxx44nxjn0rifrchnmsvvpkzpm1n82kw5q4p9h2q1yf")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.10)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.237")
|
||||
(define-public linux-libre-5.4-version "5.4.238")
|
||||
(define-public linux-libre-5.4-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.4
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -555,12 +556,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1d6as1yk9svysh07hdybs8glvn8s9f8gwlbjl7f9m920pdam2r60")))
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p")))
|
||||
(hash (base32 "07x9ibcshsm451qcpawv3l0z7g8w8jg79h6dfdmbm3jrhpdb58kh")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.278")
|
||||
(define-public linux-libre-4.19-version "4.19.279")
|
||||
(define-public linux-libre-4.19-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.19
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -570,12 +571,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1q0fgpbdwc21wj9wnjjb49dp84ch6ymd5na3iaabadwjs2nmb6bd")))
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv")))
|
||||
(hash (base32 "104qkyflkfkp8iyshpirb9q708vvsgfbxfwgl0dnas3k7nyc6v3k")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
||||
(define-public linux-libre-4.14-version "4.14.310")
|
||||
(define-public linux-libre-4.14-version "4.14.311")
|
||||
(define-public linux-libre-4.14-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.14
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -585,7 +586,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1ccggm19nl7pdcxmsm08fkqy8phz8rqfmww5ypizibdmnrmpn2v9")))
|
||||
(define-public linux-libre-4.14-pristine-source
|
||||
(let ((version linux-libre-4.14-version)
|
||||
(hash (base32 "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb")))
|
||||
(hash (base32 "1mbwrgjz575qxg4gwi2fxc94kprmiblwap3jix0mj4887zllqgw0")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.14)))
|
||||
|
@ -2615,7 +2616,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
|
|||
(define-public strace
|
||||
(package
|
||||
(name "strace")
|
||||
(version "5.18")
|
||||
(version "6.2")
|
||||
(home-page "https://strace.io")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -2623,7 +2624,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
|
|||
"/strace-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11qi7pdm0ldycsg9qhsa50icm219mmvy16yw1ih3s9f9kakkwab0"))
|
||||
"1s3pj6a6xx1p1w98ik03d8hc4xssl4ha4aa0039nhqj196j3hz8c"))
|
||||
(patches (search-patches "strace-readlink-tests.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -402,7 +402,7 @@ easy to use so that you can quickly start testing.")
|
|||
(synopsis "Interactive test framework for Common Lisp")
|
||||
(description
|
||||
"Confidence is a test framework for Common Lisp that focuses on
|
||||
simplicty. It avoids bureaucracy and makes it easy to work interactively,
|
||||
simplicity. It avoids bureaucracy and makes it easy to work interactively,
|
||||
without a complicated setup, and with explicit functions and decisions.")
|
||||
(license license:expat))))
|
||||
|
||||
|
|
|
@ -192,6 +192,54 @@ portable between implementations.")
|
|||
(define-public ecl-alexandria
|
||||
(sbcl-package->ecl-package sbcl-alexandria))
|
||||
|
||||
(define-public sbcl-reader
|
||||
(package
|
||||
(name "sbcl-reader")
|
||||
(version "0.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/digikar99/reader")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"))
|
||||
(file-name (git-file-name "cl-reader" version))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "reader.lisp"
|
||||
(("echo")
|
||||
(search-input-file inputs "/bin/echo"))))))))
|
||||
(inputs
|
||||
(list coreutils ; Needed for call to echo.
|
||||
sbcl-alexandria
|
||||
sbcl-fiveam ; Tests are written directly in the source files.
|
||||
sbcl-hash-set
|
||||
sbcl-iterate
|
||||
sbcl-split-sequence
|
||||
sbcl-trivial-types))
|
||||
(synopsis "Reader macros for common objects and data structures")
|
||||
(description "This package provides a utility library intended
|
||||
at providing configurable reader macros for common tasks such as
|
||||
accessors, hash-tables, sets, uiop:run-program, arrays and a few others.")
|
||||
(home-page "https://github.com/digikar99/reader/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public cl-reader
|
||||
(sbcl-package->cl-source-package sbcl-reader))
|
||||
|
||||
(define-public ecl-reader
|
||||
(package
|
||||
(inherit (sbcl-package->ecl-package sbcl-reader))
|
||||
(arguments
|
||||
;; TODO: Tests fail on call to coreutils echo for ecl.
|
||||
`(#:tests? #f))))
|
||||
|
||||
(define-public sbcl-stdutils
|
||||
(let ((commit "4a4e5a4036b815318282da5dee2a22825369137b")
|
||||
(revision "0"))
|
||||
|
@ -259,6 +307,37 @@ text.")
|
|||
(define-public ecl-langutils
|
||||
(sbcl-package->ecl-package sbcl-langutils))
|
||||
|
||||
(define-public sbcl-hash-set
|
||||
(let ((commit "6feb20de457f14e24a83815be1097aa02cca5986")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "sbcl-hash-set")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/samebchase/hash-set")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "cl-hash-set" version))
|
||||
(sha256
|
||||
(base32 "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs (list sbcl-fiveam))
|
||||
(inputs (list sbcl-alexandria))
|
||||
(home-page "https://github.com/samebchase/hash-set/")
|
||||
(synopsis "Implementation of a hash-set")
|
||||
(description "This package provides an implementation of the
|
||||
hash-set data structure. It has constant time lookup, insertion and
|
||||
deletion.")
|
||||
(license license:unlicense))))
|
||||
|
||||
(define-public cl-hash-set
|
||||
(sbcl-package->cl-source-package sbcl-hash-set))
|
||||
|
||||
(define-public ecl-hash-set
|
||||
(sbcl-package->ecl-package sbcl-hash-set))
|
||||
|
||||
(define-public sbcl-duologue
|
||||
(let ((commit "ea1ada244a81da65f85b548823c9a6d7c9c145e1")
|
||||
(revision "0"))
|
||||
|
@ -5739,6 +5818,40 @@ the format used by the popular compression tool bzip2.")
|
|||
(define-public ecl-chipz
|
||||
(sbcl-package->ecl-package sbcl-chipz))
|
||||
|
||||
(define-public sbcl-cl-tls
|
||||
(let ((commit "2ab4fc3ae7e79e451126a9bb6bc38ca2cd2cb4ba")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "sbcl-cl-tls")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/shrdlu68/cl-tls")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "cl-tls" version))
|
||||
(sha256
|
||||
(base32 "1j6gwv21ibkk6xd1xxm54wgwp09dzqg60b8z72hivpnq8gwm0ba7"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs
|
||||
(list sbcl-alexandria
|
||||
sbcl-babel
|
||||
sbcl-cl-base64
|
||||
sbcl-fast-io
|
||||
sbcl-ironclad))
|
||||
(home-page "https://github.com/shrdlu68/cl-tls")
|
||||
(synopsis "Implementation of Transport Layer Security Protocols")
|
||||
(description "This package provides prototype Common Lisp
|
||||
implementations of TLS, RFC5246, ASN.1, x{501,509}, and PKCS{1,3,5,8}.")
|
||||
(license license:bsd-3))))
|
||||
|
||||
(define-public cl-tls
|
||||
(sbcl-package->cl-source-package sbcl-cl-tls))
|
||||
|
||||
(define-public ecl-cl-tls
|
||||
(sbcl-package->ecl-package sbcl-cl-tls))
|
||||
|
||||
(define-public sbcl-dns-client
|
||||
(let ((commit "9f252e9c2bb61c57a6cd367e21ad366b0d3e87e0")
|
||||
(revision "0"))
|
||||
|
@ -5774,6 +5887,49 @@ DNS records.")
|
|||
(define-public cl-dns-client
|
||||
(sbcl-package->cl-source-package sbcl-dns-client))
|
||||
|
||||
(define-public sbcl-lisp-pay
|
||||
(let ((commit "c4de776f0a284709931ff3674160ced3b41bd000")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "sbcl-lisp-pay")
|
||||
(version (git-version "0.0.5" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/K1D77A/lisp-pay")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "cl-lisp-pay" version))
|
||||
(sha256
|
||||
(base32 "09r6qy4fipriqa0d6g9qm6dq992lr58vh24g5j0adm19i5fnjavh"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs
|
||||
(list sbcl-alexandria
|
||||
sbcl-babel
|
||||
sbcl-cl-base64
|
||||
sbcl-cl-str
|
||||
sbcl-cl-tls
|
||||
sbcl-closer-mop
|
||||
sbcl-dexador
|
||||
sbcl-hu.dwim.defclass-star
|
||||
sbcl-hunchentoot
|
||||
sbcl-ironclad
|
||||
sbcl-jonathan
|
||||
sbcl-lack
|
||||
sbcl-ningle
|
||||
sbcl-shasht))
|
||||
(home-page "https://github.com/K1D77A/lisp-pay/")
|
||||
(synopsis "Wrappers over multiple Payment Processor APIs")
|
||||
(description "This library provides payment API wrappers over
|
||||
BTCPay, Paypal, and Stripe.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public cl-lisp-pay
|
||||
(sbcl-package->cl-source-package sbcl-lisp-pay))
|
||||
|
||||
(define-public ecl-lisp-pay
|
||||
(sbcl-package->ecl-package sbcl-lisp-pay))
|
||||
|
||||
(define-public sbcl-drakma
|
||||
(package
|
||||
(name "sbcl-drakma")
|
||||
|
@ -5864,6 +6020,46 @@ connections (keep-alive), and SSL.")
|
|||
;; Tests fail on ECL with 'Socket error in "socket": EINVAL'.
|
||||
'(#:tests? #f))))
|
||||
|
||||
(define-public sbcl-lunamech-matrix-api
|
||||
(let ((commit "aa54a820149584c237b03d500ad83397fe25dc92")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "sbcl-lunamech-matrix-api")
|
||||
(version (git-version "0.0.2" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/K1D77A/lunamech-matrix-api")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "cl-lunamech-matrix-api" version))
|
||||
(sha256
|
||||
(base32 "0a664qq4m5gk4iv5ck63gmsl3218jhjsalawklj56wn2pw0cf8a0"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs
|
||||
(list sbcl-cl-json
|
||||
sbcl-cl-str
|
||||
sbcl-closer-mop
|
||||
sbcl-dexador
|
||||
sbcl-do-urlencode
|
||||
sbcl-drakma
|
||||
sbcl-jonathan
|
||||
sbcl-plump
|
||||
sbcl-quri
|
||||
sbcl-reader
|
||||
sbcl-shasht))
|
||||
(home-page "https://github.com/K1D77A/lunamech-matrix-api/")
|
||||
(synopsis "Implementation of the Matrix API")
|
||||
(description "This package provides an implementation of the Matrix
|
||||
API for Common Lisp.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public cl-lunamech-matrix-api
|
||||
(sbcl-package->cl-source-package sbcl-lunamech-matrix-api))
|
||||
|
||||
(define-public ecl-lunamech-matrix-api
|
||||
(sbcl-package->ecl-package sbcl-lunamech-matrix-api))
|
||||
|
||||
(define-public sbcl-trivial-types
|
||||
(package
|
||||
(name "sbcl-trivial-types")
|
||||
|
@ -23763,6 +23959,37 @@ Vernacular builds on Overlord and is inspired by Racket.")
|
|||
(define-public cl-vernacular
|
||||
(sbcl-package->cl-source-package sbcl-vernacular))
|
||||
|
||||
(define-public sbcl-osc
|
||||
(let ((commit "9f0a9d3da310a3a0f654f48af0203816f3f371ad")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "sbcl-osc")
|
||||
(version (git-version "0.7" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/zzkt/osc")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "cl-osc" version))
|
||||
(sha256
|
||||
(base32 "0gh29zcl9pmy3xlmwzpf9www2z06ah6b4jk06sj2cvxbc15nblqa"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs (list sbcl-usocket))
|
||||
(synopsis "Implementation of the Open Sound Control protocol")
|
||||
(description "This package provides a common lisp implementation
|
||||
of the Open Sound Control Protocol aka OSC. The code should be close
|
||||
to the ansi standard, and does not rely on any external code/ffi/etc+
|
||||
to do the basic encoding and decoding of packets.")
|
||||
(home-page "https://github.com/zzkt/osc/")
|
||||
(license (list license:gpl3 license:llgpl)))))
|
||||
|
||||
(define-public cl-osc
|
||||
(sbcl-package->cl-source-package sbcl-osc))
|
||||
|
||||
(define-public ecl-osc
|
||||
(sbcl-package->ecl-package sbcl-osc))
|
||||
|
||||
(define-public sbcl-cmn
|
||||
(package
|
||||
(name "sbcl-cmn")
|
||||
|
|
|
@ -1168,16 +1168,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
|||
(define-public mu
|
||||
(package
|
||||
(name "mu")
|
||||
(version "1.8.13")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/djcb/mu")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(version "1.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/djcb/mu/releases/download/v"
|
||||
version "/mu-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y4f5p7pwmaj8733rjzg29038dw33057qlsbsq2wapvp24wcjymr"))))
|
||||
"0fmcxypvl77k7si5g3c0pak13hy2ilz8a6567m7p2apjr33j223z"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
|
|
|
@ -1235,14 +1235,14 @@ in the terminal or with an external viewer.")
|
|||
(define-public gnuplot
|
||||
(package
|
||||
(name "gnuplot")
|
||||
(version "5.4.4")
|
||||
(version "5.4.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
|
||||
version "/gnuplot-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "00h97y8njhvfjbdvc0njw0znxbrlfynd1iazn8w3anvzhsvh08rp"))))
|
||||
(base32 "06bly8cpqjdf744jg7yrgba9rdcm3gl4zf63y3c69v80ha8jgz02"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config texlive-tiny))
|
||||
|
@ -3041,7 +3041,7 @@ can solve two kinds of problems:
|
|||
(define-public octave-cli
|
||||
(package
|
||||
(name "octave-cli")
|
||||
(version "7.3.0")
|
||||
(version "8.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3049,39 +3049,39 @@ can solve two kinds of problems:
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wap9p9imxxqpnm27rxcvpjahk1wg440lzlygjb6iyncxdmfw255"))))
|
||||
"00lis18dsb13v9nvz0z4cs7v4y634jc0vb04lxfw9pshwriikglv"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
("arpack" ,arpack-ng)
|
||||
("bdb" ,bdb)
|
||||
("curl" ,curl)
|
||||
("fftw" ,fftw)
|
||||
("fftwf" ,fftwf)
|
||||
("fltk" ,fltk)
|
||||
("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("gl2ps" ,gl2ps)
|
||||
("glpk" ,glpk)
|
||||
("glu" ,glu)
|
||||
("graphicsmagick" ,graphicsmagick)
|
||||
(list alsa-lib
|
||||
arpack-ng
|
||||
bdb
|
||||
curl
|
||||
fftw
|
||||
fftwf
|
||||
fltk
|
||||
fontconfig
|
||||
freetype
|
||||
gl2ps
|
||||
glpk
|
||||
glu
|
||||
graphicsmagick
|
||||
|
||||
;; TODO: libjpeg-turbo is indirectly required through libtiff. In
|
||||
;; the next rebuild cycle, add an absolute reference for -ljpeg in
|
||||
;; libtiff.la instead of having to provide it here.
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
libjpeg-turbo
|
||||
|
||||
("hdf5" ,hdf5)
|
||||
("lapack" ,lapack)
|
||||
("libsndfile" ,libsndfile)
|
||||
("libxft" ,libxft)
|
||||
("mesa" ,mesa)
|
||||
("pcre" ,pcre)
|
||||
("portaudio" ,portaudio)
|
||||
("qhull" ,qhull)
|
||||
("readline" ,readline)
|
||||
("suitesparse" ,suitesparse)
|
||||
("zlib" ,zlib)))
|
||||
hdf5
|
||||
lapack
|
||||
libsndfile
|
||||
libxft
|
||||
mesa
|
||||
pcre
|
||||
portaudio
|
||||
qhull
|
||||
readline
|
||||
suitesparse
|
||||
zlib))
|
||||
(native-inputs
|
||||
(list gfortran
|
||||
pkg-config
|
||||
|
@ -3121,8 +3121,7 @@ can solve two kinds of problems:
|
|||
(substitute* "libinterp/corefcn/help.h"
|
||||
(("\"makeinfo\"")
|
||||
(string-append
|
||||
"\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\"")))
|
||||
#t)))))
|
||||
"\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\""))))))))
|
||||
(home-page "https://www.gnu.org/software/octave/")
|
||||
(synopsis "High-level language for numerical computation (no GUI)")
|
||||
(description "GNU Octave is a high-level interpreted language that is
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Giovanni Biscuolo <g@xelera.eu>
|
||||
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -1321,7 +1322,7 @@ Encryption to Gajim.")
|
|||
(define-public dino
|
||||
(package
|
||||
(name "dino")
|
||||
(version "0.4.0")
|
||||
(version "0.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1329,7 +1330,7 @@ Encryption to Gajim.")
|
|||
(string-append "https://github.com/dino/dino/releases/download/v"
|
||||
version "/dino-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "115p7mjk0q68nvv8asrm6hsv0dzsz7hy2bnvhwhxmcfbilr8fq68"))))
|
||||
(base32 "1vbyrnivibsn4jzmfb6sfq5fxhb0xh1cnhgcmg1rafq751q55cg1"))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "debug"))
|
||||
(arguments
|
||||
|
@ -2842,7 +2843,7 @@ as well as on desktop platforms. It's based on libpurple and ModemManager.")
|
|||
(define-public mosquitto
|
||||
(package
|
||||
(name "mosquitto")
|
||||
(version "1.6.12")
|
||||
(version "2.0.15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2850,10 +2851,10 @@ as well as on desktop platforms. It's based on libpurple and ModemManager.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yq7y329baa1ly488rw125c3mvsnsa7kjkik602xv1xpkz8p73al"))))
|
||||
"1ils0ckxz86gvr37k2gfl4q9gs12625dhhb7i6lcg49z5v9v2da7"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
(list openssl))
|
||||
(list openssl libxslt))
|
||||
(synopsis "Message broker")
|
||||
(description "This package provides Eclipse Mosquitto, a message broker
|
||||
that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. Mosquitto
|
||||
|
|
|
@ -600,7 +600,7 @@ mpdevil loads all tags and covers on demand.")
|
|||
(define-public mympd
|
||||
(package
|
||||
(name "mympd")
|
||||
(version "10.2.4")
|
||||
(version "10.2.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -609,7 +609,7 @@ mpdevil loads all tags and covers on demand.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0544vx9x103394mz2x92ycfj5lh59xrzcvagi4q0jb9b1hh44s6p"))))
|
||||
"1adi1pdygj7wlfi6k3978b6ny2cziai4f761a61j9vxa2ywf7wbb"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f)) ; no test target
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
|
||||
;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2019, 2021 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2019, 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
|
||||
;;; Copyright © 2019 Daniel Schaefer <git@danielschaefer.me>
|
||||
|
@ -58,6 +58,7 @@
|
|||
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -200,7 +201,7 @@ runs on top of IP or UDP, and supports both v4 and v6 versions.")
|
|||
(define-public arp-scan
|
||||
(package
|
||||
(name "arp-scan")
|
||||
(version "1.9.8")
|
||||
(version "1.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -210,7 +211,7 @@ runs on top of IP or UDP, and supports both v4 and v6 versions.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "18pck3hi7caykpkry5ri16w4w8m11g8gvh3qx5rhwsc6d9xa2a6d"))))
|
||||
(base32 "1d603by2v7gj6bdxn1d23l425q115dk5qfk3ywbj6wbsjysqhbq5"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list libpcap))
|
||||
|
@ -2912,6 +2913,39 @@ networks.")
|
|||
speedtest.net.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public atftp
|
||||
(package
|
||||
(name "atftp")
|
||||
(version "0.8.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.code.sf.net/p/atftp/code")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"019qrh2wpvr577ksvs3s82q6kiqm5i6869aj7qba326b59lhkxrc"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autoreconf
|
||||
(lambda _
|
||||
(invoke "autoreconf" "-vif"))))))
|
||||
(native-inputs (list autoconf automake perl pkg-config))
|
||||
(inputs (list pcre2 procps readline tcp-wrappers))
|
||||
(home-page "https://sourceforge.net/projects/atftp/")
|
||||
(synopsis "Advanced TFTP server and client")
|
||||
(description
|
||||
"This package provides a multi-threaded TFTP server that implements all
|
||||
options, including all extensions, as specified in RFC 1350, RFC 2090, RFC
|
||||
2347, RFC 2348, RFC 2349 and RFC7440. Atftpd also supports a multicast
|
||||
protocol known as mtftp, which was defined in the PXE specification.
|
||||
|
||||
The server is socket activated by default but supports being started from
|
||||
@command{inetd} as well as in daemon mode.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public tftp-hpa
|
||||
(package
|
||||
(name "tftp-hpa")
|
||||
|
@ -4236,46 +4270,6 @@ cables.")
|
|||
"file://COPYING.slirpvde"
|
||||
"See COPYING.slirpvde in the distribution."))))))
|
||||
|
||||
(define-public haproxy
|
||||
(package
|
||||
(name "haproxy")
|
||||
(version "2.1.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.haproxy.org/download/"
|
||||
(version-major+minor version)
|
||||
"/src/haproxy-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let* ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "PREFIX=" out)
|
||||
(string-append "DOCDIR=" out "/share/" ,name)
|
||||
"TARGET=linux-glibc"
|
||||
"USE_LUA=1"
|
||||
"USE_OPENSSL=1"
|
||||
"USE_ZLIB=1"
|
||||
"USE_PCRE_2=1"))
|
||||
#:tests? #f ; there are only regression tests, using varnishtest
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
(list lua openssl pcre2 zlib))
|
||||
(home-page "https://www.haproxy.org/")
|
||||
(synopsis "Reliable, high performance TCP/HTTP load balancer")
|
||||
(description "HAProxy offers @acronym{HA, high availability}, load
|
||||
balancing, and proxying for TCP and HTTP-based applications. It is particularly
|
||||
suited to Web sites crawling under very high loads while needing persistence or
|
||||
Layer 7 processing. Supporting tens of thousands of connections is clearly
|
||||
realistic with today's hardware.")
|
||||
(license (list license:gpl2+
|
||||
license:lgpl2.1
|
||||
license:lgpl2.1+))))
|
||||
|
||||
(define-public lldpd
|
||||
(package
|
||||
(name "lldpd")
|
||||
|
|
|
@ -1111,14 +1111,14 @@ concrete syntax of the language (Quotations, Syntax Extensions).")
|
|||
(define-public hevea
|
||||
(package
|
||||
(name "hevea")
|
||||
(version "2.35")
|
||||
(version "2.36")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://hevea.inria.fr/old/"
|
||||
"hevea-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jwydkb9ldb1sx815c364dxgr569f2rbbzgxbn2kanrybpdbm2gi"))))
|
||||
"0j06f8gb8f5is34kzmzy3znb0jkm2qd2l6rcl5v5qa9af3bmjrsx"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list ocaml))
|
||||
|
|
|
@ -59,6 +59,7 @@
|
|||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages debian)
|
||||
#:use-module (gnu packages dejagnu)
|
||||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages docbook)
|
||||
|
@ -87,6 +88,7 @@
|
|||
#:use-module (gnu packages nettle)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages ninja)
|
||||
#:use-module (gnu packages node)
|
||||
#:use-module (gnu packages nss)
|
||||
#:use-module (gnu packages patchutils)
|
||||
#:use-module (gnu packages perl)
|
||||
|
@ -98,6 +100,7 @@
|
|||
#:use-module (gnu packages python-check)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages ssh)
|
||||
|
@ -117,6 +120,7 @@
|
|||
#:use-module (guix build-system guile)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system ruby)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
|
@ -1363,8 +1367,8 @@ environments.")
|
|||
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
|
||||
|
||||
(define-public guix-build-coordinator
|
||||
(let ((commit "804165f14ccf613b7d76b2bda83fbfd49019f7e4")
|
||||
(revision "74"))
|
||||
(let ((commit "3c9354e1c0b0767e0121ecbd03abfe37c895e34b")
|
||||
(revision "76"))
|
||||
(package
|
||||
(name "guix-build-coordinator")
|
||||
(version (git-version "0" revision commit))
|
||||
|
@ -1375,7 +1379,7 @@ environments.")
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0qga8a7795cig211hya53qjvd2bxcpabpz8izc8zxrmz490wz24j"))
|
||||
"19gc4ya56inxnjpf1br2sdva0k4jyc1jn5q84qdfpiwn1ryb0jjd"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -1414,7 +1418,7 @@ environments.")
|
|||
"guile-gnutls"
|
||||
,@(if (hurd-target?)
|
||||
'()
|
||||
'("guile-fibers")))))
|
||||
'("guile-fibers-next")))))
|
||||
(wrap-program file
|
||||
`("PATH" ":" prefix
|
||||
(,bin
|
||||
|
@ -2005,6 +2009,88 @@ applications")
|
|||
sandboxed desktop applications on GNU/Linux.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public fpm
|
||||
(package
|
||||
(name "fpm")
|
||||
(version "1.15.1")
|
||||
(source (origin
|
||||
(method git-fetch) ;for tests
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jordansissel/fpm")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1m2zxf7wyk7psvm611yxs68hnwm0pyqilsmcq3x791hz7rvbg68w"))
|
||||
(patches (search-patches "fpm-newer-clamp-fix.patch"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'extract-gemspec 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* '("lib/fpm/util.rb"
|
||||
"spec/fpm/util_spec.rb"
|
||||
"spec/fpm/package/rpm_spec.rb")
|
||||
(("\"/bin/sh\"")
|
||||
(string-append "\"" (search-input-file inputs "bin/sh")
|
||||
"\"")))))
|
||||
(add-after 'extract-gemspec 'relax-requirements
|
||||
(lambda _
|
||||
(substitute* "fpm.gemspec"
|
||||
(("\"clamp\", \"~> 1.0.0\"")
|
||||
"\"clamp\", \">= 1.0.0\""))))
|
||||
(add-after 'extract-gemspec 'disable-problematic-tests
|
||||
;; Disable some tests which are failing (see:
|
||||
;; https://github.com/jordansissel/fpm/issues/2000).
|
||||
(lambda _
|
||||
;; There are 4 'NoMethodError' test failures in the
|
||||
;; command_spec suite, for unknown reasons.
|
||||
(delete-file "spec/fpm/command_spec.rb")
|
||||
(substitute* "spec/fpm/package_spec.rb"
|
||||
(("@oldtmp = ENV\\[\"TMP\"]" all)
|
||||
"skip('fails with guix')"))
|
||||
(substitute* "spec/fpm/package/cpan_spec.rb"
|
||||
;; This test is marked as expected to fail (pending) when
|
||||
;; TRAVIS_OS_NAME is set, but passes with Guix; skip it.
|
||||
(("it \"should unpack tarball containing" all)
|
||||
(string-append "x" all)))
|
||||
(substitute* "spec/fpm/package/gem_spec.rb"
|
||||
;; This test fails for unknown reason; perhaps a patched
|
||||
;; shebang.
|
||||
(("it 'should not change the shebang'" all)
|
||||
(string-append "x" all)))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; Set TRAVIS_OS_NAME to skip tests known to cause
|
||||
;; problems in minimal environments.
|
||||
(setenv "TRAVIS_OS_NAME" "GNU Guix")
|
||||
(invoke "rspec")))))))
|
||||
(native-inputs
|
||||
(list dpkg
|
||||
libarchive
|
||||
node
|
||||
perl-app-cpanminus
|
||||
python
|
||||
ruby-rspec
|
||||
squashfs-tools
|
||||
zstd))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
ruby-arr-pm
|
||||
ruby-backports
|
||||
ruby-cabin
|
||||
ruby-clamp
|
||||
ruby-pleaserun
|
||||
ruby-rexml
|
||||
ruby-stud))
|
||||
(home-page "https://github.com/jordansissel/fpm/")
|
||||
(synopsis "Package building and mangling tool")
|
||||
(description "@command{fpm} is a command to convert directories, RPMs,
|
||||
Python eggs, Ruby gems, and more to RPMs, debs, Solaris packages and more.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public akku
|
||||
(package
|
||||
(name "akku")
|
||||
|
|
|
@ -64,14 +64,14 @@
|
|||
(define-public parallel
|
||||
(package
|
||||
(name "parallel")
|
||||
(version "20230222")
|
||||
(version "20230322")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/parallel/parallel-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "03lqkhh9pa9kyrpfkcd4jlwidnjj0bq2ykp7h2vxss3n17maadkd"))
|
||||
(base32 "1jkv5c0ddnwbmx7ay3zxn14sxibhi4ff58waqm6rvg0cdnxb3iz5"))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
Retrieved from: https://github.com/jordansissel/fpm/pull/1561.patch
|
||||
|
||||
From 956a218a7b35de08ea35da3b702ffdc716656b68 Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Sissel <jls@semicomplete.com>
|
||||
Date: Mon, 15 Oct 2018 21:05:47 -0700
|
||||
Subject: [PATCH] Check if an option has a default value before we try to look
|
||||
it up.
|
||||
|
||||
This fixes fpm when used with clamp 1.3.0 or above.
|
||||
|
||||
Fixes #1543
|
||||
---
|
||||
lib/fpm/command.rb | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/fpm/command.rb b/lib/fpm/command.rb
|
||||
index a204001e1..a99ddb627 100644
|
||||
--- a/lib/fpm/command.rb
|
||||
+++ b/lib/fpm/command.rb
|
||||
@@ -394,7 +394,12 @@ def execute
|
||||
set = proc do |object, attribute|
|
||||
# if the package's attribute is currently nil *or* the flag setting for this
|
||||
# attribute is non-default, use the value.
|
||||
- if object.send(attribute).nil? || send(attribute) != send("default_#{attribute}")
|
||||
+
|
||||
+ # Not all options have a default value, so we assume `nil` if there's no default. (#1543)
|
||||
+ # In clamp >= 1.3.0, options without `:default => ..` will not have any # `default_xyz`
|
||||
+ # methods generated, so we need to check for the presence of this method first.
|
||||
+ default = respond_to?("default_#{attribute}") ? send("default_#{attribute}") : nil
|
||||
+ if object.send(attribute).nil? || send(attribute) != default
|
||||
logger.info("Setting from flags: #{attribute}=#{send(attribute)}")
|
||||
object.send("#{attribute}=", send(attribute))
|
||||
end
|
|
@ -1,35 +0,0 @@
|
|||
From c99084ac5fc2fb854ff8e8abd4bd3298fb08fb43 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Clark <colin.clark@cclark.uk>
|
||||
Date: Sat, 9 Jan 2021 11:35:41 +0000
|
||||
Subject: [PATCH] Fix #829: segfault with clutter-gtk
|
||||
|
||||
https://github.com/BestImageViewer/geeqie/issues/829
|
||||
|
||||
This fix might cause other problems which might be cured by calling:
|
||||
LIBGL_ALWAYS_INDIRECT=1 geeqie
|
||||
|
||||
or, worst case:
|
||||
geeqie --disable-clutter
|
||||
---
|
||||
src/main.c | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index f497240d..4af654fe 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -904,11 +904,6 @@ gint main(gint argc, gchar *argv[])
|
||||
#ifdef HAVE_GTHREAD
|
||||
#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
g_thread_init(NULL);
|
||||
-#endif
|
||||
-#ifdef HAVE_CLUTTER
|
||||
-/* FIXME: see below */
|
||||
- putenv("LIBGL_ALWAYS_INDIRECT=1");
|
||||
- XInitThreads();
|
||||
#endif
|
||||
gdk_threads_init();
|
||||
gdk_threads_enter();
|
||||
--
|
||||
2.34.0
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
Reported upstream at https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62290 and
|
||||
patch merged as cba2e7e3fec3c781230570f5d1ef070625eeeda8.
|
||||
|
||||
From 31a1c3c4783e8e66b93500737f23f209d8115f77 Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Baines <mail@cbaines.net>
|
||||
Date: Fri, 17 Mar 2023 12:48:39 +0000
|
||||
Subject: [PATCH] Fix some invalid unicode handling issues with suspendable
|
||||
ports.
|
||||
|
||||
Based on the implementation in ports.c. I don't understand what this
|
||||
code is really doing, but the suspendable ports implementation differs
|
||||
from the similar C code for a couple of inequalities.
|
||||
|
||||
* module/ice-9/suspendable-ports.scm (decode-utf8, bad-utf8-len): Flip a
|
||||
couple of inequalities.
|
||||
* test-suite/tests/ports.test ("string ports"): Add additional invalid
|
||||
UTF-8 test case.
|
||||
---
|
||||
module/ice-9/suspendable-ports.scm | 8 ++++----
|
||||
test-suite/tests/ports.test | 7 +++++++
|
||||
2 files changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/module/ice-9/suspendable-ports.scm b/module/ice-9/suspendable-ports.scm
|
||||
index a823f1d37..9fac1df62 100644
|
||||
--- a/module/ice-9/suspendable-ports.scm
|
||||
+++ b/module/ice-9/suspendable-ports.scm
|
||||
@@ -419,7 +419,7 @@
|
||||
(= (logand u8_2 #xc0) #x80)
|
||||
(case u8_0
|
||||
((#xe0) (>= u8_1 #xa0))
|
||||
- ((#xed) (>= u8_1 #x9f))
|
||||
+ ((#xed) (<= u8_1 #x9f))
|
||||
(else #t)))
|
||||
(kt (integer->char
|
||||
(logior (ash (logand u8_0 #x0f) 12)
|
||||
@@ -436,7 +436,7 @@
|
||||
(= (logand u8_3 #xc0) #x80)
|
||||
(case u8_0
|
||||
((#xf0) (>= u8_1 #x90))
|
||||
- ((#xf4) (>= u8_1 #x8f))
|
||||
+ ((#xf4) (<= u8_1 #x8f))
|
||||
(else #t)))
|
||||
(kt (integer->char
|
||||
(logior (ash (logand u8_0 #x07) 18)
|
||||
@@ -462,7 +462,7 @@
|
||||
((< buffering 2) 1)
|
||||
((not (= (logand (ref 1) #xc0) #x80)) 1)
|
||||
((and (eq? first-byte #xe0) (< (ref 1) #xa0)) 1)
|
||||
- ((and (eq? first-byte #xed) (< (ref 1) #x9f)) 1)
|
||||
+ ((and (eq? first-byte #xed) (> (ref 1) #x9f)) 1)
|
||||
((< buffering 3) 2)
|
||||
((not (= (logand (ref 2) #xc0) #x80)) 2)
|
||||
(else 0)))
|
||||
@@ -471,7 +471,7 @@
|
||||
((< buffering 2) 1)
|
||||
((not (= (logand (ref 1) #xc0) #x80)) 1)
|
||||
((and (eq? first-byte #xf0) (< (ref 1) #x90)) 1)
|
||||
- ((and (eq? first-byte #xf4) (< (ref 1) #x8f)) 1)
|
||||
+ ((and (eq? first-byte #xf4) (> (ref 1) #x8f)) 1)
|
||||
((< buffering 3) 2)
|
||||
((not (= (logand (ref 2) #xc0) #x80)) 2)
|
||||
((< buffering 4) 3)
|
||||
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
|
||||
index 66e10e3dd..1b30e1a68 100644
|
||||
--- a/test-suite/tests/ports.test
|
||||
+++ b/test-suite/tests/ports.test
|
||||
@@ -1059,6 +1059,13 @@
|
||||
eof))
|
||||
|
||||
(test-decoding-error (#xf0 #x88 #x88 #x88) "UTF-8"
|
||||
+ (error ;; 2nd byte should be in the 90..BF range
|
||||
+ error ;; 88: not a valid starting byte
|
||||
+ error ;; 88: not a valid starting byte
|
||||
+ error ;; 88: not a valid starting byte
|
||||
+ eof))
|
||||
+
|
||||
+ (test-decoding-error (#xf4 #xa4 #xbd #xa4) "UTF-8"
|
||||
(error ;; 2nd byte should be in the 90..BF range
|
||||
error ;; 88: not a valid starting byte
|
||||
error ;; 88: not a valid starting byte
|
||||
--
|
||||
2.39.1
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
Retrieved 2023-03-05 from
|
||||
https://sources.debian.org/data/main/r/ruby-hiredis/0.6.3-2/debian/patches/use_system_libhiredis.patch.
|
||||
|
||||
From: Apollon Oikonomopoulos <apoikos@gmail.com>
|
||||
Date: Mon, 20 Jan 2020 09:28:45 -0300
|
||||
Subject: Use system libhiredis
|
||||
|
||||
Last-Update: 2013-04-10
|
||||
Forwarded: no
|
||||
|
||||
Use Debian's libhiredis version instead of downloading one and statically
|
||||
linking against it.
|
||||
---
|
||||
ext/hiredis_ext/extconf.rb | 18 +++---------------
|
||||
1 file changed, 3 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/ext/hiredis_ext/extconf.rb b/ext/hiredis_ext/extconf.rb
|
||||
index da39eb5..ffa3abf 100644
|
||||
--- a/ext/hiredis_ext/extconf.rb
|
||||
+++ b/ext/hiredis_ext/extconf.rb
|
||||
@@ -9,12 +9,6 @@ end
|
||||
|
||||
RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
|
||||
|
||||
-hiredis_dir = File.join(File.dirname(__FILE__), %w{.. .. vendor hiredis})
|
||||
-unless File.directory?(hiredis_dir)
|
||||
- STDERR.puts "vendor/hiredis missing, please checkout its submodule..."
|
||||
- exit 1
|
||||
-end
|
||||
-
|
||||
RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
|
||||
make_program = $1 || ENV['make']
|
||||
make_program ||= case RUBY_PLATFORM
|
||||
@@ -27,15 +21,9 @@ else
|
||||
end
|
||||
|
||||
if build_hiredis
|
||||
- # Make sure hiredis is built...
|
||||
- Dir.chdir(hiredis_dir) do
|
||||
- success = system("#{make_program} static")
|
||||
- raise "Building hiredis failed" if !success
|
||||
- end
|
||||
-
|
||||
- # Statically link to hiredis (mkmf can't do this for us)
|
||||
- $CFLAGS << " -I#{hiredis_dir}"
|
||||
- $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
|
||||
+ # Debian: use system hiredis
|
||||
+ $CFLAGS << " -I/usr/include/hiredis"
|
||||
+ $LDFLAGS << " -lhiredis"
|
||||
|
||||
have_func("rb_thread_fd_select")
|
||||
create_makefile('hiredis/ext/hiredis_ext')
|
|
@ -168,7 +168,7 @@ refreshed, and more.")
|
|||
(define-public colordiff
|
||||
(package
|
||||
(name "colordiff")
|
||||
(version "1.0.20")
|
||||
(version "1.0.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -177,7 +177,7 @@ refreshed, and more.")
|
|||
(string-append "http://www.colordiff.org/archive/colordiff-"
|
||||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32 "1kbv3lsyzzrwca4v3ajpnv8q5j0h53r94lxiqgmikxmrxrxh3cp3"))))
|
||||
(base32 "05g64z4ls1i70rpzznjxy2cpjgywisnwj9ssx9nq1w7hgqjz8c4v"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
|
@ -552,6 +552,27 @@ users can force the decision of which backend to use by setting the environment
|
|||
variable ANY_MOOSE to be Moose or Mouse.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-app-cpanminus
|
||||
(package
|
||||
(name "perl-app-cpanminus")
|
||||
(version "1.7046")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qpq1x24dcrm7bm2qj814nkmxg8mzkdn6wcirjd8yd578jdrv31y"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/App-cpanminus")
|
||||
(synopsis "CPAN package manager")
|
||||
(description "App::cpanminus is a script to get, unpack, build and install
|
||||
modules from CPAN and does nothing else. It's dependency free (can bootstrap
|
||||
itself), requires zero configuration, and stands alone. When running, it
|
||||
requires only 10MB of RAM.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-app-xml-docbook-builder
|
||||
(package
|
||||
(name "perl-app-xml-docbook-builder")
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
|
||||
|
@ -49,6 +49,7 @@
|
|||
#:use-module (gnu packages python-check)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages rpc)
|
||||
#:use-module (gnu packages rails)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
|
@ -512,7 +513,7 @@ source files.")
|
|||
(define-public ruby-protobuf
|
||||
(package
|
||||
(name "ruby-protobuf")
|
||||
(version "3.10.3")
|
||||
(version "3.10.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -521,7 +522,7 @@ source files.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yzz7jgpp6qip5d6qhzbkf5gqaydfk3z3c1ngccwzp6w6wa75g8a"))))
|
||||
"12hp1clg83jfl35x1h2ymzpj5w83wrnqw7hjfc6mqa8lsvpw535r"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -529,8 +530,7 @@ source files.")
|
|||
(add-after 'unpack 'do-not-use-bundler-for-tests
|
||||
(lambda _
|
||||
(substitute* "spec/spec_helper.rb"
|
||||
(("Bundler\\.setup.*") ""))
|
||||
#t))
|
||||
(("Bundler\\.setup.*") ""))))
|
||||
(add-after 'unpack 'relax-version-requirements
|
||||
(lambda _
|
||||
(substitute* ((@@ (guix build ruby-build-system) first-gemspec))
|
||||
|
@ -539,33 +539,30 @@ source files.")
|
|||
(("\"rubocop\",.*")
|
||||
"'rubocop'\n")
|
||||
(("\"parser\",.*")
|
||||
"'parser'\n"))
|
||||
#t))
|
||||
"'parser'\n"))))
|
||||
(add-after 'unpack 'patch-protoc
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((protoc (assoc-ref inputs "protobuf")))
|
||||
(substitute* "lib/protobuf/tasks/compile.rake"
|
||||
(("\"protoc\"")
|
||||
(string-append "\"" protoc "/bin/protoc" "\"")))
|
||||
#t)))
|
||||
(string-append "\"" (search-input-file inputs "bin/protoc")
|
||||
"\"")))))
|
||||
(add-after 'unpack 'skip-failing-test
|
||||
;; See: https://github.com/ruby-protobuf/protobuf/issues/419
|
||||
(lambda _
|
||||
(substitute* "spec/lib/protobuf/rpc/connectors/ping_spec.rb"
|
||||
(("expect\\(::IO\\)\\.to receive\\(:select\\).*" all)
|
||||
(string-append " pending\n" all)))
|
||||
#t))
|
||||
(string-append " pending\n" all)))))
|
||||
(add-after 'replace-git-ls-files 'replace-more-git-ls-files
|
||||
(lambda _
|
||||
(substitute* ((@@ (guix build ruby-build-system) first-gemspec))
|
||||
(("`git ls-files -- \\{test,spec,features\\}/*`")
|
||||
"`find test spec features -type f | sort`")
|
||||
(("`git ls-files -- bin/*`")
|
||||
"`find bin -type f | sort`"))
|
||||
#t))
|
||||
"`find bin -type f | sort`"))))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "rspec"))))))
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "rspec")))))))
|
||||
(native-inputs
|
||||
(list ruby-benchmark-ips
|
||||
ruby-ffi-rzmq
|
||||
|
@ -583,26 +580,12 @@ source files.")
|
|||
(inputs
|
||||
(list protobuf))
|
||||
(propagated-inputs
|
||||
(list ruby-activesupport ruby-middleware ruby-thor ruby-thread-safe))
|
||||
(list ruby-activesupport
|
||||
ruby-middleware
|
||||
ruby-thor
|
||||
ruby-thread-safe))
|
||||
(home-page "https://github.com/ruby-protobuf/protobuf")
|
||||
(synopsis "Implementation of Google's Protocol Buffers in Ruby")
|
||||
(description "Protobuf is an implementation of Google's Protocol Buffers
|
||||
in pure Ruby.")
|
||||
(license license:expat)))
|
||||
|
||||
;;; This is a modified ruby-protobuf package used by ruby-cucumber-messages
|
||||
;;; until https://github.com/ruby-protobuf/protobuf/pull/411 and
|
||||
;;; https://github.com/ruby-protobuf/protobuf/pull/415 are merged upstream.
|
||||
(define-public ruby-protobuf-cucumber
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit ruby-protobuf)
|
||||
(name "ruby-protobuf-cucumber")
|
||||
(version "3.10.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "protobuf-cucumber" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rd6naabhpfb1i5dr6fp5mqwaawsx0mqm73h5ycwkgbm1n2si872")))))))
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
|
@ -169,6 +169,57 @@ the SciPy stack. It provides many user-friendly and efficient numerical
|
|||
routines such as routines for numerical integration and optimization.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-scikit-allel
|
||||
(package
|
||||
(name "python-scikit-allel")
|
||||
(version "1.3.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "scikit-allel" version))
|
||||
(sha256
|
||||
(base32 "1vg88ng6gd175gzk39iz1drxig5l91dyx398w2kbw3w8036zv8gj"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
'(list "-k"
|
||||
(string-append
|
||||
;; AttributeError: 'Dataset' object has no attribute 'asstr'
|
||||
"not test_vcf_to_hdf5"
|
||||
" and not test_vcf_to_hdf5_exclude"
|
||||
" and not test_vcf_to_hdf5_rename"
|
||||
" and not test_vcf_to_hdf5_group"
|
||||
" and not test_vcf_to_hdf5_ann"
|
||||
;; Does not work with recent hmmlearn
|
||||
" and not test_roh_mhmm_0pct"
|
||||
" and not test_roh_mhmm_100pct"))
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-before 'check 'build-ext
|
||||
(lambda _
|
||||
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
|
||||
(propagated-inputs
|
||||
(list python-dask
|
||||
python-numpy))
|
||||
(native-inputs
|
||||
(list python-cython
|
||||
;; The following are all needed for the tests
|
||||
htslib
|
||||
python-h5py
|
||||
python-hmmlearn
|
||||
python-numexpr
|
||||
python-pytest
|
||||
python-scipy
|
||||
python-setuptools-scm
|
||||
python-zarr))
|
||||
(home-page "https://github.com/cggh/scikit-allel")
|
||||
(synopsis "Explore and analyze genetic variation data")
|
||||
(description
|
||||
"This package provides utilities for exploratory analysis of large scale
|
||||
genetic variation data.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-scikit-fuzzy
|
||||
(package
|
||||
(name "python-scikit-fuzzy")
|
||||
|
@ -245,53 +296,33 @@ logic, also known as grey logic.")
|
|||
"Scikit-image is a collection of algorithms for image processing.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-scikit-allel
|
||||
(define-public python-scikit-optimize
|
||||
(package
|
||||
(name "python-scikit-allel")
|
||||
(version "1.3.5")
|
||||
(source
|
||||
(origin
|
||||
(name "python-scikit-optimize")
|
||||
(version "0.9.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "scikit-allel" version))
|
||||
(uri (pypi-uri "scikit-optimize" version))
|
||||
(sha256
|
||||
(base32 "1vg88ng6gd175gzk39iz1drxig5l91dyx398w2kbw3w8036zv8gj"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "python" "setup.py" "build_ext" "--inplace")
|
||||
(invoke "python" "-m" "pytest" "-v" "allel"
|
||||
;; AttributeError: 'Dataset' object has no attribute 'asstr'
|
||||
"-k" (string-append
|
||||
"not test_vcf_to_hdf5"
|
||||
" and not test_vcf_to_hdf5_exclude"
|
||||
" and not test_vcf_to_hdf5_rename"
|
||||
" and not test_vcf_to_hdf5_group"
|
||||
" and not test_vcf_to_hdf5_ann"))))))))
|
||||
(base32
|
||||
"0230ya8bwrzxjwcy2vz23a3hg6caggnnmg2vq1f9zz2797kckn3p"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs
|
||||
(list python-dask
|
||||
python-numpy))
|
||||
(list python-joblib
|
||||
python-matplotlib
|
||||
python-numpy
|
||||
python-pyaml
|
||||
python-scikit-learn
|
||||
python-scipy))
|
||||
(native-inputs
|
||||
(list python-cython
|
||||
;; The following are all needed for the tests
|
||||
htslib
|
||||
python-h5py
|
||||
python-hmmlearn
|
||||
python-numexpr
|
||||
python-pytest
|
||||
python-scipy
|
||||
python-setuptools-scm
|
||||
python-zarr))
|
||||
(home-page "https://github.com/cggh/scikit-allel")
|
||||
(synopsis "Explore and analyze genetic variation data")
|
||||
(description
|
||||
"This package provides utilities for exploratory analysis of large scale
|
||||
genetic variation data.")
|
||||
(license license:expat)))
|
||||
(list python-pytest))
|
||||
(home-page "https://scikit-optimize.github.io/")
|
||||
(synopsis "Sequential model-based optimization toolbox")
|
||||
(description "Scikit-Optimize, or @code{skopt}, is a simple and efficient
|
||||
library to minimize (very) expensive and noisy black-box functions. It
|
||||
implements several methods for sequential model-based optimization.
|
||||
@code{skopt} aims to be accessible and easy to use in many contexts.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-trimesh
|
||||
(package
|
||||
|
|
|
@ -1755,6 +1755,51 @@ compositions like @code{XOR} and @code{NAND} are emulated on top of them.
|
|||
Expressions are constructed from parsed strings or directly in Python.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public python-hatchling
|
||||
(package
|
||||
(name "python-hatchling")
|
||||
(version "1.13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "hatchling" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1isk1kqra0sm2sj2yp39sgk62mx0bp1jnbkwdcl3a1vjrji7blpq"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #false ;there are none
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'do-not-depend-on-hatchling
|
||||
(lambda _
|
||||
;; We don't use hatchling.
|
||||
(delete-file "pyproject.toml")
|
||||
(call-with-output-file "pyproject.toml"
|
||||
(lambda (port)
|
||||
(format port "\
|
||||
[build-system]
|
||||
build-backend = 'setuptools.build_meta'
|
||||
requires = ['setuptools']
|
||||
")))
|
||||
(call-with-output-file "setup.cfg"
|
||||
(lambda (port)
|
||||
(format port "\
|
||||
[metadata]
|
||||
name = hatchling
|
||||
version = '~a' " #$version))))))))
|
||||
(propagated-inputs
|
||||
(list python-editables
|
||||
python-importlib-metadata
|
||||
python-packaging
|
||||
python-pathspec
|
||||
python-pluggy
|
||||
python-tomli))
|
||||
(home-page "https://pypi.org/project/hatchling/")
|
||||
(synopsis "Extensible Python build backend")
|
||||
(description "Hatchling is an extensible Python build backend.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-hdf4
|
||||
(package
|
||||
(name "python-hdf4")
|
||||
|
@ -2846,6 +2891,84 @@ from @code{lxml}. It aims to provide a low memory, compatible implementation
|
|||
of @code{xmlfile}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-omero-py
|
||||
(package
|
||||
(name "python-omero-py")
|
||||
(version "5.13.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ome/omero-py")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0n94v5dpmh873hjqd9k9ky85iab4xh37ibmi13rqpclv01ibvvxa"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
'(list "-m" "not broken" "-rf" "test" "-s"
|
||||
;; TestImport tries to download Java things; TestSessions
|
||||
;; and TestBuildQuery require networking.
|
||||
"-k" "not TestImport and not TestSessions and not TestBuildQuery")
|
||||
#:modules '((guix build pyproject-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 match)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'find-artifacts
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((zip-file
|
||||
(match inputs
|
||||
(((labels . files) ...)
|
||||
(find (cut string-suffix? "omero-blitz-5.5.5-python.zip" <>)
|
||||
files)))))
|
||||
(setenv "ZIP_FILE"
|
||||
(or zip-file (error "failed to find artifact file"))))))
|
||||
;; Some tests need this, such as TestTempFileManager
|
||||
(add-after 'build 'set-HOME
|
||||
(lambda _ (setenv "HOME" "/tmp")))
|
||||
;; The sanity check mistakes omero_model_TypeAnnotationI.py for a
|
||||
;; module to load.
|
||||
(delete 'sanity-check)
|
||||
;; The argument parser is picky and interprets the "-real" part as
|
||||
;; the first argument.
|
||||
(add-after 'wrap 'rename-executable
|
||||
(lambda _
|
||||
(with-directory-excursion (string-append #$output "/bin")
|
||||
(rename-file ".omero-real" ".omero")
|
||||
(substitute* "omero"
|
||||
(("bin/.omero-real") "bin/.omero"))))))))
|
||||
(propagated-inputs
|
||||
(list python-appdirs
|
||||
python-future
|
||||
python-numpy
|
||||
python-pillow
|
||||
python-pyyaml
|
||||
python-requests
|
||||
python-tables
|
||||
python-zeroc-ice-3.6))
|
||||
(native-inputs
|
||||
(list python-mox3
|
||||
python-pytest
|
||||
python-pytest-rerunfailures
|
||||
python-pytest-xdist
|
||||
unzip
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "https://artifacts.openmicroscopy.org/artifactory/\
|
||||
ome.releases/org/openmicroscopy/omero-blitz/5.5.5/omero-blitz-5.5.5-python.zip")
|
||||
(sha256
|
||||
(base32 "0wyja1zv19c1r3m31gsp555jzj3cg2v2pl00zlybpw3qd36yffwc")))))
|
||||
(home-page "https://github.com/ome/omero-py")
|
||||
(synopsis "Python bindings to the OMERO.blitz server")
|
||||
(description "This package provides Python bindings to the OMERO.blitz
|
||||
server.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public python-openpyxl
|
||||
(package
|
||||
(name "python-openpyxl")
|
||||
|
@ -31997,6 +32120,37 @@ functions
|
|||
markdown-compliant strings.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-zeroc-ice
|
||||
(package
|
||||
(name "python-zeroc-ice")
|
||||
(version "3.7.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "zeroc-ice" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bqkrjxp2fbz34x3wxkxji39kxinypzg8q2994sibiay29mpipxb"))))
|
||||
(build-system pyproject-build-system)
|
||||
(inputs (list openssl))
|
||||
(home-page "https://zeroc.com")
|
||||
(synopsis "RPC framework")
|
||||
(description
|
||||
"Ice is a comprehensive RPC framework. Ice helps you network your
|
||||
software by taking care of all interactions with low-level network programming
|
||||
interfaces.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public python-zeroc-ice-3.6
|
||||
(package
|
||||
(inherit python-zeroc-ice)
|
||||
(version "3.6.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "zeroc-ice" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mikjfvq26kh8asnn9v55z41pap4c5ypymqnwwi4xkavc3mzyda2"))))))
|
||||
|
||||
;;;
|
||||
;;; Avoid adding new packages to the end of this file. To reduce the chances
|
||||
;;; of a merge conflict, place them above by existing packages with similar
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -675,14 +675,14 @@ bibliographic data and simple document and bibtex retrieval.")
|
|||
(define-public ugrep
|
||||
(package
|
||||
(name "ugrep")
|
||||
(version "3.9.6")
|
||||
(version "3.11.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Genivia/ugrep")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "1nlxmrw0w21iwcbnir04bccb3z8hj9i4hj6gd2bk0qhdbrk2adh7"))
|
||||
(base32 "1sibd44ky7xqfmrfvi09h5ignn7i3v1fjxnfvybp3cjfm08yxacy"))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
|
|
@ -849,7 +849,7 @@ Shell (pdksh).")
|
|||
(define-public oil
|
||||
(package
|
||||
(name "oil")
|
||||
(version "0.12.9")
|
||||
(version "0.14.2")
|
||||
(source
|
||||
;; oil's sources contain a modified version of CPython 2.7.13.
|
||||
;; According to https://www.oilshell.org/blog/2017/05/05.html
|
||||
|
@ -862,7 +862,7 @@ Shell (pdksh).")
|
|||
(uri (string-append "https://www.oilshell.org/download/oil-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "047gjar5lkbms4gdp3063njnqc6fl6p0dcx8bbpi1cdn1956yh1s"))))
|
||||
(base32 "0qsfkav6a70nvp27ilab7zilmihw4ygga48a0dkxa14q9giwlgwr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:strip-binaries? #f ; strip breaks the binary
|
||||
|
|
|
@ -102,7 +102,7 @@ chart.")
|
|||
(define-public boxes
|
||||
(package
|
||||
(name "boxes")
|
||||
(version "2.1.1")
|
||||
(version "2.2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -111,7 +111,7 @@ chart.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1bf5rnfiw04ffs1l17zhbg4wvq2vfn2qbz1xmd250xqj15lysw88"))))
|
||||
"0vv2gaav1m4z2xdk0k3ragmv4kcnzv7p3v97lkjl1wbfmk5nhz07"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
(define-public syncthing
|
||||
(package
|
||||
(name "syncthing")
|
||||
(version "1.23.0")
|
||||
(version "1.23.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/syncthing/syncthing"
|
||||
|
@ -54,7 +54,7 @@
|
|||
"/syncthing-source-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n7438vppr8yrq8k4lsacjr48m1l0bfc2wv7rbrsc5br5bfx6rhg"))))
|
||||
"12d1mmqr4l0xhapq72i8yjsrzma79zsv664rhyjfpajfdw7cl3ix"))))
|
||||
(build-system go-build-system)
|
||||
;; The primary Syncthing executable goes to "out", while the auxiliary
|
||||
;; server programs and utility tools go to "utils". This reduces the size
|
||||
|
|
|
@ -5396,6 +5396,31 @@ in LaTeX documents; a jiffy to create slashed characters for physicists.")
|
|||
"Catchfile catches the contents of a file and puts it in a macro.")
|
||||
(license license:lppl1.3+))))
|
||||
|
||||
(define-public texlive-ddphonism
|
||||
(package
|
||||
(inherit (simple-texlive-package
|
||||
"texlive-ddphonism"
|
||||
(list "doc/latex/ddphonism/"
|
||||
"tex/latex/ddphonism/")
|
||||
(base32 "1p02ai76nnh6042pnmqv4n30z6yxsvyyk2nb9jk7xlyyc87zzbdd")
|
||||
#:trivial? #t))
|
||||
(propagated-inputs
|
||||
(list texlive-etoolbox
|
||||
texlive-hyperref
|
||||
texlive-latex-l3packages
|
||||
texlive-listings
|
||||
texlive-pgf
|
||||
texlive-latex-tools
|
||||
texlive-xstring))
|
||||
(home-page "https://www.ctan.org/pkg/ddphonism")
|
||||
(synopsis "Dodecaphonic diagrams for LaTeX")
|
||||
(description
|
||||
"This is a music-related package which is focused on notation from the
|
||||
twelve-tone system, also called dodecaphonism. It provides LaTeX algorithms
|
||||
that produce typical dodecaphonic notation based off a musical series, or row
|
||||
sequence, of variable length.")
|
||||
(license license:lppl1.3c)))
|
||||
|
||||
(define-public texlive-doi
|
||||
(package
|
||||
(inherit (simple-texlive-package
|
||||
|
|
|
@ -104,14 +104,14 @@ is on expressing the content semantically, avoiding physical markup commands.")
|
|||
(define-public texinfo-7
|
||||
(package
|
||||
(inherit texinfo)
|
||||
(version "7.0.2")
|
||||
(version "7.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/texinfo/texinfo-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1balvbkdlwa8zwnzp4irkixq1zhps2wr6njmwj4ilgiqc4rfq4gj"))))
|
||||
"1gq7i01iblgfcwby1977adh8mab9vpq318vsz628wlkzkp821d3l"))))
|
||||
(inputs (modify-inputs (package-inputs texinfo)
|
||||
(append perl-archive-zip))) ;needed for 'tex2any --epub3'
|
||||
(arguments
|
||||
|
|
|
@ -319,14 +319,14 @@ under several distributions that's hard or impossible to figure out.")
|
|||
(define-public python-isodate
|
||||
(package
|
||||
(name "python-isodate")
|
||||
(version "0.6.0")
|
||||
(version "0.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "isodate" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1n7jkz68kk5pwni540pr5zdh99bf6ywydk1p5pdrqisrawylldif"))))
|
||||
"1sdx4z0x6kv1qxjfi0gd82wfg16wca04q0nb93ba1c78wwfqiia8"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
(list python-six))
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
|
||||
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
|
||||
|
@ -2009,21 +2009,20 @@ following features:
|
|||
(define-public subversion
|
||||
(package
|
||||
(name "subversion")
|
||||
(version "1.14.1")
|
||||
(version "1.14.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/subversion/"
|
||||
"subversion-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ag1hvcm9q92kgalzbbgcsq9clxnzmbj9nciz9lmabjx4lyajp9c"))))
|
||||
"0a6csc84hfymm8b5cnvq1n1p3rjjf33qy0z7y1k8lwkm1f6hw4y9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:parallel-tests? #f ; TODO Seems to cause test failures on
|
||||
; i686-linux
|
||||
#:configure-flags '("--enable-static=no")
|
||||
(list
|
||||
#:configure-flags #~(list "--enable-static=no")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'configure 'patch-libtool-wrapper-ls
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; This substitution allows tests svnauthz_tests and svnlook_tests
|
||||
|
@ -2031,54 +2030,47 @@ following features:
|
|||
;; their libtool wrapper scripts from svn hooks, whose empty
|
||||
;; environments cause "ls: command not found" errors. It would be
|
||||
;; nice if this fix ultimately made its way into libtool.
|
||||
(let ((coreutils (assoc-ref inputs "coreutils")))
|
||||
(substitute* "libtool"
|
||||
(("\\\\`ls") (string-append "\\`" coreutils "/bin/ls")))
|
||||
#t)))
|
||||
(("\\\\`ls")
|
||||
(string-append "\\`" (search-input-file inputs "bin/ls"))))))
|
||||
(add-before 'build 'patch-test-sh
|
||||
(lambda _
|
||||
(substitute* "subversion/tests/libsvn_repos/repos-test.c"
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||
#t))
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))))
|
||||
(add-before 'check 'set-PARALLEL
|
||||
(lambda* (#:key parallel-tests? #:allow-other-keys)
|
||||
(if parallel-tests?
|
||||
(setenv "PARALLEL" (number->string (parallel-job-count)))
|
||||
(simple-format #t "parallel-tests? are disabled\n"))
|
||||
#t))
|
||||
(simple-format #t "parallel-tests? are disabled\n"))))
|
||||
(add-after 'install 'install-perl-bindings
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(lambda _
|
||||
;; Follow the instructions from 'subversion/bindings/swig/INSTALL'.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(invoke "make" "swig-pl-lib")
|
||||
;; FIXME: Test failures.
|
||||
;; (invoke "make" "check-swig-pl")
|
||||
(invoke "make" "install-swig-pl-lib")
|
||||
|
||||
;; Set the right installation prefix.
|
||||
(with-directory-excursion
|
||||
"subversion/bindings/swig/perl/native"
|
||||
(invoke "perl" "Makefile.PL"
|
||||
"NO_PERLLOCAL=1"
|
||||
(string-append "PREFIX=" out))
|
||||
(with-directory-excursion "subversion/bindings/swig/perl/native"
|
||||
(invoke "perl" "Makefile.PL" "NO_PERLLOCAL=1"
|
||||
(string-append "PREFIX=" #$output))
|
||||
(invoke "make" "install"
|
||||
(string-append "OTHERLDFLAGS="
|
||||
"-Wl,-rpath="
|
||||
out "/lib")))))))))
|
||||
(string-append "OTHERLDFLAGS=-Wl,-rpath="
|
||||
#$output "/lib"))))))))
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
;; For the Perl bindings.
|
||||
swig))
|
||||
(inputs
|
||||
`(("apr" ,apr)
|
||||
("apr-util" ,apr-util)
|
||||
("lz4" ,lz4)
|
||||
("serf" ,serf)
|
||||
("perl" ,perl)
|
||||
("python" ,python-wrapper)
|
||||
("sqlite" ,sqlite)
|
||||
("utf8proc" ,utf8proc)
|
||||
("zlib" ,zlib)))
|
||||
(list apr
|
||||
apr-util
|
||||
lz4
|
||||
perl
|
||||
python-wrapper
|
||||
serf
|
||||
sqlite
|
||||
utf8proc
|
||||
zlib))
|
||||
(home-page "https://subversion.apache.org/")
|
||||
(synopsis "Revision control system")
|
||||
(description
|
||||
|
|
|
@ -3380,7 +3380,7 @@ be used for realtime video capture via Linux-specific APIs.")
|
|||
(define-public obs
|
||||
(package
|
||||
(name "obs")
|
||||
(version "29.0.0")
|
||||
(version "29.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3390,7 +3390,7 @@ be used for realtime video capture via Linux-specific APIs.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"15nvvlpryvlbf76918jvygg1985glz38cndfgnc2c0009vdb9qbk"))
|
||||
"1ijn19wy52fa7ahr29v1rzvh6j0qr7i5xl129m6s9c644f7i51ac"))
|
||||
(patches
|
||||
(search-patches "obs-modules-location.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017, 2018, 2023 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
|
@ -42,6 +42,9 @@
|
|||
(define-public w3m
|
||||
(package
|
||||
(name "w3m")
|
||||
;; When updating, be careful not to change the derivation of w3m-for-tests,
|
||||
;; unless you mean to. Changing w3m-for-tests will cause thousands of
|
||||
;; rebuilds via the reverse dependency graph of xdg-utils.
|
||||
(version "0.5.3+git20230121")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -86,3 +89,21 @@ window. Moreover, w3m can be used as a text formatting tool which
|
|||
typesets HTML into plain text.")
|
||||
(license (x11-style "file://doc/README"
|
||||
"See 'doc/README' in the distribution."))))
|
||||
|
||||
;; Used in the test suite of xdg-utils
|
||||
(define-public w3m-for-tests
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit w3m)
|
||||
(name "w3m")
|
||||
(version "0.5.3+git20230121")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
;; Debian's fork of w3m is the only one that is still maintained.
|
||||
(uri (git-reference
|
||||
(url "https://salsa.debian.org/debian/w3m.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nvhxsqxgxjrr62mvxzhhfzvbvg56g19vlqcgb8mh2x1daazk5ms")))))))
|
||||
|
|
|
@ -131,6 +131,7 @@
|
|||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages mpd)
|
||||
#:use-module (gnu packages music)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
|
@ -744,7 +745,7 @@ desktop environment.")
|
|||
(define-public icewm
|
||||
(package
|
||||
(name "icewm")
|
||||
(version "3.3.1")
|
||||
(version "3.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -752,7 +753,7 @@ desktop environment.")
|
|||
version "/icewm-" version ".tar.lz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m0jl9d2ikwb1s2cpm3q7f73h84mai9y31k8bhsq8y47jbkc6slk"))))
|
||||
"1mp1xl64sin3d4nkh19qmnic1c9qcwf9v7mkzji76pg3mzd823jg"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
(inputs (list fontconfig
|
||||
|
@ -1777,7 +1778,7 @@ compository, supporting the following featuers:
|
|||
(define-public waybar
|
||||
(package
|
||||
(name "waybar")
|
||||
(version "0.9.16")
|
||||
(version "0.9.17")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1786,7 +1787,7 @@ compository, supporting the following featuers:
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "06vwsax8z6vvvav4c1d40nfiljc7h1cla57r43nv8dw86n539ic5"))))
|
||||
(base32 "1709ck7931804mhirnki03cvx60c4dxg668fyz6jpzy8djg5xlxi"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs (list date
|
||||
fmt
|
||||
|
@ -1798,6 +1799,7 @@ compository, supporting the following featuers:
|
|||
libmpdclient
|
||||
libnl
|
||||
libxml2
|
||||
playerctl
|
||||
pulseaudio
|
||||
spdlog
|
||||
wayland))
|
||||
|
|
|
@ -2318,6 +2318,47 @@ before the system goes to sleep.")
|
|||
(home-page "https://bitbucket.org/raymonad/xss-lock")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public physlock
|
||||
(package
|
||||
(name "physlock")
|
||||
(version "13")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/xyb3rt/physlock")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;no tests
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
|
||||
(add-after 'unpack 'fix-makefile
|
||||
(lambda _
|
||||
(substitute* "main.c" ; remove extra newline in the prompt
|
||||
(("(fprintf.vt.ios, .%s.)\\n(., options->prompt)" all start end)
|
||||
(string-append start end)))
|
||||
(substitute* "Makefile" (("-m 4755 -o root -g root") "")))))
|
||||
|
||||
#:make-flags
|
||||
#~(list "HAVE_SYSTEMD=0" "HAVE_ELOGIND=1"
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PREFIX=" #$output))))
|
||||
(native-inputs (list linux-pam elogind))
|
||||
(synopsis "Screen lock utility")
|
||||
(description
|
||||
"@command{physlock} locks all virtual terminals at once, only allowing the
|
||||
user of the active session (the user logged into the foreground virtual
|
||||
terminal) to unlock the computer. It is an alternative to @command{vlock -an},
|
||||
written to overcome vlock's limitations regarding hibernate and suspend.")
|
||||
(home-page "https://github.com/xyb3rt/physlock")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public python-pyperclip
|
||||
(package
|
||||
(name "python-pyperclip")
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
|
||||
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2022 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2022–2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -137,9 +137,6 @@
|
|||
str)
|
||||
#\-) "_")))
|
||||
|
||||
(define list-of-string?
|
||||
(list-of string?))
|
||||
|
||||
(define list-of-symbol?
|
||||
(list-of symbol?))
|
||||
|
||||
|
@ -159,11 +156,11 @@
|
|||
(define mpd-serialize-string mpd-serialize-field)
|
||||
(define mpd-serialize-boolean mpd-serialize-field)
|
||||
|
||||
(define (mpd-serialize-list-of-string field-name value)
|
||||
(define (mpd-serialize-list-of-strings field-name value)
|
||||
#~(string-append #$@(map (cut mpd-serialize-string field-name <>) value)))
|
||||
|
||||
(define-maybe string (prefix mpd-))
|
||||
(define-maybe list-of-string (prefix mpd-))
|
||||
(define-maybe list-of-strings (prefix mpd-))
|
||||
(define-maybe boolean (prefix mpd-))
|
||||
|
||||
;;; TODO: Procedures for deprecated fields, to be removed.
|
||||
|
@ -349,7 +346,8 @@ will depend on."
|
|||
empty-serializer)
|
||||
|
||||
(environment-variables
|
||||
(list-of-string '())
|
||||
(list-of-strings '("PULSE_CLIENTCONFIG=/etc/pulse/client.conf"
|
||||
"PULSE_CONFIG=/etc/pulse/daemon.conf"))
|
||||
"A list of strings specifying environment variables."
|
||||
empty-serializer)
|
||||
|
||||
|
@ -400,7 +398,7 @@ Available values: @code{notice}, @code{info}, @code{verbose},
|
|||
"The default port to run mpd on.")
|
||||
|
||||
(endpoints
|
||||
maybe-list-of-string
|
||||
maybe-list-of-strings
|
||||
"The addresses that mpd will bind to. A port different from
|
||||
@var{default-port} may be specified, e.g. @code{localhost:6602} and
|
||||
IPv6 addresses must be enclosed in square brackets when a different
|
||||
|
@ -409,7 +407,7 @@ To use a Unix domain socket, an absolute path or a path starting with @code{~}
|
|||
can be specified here."
|
||||
(lambda (_ endpoints)
|
||||
(if (maybe-value-set? endpoints)
|
||||
(mpd-serialize-list-of-string "bind_to_address" endpoints)
|
||||
(mpd-serialize-list-of-strings "bind_to_address" endpoints)
|
||||
"")))
|
||||
|
||||
(address ; TODO: deprecated, remove later
|
||||
|
@ -581,11 +579,11 @@ appended to the configuration.")
|
|||
|
||||
(define-configuration/no-serialization mympd-ip-acl
|
||||
(allow
|
||||
(list-of-string '())
|
||||
(list-of-strings '())
|
||||
"Allowed IP addresses.")
|
||||
|
||||
(deny
|
||||
(list-of-string '())
|
||||
(list-of-strings '())
|
||||
"Disallowed IP addresses."))
|
||||
|
||||
(define-maybe/no-serialization integer)
|
||||
|
@ -707,12 +705,12 @@ prompting a pin from the user.")
|
|||
((? string? val) val)))
|
||||
|
||||
(define (ip-acl-serialize-configuration config)
|
||||
(define (serialize-list-of-string prefix lst)
|
||||
(define (serialize-list-of-strings prefix lst)
|
||||
(map (cut format #f "~a~a" prefix <>) lst))
|
||||
(string-join
|
||||
(append
|
||||
(serialize-list-of-string "+" (mympd-ip-acl-allow config))
|
||||
(serialize-list-of-string "-" (mympd-ip-acl-deny config))) ","))
|
||||
(serialize-list-of-strings "+" (mympd-ip-acl-allow config))
|
||||
(serialize-list-of-strings "-" (mympd-ip-acl-deny config))) ","))
|
||||
|
||||
;; myMPD configuration fields are serialized as individual files under
|
||||
;; <work-directory>/config/.
|
||||
|
@ -752,7 +750,11 @@ prompting a pin from the user.")
|
|||
(let ((log-level* (format #f "MYMPD_LOGLEVEL=~a" log-level)))
|
||||
(shepherd-service
|
||||
(documentation "Run the myMPD daemon.")
|
||||
(requirement `(loopback user-processes ,@shepherd-requirement))
|
||||
(requirement `(loopback user-processes
|
||||
,@(if (eq? log-to 'syslog)
|
||||
'(syslog)
|
||||
'())
|
||||
,@shepherd-requirement))
|
||||
(provision '(mympd))
|
||||
(start #~(begin
|
||||
(let* ((pw (getpwnam #$user))
|
||||
|
|
|
@ -1554,14 +1554,17 @@ Service Switch}, for an example."
|
|||
(shepherd-service-type
|
||||
'syslog
|
||||
(lambda (config)
|
||||
(define config-file
|
||||
(syslog-configuration-config-file config))
|
||||
|
||||
(shepherd-service
|
||||
(documentation "Run the syslog daemon (syslogd).")
|
||||
(provision '(syslogd))
|
||||
(requirement '(user-processes))
|
||||
(actions (list (shepherd-configuration-action config-file)))
|
||||
(start #~(let ((spawn (make-forkexec-constructor
|
||||
(list #$(syslog-configuration-syslogd config)
|
||||
"--rcfile"
|
||||
#$(syslog-configuration-config-file config))
|
||||
"--rcfile" #$config-file)
|
||||
#:pid-file "/var/run/syslog.pid")))
|
||||
(lambda ()
|
||||
;; Set the umask such that file permissions are #o640.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016-2019, 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016-2019, 2022-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -284,22 +284,12 @@ returns a shepherd <service> object."
|
|||
|
||||
(define (load-services/safe files)
|
||||
"This is like 'load-services', but make sure only the subset of FILES that
|
||||
can be safely reloaded is actually reloaded.
|
||||
|
||||
This is done to accommodate the Shepherd < 0.15.0 where services lacked the
|
||||
'replacement' slot, and where 'register-services' would throw an exception
|
||||
when passed a service with an already-registered name."
|
||||
(eval-there `(let* ((services (map primitive-load ',files))
|
||||
(slots (map slot-definition-name
|
||||
(class-slots <service>)))
|
||||
(can-replace? (memq 'replacement slots)))
|
||||
(define (registered? service)
|
||||
(not (null? (lookup-services (canonical-name service)))))
|
||||
|
||||
(apply register-services
|
||||
(if can-replace?
|
||||
services
|
||||
(remove registered? services))))))
|
||||
can be safely reloaded is actually reloaded."
|
||||
(eval-there `(let ((services (map primitive-load ',files)))
|
||||
;; Since version 0.5.0 of the Shepherd, registering a service
|
||||
;; that has the same name as an already-registered service
|
||||
;; makes it a "replacement" of that previous service.
|
||||
(apply register-services services))))
|
||||
|
||||
(define* (start-service name #:optional (arguments '()))
|
||||
(invoke-action name 'start arguments
|
||||
|
|
|
@ -234,7 +234,7 @@ more information)."
|
|||
;; lists are ungexp'd correctly since @var{schedule}
|
||||
;; can be either a procedure, a string or a list.
|
||||
#$(if (list? schedule)
|
||||
`(list ,@schedule)
|
||||
#~'(#$@schedule)
|
||||
schedule)
|
||||
(lambda ()
|
||||
(system* #$(file-append package "/sbin/fstrim")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
|
@ -536,6 +536,7 @@ restrict source notrap nomodify noquery\n"))
|
|||
(provision '(ntpd))
|
||||
(documentation "Run the Network Time Protocol (NTP) daemon.")
|
||||
(requirement '(user-processes networking))
|
||||
(actions (list (shepherd-configuration-action ntpd.conf)))
|
||||
(start #~(make-forkexec-constructor
|
||||
(list (string-append #$ntp "/bin/ntpd") "-n"
|
||||
"-c" #$ntpd.conf "-u" "ntpd"
|
||||
|
@ -1235,6 +1236,7 @@ project's documentation} for more information."
|
|||
;; TODO: iwd? is deprecated and should be passed
|
||||
;; with shepherd-requirement, remove later.
|
||||
,@(if iwd? '(iwd) '())))
|
||||
(actions (list (shepherd-configuration-action conf)))
|
||||
(start
|
||||
#~(lambda _
|
||||
(let ((pid
|
||||
|
|
|
@ -358,6 +358,22 @@ in @var{modules}."
|
|||
files)
|
||||
#t))))
|
||||
|
||||
(define (xorg-configuration-server-package-path config input path)
|
||||
"Lookup the direct @var{input} in the xorg server package of @var{config}
|
||||
and append @var{path} to it."
|
||||
(let* ((server (xorg-configuration-server config))
|
||||
(package (lookup-package-direct-input server input)))
|
||||
(when package (file-append package path))))
|
||||
|
||||
(define (xorg-configuration-dri-driver-path config)
|
||||
(xorg-configuration-server-package-path config "mesa" "/lib/dri"))
|
||||
|
||||
(define (xorg-configuration-xkb-bin-dir config)
|
||||
(xorg-configuration-server-package-path config "xkbcomp" "/bin"))
|
||||
|
||||
(define (xorg-configuration-xkb-dir config)
|
||||
(xorg-configuration-server-package-path config "xkeyboard-config" "/share/X11/xkb"))
|
||||
|
||||
(define* (xorg-wrapper #:optional (config (xorg-configuration)))
|
||||
"Return a derivation that builds a script to start the X server with the
|
||||
given @var{config}. The resulting script should be used in place of
|
||||
|
@ -365,12 +381,13 @@ given @var{config}. The resulting script should be used in place of
|
|||
(define exp
|
||||
;; Write a small wrapper around the X server.
|
||||
#~(begin
|
||||
(setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri"))
|
||||
(setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin"))
|
||||
(setenv "XORG_DRI_DRIVER_PATH"
|
||||
#$(xorg-configuration-dri-driver-path config))
|
||||
(setenv "XKB_BINDIR" #$(xorg-configuration-xkb-bin-dir config))
|
||||
|
||||
(let ((X (string-append #$(xorg-configuration-server config) "/bin/X")))
|
||||
(apply execl X X
|
||||
"-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb")
|
||||
"-xkbdir" #$(xorg-configuration-xkb-dir config)
|
||||
"-config" #$(xorg-configuration->file config)
|
||||
"-configdir" #$(xorg-configuration-directory
|
||||
(xorg-configuration-modules config))
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Google LLC
|
||||
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2023 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -49,9 +50,12 @@ from OS that are needed on the bare metal and not in a container."
|
|||
(define base
|
||||
(remove (lambda (service)
|
||||
(memq (service-kind service)
|
||||
(list (service-kind %linux-bare-metal-service)
|
||||
(cons* (service-kind %linux-bare-metal-service)
|
||||
firmware-service-type
|
||||
system-service-type)))
|
||||
system-service-type
|
||||
(if shared-network?
|
||||
(list hosts-service-type)
|
||||
'()))))
|
||||
(operating-system-default-essential-services os)))
|
||||
|
||||
(cons (service system-service-type
|
||||
|
|
|
@ -970,7 +970,10 @@ backend device."
|
|||
(string->pointer key)
|
||||
(string->pointer "")
|
||||
0)))
|
||||
(cond ((< size 0) #f)
|
||||
(cond ((< size 0)
|
||||
(throw 'system-error "getxattr" "~S: ~A"
|
||||
(list file key (strerror err))
|
||||
(list err)))
|
||||
((zero? size) "")
|
||||
;; Get VALUE in buffer of SIZE. XXX actual size can race.
|
||||
(else (let*-values (((buf) (make-bytevector size))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
|
||||
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
|
@ -1485,6 +1485,9 @@ the NIST server non-fatal."
|
|||
(package-version package))))
|
||||
((force lookup) name version)))))
|
||||
|
||||
;; Prevent Guile 3 from inlining this procedure so we can mock it in tests.
|
||||
(set! package-vulnerabilities package-vulnerabilities)
|
||||
|
||||
(define* (check-vulnerabilities package
|
||||
#:optional (package-vulnerabilities
|
||||
package-vulnerabilities))
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013-2021, 2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com>
|
||||
;;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
|
||||
|
@ -35,6 +35,7 @@
|
|||
#:select ((open-connection-for-uri
|
||||
. guix:open-connection-for-uri)
|
||||
resolve-uri-reference))
|
||||
#:autoload (gnutls) (error->string error/premature-termination)
|
||||
#:use-module (guix progress)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 format)
|
||||
|
@ -152,6 +153,13 @@ indicates that PATH is unavailable at CACHE-URL."
|
|||
(strerror
|
||||
(system-error-errno `(system-error ,@args)))))
|
||||
#f)
|
||||
(('gnutls-error error proc . rest)
|
||||
(if (eq? error error/premature-termination)
|
||||
(begin
|
||||
(warning (G_ "~a: TLS connection failed: in ~a: ~a~%") host
|
||||
proc (error->string error))
|
||||
#f)
|
||||
(apply throw 'gnutls-error error proc rest)))
|
||||
(args
|
||||
(apply throw args)))))
|
||||
|
||||
|
|
|
@ -36,8 +36,8 @@ container_supported ()
|
|||
fi
|
||||
}
|
||||
|
||||
NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')"
|
||||
localstatedir="$(guile -c '(use-modules (guix config))(display %localstatedir)')"
|
||||
NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')"
|
||||
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
|
||||
export NIX_STORE_DIR GUIX_DAEMON_SOCKET
|
||||
|
||||
|
|
Reference in New Issue