mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: gnu/local.mk gnu/packages/boost.scm gnu/packages/chez.scm gnu/packages/compression.scm gnu/packages/crates-io.scm gnu/packages/docbook.scm gnu/packages/engineering.scm gnu/packages/gcc.scm gnu/packages/gl.scm gnu/packages/gtk.scm gnu/packages/nettle.scm gnu/packages/python-check.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/rust.scm gnu/packages/sqlite.scm guix/build-system/node.scm
This commit is contained in:
commit
fcc39864db
283 changed files with 23915 additions and 6384 deletions
|
@ -354,7 +354,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-5.11-version "5.11.8")
|
||||
(define-public linux-libre-5.11-version "5.11.14")
|
||||
(define deblob-scripts-5.11
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.11-version
|
||||
|
@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n")))
|
||||
(define-public linux-libre-5.11-pristine-source
|
||||
(let ((version linux-libre-5.11-version)
|
||||
(hash (base32 "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci")))
|
||||
(hash (base32 "1ia4wzh44lkvrbvnhdnnjcdyvqx2ihpbwkih7wqm1n5prhq38ql7")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.11)))
|
||||
|
@ -370,7 +370,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.10-version "5.10.25")
|
||||
(define-public linux-libre-5.10-version "5.10.30")
|
||||
(define deblob-scripts-5.10
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.10-version
|
||||
|
@ -378,12 +378,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
|
||||
(define-public linux-libre-5.10-pristine-source
|
||||
(let ((version linux-libre-5.10-version)
|
||||
(hash (base32 "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk")))
|
||||
(hash (base32 "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.10)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.107")
|
||||
(define-public linux-libre-5.4-version "5.4.112")
|
||||
(define deblob-scripts-5.4
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.4-version
|
||||
|
@ -391,12 +391,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w")))
|
||||
(hash (base32 "190cq97pm0r6s115ay66rjra7fnyn7m4rak89inwhm223931sdmq")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.182")
|
||||
(define-public linux-libre-4.19-version "4.19.187")
|
||||
(define deblob-scripts-4.19
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-4.19-version
|
||||
|
@ -404,12 +404,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5")))
|
||||
(hash (base32 "1hx0jw11xmj57v9a8w34729vgrandaing2n9qkhx5dq4mhy04k50")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
||||
(define-public linux-libre-4.14-version "4.14.226")
|
||||
(define-public linux-libre-4.14-version "4.14.230")
|
||||
(define deblob-scripts-4.14
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-4.14-version
|
||||
|
@ -417,12 +417,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
|
||||
(define-public linux-libre-4.14-pristine-source
|
||||
(let ((version linux-libre-4.14-version)
|
||||
(hash (base32 "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s")))
|
||||
(hash (base32 "1gn5cs1ss4bfsnnv0b2s4g5ibiigpzsx0i3qfswchdbxvdag75cw")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.14)))
|
||||
|
||||
(define-public linux-libre-4.9-version "4.9.262")
|
||||
(define-public linux-libre-4.9-version "4.9.266")
|
||||
(define deblob-scripts-4.9
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-4.9-version
|
||||
|
@ -430,12 +430,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
|
||||
(define-public linux-libre-4.9-pristine-source
|
||||
(let ((version linux-libre-4.9-version)
|
||||
(hash (base32 "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj")))
|
||||
(hash (base32 "0qzigcslfp714vaswwlw93xj0h2f8laikppw6krrhfnh5wwrp5dr")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.9)))
|
||||
|
||||
(define-public linux-libre-4.4-version "4.4.262")
|
||||
(define-public linux-libre-4.4-version "4.4.266")
|
||||
(define deblob-scripts-4.4
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-4.4-version
|
||||
|
@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
|
||||
(define-public linux-libre-4.4-pristine-source
|
||||
(let ((version linux-libre-4.4-version)
|
||||
(hash (base32 "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j")))
|
||||
(hash (base32 "00x2dmjiiv9zpc0vih9xqmf78kynqzj9q9v1chc2q2hcjpqfj31c")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.4)))
|
||||
|
@ -1167,8 +1167,8 @@ and should be used with caution, especially on untested models.")
|
|||
(license license:gpl3+))) ; see README.md (no licence headers)
|
||||
|
||||
(define-public rtl8812au-aircrack-ng-linux-module
|
||||
(let ((commit "62cb003043e4daeeba0b8805137fa604af450ed2")
|
||||
(revision "3"))
|
||||
(let ((commit "059e06a51be025fde5b2bec6565540b3d9981b0b")
|
||||
(revision "4"))
|
||||
(package
|
||||
(name "rtl8812au-aircrack-ng-linux-module")
|
||||
(version (git-version "5.6.4.2" revision commit))
|
||||
|
@ -1180,7 +1180,7 @@ and should be used with caution, especially on untested models.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kragxkjprjy7nl9h2rd0mwcry1ygw07zb1p2qkj7cmz0r2035yz"))
|
||||
(base32 "0h6l2r3yj7j9zf11dw0zcdyn50ajnjw8yvv86dzlfj80dn75n98f"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -3535,6 +3535,93 @@ subsystem. @code{uinput} allows userspace programs to create and handle input
|
|||
devices that can inject events directly into the input subsystem.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public interception-tools
|
||||
(package
|
||||
(name "interception-tools")
|
||||
(version "0.6.4")
|
||||
(home-page "https://gitlab.com/interception/linux/tools")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"121jy40ynkbzlqnx7g0dqwvkb7dm2ahcy6vwrz6ylsyd0jmi6s5a"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("libevdev" ,libevdev)
|
||||
("libudev" ,eudev)
|
||||
("yaml-cpp" ,yaml-cpp)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-libevdev-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libevdev (assoc-ref inputs "libevdev")))
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("/usr/include/libevdev-1.0")
|
||||
(string-append libevdev "/include/libevdev-1.0")))
|
||||
#t))))
|
||||
;; No tests are included.
|
||||
#:tests? #f))
|
||||
(synopsis "Utilities for operating on input events of evdev devices")
|
||||
(description
|
||||
"Interception Tools provides a composable infrastructure on top of
|
||||
@code{libudev} and @code{libevdev}. The following utilities are provided:
|
||||
|
||||
@itemize
|
||||
@item @command{udevmon} --- monitor input devices for launching tasks
|
||||
@item @command{intercept} --- redirect device input events to stdout
|
||||
@item @command{uinput} --- redirect device input events from stding to virtual device
|
||||
@item @command{mux} --- mux streams of input events
|
||||
@end itemize")
|
||||
;; Dual-licensed under GPLv3+ or "something else" on request, per
|
||||
;; 'README.md'.
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public interception-dual-function-keys
|
||||
(package
|
||||
(name "interception-dual-function-keys")
|
||||
(version "1.3.0")
|
||||
(home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gvhkmwzl5fyyc7k8rc4rf2b9mzh05wa8wcybf9hz2x1mqkc7lmz"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libevdev" ,libevdev)
|
||||
("yaml-cpp" ,yaml-cpp)))
|
||||
(arguments
|
||||
`(#:make-flags (list "CC=gcc" "CXX=g++"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-libevdev-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libevdev (assoc-ref inputs "libevdev")))
|
||||
(substitute* "config.mk"
|
||||
(("/usr/include/libevdev-1.0")
|
||||
(string-append libevdev "/include/libevdev-1.0")))
|
||||
#t)))
|
||||
;; No configure script
|
||||
(delete 'configure)
|
||||
;; No target 'check'
|
||||
(delete 'check))))
|
||||
(synopsis "Tap for one key, hold for another")
|
||||
(description
|
||||
"Dual Function Keys is a plugin for @code{interception-tools} that allows
|
||||
one to send arbitrary keycodes when a given key is tapped or held.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public lvm2
|
||||
(package
|
||||
(name "lvm2")
|
||||
|
@ -3823,7 +3910,7 @@ compliance.")
|
|||
(define-public wireless-regdb
|
||||
(package
|
||||
(name "wireless-regdb")
|
||||
(version "2020.04.29")
|
||||
(version "2020.11.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -3831,7 +3918,7 @@ compliance.")
|
|||
"wireless-regdb-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9"))
|
||||
"0liagyi6ppf5w474qk9j4jz5gbvvn8mc8al1dq4b1xrgv28485ml"))
|
||||
|
||||
;; We're building 'regulatory.bin' by ourselves.
|
||||
(snippet '(begin
|
||||
|
@ -3885,8 +3972,8 @@ compliance.")
|
|||
"https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb")
|
||||
(synopsis "Wireless regulatory database")
|
||||
(description
|
||||
"This package contains the wireless regulatory database Central
|
||||
Regulatory Database Agent (CRDA) daemon. The database contains information on
|
||||
"This package contains the wireless regulatory database for the Central
|
||||
Regulatory Database Agent (CRDA). The database contains information on
|
||||
country-specific regulations for the wireless spectrum.")
|
||||
(license license:isc)))
|
||||
|
||||
|
@ -4974,7 +5061,7 @@ and copy/paste text in the console and in xterm.")
|
|||
(define-public btrfs-progs
|
||||
(package
|
||||
(name "btrfs-progs")
|
||||
(version "5.11")
|
||||
(version "5.11.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/kernel/"
|
||||
|
@ -4982,7 +5069,7 @@ and copy/paste text in the console and in xterm.")
|
|||
"btrfs-progs-v" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dq1ryji9hmq10zbyk083lp9r212524a3naai47whq11m6q626fl"))))
|
||||
"1zpbpmq8qndwls40yg2c9xj9ca6mcxdziadj5i8fbi3ffp2crap3"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"static")) ; static versions of the binaries in "out"
|
||||
|
@ -7042,7 +7129,7 @@ privileges.")
|
|||
(define-public psm2
|
||||
(package
|
||||
(name "psm2")
|
||||
(version "11.2.86")
|
||||
(version "11.2.185")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -7051,7 +7138,7 @@ privileges.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hiqzcmc97lzhaqjva82vf8irgg038cciypsv2brw90ak09n6vwf"))))
|
||||
"062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags
|
||||
|
@ -7942,8 +8029,8 @@ kernel side implementation.")
|
|||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/")
|
||||
(synopsis "User-space tools for EROFS filesystem")
|
||||
(synopsis "User-space tools for EROFS file system")
|
||||
(description "EROFS (Enhanced Read-Only File System) is a compressed,
|
||||
read-only filesystem optimized for resource-scarce devices. This package
|
||||
provides user-space tools for creating EROFS filesystems.")
|
||||
read-only file system optimized for resource-scarce devices. This package
|
||||
provides user-space tools for creating EROFS file systems.")
|
||||
(license license:gpl2+)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue