diff options
Diffstat (limited to 'gnu/packages')
30 files changed, 740 insertions, 179 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 97c7499c1c..262c6efc24 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -519,6 +519,7 @@ detection, and lossless compression.") (sha256 (base32 "0x95nhv4h34m8cxycbwc4xdz350saaxlgh727b23bgn4ci7gh3vx")) + (patches (search-patches "borg-fix-hard-link-preloading.patch")) (modules '((guix build utils))) (snippet '(begin @@ -674,14 +675,14 @@ changes are stored.") (define-public wimlib (package (name "wimlib") - (version "1.13.0") + (version "1.13.1") (source (origin (method url-fetch) (uri (string-append "https://wimlib.net/downloads/" "wimlib-" version ".tar.gz")) (sha256 (base32 - "02wpsxjlw9vysj6x6q7kmvbcdkpvdzw201mmj5x0q670mapjrnai")))) + "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -872,7 +873,7 @@ is like a time machine for your data. ") (define-public restic (package (name "restic") - (version "0.9.4") + (version "0.9.5") ;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/' ;; directory. (source (origin @@ -883,7 +884,7 @@ is like a time machine for your data. ") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13ksprq1ia86px8x4lqrmx0l6y9rb1ppg8pnp7lcx0zxnq7skp67")))) + "0afl3dv7gzwdc9klikk3fsb57d0px2fwihb0xxb7zq7d8vlhh8p2")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 8b9bd29c66..8d9778176f 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -162,8 +162,20 @@ libcdio.") version ".tar.gz")) (sha256 (base32 - "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9")))) + "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9")) + (patches + (search-patches "xorriso-no-partition-table-in-inner-efi.patch" + "xorriso-no-mbr-in-inner-efi.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-frontends + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out-bin (string-append out "/bin"))) + (install-file "frontend/grub-mkrescue-sed.sh" out-bin) + #t)))))) (inputs `(("acl" ,acl) ("readline" ,readline) @@ -713,16 +725,20 @@ session, and it can create M3U playlists.") (package (name "ripit") (version "3.9.0") - (source (origin - (method url-fetch) - (uri (string-append "http://www.suwald.com/ripit/ripit-" - version ".tar.gz")) - (sha256 - (base32 - "0ap71x477jy9c4jiqazb3y45hxdxm3jbq24x05g3vjyqzigi4x1b")))) + (source + (origin + (method url-fetch) + ;; The original suwald.com domain has expired. + (uri (list + (string-append "https://web.archive.org/web/20160327050927/" + "http://suwald.com/ripit/ripit-" version ".tar.gz") + (string-append "https://ponce.cc/slackware/sources/repo/ripit-" + version ".tar.gz"))) + (sha256 + (base32 "0ap71x477jy9c4jiqazb3y45hxdxm3jbq24x05g3vjyqzigi4x1b")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No test suite. + `(#:tests? #f ; no test suite #:phases (modify-phases %standard-phases (delete 'configure) @@ -744,7 +760,8 @@ session, and it can create M3U playlists.") ("vorbis-tools" ,vorbis-tools) ("wavpack" ,wavpack) ("perl-cddb-get" ,perl-cddb-get))) - (home-page "http://www.suwald.com/ripit/about.php") + (home-page (string-append "https://web.archive.org/web/20170119092156/" + "http://www.suwald.com/ripit/about.php")) (synopsis "Command-line program to extract audio CDs") (description "RipIT is used to extract audio from CDs.") (license gpl2))) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 748f67ba1e..52762dce1e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -646,7 +646,7 @@ printer/driver specific, but spooler-independent PPD file.") (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "00k22vmghxls7rk2hrbz9v17wi5z8vdk3fmsp2lrfghfcad8nhpx")))) + "0djzp3ddslmzyxkjhzkhkg6qqqm02whjfnfvh5glprkshcskzlg9")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index ec10254c97..291139ef1b 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -108,7 +108,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.12.4-P1") + (version "9.14.2") (source (origin (method url-fetch) (uri (string-append @@ -116,9 +116,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.gz")) (sha256 (base32 - "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2")) - (patches - (search-patches "bind-fix-unused-pk11-ecc-constants.patch")))) + "033zqajnj5ys45g899132xkhh9f0hsh76ffv7302wl166xbjfh0f")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs @@ -163,7 +161,11 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; (system "bin/tests/system/ifconfig.sh up"))) (replace 'check (lambda _ - (invoke "make" "force-test")))))) + ;; XXX Even ‘make force-test’ tries to create network interfaces + ;; and fails. The only working target is the (trivial) fuzz test. + (with-directory-excursion "fuzz" + (invoke "make" "check")) + #t))))) (synopsis "An implementation of the Domain Name System") (description "BIND is an implementation of the @dfn{Domain Name System} (DNS) protocols for the Internet. It is a reference implementation of those diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4b93cd1023..869789552e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -309,14 +309,14 @@ to open the application in a web browser, for offline usage.") (define-public toutenclic (package (name "toutenclic") - (version "6.13") + (version "7.00") (source (origin (method url-fetch) (uri (string-append "http://www.bipede.fr/downloads/logiciels/" - "ToutEnClic-" version ".tar.xz")) + "ToutEnClic-" version "-src.zip")) (sha256 - (base32 "1pjprdzc4bn7ckbg4469691ph6yjjr8f022hb4gi4lacs4h71wnd")))) + (base32 "0xg24p925rl5bfqsq3jb2lrkidb0f3kbmay5iyxxmjsn3ra0blyh")))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests @@ -328,17 +328,20 @@ to open the application in a web browser, for offline usage.") (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share/toutenclic")) (pixmaps (string-append out "/share/pixmaps")) + (doc (string-append out "share/doc/" ,name "-" ,version)) (bin (string-append out "/bin")) - (executable "toutenclic.py")) + (executable "toutenclic")) ;; Install icon. (install-file "toutenclic.png" pixmaps) ;; Move files into "share/" directory. - (mkdir-p share) - (copy-recursively "." share) + (for-each (lambda (f) (install-file f share)) + (find-files "." "\\.py$")) + ;; Install documentation. + (install-file "ToutEnClic.pdf" doc) ;; Create executable in "bin/". (mkdir-p bin) (with-directory-excursion bin - (symlink (string-append share "/" executable) + (symlink (string-append share "/" executable ".py") executable))) #t)) (add-after 'install 'create-desktop-file @@ -353,8 +356,8 @@ to open the application in a web browser, for offline usage.") "[Desktop Entry]~@ Name=ToutEnClic~@ Comment=For schooling without difference~@ - Exec=~a/bin/toutenclic.py~@ - TryExec=~@*~a/bin/toutenclic.py~@ + Exec=~a/bin/toutenclic~@ + TryExec=~@*~a/bin/toutenclic~@ Terminal=false~@ Icon=toutenclic~@ Type=Application~%" diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c7883e3507..c5fbb06d8a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5811,8 +5811,8 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "baa9c6880779d416a91bf5bde3589673a7403612") - (revision "8")) + (let ((commit "0748c695dfa89b79eb316da5060360de8c0f04da") + (revision "9")) (package (name "emacs-evil-collection") (version (git-version "0.0.1" revision commit)) @@ -5824,7 +5824,7 @@ extensions.") (file-name (git-file-name name version)) (sha256 (base32 - "09v97nk7qawphfijzqxzi2y63ydmfq7hsgpljjxwkykrc5h0kdlj")))) + "17w8nh3q7ffc7776f3qzixk0c0g6vys3xybgw16ky1f416585kvb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) @@ -8365,7 +8365,7 @@ key. Optionally, a mouse pop-up can be added by binding version ".tar")) (sha256 (base32 - "02r1qqsxi6qk7q4cj6a6pygbj856dcw9vcmhfh0ib92j41v77q6y")))) + "16hl2s22l3wc9drnwzw6hn7xrm49ml9lii0s6k218dgahdgsncmf")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-prop-menu" ,emacs-prop-menu))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 78a9930802..359503e9e1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -851,18 +851,18 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (package (name "kicad-library") (version version) - (source (origin - (method url-fetch) - (uri (string-append - "http://downloads.kicad-pcb.org/libraries/kicad-library-" - version ".tar.gz")) - (sha256 - (base32 - "1azb7v1y3l6j329r9gg7f4zlg0wz8nh4s4i5i0l9s4yh9r6i9zmv")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://kicad-downloads.s3.cern.ch/libraries/kicad-library-" + version ".tar.gz")) + (sha256 + (base32 "1azb7v1y3l6j329r9gg7f4zlg0wz8nh4s4i5i0l9s4yh9r6i9zmv")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t - #:tests? #f ; no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (add-after 'install 'install-footprints ; from footprints tarball @@ -882,14 +882,14 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (fp-lib-table (string-append template-dir "/fp-lib-table"))) (delete-file fp-lib-table) (copy-file (string-append fp-lib-table ".for-pretty") - fp-lib-table)) + fp-lib-table)) #t))))) (native-search-paths (list (search-path-specification - (variable "KISYSMOD") ; footprint path + (variable "KISYSMOD") ; footprint path (files '("share/kicad/modules"))) (search-path-specification - (variable "KISYS3DMOD") ; 3D model path + (variable "KISYS3DMOD") ; 3D model path (files '("share/kicad/modules/packages3d"))))) ;; Kicad distributes footprints in a separate tarball. (native-inputs diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 7bb358e515..11fcf0b7b0 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -484,7 +484,7 @@ and in creating applications based on the Enlightenment Foundation Library suite "apps/ephoto/ephoto-" version ".tar.xz"))) (sha256 (base32 - "04kli43sfsy6s660g13pjc0kjmgdcmq8m4qh02vvpcwv60mf9mgz")))) + "1q7v9abjp9jrs08xc7pqaac64yzax24dk1snjb9rciarzzh3mlzy")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e62f532a0c..84aca17c70 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -426,7 +426,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "60.6.2-guix1") +(define %icecat-version "60.6.3-guix1") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -448,7 +448,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0fvxqxg48c0xrffb720gxfjayz3xqam2xnsz5piri64dcjvxgcyd")))) + "0gl3a0kb404f7rjlr2qz2kdcsmfz9q99innhgl08rkv4ijb39gzf")))) (upstream-icecat-base-version "60.3.0") ; maybe older than base-version (upstream-icecat-gnu-version "1") diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 738ba6c455..36d0467175 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -415,3 +415,34 @@ CPUFLAGS = ~{~a ~}~%" (description "Faiss is a library for efficient similarity search and clustering of dense vectors. This package provides Python bindings to the Faiss library."))) + +(define-public python-leidenalg + (package + (name "python-leidenalg") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "leidenalg" version)) + (sha256 + (base32 + "15fwld9hdw357rd026mzcwpah5liy4f33vc9x9kwy37g71b2rjf1")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; tests are not included + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("igraph" ,igraph))) + (propagated-inputs + `(("python-igraph" ,python-igraph))) + (home-page "https://github.com/vtraag/leidenalg") + (synopsis "Community detection in large networks") + (description + "Leiden is a general algorithm for methods of community detection in +large networks. This package implements the Leiden algorithm in C++ and +exposes it to Python. Besides the relative flexibility of the implementation, +it also scales well, and can be run on graphs of millions of nodes (as long as +they can fit in memory). The core function is @code{find_partition} which +finds the optimal partition using the Leiden algorithm, which is an extension +of the Louvain algorithm, for a number of different methods.") + (license license:gpl3+))) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c640893e32..365f909c2c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2199,7 +2199,7 @@ from @code{tree-il}.") (define-public guile-file-names (package (name "guile-file-names") - (version "0.1") + (version "0.2") (source (origin (method url-fetch) (uri (string-append "http://brandon.invergo.net/software/download/" @@ -2207,16 +2207,14 @@ from @code{tree-il}.") version ".tar.gz")) (sha256 (base32 - "01ba6jdypj9cwc5rgiw384dgz12iz6ab4dsd3ai5gfklprm2a50b")))) + "1kwx5hanl40960w2nhyga7ry4l6c3c57zdrihk4yajj87vn3pmi8")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'build-with-guile-2.2 + (add-after 'unpack 'fix-target-directory (lambda _ - (substitute* "configure" - (("guile-2.0") "guile-2.2")) - (substitute* "file-names/Makefile.in" + (substitute* "src/Makefile.in" (("guilemoddir = \\$\\(GUILE_SITE\\)") "guilemoddir = $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) #t))))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6e9ebc49f4..24b4980efd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -426,8 +426,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.1.2") -(define %linux-libre-hash "1v4i5lf95zjp3gvswhla9jz7yqkl0k13blf6y2z0229xh05627jb") +(define %linux-libre-version "5.1.3") +(define %linux-libre-hash "07y1hl1r4na7yd9k113q0vij54hw9m32kcg7wli2y2f5xxdzb6dx") (define %linux-libre-5.1-patches (list %boot-logo-patch @@ -440,8 +440,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-5.1-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.43") -(define %linux-libre-4.19-hash "15lx2igfqazn6v0nzs0y1ii6a0mmwqi9dnivs36a9r2f17l8p6p7") +(define %linux-libre-4.19-version "4.19.44") +(define %linux-libre-4.19-hash "1shxns3b5dm2hq6h59y3pc1ks4x1hbxqcchzncxz53gf2xqyz95i") (define %linux-libre-4.19-patches (list %boot-logo-patch @@ -454,8 +454,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.119") -(define %linux-libre-4.14-hash "18bi9cjmy1cw0kjwckcbiaj1iw8sx2isz3vpdgb3si9zhzfcjnz2") +(define %linux-libre-4.14-version "4.14.120") +(define %linux-libre-4.14-hash "0ll8m46cdbfrp6nvjcjm8w4alm75rg95k2lcdj72gfjnn8dfsnv1") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -464,14 +464,14 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.176" - "0v5rhb1nd9h4ssm0jxf3vspcm954pp7vkmz2k99p0yhw45i3aj6x" + (make-linux-libre "4.9.177" + "1zzv863qzzzri4xdcqr84pgbfafvfi6wylbxv6qz139fx638z9bd" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.179" - "025jl50sgi3bxj8hxlihqyfshmfphrg6z3cfi043qwkc8sbdy3af" + (make-linux-libre "4.4.180" + "157kfs4slii86q9yrspvqdynpiv6rff80hrrn569v6h4nkc4b7ag" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config #:extra-options @@ -559,6 +559,80 @@ between the CDemu userspace daemon and linux kernel.") ;;; +;;; Linux kernel modules. +;;; + +(define-public acpi-call-linux-module + (package + (name "acpi-call-linux-module") + (version "3.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/teleshoes/acpi_call.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04mbv4lasm3vv1j4ndxhnz4hvp5wg8f5fc9q6qxv0nhvwjynmsl3")))) + (build-system linux-module-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-for-linux-4.12 + (lambda _ + (substitute* "acpi_call.c" + (("asm/uaccess\\.h") + "linux/uaccess.h")) + #t)) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (for-each (lambda (file) + (let ((target (string-append doc "/" file))) + (mkdir-p (dirname target)) + (copy-recursively file target))) + (list "README.md" "examples")) + #t)))))) + (home-page "https://github.com/teleshoes/acpi_call") + (synopsis "Linux kernel module to perform ACPI method calls") + (description + "This simple Linux kernel module allows calls from user space to any +@acronym{ACPI, Advanced Configuration and Power Interface} method provided by +your computer's firmware, by writing to @file{/proc/acpi/call}. You can pass +any number of parameters of types @code{ACPI_INTEGER}, @code{ACPI_STRING}, +and @code{ACPI_BUFFER}. + +It grants direct and undocumented access to your hardware that may cause damage +and should be used with caution, especially on untested models.") + (license license:gpl3+))) ; see README.md (no licence headers) + +(define-public vhba-module + (package + (name "vhba-module") + (version "20190410") + (source (origin + (method url-fetch) + (uri (string-append + "http://downloads.sourceforge.net/cdemu/vhba-module/vhba-module-" + version ".tar.bz2")) + (sha256 + (base32 + "1513hq130raxp9z5grj54cwfjfxj05apipxg425j0zicii59a60c")))) + (build-system linux-module-build-system) + (arguments + ;; TODO: No tests? + `(#:tests? #f)) + (home-page "https://cdemu.sourceforge.io/") + (synopsis "Kernel module that emulates SCSI devices") + (description "VHBA module provides a Virtual (SCSI) HBA, which is the link +between the CDemu userspace daemon and linux kernel.") + (license license:gpl2+))) + + +;;; ;;; Pluggable authentication modules (PAM). ;;; @@ -3696,6 +3770,68 @@ other @code{hwmon} driver that enables temperature reading and fan control from userspace.") (license license:gpl3+))) +(define-public tpacpi-bat + (package + (name "tpacpi-bat") + (version "3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/teleshoes/tpacpi-bat.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'refer-to-inputs + (lambda _ + (substitute* "tpacpi-bat" + (("cat ") + (format "~a " (which "cat"))) + ;; tpacpi-bat modprobes the acpi_call kernel module if it's not + ;; loaded. That's the administrator's prerogative; disable it. + (("system \"(modprobe .*)\"" _ match) + (format "die \"Please run ‘~a’ first.\\n\"" match))) + #t)) + (delete 'configure) ; nothing to configure + (delete 'build) ; nothing to build + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "tpacpi-bat" bin) + + ;; There's no man page. Install other forms of documentation. + (for-each (lambda (file) + (let ((target (string-append doc "/" file))) + (mkdir-p (dirname target)) + (copy-recursively file target))) + (list "battery_asl" "examples" "README.md")) + #t)))))) + (inputs + `(("perl" ,perl))) + (home-page "https://github.com/teleshoes/tpacpi-bat") + (synopsis "ThinkPad battery charge controller") + (description + "Tpacpi-bat is a command-line interface to control battery charging on +@uref{https://github.com/teleshoes/tpacpi-bat/wiki/Supported-Hardware, Lenovo +ThinkPad models released after 2011}, starting with the xx20 series. It can +query and set the thresholds at which one or both batteries will start and stop +charging, inhibit charging batteries for a set period of time, or force them to +discharge when they otherwise would not. + +This tool merely exposes ACPI calls provided by the @code{acpi_call} Linux +kernel module provided by the @code{acpi-call-linux-module} package, which must +be installed and loaded separately. Only the original vendor firmware is +supported.") + (license license:gpl3+))) + (define-public ntfs-3g (package (name "ntfs-3g") @@ -4641,15 +4777,16 @@ userspace queueing component and the logging subsystem.") (package (name "proot") (version "5.1.0") - (home-page "https://github.com/proot-me/PRoot") - (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "11h30i83vdhc3khlj6hrh3a21sbmmz8nhfv09vkf6b9bcs1biz2h")) - (patches (search-patches "proot-test-fhs.patch")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/proot-me/PRoot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz")) + (patches (search-patches "proot-test-fhs.patch")))) (build-system gnu-build-system) (arguments '(#:make-flags '("-C" "src") @@ -4726,6 +4863,7 @@ userspace queueing component and the logging subsystem.") ;; For 'mcookie', used by some of the tests. ("util-linux" ,util-linux))) (inputs `(("talloc" ,talloc))) + (home-page "https://github.com/proot-me/PRoot") (synopsis "Unprivileged chroot, bind mount, and binfmt_misc") (description "PRoot is a user-space implementation of @code{chroot}, @code{mount --bind}, diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d5f59e30d6..46b670f60f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2018 Eric Brown <brown@fastmail.com> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Amin Bandali <bandali@gnu.org> +;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -4881,13 +4882,12 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.") (uri (string-append "https://mersenneforum.org/mayer/src/C/mlucas_v" version ".txz")) (sha256 - (base32 - "1ax12qj9lyvnx4vs3gx7l8r3wx5gjbsdswp5f00ik9z0wz7xf297")))) + (base32 "0h4xj6pyyac79ka5ibqjilfa3s9j3yxnzgpwc57b54kfh2bj3447")))) (build-system gnu-build-system) (inputs `(("python2" ,python-2))) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure @@ -4921,3 +4921,72 @@ coordinated fashion, as part of the Great Internet Mersenne Prime Search (GIMPS). Mlucas also includes a simple Python script for assignment management via the GIMPS project's Primenet server.") (license license:gpl2+))) + +(define-public nauty + (package + (name "nauty") + (version "2.6r11") + (source (origin + (method url-fetch) + (uri (string-append + "https://pallini.di.uniroma1.it/" + "nauty" (string-join (string-split version #\.) "") + ".tar.gz")) + (sha256 + (base32 + "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y")))) + (build-system gnu-build-system) + (outputs '("out" "lib")) + (arguments + `(#:test-target "checks" + #:phases + (modify-phases %standard-phases + ;; Default make target does not build all available + ;; executables. Create them now. + (add-after 'build 'build-extra-programs + (lambda _ + (for-each (lambda (target) (invoke "make" target)) + '("blisstog" "bliss2dre" "checks6" "sumlines")) + #t)) + ;; Upstream does not provide any install target. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib-output (assoc-ref outputs "lib")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/nauty/")) + (include (string-append lib-output "/include/nauty")) + (lib (string-append lib-output "/lib/nauty"))) + (for-each (lambda (f) (install-file f bin)) + '("dreadnaut" "NRswitchg" "addedgeg" "amtog" "biplabg" + "blisstog" "bliss2dre" "catg" "checks6" "complg" + "converseg" "copyg" "countg" "cubhamg" "deledgeg" + "delptg" "directg" "dretodot" "dretog" "genbg" + "genbgL" "geng" "genquarticg" "genrang" "genspecialg" + "gentourng" "gentreeg" "hamheuristic" "labelg" + "linegraphg" "listg" "multig" "newedgeg" "pickg" + "planarg" "ranlabg" "shortg" "showg" "subdivideg" + "sumlines" "twohamg" "vcolg" "watercluster2")) + (for-each (lambda (f) (install-file f include)) + (find-files "." "\\.h$")) + (for-each (lambda (f) (install-file f lib)) + (find-files "." "\\.a$")) + (for-each (lambda (f) (install-file f doc)) + (append '("formats.txt" "README" "schreier.txt") + (find-files "." "\\.pdf$"))))))))) + (inputs + `(("gmp" ,gmp))) ;for sumlines + (home-page "https://pallini.di.uniroma1.it/") + (synopsis "Library for graph automorphisms") + (description "@code{nauty} (No AUTomorphisms, Yes?) is a set of +procedures for computing automorphism groups of graphs and digraphs. + +@code{nauty} computes graph information in the form of a set of +generators, the size of the group, and the orbits of the group; it can +also produce a canonical label. The @code{nauty} suite is written in +C and comes with a command-line interface, a collection of +command-line tools, and an Application Programming Interface (API). + +This package provides the static libraries required to run programs +compiled against the nauty library.") + (license license:asl2.0))) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 6383976f00..7d355220b2 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -193,13 +193,13 @@ error. Additionally, iRRAM uses the concept of multi-valued functions.") (package (name "qd") (version "2.3.22") - (source (origin - (method url-fetch) - (uri (string-append "http://crd.lbl.gov/~dhbailey/mpdist/qd-" - version ".tar.gz")) - (sha256 - (base32 - "0wpgdzjcbanwd0c9mk90n04nas0q5fwc5zkrlbxyn6yjd2n8k3i6")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://crd-legacy.lbl.gov/~dhbailey/mpdist/qd-" + version ".tar.gz")) + (sha256 + (base32 "1lq609rsp6zpg7zda75lyxzzk1fabzp4jn88j7xfk84mdgjgzh9h")))) (build-system gnu-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -215,7 +215,7 @@ error. Additionally, iRRAM uses the concept of multi-valued functions.") ;; expensive optimizations lets it pass. '("CXXFLAGS=-O3 -fno-expensive-optimizations") '("CXXFLAGS=-O3"))))) - (home-page "http://crd-legacy.lbl.gov/~dhbailey/mpdist/") + (home-page "https://www.davidhbailey.com/dhbsoftware/") (synopsis "Double-double and quad-double library") (description "This package supports both a double-double datatype (approx. 32 decimal digits) and a quad-double datatype (approx. 64 diff --git a/gnu/packages/patches/bind-fix-unused-pk11-ecc-constants.patch b/gnu/packages/patches/bind-fix-unused-pk11-ecc-constants.patch deleted file mode 100644 index ab7cc83684..0000000000 --- a/gnu/packages/patches/bind-fix-unused-pk11-ecc-constants.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Tobias Geerinckx-Rice <me@tobias.gr> -Date: Thu, 25 Apr 2019 04:36:52 +0200 -Subject: [PATCH] gnu: bind: Fix unused PKCS#11 ECC constants. - -Without this patch, the build fails: - - pkcs11-keygen.c: In function ‘main’: - pkcs11-keygen.c:424:32: error: ‘pk11_ecc_prime256v1’ undeclared (first use in this function) - public_template[4].pValue = pk11_ecc_prime256v1; - ^ - pkcs11-keygen.c:424:32: note: each undeclared identifier is reported only once for each function it appears in - pkcs11-keygen.c:428:32: error: ‘pk11_ecc_secp384r1’ undeclared (first use in this function) - public_template[4].pValue = pk11_ecc_secp384r1; - ^ - make[2]: *** [Makefile:217: pkcs11-keygen.o] Error 1 - -Fix copied verbatim from upstream[0]. - -[0]: https://gitlab.isc.org/isc-projects/bind9/issues/935 - ---- ---- orig-bind-9.11.6/bin/pkcs11/pkcs11-keygen.c 2019-02-27 15:28:15.000000000 -0800 -+++ bind-9.11.6/bin/pkcs11/pkcs11-keygen.c 2019-03-11 09:20:50.955257469 -0700 -@@ -403,6 +403,10 @@ - public_template[RSA_PUBLIC_EXPONENT].ulValueLen = expsize; - break; - case key_ecc: -+#if !defined(HAVE_PKCS11_ECDSA) -+ fprintf(stderr, "prime256v1 and secp3841r1 is not supported\n"); -+ usage(); -+#else - op_type = OP_EC; - if (bits == 0) - bits = 256; -@@ -429,7 +433,7 @@ - public_template[4].ulValueLen = - sizeof(pk11_ecc_secp384r1); - } -- -+#endif - break; - case key_ecx: - #if !defined(CKM_EDDSA_KEY_PAIR_GEN) diff --git a/gnu/packages/patches/borg-fix-hard-link-preloading.patch b/gnu/packages/patches/borg-fix-hard-link-preloading.patch new file mode 100644 index 0000000000..92a4e22674 --- /dev/null +++ b/gnu/packages/patches/borg-fix-hard-link-preloading.patch @@ -0,0 +1,157 @@ +Fix a bug that would cause the test suite to hang: + +https://github.com/borgbackup/borg/issues/4350 + +Patch copied from upstream source repository: + +https://github.com/borgbackup/borg/commit/18242ab9e2f26c450b8507aa1d5eceadab8ad027 + +From 18242ab9e2f26c450b8507aa1d5eceadab8ad027 Mon Sep 17 00:00:00 2001 +From: Thomas Waldmann <tw@waldmann-edv.de> +Date: Thu, 2 May 2019 21:02:26 +0200 +Subject: [PATCH] preload chunks for hardlink slaves w/o preloaded master, + fixes #4350 + +also split the hardlink extraction test into 2 tests. + +(cherry picked from commit f33f318d816505161d1449a02ddfdeb97d6fe80a) +--- + src/borg/archive.py | 42 +++++++++++++++++++++++++++++----- + src/borg/archiver.py | 5 ++-- + src/borg/testsuite/archiver.py | 20 +++++++++------- + 3 files changed, 51 insertions(+), 16 deletions(-) + +diff --git a/src/borg/archive.py b/src/borg/archive.py +index adc1f42c..0793672a 100644 +--- a/src/borg/archive.py ++++ b/src/borg/archive.py +@@ -192,7 +192,7 @@ def __init__(self, repository, key): + self.repository = repository + self.key = key + +- def unpack_many(self, ids, filter=None, preload=False): ++ def unpack_many(self, ids, filter=None, partial_extract=False, preload=False, hardlink_masters=None): + """ + Return iterator of items. + +@@ -209,12 +209,40 @@ def unpack_many(self, ids, filter=None, preload=False): + for item in items: + if 'chunks' in item: + item.chunks = [ChunkListEntry(*e) for e in item.chunks] ++ ++ def preload(chunks): ++ self.repository.preload([c.id for c in chunks]) ++ + if filter: + items = [item for item in items if filter(item)] ++ + if preload: +- for item in items: +- if 'chunks' in item: +- self.repository.preload([c.id for c in item.chunks]) ++ if filter and partial_extract: ++ # if we do only a partial extraction, it gets a bit ++ # complicated with computing the preload items: if a hardlink master item is not ++ # selected (== not extracted), we will still need to preload its chunks if a ++ # corresponding hardlink slave is selected (== is extracted). ++ # due to a side effect of the filter() call, we now have hardlink_masters dict populated. ++ masters_preloaded = set() ++ for item in items: ++ if 'chunks' in item: # regular file, maybe a hardlink master ++ preload(item.chunks) ++ # if this is a hardlink master, remember that we already preloaded it: ++ if 'source' not in item and hardlinkable(item.mode) and item.get('hardlink_master', True): ++ masters_preloaded.add(item.path) ++ elif 'source' in item and hardlinkable(item.mode): # hardlink slave ++ source = item.source ++ if source not in masters_preloaded: ++ # we only need to preload *once* (for the 1st selected slave) ++ chunks, _ = hardlink_masters[source] ++ preload(chunks) ++ masters_preloaded.add(source) ++ else: ++ # easy: we do not have a filter, thus all items are selected, thus we need to preload all chunks. ++ for item in items: ++ if 'chunks' in item: ++ preload(item.chunks) ++ + for item in items: + yield item + +@@ -433,8 +461,10 @@ def item_filter(self, item, filter=None): + return False + return filter(item) if filter else True + +- def iter_items(self, filter=None, preload=False): +- for item in self.pipeline.unpack_many(self.metadata.items, preload=preload, ++ def iter_items(self, filter=None, partial_extract=False, preload=False, hardlink_masters=None): ++ assert not (filter and partial_extract and preload) or hardlink_masters is not None ++ for item in self.pipeline.unpack_many(self.metadata.items, partial_extract=partial_extract, ++ preload=preload, hardlink_masters=hardlink_masters, + filter=lambda item: self.item_filter(item, filter)): + yield item + +diff --git a/src/borg/archiver.py b/src/borg/archiver.py +index 957959d6..dcc20455 100644 +--- a/src/borg/archiver.py ++++ b/src/borg/archiver.py +@@ -755,7 +755,8 @@ def peek_and_store_hardlink_masters(item, matched): + else: + pi = None + +- for item in archive.iter_items(filter, preload=True): ++ for item in archive.iter_items(filter, partial_extract=partial_extract, ++ preload=True, hardlink_masters=hardlink_masters): + orig_path = item.path + if strip_components: + item.path = os.sep.join(orig_path.split(os.sep)[strip_components:]) +@@ -997,7 +998,7 @@ def item_to_tarinfo(item, original_path): + return None, stream + return tarinfo, stream + +- for item in archive.iter_items(filter, preload=True): ++ for item in archive.iter_items(filter, preload=True, hardlink_masters=hardlink_masters): + orig_path = item.path + if strip_components: + item.path = os.sep.join(orig_path.split(os.sep)[strip_components:]) +diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py +index c35ad800..935b3d79 100644 +--- a/src/borg/testsuite/archiver.py ++++ b/src/borg/testsuite/archiver.py +@@ -823,7 +823,18 @@ def test_mount_hardlinks(self): + assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' + + @requires_hardlinks +- def test_extract_hardlinks(self): ++ def test_extract_hardlinks1(self): ++ self._extract_hardlinks_setup() ++ with changedir('output'): ++ self.cmd('extract', self.repository_location + '::test') ++ assert os.stat('input/source').st_nlink == 4 ++ assert os.stat('input/abba').st_nlink == 4 ++ assert os.stat('input/dir1/hardlink').st_nlink == 4 ++ assert os.stat('input/dir1/subdir/hardlink').st_nlink == 4 ++ assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' ++ ++ @requires_hardlinks ++ def test_extract_hardlinks2(self): + self._extract_hardlinks_setup() + with changedir('output'): + self.cmd('extract', self.repository_location + '::test', '--strip-components', '2') +@@ -839,13 +850,6 @@ def test_extract_hardlinks(self): + assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' + assert os.stat('input/dir1/aaaa').st_nlink == 2 + assert os.stat('input/dir1/source2').st_nlink == 2 +- with changedir('output'): +- self.cmd('extract', self.repository_location + '::test') +- assert os.stat('input/source').st_nlink == 4 +- assert os.stat('input/abba').st_nlink == 4 +- assert os.stat('input/dir1/hardlink').st_nlink == 4 +- assert os.stat('input/dir1/subdir/hardlink').st_nlink == 4 +- assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' + + def test_extract_include_exclude(self): + self.cmd('init', '--encryption=repokey', self.repository_location) +-- +2.21.0 + diff --git a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch new file mode 100644 index 0000000000..5cadef3928 --- /dev/null +++ b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch @@ -0,0 +1,34 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Mon, 20 May 2019 04:52:33 +0200 +Subject: [PATCH] gnu: xf86-video-voodoo: Don't use PCITAG. + +Copied verbatim from upstream repository[0]. + +[0]: https://cgit.freedesktop.org/xorg/driver/-xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593 + +From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 22 Sep 2014 10:56:02 +1000 +Subject: don't use PCITAG in struct anymore + +--- + src/voodoo.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/voodoo.h b/src/voodoo.h +index bfed497..c3eb64e 100644 +--- a/src/voodoo.h ++++ b/src/voodoo.h +@@ -23,7 +23,9 @@ typedef struct { + + Bool Voodoo2; /* Set if Voodoo2 */ + pciVideoPtr PciInfo; /* PCI data */ ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + CARD32 PhysBase; + + CARD32 Width; /* Current width */ +-- +cgit v1.0 + diff --git a/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch b/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch new file mode 100644 index 0000000000..a43889d2c6 --- /dev/null +++ b/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch @@ -0,0 +1,47 @@ +https://dev.lovelyhq.com/libburnia/libisoburn/commit/1eb51f44dadb8b6c5f87533ca357186cdc1ac625 +diff --git a/frontend/grub-mkrescue-sed.sh b/frontend/grub-mkrescue-sed.sh +index b3948c99..dcd9d696 100755 +--- a/frontend/grub-mkrescue-sed.sh ++++ b/frontend/grub-mkrescue-sed.sh +@@ -120,6 +120,7 @@ fi + # "yes" overwrites the MBR partition table area in the EFI boot image by zeros. + # Some EFI implementations get stuck when seeing in the EFI partition a + # partition table entry which begins at LBA 0. ++# "extra" not only zeros the partition table but also the MBR signature. + efi_zero_inner_pt=no + if test -n "$MKRESCUE_SED_IN_EFI_NO_PT" + then +@@ -192,24 +193,31 @@ then + find "$dir" + fi + +-if test "$efi_zero_inner_pt" = yes ++if test "$efi_zero_inner_pt" = yes -o "$efi_zero_inner_pt" = extra + then + did_dd=0 + if test -e "$dir"/efi.img + then ++ # Look for 0x55 0xAA in bytes 510 and 511 + magic=$(dd bs=1 skip=510 count=2 if="$dir"/efi.img 2>/dev/null | \ + od -c | head -1 | awk '{print $2 " " $3}') + if test "$magic" = "U 252" + then ++ echo "Performing actions for MKRESCUE_SED_IN_EFI_NO_PT=$efi_zero_inner_pt" >&2 + dd if=/dev/zero bs=1 seek=446 count=64 conv=notrunc of="$dir"/efi.img + did_dd=1 ++ if test "$efi_zero_inner_pt" = extra ++ then ++ dd if=/dev/zero bs=1 seek=510 count=2 conv=notrunc of="$dir"/efi.img ++ fi ++ echo >&2 + fi + fi + if test "$did_dd" = 0 + then + echo >&2 + echo "$0 : NOTE : No EFI image found or no MBR signature in it." >&2 +- echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=yes" >&2 ++ echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=$efi_zero_inner_pt" >&2 + echo >&2 + fi + fi diff --git a/gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch b/gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch new file mode 100644 index 0000000000..a719ca1f89 --- /dev/null +++ b/gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch @@ -0,0 +1,107 @@ +https://dev.lovelyhq.com/libburnia/libisoburn/commit/3a2a3ba737a06162c22ace0ae09d33ba97aa2673 +diff --git a/frontend/grub-mkrescue-sed.sh b/frontend/grub-mkrescue-sed.sh +index d772ff22..b3948c99 100755 +--- a/frontend/grub-mkrescue-sed.sh ++++ b/frontend/grub-mkrescue-sed.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + +-# Copyright (C) 2015 - 2016 ++# Copyright (C) 2015 - 2019 + # Thomas Schmitt <scdbackup@gmx.net>, libburnia-project.org + # Provided under BSD license: Use, modify, and distribute as you like. + +@@ -117,6 +117,15 @@ fi + # command line.) + # Each argument must be a single word. No whitespace. No quotation marks. + ++# "yes" overwrites the MBR partition table area in the EFI boot image by zeros. ++# Some EFI implementations get stuck when seeing in the EFI partition a ++# partition table entry which begins at LBA 0. ++efi_zero_inner_pt=no ++if test -n "$MKRESCUE_SED_IN_EFI_NO_PT" ++then ++ efi_zero_inner_pt="$MKRESCUE_SED_IN_EFI_NO_PT" ++fi ++ + + # + # Do the work +@@ -183,12 +192,48 @@ then + find "$dir" + fi + ++if test "$efi_zero_inner_pt" = yes ++then ++ did_dd=0 ++ if test -e "$dir"/efi.img ++ then ++ magic=$(dd bs=1 skip=510 count=2 if="$dir"/efi.img 2>/dev/null | \ ++ od -c | head -1 | awk '{print $2 " " $3}') ++ if test "$magic" = "U 252" ++ then ++ dd if=/dev/zero bs=1 seek=446 count=64 conv=notrunc of="$dir"/efi.img ++ did_dd=1 ++ fi ++ fi ++ if test "$did_dd" = 0 ++ then ++ echo >&2 ++ echo "$0 : NOTE : No EFI image found or no MBR signature in it." >&2 ++ echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=yes" >&2 ++ echo >&2 ++ fi ++fi ++ + efi_tmp_name= ++if test x"$mode" = xmjg \ ++ -o x"$mode" = xmbr_only \ ++ -o x"$mode" = xgpt_appended \ ++ -o x"$mode" = xmbr_hfs ++then ++ # Move EFI partition image file out of the "$dir" tree, i.e. out of the ISO ++ efi_tmp_name=grub-mkrescue-sed-efi-img.$$ ++ if test -e "$dir"/efi.img ++ then ++ mv "$dir"/efi.img /tmp/$efi_tmp_name ++ elif test -e /tmp/$efi_tmp_name ++ then ++ rm /tmp/$efi_tmp_name ++ fi ++fi ++ + if test x"$mode" = xmjg + then + # Exchange arguments for the experimental GRUB2 mjg layout +- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ +- mv "$dir"/efi.img /tmp/$efi_tmp_name + x=$(echo " $*" | sed \ + -e "s/-efi-boot-part --efi-boot-image/-no-pad -append_partition $partno 0xef \/tmp\/$efi_tmp_name/" \ + -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_${partno}:all:: -no-emul-boot -isohybrid-gpt-basdat/" \ +@@ -207,8 +252,6 @@ then + elif test x"$mode" = xmbr_only + then + # Exchange arguments for no-HFS MBR-only layout +- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ +- mv "$dir"/efi.img /tmp/$efi_tmp_name + x=$(echo " $*" | sed \ + -e "s/-efi-boot-part --efi-boot-image/$iso_mbr_part_type -no-pad -append_partition 2 0xef \/tmp\/$efi_tmp_name/" \ + -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_2:all:: -no-emul-boot/" \ +@@ -228,8 +271,6 @@ then + elif test x"$mode" = xmbr_hfs + then + # Exchange arguments for MBR and HFS+ layout +- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ +- mv "$dir"/efi.img /tmp/$efi_tmp_name + x=$(echo " $*" | sed \ + -e "s/-efi-boot-part --efi-boot-image/$iso_mbr_part_type -no-pad -append_partition 2 0xef \/tmp\/$efi_tmp_name/" \ + -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_2:all:: -no-emul-boot/" \ +@@ -247,8 +288,6 @@ then + elif test x"$mode" = xgpt_appended + then + # Exchange arguments for no-HFS MBR-only layout +- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ +- mv "$dir"/efi.img /tmp/$efi_tmp_name + x=$(echo " $*" | sed \ + -e "s/-efi-boot-part --efi-boot-image/-no-pad -append_partition 2 0xef \/tmp\/$efi_tmp_name -appended_part_as_gpt -partition_offset 16/" \ + -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_2:all:: -no-emul-boot/" \ diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 8aa3f0caef..5fb75ce617 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -407,7 +407,7 @@ PCSC API Python wrapper module.") (define-public libu2f-host (package (name "libu2f-host") - (version "1.1.9") + (version "1.1.10") (source (origin (method url-fetch) (uri @@ -416,7 +416,7 @@ PCSC API Python wrapper module.") "/libu2f-host/Releases/libu2f-host-" version ".tar.xz")) (sha256 (base32 - "1hnh3f4scx07v9jfkr1nnxasmydk1cmivn0nijcp2p75bc1fznip")))) + "0vrivl1dwql6nfi48z6dy56fwy2z13d7abgahgrs2mcmqng7hra2")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index b0c19f2664..cee50f627a 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -29,14 +29,14 @@ (define-public skalibs (package (name "skalibs") - (version "2.8.0.1") + (version "2.8.1.0") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "00mh15jx3p4xzhkslxzpgi1c0xglywck1ik7ffi0hfwcq092wla7")))) + (base32 "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist @@ -103,14 +103,14 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.8.0.0") + (version "2.8.0.1") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/s6/s6-" version ".tar.gz")) (sha256 - (base32 "01milx5shixvniaxxmanfzz54vcymjfi86433w62rk5ypvc94ir8")))) + (base32 "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e887cd7e70..010ed40707 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -442,12 +442,13 @@ especially over Wi-Fi, cellular, and long-distance links.") (version "3.1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/MisterTea/EternalTCP/archive/et-v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/MisterTea/EternalTCP.git") + (commit (string-append "et-v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1n2w2kqbshdmbb0gz4yizyw9gqfls6qm2dnwx1d9c2hz7hmi7521")))) + (base32 "1m5caxckn2ihwp9s2pbyh5amxlpwr7yc54q8s0kb10fr52w2vfnm")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) (native-inputs diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c3ce80c8f5..ec35315f22 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4908,13 +4908,13 @@ than the bitmaps Metafont creates.") (define-public texlive-latex-acmart (package (name "texlive-latex-acmart") - (version "1.45") + (version "1.60") (source (origin (method svn-fetch) (uri (texlive-ref "latex" "acmart")) (sha256 (base32 - "10zs8ga88ksypv1v4p6mynmfa7749q2hgxlr4shnwfjd9wrb421q")) + "0n62cs8dhcbn29y9ij1nnyigzr76yhk36kyahhqkkmvbafbys9s7")) (file-name (string-append name "-" version "-checkout")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/acmart")) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9d9804fa91..9c03719e7d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1446,7 +1446,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.04.30") + (version "2019.05.11") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1454,7 +1454,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1s43adnky8ayhjwmgmiqy6rmmygd4c23v36jhy2lzr2jpn8l53z1")))) + "1y272jgdqwhf2njzqfln80zb2pmw83rvp6lxza6wghb7cld249j1")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 0c8e8e85b8..0c607e60c8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -244,13 +244,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.02") + (version "8.03") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) (sha256 (base32 - "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w")))) + "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 60a9661040..d5a9acc80c 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -120,7 +120,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (define-public glslang (package (name "glslang") - (version "7.11.3188") + (version "7.11.3214") (source (origin (method git-fetch) @@ -129,7 +129,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (commit version))) (sha256 (base32 - "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq")) + "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins")) (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d9e4cb0ded..7d41b61c4e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4038,14 +4038,20 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") (package (name "jq") (version "1.6") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/stedolan/jq" - "/releases/download/jq-" version - "/jq-" version ".tar.gz")) - (sha256 - (base32 - "1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/stedolan/jq" + "/releases/download/jq-" version + "/jq-" version ".tar.gz")) + (sha256 + (base32 "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled onigurama. + (delete-file-recursively "modules") + #t)))) (inputs `(("oniguruma" ,oniguruma))) (native-inputs @@ -4812,14 +4818,14 @@ tools like SSH (Secure Shell) to reach the outside world.") (define-public stunnel (package (name "stunnel") - (version "5.53") + (version "5.54") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0")))) + (base32 "00krr0h3vsyi93mqhrbgfgn8v47l4l3hzdg1ccfnpd3lqak8i1ay")))) (build-system gnu-build-system) (native-inputs ;; For tests. diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ccc4e4f3ad..59716928f5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -72,7 +72,7 @@ (define-public wine (package (name "wine") - (version "4.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -80,7 +80,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7")))) + "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index cc79fb4851..c3ddf9f866 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -188,15 +188,15 @@ to share commonly used Xfce widgets among the Xfce applications.") (define-public exo (package (name "exo") - (version "0.12.4") + (version "0.12.5") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "exo/" (version-major+minor version) "/" + "exo-" version ".tar.bz2")) (sha256 (base32 - "1bsh43m6dh83vj9qi1vs0425m2d5yfqjyihr7zjjqmyvdf0n1bxh")))) + "1s23prcgall6r5dpn0qlrdq3zj13p95a5s0l2vflgrka8gb39x78")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -224,8 +224,8 @@ development.") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "garcon/" (version-major+minor version) "/" + "garcon-" version ".tar.bz2")) (sha256 (base32 "0z64g6f2vwfjzqsrsn05nbcbs8l6y4cfdgxk4k2la3giixj0jzx8")))) @@ -250,15 +250,15 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "tumbler/" (version-major+minor version) "/" + "tumbler-" version ".tar.bz2")) (sha256 (base32 - "0h3x325dbz0lnb7b3zzbfrva3v0rn99v03zj9cza7ysr2nyy28nh")))) + "19mnwmcxdhqfqkd9433z8h2y8w49vlc7jw5p5h8j54wz7zhrgx0g")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -596,15 +596,15 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.4") + (version "1.8.6") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" + "thunar/" (version-major+minor version) "/" "Thunar-" version ".tar.bz2")) (sha256 (base32 - "1c4kg8w77nwi75b4ashy2m1y39icv951h63qsr1gdj6yipd53gy2")))) + "0apg70dwkh8q89ybzhj4q2gp4yxiybwxfzpbvx0nj0rxis1gprf0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5d8b3498e6..68f72bea98 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3488,14 +3488,7 @@ X server.") (base32 "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly")) (patches - (list (origin - (method url-fetch) - (uri "https://cgit.freedesktop.org/xorg/driver/\ -xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593") - (sha256 - (base32 - "0rndmxf5b8j3hjnhrwrnzsq5024fli134fj1mprhkcrvax2zq8db")) - (file-name "xf86-video-voodoo-pcitag.patch")))))) + (search-patches "xf86-video-voodoo-pcitag.patch")))) (build-system gnu-build-system) (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) |