mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
Merge branch 'staging'
This commit is contained in:
Marius Bakke
commit
33b59c1a3e
60 changed files with 1171 additions and 734 deletions
|
|
@ -953,7 +953,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/guile-relocatable.patch \
|
||||
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
|
||||
%D%/packages/patches/guile-emacs-fix-configure.patch \
|
||||
%D%/packages/patches/gstreamer-buffer-reset-offset.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk2-theme-paths.patch \
|
||||
|
|
@ -1025,6 +1024,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/kmod-module-directory.patch \
|
||||
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
|
||||
%D%/packages/patches/kpackage-allow-external-paths.patch \
|
||||
%D%/packages/patches/kpmcore-fix-tests.patch \
|
||||
%D%/packages/patches/kpmcore-remove-broken-test.patch \
|
||||
%D%/packages/patches/kobodeluxe-paths.patch \
|
||||
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
|
||||
%D%/packages/patches/kobodeluxe-const-charp-conversion.patch \
|
||||
|
|
@ -1132,6 +1133,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \
|
||||
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
|
||||
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
|
||||
%D%/packages/patches/mesa-timespec-test-32bit.patch \
|
||||
%D%/packages/patches/mescc-tools-boot.patch \
|
||||
%D%/packages/patches/meson-for-build-rpath.patch \
|
||||
%D%/packages/patches/metabat-fix-compilation.patch \
|
||||
|
|
@ -1207,6 +1209,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/openssl-c-rehash-in.patch \
|
||||
%D%/packages/patches/openssl-CVE-2019-1559.patch \
|
||||
%D%/packages/patches/open-zwave-hidapi.patch \
|
||||
%D%/packages/patches/orc-typedef-enum.patch \
|
||||
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
|
||||
%D%/packages/patches/osip-CVE-2017-7853.patch \
|
||||
%D%/packages/patches/ots-no-include-missing-file.patch \
|
||||
|
|
@ -1265,6 +1268,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/pygpgme-disable-problematic-tests.patch \
|
||||
%D%/packages/patches/pyqt-configure.patch \
|
||||
%D%/packages/patches/pyqt-public-sip.patch \
|
||||
%D%/packages/patches/pyqt-unbundled-qt.patch \
|
||||
%D%/packages/patches/python-2-deterministic-build-info.patch \
|
||||
%D%/packages/patches/python-2.7-adjust-tests.patch \
|
||||
%D%/packages/patches/python-2.7-search-paths.patch \
|
||||
|
|
@ -1302,7 +1306,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-waitress-fix-tests.patch \
|
||||
%D%/packages/patches/qemu-glibc-2.27.patch \
|
||||
%D%/packages/patches/qt4-ldflags.patch \
|
||||
%D%/packages/patches/qtbase-old-kernel.patch \
|
||||
%D%/packages/patches/qtbase-use-TZDIR.patch \
|
||||
%D%/packages/patches/qtscript-disable-tests.patch \
|
||||
%D%/packages/patches/quagga-reproducible-build.patch \
|
||||
|
|
@ -1343,6 +1346,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/scotch-build-parallelism.patch \
|
||||
%D%/packages/patches/scotch-integer-declarations.patch \
|
||||
%D%/packages/patches/sdl-libx11-1.6.patch \
|
||||
%D%/packages/patches/sdl2-mesa-compat.patch \
|
||||
%D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \
|
||||
%D%/packages/patches/seq24-rename-mutex.patch \
|
||||
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
|
||||
|
|
|
|||
|
|
@ -1196,7 +1196,7 @@ (define-public glibc/hurd-headers
|
|||
(define-public tzdata
|
||||
(package
|
||||
(name "tzdata")
|
||||
(version "2019b")
|
||||
(version "2019c")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -1204,7 +1204,7 @@ (define-public tzdata
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"))))
|
||||
"0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f
|
||||
|
|
@ -1254,7 +1254,7 @@ (define-public tzdata
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"))))))
|
||||
"1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"))))))
|
||||
(home-page "https://www.iana.org/time-zones")
|
||||
(synopsis "Database of current and historical time zones")
|
||||
(description "The Time Zone Database (often called tz or zoneinfo)
|
||||
|
|
@ -1272,7 +1272,25 @@ (define-public tzdata
|
|||
(define-public tzdata-for-tests
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit tzdata))))
|
||||
(inherit tzdata)
|
||||
(version "2019b")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://data.iana.org/time-zones/releases/tzdata"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"))))
|
||||
(inputs
|
||||
`(("tzcode" ,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://data.iana.org/time-zones/releases/tzcode"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf")))))))))
|
||||
|
||||
(define-public libiconv
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -11273,7 +11273,8 @@ (define-public kentutils
|
|||
("tcsh" ,tcsh)
|
||||
("perl" ,perl)
|
||||
("libpng" ,libpng)
|
||||
("mariadb" ,mariadb)
|
||||
("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("openssl" ,openssl)))
|
||||
(home-page "http://genome.cse.ucsc.edu/index.html")
|
||||
(synopsis "Assorted bioinformatics utilities")
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ (define-module (gnu packages calendar)
|
|||
(define-public libical
|
||||
(package
|
||||
(name "libical")
|
||||
(version "3.0.5")
|
||||
(version "3.0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -58,7 +58,7 @@ (define-public libical
|
|||
version "/libical-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rkq9qkvbv76n6k6kc8pxhwj9vhyigkb6flfcn1rk6wwqk451mbs"))))
|
||||
"15sdmh8w4vszd7jhv9fdpd48anpkniq2k1jw7siy9v1jnz1232jw"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; test suite appears broken
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ (define certdata2pem
|
|||
(define-public nss-certs
|
||||
(package
|
||||
(name "nss-certs")
|
||||
(version "3.45")
|
||||
(version "3.46.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
|
@ -87,7 +87,7 @@ (define-public nss-certs
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"12sfq9xvpwpc22qnjsg1if1lmchiy33byrh92wn91phz7li0abqi"))))
|
||||
"0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"))
|
||||
(native-inputs
|
||||
|
|
|
|||
|
|
@ -2249,7 +2249,7 @@ (define-public unittest-cpp
|
|||
(define-public libfaketime
|
||||
(package
|
||||
(name "libfaketime")
|
||||
(version "0.9.7")
|
||||
(version "0.9.8")
|
||||
(home-page "https://github.com/wolfcw/libfaketime")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
|
@ -2258,7 +2258,7 @@ (define-public libfaketime
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1cin1pqwpsswcv7amiwijirvcg3x1zf2l00s1x84nxc5602fzr5c"))
|
||||
"1mfdl82ppgbdvy1ny8mb7xii7p0g7awvn4bn36jb8v4r545slmjc"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -597,21 +598,38 @@ (define-public astyle
|
|||
#:make-flags (list (string-append "prefix=" %output)
|
||||
"INSTALL=install"
|
||||
"all")
|
||||
#:modules ((guix build gnu-build-system) ;; FIXME use %default-modules
|
||||
(guix build utils)
|
||||
(ice-9 regex))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _ (chdir "build/gcc") #t))
|
||||
(add-after 'install 'install-libs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Libraries are not installed by default
|
||||
;; Libraries and includes are not installed by default
|
||||
(let* ((output (assoc-ref outputs "out"))
|
||||
(incdir (string-append output "/include"))
|
||||
(libdir (string-append output "/lib")))
|
||||
(begin
|
||||
(mkdir-p libdir)
|
||||
(for-each (lambda (l)
|
||||
(copy-file
|
||||
l (string-append libdir "/" (basename l))))
|
||||
(find-files "bin" "lib*"))))
|
||||
(define (make-so-link sofile strip-pattern)
|
||||
(symlink
|
||||
(basename sofile)
|
||||
(regexp-substitute #f
|
||||
(string-match strip-pattern sofile)
|
||||
'pre)))
|
||||
(mkdir-p incdir)
|
||||
(copy-file "../../src/astyle.h"
|
||||
(string-append incdir "/astyle.h"))
|
||||
(mkdir-p libdir)
|
||||
(for-each (lambda (l)
|
||||
(copy-file
|
||||
l (string-append libdir "/" (basename l))))
|
||||
(find-files "bin" "lib*"))
|
||||
(for-each
|
||||
(lambda (sofile)
|
||||
(make-so-link sofile "(\\.[0-9]){3}$") ;; link .so
|
||||
(make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3
|
||||
(find-files libdir "lib.*\\.so\\..*")))
|
||||
#t)))))
|
||||
(home-page "http://astyle.sourceforge.net/")
|
||||
(synopsis "Source code indenter, formatter, and beautifier")
|
||||
|
|
|
|||
|
|
@ -736,7 +736,7 @@ (define-public libmspack
|
|||
(define-public lz4
|
||||
(package
|
||||
(name "lz4")
|
||||
(version "1.9.1")
|
||||
(version "1.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -744,10 +744,13 @@ (define-public lz4
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0"))
|
||||
"0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("valgrind" ,valgrind))) ;for tests
|
||||
(native-inputs
|
||||
`(;; For tests.
|
||||
("python" ,python)
|
||||
("valgrind" ,valgrind)))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:make-flags (list "CC=gcc"
|
||||
|
|
|
|||
|
|
@ -2759,7 +2759,8 @@ (define-public r-rmysql
|
|||
(properties `((upstream-name . "RMySQL")))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("mariadb" ,mariadb)
|
||||
`(("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("zlib" ,zlib)))
|
||||
(propagated-inputs
|
||||
`(("r-dbi" ,r-dbi)))
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ (define-module (gnu packages cups)
|
|||
(define-public cups-filters
|
||||
(package
|
||||
(name "cups-filters")
|
||||
(version "1.25.1")
|
||||
(version "1.25.11")
|
||||
(source(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
|
@ -66,7 +66,7 @@ (define-public cups-filters
|
|||
"cups-filters-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nlq44jnjcnrbdv0dv5myg5kaycmk6a4klynpvj65xvn3l9cq28s"))
|
||||
"0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; install backends, banners and filters to cups-filters output
|
||||
|
|
@ -187,7 +187,7 @@ (define-public cups-filters
|
|||
(define-public cups-minimal
|
||||
(package
|
||||
(name "cups-minimal")
|
||||
(version "2.2.11")
|
||||
(version "2.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -195,7 +195,7 @@ (define-public cups-minimal
|
|||
version "/cups-" version "-source.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m"))))
|
||||
"19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -225,7 +225,7 @@ (define-public cups-minimal
|
|||
#t)))
|
||||
(add-before 'build 'patch-tests
|
||||
(lambda _
|
||||
(substitute* "test/ippserver.c"
|
||||
(substitute* "tools/ippeveprinter.c"
|
||||
(("# else /\\* HAVE_AVAHI \\*/")
|
||||
"#elif defined(HAVE_AVAHI)"))
|
||||
#t)))))
|
||||
|
|
@ -245,7 +245,8 @@ (define-public cups-minimal
|
|||
Internally, CUPS uses PostScript Printer Description (@dfn{PPD}) files to
|
||||
describe printer capabilities and features, and a wide variety of generic and
|
||||
device-specific programs to convert and print many types of files.")
|
||||
(license license:gpl2)))
|
||||
;; CUPS is Apache 2.0 with exceptions, see the NOTICE file.
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public cups
|
||||
(package (inherit cups-minimal)
|
||||
|
|
|
|||
|
|
@ -717,9 +717,11 @@ (define-public mariadb
|
|||
(find-files "pcre") (find-files "zlib")))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "lib" "dev"))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
'("-DBUILD_CONFIG=mysql_release"
|
||||
(list
|
||||
"-DBUILD_CONFIG=mysql_release"
|
||||
;; Linking with libarchive fails, like this:
|
||||
|
||||
;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o):
|
||||
|
|
@ -743,15 +745,26 @@ (define-public mariadb
|
|||
"-DDEFAULT_COLLATION=utf8_general_ci"
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
|
||||
"-DINSTALL_INFODIR=share/mysql/docs"
|
||||
"-DINSTALL_MANDIR=share/man"
|
||||
(string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib"))
|
||||
(string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib")
|
||||
"/lib")
|
||||
(string-append "-DINSTALL_INFODIR=" (assoc-ref %outputs "out")
|
||||
"/share/mysql/docs")
|
||||
(string-append "-DINSTALL_MANDIR=" (assoc-ref %outputs "out")
|
||||
"/share/man")
|
||||
(string-append "-DINSTALL_SCRIPTDIR=" (assoc-ref %outputs "out") "/bin")
|
||||
(string-append "-DINSTALL_BINDIR=" (assoc-ref %outputs "out") "/bin")
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
|
||||
"-DINSTALL_SCRIPTDIR=bin"
|
||||
"-DINSTALL_INCLUDEDIR=include/mysql"
|
||||
"-DINSTALL_DOCREADMEDIR=share/mysql/docs"
|
||||
"-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files"
|
||||
(string-append "-DINSTALL_INCLUDEDIR=" (assoc-ref %outputs "dev")
|
||||
"/include/mysql")
|
||||
(string-append "-DINSTALL_DOCREADMEDIR=" (assoc-ref %outputs "out")
|
||||
"/share/mysql/docs")
|
||||
(string-append "-DINSTALL_DOCDIR=" (assoc-ref %outputs "out")
|
||||
"/share/mysql/docs")
|
||||
(string-append "-DINSTALL_SUPPORTFILESDIR=" (assoc-ref %outputs "out")
|
||||
"/share/mysql/support-files")
|
||||
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
|
||||
"-DINSTALL_DOCDIR=share/mysql/docs"
|
||||
"-DINSTALL_SHAREDIR=share")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -834,19 +847,29 @@ (define-public mariadb
|
|||
'install 'post-install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(test (assoc-ref outputs "test")))
|
||||
(dev (assoc-ref outputs "dev"))
|
||||
(lib (assoc-ref outputs "lib")))
|
||||
(substitute* (string-append out "/bin/mysql_install_db")
|
||||
(("basedir=\"\"")
|
||||
(string-append "basedir=\"" out "\"")))
|
||||
;; Remove unneeded files for testing.
|
||||
(with-directory-excursion out
|
||||
(with-directory-excursion lib
|
||||
(for-each delete-file-recursively
|
||||
'("data" "mysql-test" "sql-bench"
|
||||
"share/man/man1/mysql-test-run.pl.1"))
|
||||
;; Delete huge and unnecessary executables.
|
||||
(for-each delete-file (find-files "bin" "(test|embedded)"))
|
||||
'("data" "mysql-test" "sql-bench"))
|
||||
;; And static libraries.
|
||||
(for-each delete-file (find-files "lib" "\\.a$")))
|
||||
(with-directory-excursion out
|
||||
(delete-file "share/man/man1/mysql-test-run.pl.1")
|
||||
;; Delete huge and unnecessary executables.
|
||||
(for-each delete-file (find-files "bin" "(test|embedded)")))
|
||||
(mkdir-p (string-append dev "/share"))
|
||||
(mkdir-p (string-append dev "/bin"))
|
||||
(rename-file (string-append lib "/bin/mysqld")
|
||||
(string-append out "/bin/mysqld"))
|
||||
(rename-file (string-append lib "/share/pkgconfig")
|
||||
(string-append dev "/share/pkgconfig"))
|
||||
(rename-file (string-append out "/bin/mysql_config")
|
||||
(string-append dev "/bin/mysql_config"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
|
|
@ -1611,7 +1634,8 @@ (define-public perl-dbd-mysql
|
|||
#:tests? #f))
|
||||
(propagated-inputs
|
||||
`(("perl-dbi" ,perl-dbi)
|
||||
("mysql" ,mariadb)))
|
||||
("mysql" ,mariadb "lib")
|
||||
("mysql-dev" ,mariadb "dev")))
|
||||
(home-page "https://metacpan.org/release/DBD-mysql")
|
||||
(synopsis "DBI MySQL interface")
|
||||
(description "This package provides a MySQL driver for the Perl5
|
||||
|
|
@ -2729,7 +2753,8 @@ (define-public python-mysqlclient
|
|||
("mock" ,python-mock)
|
||||
("py.test" ,python-pytest)))
|
||||
(inputs
|
||||
`(("mysql" ,mariadb)
|
||||
`(("mysql" ,mariadb "lib")
|
||||
("mysql-dev" ,mariadb "dev")
|
||||
("libz" ,zlib)
|
||||
("openssl" ,openssl)))
|
||||
(home-page "https://github.com/PyMySQL/mysqlclient-python")
|
||||
|
|
|
|||
|
|
@ -555,7 +555,7 @@ (define-public klavaro
|
|||
(define-public ktouch
|
||||
(package
|
||||
(name "ktouch")
|
||||
(version "19.08.1")
|
||||
(version "19.08.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -563,7 +563,7 @@ (define-public ktouch
|
|||
version "/src/ktouch-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr"))))
|
||||
"0dm6xcwai0bx2h16rny1xa9n1509mfxvy39kfxx5qih53p15jrnk"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -11958,7 +11958,8 @@ (define-public emacs-emacsql
|
|||
#t)))))
|
||||
(inputs
|
||||
`(("emacs-minimal" ,emacs-minimal)
|
||||
("mariadb" ,mariadb)
|
||||
("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("postgresql" ,postgresql)))
|
||||
(propagated-inputs
|
||||
`(("emacs-finalize" ,emacs-finalize)
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ (define-module (gnu packages finance)
|
|||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages upnp)
|
||||
#:use-module (gnu packages version-control)
|
||||
|
|
@ -442,7 +443,7 @@ (define-public electron-cash
|
|||
(package
|
||||
(inherit electrum)
|
||||
(name "electron-cash")
|
||||
(version "4.0.7")
|
||||
(version "4.0.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -453,13 +454,17 @@ (define-public electron-cash
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xswmr68cm1c77lzisi3z812jzqczm9dfrshfhdq42zz5kaz4gnn"))
|
||||
"1rcywlma6hk52ymisx536jvkdwa73rhn1jxhsbs4wbvajl90w9s8"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete the bundled dependencies.
|
||||
(delete-file-recursively "packages")
|
||||
#t))))
|
||||
(inputs
|
||||
`(,@(package-inputs electrum)
|
||||
("python-dateutil", python-dateutil)
|
||||
("python-dnspython", python-dnspython)))
|
||||
(home-page "https://electroncash.org/")
|
||||
(synopsis "Bitcoin Cash wallet")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -155,14 +155,14 @@ (define-public xdg-utils
|
|||
(define-public libinput
|
||||
(package
|
||||
(name "libinput")
|
||||
(version "1.13.4")
|
||||
(version "1.14.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://freedesktop.org/software/libinput/"
|
||||
"libinput-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"))))
|
||||
"0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Ddocumentation=false")
|
||||
|
|
@ -590,7 +590,7 @@ (define-public wayland
|
|||
(define-public wayland-protocols
|
||||
(package
|
||||
(name "wayland-protocols")
|
||||
(version "1.17")
|
||||
(version "1.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -598,7 +598,7 @@ (define-public wayland-protocols
|
|||
"wayland-protocols-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"))))
|
||||
"1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("wayland" ,wayland)))
|
||||
|
|
|
|||
|
|
@ -34,17 +34,17 @@ (define-module (gnu packages gdb)
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public gdb-8.2
|
||||
(define-public gdb-8.3
|
||||
(package
|
||||
(name "gdb")
|
||||
(version "8.2.1")
|
||||
(version "8.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))
|
||||
"1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
|
||||
|
|
@ -106,19 +106,19 @@ (define-public gdb-8.2
|
|||
written in C, C++, Ada, Objective-C, Pascal and more.")
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public gdb-8.3
|
||||
(package
|
||||
(inherit gdb-8.2)
|
||||
(version "8.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"))))))
|
||||
(define-public gdb-8.2
|
||||
(package/inherit
|
||||
gdb-8.3
|
||||
(version "8.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))))
|
||||
|
||||
(define-public gdb
|
||||
;; This is the fixed version that packages depend on. Update it rarely
|
||||
;; enough to avoid massive rebuilds.
|
||||
gdb-8.2)
|
||||
gdb-8.3)
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ (define libva-without-mesa
|
|||
(define-public mesa
|
||||
(package
|
||||
(name "mesa")
|
||||
(version "19.1.4")
|
||||
(version "19.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -241,9 +241,10 @@ (define-public mesa
|
|||
version "/mesa-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1yvb7ja09i36zjifpyrf8jmbm9z0wqs2w3x8dlmxkkzdv6knilm6"))
|
||||
"1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac"))
|
||||
(patches
|
||||
(search-patches "mesa-skip-disk-cache-test.patch"))))
|
||||
(search-patches "mesa-skip-disk-cache-test.patch"
|
||||
"mesa-timespec-test-32bit.patch"))))
|
||||
(build-system meson-build-system)
|
||||
(propagated-inputs
|
||||
`(;; The following are in the Requires.private field of gl.pc.
|
||||
|
|
@ -277,13 +278,11 @@ (define-public mesa
|
|||
("gettext" ,gettext-minimal)
|
||||
,@(match (%current-system)
|
||||
((or "x86_64-linux" "i686-linux")
|
||||
`(("glslang" ,glslang)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("vulkan-loader" ,vulkan-loader)))
|
||||
`(("glslang" ,glslang)))
|
||||
(_
|
||||
`()))
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("python" ,python-wrapper)
|
||||
("python-mako" ,python-mako)
|
||||
("which" ,(@ (gnu packages base) which))))
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 ng0 <ng0@n0.is>
|
||||
|
|
@ -875,7 +875,7 @@ (define-public icecat
|
|||
;; "--with-system-png"
|
||||
)
|
||||
|
||||
#:imported-modules ,%cargo-utils-modules ;for `generate-checksums'
|
||||
#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
|
||||
|
||||
#:modules ((ice-9 ftw)
|
||||
(ice-9 rdelim)
|
||||
|
|
@ -977,15 +977,7 @@ (define-public icecat
|
|||
(substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
|
||||
(("(\"checksum .* = )\".*\"" all name)
|
||||
(string-append name "\"" null-hash "\"")))
|
||||
(for-each
|
||||
(lambda (filename)
|
||||
(delete-file filename)
|
||||
(let ((dir (dirname filename)))
|
||||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir)))
|
||||
(find-files "third_party/rust" ".cargo-checksum.json")))
|
||||
(generate-all-checksums "third_party/rust"))
|
||||
#t))
|
||||
(add-before 'configure 'augment-CPLUS_INCLUDE_PATH
|
||||
(lambda* (#:key build inputs #:allow-other-keys)
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ (define-module (gnu packages gstreamer)
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages audio)
|
||||
|
|
@ -68,19 +69,20 @@ (define-module (gnu packages gstreamer)
|
|||
(define-public orc
|
||||
(package
|
||||
(name "orc")
|
||||
(version "0.4.29")
|
||||
(version "0.4.30")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/data/src/"
|
||||
"orc/orc-" version ".tar.xz"))
|
||||
(patches (search-patches "orc-typedef-enum.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag"))))
|
||||
(build-system gnu-build-system)
|
||||
"0wj93im7i8a6546q2r8sp39yjfbxflkc0ygb0b8iqsd58qhvjhds"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-faulty-test
|
||||
(add-after 'unpack 'disable-faulty-test
|
||||
(lambda _
|
||||
;; XXX Disable the 'test-limits' and 'exec_opcodes_sys'
|
||||
;; tests, which fail on some machines. See:
|
||||
|
|
@ -90,6 +92,8 @@ (define-public orc
|
|||
(("if \\(error\\) return 1;")
|
||||
"if (error) return 77;"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("gtk-doc" ,gtk-doc)))
|
||||
(home-page "https://gstreamer.freedesktop.org/modules/orc.html")
|
||||
(synopsis "Oil runtime compiler")
|
||||
(description
|
||||
|
|
@ -103,17 +107,16 @@ (define-public orc
|
|||
(define-public gstreamer
|
||||
(package
|
||||
(name "gstreamer")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
|
||||
version ".tar.xz"))
|
||||
(patches (search-patches "gstreamer-buffer-reset-offset.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"))))
|
||||
"0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
|
@ -152,7 +155,7 @@ (define-public gstreamer
|
|||
(define-public gst-plugins-base
|
||||
(package
|
||||
(name "gst-plugins-base")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -160,7 +163,7 @@ (define-public gst-plugins-base
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"))))
|
||||
"0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(propagated-inputs
|
||||
|
|
@ -211,7 +214,7 @@ (define-public gst-plugins-base
|
|||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -220,7 +223,7 @@ (define-public gst-plugins-good
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"))))
|
||||
"07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("aalib" ,aalib)
|
||||
|
|
@ -274,14 +277,14 @@ (define-public gst-plugins-good
|
|||
(define-public gst-plugins-bad
|
||||
(package
|
||||
(name "gst-plugins-bad")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"))))
|
||||
"1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n"))))
|
||||
(outputs '("out" "doc"))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
@ -354,7 +357,7 @@ (define-public gst-plugins-bad
|
|||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
(name "gst-plugins-ugly")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -362,7 +365,7 @@ (define-public gst-plugins-ugly
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"))))
|
||||
"07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gst-plugins-base" ,gst-plugins-base)
|
||||
|
|
@ -389,7 +392,7 @@ (define-public gst-plugins-ugly
|
|||
(define-public gst-libav
|
||||
(package
|
||||
(name "gst-libav")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -397,7 +400,7 @@ (define-public gst-libav
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"))
|
||||
"1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -425,7 +428,7 @@ (define-public gst-libav
|
|||
(define-public python-gst
|
||||
(package
|
||||
(name "python-gst")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -433,7 +436,7 @@ (define-public python-gst
|
|||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m"))))
|
||||
"12bl6kc0ny2vyf6klas2bwqcv0pi55q9ns5zw261px16a6awhsdl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ (define-public gtksourceview-3
|
|||
(define-public gdk-pixbuf
|
||||
(package
|
||||
(name "gdk-pixbuf")
|
||||
(version "2.38.1")
|
||||
(version "2.40.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
|
@ -469,7 +469,7 @@ (define-public gdk-pixbuf
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi"))))
|
||||
"1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dinstalled_tests=false")
|
||||
|
|
@ -495,16 +495,7 @@ (define-public gdk-pixbuf
|
|||
'((replace 'check
|
||||
(lambda _
|
||||
(invoke "meson" "test" "--timeout-multiplier" "5"))))
|
||||
'())
|
||||
(add-before 'configure 'aid-install-script
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders`
|
||||
;; for updating loader.cache, but it's not on PATH. Make it use
|
||||
;; the one we're installing. XXX: Won't work when cross-compiling.
|
||||
(substitute* "build-aux/post-install.sh"
|
||||
(("gdk-pixbuf-query-loaders" match)
|
||||
(string-append (assoc-ref outputs "out") "/bin/" match)))
|
||||
#t)))))
|
||||
'()))))
|
||||
(propagated-inputs
|
||||
`(;; Required by gdk-pixbuf-2.0.pc
|
||||
("glib" ,glib)
|
||||
|
|
@ -731,7 +722,7 @@ (define-public gtk+-2
|
|||
(define-public gtk+
|
||||
(package (inherit gtk+-2)
|
||||
(name "gtk+")
|
||||
(version "3.24.10")
|
||||
(version "3.24.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
|
@ -739,7 +730,7 @@ (define-public gtk+
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m"))
|
||||
"10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k"))
|
||||
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
|
||||
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
|
||||
(outputs '("out" "bin" "doc"))
|
||||
|
|
@ -753,6 +744,7 @@ (define-public gtk+
|
|||
("libxinerama" ,libxinerama)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("libxdamage" ,libxdamage)
|
||||
("libxrandr" ,libxrandr)
|
||||
("mesa" ,mesa)
|
||||
("pango" ,pango)
|
||||
("wayland" ,wayland)
|
||||
|
|
|
|||
|
|
@ -1130,11 +1130,7 @@ (define-public libwebp
|
|||
(arguments
|
||||
'(#:configure-flags '("--enable-libwebpmux"
|
||||
"--enable-libwebpdemux"
|
||||
"--enable-libwebpdecoder")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'bootstrap
|
||||
(lambda _
|
||||
(invoke "autoreconf" "-vif"))))))
|
||||
"--enable-libwebpdecoder")))
|
||||
(home-page "https://developers.google.com/speed/webp/")
|
||||
(synopsis "Lossless and lossy image compression")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -48,14 +48,14 @@ (define-public imagemagick
|
|||
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||
;; users are ready for the 7-series API.
|
||||
(version "6.9.10-58")
|
||||
(version "6.9.10-68")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hrd408lqgwg70aaif8g60lipwsplsg61722kpmx7a08pygs46hf"))))
|
||||
"1jxjxhnvznpbdigry2cgxx94cx6k6y3rs40a464n5yln29s1qlz1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -192,7 +193,12 @@ (define jamvm-1-bootstrap
|
|||
(patches (search-patches "jamvm-arm.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36"))))
|
||||
"06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36"))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove precompiled software.
|
||||
(delete-file "lib/classes.zip")
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -205,6 +211,7 @@ (define jamvm-1-bootstrap
|
|||
`(("classpath" ,classpath-bootstrap)
|
||||
("jikes" ,jikes)
|
||||
("libffi" ,libffi)
|
||||
("zip" ,zip)
|
||||
("zlib" ,zlib)))
|
||||
;; When built with a recent GCC and glibc the configure step of icedtea-6
|
||||
;; fails with an invalid instruction error.
|
||||
|
|
@ -659,7 +666,12 @@ (define jamvm
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn"))))
|
||||
"1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn"))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove precompiled software.
|
||||
(delete-file "src/classlib/gnuclasspath/lib/classes.zip")
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -668,6 +680,7 @@ (define jamvm
|
|||
(inputs
|
||||
`(("classpath" ,classpath-devel)
|
||||
("ecj-javac-wrapper" ,ecj-javac-wrapper)
|
||||
("zip" ,zip)
|
||||
("zlib" ,zlib)))))
|
||||
|
||||
(define ecj-javac-wrapper-final
|
||||
|
|
@ -2594,6 +2607,45 @@ (define-public java-ecj-3.5
|
|||
(native-inputs
|
||||
`(("unzip" ,unzip)))))
|
||||
|
||||
(define-public java-ecj
|
||||
(package (inherit java-ecj-3)
|
||||
(version "4.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://archive.eclipse.org/eclipse/downloads/drops4/R-"
|
||||
version
|
||||
"-201703010400/ecjsrc-"
|
||||
version
|
||||
".jar"))
|
||||
(sha256
|
||||
(base32
|
||||
"11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl"))))
|
||||
(arguments
|
||||
`(#:tests? #f ; none included
|
||||
#:build-target "build"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-build.xml
|
||||
(lambda _
|
||||
(substitute* "src/build.xml"
|
||||
(("^.*MANIFEST.*$")
|
||||
""))
|
||||
#t))
|
||||
(add-after 'unpack 'fix-prop
|
||||
(lambda _
|
||||
(substitute* "src/build.xml"
|
||||
(("^.*properties.*$")
|
||||
"<include name=\"**/*.properties\"/>
|
||||
<include name=\"**/*.props\"/>"))
|
||||
#t))
|
||||
(add-before 'build 'chdir
|
||||
(lambda _
|
||||
(chdir "src")
|
||||
#t))
|
||||
(replace 'install (install-jars ".")))))))
|
||||
|
||||
(define-public java-cisd-base
|
||||
(let ((revision 38938)
|
||||
(base-version "14.12.0"))
|
||||
|
|
@ -3068,20 +3120,39 @@ (define-public java-javaee-servletapi
|
|||
(package
|
||||
(name "java-javaee-servletapi")
|
||||
(version "3.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/javaee/servlet-spec/"
|
||||
"archive/" version ".zip"))
|
||||
(file-name (string-append name "-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m6p13vgfb1ihich1jp5j6fqlhkjsrkn32c86bsbkryp38ipwg8w"))))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/javaee/servlet-spec.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0s03lj8w5an70lkqbjycgfrfk0kc07vbfav91jzk87gh3awf9ksl"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "javax-servletapi.jar"
|
||||
;; no tests
|
||||
#:tests? #f
|
||||
#:source-dir "src/main/java"))
|
||||
#:source-dir "src/main/java"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'copy-resources
|
||||
(lambda _
|
||||
(mkdir-p "build/classes/javax/servlet/http")
|
||||
(let ((from-prefix "src/main/java/javax/servlet/")
|
||||
(to-prefix "build/classes/javax/servlet/"))
|
||||
(for-each (lambda (f)
|
||||
(copy-file (string-append from-prefix f)
|
||||
(string-append to-prefix f)))
|
||||
(list "LocalStrings_ja.properties"
|
||||
"LocalStrings.properties"
|
||||
"LocalStrings_fr.properties"
|
||||
"http/LocalStrings_es.properties"
|
||||
"http/LocalStrings_ja.properties"
|
||||
"http/LocalStrings.properties"
|
||||
"http/LocalStrings_fr.properties")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
(home-page "https://javaee.github.io/servlet-spec/")
|
||||
|
|
@ -6569,14 +6640,14 @@ (define-public java-commons-codec
|
|||
(define-public java-commons-daemon
|
||||
(package
|
||||
(name "java-commons-daemon")
|
||||
(version "1.0.15")
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/commons/daemon/source/"
|
||||
"commons-daemon-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi"))))
|
||||
"141gkhfzv5v3pdhic6y4ardq2dhsa3v36j8wmmhy6f8mac48fp7n"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -37,14 +37,14 @@ (define-module (gnu packages kde-plasma)
|
|||
(define-public kdecoration
|
||||
(package
|
||||
(name "kdecoration")
|
||||
(version "5.15.1")
|
||||
(version "5.17.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/kdecoration-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03lxnjbhlnyiw2znflp0f2w77a5pzv5yvsbngvwgp89ig9mansi1"))))
|
||||
"0rljpywpaqmar13jijphkpc9k1crma476j9my0d00hfrjil5xlnn"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
|
|
@ -66,14 +66,14 @@ (define-public kdecoration
|
|||
(define-public kscreenlocker
|
||||
(package
|
||||
(name "kscreenlocker")
|
||||
(version "5.15.1")
|
||||
(version "5.17.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/kscreenlocker-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jp2z1wjsd99is31igkfnscs55h755cmp86ppkj596fcxv1krymq"))))
|
||||
"1jzkq5m0hvcpsl7clai33ndiil8gls7ndir3mfcc5l8gv7df2ir0"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -129,14 +129,14 @@ (define-public kscreenlocker
|
|||
(define-public libkscreen
|
||||
(package
|
||||
(name "libkscreen")
|
||||
(version "5.15.1")
|
||||
(version "5.17.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1zpzqafrb576al10f5873nl1z135gscjza6gd3ickfzlvd9qmr18"))))
|
||||
(base32 "0znxfqqyyij6i4dp95gf5g4vrhg4jsshgh2k13ldy294kby2mxw0"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
|
|
@ -168,7 +168,7 @@ (define-public libkscreen
|
|||
(define-public libksysguard
|
||||
(package
|
||||
(name "libksysguard")
|
||||
(version "5.15.1")
|
||||
(version "5.17.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -176,7 +176,7 @@ (define-public libksysguard
|
|||
"/libksysguard-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ml106yq4q9qagkrcaafgcky18wk76px5a1r6j36wfjqdd6wpzvs"))))
|
||||
"1b79qxg6j9lqgyq8i677f00f7cbplqak1r9riyc9wj5s2r60ydw7"))))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -30,6 +32,7 @@ (define-module (gnu packages kde)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages apr)
|
||||
#:use-module (gnu packages boost)
|
||||
|
|
@ -44,6 +47,7 @@ (define-module (gnu packages kde)
|
|||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages kde-frameworks)
|
||||
#:use-module (gnu packages kde-plasma)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages pdf)
|
||||
|
|
@ -322,16 +326,15 @@ (define-public kdevplatform
|
|||
(define-public krita
|
||||
(package
|
||||
(name "krita")
|
||||
(version "4.2.5")
|
||||
(version "4.2.7.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://kde/stable/krita/"
|
||||
(version-prefix version 3)
|
||||
"mirror://kde/stable/krita/" version
|
||||
"/krita-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w"))))
|
||||
"0gcwq1w09gmx53i2fir73l222p41299wagvhbvsxwrz0v3crzliy"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
@ -409,52 +412,17 @@ (define-public krita
|
|||
features include brush stabilizers, brush engines and wrap-around mode.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public kholidays
|
||||
(package
|
||||
(name "kholidays")
|
||||
(version "17.12.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://kde/stable/applications/" version "/src/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda _
|
||||
;; blacklist a failing test function TODO: make it pass
|
||||
(with-output-to-file "autotests/BLACKLIST"
|
||||
(lambda _
|
||||
(display "[testDefaultRegions]\n*\n")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
(home-page "https://cgit.kde.org/kholidays.git")
|
||||
(synopsis "Library for regional holiday information")
|
||||
(description "This library provides a C++ API that determines holiday and
|
||||
other special events for a geographical region.")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public libkomparediff2
|
||||
(package
|
||||
(name "libkomparediff2")
|
||||
(version "19.04.1")
|
||||
(version "19.08.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/applications/" version
|
||||
"/src/libkomparediff2-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1cyi7a5ss7jv87llk0k8c9g3h1qsp6j6nmdzh3xxcswr4p5skc9a"))))
|
||||
(base32 "1mvihd0xpkl8kryf5dvsfgpbgs9af8c9bzq8mmr74gfsvfb8ywy5"))))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
|
@ -502,6 +470,38 @@ (define-public qca
|
|||
cards.")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public kpmcore
|
||||
(package
|
||||
(name "kpmcore")
|
||||
(version "4.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://kde/stable/kpmcore"
|
||||
"/" version "/src/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sslkwcj2cyrn7bpjdjdwikp1q8wrsxpsg2sxxd8hsairgy7ygh3"))
|
||||
(patches (search-patches "kpmcore-fix-tests.patch"
|
||||
"kpmcore-remove-broken-test.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("kauth" ,kauth)
|
||||
("kcoreaddons" ,kcoreaddons)
|
||||
("ki18n" ,ki18n)
|
||||
("kwidgetsaddons" ,kwidgetsaddons)
|
||||
("qtbase" ,qtbase)
|
||||
("qca" ,qca)
|
||||
("util-linux" ,util-linux)))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Library for managing partitions")
|
||||
(description "Library for managing partitions.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public snorenotify
|
||||
(package
|
||||
(name "snorenotify")
|
||||
|
|
@ -593,7 +593,7 @@ (define-public kdeconnect
|
|||
(define-public kqtquickcharts
|
||||
(package
|
||||
(name "kqtquickcharts")
|
||||
(version "19.08.1")
|
||||
(version "19.08.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -601,7 +601,7 @@ (define-public kqtquickcharts
|
|||
version "/src/kqtquickcharts-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j3rivvh4sa94lsd0hi4xfvcikl05zrqd7634wxyaxs718ais6dg"))))
|
||||
"1yy9fyd8y4g25ljdsbil19qdf4j3mzmzl489sx7rqpm3lfdzjh9k"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
|
|
|
|||
|
|
@ -435,7 +435,8 @@ (define-public kodi
|
|||
("libxrender" ,libxrender)
|
||||
("libxslt" ,libxslt)
|
||||
("lzo" ,lzo)
|
||||
("mariadb" ,mariadb)
|
||||
("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("openssl" ,openssl)
|
||||
("pcre" ,pcre)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
|
|
|
|||
|
|
@ -1007,7 +1007,7 @@ (define-public libreoffice
|
|||
("libxt" ,libxt)
|
||||
("libzmf" ,libzmf)
|
||||
("lpsolve" ,lpsolve)
|
||||
("mariadb" ,mariadb)
|
||||
("mariadb" ,mariadb "dev")
|
||||
("mdds" ,mdds)
|
||||
("mythes" ,mythes)
|
||||
("neon" ,neon)
|
||||
|
|
|
|||
|
|
@ -3746,7 +3746,7 @@ (define-public sbc
|
|||
(define-public bluez
|
||||
(package
|
||||
(name "bluez")
|
||||
(version "5.50")
|
||||
(version "5.51")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -3754,7 +3754,7 @@ (define-public bluez
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"))))
|
||||
"1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
|
|
@ -3074,12 +3074,8 @@ (define-public muparser
|
|||
|
||||
(define-public openblas
|
||||
(package
|
||||
;; TODO: Incorporate 'openblas/fixed-num-threads' changes on the next
|
||||
;; rebuild cycle.
|
||||
(replacement openblas/fixed-num-threads)
|
||||
|
||||
(name "openblas")
|
||||
(version "0.3.6")
|
||||
(version "0.3.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -3088,7 +3084,7 @@ (define-public openblas
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r2g9zzwq5dm8vjd19pxwggfvfzy56cvkmpmp5d014qr3svgmsap"))))
|
||||
"0jbdjsi0qsxahdcm42agnn1y7xpmg0hrhwjsxg0zbhs9wwy3p568"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
|
@ -3105,6 +3101,13 @@ (define-public openblas
|
|||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
"SHELL=bash"
|
||||
"MAKE_NB_JOBS=0" ;use jobserver for submakes
|
||||
|
||||
;; This is the maximum number of threads OpenBLAS will ever use (that
|
||||
;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS
|
||||
;; is used.) If we don't set it, the makefile sets it to the number
|
||||
;; of cores of the build machine, which is obviously wrong.
|
||||
"NUM_THREADS=128"
|
||||
|
||||
;; Build the library for all supported CPUs. This allows
|
||||
;; switching CPU targets at runtime with the environment variable
|
||||
;; OPENBLAS_CORETYPE=<type>, where "type" is a supported CPU type.
|
||||
|
|
@ -3159,24 +3162,6 @@ (define-public openblas-ilp64
|
|||
(synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define openblas/fixed-num-threads
|
||||
;; TODO: Move that to 'openblas' proper on the next rebuild cycle.
|
||||
(package
|
||||
(inherit openblas)
|
||||
(version (match (string-split (package-version openblas) #\.)
|
||||
((numbers ... (= string-length len))
|
||||
(string-join (append numbers
|
||||
(list (make-string len #\a)))
|
||||
"."))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openblas)
|
||||
((#:make-flags flags ''())
|
||||
;; This is the maximum number of threads OpenBLAS will ever use (that
|
||||
;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS
|
||||
;; is used.) If we don't set it, the makefile sets it to the number
|
||||
;; of cores of the build machine, which is obviously wrong.
|
||||
`(cons "NUM_THREADS=128" ,flags))))))
|
||||
|
||||
(define* (make-blis implementation #:optional substitutable?)
|
||||
"Return a BLIS package with the given IMPLEMENTATION (see config/ in the
|
||||
source tree for a list of implementations.)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2019 Tobias Geerinckx-Rite <me@tobias.gr>
|
||||
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -523,7 +524,7 @@ (define-public maven-wagon-tck-http
|
|||
(inputs
|
||||
`(("java-plexus-util" ,java-plexus-utils)
|
||||
("maven-wagon-provider-api" ,maven-wagon-provider-api)
|
||||
("java-tomcat" ,java-tomcat)
|
||||
("java-javaee-servletapi" ,java-javaee-servletapi)
|
||||
("java-slf4j-api" ,java-slf4j-api)
|
||||
("java-commons-codec" ,java-commons-codec)
|
||||
("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
|
||||
|
|
@ -663,7 +664,7 @@ (define-public maven-wagon-http
|
|||
("java-jdom2" ,java-jdom2)
|
||||
("java-asm" ,java-asm)
|
||||
("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
|
||||
("java-tomcat" ,java-tomcat)
|
||||
("java-javaee-servletapi" ,java-javaee-servletapi)
|
||||
("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
|
||||
("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
|
||||
("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ (define-module (gnu packages nss)
|
|||
(define-public nspr
|
||||
(package
|
||||
(name "nspr")
|
||||
(version "4.21")
|
||||
(version "4.22")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -42,7 +42,7 @@ (define-public nspr
|
|||
version "/src/nspr-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm"))))
|
||||
"0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("perl" ,perl)))
|
||||
|
|
@ -70,7 +70,7 @@ (define-public nspr
|
|||
(define-public nss
|
||||
(package
|
||||
(name "nss")
|
||||
(version "3.45")
|
||||
(version "3.46.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
|
@ -81,7 +81,7 @@ (define-public nss
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"12sfq9xvpwpc22qnjsg1if1lmchiy33byrh92wn91phz7li0abqi"))
|
||||
"0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv"))
|
||||
;; Create nss.pc and nss-config.
|
||||
(patches (search-patches "nss-pkgconfig.patch"
|
||||
"nss-freebl-stubs.patch"
|
||||
|
|
@ -130,7 +130,7 @@ (define-public nss
|
|||
;; leading to test failures:
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
|
||||
;; work around that, set the time to roughly the release date.
|
||||
(invoke "faketime" "2019-05-01" "./nss/tests/all.sh")))
|
||||
(invoke "faketime" "2019-10-01" "./nss/tests/all.sh")))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
Fix a buffer offset problem in GStreamer 1.16. Initially reported by Mark H.
|
||||
Weaver in <https://lists.gnu.org/archive/html/guix-devel/2019-06/msg00140.html>.
|
||||
|
||||
See also <https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/316>.
|
||||
|
||||
From 1734c9fc1a4f99b165383ae1eb02f04e0844a00c Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
|
||||
Date: Sat, 29 Jun 2019 09:22:05 -0400
|
||||
Subject: [PATCH] bufferpool: Fix the buffer size reset code
|
||||
|
||||
The offset in gst_buffer_resize() is additive. So to move back the
|
||||
offset to zero, we need to pass the opposite of the current offset. This
|
||||
was raised through the related unit test failingon 32bit as on 64bit
|
||||
the alignment padding was enough to hide the issue. The test was
|
||||
modified to also fail on 64bit. This patch will remove spurious
|
||||
assertions like:
|
||||
|
||||
assertion 'bufmax >= bufoffs + offset + size' failed
|
||||
|
||||
Fixes #316
|
||||
---
|
||||
gst/gstbufferpool.c | 7 +++++--
|
||||
tests/check/gst/gstbufferpool.c | 2 +-
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gst/gstbufferpool.c b/gst/gstbufferpool.c
|
||||
index e5c7a5872..619860e63 100644
|
||||
--- a/gst/gstbufferpool.c
|
||||
+++ b/gst/gstbufferpool.c
|
||||
@@ -1222,8 +1222,11 @@ default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer)
|
||||
GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET_NONE;
|
||||
|
||||
/* if the memory is intact reset the size to the full size */
|
||||
- if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY))
|
||||
- gst_buffer_resize (buffer, 0, pool->priv->size);
|
||||
+ if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY)) {
|
||||
+ gsize offset;
|
||||
+ gst_buffer_get_sizes (buffer, &offset, NULL);
|
||||
+ gst_buffer_resize (buffer, -offset, pool->priv->size);
|
||||
+ }
|
||||
|
||||
/* remove all metadata without the POOLED flag */
|
||||
gst_buffer_foreach_meta (buffer, remove_meta_unpooled, pool);
|
||||
diff --git a/tests/check/gst/gstbufferpool.c b/tests/check/gst/gstbufferpool.c
|
||||
index f0c3c8d8e..dd9b2dc03 100644
|
||||
--- a/tests/check/gst/gstbufferpool.c
|
||||
+++ b/tests/check/gst/gstbufferpool.c
|
||||
@@ -190,7 +190,7 @@ GST_START_TEST (test_buffer_modify_discard)
|
||||
gst_buffer_pool_acquire_buffer (pool, &buf, NULL);
|
||||
buffer_track_destroy (buf, &dcount);
|
||||
/* do resize, as we didn't modify the memory, pool should reuse this buffer */
|
||||
- gst_buffer_resize (buf, 5, 2);
|
||||
+ gst_buffer_resize (buf, 8, 2);
|
||||
gst_buffer_unref (buf);
|
||||
|
||||
/* buffer should've gone back into pool */
|
||||
--
|
||||
2.22.0
|
||||
|
||||
|
|
@ -8,15 +8,13 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
|
|||
===================================================================
|
||||
--- kinit-5.32.0/src/kdeinit/kinit-5.32.0/src/kdeinit/.orig
|
||||
+++ kinit-5.32.0/src/kdeinit/kinit.cpp
|
||||
@@ -96,11 +96,9 @@
|
||||
@@ -96,9 +96,9 @@
|
||||
"libKF5Parts.5.dylib",
|
||||
"libKF5Plasma.5.dylib"
|
||||
#else
|
||||
- "libKF5KIOCore.so.5",
|
||||
- "libKF5Parts.so.5",
|
||||
-//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see.
|
||||
- "libKF5Plasma.so.5"
|
||||
-//#endif
|
||||
+ "GUIX_PKGS_KF5_KIO/lib/libKF5KIOCore.so.5",
|
||||
+ "GUIX_PKGS_KF5_PARTS/lib/libKF5Parts.so.5",
|
||||
+ "GUIX_PKGS_KF5_PLASMA/lib/libKF5Plasma.so.5"
|
||||
|
|
|
|||
30
gnu/packages/patches/kpmcore-fix-tests.patch
Normal file
30
gnu/packages/patches/kpmcore-fix-tests.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
Git commit c02d59aa6d314678cef9683f96b28e2a1abd82b7 by Andrius Štikonas, on behalf of Hartmut Goebel.
|
||||
Committed on 07/11/2019 at 22:16.
|
||||
Pushed by stikonas into branch '4.0'.
|
||||
|
||||
Fix test for kpmcore: stop helper only if formerly started.
|
||||
|
||||
See https://bugs.kde.org/413851 and https://phabricator.kde.org/D25161
|
||||
|
||||
diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp
|
||||
--- a/src/util/externalcommand.cpp
|
||||
+++ b/src/util/externalcommand.cpp
|
||||
@@ -433,14 +433,17 @@
|
||||
|
||||
void ExternalCommand::stopHelper()
|
||||
{
|
||||
+ if (!helperStarted)
|
||||
+ return;
|
||||
auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
|
||||
QStringLiteral("/Helper"), QDBusConnection::systemBus());
|
||||
QByteArray request;
|
||||
const quint64 nonce = interface->getNonce();
|
||||
request.setNum(nonce);
|
||||
QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512);
|
||||
interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce);
|
||||
|
||||
+ helperStarted = false;
|
||||
delete privateKey;
|
||||
delete init;
|
||||
}
|
||||
|
||||
139
gnu/packages/patches/kpmcore-remove-broken-test.patch
Normal file
139
gnu/packages/patches/kpmcore-remove-broken-test.patch
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
|
||||
Date: Thu, 7 Nov 2019 22:12:00 +0000
|
||||
Subject: [PATCH] Remove broken smart unit test.
|
||||
|
||||
BUG: 413853
|
||||
---
|
||||
test/CMakeLists.txt | 9 ----
|
||||
test/testsmart.cpp | 102 --------------------------------------------
|
||||
2 files changed, 111 deletions(-)
|
||||
delete mode 100644 test/testsmart.cpp
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 67f63a2..6a300d3 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -53,12 +53,3 @@ find_package (Threads)
|
||||
# Execute external commands as root
|
||||
kpm_test(testexternalcommand testexternalcommand.cpp)
|
||||
add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND})
|
||||
-
|
||||
-# Including SMART files reference
|
||||
-set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp
|
||||
- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp
|
||||
- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp)
|
||||
-
|
||||
-# Test SMART support
|
||||
-kpm_test(testsmart testsmart.cpp ${SMARTPARSER})
|
||||
-add_test(NAME testsmart COMMAND testsmart ${BACKEND})
|
||||
diff --git a/test/testsmart.cpp b/test/testsmart.cpp
|
||||
deleted file mode 100644
|
||||
index 2236af7..0000000
|
||||
--- a/test/testsmart.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,102 +0,0 @@
|
||||
-#include "helpers.h"
|
||||
-
|
||||
-#include "util/externalcommand.h"
|
||||
-#include "backend/corebackend.h"
|
||||
-#include "backend/corebackendmanager.h"
|
||||
-#include "core/smartstatus.h"
|
||||
-#include "core/smartparser.h"
|
||||
-
|
||||
-#include <QCoreApplication>
|
||||
-#include <QDebug>
|
||||
-
|
||||
-static QString getDefaultDevicePath();
|
||||
-static bool testSmartStatus();
|
||||
-static bool testSmartParser();
|
||||
-
|
||||
-int main(int argc, char **argv)
|
||||
-{
|
||||
- QCoreApplication app(argc, argv);
|
||||
-
|
||||
- KPMCoreInitializer i;
|
||||
-
|
||||
- if (argc == 2)
|
||||
- i = KPMCoreInitializer(argv[1]);
|
||||
-
|
||||
- if (!i.isValid())
|
||||
- return 1;
|
||||
-
|
||||
- CoreBackend *backend = CoreBackendManager::self()->backend();
|
||||
-
|
||||
- if (!backend)
|
||||
- {
|
||||
- qWarning() << "Couldn't get backend.";
|
||||
- return 1;
|
||||
- }
|
||||
-
|
||||
- if (!testSmartStatus() || !testSmartParser())
|
||||
- return 1;
|
||||
-
|
||||
- return app.exec();
|
||||
-}
|
||||
-
|
||||
-static QString getDefaultDevicePath()
|
||||
-{
|
||||
- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command
|
||||
- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"),
|
||||
- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") });
|
||||
-
|
||||
- if (command.run() && command.exitCode() == 0) {
|
||||
- QString output = command.output();
|
||||
- return output;
|
||||
- }
|
||||
-
|
||||
- return QString();
|
||||
-}
|
||||
-
|
||||
-static bool testSmartStatus()
|
||||
-{
|
||||
- QString devicePath = getDefaultDevicePath();
|
||||
-
|
||||
- SmartStatus smart(devicePath);
|
||||
-
|
||||
- if (smart.devicePath() != devicePath)
|
||||
- return false;
|
||||
-
|
||||
- if (!smart.status())
|
||||
- return false;
|
||||
-
|
||||
- if (smart.modelName() == QString())
|
||||
- return false;
|
||||
-
|
||||
- if (smart.firmware() == QString())
|
||||
- return false;
|
||||
-
|
||||
- if (smart.serial() == QString())
|
||||
- return false;
|
||||
-
|
||||
- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success)
|
||||
- return false;
|
||||
-
|
||||
- if (!smart.isValid())
|
||||
- return false;
|
||||
-
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
-static bool testSmartParser()
|
||||
-{
|
||||
- QString devicePath = getDefaultDevicePath();
|
||||
-
|
||||
- SmartParser parser(devicePath);
|
||||
-
|
||||
- if (!parser.init())
|
||||
- return false;
|
||||
-
|
||||
- if (parser.devicePath() != devicePath)
|
||||
- return false;
|
||||
-
|
||||
- if (!parser.diskInformation())
|
||||
- return false;
|
||||
-
|
||||
- return true;
|
||||
-}
|
||||
--
|
||||
2.17.1
|
||||
17
gnu/packages/patches/mesa-timespec-test-32bit.patch
Normal file
17
gnu/packages/patches/mesa-timespec-test-32bit.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Fix a test failure on 32-bit systems.
|
||||
|
||||
Taken from upstream:
|
||||
https://gitlab.freedesktop.org/mesa/mesa/commit/dd1dba80b9ee74ec8b90761285a8262e374bf8ef
|
||||
|
||||
diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec/timespec_test.cpp
|
||||
--- a/src/util/tests/timespec/timespec_test.cpp
|
||||
+++ b/src/util/tests/timespec/timespec_test.cpp
|
||||
@@ -206,7 +206,7 @@ TEST(timespec_test, timespec_from_nsec)
|
||||
|
||||
timespec_from_nsec(&a, UINT64_MAX);
|
||||
EXPECT_EQ(a.tv_nsec, UINT64_MAX % NSEC_PER_SEC);
|
||||
- EXPECT_EQ(a.tv_sec, UINT64_MAX / NSEC_PER_SEC);
|
||||
+ EXPECT_EQ(a.tv_sec, (time_t)(UINT64_MAX / NSEC_PER_SEC));
|
||||
}
|
||||
|
||||
TEST(timespec_test, timespec_from_usec)
|
||||
17
gnu/packages/patches/orc-typedef-enum.patch
Normal file
17
gnu/packages/patches/orc-typedef-enum.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Orc 0.4.30 has a bug that causes duplicate symbols due to a missing typedef.
|
||||
|
||||
Taken from upstream:
|
||||
https://gitlab.freedesktop.org/gstreamer/orc/merge_requests/32
|
||||
|
||||
diff --git a/orc/orctarget.h b/orc/orctarget.h
|
||||
--- a/orc/orctarget.h
|
||||
+++ b/orc/orctarget.h
|
||||
@@ -19,7 +19,7 @@ enum {
|
||||
ORC_TARGET_FAST_DENORMAL = (1<<31)
|
||||
};
|
||||
|
||||
-enum {
|
||||
+typedef enum {
|
||||
ORC_TARGET_POWERPC_64BIT = (1<<0),
|
||||
ORC_TARGET_POWERPC_LE = (1<<1),
|
||||
ORC_TARGET_POWERPC_ALTIVEC = (1<<2),
|
||||
19
gnu/packages/patches/pyqt-unbundled-qt.patch
Normal file
19
gnu/packages/patches/pyqt-unbundled-qt.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
Remove test for bundled Qt which breaks dependent applications. This has
|
||||
been fixed in 5.13.
|
||||
|
||||
Taken from Arch Linux:
|
||||
https://git.archlinux.org/svntogit/packages.git/tree/trunk/python2-pyqt5-crash-fix.patch?h=packages/pyqt5&id=3e56e11d1fd7b1eac8242ce64c58db2bd9acba20
|
||||
|
||||
diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in
|
||||
--- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200
|
||||
+++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200
|
||||
@@ -151,8 +151,4 @@
|
||||
// initialised first (at least for Windows) and this is the only way to
|
||||
// guarantee things are done in the right order.
|
||||
PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive);
|
||||
-
|
||||
- // Load the embedded qt.conf file if there is a bundled copy of Qt.
|
||||
- if (!qpycore_qt_conf())
|
||||
- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf");
|
||||
}
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
https://672856.bugs.gentoo.org/attachment.cgi?id=557978
|
||||
https://bugs.gentoo.org/672856
|
||||
|
||||
The patch fixes building qtbase with linux kernels < 4.11.
|
||||
See bug #34431.
|
||||
|
||||
diff -Naurp a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h
|
||||
--- a/src/corelib/global/minimum-linux_p.h 2018-11-25 15:51:11.000000000 +0300
|
||||
+++ b/src/corelib/global/minimum-linux_p.h 2018-12-17 13:25:38.176823753 +0300
|
||||
@@ -75,14 +75,9 @@ QT_BEGIN_NAMESPACE
|
||||
* - accept4 2.6.28
|
||||
* - renameat2 3.16 QT_CONFIG(renameat2)
|
||||
* - getrandom 3.17 QT_CONFIG(getentropy)
|
||||
- * - statx 4.11 QT_CONFIG(statx)
|
||||
*/
|
||||
|
||||
-#if QT_CONFIG(statx)
|
||||
-# define MINLINUX_MAJOR 4
|
||||
-# define MINLINUX_MINOR 11
|
||||
-# define MINLINUX_PATCH 0
|
||||
-#elif QT_CONFIG(getentropy)
|
||||
+#if QT_CONFIG(getentropy)
|
||||
# define MINLINUX_MAJOR 3
|
||||
# define MINLINUX_MINOR 17
|
||||
# define MINLINUX_PATCH 0
|
||||
21
gnu/packages/patches/sdl2-mesa-compat.patch
Normal file
21
gnu/packages/patches/sdl2-mesa-compat.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
Do not include GLES header when OpenGL headers are already included.
|
||||
|
||||
Taken from upstream:
|
||||
https://hg.libsdl.org/SDL/rev/369b01006eb2
|
||||
|
||||
diff -r 4cbaffd0083b -r 369b01006eb2 src/video/SDL_video.c
|
||||
--- a/src/video/SDL_video.c Fri Oct 11 06:18:24 2019 +0200
|
||||
+++ b/src/video/SDL_video.c Sat Oct 12 18:47:56 2019 +0200
|
||||
@@ -37,9 +37,9 @@
|
||||
#include "SDL_opengl.h"
|
||||
#endif /* SDL_VIDEO_OPENGL */
|
||||
|
||||
-#if SDL_VIDEO_OPENGL_ES
|
||||
+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
|
||||
#include "SDL_opengles.h"
|
||||
-#endif /* SDL_VIDEO_OPENGL_ES */
|
||||
+#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */
|
||||
|
||||
/* GL and GLES2 headers conflict on Linux 32 bits */
|
||||
#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
|
||||
|
||||
|
|
@ -670,14 +670,14 @@ (define-public mupdf
|
|||
(define-public qpdf
|
||||
(package
|
||||
(name "qpdf")
|
||||
(version "8.4.1")
|
||||
(version "9.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
|
||||
"/qpdf-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"))
|
||||
"0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Replace shebang with the bi-lingual shell/Perl trick to remove
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ (define-module (gnu packages pulseaudio)
|
|||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages xiph))
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public libsndfile
|
||||
(package
|
||||
|
|
@ -130,7 +131,7 @@ (define-public libsamplerate
|
|||
(define-public pulseaudio
|
||||
(package
|
||||
(name "pulseaudio")
|
||||
(version "12.2")
|
||||
(version "13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -138,7 +139,7 @@ (define-public pulseaudio
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"))
|
||||
"0mw0ybrqj7hvf8lqs5gjzip464hfnixw453lr0mqzlng3b5266wn"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Disable console-kit support by default since it's deprecated
|
||||
|
|
@ -160,11 +161,6 @@ (define-public pulseaudio
|
|||
(assoc-ref %outputs "out")
|
||||
"/lib/udev/rules.d"))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-alsa-include
|
||||
(lambda _
|
||||
(substitute* '("configure" "src/modules/alsa/alsa-ucm.h")
|
||||
(("use-case\\.h") "alsa/use-case.h"))
|
||||
#t))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; 'tests/lock-autospawn-test.c' wants to create a file
|
||||
|
|
@ -187,6 +183,13 @@ (define-public pulseaudio
|
|||
("libltdl" ,libltdl)
|
||||
("fftwf" ,fftwf)
|
||||
("avahi" ,avahi)
|
||||
|
||||
;; For the optional X11 modules.
|
||||
("libice" ,libice)
|
||||
("libsm" ,libsm)
|
||||
("libxcb" ,libxcb)
|
||||
("libxtst" ,libxtst)
|
||||
|
||||
("eudev" ,eudev))) ;for the detection of hardware audio devices
|
||||
(native-inputs
|
||||
`(("check" ,check)
|
||||
|
|
|
|||
|
|
@ -13044,14 +13044,14 @@ (define-public python2-translate-toolkit
|
|||
(define-public python-packaging
|
||||
(package
|
||||
(name "python-packaging")
|
||||
(version "19.0")
|
||||
(version "19.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "packaging" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c"))))
|
||||
"0izwlz9h0bw171a1chr311g2y7n657zjaf4mq4rgm8pp9lbj9f98"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
|||
|
|
@ -101,7 +101,8 @@ (define-public grantlee
|
|||
("qtscript" ,qtscript)))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:configure-flags '("-DCMAKE_CXX_STANDARD=11")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-broken-tests
|
||||
(lambda _
|
||||
|
|
@ -184,7 +185,8 @@ (define-public qt-4
|
|||
("libxslt" ,libxslt)
|
||||
("libxtst" ,libxtst)
|
||||
("mtdev" ,mtdev)
|
||||
("mariadb" ,mariadb)
|
||||
("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("nss" ,nss)
|
||||
("postgresql" ,postgresql)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
|
|
@ -323,7 +325,7 @@ (define-public qt-4
|
|||
(define-public qtbase
|
||||
(package
|
||||
(name "qtbase")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -332,10 +334,9 @@ (define-public qtbase
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6"))
|
||||
"09wz7zs1x5mpgs2y4xnl2zv3naqls4sz6v2arwl1fz2dsx4jddba"))
|
||||
;; Use TZDIR to avoid depending on package "tzdata".
|
||||
(patches (search-patches "qtbase-use-TZDIR.patch"
|
||||
"qtbase-old-kernel.patch"))
|
||||
(patches (search-patches "qtbase-use-TZDIR.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; corelib uses bundled harfbuzz, md4, md5, sha3
|
||||
|
|
@ -344,7 +345,7 @@ (define-public qtbase
|
|||
(for-each delete-file-recursively
|
||||
(list "double-conversion" "freetype" "harfbuzz-ng"
|
||||
"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
|
||||
"xkbcommon" "zlib"))
|
||||
"zlib"))
|
||||
#t)))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -379,7 +380,8 @@ (define-public qtbase
|
|||
("libxslt" ,libxslt)
|
||||
("libxtst" ,libxtst)
|
||||
("mtdev" ,mtdev)
|
||||
("mariadb" ,mariadb)
|
||||
("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("nss" ,nss)
|
||||
("openssl" ,openssl)
|
||||
("pcre2" ,pcre2)
|
||||
|
|
@ -399,7 +401,7 @@ (define-public qtbase
|
|||
("gperf" ,gperf)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("python" ,python)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("ruby" ,ruby)))
|
||||
(arguments
|
||||
|
|
@ -449,6 +451,7 @@ (define-public qtbase
|
|||
;; kernels that the glibc supports, including the RHEL6
|
||||
;; (2.6.32) and RHEL7 (3.10) kernels.
|
||||
"-no-feature-getentropy" ; requires Linux 3.17
|
||||
"-no-feature-renameat2" ; requires Linux 3.16
|
||||
|
||||
;; Do not build examples; if desired, these could go
|
||||
;; into a separate output, but for the time being, we
|
||||
|
|
@ -507,6 +510,16 @@ (define-public qtbase
|
|||
(("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
|
||||
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))
|
||||
#t)))
|
||||
(add-after 'patch-mkspecs 'patch-prl-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; Insert absolute references to the qtbase libraries because
|
||||
;; QT_INSTALL_LIBS does not always resolve correctly, depending
|
||||
;; on context. See <https://bugs.gnu.org/38405>
|
||||
(substitute* (find-files (string-append out "/lib") "\\.prl$")
|
||||
(("\\$\\$\\[QT_INSTALL_LIBS\\]")
|
||||
(string-append out "/lib")))
|
||||
#t)))
|
||||
(add-after 'unpack 'patch-paths
|
||||
;; Use the absolute paths for dynamically loaded libs, otherwise
|
||||
;; the lib will be searched in LD_LIBRARY_PATH which typically is
|
||||
|
|
@ -568,7 +581,7 @@ (define-deprecated qt qtbase qtbase)
|
|||
(define-public qtsvg
|
||||
(package (inherit qtbase)
|
||||
(name "qtsvg")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -577,7 +590,7 @@ (define-public qtsvg
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1"))))
|
||||
"13zg5095ffm88dsrybyi075i9zw3yrkibqzvj57an9sq89n3w926"))))
|
||||
(propagated-inputs `())
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
|
|
@ -643,7 +656,7 @@ (define-public qtsvg
|
|||
(define-public qtimageformats
|
||||
(package (inherit qtsvg)
|
||||
(name "qtimageformats")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -652,7 +665,7 @@ (define-public qtimageformats
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4"))
|
||||
"0n3qc5rx7kzb4csmcxaxdm2bqpciz2j2pz2zdfrlpi1ml4liq39k"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -674,7 +687,7 @@ (define-public qtimageformats
|
|||
(define-public qtx11extras
|
||||
(package (inherit qtsvg)
|
||||
(name "qtx11extras")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -683,7 +696,7 @@ (define-public qtx11extras
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr"))))
|
||||
"0sqx785kb4kfxfl3cmg848dlxlxmfdg8jnfh3rrk8q0iazsr2faz"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -698,7 +711,7 @@ (define-public qtx11extras
|
|||
(define-public qtxmlpatterns
|
||||
(package (inherit qtsvg)
|
||||
(name "qtxmlpatterns")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -707,7 +720,7 @@ (define-public qtxmlpatterns
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b"))))
|
||||
"1l44476ibb8rv4rf80vbjdc3712lmrl1xcxswa513ip66k47p5vn"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
|
@ -727,7 +740,7 @@ (define-public qtxmlpatterns
|
|||
(define-public qtdeclarative
|
||||
(package (inherit qtsvg)
|
||||
(name "qtdeclarative")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -736,14 +749,15 @@ (define-public qtdeclarative
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf"))))
|
||||
"1lw6nr26cjdrshin3gq5xwqb0bvslg0ml99cw8rx9wb2anpd3c9l"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("python" ,python)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("qtsvg" ,qtsvg)
|
||||
("qtxmlpatterns" ,qtxmlpatterns)))
|
||||
(inputs
|
||||
|
|
@ -759,7 +773,7 @@ (define-public qtdeclarative
|
|||
(define-public qtconnectivity
|
||||
(package (inherit qtsvg)
|
||||
(name "qtconnectivity")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -768,7 +782,7 @@ (define-public qtconnectivity
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l"))))
|
||||
"1ni2x848dxf0c7ilk461vz0z46qis8zv6jxbpyhpbhzdg9rcdw8h"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
|
|
@ -783,7 +797,7 @@ (define-public qtconnectivity
|
|||
(define-public qtwebsockets
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebsockets")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -792,7 +806,7 @@ (define-public qtwebsockets
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402"))))
|
||||
"07nnzqhsnb4q8pbka9dk5nxmqinbg9yicag7f4rlq2p6ffmgn2zh"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -810,7 +824,7 @@ (define-public qtwebsockets
|
|||
(define-public qtsensors
|
||||
(package (inherit qtsvg)
|
||||
(name "qtsensors")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -819,7 +833,7 @@ (define-public qtsensors
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7"))))
|
||||
"1x8f55qyix5bsd0hl9rzi56ndyv4h16z2qh8is9nv13jpk0a9nsr"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:parallel-tests? _ #f) #f) ; can lead to race condition
|
||||
|
|
@ -843,7 +857,7 @@ (define-public qtsensors
|
|||
(define-public qtmultimedia
|
||||
(package (inherit qtsvg)
|
||||
(name "qtmultimedia")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -852,7 +866,7 @@ (define-public qtmultimedia
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j"))
|
||||
"0w4mcxmj41b9phwirppn9ws1vxy3sww7prvhhmh0jsnaca4hwn4z"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -876,7 +890,7 @@ (define-public qtmultimedia
|
|||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("python" ,python)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
|
|
@ -894,7 +908,7 @@ (define-public qtmultimedia
|
|||
(define-public qtwayland
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwayland")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -903,7 +917,7 @@ (define-public qtwayland
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2"))
|
||||
"1i2i4d6qa512njm6gvd1ygcyb5p4d6axciqg9ys380yw9nl6m77s"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; The examples try to build and cause the build to fail
|
||||
|
|
@ -946,7 +960,7 @@ (define-public qtwayland
|
|||
(define-public qtserialport
|
||||
(package (inherit qtsvg)
|
||||
(name "qtserialport")
|
||||
(version "5.11.3")
|
||||
(version "5.12.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -955,7 +969,7 @@ (define-public qtserialport
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n"))))
|
||||
"0qmq3yppc54vf7xrwyrwk91h6x04w0hf4bnw5b3y5kwyllhh7vzq"))))
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
|
@ -980,7 +994,7 @@ (define-public qtserialport
|
|||
(define-public qtserialbus
|
||||
(package (inherit qtsvg)
|
||||
(name "qtserialbus")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -989,7 +1003,7 @@ (define-public qtserialbus
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n"))))
|
||||
"1ppmrwshj42lpx21m2gxblrlbigjf10fwg3fk5x5130ih89446q7"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtserialport" ,qtserialport)))
|
||||
|
|
@ -1001,7 +1015,7 @@ (define-public qtserialbus
|
|||
(define-public qtwebchannel
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebchannel")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1010,7 +1024,7 @@ (define-public qtwebchannel
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w"))))
|
||||
"1my8vcsidx9r5wpd1iax8skhp5ac3234g9r7ax04k9z17mqd2i97"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
|
|
@ -1025,7 +1039,7 @@ (define-public qtwebchannel
|
|||
(define-public qtwebglplugin
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebglplugin")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1034,7 +1048,7 @@ (define-public qtwebglplugin
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9"))))
|
||||
"1pahdyhinhq1xhsc7lsfprjjpz6fn9vgwqcyi72hc3wzyr98in11"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
|
@ -1060,7 +1074,7 @@ (define-public qtwebglplugin
|
|||
(define-public qtwebview
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebview")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1069,7 +1083,7 @@ (define-public qtwebview
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh"))))
|
||||
"0ykjwz3cwv718gvgvnlhq7wia8gllnj3cdzw3amj0rh63hy65h22"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)))
|
||||
(inputs
|
||||
|
|
@ -1083,7 +1097,7 @@ (define-public qtwebview
|
|||
(define-public qtlocation
|
||||
(package (inherit qtsvg)
|
||||
(name "qtlocation")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1092,7 +1106,7 @@ (define-public qtlocation
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q"))))
|
||||
"0y12vs6jwiwljdn57jqs1dwi6wfw1l5l95dvj9g93h739p533qks"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1113,7 +1127,7 @@ (define-public qtlocation
|
|||
(define-public qttools
|
||||
(package (inherit qtsvg)
|
||||
(name "qttools")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1122,7 +1136,7 @@ (define-public qttools
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2"))))
|
||||
"0xy7sf8w2lln1l59lhrf0kb687avwirrh63izp7509jwi33r2jg9"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1141,7 +1155,7 @@ (define-public qttools
|
|||
(define-public qtscript
|
||||
(package (inherit qtsvg)
|
||||
(name "qtscript")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1150,7 +1164,7 @@ (define-public qtscript
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v"))
|
||||
"0z3p4bb2ddylb7y2xvagjbn7fc5d0ic08cmrrb67h8wf6fnq5051"))
|
||||
(patches (search-patches "qtscript-disable-tests.patch"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
|
|
@ -1165,7 +1179,7 @@ (define-public qtscript
|
|||
(define-public qtquickcontrols
|
||||
(package (inherit qtsvg)
|
||||
(name "qtquickcontrols")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1174,7 +1188,7 @@ (define-public qtquickcontrols
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf"))))
|
||||
"169cvwiav5d538cw81rbdimb1pis0z6fkaxlwhd4z4pzhyhrd3f4"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1189,7 +1203,7 @@ (define-public qtquickcontrols
|
|||
(define-public qtquickcontrols2
|
||||
(package (inherit qtsvg)
|
||||
(name "qtquickcontrols2")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1198,7 +1212,7 @@ (define-public qtquickcontrols2
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl"))))
|
||||
"0w5910wblzc7q2llyb7fyfcbmy1fl369c6w5d6r5sh26z490gasw"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1214,7 +1228,7 @@ (define-public qtquickcontrols2
|
|||
(define-public qtgraphicaleffects
|
||||
(package (inherit qtsvg)
|
||||
(name "qtgraphicaleffects")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1223,7 +1237,7 @@ (define-public qtgraphicaleffects
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l"))))
|
||||
"1vvpq34433j94n9yyhh4if4yv51i8xiffpvyn3xgffx14iv35l6y"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1241,7 +1255,7 @@ (define-public qtgraphicaleffects
|
|||
(define-public qtgamepad
|
||||
(package (inherit qtsvg)
|
||||
(name "qtgamepad")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1250,7 +1264,7 @@ (define-public qtgamepad
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9"))))
|
||||
"1cxkqnhx0baxh3csjl7ar151v0zizf86f4338rr38liwb7rwbsz1"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
|
@ -1271,7 +1285,7 @@ (define-public qtgamepad
|
|||
(define-public qtscxml
|
||||
(package (inherit qtsvg)
|
||||
(name "qtscxml")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1280,7 +1294,7 @@ (define-public qtscxml
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk"))
|
||||
"12y6ga7j6xby9rz1c9h17r9ih4i16i1ylr6b4vmrn7svidy87msk"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -1302,7 +1316,7 @@ (define-public qtscxml
|
|||
(define-public qtpurchasing
|
||||
(package (inherit qtsvg)
|
||||
(name "qtpurchasing")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1311,7 +1325,7 @@ (define-public qtpurchasing
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n"))))
|
||||
"1kbhmzrw612yb4brxi3fwslil31j31vm0zqpb52vcma7vbivg80z"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
|
|
@ -1322,7 +1336,7 @@ (define-public qtpurchasing
|
|||
(define-public qtcanvas3d
|
||||
(package (inherit qtsvg)
|
||||
(name "qtcanvas3d")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1331,7 +1345,7 @@ (define-public qtcanvas3d
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m"))
|
||||
"024xglrb321rp3wb3fhprw7pl6zvmpgfkpwgabbyx8p58k4yccrd"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -1361,7 +1375,7 @@ (define-public qtcanvas3d
|
|||
(define-public qtcharts
|
||||
(package (inherit qtsvg)
|
||||
(name "qtcharts")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1370,7 +1384,7 @@ (define-public qtcharts
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627"))))
|
||||
"0gdark4z2g8j0kzjg1aqq91ap04h6hzjl163g8xlwxwdn5dxpnql"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1388,7 +1402,7 @@ (define-public qtcharts
|
|||
(define-public qtdatavis3d
|
||||
(package (inherit qtsvg)
|
||||
(name "qtdatavis3d")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1397,7 +1411,7 @@ (define-public qtdatavis3d
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3"))))
|
||||
"1zm4xfi2ijqr3n3g0lfs3yzil6w7c54r8vsj1d541lz7wnm92ka1"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1415,7 +1429,7 @@ (define-public qtdatavis3d
|
|||
(define-public qtnetworkauth
|
||||
(package (inherit qtsvg)
|
||||
(name "qtnetworkauth")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1424,7 +1438,7 @@ (define-public qtnetworkauth
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50"))))
|
||||
"1gba6rdhcvljc4dnzhnkxrdlaxm3y095ljqg1sz3p1k0m632s4pa"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
|
@ -1444,7 +1458,7 @@ (define-public qtnetworkauth
|
|||
(define-public qtremoteobjects
|
||||
(package (inherit qtsvg)
|
||||
(name "qtremoteobjects")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1453,7 +1467,7 @@ (define-public qtremoteobjects
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp"))))
|
||||
"16fna70pljn45yj6hv3g4qvb1imcnfj43jchvydspdhg08ykbda9"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
|
@ -1477,7 +1491,7 @@ (define-public qtremoteobjects
|
|||
(define-public qtspeech
|
||||
(package (inherit qtsvg)
|
||||
(name "qtspeech")
|
||||
(version "5.11.3")
|
||||
(version "5.12.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
|
@ -1486,7 +1500,7 @@ (define-public qtspeech
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr"))))
|
||||
"12l7rycjfa6d9gnnjd6i097pf1qqzjnz9c1jgxhpldvkf0n7pbi7"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
|
@ -1509,16 +1523,15 @@ (define-public qtspeech
|
|||
(define-public python-sip
|
||||
(package
|
||||
(name "python-sip")
|
||||
(version "4.19.13")
|
||||
(version "4.19.18")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "mirror://sourceforge/pyqt/sip/"
|
||||
"sip-" version "/sip-" version ".tar.gz"))
|
||||
(uri (string-append "https://www.riverbankcomputing.com/static/"
|
||||
"Downloads/sip/" version "/sip-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3"))))
|
||||
"07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("python" ,python-wrapper)))
|
||||
|
|
@ -1571,18 +1584,18 @@ (define-public python2-sip
|
|||
(define-public python-pyqt
|
||||
(package
|
||||
(name "python-pyqt")
|
||||
(version "5.11.3")
|
||||
(version "5.12.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "mirror://sourceforge/pyqt/PyQt5/"
|
||||
"PyQt-" version "/PyQt5_gpl-"
|
||||
version ".tar.gz"))
|
||||
(uri (string-append "https://www.riverbankcomputing.com/static/"
|
||||
"Downloads/PyQt5/" version "/PyQt5_gpl-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9"))
|
||||
"041155bdzp57jy747p5d59740c55yy3241cy1x2lgcdsvqvzmc0d"))
|
||||
(patches (search-patches "pyqt-configure.patch"
|
||||
"pyqt-unbundled-qt.patch"
|
||||
"pyqt-public-sip.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
|
@ -1957,7 +1970,7 @@ (define-public qtwebkit
|
|||
("libjpeg" ,libjpeg)
|
||||
("libpng" ,libpng)
|
||||
("libwebp" ,libwebp)
|
||||
("sqlite" ,sqlite)
|
||||
("sqlite" ,sqlite-with-column-metadata)
|
||||
("fontconfig" ,fontconfig)
|
||||
("libxrender" ,libxrender)
|
||||
("qtbase" ,qtbase)
|
||||
|
|
|
|||
|
|
@ -2645,7 +2645,8 @@ (define-public ruby-mysql2
|
|||
(invoke "rspec"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("mariadb" ,mariadb)
|
||||
`(("mariadb" ,mariadb "lib")
|
||||
("mariadb-dev" ,mariadb "dev")
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("ruby-rspec" ,ruby-rspec)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
|
||||
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
||||
|
|
@ -196,7 +196,7 @@ (define rust-1.19
|
|||
(properties '((timeout . 72000) ;20 hours
|
||||
(max-silent-time . 18000))) ;5 hours (for armel)
|
||||
(arguments
|
||||
`(#:imported-modules ,%cargo-utils-modules ;for `generate-checksums'
|
||||
`(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
|
||||
#:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -270,19 +270,11 @@ (define rust-1.19
|
|||
#t))
|
||||
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
||||
(lambda* _
|
||||
(use-modules (guix build cargo-utils))
|
||||
(substitute* "src/Cargo.lock"
|
||||
(("(\"checksum .* = )\".*\"" all name)
|
||||
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
||||
(for-each
|
||||
(lambda (filename)
|
||||
(use-modules (guix build cargo-utils))
|
||||
(delete-file filename)
|
||||
(let* ((dir (dirname filename)))
|
||||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir)))
|
||||
(find-files "src/vendor" ".cargo-checksum.json"))
|
||||
(generate-all-checksums "src/vendor")
|
||||
#t))
|
||||
;; This phase is overridden by newer versions.
|
||||
(replace 'configure
|
||||
|
|
@ -787,6 +779,11 @@ (define-public rust-1.27
|
|||
"rust-bootstrap-stage0-test.patch"
|
||||
"rust-1.25-accept-more-detailed-gdb-lines.patch"
|
||||
"rust-reproducible-builds.patch")))))
|
||||
(native-inputs
|
||||
;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically.
|
||||
;; See <https://bugs.gnu.org/37810>.
|
||||
(alist-replace "gdb" (list gdb-8.2)
|
||||
(package-native-inputs base-rust)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
|
|
@ -972,19 +969,11 @@ (define-public rust-1.32
|
|||
;; root of the rust tarball
|
||||
(replace 'patch-cargo-checksums
|
||||
(lambda* _
|
||||
(use-modules (guix build cargo-utils))
|
||||
(substitute* "Cargo.lock"
|
||||
(("(\"checksum .* = )\".*\"" all name)
|
||||
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
||||
(for-each
|
||||
(lambda (filename)
|
||||
(use-modules (guix build cargo-utils))
|
||||
(delete-file filename)
|
||||
(let* ((dir (dirname filename)))
|
||||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir)))
|
||||
(find-files "vendor" ".cargo-checksum.json"))
|
||||
(generate-all-checksums "vendor")
|
||||
#t))
|
||||
(add-after 'enable-codegen-tests 'override-jemalloc
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ (define-public sdl2
|
|||
(uri
|
||||
(string-append "https://libsdl.org/release/SDL2-"
|
||||
version ".tar.gz"))
|
||||
(patches (search-patches "sdl2-mesa-compat.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"))))
|
||||
|
|
|
|||
|
|
@ -46,14 +46,14 @@ (define-module (gnu packages sphinx)
|
|||
(define-public python-sphinx
|
||||
(package
|
||||
(name "python-sphinx")
|
||||
(version "2.1.2")
|
||||
(version "2.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Sphinx" version))
|
||||
(sha256
|
||||
(base32
|
||||
"09y4mjmbxz94pmfr2lzf1hkx2xk0khcpb8xsqfmir4l7dds9x9zr"))))
|
||||
"0ig8s94xg0p6h9y5s3ns9x8i10b24ihzvs65b5jwrhrgih7nnn0d"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -424,8 +424,7 @@ (define-public openssl-1.0
|
|||
(package
|
||||
(inherit openssl)
|
||||
(name "openssl")
|
||||
(version "1.0.2s")
|
||||
(replacement openssl-1.0.2t)
|
||||
(version "1.0.2t")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "https://www.openssl.org/source/openssl-"
|
||||
|
|
@ -437,7 +436,7 @@ (define-public openssl-1.0
|
|||
"/openssl-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa"))
|
||||
"1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql"))
|
||||
(patches (search-patches "openssl-runpath.patch"
|
||||
"openssl-c-rehash-in.patch"))))
|
||||
(outputs '("out"
|
||||
|
|
@ -445,6 +444,8 @@ (define-public openssl-1.0
|
|||
"static")) ;6MiB of .a files
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openssl)
|
||||
;; Parallel build is not supported in 1.0.x.
|
||||
((#:parallel-build? _ #f) #f)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-before 'patch-source-shebangs 'patch-tests
|
||||
|
|
@ -507,27 +508,6 @@ (define-public openssl-1.0
|
|||
,version "/misc"))
|
||||
#t)))))))))
|
||||
|
||||
(define openssl-1.0.2t
|
||||
(package
|
||||
(inherit openssl)
|
||||
(version "1.0.2t")
|
||||
(source (origin
|
||||
(inherit (package-source openssl-1.0))
|
||||
(uri (list (string-append "https://www.openssl.org/source/openssl-"
|
||||
version ".tar.gz")
|
||||
(string-append "ftp://ftp.openssl.org/source/"
|
||||
"openssl-" version ".tar.gz")
|
||||
(string-append "ftp://ftp.openssl.org/source/old/"
|
||||
(string-trim-right version char-set:letter)
|
||||
"/openssl-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openssl-1.0)
|
||||
;; Parallel build is not supported in 1.0.x.
|
||||
((#:parallel-build? _ #f) #f)))))
|
||||
|
||||
(define-public libressl
|
||||
(package
|
||||
(name "libressl")
|
||||
|
|
|
|||
|
|
@ -531,7 +531,7 @@ (define-public git-minimal
|
|||
(define-public libgit2
|
||||
(package
|
||||
(name "libgit2")
|
||||
(version "0.28.2")
|
||||
(version "0.28.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -540,7 +540,7 @@ (define-public libgit2
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cm8fvs05rj0baigs2133q5a0sm3pa234y8h6hmwhl2bz9xq3k4b"))
|
||||
"07068flm9xi25wmcs65nyfg6a7ikgfv96i2nhgyj5gzs9gljqiz2"))
|
||||
(patches (search-patches "libgit2-avoid-python.patch"
|
||||
"libgit2-mtime-0.patch"))
|
||||
|
||||
|
|
|
|||
|
|
@ -2343,17 +2343,18 @@ (define-public obs
|
|||
(define-public libvdpau
|
||||
(package
|
||||
(name "libvdpau")
|
||||
(version "1.2")
|
||||
(version "1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gitlab.freedesktop.org/vdpau/libvdpau"
|
||||
"/uploads/14b620084c027d546fa0b3f083b800c6/"
|
||||
"libvdpau-" version ".tar.bz2"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.freedesktop.org/vdpau/libvdpau.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01ps6g6p6q7j2mjm9vn44pmzq3g75mm7mdgmnhb1qkjjdwc9njba"))))
|
||||
(build-system gnu-build-system)
|
||||
"1fb1nh5apr9kzx9bm2lysjwpyva1s60b2l2p230nqgvb11q25hd2"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
|
|
|||
|
|
@ -870,13 +870,20 @@ (define-public looking-glass-client
|
|||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(chdir "client")
|
||||
#t))
|
||||
(add-after 'chdir-to-client 'add-missing-include
|
||||
(lambda _
|
||||
;; Mimic upstream commit b9797529893, required since the
|
||||
;; update to Mesa 19.2.
|
||||
(substitute* "renderers/egl/shader.h"
|
||||
(("#include <stdbool\\.h>")
|
||||
"#include <stdbool.h>\n#include <stddef.h>"))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(install-file "looking-glass-client"
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/bin"))
|
||||
#t))
|
||||
)))
|
||||
#t)))))
|
||||
(home-page "https://looking-glass.hostfission.com")
|
||||
(synopsis "KVM Frame Relay (KVMFR) implementation")
|
||||
(description "Looking Glass allows the use of a KVM (Kernel-based Virtual
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ (define-public glslang
|
|||
(define-public vulkan-headers
|
||||
(package
|
||||
(name "vulkan-headers")
|
||||
(version "1.1.114")
|
||||
(version "1.1.121")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -159,7 +159,7 @@ (define-public vulkan-headers
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka"))))
|
||||
"0hbgbdxj7lrm37phb0pkq5zgss3h21znj3mivnyva5f60i2wgr73"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No tests.
|
||||
|
|
@ -183,7 +183,7 @@ (define-public vulkan-loader
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rkm6dzdzxva62shscipz3kpp66x4kgmwvp1ski2fvf4jzzcbv7h"))))
|
||||
"1gbrppfxrncvva30fikgzm7f15xs527sb4lf1sswdyxj3h5cw741"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh".
|
||||
|
|
@ -193,28 +193,6 @@ (define-public vulkan-loader
|
|||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Remove lines trying to build in a git commit id.
|
||||
(substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") ""))
|
||||
#t))
|
||||
;; Make sure that the files needed for Mesa's Vulkan overlay are availabe.
|
||||
(add-after 'unpack 'copy-headers1
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(install-file "tests/layers/vk_layer_data.h"
|
||||
(string-append (assoc-ref %outputs "out")
|
||||
"/include/vulkan"))
|
||||
(install-file "tests/layers/vk_layer_extension_utils.h"
|
||||
(string-append (assoc-ref %outputs "out")
|
||||
"/include/vulkan"))
|
||||
(install-file "loader/vk_loader_platform.h"
|
||||
(string-append (assoc-ref %outputs "out")
|
||||
"/include/vulkan"))
|
||||
#t))
|
||||
(add-after 'build 'copy-headers2
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(install-file "vk_layer_dispatch_table.h"
|
||||
(string-append (assoc-ref %outputs "out")
|
||||
"/include/vulkan"))
|
||||
(install-file "vk_dispatch_table_helper.h"
|
||||
(string-append (assoc-ref %outputs "out")
|
||||
"/include/vulkan"))
|
||||
#t)))
|
||||
#:configure-flags (list
|
||||
"-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule.
|
||||
|
|
@ -256,7 +234,7 @@ (define-public vulkan-tools
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lz06mpni8ghf1xcxi4g6ck306lfaqwfi6f1w64kp9hczmvapfhf"))))
|
||||
"1jndlz3n35zlz44p1b4cgl2alvsmgrqnkxdn5mpahg0zb8dgwmm8"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("glslang" ,glslang)
|
||||
|
|
|
|||
|
|
@ -5871,27 +5871,27 @@ (define-public python-py-ubjson
|
|||
(define-public java-tomcat
|
||||
(package
|
||||
(name "java-tomcat")
|
||||
(version "8.5.38")
|
||||
(version "8.5.46")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/tomcat/tomcat-8/v"
|
||||
version "/src/apache-tomcat-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13pbsyk39g1qph82nngp54mqycmg60rxlxwy4yszsssahrqnggb2"))
|
||||
"0fb49gsqa3r6jrwc54yynvsakq9qbzr2pbxr7a29c2zvja2v65iq"))
|
||||
(modules '((guix build utils)))
|
||||
;; Delete bundled jars.
|
||||
(snippet
|
||||
'(begin
|
||||
(for-each delete-file (find-files "." "\\.jar$"))
|
||||
(for-each delete-file (find-files "." "\\.bat$"))
|
||||
#t))))
|
||||
(build-system ant-build-system)
|
||||
(inputs
|
||||
`(("java-eclipse-jdt-core" ,java-eclipse-jdt-core)))
|
||||
(native-inputs
|
||||
`(("java-junit" ,java-junit)))
|
||||
`(("java-commons-daemon" ,java-commons-daemon)
|
||||
("java-ecj" ,java-ecj)))
|
||||
(arguments
|
||||
`(#:build-target "package"
|
||||
`(#:build-target "deploy"
|
||||
#:tests? #f; requires downloading some files.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -5914,6 +5914,34 @@ (define-public java-tomcat
|
|||
(("<filter token=\"VERSION_BUILT\" value=.*")
|
||||
"<filter token=\"VERSION_BUILT\" value=\"Jan 1 1970 00:00:00 UTC\"/>"))
|
||||
#t))
|
||||
(add-after 'unpack 'modify-deploy
|
||||
(lambda _
|
||||
;; The Tomcat build downloads and copies these files to the
|
||||
;; bin and lib directory.
|
||||
;; We instead symlink to the input (see below).
|
||||
(substitute* "build.xml"
|
||||
(("<copy tofile=\"\\$\\{tomcat.build\\}/bin/commons-daemon.jar.*") "")
|
||||
(("<copy file=\"\\$\\{jdt.jar\\}\" todir=\"\\$\\{tomcat.build\\}/lib\"/>")
|
||||
""))
|
||||
#t))
|
||||
(add-after 'install 'symlink-commons-daemon
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((commons-daemon (assoc-ref inputs "java-commons-daemon"))
|
||||
(files (find-files commons-daemon "commons-daemon-.*\\.jar"))
|
||||
(daemon-jar (car files))
|
||||
(out-bin (string-append (assoc-ref outputs "out") "/bin"))
|
||||
(target (string-append out-bin "/commons-daemon.jar")))
|
||||
(symlink daemon-jar target)
|
||||
#t)))
|
||||
(add-after 'install 'symlink-java-ecj
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((java-ecj (assoc-ref inputs "java-ecj"))
|
||||
(files (find-files java-ecj "ecj.*\\.jar"))
|
||||
(java-ecj-jar (car files))
|
||||
(out-lib (string-append (assoc-ref outputs "out") "/lib"))
|
||||
(target (string-append out-lib "/java-ecj.jar")))
|
||||
(symlink java-ecj-jar target)
|
||||
#t)))
|
||||
(add-after 'unpack 'generate-properties
|
||||
(lambda _
|
||||
;; This could have been passed to make-flags, but getcwd returns
|
||||
|
|
@ -5924,7 +5952,10 @@ (define-public java-tomcat
|
|||
(string-append "base.path=" (getcwd) "/downloads\n"))))
|
||||
#t))
|
||||
(replace 'install
|
||||
(install-jars "output/build/lib")))))
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(copy-recursively "output/build" out))
|
||||
#t)))))
|
||||
(home-page "https://tomcat.apache.org")
|
||||
(synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java
|
||||
WebSocket")
|
||||
|
|
@ -6035,7 +6066,7 @@ (define-public java-eclipse-jetty-util
|
|||
#t)))))
|
||||
(inputs
|
||||
`(("slf4j" ,java-slf4j-api)
|
||||
("servlet" ,java-tomcat)))
|
||||
("servlet" ,java-javaee-servletapi)))
|
||||
(native-inputs
|
||||
`(("junit" ,java-junit)
|
||||
("hamcrest" ,java-hamcrest-all)
|
||||
|
|
@ -6223,7 +6254,7 @@ (define java-eclipse-jetty-http-test-classes
|
|||
#t)))))
|
||||
(inputs
|
||||
`(("slf4j" ,java-slf4j-api)
|
||||
("servlet" ,java-tomcat)
|
||||
("java-javaee-servletapi" ,java-javaee-servletapi)
|
||||
("http" ,java-eclipse-jetty-http)
|
||||
("io" ,java-eclipse-jetty-io)
|
||||
("util" ,java-eclipse-jetty-util)))))
|
||||
|
|
@ -6318,7 +6349,7 @@ (define-public java-eclipse-jetty-security
|
|||
#t)))))
|
||||
(inputs
|
||||
`(("slf4j" ,java-slf4j-api)
|
||||
("servlet" ,java-tomcat)
|
||||
("servlet" ,java-javaee-servletapi)
|
||||
("http" ,java-eclipse-jetty-http)
|
||||
("server" ,java-eclipse-jetty-server)
|
||||
("util" ,java-eclipse-jetty-util)))
|
||||
|
|
@ -6361,7 +6392,7 @@ (define-public java-eclipse-jetty-servlet
|
|||
#t)))))
|
||||
(inputs
|
||||
`(("slf4j" ,java-slf4j-api)
|
||||
("servlet" ,java-tomcat)
|
||||
("java-javaee-servletapi" ,java-javaee-servletapi)
|
||||
("http" ,java-eclipse-jetty-http)
|
||||
("http-test" ,java-eclipse-jetty-http-test-classes)
|
||||
("io" ,java-eclipse-jetty-io)
|
||||
|
|
@ -6496,7 +6527,7 @@ (define-public java-eclipse-jetty-webapp-9.2
|
|||
("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
|
||||
("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
|
||||
("java-eclipse-jetty-xml-9.2" ,java-eclipse-jetty-xml-9.2)
|
||||
("java-tomcat" ,java-tomcat)
|
||||
("java-javaee-servletapi" ,java-javaee-servletapi)
|
||||
,@(package-inputs java-eclipse-jetty-util-9.2)))
|
||||
(native-inputs
|
||||
`(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
|
||||
|
|
|
|||
|
|
@ -60,14 +60,14 @@ (define-module (gnu packages xiph)
|
|||
(define libogg
|
||||
(package
|
||||
(name "libogg")
|
||||
(version "1.3.3")
|
||||
(version "1.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.xiph.org/releases/ogg/libogg-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"022wjlzn8fx7mfby4pcgyjwx8zir7jr7cizichh3jgaki8bwcgsg"))))
|
||||
"1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Library for manipulating the ogg multimedia format")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -4900,14 +4900,14 @@ (define-public libxfont
|
|||
(define-public libxfont2
|
||||
(package
|
||||
(inherit libxfont)
|
||||
(version "2.0.3")
|
||||
(version "2.0.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://xorg/individual/lib/libXfont2-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"))))))
|
||||
"1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"))))))
|
||||
|
||||
(define-public libxi
|
||||
(package
|
||||
|
|
@ -4968,7 +4968,7 @@ (define-public libxrandr
|
|||
(define-public libxvmc
|
||||
(package
|
||||
(name "libxvmc")
|
||||
(version "1.0.11")
|
||||
(version "1.0.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4978,7 +4978,7 @@ (define-public libxvmc
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"))))
|
||||
"1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libxv" ,libxv)))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -171,6 +172,12 @@ (define* (build #:key (make-flags '()) (build-target "jar")
|
|||
#:allow-other-keys)
|
||||
(apply invoke `("ant" ,build-target ,@make-flags)))
|
||||
|
||||
(define (regular-jar-file-predicate file stat)
|
||||
"Predicate returning true if FILE is ending on '.jar'
|
||||
and STAT indicates it is a regular file."
|
||||
(and ((file-name-predicate "\\.jar$") file stat)
|
||||
(eq? 'regular (stat:type stat))))
|
||||
|
||||
(define* (generate-jar-indices #:key outputs #:allow-other-keys)
|
||||
"Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps
|
||||
and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps,
|
||||
|
|
@ -181,7 +188,10 @@ (define (generate-index jar)
|
|||
(invoke "jar" "-i" jar))
|
||||
(for-each (match-lambda
|
||||
((output . directory)
|
||||
(for-each generate-index (find-files directory "\\.jar$"))))
|
||||
(for-each generate-index
|
||||
(find-files
|
||||
directory
|
||||
regular-jar-file-predicate))))
|
||||
outputs)
|
||||
#t)
|
||||
|
||||
|
|
@ -222,7 +232,8 @@ (define (repack-archive jar)
|
|||
|
||||
(for-each (match-lambda
|
||||
((output . directory)
|
||||
(for-each repack-archive (find-files directory "\\.jar$"))))
|
||||
(for-each repack-archive
|
||||
(find-files directory regular-jar-file-predicate))))
|
||||
outputs)
|
||||
#t)
|
||||
|
||||
|
|
|
|||
|
|
@ -40,21 +40,6 @@ (define-module (guix build cargo-build-system)
|
|||
;;
|
||||
;; Code:
|
||||
|
||||
;; TODO: Move this to (guix build cargo-utils). Will cause a full rebuild
|
||||
;; of all rust compilers.
|
||||
|
||||
(define (generate-all-checksums dir-name)
|
||||
(for-each
|
||||
(lambda (filename)
|
||||
(let* ((dir (dirname filename))
|
||||
(checksum-file (string-append dir "/.cargo-checksum.json")))
|
||||
(when (file-exists? checksum-file) (delete-file checksum-file))
|
||||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir)))
|
||||
(find-files dir-name "Cargo.toml$")))
|
||||
|
||||
(define (manifest-targets)
|
||||
"Extract all targets from the Cargo.toml manifest"
|
||||
(let* ((port (open-input-pipe "cargo read-manifest"))
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
||||
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -22,7 +23,8 @@ (define-module (guix build cargo-utils)
|
|||
#:use-module (guix build utils)
|
||||
#:use-module (ice-9 popen)
|
||||
#:use-module (ice-9 rdelim)
|
||||
#:export (generate-checksums))
|
||||
#:export (generate-checksums
|
||||
generate-all-checksums))
|
||||
|
||||
;; Commentary:
|
||||
;;
|
||||
|
|
@ -66,3 +68,15 @@ (define (generate-checksums dir-name)
|
|||
(display "},\"package\":" port)
|
||||
(write (file-sha256 "/dev/null") port)
|
||||
(display "}" port)))))
|
||||
|
||||
(define (generate-all-checksums dir-name)
|
||||
(for-each
|
||||
(lambda (filename)
|
||||
(let* ((dir (dirname filename))
|
||||
(checksum-file (string-append dir "/.cargo-checksum.json")))
|
||||
(when (file-exists? checksum-file) (delete-file checksum-file))
|
||||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir)))
|
||||
(find-files dir-name "Cargo.toml$")))
|
||||
|
|
|
|||
Loading…
Reference in a new issue