Merge branch 'master' into staging
This commit is contained in:
		
						commit
						233df51ebc
					
				
					 74 changed files with 41670 additions and 4979 deletions
				
			
		| 
						 | 
					@ -277,10 +277,10 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
 | 
				
			||||||
# Auxiliary files for packages.
 | 
					# Auxiliary files for packages.
 | 
				
			||||||
AUX_FILES =						\
 | 
					AUX_FILES =						\
 | 
				
			||||||
  gnu/packages/aux-files/emacs/guix-emacs.el		\
 | 
					  gnu/packages/aux-files/emacs/guix-emacs.el		\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.17-arm.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.18-arm.conf	\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.17-arm64.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.18-arm64.conf	\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.17-i686.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.18-i686.conf	\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.17-x86_64.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.18-x86_64.conf	\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.14-arm.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.14-arm.conf	\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.14-i686.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.14-i686.conf	\
 | 
				
			||||||
  gnu/packages/aux-files/linux-libre/4.14-x86_64.conf	\
 | 
					  gnu/packages/aux-files/linux-libre/4.14-x86_64.conf	\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -170,7 +170,7 @@ Programming Interface
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Defining Packages
 | 
					Defining Packages
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* package Reference ::          The package data type.
 | 
					* package Reference::           The package data type.
 | 
				
			||||||
* origin Reference::            The origin data type.
 | 
					* origin Reference::            The origin data type.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Utilities
 | 
					Utilities
 | 
				
			||||||
| 
						 | 
					@ -3522,7 +3522,7 @@ when @var{cut?} returns true for a given package.
 | 
				
			||||||
@end deffn
 | 
					@end deffn
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@menu
 | 
					@menu
 | 
				
			||||||
* package Reference ::          The package data type.
 | 
					* package Reference::           The package data type.
 | 
				
			||||||
* origin Reference::            The origin data type.
 | 
					* origin Reference::            The origin data type.
 | 
				
			||||||
@end menu
 | 
					@end menu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -58,11 +58,10 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (section-contents elf section)
 | 
					(define (section-contents elf section)
 | 
				
			||||||
  "Return the contents of SECTION in ELF as a bytevector."
 | 
					  "Return the contents of SECTION in ELF as a bytevector."
 | 
				
			||||||
  (let* ((modinfo  (elf-section-by-name elf ".modinfo"))
 | 
					  (let ((contents (make-bytevector (elf-section-size section))))
 | 
				
			||||||
         (contents (make-bytevector (elf-section-size modinfo))))
 | 
					    (bytevector-copy! (elf-bytes elf) (elf-section-offset section)
 | 
				
			||||||
    (bytevector-copy! (elf-bytes elf) (elf-section-offset modinfo)
 | 
					 | 
				
			||||||
                      contents 0
 | 
					                      contents 0
 | 
				
			||||||
                      (elf-section-size modinfo))
 | 
					                      (elf-section-size section))
 | 
				
			||||||
    contents))
 | 
					    contents))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define %not-nul
 | 
					(define %not-nul
 | 
				
			||||||
| 
						 | 
					@ -85,7 +84,8 @@ string list."
 | 
				
			||||||
key/value pairs.."
 | 
					key/value pairs.."
 | 
				
			||||||
  (let* ((bv      (call-with-input-file file get-bytevector-all))
 | 
					  (let* ((bv      (call-with-input-file file get-bytevector-all))
 | 
				
			||||||
         (elf     (parse-elf bv))
 | 
					         (elf     (parse-elf bv))
 | 
				
			||||||
         (modinfo (section-contents elf ".modinfo")))
 | 
					         (section (elf-section-by-name elf ".modinfo"))
 | 
				
			||||||
 | 
					         (modinfo (section-contents elf section)))
 | 
				
			||||||
    (map key=value->pair
 | 
					    (map key=value->pair
 | 
				
			||||||
         (nul-separated-string->list (utf8->string modinfo)))))
 | 
					         (nul-separated-string->list (utf8->string modinfo)))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										10
									
								
								gnu/local.mk
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								gnu/local.mk
									
										
									
									
									
								
							| 
						 | 
					@ -594,7 +594,6 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/binutils-loongson-workaround.patch	\
 | 
					  %D%/packages/patches/binutils-loongson-workaround.patch	\
 | 
				
			||||||
  %D%/packages/patches/blast+-fix-makefile.patch		\
 | 
					  %D%/packages/patches/blast+-fix-makefile.patch		\
 | 
				
			||||||
  %D%/packages/patches/boost-fix-icu-build.patch		\
 | 
					  %D%/packages/patches/boost-fix-icu-build.patch		\
 | 
				
			||||||
  %D%/packages/patches/btrfs-progs-e-value-block.patch		\
 | 
					 | 
				
			||||||
  %D%/packages/patches/byobu-writable-status.patch		\
 | 
					  %D%/packages/patches/byobu-writable-status.patch		\
 | 
				
			||||||
  %D%/packages/patches/cairo-CVE-2016-9082.patch			\
 | 
					  %D%/packages/patches/cairo-CVE-2016-9082.patch			\
 | 
				
			||||||
  %D%/packages/patches/calibre-no-updates-dialog.patch		\
 | 
					  %D%/packages/patches/calibre-no-updates-dialog.patch		\
 | 
				
			||||||
| 
						 | 
					@ -650,8 +649,6 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/doxygen-gcc-ice.patch			\
 | 
					  %D%/packages/patches/doxygen-gcc-ice.patch			\
 | 
				
			||||||
  %D%/packages/patches/doxygen-test.patch			\
 | 
					  %D%/packages/patches/doxygen-test.patch			\
 | 
				
			||||||
  %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
 | 
					  %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
 | 
				
			||||||
  %D%/packages/patches/e2fsprogs-glibc-2.27.patch		\
 | 
					 | 
				
			||||||
  %D%/packages/patches/eigen-arm-neon-fixes.patch		\
 | 
					 | 
				
			||||||
  %D%/packages/patches/elfutils-tests-ptrace.patch		\
 | 
					  %D%/packages/patches/elfutils-tests-ptrace.patch		\
 | 
				
			||||||
  %D%/packages/patches/elogind-glibc-2.27.patch			\
 | 
					  %D%/packages/patches/elogind-glibc-2.27.patch			\
 | 
				
			||||||
  %D%/packages/patches/einstein-build.patch			\
 | 
					  %D%/packages/patches/einstein-build.patch			\
 | 
				
			||||||
| 
						 | 
					@ -668,6 +665,7 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/evilwm-lost-focus-bug.patch		\
 | 
					  %D%/packages/patches/evilwm-lost-focus-bug.patch		\
 | 
				
			||||||
  %D%/packages/patches/exiv2-CVE-2017-14860.patch		\
 | 
					  %D%/packages/patches/exiv2-CVE-2017-14860.patch		\
 | 
				
			||||||
  %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch	\
 | 
					  %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch	\
 | 
				
			||||||
 | 
					  %D%/packages/patches/extundelete-e2fsprogs-1.44.patch		\
 | 
				
			||||||
  %D%/packages/patches/fastcap-mulGlobal.patch			\
 | 
					  %D%/packages/patches/fastcap-mulGlobal.patch			\
 | 
				
			||||||
  %D%/packages/patches/fastcap-mulSetup.patch			\
 | 
					  %D%/packages/patches/fastcap-mulSetup.patch			\
 | 
				
			||||||
  %D%/packages/patches/fasthenry-spAllocate.patch		\
 | 
					  %D%/packages/patches/fasthenry-spAllocate.patch		\
 | 
				
			||||||
| 
						 | 
					@ -697,6 +695,7 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/gcc-asan-missing-include.patch		\
 | 
					  %D%/packages/patches/gcc-asan-missing-include.patch		\
 | 
				
			||||||
  %D%/packages/patches/gcc-cross-environment-variables.patch	\
 | 
					  %D%/packages/patches/gcc-cross-environment-variables.patch	\
 | 
				
			||||||
  %D%/packages/patches/gcc-fix-texi2pod.patch			\
 | 
					  %D%/packages/patches/gcc-fix-texi2pod.patch			\
 | 
				
			||||||
 | 
					  %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch		\
 | 
				
			||||||
  %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch		\
 | 
					  %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch		\
 | 
				
			||||||
  %D%/packages/patches/gcc-libsanitizer-fix.patch		\
 | 
					  %D%/packages/patches/gcc-libsanitizer-fix.patch		\
 | 
				
			||||||
  %D%/packages/patches/gcc-libvtv-runpath.patch			\
 | 
					  %D%/packages/patches/gcc-libvtv-runpath.patch			\
 | 
				
			||||||
| 
						 | 
					@ -930,7 +929,6 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/luit-posix.patch				\
 | 
					  %D%/packages/patches/luit-posix.patch				\
 | 
				
			||||||
  %D%/packages/patches/luminance-hdr-qt-printer.patch		\
 | 
					  %D%/packages/patches/luminance-hdr-qt-printer.patch		\
 | 
				
			||||||
  %D%/packages/patches/lvm2-static-link.patch			\
 | 
					  %D%/packages/patches/lvm2-static-link.patch			\
 | 
				
			||||||
  %D%/packages/patches/lxc-CVE-2018-6556.patch         		\
 | 
					 | 
				
			||||||
  %D%/packages/patches/lxsession-use-gapplication.patch         \
 | 
					  %D%/packages/patches/lxsession-use-gapplication.patch         \
 | 
				
			||||||
  %D%/packages/patches/lyx-2.2.3-fix-test.patch			\
 | 
					  %D%/packages/patches/lyx-2.2.3-fix-test.patch			\
 | 
				
			||||||
  %D%/packages/patches/mailutils-uninitialized-memory.patch	\
 | 
					  %D%/packages/patches/mailutils-uninitialized-memory.patch	\
 | 
				
			||||||
| 
						 | 
					@ -999,6 +997,7 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/openldap-CVE-2017-9287.patch		\
 | 
					  %D%/packages/patches/openldap-CVE-2017-9287.patch		\
 | 
				
			||||||
  %D%/packages/patches/openocd-nrf52.patch			\
 | 
					  %D%/packages/patches/openocd-nrf52.patch			\
 | 
				
			||||||
  %D%/packages/patches/opensmtpd-fix-crash.patch		\
 | 
					  %D%/packages/patches/opensmtpd-fix-crash.patch		\
 | 
				
			||||||
 | 
					  %D%/packages/patches/openssh-CVE-2018-15473.patch		\
 | 
				
			||||||
  %D%/packages/patches/openssl-runpath.patch			\
 | 
					  %D%/packages/patches/openssl-runpath.patch			\
 | 
				
			||||||
  %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch	\
 | 
					  %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch	\
 | 
				
			||||||
  %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch	\
 | 
					  %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch	\
 | 
				
			||||||
| 
						 | 
					@ -1098,7 +1097,6 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/qemu-glibc-2.27.patch 			\
 | 
					  %D%/packages/patches/qemu-glibc-2.27.patch 			\
 | 
				
			||||||
  %D%/packages/patches/qt4-ldflags.patch			\
 | 
					  %D%/packages/patches/qt4-ldflags.patch			\
 | 
				
			||||||
  %D%/packages/patches/qtbase-use-TZDIR.patch			\
 | 
					  %D%/packages/patches/qtbase-use-TZDIR.patch			\
 | 
				
			||||||
  %D%/packages/patches/qtoctave-qt-5.11-fix.patch		\
 | 
					 | 
				
			||||||
  %D%/packages/patches/qtscript-disable-tests.patch		\
 | 
					  %D%/packages/patches/qtscript-disable-tests.patch		\
 | 
				
			||||||
  %D%/packages/patches/quagga-reproducible-build.patch          \
 | 
					  %D%/packages/patches/quagga-reproducible-build.patch          \
 | 
				
			||||||
  %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
 | 
					  %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
 | 
				
			||||||
| 
						 | 
					@ -1117,7 +1115,7 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
 | 
					  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
 | 
				
			||||||
  %D%/packages/patches/rsem-makefile.patch			\
 | 
					  %D%/packages/patches/rsem-makefile.patch			\
 | 
				
			||||||
  %D%/packages/patches/rtags-separate-rct.patch			\
 | 
					  %D%/packages/patches/rtags-separate-rct.patch			\
 | 
				
			||||||
  %D%/packages/patches/racket-fix-xform-issue.patch		\
 | 
					  %D%/packages/patches/racket-store-checksum-override.patch	\
 | 
				
			||||||
  %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch	\
 | 
					  %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch	\
 | 
				
			||||||
  %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch	\
 | 
					  %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch	\
 | 
				
			||||||
  %D%/packages/patches/ruby-concurrent-test-arm.patch		\
 | 
					  %D%/packages/patches/ruby-concurrent-test-arm.patch		\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -963,7 +963,7 @@ system administrator.")
 | 
				
			||||||
(define-public sudo
 | 
					(define-public sudo
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "sudo")
 | 
					    (name "sudo")
 | 
				
			||||||
    (version "1.8.23")
 | 
					    (version "1.8.24")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri
 | 
					              (uri
 | 
				
			||||||
| 
						 | 
					@ -973,7 +973,7 @@ system administrator.")
 | 
				
			||||||
                                    version ".tar.gz")))
 | 
					                                    version ".tar.gz")))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"))
 | 
					                "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l"))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
              (snippet
 | 
					              (snippet
 | 
				
			||||||
               '(begin
 | 
					               '(begin
 | 
				
			||||||
| 
						 | 
					@ -983,7 +983,7 @@ system administrator.")
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:configure-flags
 | 
					     `(#:configure-flags
 | 
				
			||||||
       (list "--with-logpath=/var/log/sudo.log"
 | 
					       (list "--with-logpath=/var/log/sudo.log"
 | 
				
			||||||
             "--with-rundir=/var/run/sudo"    ;must be cleaned up at boot time
 | 
					             "--with-rundir=/var/run/sudo" ; must be cleaned up at boot time
 | 
				
			||||||
             "--with-vardir=/var/db/sudo"
 | 
					             "--with-vardir=/var/db/sudo"
 | 
				
			||||||
             "--with-iologdir=/var/log/sudo-io"
 | 
					             "--with-iologdir=/var/log/sudo-io"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -399,15 +399,21 @@ matrices, and polynomials over the integers and over finite fields.")
 | 
				
			||||||
(define-public singular
 | 
					(define-public singular
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
   (name "singular")
 | 
					   (name "singular")
 | 
				
			||||||
   (version "4.0.3")
 | 
					   (version "4.1.1p3")
 | 
				
			||||||
   (source (origin
 | 
					   (source
 | 
				
			||||||
 | 
					    (origin
 | 
				
			||||||
      (method url-fetch)
 | 
					      (method url-fetch)
 | 
				
			||||||
            (uri (string-append "http://www.mathematik.uni-kl.de/ftp/pub/"
 | 
					      (uri
 | 
				
			||||||
                                "Math/Singular/SOURCES/"
 | 
					       (string-append "http://www.mathematik.uni-kl.de/ftp/pub/Math/"
 | 
				
			||||||
                                (string-join (string-split version #\.) "-")
 | 
					                      "Singular/SOURCES/"
 | 
				
			||||||
 | 
					                      (string-join
 | 
				
			||||||
 | 
					                       (string-split
 | 
				
			||||||
 | 
					                        (string-trim-right version #\p
 | 
				
			||||||
 | 
					                                           0 (1- (string-length version)))
 | 
				
			||||||
 | 
					                        #\.) "-")
 | 
				
			||||||
                      "/singular-" version ".tar.gz"))
 | 
					                      "/singular-" version ".tar.gz"))
 | 
				
			||||||
             (sha256 (base32
 | 
					             (sha256 (base32
 | 
				
			||||||
                     "0viidy2fz62rln9p0s9qfs7fnm55c6fw1agydd1py26gxylp1ksc"))))
 | 
					                      "1qqj9bm9pkzm0iyycpvm8x6s79wws3nq60lz25h8x1q61h3426sm"))))
 | 
				
			||||||
   (build-system gnu-build-system)
 | 
					   (build-system gnu-build-system)
 | 
				
			||||||
   (native-inputs
 | 
					   (native-inputs
 | 
				
			||||||
    `(("doxygen" ,doxygen)
 | 
					    `(("doxygen" ,doxygen)
 | 
				
			||||||
| 
						 | 
					@ -697,16 +703,15 @@ Sine Transform} (DST) and @dfn{Discrete Hartley Transform} (DHT).")
 | 
				
			||||||
(define-public eigen
 | 
					(define-public eigen
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "eigen")
 | 
					    (name "eigen")
 | 
				
			||||||
    (version "3.3.4")
 | 
					    (version "3.3.5")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://bitbucket.org/eigen/eigen/get/"
 | 
					              (uri (string-append "https://bitbucket.org/eigen/eigen/get/"
 | 
				
			||||||
                                  version ".tar.bz2"))
 | 
					                                  version ".tar.bz2"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "19m4406jvqnwh7kpcvx1lfx2vdc5zwia5q9ayv89bimg1gmln9fx"))
 | 
					                "1qh3yrwn78ms5yhwbpl5wvblk4gbz02cacdygxylr7i9xbrvylkk"))
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.bz2"))
 | 
					              (file-name (string-append name "-" version ".tar.bz2"))
 | 
				
			||||||
	      (patches (search-patches "eigen-arm-neon-fixes.patch"))
 | 
					 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
              (snippet
 | 
					              (snippet
 | 
				
			||||||
               ;; There are 3 test failures in the "unsupported" directory,
 | 
					               ;; There are 3 test failures in the "unsupported" directory,
 | 
				
			||||||
| 
						 | 
					@ -716,16 +721,6 @@ Sine Transform} (DST) and @dfn{Discrete Hartley Transform} (DHT).")
 | 
				
			||||||
                  (substitute* "unsupported/CMakeLists.txt"
 | 
					                  (substitute* "unsupported/CMakeLists.txt"
 | 
				
			||||||
                    (("add_subdirectory\\(test.*")
 | 
					                    (("add_subdirectory\\(test.*")
 | 
				
			||||||
                     "# Do not build the tests for unsupported features.\n"))
 | 
					                     "# Do not build the tests for unsupported features.\n"))
 | 
				
			||||||
		  (substitute* "CMakeLists.txt"
 | 
					 | 
				
			||||||
                    ;; Work around
 | 
					 | 
				
			||||||
                    ;; <http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1114>.
 | 
					 | 
				
			||||||
                    (("\"include/eigen3\"")
 | 
					 | 
				
			||||||
                     "\"${CMAKE_INSTALL_PREFIX}/include/eigen3\""))
 | 
					 | 
				
			||||||
		  (substitute* "test/bdcsvd.cpp"
 | 
					 | 
				
			||||||
                    ;; See
 | 
					 | 
				
			||||||
                    ;; https://bitbucket.org/eigen/eigen/commits/ea8c22ce6920e982d15245ee41d0531a46a28e5d
 | 
					 | 
				
			||||||
                    ((".*svd_preallocate[^\n]*" &)
 | 
					 | 
				
			||||||
                     (string-append "//" & " // Not supported by BDCSVD")))
 | 
					 | 
				
			||||||
                  #t))))
 | 
					                  #t))))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
| 
						 | 
					@ -740,11 +735,11 @@ Sine Transform} (DST) and @dfn{Discrete Hartley Transform} (DHT).")
 | 
				
			||||||
			(setenv "EIGEN_SEED" "1") ;for reproducibility
 | 
								(setenv "EIGEN_SEED" "1") ;for reproducibility
 | 
				
			||||||
                        ;; First build the tests, in parallel.  See
 | 
					                        ;; First build the tests, in parallel.  See
 | 
				
			||||||
                        ;; <http://eigen.tuxfamily.org/index.php?title=Tests>.
 | 
					                        ;; <http://eigen.tuxfamily.org/index.php?title=Tests>.
 | 
				
			||||||
                        (and (zero? (system* "make" "buildtests" dash-j))
 | 
					                        (invoke "make" "buildtests" dash-j)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        ;; Then run 'CTest' with -V so we get more
 | 
					                        ;; Then run 'CTest' with -V so we get more
 | 
				
			||||||
                        ;; details upon failure.
 | 
					                        ;; details upon failure.
 | 
				
			||||||
                             (zero? (system* "ctest" "-V" dash-j)))))))))
 | 
					                        (invoke "ctest" "-V" dash-j)))))))
 | 
				
			||||||
    (home-page "https://eigen.tuxfamily.org")
 | 
					    (home-page "https://eigen.tuxfamily.org")
 | 
				
			||||||
    (synopsis "C++ template library for linear algebra")
 | 
					    (synopsis "C++ template library for linear algebra")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					@ -761,16 +756,16 @@ features, and more.")
 | 
				
			||||||
(define-public xtensor
 | 
					(define-public xtensor
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xtensor")
 | 
					    (name "xtensor")
 | 
				
			||||||
    (version "0.15.9")
 | 
					    (version "0.17.1")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method git-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (git-reference
 | 
				
			||||||
                    "https://github.com/QuantStack/xtensor/archive/"
 | 
					                    (url "https://github.com/QuantStack/xtensor.git")
 | 
				
			||||||
                    version ".tar.gz"))
 | 
					                    (commit version)))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0mlsw4p1w5mh7pscddfdamz27zq3wml5qla3vbzgvif34vsqc8ra"))
 | 
					                "0w40v5lp0hp8ihf8nnvak373sb5xx0768pxgiqh3nzn57wf8px4r"))
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))))
 | 
					              (file-name (git-file-name name version))))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("googletest" ,googletest)
 | 
					     `(("googletest" ,googletest)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,9 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Automatically generated file; DO NOT EDIT.
 | 
					# Automatically generated file; DO NOT EDIT.
 | 
				
			||||||
# Linux/arm 4.17.0-gnu Kernel Configuration
 | 
					# Linux/arm 4.18.0-gnu Kernel Configuration
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_ARM=y
 | 
					CONFIG_ARM=y
 | 
				
			||||||
CONFIG_ARM_HAS_SG_CHAIN=y
 | 
					CONFIG_ARM_HAS_SG_CHAIN=y
 | 
				
			||||||
CONFIG_NEED_SG_DMA_LENGTH=y
 | 
					 | 
				
			||||||
CONFIG_ARM_DMA_USE_IOMMU=y
 | 
					CONFIG_ARM_DMA_USE_IOMMU=y
 | 
				
			||||||
CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 | 
					CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 | 
				
			||||||
CONFIG_MIGHT_HAVE_PCI=y
 | 
					CONFIG_MIGHT_HAVE_PCI=y
 | 
				
			||||||
| 
						 | 
					@ -19,12 +18,14 @@ CONFIG_ARCH_HAS_BANDGAP=y
 | 
				
			||||||
CONFIG_FIX_EARLYCON_MEM=y
 | 
					CONFIG_FIX_EARLYCON_MEM=y
 | 
				
			||||||
CONFIG_GENERIC_HWEIGHT=y
 | 
					CONFIG_GENERIC_HWEIGHT=y
 | 
				
			||||||
CONFIG_GENERIC_CALIBRATE_DELAY=y
 | 
					CONFIG_GENERIC_CALIBRATE_DELAY=y
 | 
				
			||||||
CONFIG_NEED_DMA_MAP_STATE=y
 | 
					 | 
				
			||||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
 | 
					CONFIG_ARCH_SUPPORTS_UPROBES=y
 | 
				
			||||||
CONFIG_FIQ=y
 | 
					CONFIG_FIQ=y
 | 
				
			||||||
CONFIG_ARM_PATCH_PHYS_VIRT=y
 | 
					CONFIG_ARM_PATCH_PHYS_VIRT=y
 | 
				
			||||||
CONFIG_GENERIC_BUG=y
 | 
					CONFIG_GENERIC_BUG=y
 | 
				
			||||||
CONFIG_PGTABLE_LEVELS=2
 | 
					CONFIG_PGTABLE_LEVELS=2
 | 
				
			||||||
 | 
					CONFIG_CC_IS_GCC=y
 | 
				
			||||||
 | 
					CONFIG_GCC_VERSION=70300
 | 
				
			||||||
 | 
					CONFIG_CLANG_VERSION=0
 | 
				
			||||||
CONFIG_IRQ_WORK=y
 | 
					CONFIG_IRQ_WORK=y
 | 
				
			||||||
CONFIG_BUILDTIME_EXTABLE_SORT=y
 | 
					CONFIG_BUILDTIME_EXTABLE_SORT=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,7 +33,6 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 | 
				
			||||||
# General setup
 | 
					# General setup
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_INIT_ENV_ARG_LIMIT=32
 | 
					CONFIG_INIT_ENV_ARG_LIMIT=32
 | 
				
			||||||
CONFIG_CROSS_COMPILE=""
 | 
					 | 
				
			||||||
# CONFIG_COMPILE_TEST is not set
 | 
					# CONFIG_COMPILE_TEST is not set
 | 
				
			||||||
CONFIG_LOCALVERSION=""
 | 
					CONFIG_LOCALVERSION=""
 | 
				
			||||||
# CONFIG_LOCALVERSION_AUTO is not set
 | 
					# CONFIG_LOCALVERSION_AUTO is not set
 | 
				
			||||||
| 
						 | 
					@ -199,6 +199,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 | 
				
			||||||
CONFIG_BPF_SYSCALL=y
 | 
					CONFIG_BPF_SYSCALL=y
 | 
				
			||||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
 | 
					# CONFIG_BPF_JIT_ALWAYS_ON is not set
 | 
				
			||||||
CONFIG_USERFAULTFD=y
 | 
					CONFIG_USERFAULTFD=y
 | 
				
			||||||
 | 
					CONFIG_RSEQ=y
 | 
				
			||||||
 | 
					# CONFIG_DEBUG_RSEQ is not set
 | 
				
			||||||
# CONFIG_EMBEDDED is not set
 | 
					# CONFIG_EMBEDDED is not set
 | 
				
			||||||
CONFIG_HAVE_PERF_EVENTS=y
 | 
					CONFIG_HAVE_PERF_EVENTS=y
 | 
				
			||||||
CONFIG_PERF_USE_VMALLOC=y
 | 
					CONFIG_PERF_USE_VMALLOC=y
 | 
				
			||||||
| 
						 | 
					@ -243,8 +245,8 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 | 
				
			||||||
CONFIG_ARCH_HAS_SET_MEMORY=y
 | 
					CONFIG_ARCH_HAS_SET_MEMORY=y
 | 
				
			||||||
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 | 
					CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 | 
				
			||||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 | 
					CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 | 
				
			||||||
 | 
					CONFIG_HAVE_RSEQ=y
 | 
				
			||||||
CONFIG_HAVE_CLK=y
 | 
					CONFIG_HAVE_CLK=y
 | 
				
			||||||
CONFIG_HAVE_DMA_API_DEBUG=y
 | 
					 | 
				
			||||||
CONFIG_HAVE_HW_BREAKPOINT=y
 | 
					CONFIG_HAVE_HW_BREAKPOINT=y
 | 
				
			||||||
CONFIG_HAVE_PERF_REGS=y
 | 
					CONFIG_HAVE_PERF_REGS=y
 | 
				
			||||||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 | 
					CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 | 
				
			||||||
| 
						 | 
					@ -252,13 +254,12 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 | 
				
			||||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 | 
					CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 | 
				
			||||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 | 
					CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 | 
				
			||||||
CONFIG_SECCOMP_FILTER=y
 | 
					CONFIG_SECCOMP_FILTER=y
 | 
				
			||||||
 | 
					CONFIG_PLUGIN_HOSTCC=""
 | 
				
			||||||
CONFIG_HAVE_GCC_PLUGINS=y
 | 
					CONFIG_HAVE_GCC_PLUGINS=y
 | 
				
			||||||
# CONFIG_GCC_PLUGINS is not set
 | 
					CONFIG_HAVE_STACKPROTECTOR=y
 | 
				
			||||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
 | 
					CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 | 
				
			||||||
# CONFIG_CC_STACKPROTECTOR_NONE is not set
 | 
					CONFIG_STACKPROTECTOR=y
 | 
				
			||||||
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 | 
					CONFIG_STACKPROTECTOR_STRONG=y
 | 
				
			||||||
CONFIG_CC_STACKPROTECTOR_STRONG=y
 | 
					 | 
				
			||||||
# CONFIG_CC_STACKPROTECTOR_AUTO is not set
 | 
					 | 
				
			||||||
CONFIG_HAVE_CONTEXT_TRACKING=y
 | 
					CONFIG_HAVE_CONTEXT_TRACKING=y
 | 
				
			||||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 | 
					CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 | 
				
			||||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 | 
					CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 | 
				
			||||||
| 
						 | 
					@ -287,7 +288,6 @@ CONFIG_REFCOUNT_FULL=y
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_GCOV_KERNEL is not set
 | 
					# CONFIG_GCOV_KERNEL is not set
 | 
				
			||||||
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 | 
					CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 | 
				
			||||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 | 
					 | 
				
			||||||
CONFIG_RT_MUTEXES=y
 | 
					CONFIG_RT_MUTEXES=y
 | 
				
			||||||
CONFIG_BASE_SMALL=0
 | 
					CONFIG_BASE_SMALL=0
 | 
				
			||||||
CONFIG_MODULES=y
 | 
					CONFIG_MODULES=y
 | 
				
			||||||
| 
						 | 
					@ -451,7 +451,6 @@ CONFIG_SOC_EXYNOS5250=y
 | 
				
			||||||
CONFIG_SOC_EXYNOS5260=y
 | 
					CONFIG_SOC_EXYNOS5260=y
 | 
				
			||||||
CONFIG_SOC_EXYNOS5410=y
 | 
					CONFIG_SOC_EXYNOS5410=y
 | 
				
			||||||
CONFIG_SOC_EXYNOS5420=y
 | 
					CONFIG_SOC_EXYNOS5420=y
 | 
				
			||||||
CONFIG_SOC_EXYNOS5440=y
 | 
					 | 
				
			||||||
CONFIG_SOC_EXYNOS5800=y
 | 
					CONFIG_SOC_EXYNOS5800=y
 | 
				
			||||||
CONFIG_EXYNOS5420_MCPM=y
 | 
					CONFIG_EXYNOS5420_MCPM=y
 | 
				
			||||||
CONFIG_EXYNOS_CPU_SUSPEND=y
 | 
					CONFIG_EXYNOS_CPU_SUSPEND=y
 | 
				
			||||||
| 
						 | 
					@ -530,7 +529,6 @@ CONFIG_POWER_AVS_OMAP_CLASS3=y
 | 
				
			||||||
CONFIG_OMAP_RESET_CLOCKS=y
 | 
					CONFIG_OMAP_RESET_CLOCKS=y
 | 
				
			||||||
CONFIG_OMAP_32K_TIMER=y
 | 
					CONFIG_OMAP_32K_TIMER=y
 | 
				
			||||||
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 | 
					# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 | 
				
			||||||
CONFIG_OMAP_PM_NOOP=y
 | 
					 | 
				
			||||||
CONFIG_MACH_OMAP_GENERIC=y
 | 
					CONFIG_MACH_OMAP_GENERIC=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -626,7 +624,6 @@ CONFIG_CPU_CP15_MMU=y
 | 
				
			||||||
# Processor Features
 | 
					# Processor Features
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_ARM_LPAE is not set
 | 
					# CONFIG_ARM_LPAE is not set
 | 
				
			||||||
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 | 
					 | 
				
			||||||
CONFIG_ARM_THUMB=y
 | 
					CONFIG_ARM_THUMB=y
 | 
				
			||||||
CONFIG_ARM_THUMBEE=y
 | 
					CONFIG_ARM_THUMBEE=y
 | 
				
			||||||
CONFIG_ARM_VIRT_EXT=y
 | 
					CONFIG_ARM_VIRT_EXT=y
 | 
				
			||||||
| 
						 | 
					@ -634,6 +631,8 @@ CONFIG_SWP_EMULATE=y
 | 
				
			||||||
# CONFIG_CPU_BIG_ENDIAN is not set
 | 
					# CONFIG_CPU_BIG_ENDIAN is not set
 | 
				
			||||||
# CONFIG_CPU_ICACHE_DISABLE is not set
 | 
					# CONFIG_CPU_ICACHE_DISABLE is not set
 | 
				
			||||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
 | 
					# CONFIG_CPU_BPREDICT_DISABLE is not set
 | 
				
			||||||
 | 
					CONFIG_CPU_SPECTRE=y
 | 
				
			||||||
 | 
					CONFIG_HARDEN_BRANCH_PREDICTOR=y
 | 
				
			||||||
CONFIG_KUSER_HELPERS=y
 | 
					CONFIG_KUSER_HELPERS=y
 | 
				
			||||||
CONFIG_VDSO=y
 | 
					CONFIG_VDSO=y
 | 
				
			||||||
CONFIG_OUTER_CACHE=y
 | 
					CONFIG_OUTER_CACHE=y
 | 
				
			||||||
| 
						 | 
					@ -680,8 +679,8 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 | 
				
			||||||
CONFIG_PCI_SYSCALL=y
 | 
					CONFIG_PCI_SYSCALL=y
 | 
				
			||||||
CONFIG_PCIEPORTBUS=y
 | 
					CONFIG_PCIEPORTBUS=y
 | 
				
			||||||
CONFIG_PCIEAER=y
 | 
					CONFIG_PCIEAER=y
 | 
				
			||||||
# CONFIG_PCIE_ECRC is not set
 | 
					 | 
				
			||||||
CONFIG_PCIEAER_INJECT=m
 | 
					CONFIG_PCIEAER_INJECT=m
 | 
				
			||||||
 | 
					# CONFIG_PCIE_ECRC is not set
 | 
				
			||||||
CONFIG_PCIEASPM=y
 | 
					CONFIG_PCIEASPM=y
 | 
				
			||||||
# CONFIG_PCIEASPM_DEBUG is not set
 | 
					# CONFIG_PCIEASPM_DEBUG is not set
 | 
				
			||||||
CONFIG_PCIEASPM_DEFAULT=y
 | 
					CONFIG_PCIEASPM_DEFAULT=y
 | 
				
			||||||
| 
						 | 
					@ -691,7 +690,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 | 
				
			||||||
CONFIG_PCIE_PME=y
 | 
					CONFIG_PCIE_PME=y
 | 
				
			||||||
CONFIG_PCIE_DPC=y
 | 
					CONFIG_PCIE_DPC=y
 | 
				
			||||||
CONFIG_PCIE_PTM=y
 | 
					CONFIG_PCIE_PTM=y
 | 
				
			||||||
CONFIG_PCI_BUS_ADDR_T_64BIT=y
 | 
					 | 
				
			||||||
CONFIG_PCI_MSI=y
 | 
					CONFIG_PCI_MSI=y
 | 
				
			||||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
 | 
					CONFIG_PCI_MSI_IRQ_DOMAIN=y
 | 
				
			||||||
CONFIG_PCI_QUIRKS=y
 | 
					CONFIG_PCI_QUIRKS=y
 | 
				
			||||||
| 
						 | 
					@ -704,10 +702,23 @@ CONFIG_PCI_ECAM=y
 | 
				
			||||||
CONFIG_PCI_LABEL=y
 | 
					CONFIG_PCI_LABEL=y
 | 
				
			||||||
# CONFIG_HOTPLUG_PCI is not set
 | 
					# CONFIG_HOTPLUG_PCI is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# PCI controller drivers
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_PCI_MVEBU=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Cadence PCIe controllers support
 | 
					# Cadence PCIe controllers support
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_PCIE_CADENCE_HOST is not set
 | 
					# CONFIG_PCIE_CADENCE_HOST is not set
 | 
				
			||||||
 | 
					# CONFIG_PCI_FTPCI100 is not set
 | 
				
			||||||
 | 
					CONFIG_PCI_TEGRA=y
 | 
				
			||||||
 | 
					CONFIG_PCI_HOST_COMMON=y
 | 
				
			||||||
 | 
					CONFIG_PCI_HOST_GENERIC=y
 | 
				
			||||||
 | 
					# CONFIG_PCI_V3_SEMI is not set
 | 
				
			||||||
 | 
					# CONFIG_PCIE_ALTERA is not set
 | 
				
			||||||
 | 
					CONFIG_PCIE_ROCKCHIP=y
 | 
				
			||||||
 | 
					CONFIG_PCIE_ROCKCHIP_HOST=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# DesignWare PCI Core Support
 | 
					# DesignWare PCI Core Support
 | 
				
			||||||
| 
						 | 
					@ -716,23 +727,11 @@ CONFIG_PCIE_DW=y
 | 
				
			||||||
CONFIG_PCIE_DW_HOST=y
 | 
					CONFIG_PCIE_DW_HOST=y
 | 
				
			||||||
CONFIG_PCI_DRA7XX=y
 | 
					CONFIG_PCI_DRA7XX=y
 | 
				
			||||||
CONFIG_PCI_DRA7XX_HOST=y
 | 
					CONFIG_PCI_DRA7XX_HOST=y
 | 
				
			||||||
# CONFIG_PCIE_DW_PLAT is not set
 | 
					# CONFIG_PCIE_DW_PLAT_HOST is not set
 | 
				
			||||||
# CONFIG_PCI_EXYNOS is not set
 | 
					 | 
				
			||||||
CONFIG_PCI_IMX6=y
 | 
					CONFIG_PCI_IMX6=y
 | 
				
			||||||
# CONFIG_PCI_LAYERSCAPE is not set
 | 
					# CONFIG_PCI_LAYERSCAPE is not set
 | 
				
			||||||
# CONFIG_PCIE_ARMADA_8K is not set
 | 
					# CONFIG_PCIE_ARMADA_8K is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# PCI host controller drivers
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_PCI_MVEBU=y
 | 
					 | 
				
			||||||
# CONFIG_PCI_FTPCI100 is not set
 | 
					 | 
				
			||||||
CONFIG_PCI_TEGRA=y
 | 
					 | 
				
			||||||
CONFIG_PCI_HOST_COMMON=y
 | 
					 | 
				
			||||||
CONFIG_PCI_HOST_GENERIC=y
 | 
					 | 
				
			||||||
# CONFIG_PCI_V3_SEMI is not set
 | 
					 | 
				
			||||||
# CONFIG_PCIE_ROCKCHIP is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# PCI Endpoint
 | 
					# PCI Endpoint
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -827,8 +826,6 @@ CONFIG_FORCE_MAX_ZONEORDER=12
 | 
				
			||||||
CONFIG_ALIGNMENT_TRAP=y
 | 
					CONFIG_ALIGNMENT_TRAP=y
 | 
				
			||||||
# CONFIG_UACCESS_WITH_MEMCPY is not set
 | 
					# CONFIG_UACCESS_WITH_MEMCPY is not set
 | 
				
			||||||
CONFIG_SECCOMP=y
 | 
					CONFIG_SECCOMP=y
 | 
				
			||||||
CONFIG_SWIOTLB=y
 | 
					 | 
				
			||||||
CONFIG_IOMMU_HELPER=y
 | 
					 | 
				
			||||||
CONFIG_PARAVIRT=y
 | 
					CONFIG_PARAVIRT=y
 | 
				
			||||||
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 | 
					# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 | 
				
			||||||
CONFIG_XEN_DOM0=y
 | 
					CONFIG_XEN_DOM0=y
 | 
				
			||||||
| 
						 | 
					@ -886,7 +883,6 @@ CONFIG_CPUFREQ_DT=m
 | 
				
			||||||
CONFIG_CPUFREQ_DT_PLATDEV=y
 | 
					CONFIG_CPUFREQ_DT_PLATDEV=y
 | 
				
			||||||
CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 | 
					CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 | 
				
			||||||
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 | 
					# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 | 
				
			||||||
CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 | 
					 | 
				
			||||||
CONFIG_ARM_HIGHBANK_CPUFREQ=m
 | 
					CONFIG_ARM_HIGHBANK_CPUFREQ=m
 | 
				
			||||||
CONFIG_ARM_IMX6Q_CPUFREQ=m
 | 
					CONFIG_ARM_IMX6Q_CPUFREQ=m
 | 
				
			||||||
CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 | 
					CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 | 
				
			||||||
| 
						 | 
					@ -976,6 +972,7 @@ CONFIG_XFRM_IPCOMP=m
 | 
				
			||||||
CONFIG_NET_KEY=m
 | 
					CONFIG_NET_KEY=m
 | 
				
			||||||
CONFIG_NET_KEY_MIGRATE=y
 | 
					CONFIG_NET_KEY_MIGRATE=y
 | 
				
			||||||
# CONFIG_SMC is not set
 | 
					# CONFIG_SMC is not set
 | 
				
			||||||
 | 
					# CONFIG_XDP_SOCKETS is not set
 | 
				
			||||||
CONFIG_INET=y
 | 
					CONFIG_INET=y
 | 
				
			||||||
CONFIG_IP_MULTICAST=y
 | 
					CONFIG_IP_MULTICAST=y
 | 
				
			||||||
CONFIG_IP_ADVANCED_ROUTER=y
 | 
					CONFIG_IP_ADVANCED_ROUTER=y
 | 
				
			||||||
| 
						 | 
					@ -1125,21 +1122,18 @@ CONFIG_NF_NAT_FTP=m
 | 
				
			||||||
CONFIG_NF_NAT_IRC=m
 | 
					CONFIG_NF_NAT_IRC=m
 | 
				
			||||||
CONFIG_NF_NAT_SIP=m
 | 
					CONFIG_NF_NAT_SIP=m
 | 
				
			||||||
CONFIG_NF_NAT_TFTP=m
 | 
					CONFIG_NF_NAT_TFTP=m
 | 
				
			||||||
CONFIG_NF_NAT_REDIRECT=m
 | 
					CONFIG_NF_NAT_REDIRECT=y
 | 
				
			||||||
CONFIG_NETFILTER_SYNPROXY=m
 | 
					CONFIG_NETFILTER_SYNPROXY=m
 | 
				
			||||||
 | 
					CONFIG_NF_OSF=m
 | 
				
			||||||
CONFIG_NF_TABLES=m
 | 
					CONFIG_NF_TABLES=m
 | 
				
			||||||
 | 
					CONFIG_NF_TABLES_SET=m
 | 
				
			||||||
# CONFIG_NF_TABLES_INET is not set
 | 
					# CONFIG_NF_TABLES_INET is not set
 | 
				
			||||||
# CONFIG_NF_TABLES_NETDEV is not set
 | 
					# CONFIG_NF_TABLES_NETDEV is not set
 | 
				
			||||||
CONFIG_NFT_EXTHDR=m
 | 
					 | 
				
			||||||
CONFIG_NFT_META=m
 | 
					 | 
				
			||||||
# CONFIG_NFT_RT is not set
 | 
					 | 
				
			||||||
CONFIG_NFT_NUMGEN=m
 | 
					CONFIG_NFT_NUMGEN=m
 | 
				
			||||||
CONFIG_NFT_CT=m
 | 
					CONFIG_NFT_CT=m
 | 
				
			||||||
CONFIG_NFT_FLOW_OFFLOAD=m
 | 
					CONFIG_NFT_FLOW_OFFLOAD=m
 | 
				
			||||||
CONFIG_NFT_SET_RBTREE=m
 | 
					 | 
				
			||||||
CONFIG_NFT_SET_HASH=m
 | 
					 | 
				
			||||||
# CONFIG_NFT_SET_BITMAP is not set
 | 
					 | 
				
			||||||
CONFIG_NFT_COUNTER=m
 | 
					CONFIG_NFT_COUNTER=m
 | 
				
			||||||
 | 
					CONFIG_NFT_CONNLIMIT=m
 | 
				
			||||||
CONFIG_NFT_LOG=m
 | 
					CONFIG_NFT_LOG=m
 | 
				
			||||||
CONFIG_NFT_LIMIT=m
 | 
					CONFIG_NFT_LIMIT=m
 | 
				
			||||||
CONFIG_NFT_MASQ=m
 | 
					CONFIG_NFT_MASQ=m
 | 
				
			||||||
| 
						 | 
					@ -1151,6 +1145,7 @@ CONFIG_NFT_QUOTA=m
 | 
				
			||||||
CONFIG_NFT_REJECT=m
 | 
					CONFIG_NFT_REJECT=m
 | 
				
			||||||
CONFIG_NFT_COMPAT=m
 | 
					CONFIG_NFT_COMPAT=m
 | 
				
			||||||
CONFIG_NFT_HASH=m
 | 
					CONFIG_NFT_HASH=m
 | 
				
			||||||
 | 
					CONFIG_NFT_SOCKET=m
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE_INET=m
 | 
					CONFIG_NF_FLOW_TABLE_INET=m
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE=m
 | 
					CONFIG_NF_FLOW_TABLE=m
 | 
				
			||||||
CONFIG_NETFILTER_XTABLES=m
 | 
					CONFIG_NETFILTER_XTABLES=m
 | 
				
			||||||
| 
						 | 
					@ -1287,6 +1282,7 @@ CONFIG_IP_VS_LBLC=m
 | 
				
			||||||
CONFIG_IP_VS_LBLCR=m
 | 
					CONFIG_IP_VS_LBLCR=m
 | 
				
			||||||
CONFIG_IP_VS_DH=m
 | 
					CONFIG_IP_VS_DH=m
 | 
				
			||||||
CONFIG_IP_VS_SH=m
 | 
					CONFIG_IP_VS_SH=m
 | 
				
			||||||
 | 
					CONFIG_IP_VS_MH=m
 | 
				
			||||||
CONFIG_IP_VS_SED=m
 | 
					CONFIG_IP_VS_SED=m
 | 
				
			||||||
CONFIG_IP_VS_NQ=m
 | 
					CONFIG_IP_VS_NQ=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1295,6 +1291,11 @@ CONFIG_IP_VS_NQ=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_IP_VS_SH_TAB_BITS=8
 | 
					CONFIG_IP_VS_SH_TAB_BITS=8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# IPVS MH scheduler
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_IP_VS_MH_TAB_INDEX=12
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# IPVS application helper
 | 
					# IPVS application helper
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -1308,6 +1309,7 @@ CONFIG_IP_VS_PE_SIP=m
 | 
				
			||||||
CONFIG_NF_DEFRAG_IPV4=m
 | 
					CONFIG_NF_DEFRAG_IPV4=m
 | 
				
			||||||
CONFIG_NF_CONNTRACK_IPV4=m
 | 
					CONFIG_NF_CONNTRACK_IPV4=m
 | 
				
			||||||
CONFIG_NF_SOCKET_IPV4=m
 | 
					CONFIG_NF_SOCKET_IPV4=m
 | 
				
			||||||
 | 
					CONFIG_NF_TPROXY_IPV4=m
 | 
				
			||||||
# CONFIG_NF_TABLES_IPV4 is not set
 | 
					# CONFIG_NF_TABLES_IPV4 is not set
 | 
				
			||||||
# CONFIG_NF_TABLES_ARP is not set
 | 
					# CONFIG_NF_TABLES_ARP is not set
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE_IPV4=m
 | 
					CONFIG_NF_FLOW_TABLE_IPV4=m
 | 
				
			||||||
| 
						 | 
					@ -1316,7 +1318,7 @@ CONFIG_NF_LOG_ARP=m
 | 
				
			||||||
CONFIG_NF_LOG_IPV4=m
 | 
					CONFIG_NF_LOG_IPV4=m
 | 
				
			||||||
CONFIG_NF_REJECT_IPV4=m
 | 
					CONFIG_NF_REJECT_IPV4=m
 | 
				
			||||||
CONFIG_NF_NAT_IPV4=m
 | 
					CONFIG_NF_NAT_IPV4=m
 | 
				
			||||||
CONFIG_NF_NAT_MASQUERADE_IPV4=m
 | 
					CONFIG_NF_NAT_MASQUERADE_IPV4=y
 | 
				
			||||||
CONFIG_NF_NAT_SNMP_BASIC=m
 | 
					CONFIG_NF_NAT_SNMP_BASIC=m
 | 
				
			||||||
CONFIG_NF_NAT_PROTO_GRE=m
 | 
					CONFIG_NF_NAT_PROTO_GRE=m
 | 
				
			||||||
CONFIG_NF_NAT_PPTP=m
 | 
					CONFIG_NF_NAT_PPTP=m
 | 
				
			||||||
| 
						 | 
					@ -1349,13 +1351,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 | 
				
			||||||
CONFIG_NF_DEFRAG_IPV6=m
 | 
					CONFIG_NF_DEFRAG_IPV6=m
 | 
				
			||||||
CONFIG_NF_CONNTRACK_IPV6=m
 | 
					CONFIG_NF_CONNTRACK_IPV6=m
 | 
				
			||||||
CONFIG_NF_SOCKET_IPV6=m
 | 
					CONFIG_NF_SOCKET_IPV6=m
 | 
				
			||||||
 | 
					CONFIG_NF_TPROXY_IPV6=m
 | 
				
			||||||
# CONFIG_NF_TABLES_IPV6 is not set
 | 
					# CONFIG_NF_TABLES_IPV6 is not set
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE_IPV6=m
 | 
					CONFIG_NF_FLOW_TABLE_IPV6=m
 | 
				
			||||||
CONFIG_NF_DUP_IPV6=m
 | 
					CONFIG_NF_DUP_IPV6=m
 | 
				
			||||||
CONFIG_NF_REJECT_IPV6=m
 | 
					CONFIG_NF_REJECT_IPV6=m
 | 
				
			||||||
CONFIG_NF_LOG_IPV6=m
 | 
					CONFIG_NF_LOG_IPV6=m
 | 
				
			||||||
CONFIG_NF_NAT_IPV6=m
 | 
					CONFIG_NF_NAT_IPV6=m
 | 
				
			||||||
CONFIG_NF_NAT_MASQUERADE_IPV6=m
 | 
					CONFIG_NF_NAT_MASQUERADE_IPV6=y
 | 
				
			||||||
CONFIG_IP6_NF_IPTABLES=m
 | 
					CONFIG_IP6_NF_IPTABLES=m
 | 
				
			||||||
CONFIG_IP6_NF_MATCH_AH=m
 | 
					CONFIG_IP6_NF_MATCH_AH=m
 | 
				
			||||||
CONFIG_IP6_NF_MATCH_EUI64=m
 | 
					CONFIG_IP6_NF_MATCH_EUI64=m
 | 
				
			||||||
| 
						 | 
					@ -1399,6 +1402,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 | 
				
			||||||
CONFIG_BRIDGE_EBT_SNAT=m
 | 
					CONFIG_BRIDGE_EBT_SNAT=m
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=m
 | 
					CONFIG_BRIDGE_EBT_LOG=m
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=m
 | 
					CONFIG_BRIDGE_EBT_NFLOG=m
 | 
				
			||||||
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_IP_DCCP=m
 | 
					CONFIG_IP_DCCP=m
 | 
				
			||||||
CONFIG_INET_DCCP_DIAG=m
 | 
					CONFIG_INET_DCCP_DIAG=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1787,6 +1791,8 @@ CONFIG_DST_CACHE=y
 | 
				
			||||||
CONFIG_GRO_CELLS=y
 | 
					CONFIG_GRO_CELLS=y
 | 
				
			||||||
CONFIG_NET_DEVLINK=m
 | 
					CONFIG_NET_DEVLINK=m
 | 
				
			||||||
CONFIG_MAY_USE_DEVLINK=m
 | 
					CONFIG_MAY_USE_DEVLINK=m
 | 
				
			||||||
 | 
					CONFIG_PAGE_POOL=y
 | 
				
			||||||
 | 
					CONFIG_FAILOVER=m
 | 
				
			||||||
CONFIG_HAVE_EBPF_JIT=y
 | 
					CONFIG_HAVE_EBPF_JIT=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -1803,6 +1809,10 @@ CONFIG_DEVTMPFS=y
 | 
				
			||||||
CONFIG_DEVTMPFS_MOUNT=y
 | 
					CONFIG_DEVTMPFS_MOUNT=y
 | 
				
			||||||
CONFIG_STANDALONE=y
 | 
					CONFIG_STANDALONE=y
 | 
				
			||||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
 | 
					CONFIG_PREVENT_FIRMWARE_BUILD=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Firmware loader
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
CONFIG_FW_LOADER=y
 | 
					CONFIG_FW_LOADER=y
 | 
				
			||||||
CONFIG_EXTRA_FIRMWARE=""
 | 
					CONFIG_EXTRA_FIRMWARE=""
 | 
				
			||||||
CONFIG_FW_LOADER_USER_HELPER=y
 | 
					CONFIG_FW_LOADER_USER_HELPER=y
 | 
				
			||||||
| 
						 | 
					@ -2002,6 +2012,7 @@ CONFIG_CDROM=m
 | 
				
			||||||
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 | 
					CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 | 
				
			||||||
CONFIG_ZRAM=m
 | 
					CONFIG_ZRAM=m
 | 
				
			||||||
# CONFIG_ZRAM_WRITEBACK is not set
 | 
					# CONFIG_ZRAM_WRITEBACK is not set
 | 
				
			||||||
 | 
					# CONFIG_ZRAM_MEMORY_TRACKING is not set
 | 
				
			||||||
# CONFIG_BLK_DEV_DAC960 is not set
 | 
					# CONFIG_BLK_DEV_DAC960 is not set
 | 
				
			||||||
# CONFIG_BLK_DEV_UMEM is not set
 | 
					# CONFIG_BLK_DEV_UMEM is not set
 | 
				
			||||||
CONFIG_BLK_DEV_LOOP=m
 | 
					CONFIG_BLK_DEV_LOOP=m
 | 
				
			||||||
| 
						 | 
					@ -2373,6 +2384,7 @@ CONFIG_DM_SNAPSHOT=m
 | 
				
			||||||
CONFIG_DM_THIN_PROVISIONING=m
 | 
					CONFIG_DM_THIN_PROVISIONING=m
 | 
				
			||||||
CONFIG_DM_CACHE=m
 | 
					CONFIG_DM_CACHE=m
 | 
				
			||||||
CONFIG_DM_CACHE_SMQ=m
 | 
					CONFIG_DM_CACHE_SMQ=m
 | 
				
			||||||
 | 
					# CONFIG_DM_WRITECACHE is not set
 | 
				
			||||||
CONFIG_DM_ERA=m
 | 
					CONFIG_DM_ERA=m
 | 
				
			||||||
CONFIG_DM_MIRROR=m
 | 
					CONFIG_DM_MIRROR=m
 | 
				
			||||||
CONFIG_DM_LOG_USERSPACE=m
 | 
					CONFIG_DM_LOG_USERSPACE=m
 | 
				
			||||||
| 
						 | 
					@ -2519,8 +2531,6 @@ CONFIG_ATL1E=m
 | 
				
			||||||
CONFIG_ATL1C=m
 | 
					CONFIG_ATL1C=m
 | 
				
			||||||
CONFIG_ALX=m
 | 
					CONFIG_ALX=m
 | 
				
			||||||
# CONFIG_NET_VENDOR_AURORA is not set
 | 
					# CONFIG_NET_VENDOR_AURORA is not set
 | 
				
			||||||
CONFIG_NET_CADENCE=y
 | 
					 | 
				
			||||||
# CONFIG_MACB is not set
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_BROADCOM=y
 | 
					CONFIG_NET_VENDOR_BROADCOM=y
 | 
				
			||||||
# CONFIG_B44 is not set
 | 
					# CONFIG_B44 is not set
 | 
				
			||||||
# CONFIG_BCMGENET is not set
 | 
					# CONFIG_BCMGENET is not set
 | 
				
			||||||
| 
						 | 
					@ -2535,6 +2545,8 @@ CONFIG_BNXT_FLOWER_OFFLOAD=y
 | 
				
			||||||
# CONFIG_BNXT_DCB is not set
 | 
					# CONFIG_BNXT_DCB is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_BROCADE=y
 | 
					CONFIG_NET_VENDOR_BROCADE=y
 | 
				
			||||||
CONFIG_BNA=m
 | 
					CONFIG_BNA=m
 | 
				
			||||||
 | 
					CONFIG_NET_CADENCE=y
 | 
				
			||||||
 | 
					# CONFIG_MACB is not set
 | 
				
			||||||
CONFIG_NET_CALXEDA_XGMAC=m
 | 
					CONFIG_NET_CALXEDA_XGMAC=m
 | 
				
			||||||
CONFIG_NET_VENDOR_CAVIUM=y
 | 
					CONFIG_NET_VENDOR_CAVIUM=y
 | 
				
			||||||
CONFIG_NET_VENDOR_CHELSIO=y
 | 
					CONFIG_NET_VENDOR_CHELSIO=y
 | 
				
			||||||
| 
						 | 
					@ -2575,10 +2587,6 @@ CONFIG_BE2NET=m
 | 
				
			||||||
CONFIG_BE2NET_HWMON=y
 | 
					CONFIG_BE2NET_HWMON=y
 | 
				
			||||||
CONFIG_NET_VENDOR_EZCHIP=y
 | 
					CONFIG_NET_VENDOR_EZCHIP=y
 | 
				
			||||||
# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 | 
					# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_EXAR=y
 | 
					 | 
				
			||||||
CONFIG_S2IO=m
 | 
					 | 
				
			||||||
CONFIG_VXGE=m
 | 
					 | 
				
			||||||
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_FARADAY=y
 | 
					CONFIG_NET_VENDOR_FARADAY=y
 | 
				
			||||||
# CONFIG_FTMAC100 is not set
 | 
					# CONFIG_FTMAC100 is not set
 | 
				
			||||||
# CONFIG_FTGMAC100 is not set
 | 
					# CONFIG_FTGMAC100 is not set
 | 
				
			||||||
| 
						 | 
					@ -2598,6 +2606,7 @@ CONFIG_NET_VENDOR_HISILICON=y
 | 
				
			||||||
CONFIG_NET_VENDOR_HP=y
 | 
					CONFIG_NET_VENDOR_HP=y
 | 
				
			||||||
# CONFIG_HP100 is not set
 | 
					# CONFIG_HP100 is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_HUAWEI=y
 | 
					CONFIG_NET_VENDOR_HUAWEI=y
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_I825XX=y
 | 
				
			||||||
CONFIG_NET_VENDOR_INTEL=y
 | 
					CONFIG_NET_VENDOR_INTEL=y
 | 
				
			||||||
CONFIG_E100=m
 | 
					CONFIG_E100=m
 | 
				
			||||||
CONFIG_E1000=m
 | 
					CONFIG_E1000=m
 | 
				
			||||||
| 
						 | 
					@ -2615,7 +2624,10 @@ CONFIG_I40E_DCB=y
 | 
				
			||||||
CONFIG_I40EVF=m
 | 
					CONFIG_I40EVF=m
 | 
				
			||||||
# CONFIG_ICE is not set
 | 
					# CONFIG_ICE is not set
 | 
				
			||||||
# CONFIG_FM10K is not set
 | 
					# CONFIG_FM10K is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_I825XX=y
 | 
					CONFIG_NET_VENDOR_EXAR=y
 | 
				
			||||||
 | 
					CONFIG_S2IO=m
 | 
				
			||||||
 | 
					CONFIG_VXGE=m
 | 
				
			||||||
 | 
					# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 | 
				
			||||||
CONFIG_JME=m
 | 
					CONFIG_JME=m
 | 
				
			||||||
CONFIG_NET_VENDOR_MARVELL=y
 | 
					CONFIG_NET_VENDOR_MARVELL=y
 | 
				
			||||||
# CONFIG_MV643XX_ETH is not set
 | 
					# CONFIG_MV643XX_ETH is not set
 | 
				
			||||||
| 
						 | 
					@ -2653,6 +2665,8 @@ CONFIG_ENC28J60=m
 | 
				
			||||||
# CONFIG_ENC28J60_WRITEVERIFY is not set
 | 
					# CONFIG_ENC28J60_WRITEVERIFY is not set
 | 
				
			||||||
# CONFIG_ENCX24J600 is not set
 | 
					# CONFIG_ENCX24J600 is not set
 | 
				
			||||||
# CONFIG_LAN743X is not set
 | 
					# CONFIG_LAN743X is not set
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_MICROSEMI=y
 | 
				
			||||||
 | 
					# CONFIG_MSCC_OCELOT_SWITCH is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_MYRI=y
 | 
					CONFIG_NET_VENDOR_MYRI=y
 | 
				
			||||||
CONFIG_MYRI10GE=m
 | 
					CONFIG_MYRI10GE=m
 | 
				
			||||||
CONFIG_FEALNX=m
 | 
					CONFIG_FEALNX=m
 | 
				
			||||||
| 
						 | 
					@ -2662,6 +2676,7 @@ CONFIG_NS83820=m
 | 
				
			||||||
CONFIG_NET_VENDOR_NETRONOME=y
 | 
					CONFIG_NET_VENDOR_NETRONOME=y
 | 
				
			||||||
CONFIG_NFP=m
 | 
					CONFIG_NFP=m
 | 
				
			||||||
# CONFIG_NFP_APP_FLOWER is not set
 | 
					# CONFIG_NFP_APP_FLOWER is not set
 | 
				
			||||||
 | 
					CONFIG_NFP_APP_ABM_NIC=y
 | 
				
			||||||
# CONFIG_NFP_DEBUG is not set
 | 
					# CONFIG_NFP_DEBUG is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_NI=y
 | 
					CONFIG_NET_VENDOR_NI=y
 | 
				
			||||||
CONFIG_NET_VENDOR_8390=y
 | 
					CONFIG_NET_VENDOR_8390=y
 | 
				
			||||||
| 
						 | 
					@ -2687,6 +2702,8 @@ CONFIG_NET_VENDOR_QUALCOMM=y
 | 
				
			||||||
# CONFIG_QCA7000_SPI is not set
 | 
					# CONFIG_QCA7000_SPI is not set
 | 
				
			||||||
# CONFIG_QCOM_EMAC is not set
 | 
					# CONFIG_QCOM_EMAC is not set
 | 
				
			||||||
CONFIG_RMNET=m
 | 
					CONFIG_RMNET=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_RDC=y
 | 
				
			||||||
 | 
					CONFIG_R6040=m
 | 
				
			||||||
CONFIG_NET_VENDOR_REALTEK=y
 | 
					CONFIG_NET_VENDOR_REALTEK=y
 | 
				
			||||||
CONFIG_8139CP=m
 | 
					CONFIG_8139CP=m
 | 
				
			||||||
CONFIG_8139TOO=m
 | 
					CONFIG_8139TOO=m
 | 
				
			||||||
| 
						 | 
					@ -2696,18 +2713,11 @@ CONFIG_8139TOO_8129=y
 | 
				
			||||||
# CONFIG_8139_OLD_RX_RESET is not set
 | 
					# CONFIG_8139_OLD_RX_RESET is not set
 | 
				
			||||||
CONFIG_R8169=m
 | 
					CONFIG_R8169=m
 | 
				
			||||||
CONFIG_NET_VENDOR_RENESAS=y
 | 
					CONFIG_NET_VENDOR_RENESAS=y
 | 
				
			||||||
CONFIG_NET_VENDOR_RDC=y
 | 
					 | 
				
			||||||
CONFIG_R6040=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_ROCKER=y
 | 
					CONFIG_NET_VENDOR_ROCKER=y
 | 
				
			||||||
# CONFIG_ROCKER is not set
 | 
					# CONFIG_ROCKER is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_SAMSUNG=y
 | 
					CONFIG_NET_VENDOR_SAMSUNG=y
 | 
				
			||||||
# CONFIG_SXGBE_ETH is not set
 | 
					# CONFIG_SXGBE_ETH is not set
 | 
				
			||||||
# CONFIG_NET_VENDOR_SEEQ is not set
 | 
					# CONFIG_NET_VENDOR_SEEQ is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_SILAN=y
 | 
					 | 
				
			||||||
CONFIG_SC92031=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_SIS=y
 | 
					 | 
				
			||||||
# CONFIG_SIS900 is not set
 | 
					 | 
				
			||||||
CONFIG_SIS190=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_SOLARFLARE=y
 | 
					CONFIG_NET_VENDOR_SOLARFLARE=y
 | 
				
			||||||
CONFIG_SFC=m
 | 
					CONFIG_SFC=m
 | 
				
			||||||
CONFIG_SFC_MTD=y
 | 
					CONFIG_SFC_MTD=y
 | 
				
			||||||
| 
						 | 
					@ -2715,6 +2725,11 @@ CONFIG_SFC_MCDI_MON=y
 | 
				
			||||||
CONFIG_SFC_MCDI_LOGGING=y
 | 
					CONFIG_SFC_MCDI_LOGGING=y
 | 
				
			||||||
CONFIG_SFC_FALCON=m
 | 
					CONFIG_SFC_FALCON=m
 | 
				
			||||||
CONFIG_SFC_FALCON_MTD=y
 | 
					CONFIG_SFC_FALCON_MTD=y
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_SILAN=y
 | 
				
			||||||
 | 
					CONFIG_SC92031=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_SIS=y
 | 
				
			||||||
 | 
					# CONFIG_SIS900 is not set
 | 
				
			||||||
 | 
					CONFIG_SIS190=m
 | 
				
			||||||
CONFIG_NET_VENDOR_SMSC=y
 | 
					CONFIG_NET_VENDOR_SMSC=y
 | 
				
			||||||
CONFIG_SMC91X=m
 | 
					CONFIG_SMC91X=m
 | 
				
			||||||
CONFIG_EPIC100=m
 | 
					CONFIG_EPIC100=m
 | 
				
			||||||
| 
						 | 
					@ -2737,6 +2752,8 @@ CONFIG_NET_VENDOR_SUN=y
 | 
				
			||||||
# CONFIG_SUNGEM is not set
 | 
					# CONFIG_SUNGEM is not set
 | 
				
			||||||
CONFIG_CASSINI=m
 | 
					CONFIG_CASSINI=m
 | 
				
			||||||
CONFIG_NIU=m
 | 
					CONFIG_NIU=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_SYNOPSYS=y
 | 
				
			||||||
 | 
					# CONFIG_DWC_XLGMAC is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_TEHUTI=y
 | 
					CONFIG_NET_VENDOR_TEHUTI=y
 | 
				
			||||||
CONFIG_TEHUTI=m
 | 
					CONFIG_TEHUTI=m
 | 
				
			||||||
CONFIG_NET_VENDOR_TI=y
 | 
					CONFIG_NET_VENDOR_TI=y
 | 
				
			||||||
| 
						 | 
					@ -2754,8 +2771,6 @@ CONFIG_VIA_VELOCITY=m
 | 
				
			||||||
CONFIG_NET_VENDOR_WIZNET=y
 | 
					CONFIG_NET_VENDOR_WIZNET=y
 | 
				
			||||||
# CONFIG_WIZNET_W5100 is not set
 | 
					# CONFIG_WIZNET_W5100 is not set
 | 
				
			||||||
# CONFIG_WIZNET_W5300 is not set
 | 
					# CONFIG_WIZNET_W5300 is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_SYNOPSYS=y
 | 
					 | 
				
			||||||
# CONFIG_DWC_XLGMAC is not set
 | 
					 | 
				
			||||||
CONFIG_FDDI=y
 | 
					CONFIG_FDDI=y
 | 
				
			||||||
CONFIG_DEFXX=m
 | 
					CONFIG_DEFXX=m
 | 
				
			||||||
# CONFIG_DEFXX_MMIO is not set
 | 
					# CONFIG_DEFXX_MMIO is not set
 | 
				
			||||||
| 
						 | 
					@ -2770,6 +2785,7 @@ CONFIG_MDIO_BUS_MUX=m
 | 
				
			||||||
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 | 
					# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 | 
				
			||||||
# CONFIG_MDIO_HISI_FEMAC is not set
 | 
					# CONFIG_MDIO_HISI_FEMAC is not set
 | 
				
			||||||
CONFIG_MDIO_I2C=m
 | 
					CONFIG_MDIO_I2C=m
 | 
				
			||||||
 | 
					# CONFIG_MDIO_MSCC_MIIM is not set
 | 
				
			||||||
CONFIG_MDIO_SUN4I=y
 | 
					CONFIG_MDIO_SUN4I=y
 | 
				
			||||||
CONFIG_PHYLINK=m
 | 
					CONFIG_PHYLINK=m
 | 
				
			||||||
CONFIG_PHYLIB=y
 | 
					CONFIG_PHYLIB=y
 | 
				
			||||||
| 
						 | 
					@ -2782,6 +2798,7 @@ CONFIG_SWPHY=y
 | 
				
			||||||
CONFIG_SFP=m
 | 
					CONFIG_SFP=m
 | 
				
			||||||
CONFIG_AMD_PHY=m
 | 
					CONFIG_AMD_PHY=m
 | 
				
			||||||
CONFIG_AQUANTIA_PHY=m
 | 
					CONFIG_AQUANTIA_PHY=m
 | 
				
			||||||
 | 
					CONFIG_ASIX_PHY=m
 | 
				
			||||||
CONFIG_AT803X_PHY=m
 | 
					CONFIG_AT803X_PHY=m
 | 
				
			||||||
CONFIG_BCM7XXX_PHY=m
 | 
					CONFIG_BCM7XXX_PHY=m
 | 
				
			||||||
CONFIG_BCM87XX_PHY=m
 | 
					CONFIG_BCM87XX_PHY=m
 | 
				
			||||||
| 
						 | 
					@ -2791,6 +2808,7 @@ CONFIG_CICADA_PHY=m
 | 
				
			||||||
# CONFIG_CORTINA_PHY is not set
 | 
					# CONFIG_CORTINA_PHY is not set
 | 
				
			||||||
CONFIG_DAVICOM_PHY=m
 | 
					CONFIG_DAVICOM_PHY=m
 | 
				
			||||||
CONFIG_DP83822_PHY=m
 | 
					CONFIG_DP83822_PHY=m
 | 
				
			||||||
 | 
					CONFIG_DP83TC811_PHY=m
 | 
				
			||||||
CONFIG_DP83848_PHY=m
 | 
					CONFIG_DP83848_PHY=m
 | 
				
			||||||
CONFIG_DP83867_PHY=m
 | 
					CONFIG_DP83867_PHY=m
 | 
				
			||||||
CONFIG_FIXED_PHY=y
 | 
					CONFIG_FIXED_PHY=y
 | 
				
			||||||
| 
						 | 
					@ -2802,6 +2820,7 @@ CONFIG_MARVELL_PHY=m
 | 
				
			||||||
# CONFIG_MARVELL_10G_PHY is not set
 | 
					# CONFIG_MARVELL_10G_PHY is not set
 | 
				
			||||||
CONFIG_MICREL_PHY=m
 | 
					CONFIG_MICREL_PHY=m
 | 
				
			||||||
CONFIG_MICROCHIP_PHY=m
 | 
					CONFIG_MICROCHIP_PHY=m
 | 
				
			||||||
 | 
					CONFIG_MICROCHIP_T1_PHY=m
 | 
				
			||||||
CONFIG_MICROSEMI_PHY=m
 | 
					CONFIG_MICROSEMI_PHY=m
 | 
				
			||||||
CONFIG_NATIONAL_PHY=m
 | 
					CONFIG_NATIONAL_PHY=m
 | 
				
			||||||
CONFIG_QSEMI_PHY=m
 | 
					CONFIG_QSEMI_PHY=m
 | 
				
			||||||
| 
						 | 
					@ -2921,6 +2940,7 @@ CONFIG_WIL6210_ISR_COR=y
 | 
				
			||||||
CONFIG_WIL6210_TRACING=y
 | 
					CONFIG_WIL6210_TRACING=y
 | 
				
			||||||
CONFIG_WIL6210_DEBUGFS=y
 | 
					CONFIG_WIL6210_DEBUGFS=y
 | 
				
			||||||
CONFIG_ATH10K=m
 | 
					CONFIG_ATH10K=m
 | 
				
			||||||
 | 
					CONFIG_ATH10K_CE=y
 | 
				
			||||||
CONFIG_ATH10K_PCI=m
 | 
					CONFIG_ATH10K_PCI=m
 | 
				
			||||||
# CONFIG_ATH10K_AHB is not set
 | 
					# CONFIG_ATH10K_AHB is not set
 | 
				
			||||||
# CONFIG_ATH10K_SDIO is not set
 | 
					# CONFIG_ATH10K_SDIO is not set
 | 
				
			||||||
| 
						 | 
					@ -3133,6 +3153,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 | 
				
			||||||
CONFIG_XEN_NETDEV_BACKEND=m
 | 
					CONFIG_XEN_NETDEV_BACKEND=m
 | 
				
			||||||
# CONFIG_VMXNET3 is not set
 | 
					# CONFIG_VMXNET3 is not set
 | 
				
			||||||
CONFIG_NETDEVSIM=m
 | 
					CONFIG_NETDEVSIM=m
 | 
				
			||||||
 | 
					CONFIG_NET_FAILOVER=m
 | 
				
			||||||
# CONFIG_ISDN is not set
 | 
					# CONFIG_ISDN is not set
 | 
				
			||||||
# CONFIG_NVM is not set
 | 
					# CONFIG_NVM is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3206,6 +3227,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_CYPRESS=y
 | 
					CONFIG_MOUSE_PS2_CYPRESS=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_TRACKPOINT=y
 | 
					CONFIG_MOUSE_PS2_TRACKPOINT=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_ELANTECH=y
 | 
					CONFIG_MOUSE_PS2_ELANTECH=y
 | 
				
			||||||
 | 
					CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_SENTELIC=y
 | 
					CONFIG_MOUSE_PS2_SENTELIC=y
 | 
				
			||||||
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 | 
					# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 | 
				
			||||||
CONFIG_MOUSE_PS2_FOCALTECH=y
 | 
					CONFIG_MOUSE_PS2_FOCALTECH=y
 | 
				
			||||||
| 
						 | 
					@ -3616,6 +3638,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
 | 
				
			||||||
CONFIG_SPI=y
 | 
					CONFIG_SPI=y
 | 
				
			||||||
# CONFIG_SPI_DEBUG is not set
 | 
					# CONFIG_SPI_DEBUG is not set
 | 
				
			||||||
CONFIG_SPI_MASTER=y
 | 
					CONFIG_SPI_MASTER=y
 | 
				
			||||||
 | 
					CONFIG_SPI_MEM=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# SPI Master Controller Drivers
 | 
					# SPI Master Controller Drivers
 | 
				
			||||||
| 
						 | 
					@ -3729,7 +3752,6 @@ CONFIG_PINCTRL_ARMADA_XP=y
 | 
				
			||||||
CONFIG_PINCTRL_SAMSUNG=y
 | 
					CONFIG_PINCTRL_SAMSUNG=y
 | 
				
			||||||
CONFIG_PINCTRL_EXYNOS=y
 | 
					CONFIG_PINCTRL_EXYNOS=y
 | 
				
			||||||
CONFIG_PINCTRL_EXYNOS_ARM=y
 | 
					CONFIG_PINCTRL_EXYNOS_ARM=y
 | 
				
			||||||
CONFIG_PINCTRL_EXYNOS5440=y
 | 
					 | 
				
			||||||
CONFIG_PINCTRL_SUNXI=y
 | 
					CONFIG_PINCTRL_SUNXI=y
 | 
				
			||||||
CONFIG_PINCTRL_SUN4I_A10=y
 | 
					CONFIG_PINCTRL_SUN4I_A10=y
 | 
				
			||||||
CONFIG_PINCTRL_SUN5I=y
 | 
					CONFIG_PINCTRL_SUN5I=y
 | 
				
			||||||
| 
						 | 
					@ -3753,6 +3775,7 @@ CONFIG_PINCTRL_WMT=y
 | 
				
			||||||
CONFIG_PINCTRL_WM8850=y
 | 
					CONFIG_PINCTRL_WM8850=y
 | 
				
			||||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 | 
					CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 | 
				
			||||||
CONFIG_GPIOLIB=y
 | 
					CONFIG_GPIOLIB=y
 | 
				
			||||||
 | 
					CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 | 
				
			||||||
CONFIG_OF_GPIO=y
 | 
					CONFIG_OF_GPIO=y
 | 
				
			||||||
CONFIG_GPIOLIB_IRQCHIP=y
 | 
					CONFIG_GPIOLIB_IRQCHIP=y
 | 
				
			||||||
# CONFIG_DEBUG_GPIO is not set
 | 
					# CONFIG_DEBUG_GPIO is not set
 | 
				
			||||||
| 
						 | 
					@ -4362,6 +4385,7 @@ CONFIG_REGULATOR_S2MPA01=m
 | 
				
			||||||
CONFIG_REGULATOR_S2MPS11=m
 | 
					CONFIG_REGULATOR_S2MPS11=m
 | 
				
			||||||
CONFIG_REGULATOR_S5M8767=m
 | 
					CONFIG_REGULATOR_S5M8767=m
 | 
				
			||||||
CONFIG_REGULATOR_TI_ABB=m
 | 
					CONFIG_REGULATOR_TI_ABB=m
 | 
				
			||||||
 | 
					CONFIG_REGULATOR_SY8106A=m
 | 
				
			||||||
# CONFIG_REGULATOR_TPS51632 is not set
 | 
					# CONFIG_REGULATOR_TPS51632 is not set
 | 
				
			||||||
# CONFIG_REGULATOR_TPS62360 is not set
 | 
					# CONFIG_REGULATOR_TPS62360 is not set
 | 
				
			||||||
# CONFIG_REGULATOR_TPS65023 is not set
 | 
					# CONFIG_REGULATOR_TPS65023 is not set
 | 
				
			||||||
| 
						 | 
					@ -4376,6 +4400,7 @@ CONFIG_CEC_NOTIFIER=y
 | 
				
			||||||
CONFIG_RC_CORE=y
 | 
					CONFIG_RC_CORE=y
 | 
				
			||||||
CONFIG_RC_MAP=m
 | 
					CONFIG_RC_MAP=m
 | 
				
			||||||
CONFIG_LIRC=y
 | 
					CONFIG_LIRC=y
 | 
				
			||||||
 | 
					# CONFIG_BPF_LIRC_MODE2 is not set
 | 
				
			||||||
CONFIG_RC_DECODERS=y
 | 
					CONFIG_RC_DECODERS=y
 | 
				
			||||||
CONFIG_IR_NEC_DECODER=m
 | 
					CONFIG_IR_NEC_DECODER=m
 | 
				
			||||||
CONFIG_IR_RC5_DECODER=m
 | 
					CONFIG_IR_RC5_DECODER=m
 | 
				
			||||||
| 
						 | 
					@ -4433,7 +4458,6 @@ CONFIG_V4L2_FWNODE=m
 | 
				
			||||||
CONFIG_VIDEOBUF_GEN=m
 | 
					CONFIG_VIDEOBUF_GEN=m
 | 
				
			||||||
CONFIG_VIDEOBUF_DMA_SG=m
 | 
					CONFIG_VIDEOBUF_DMA_SG=m
 | 
				
			||||||
CONFIG_VIDEOBUF_VMALLOC=m
 | 
					CONFIG_VIDEOBUF_VMALLOC=m
 | 
				
			||||||
CONFIG_VIDEOBUF_DVB=m
 | 
					 | 
				
			||||||
CONFIG_DVB_CORE=y
 | 
					CONFIG_DVB_CORE=y
 | 
				
			||||||
# CONFIG_DVB_MMAP is not set
 | 
					# CONFIG_DVB_MMAP is not set
 | 
				
			||||||
CONFIG_DVB_NET=y
 | 
					CONFIG_DVB_NET=y
 | 
				
			||||||
| 
						 | 
					@ -4686,6 +4710,9 @@ CONFIG_DVB_SMIPCIE=m
 | 
				
			||||||
CONFIG_DVB_NETUP_UNIDVB=m
 | 
					CONFIG_DVB_NETUP_UNIDVB=m
 | 
				
			||||||
CONFIG_V4L_PLATFORM_DRIVERS=y
 | 
					CONFIG_V4L_PLATFORM_DRIVERS=y
 | 
				
			||||||
CONFIG_VIDEO_CAFE_CCIC=m
 | 
					CONFIG_VIDEO_CAFE_CCIC=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_CADENCE=y
 | 
				
			||||||
 | 
					CONFIG_VIDEO_CADENCE_CSI2RX=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_CADENCE_CSI2TX=m
 | 
				
			||||||
# CONFIG_VIDEO_MUX is not set
 | 
					# CONFIG_VIDEO_MUX is not set
 | 
				
			||||||
CONFIG_VIDEO_OMAP3=m
 | 
					CONFIG_VIDEO_OMAP3=m
 | 
				
			||||||
# CONFIG_VIDEO_OMAP3_DEBUG is not set
 | 
					# CONFIG_VIDEO_OMAP3_DEBUG is not set
 | 
				
			||||||
| 
						 | 
					@ -4903,6 +4930,7 @@ CONFIG_MEDIA_TUNER_IT913X=m
 | 
				
			||||||
CONFIG_MEDIA_TUNER_R820T=m
 | 
					CONFIG_MEDIA_TUNER_R820T=m
 | 
				
			||||||
CONFIG_MEDIA_TUNER_MXL301RF=m
 | 
					CONFIG_MEDIA_TUNER_MXL301RF=m
 | 
				
			||||||
CONFIG_MEDIA_TUNER_QM1D1C0042=m
 | 
					CONFIG_MEDIA_TUNER_QM1D1C0042=m
 | 
				
			||||||
 | 
					CONFIG_MEDIA_TUNER_QM1D1B0004=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Multistandard (satellite) frontends
 | 
					# Multistandard (satellite) frontends
 | 
				
			||||||
| 
						 | 
					@ -5060,6 +5088,7 @@ CONFIG_DVB_SP2=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Tools to develop new frontends
 | 
					# Tools to develop new frontends
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_DVB_DUMMY_FE=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Graphics support
 | 
					# Graphics support
 | 
				
			||||||
| 
						 | 
					@ -5071,7 +5100,7 @@ CONFIG_IMX_IPUV3_CORE=m
 | 
				
			||||||
CONFIG_DRM=m
 | 
					CONFIG_DRM=m
 | 
				
			||||||
CONFIG_DRM_MIPI_DSI=y
 | 
					CONFIG_DRM_MIPI_DSI=y
 | 
				
			||||||
# CONFIG_DRM_DP_AUX_CHARDEV is not set
 | 
					# CONFIG_DRM_DP_AUX_CHARDEV is not set
 | 
				
			||||||
# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 | 
					# CONFIG_DRM_DEBUG_SELFTEST is not set
 | 
				
			||||||
CONFIG_DRM_KMS_HELPER=m
 | 
					CONFIG_DRM_KMS_HELPER=m
 | 
				
			||||||
CONFIG_DRM_KMS_FB_HELPER=y
 | 
					CONFIG_DRM_KMS_FB_HELPER=y
 | 
				
			||||||
CONFIG_DRM_FBDEV_EMULATION=y
 | 
					CONFIG_DRM_FBDEV_EMULATION=y
 | 
				
			||||||
| 
						 | 
					@ -5089,6 +5118,7 @@ CONFIG_DRM_SCHED=m
 | 
				
			||||||
# CONFIG_DRM_I2C_CH7006 is not set
 | 
					# CONFIG_DRM_I2C_CH7006 is not set
 | 
				
			||||||
# CONFIG_DRM_I2C_SIL164 is not set
 | 
					# CONFIG_DRM_I2C_SIL164 is not set
 | 
				
			||||||
CONFIG_DRM_I2C_NXP_TDA998X=m
 | 
					CONFIG_DRM_I2C_NXP_TDA998X=m
 | 
				
			||||||
 | 
					CONFIG_DRM_I2C_NXP_TDA9950=m
 | 
				
			||||||
# CONFIG_DRM_HDLCD is not set
 | 
					# CONFIG_DRM_HDLCD is not set
 | 
				
			||||||
# CONFIG_DRM_MALI_DISPLAY is not set
 | 
					# CONFIG_DRM_MALI_DISPLAY is not set
 | 
				
			||||||
# CONFIG_DRM_RADEON is not set
 | 
					# CONFIG_DRM_RADEON is not set
 | 
				
			||||||
| 
						 | 
					@ -5126,6 +5156,10 @@ CONFIG_DRM_EXYNOS_HDMI=y
 | 
				
			||||||
# Sub-drivers
 | 
					# Sub-drivers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_DRM_EXYNOS_G2D is not set
 | 
					# CONFIG_DRM_EXYNOS_G2D is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_EXYNOS_FIMC is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_EXYNOS_ROTATOR is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_EXYNOS_SCALER is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_EXYNOS_GSC is not set
 | 
				
			||||||
CONFIG_DRM_ROCKCHIP=m
 | 
					CONFIG_DRM_ROCKCHIP=m
 | 
				
			||||||
CONFIG_ROCKCHIP_ANALOGIX_DP=y
 | 
					CONFIG_ROCKCHIP_ANALOGIX_DP=y
 | 
				
			||||||
# CONFIG_ROCKCHIP_CDN_DP is not set
 | 
					# CONFIG_ROCKCHIP_CDN_DP is not set
 | 
				
			||||||
| 
						 | 
					@ -5213,6 +5247,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 | 
				
			||||||
# Display Interface Bridges
 | 
					# Display Interface Bridges
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
 | 
					# CONFIG_DRM_ANALOGIX_ANX78XX is not set
 | 
				
			||||||
 | 
					CONFIG_DRM_CDNS_DSI=m
 | 
				
			||||||
# CONFIG_DRM_DUMB_VGA_DAC is not set
 | 
					# CONFIG_DRM_DUMB_VGA_DAC is not set
 | 
				
			||||||
# CONFIG_DRM_LVDS_ENCODER is not set
 | 
					# CONFIG_DRM_LVDS_ENCODER is not set
 | 
				
			||||||
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 | 
					# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 | 
				
			||||||
| 
						 | 
					@ -5221,6 +5256,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 | 
				
			||||||
# CONFIG_DRM_SIL_SII8620 is not set
 | 
					# CONFIG_DRM_SIL_SII8620 is not set
 | 
				
			||||||
# CONFIG_DRM_SII902X is not set
 | 
					# CONFIG_DRM_SII902X is not set
 | 
				
			||||||
# CONFIG_DRM_SII9234 is not set
 | 
					# CONFIG_DRM_SII9234 is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_THINE_THC63LVD1024 is not set
 | 
				
			||||||
# CONFIG_DRM_TOSHIBA_TC358767 is not set
 | 
					# CONFIG_DRM_TOSHIBA_TC358767 is not set
 | 
				
			||||||
# CONFIG_DRM_TI_TFP410 is not set
 | 
					# CONFIG_DRM_TI_TFP410 is not set
 | 
				
			||||||
CONFIG_DRM_ANALOGIX_DP=m
 | 
					CONFIG_DRM_ANALOGIX_DP=m
 | 
				
			||||||
| 
						 | 
					@ -5235,17 +5271,18 @@ CONFIG_DRM_IMX=m
 | 
				
			||||||
# CONFIG_DRM_IMX_TVE is not set
 | 
					# CONFIG_DRM_IMX_TVE is not set
 | 
				
			||||||
CONFIG_DRM_IMX_LDB=m
 | 
					CONFIG_DRM_IMX_LDB=m
 | 
				
			||||||
CONFIG_DRM_IMX_HDMI=m
 | 
					CONFIG_DRM_IMX_HDMI=m
 | 
				
			||||||
 | 
					CONFIG_DRM_V3D=m
 | 
				
			||||||
CONFIG_DRM_VC4=m
 | 
					CONFIG_DRM_VC4=m
 | 
				
			||||||
# CONFIG_DRM_VC4_HDMI_CEC is not set
 | 
					# CONFIG_DRM_VC4_HDMI_CEC is not set
 | 
				
			||||||
CONFIG_DRM_ETNAVIV=m
 | 
					CONFIG_DRM_ETNAVIV=m
 | 
				
			||||||
CONFIG_DRM_ETNAVIV_THERMAL=y
 | 
					CONFIG_DRM_ETNAVIV_THERMAL=y
 | 
				
			||||||
# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 | 
					 | 
				
			||||||
# CONFIG_DRM_ARCPGU is not set
 | 
					# CONFIG_DRM_ARCPGU is not set
 | 
				
			||||||
# CONFIG_DRM_HISI_HIBMC is not set
 | 
					# CONFIG_DRM_HISI_HIBMC is not set
 | 
				
			||||||
# CONFIG_DRM_MXSFB is not set
 | 
					# CONFIG_DRM_MXSFB is not set
 | 
				
			||||||
# CONFIG_DRM_TINYDRM is not set
 | 
					# CONFIG_DRM_TINYDRM is not set
 | 
				
			||||||
# CONFIG_DRM_PL111 is not set
 | 
					# CONFIG_DRM_PL111 is not set
 | 
				
			||||||
# CONFIG_DRM_TVE200 is not set
 | 
					# CONFIG_DRM_TVE200 is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_XEN is not set
 | 
				
			||||||
CONFIG_DRM_LEGACY=y
 | 
					CONFIG_DRM_LEGACY=y
 | 
				
			||||||
# CONFIG_DRM_TDFX is not set
 | 
					# CONFIG_DRM_TDFX is not set
 | 
				
			||||||
# CONFIG_DRM_R128 is not set
 | 
					# CONFIG_DRM_R128 is not set
 | 
				
			||||||
| 
						 | 
					@ -5334,7 +5371,6 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 | 
				
			||||||
CONFIG_FB_MB862XX_I2C=y
 | 
					CONFIG_FB_MB862XX_I2C=y
 | 
				
			||||||
CONFIG_FB_MX3=y
 | 
					CONFIG_FB_MX3=y
 | 
				
			||||||
# CONFIG_FB_BROADSHEET is not set
 | 
					# CONFIG_FB_BROADSHEET is not set
 | 
				
			||||||
# CONFIG_FB_AUO_K190X is not set
 | 
					 | 
				
			||||||
# CONFIG_FB_MXS is not set
 | 
					# CONFIG_FB_MXS is not set
 | 
				
			||||||
CONFIG_FB_SIMPLE=y
 | 
					CONFIG_FB_SIMPLE=y
 | 
				
			||||||
# CONFIG_FB_SSD1307 is not set
 | 
					# CONFIG_FB_SSD1307 is not set
 | 
				
			||||||
| 
						 | 
					@ -5566,6 +5602,7 @@ CONFIG_SND_SOC_IMX_MC13783=m
 | 
				
			||||||
# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 | 
					# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 | 
				
			||||||
# CONFIG_SND_I2S_HI6210_I2S is not set
 | 
					# CONFIG_SND_I2S_HI6210_I2S is not set
 | 
				
			||||||
CONFIG_SND_OMAP_SOC=m
 | 
					CONFIG_SND_OMAP_SOC=m
 | 
				
			||||||
 | 
					CONFIG_SND_SDMA_SOC=m
 | 
				
			||||||
CONFIG_SND_OMAP_SOC_DMIC=m
 | 
					CONFIG_SND_OMAP_SOC_DMIC=m
 | 
				
			||||||
CONFIG_SND_OMAP_SOC_MCBSP=m
 | 
					CONFIG_SND_OMAP_SOC_MCBSP=m
 | 
				
			||||||
CONFIG_SND_OMAP_SOC_MCPDM=m
 | 
					CONFIG_SND_OMAP_SOC_MCPDM=m
 | 
				
			||||||
| 
						 | 
					@ -5692,6 +5729,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
 | 
				
			||||||
CONFIG_SND_SOC_SGTL5000=m
 | 
					CONFIG_SND_SOC_SGTL5000=m
 | 
				
			||||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 | 
					# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 | 
				
			||||||
# CONFIG_SND_SOC_SPDIF is not set
 | 
					# CONFIG_SND_SOC_SPDIF is not set
 | 
				
			||||||
 | 
					# CONFIG_SND_SOC_SSM2305 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_SSM2602_SPI is not set
 | 
					# CONFIG_SND_SOC_SSM2602_SPI is not set
 | 
				
			||||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
 | 
					# CONFIG_SND_SOC_SSM2602_I2C is not set
 | 
				
			||||||
# CONFIG_SND_SOC_SSM4567 is not set
 | 
					# CONFIG_SND_SOC_SSM4567 is not set
 | 
				
			||||||
| 
						 | 
					@ -5714,6 +5752,7 @@ CONFIG_SND_SOC_TLV320AIC23_I2C=m
 | 
				
			||||||
CONFIG_SND_SOC_TLV320AIC3X=m
 | 
					CONFIG_SND_SOC_TLV320AIC3X=m
 | 
				
			||||||
CONFIG_SND_SOC_TS3A227E=m
 | 
					CONFIG_SND_SOC_TS3A227E=m
 | 
				
			||||||
# CONFIG_SND_SOC_TSCS42XX is not set
 | 
					# CONFIG_SND_SOC_TSCS42XX is not set
 | 
				
			||||||
 | 
					# CONFIG_SND_SOC_TSCS454 is not set
 | 
				
			||||||
CONFIG_SND_SOC_TWL4030=m
 | 
					CONFIG_SND_SOC_TWL4030=m
 | 
				
			||||||
CONFIG_SND_SOC_TWL6040=m
 | 
					CONFIG_SND_SOC_TWL6040=m
 | 
				
			||||||
# CONFIG_SND_SOC_WM8510 is not set
 | 
					# CONFIG_SND_SOC_WM8510 is not set
 | 
				
			||||||
| 
						 | 
					@ -5729,6 +5768,7 @@ CONFIG_SND_SOC_TWL6040=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8753=m
 | 
					CONFIG_SND_SOC_WM8753=m
 | 
				
			||||||
# CONFIG_SND_SOC_WM8770 is not set
 | 
					# CONFIG_SND_SOC_WM8770 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_WM8776 is not set
 | 
					# CONFIG_SND_SOC_WM8776 is not set
 | 
				
			||||||
 | 
					# CONFIG_SND_SOC_WM8782 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_WM8804_I2C is not set
 | 
					# CONFIG_SND_SOC_WM8804_I2C is not set
 | 
				
			||||||
# CONFIG_SND_SOC_WM8804_SPI is not set
 | 
					# CONFIG_SND_SOC_WM8804_SPI is not set
 | 
				
			||||||
CONFIG_SND_SOC_WM8903=m
 | 
					CONFIG_SND_SOC_WM8903=m
 | 
				
			||||||
| 
						 | 
					@ -5741,6 +5781,7 @@ CONFIG_SND_SOC_WM9712=m
 | 
				
			||||||
# CONFIG_SND_SOC_ZX_AUD96P22 is not set
 | 
					# CONFIG_SND_SOC_ZX_AUD96P22 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_MAX9759 is not set
 | 
					# CONFIG_SND_SOC_MAX9759 is not set
 | 
				
			||||||
CONFIG_SND_SOC_MC13783=m
 | 
					CONFIG_SND_SOC_MC13783=m
 | 
				
			||||||
 | 
					# CONFIG_SND_SOC_MT6351 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_NAU8540 is not set
 | 
					# CONFIG_SND_SOC_NAU8540 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_NAU8810 is not set
 | 
					# CONFIG_SND_SOC_NAU8810 is not set
 | 
				
			||||||
# CONFIG_SND_SOC_NAU8824 is not set
 | 
					# CONFIG_SND_SOC_NAU8824 is not set
 | 
				
			||||||
| 
						 | 
					@ -5750,6 +5791,7 @@ CONFIG_SND_SIMPLE_CARD=m
 | 
				
			||||||
# CONFIG_SND_SIMPLE_SCU_CARD is not set
 | 
					# CONFIG_SND_SIMPLE_SCU_CARD is not set
 | 
				
			||||||
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
 | 
					# CONFIG_SND_AUDIO_GRAPH_CARD is not set
 | 
				
			||||||
# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 | 
					# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 | 
				
			||||||
 | 
					# CONFIG_SND_XEN_FRONTEND is not set
 | 
				
			||||||
CONFIG_AC97_BUS=m
 | 
					CONFIG_AC97_BUS=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -5816,6 +5858,7 @@ CONFIG_LOGIG940_FF=y
 | 
				
			||||||
CONFIG_LOGIWHEELS_FF=y
 | 
					CONFIG_LOGIWHEELS_FF=y
 | 
				
			||||||
CONFIG_HID_MAGICMOUSE=m
 | 
					CONFIG_HID_MAGICMOUSE=m
 | 
				
			||||||
# CONFIG_HID_MAYFLASH is not set
 | 
					# CONFIG_HID_MAYFLASH is not set
 | 
				
			||||||
 | 
					# CONFIG_HID_REDRAGON is not set
 | 
				
			||||||
CONFIG_HID_MICROSOFT=m
 | 
					CONFIG_HID_MICROSOFT=m
 | 
				
			||||||
CONFIG_HID_MONTEREY=m
 | 
					CONFIG_HID_MONTEREY=m
 | 
				
			||||||
CONFIG_HID_MULTITOUCH=m
 | 
					CONFIG_HID_MULTITOUCH=m
 | 
				
			||||||
| 
						 | 
					@ -5840,6 +5883,7 @@ CONFIG_HID_SAMSUNG=m
 | 
				
			||||||
CONFIG_HID_SONY=m
 | 
					CONFIG_HID_SONY=m
 | 
				
			||||||
CONFIG_SONY_FF=y
 | 
					CONFIG_SONY_FF=y
 | 
				
			||||||
CONFIG_HID_SPEEDLINK=m
 | 
					CONFIG_HID_SPEEDLINK=m
 | 
				
			||||||
 | 
					# CONFIG_HID_STEAM is not set
 | 
				
			||||||
CONFIG_HID_STEELSERIES=m
 | 
					CONFIG_HID_STEELSERIES=m
 | 
				
			||||||
CONFIG_HID_SUNPLUS=m
 | 
					CONFIG_HID_SUNPLUS=m
 | 
				
			||||||
CONFIG_HID_RMI=m
 | 
					CONFIG_HID_RMI=m
 | 
				
			||||||
| 
						 | 
					@ -6007,6 +6051,7 @@ CONFIG_USB_INVENTRA_DMA=y
 | 
				
			||||||
CONFIG_USB_TI_CPPI41_DMA=y
 | 
					CONFIG_USB_TI_CPPI41_DMA=y
 | 
				
			||||||
CONFIG_USB_TUSB_OMAP_DMA=y
 | 
					CONFIG_USB_TUSB_OMAP_DMA=y
 | 
				
			||||||
CONFIG_USB_DWC3=m
 | 
					CONFIG_USB_DWC3=m
 | 
				
			||||||
 | 
					# CONFIG_USB_DWC3_ULPI is not set
 | 
				
			||||||
# CONFIG_USB_DWC3_HOST is not set
 | 
					# CONFIG_USB_DWC3_HOST is not set
 | 
				
			||||||
# CONFIG_USB_DWC3_GADGET is not set
 | 
					# CONFIG_USB_DWC3_GADGET is not set
 | 
				
			||||||
CONFIG_USB_DWC3_DUAL_ROLE=y
 | 
					CONFIG_USB_DWC3_DUAL_ROLE=y
 | 
				
			||||||
| 
						 | 
					@ -6139,6 +6184,7 @@ CONFIG_TWL6030_USB=m
 | 
				
			||||||
# CONFIG_USB_GPIO_VBUS is not set
 | 
					# CONFIG_USB_GPIO_VBUS is not set
 | 
				
			||||||
# CONFIG_USB_ISP1301 is not set
 | 
					# CONFIG_USB_ISP1301 is not set
 | 
				
			||||||
CONFIG_USB_MXS_PHY=m
 | 
					CONFIG_USB_MXS_PHY=m
 | 
				
			||||||
 | 
					CONFIG_USB_TEGRA_PHY=m
 | 
				
			||||||
CONFIG_USB_ULPI=y
 | 
					CONFIG_USB_ULPI=y
 | 
				
			||||||
CONFIG_USB_ULPI_VIEWPORT=y
 | 
					CONFIG_USB_ULPI_VIEWPORT=y
 | 
				
			||||||
CONFIG_USB_GADGET=m
 | 
					CONFIG_USB_GADGET=m
 | 
				
			||||||
| 
						 | 
					@ -6246,7 +6292,7 @@ CONFIG_TYPEC_UCSI=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_TYPEC_MUX_PI3USB30532 is not set
 | 
					# CONFIG_TYPEC_MUX_PI3USB30532 is not set
 | 
				
			||||||
CONFIG_USB_LED_TRIG=y
 | 
					CONFIG_USB_LED_TRIG=y
 | 
				
			||||||
# CONFIG_USB_ULPI_BUS is not set
 | 
					CONFIG_USB_ULPI_BUS=m
 | 
				
			||||||
CONFIG_UWB=m
 | 
					CONFIG_UWB=m
 | 
				
			||||||
CONFIG_UWB_HWA=m
 | 
					CONFIG_UWB_HWA=m
 | 
				
			||||||
CONFIG_UWB_WHCI=m
 | 
					CONFIG_UWB_WHCI=m
 | 
				
			||||||
| 
						 | 
					@ -6291,6 +6337,7 @@ CONFIG_MMC_CB710=m
 | 
				
			||||||
CONFIG_MMC_VIA_SDMMC=m
 | 
					CONFIG_MMC_VIA_SDMMC=m
 | 
				
			||||||
CONFIG_MMC_DW=m
 | 
					CONFIG_MMC_DW=m
 | 
				
			||||||
CONFIG_MMC_DW_PLTFM=m
 | 
					CONFIG_MMC_DW_PLTFM=m
 | 
				
			||||||
 | 
					# CONFIG_MMC_DW_BLUEFIELD is not set
 | 
				
			||||||
CONFIG_MMC_DW_EXYNOS=m
 | 
					CONFIG_MMC_DW_EXYNOS=m
 | 
				
			||||||
# CONFIG_MMC_DW_HI3798CV200 is not set
 | 
					# CONFIG_MMC_DW_HI3798CV200 is not set
 | 
				
			||||||
# CONFIG_MMC_DW_K3 is not set
 | 
					# CONFIG_MMC_DW_K3 is not set
 | 
				
			||||||
| 
						 | 
					@ -6337,6 +6384,7 @@ CONFIG_LEDS_CLASS=y
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_LEDS_BCM6328 is not set
 | 
					# CONFIG_LEDS_BCM6328 is not set
 | 
				
			||||||
# CONFIG_LEDS_BCM6358 is not set
 | 
					# CONFIG_LEDS_BCM6358 is not set
 | 
				
			||||||
 | 
					# CONFIG_LEDS_CR0014114 is not set
 | 
				
			||||||
# CONFIG_LEDS_LM3530 is not set
 | 
					# CONFIG_LEDS_LM3530 is not set
 | 
				
			||||||
# CONFIG_LEDS_LM3642 is not set
 | 
					# CONFIG_LEDS_LM3642 is not set
 | 
				
			||||||
# CONFIG_LEDS_LM3692X is not set
 | 
					# CONFIG_LEDS_LM3692X is not set
 | 
				
			||||||
| 
						 | 
					@ -6577,7 +6625,6 @@ CONFIG_ALTERA_MSGDMA=m
 | 
				
			||||||
CONFIG_AMBA_PL08X=y
 | 
					CONFIG_AMBA_PL08X=y
 | 
				
			||||||
# CONFIG_AXI_DMAC is not set
 | 
					# CONFIG_AXI_DMAC is not set
 | 
				
			||||||
CONFIG_DMA_BCM2835=y
 | 
					CONFIG_DMA_BCM2835=y
 | 
				
			||||||
CONFIG_DMA_OMAP=y
 | 
					 | 
				
			||||||
CONFIG_DMA_SUN4I=y
 | 
					CONFIG_DMA_SUN4I=y
 | 
				
			||||||
CONFIG_DMA_SUN6I=m
 | 
					CONFIG_DMA_SUN6I=m
 | 
				
			||||||
# CONFIG_DW_AXI_DMAC is not set
 | 
					# CONFIG_DW_AXI_DMAC is not set
 | 
				
			||||||
| 
						 | 
					@ -6592,13 +6639,14 @@ CONFIG_MX3_IPU_IRQS=4
 | 
				
			||||||
# CONFIG_NBPFAXI_DMA is not set
 | 
					# CONFIG_NBPFAXI_DMA is not set
 | 
				
			||||||
CONFIG_PL330_DMA=y
 | 
					CONFIG_PL330_DMA=y
 | 
				
			||||||
CONFIG_TEGRA20_APB_DMA=y
 | 
					CONFIG_TEGRA20_APB_DMA=y
 | 
				
			||||||
CONFIG_TI_CPPI41=m
 | 
					 | 
				
			||||||
CONFIG_TI_DMA_CROSSBAR=y
 | 
					 | 
				
			||||||
CONFIG_TI_EDMA=y
 | 
					 | 
				
			||||||
# CONFIG_QCOM_HIDMA_MGMT is not set
 | 
					# CONFIG_QCOM_HIDMA_MGMT is not set
 | 
				
			||||||
# CONFIG_QCOM_HIDMA is not set
 | 
					# CONFIG_QCOM_HIDMA is not set
 | 
				
			||||||
# CONFIG_DW_DMAC is not set
 | 
					# CONFIG_DW_DMAC is not set
 | 
				
			||||||
# CONFIG_DW_DMAC_PCI is not set
 | 
					# CONFIG_DW_DMAC_PCI is not set
 | 
				
			||||||
 | 
					CONFIG_TI_CPPI41=m
 | 
				
			||||||
 | 
					CONFIG_TI_EDMA=y
 | 
				
			||||||
 | 
					CONFIG_DMA_OMAP=y
 | 
				
			||||||
 | 
					CONFIG_TI_DMA_CROSSBAR=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# DMA Clients
 | 
					# DMA Clients
 | 
				
			||||||
| 
						 | 
					@ -6613,7 +6661,6 @@ CONFIG_DMA_ENGINE_RAID=y
 | 
				
			||||||
CONFIG_SYNC_FILE=y
 | 
					CONFIG_SYNC_FILE=y
 | 
				
			||||||
# CONFIG_SW_SYNC is not set
 | 
					# CONFIG_SW_SYNC is not set
 | 
				
			||||||
# CONFIG_AUXDISPLAY is not set
 | 
					# CONFIG_AUXDISPLAY is not set
 | 
				
			||||||
CONFIG_ARM_CHARLCD=y
 | 
					 | 
				
			||||||
# CONFIG_PANEL is not set
 | 
					# CONFIG_PANEL is not set
 | 
				
			||||||
CONFIG_UIO=m
 | 
					CONFIG_UIO=m
 | 
				
			||||||
CONFIG_UIO_CIF=m
 | 
					CONFIG_UIO_CIF=m
 | 
				
			||||||
| 
						 | 
					@ -6661,16 +6708,6 @@ CONFIG_XEN_PRIVCMD=m
 | 
				
			||||||
CONFIG_XEN_EFI=y
 | 
					CONFIG_XEN_EFI=y
 | 
				
			||||||
CONFIG_XEN_AUTO_XLATE=y
 | 
					CONFIG_XEN_AUTO_XLATE=y
 | 
				
			||||||
CONFIG_STAGING=y
 | 
					CONFIG_STAGING=y
 | 
				
			||||||
# CONFIG_IPX is not set
 | 
					 | 
				
			||||||
CONFIG_NCP_FS=m
 | 
					 | 
				
			||||||
CONFIG_NCPFS_PACKET_SIGNING=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_IOCTL_LOCKING=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_STRONG=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_NFS_NS=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_OS2_NS=y
 | 
					 | 
				
			||||||
# CONFIG_NCPFS_SMALLDOS is not set
 | 
					 | 
				
			||||||
CONFIG_NCPFS_NLS=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_EXTRAS=y
 | 
					 | 
				
			||||||
# CONFIG_PRISM2_USB is not set
 | 
					# CONFIG_PRISM2_USB is not set
 | 
				
			||||||
# CONFIG_COMEDI is not set
 | 
					# CONFIG_COMEDI is not set
 | 
				
			||||||
# CONFIG_RTL8192U is not set
 | 
					# CONFIG_RTL8192U is not set
 | 
				
			||||||
| 
						 | 
					@ -6692,9 +6729,7 @@ CONFIG_RTLWIFI_DEBUG_ST=y
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Accelerometers
 | 
					# Accelerometers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_ADIS16201 is not set
 | 
					 | 
				
			||||||
# CONFIG_ADIS16203 is not set
 | 
					# CONFIG_ADIS16203 is not set
 | 
				
			||||||
# CONFIG_ADIS16209 is not set
 | 
					 | 
				
			||||||
# CONFIG_ADIS16240 is not set
 | 
					# CONFIG_ADIS16240 is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -6734,25 +6769,15 @@ CONFIG_RTLWIFI_DEBUG_ST=y
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_AD5933 is not set
 | 
					# CONFIG_AD5933 is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Light sensors
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# CONFIG_TSL2x7x is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Active energy metering IC
 | 
					# Active energy metering IC
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_ADE7753 is not set
 | 
					 | 
				
			||||||
# CONFIG_ADE7754 is not set
 | 
					 | 
				
			||||||
# CONFIG_ADE7758 is not set
 | 
					 | 
				
			||||||
# CONFIG_ADE7759 is not set
 | 
					 | 
				
			||||||
# CONFIG_ADE7854 is not set
 | 
					# CONFIG_ADE7854 is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Resolver to digital converters
 | 
					# Resolver to digital converters
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_AD2S90 is not set
 | 
					# CONFIG_AD2S90 is not set
 | 
				
			||||||
# CONFIG_AD2S1200 is not set
 | 
					 | 
				
			||||||
# CONFIG_AD2S1210 is not set
 | 
					# CONFIG_AD2S1210 is not set
 | 
				
			||||||
# CONFIG_FB_SM750 is not set
 | 
					# CONFIG_FB_SM750 is not set
 | 
				
			||||||
# CONFIG_FB_XGI is not set
 | 
					# CONFIG_FB_XGI is not set
 | 
				
			||||||
| 
						 | 
					@ -6782,7 +6807,6 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 | 
				
			||||||
# CONFIG_LTE_GDM724X is not set
 | 
					# CONFIG_LTE_GDM724X is not set
 | 
				
			||||||
# CONFIG_FIREWIRE_SERIAL is not set
 | 
					# CONFIG_FIREWIRE_SERIAL is not set
 | 
				
			||||||
# CONFIG_MTD_SPINAND_MT29F is not set
 | 
					# CONFIG_MTD_SPINAND_MT29F is not set
 | 
				
			||||||
# CONFIG_LNET is not set
 | 
					 | 
				
			||||||
# CONFIG_DGNC is not set
 | 
					# CONFIG_DGNC is not set
 | 
				
			||||||
# CONFIG_GS_FPGABOOT is not set
 | 
					# CONFIG_GS_FPGABOOT is not set
 | 
				
			||||||
# CONFIG_UNISYSSPAR is not set
 | 
					# CONFIG_UNISYSSPAR is not set
 | 
				
			||||||
| 
						 | 
					@ -7028,6 +7052,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Accelerometers
 | 
					# Accelerometers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					# CONFIG_ADIS16201 is not set
 | 
				
			||||||
 | 
					# CONFIG_ADIS16209 is not set
 | 
				
			||||||
# CONFIG_ADXL345_I2C is not set
 | 
					# CONFIG_ADXL345_I2C is not set
 | 
				
			||||||
# CONFIG_ADXL345_SPI is not set
 | 
					# CONFIG_ADXL345_SPI is not set
 | 
				
			||||||
# CONFIG_BMA180 is not set
 | 
					# CONFIG_BMA180 is not set
 | 
				
			||||||
| 
						 | 
					@ -7112,6 +7138,11 @@ CONFIG_TWL4030_MADC=m
 | 
				
			||||||
# CONFIG_VF610_ADC is not set
 | 
					# CONFIG_VF610_ADC is not set
 | 
				
			||||||
CONFIG_VIPERBOARD_ADC=m
 | 
					CONFIG_VIPERBOARD_ADC=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Analog Front Ends
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# CONFIG_IIO_RESCALE is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Amplifiers
 | 
					# Amplifiers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -7158,7 +7189,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 | 
				
			||||||
# CONFIG_AD5504 is not set
 | 
					# CONFIG_AD5504 is not set
 | 
				
			||||||
# CONFIG_AD5624R_SPI is not set
 | 
					# CONFIG_AD5624R_SPI is not set
 | 
				
			||||||
# CONFIG_LTC2632 is not set
 | 
					# CONFIG_LTC2632 is not set
 | 
				
			||||||
# CONFIG_AD5686 is not set
 | 
					# CONFIG_AD5686_SPI is not set
 | 
				
			||||||
 | 
					# CONFIG_AD5696_I2C is not set
 | 
				
			||||||
# CONFIG_AD5755 is not set
 | 
					# CONFIG_AD5755 is not set
 | 
				
			||||||
# CONFIG_AD5761 is not set
 | 
					# CONFIG_AD5761 is not set
 | 
				
			||||||
# CONFIG_AD5764 is not set
 | 
					# CONFIG_AD5764 is not set
 | 
				
			||||||
| 
						 | 
					@ -7173,6 +7205,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 | 
				
			||||||
# CONFIG_MCP4725 is not set
 | 
					# CONFIG_MCP4725 is not set
 | 
				
			||||||
# CONFIG_MCP4922 is not set
 | 
					# CONFIG_MCP4922 is not set
 | 
				
			||||||
# CONFIG_TI_DAC082S085 is not set
 | 
					# CONFIG_TI_DAC082S085 is not set
 | 
				
			||||||
 | 
					# CONFIG_TI_DAC5571 is not set
 | 
				
			||||||
# CONFIG_VF610_DAC is not set
 | 
					# CONFIG_VF610_DAC is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -7277,6 +7310,7 @@ CONFIG_HID_SENSOR_PROX=m
 | 
				
			||||||
# CONFIG_TCS3472 is not set
 | 
					# CONFIG_TCS3472 is not set
 | 
				
			||||||
CONFIG_SENSORS_TSL2563=m
 | 
					CONFIG_SENSORS_TSL2563=m
 | 
				
			||||||
# CONFIG_TSL2583 is not set
 | 
					# CONFIG_TSL2583 is not set
 | 
				
			||||||
 | 
					# CONFIG_TSL2772 is not set
 | 
				
			||||||
# CONFIG_TSL4531 is not set
 | 
					# CONFIG_TSL4531 is not set
 | 
				
			||||||
# CONFIG_US5182D is not set
 | 
					# CONFIG_US5182D is not set
 | 
				
			||||||
# CONFIG_VCNL4000 is not set
 | 
					# CONFIG_VCNL4000 is not set
 | 
				
			||||||
| 
						 | 
					@ -7364,6 +7398,11 @@ CONFIG_HID_SENSOR_PRESS=m
 | 
				
			||||||
# CONFIG_SX9500 is not set
 | 
					# CONFIG_SX9500 is not set
 | 
				
			||||||
# CONFIG_SRF08 is not set
 | 
					# CONFIG_SRF08 is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Resolver to digital converters
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# CONFIG_AD2S1200 is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Temperature sensors
 | 
					# Temperature sensors
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -7434,6 +7473,8 @@ CONFIG_PHY_MVEBU_CP110_COMPHY=m
 | 
				
			||||||
# CONFIG_PHY_PXA_28NM_USB2 is not set
 | 
					# CONFIG_PHY_PXA_28NM_USB2 is not set
 | 
				
			||||||
# CONFIG_PHY_CPCAP_USB is not set
 | 
					# CONFIG_PHY_CPCAP_USB is not set
 | 
				
			||||||
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
 | 
					# CONFIG_PHY_MAPPHONE_MDM6600 is not set
 | 
				
			||||||
 | 
					CONFIG_PHY_QCOM_USB_HS=m
 | 
				
			||||||
 | 
					CONFIG_PHY_QCOM_USB_HSIC=m
 | 
				
			||||||
CONFIG_PHY_ROCKCHIP_DP=m
 | 
					CONFIG_PHY_ROCKCHIP_DP=m
 | 
				
			||||||
CONFIG_PHY_ROCKCHIP_EMMC=m
 | 
					CONFIG_PHY_ROCKCHIP_EMMC=m
 | 
				
			||||||
# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
 | 
					# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
 | 
				
			||||||
| 
						 | 
					@ -7454,6 +7495,7 @@ CONFIG_PHY_TEGRA_XUSB=m
 | 
				
			||||||
CONFIG_OMAP_CONTROL_PHY=m
 | 
					CONFIG_OMAP_CONTROL_PHY=m
 | 
				
			||||||
CONFIG_OMAP_USB2=m
 | 
					CONFIG_OMAP_USB2=m
 | 
				
			||||||
CONFIG_TI_PIPE3=m
 | 
					CONFIG_TI_PIPE3=m
 | 
				
			||||||
 | 
					CONFIG_PHY_TUSB1210=m
 | 
				
			||||||
CONFIG_TWL4030_USB=m
 | 
					CONFIG_TWL4030_USB=m
 | 
				
			||||||
# CONFIG_POWERCAP is not set
 | 
					# CONFIG_POWERCAP is not set
 | 
				
			||||||
# CONFIG_MCB is not set
 | 
					# CONFIG_MCB is not set
 | 
				
			||||||
| 
						 | 
					@ -7461,8 +7503,7 @@ CONFIG_TWL4030_USB=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Performance monitor support
 | 
					# Performance monitor support
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_ARM_CCI400_PMU is not set
 | 
					# CONFIG_ARM_CCI_PMU is not set
 | 
				
			||||||
# CONFIG_ARM_CCI5xx_PMU is not set
 | 
					 | 
				
			||||||
# CONFIG_ARM_CCN is not set
 | 
					# CONFIG_ARM_CCN is not set
 | 
				
			||||||
CONFIG_ARM_PMU=y
 | 
					CONFIG_ARM_PMU=y
 | 
				
			||||||
CONFIG_RAS=y
 | 
					CONFIG_RAS=y
 | 
				
			||||||
| 
						 | 
					@ -7602,6 +7643,7 @@ CONFIG_QFMT_V1=m
 | 
				
			||||||
CONFIG_QFMT_V2=m
 | 
					CONFIG_QFMT_V2=m
 | 
				
			||||||
CONFIG_QUOTACTL=y
 | 
					CONFIG_QUOTACTL=y
 | 
				
			||||||
CONFIG_AUTOFS4_FS=m
 | 
					CONFIG_AUTOFS4_FS=m
 | 
				
			||||||
 | 
					CONFIG_AUTOFS_FS=m
 | 
				
			||||||
CONFIG_FUSE_FS=m
 | 
					CONFIG_FUSE_FS=m
 | 
				
			||||||
CONFIG_CUSE=m
 | 
					CONFIG_CUSE=m
 | 
				
			||||||
CONFIG_OVERLAY_FS=m
 | 
					CONFIG_OVERLAY_FS=m
 | 
				
			||||||
| 
						 | 
					@ -7629,7 +7671,6 @@ CONFIG_ISO9660_FS=m
 | 
				
			||||||
CONFIG_JOLIET=y
 | 
					CONFIG_JOLIET=y
 | 
				
			||||||
CONFIG_ZISOFS=y
 | 
					CONFIG_ZISOFS=y
 | 
				
			||||||
CONFIG_UDF_FS=m
 | 
					CONFIG_UDF_FS=m
 | 
				
			||||||
CONFIG_UDF_NLS=y
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# DOS/FAT/NT Filesystems
 | 
					# DOS/FAT/NT Filesystems
 | 
				
			||||||
| 
						 | 
					@ -7656,6 +7697,7 @@ CONFIG_SYSFS=y
 | 
				
			||||||
CONFIG_TMPFS=y
 | 
					CONFIG_TMPFS=y
 | 
				
			||||||
CONFIG_TMPFS_POSIX_ACL=y
 | 
					CONFIG_TMPFS_POSIX_ACL=y
 | 
				
			||||||
CONFIG_TMPFS_XATTR=y
 | 
					CONFIG_TMPFS_XATTR=y
 | 
				
			||||||
 | 
					CONFIG_MEMFD_CREATE=y
 | 
				
			||||||
CONFIG_CONFIGFS_FS=m
 | 
					CONFIG_CONFIGFS_FS=m
 | 
				
			||||||
CONFIG_EFIVAR_FS=m
 | 
					CONFIG_EFIVAR_FS=m
 | 
				
			||||||
CONFIG_MISC_FILESYSTEMS=y
 | 
					CONFIG_MISC_FILESYSTEMS=y
 | 
				
			||||||
| 
						 | 
					@ -7913,6 +7955,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 | 
				
			||||||
CONFIG_DEBUG_MEMORY_INIT=y
 | 
					CONFIG_DEBUG_MEMORY_INIT=y
 | 
				
			||||||
# CONFIG_DEBUG_PER_CPU_MAPS is not set
 | 
					# CONFIG_DEBUG_PER_CPU_MAPS is not set
 | 
				
			||||||
# CONFIG_DEBUG_HIGHMEM is not set
 | 
					# CONFIG_DEBUG_HIGHMEM is not set
 | 
				
			||||||
 | 
					CONFIG_ARCH_HAS_KCOV=y
 | 
				
			||||||
 | 
					CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 | 
				
			||||||
 | 
					# CONFIG_KCOV is not set
 | 
				
			||||||
# CONFIG_DEBUG_SHIRQ is not set
 | 
					# CONFIG_DEBUG_SHIRQ is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -8042,6 +8087,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 | 
				
			||||||
# CONFIG_TEST_PRINTF is not set
 | 
					# CONFIG_TEST_PRINTF is not set
 | 
				
			||||||
# CONFIG_TEST_BITMAP is not set
 | 
					# CONFIG_TEST_BITMAP is not set
 | 
				
			||||||
# CONFIG_TEST_UUID is not set
 | 
					# CONFIG_TEST_UUID is not set
 | 
				
			||||||
 | 
					# CONFIG_TEST_OVERFLOW is not set
 | 
				
			||||||
# CONFIG_TEST_RHASHTABLE is not set
 | 
					# CONFIG_TEST_RHASHTABLE is not set
 | 
				
			||||||
# CONFIG_TEST_HASH is not set
 | 
					# CONFIG_TEST_HASH is not set
 | 
				
			||||||
# CONFIG_TEST_LKM is not set
 | 
					# CONFIG_TEST_LKM is not set
 | 
				
			||||||
| 
						 | 
					@ -8198,6 +8244,11 @@ CONFIG_CRYPTO_ENGINE=m
 | 
				
			||||||
CONFIG_CRYPTO_CCM=m
 | 
					CONFIG_CRYPTO_CCM=m
 | 
				
			||||||
CONFIG_CRYPTO_GCM=m
 | 
					CONFIG_CRYPTO_GCM=m
 | 
				
			||||||
CONFIG_CRYPTO_CHACHA20POLY1305=m
 | 
					CONFIG_CRYPTO_CHACHA20POLY1305=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_AEGIS128=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_AEGIS128L=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_AEGIS256=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_MORUS640=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_MORUS1280=m
 | 
				
			||||||
CONFIG_CRYPTO_SEQIV=m
 | 
					CONFIG_CRYPTO_SEQIV=m
 | 
				
			||||||
CONFIG_CRYPTO_ECHAINIV=m
 | 
					CONFIG_CRYPTO_ECHAINIV=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8279,6 +8330,7 @@ CONFIG_CRYPTO_LZO=y
 | 
				
			||||||
# CONFIG_CRYPTO_842 is not set
 | 
					# CONFIG_CRYPTO_842 is not set
 | 
				
			||||||
CONFIG_CRYPTO_LZ4=m
 | 
					CONFIG_CRYPTO_LZ4=m
 | 
				
			||||||
CONFIG_CRYPTO_LZ4HC=m
 | 
					CONFIG_CRYPTO_LZ4HC=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_ZSTD=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Random Number Generation
 | 
					# Random Number Generation
 | 
				
			||||||
| 
						 | 
					@ -8394,8 +8446,14 @@ CONFIG_TEXTSEARCH_FSM=m
 | 
				
			||||||
CONFIG_ASSOCIATIVE_ARRAY=y
 | 
					CONFIG_ASSOCIATIVE_ARRAY=y
 | 
				
			||||||
CONFIG_HAS_IOMEM=y
 | 
					CONFIG_HAS_IOMEM=y
 | 
				
			||||||
CONFIG_HAS_DMA=y
 | 
					CONFIG_HAS_DMA=y
 | 
				
			||||||
CONFIG_SGL_ALLOC=y
 | 
					CONFIG_NEED_SG_DMA_LENGTH=y
 | 
				
			||||||
 | 
					CONFIG_NEED_DMA_MAP_STATE=y
 | 
				
			||||||
 | 
					CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 | 
				
			||||||
 | 
					CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 | 
				
			||||||
 | 
					CONFIG_DMA_DIRECT_OPS=y
 | 
				
			||||||
CONFIG_DMA_VIRT_OPS=y
 | 
					CONFIG_DMA_VIRT_OPS=y
 | 
				
			||||||
 | 
					CONFIG_SWIOTLB=y
 | 
				
			||||||
 | 
					CONFIG_SGL_ALLOC=y
 | 
				
			||||||
CONFIG_CHECK_SIGNATURE=y
 | 
					CONFIG_CHECK_SIGNATURE=y
 | 
				
			||||||
CONFIG_CPU_RMAP=y
 | 
					CONFIG_CPU_RMAP=y
 | 
				
			||||||
CONFIG_DQL=y
 | 
					CONFIG_DQL=y
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
					@ -1,6 +1,10 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Automatically generated file; DO NOT EDIT.
 | 
					# Automatically generated file; DO NOT EDIT.
 | 
				
			||||||
# Linux/x86 4.17.0-gnu Kernel Configuration
 | 
					# Linux/x86 4.18.0-gnu Kernel Configuration
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Compiler: gcc (GCC) 7.3.0
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_64BIT is not set
 | 
					# CONFIG_64BIT is not set
 | 
				
			||||||
CONFIG_X86_32=y
 | 
					CONFIG_X86_32=y
 | 
				
			||||||
| 
						 | 
					@ -15,8 +19,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 | 
				
			||||||
CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 | 
					CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 | 
				
			||||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 | 
					CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 | 
				
			||||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 | 
					CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 | 
				
			||||||
CONFIG_NEED_DMA_MAP_STATE=y
 | 
					 | 
				
			||||||
CONFIG_NEED_SG_DMA_LENGTH=y
 | 
					 | 
				
			||||||
CONFIG_GENERIC_ISA_DMA=y
 | 
					CONFIG_GENERIC_ISA_DMA=y
 | 
				
			||||||
CONFIG_GENERIC_BUG=y
 | 
					CONFIG_GENERIC_BUG=y
 | 
				
			||||||
CONFIG_GENERIC_HWEIGHT=y
 | 
					CONFIG_GENERIC_HWEIGHT=y
 | 
				
			||||||
| 
						 | 
					@ -40,6 +42,9 @@ CONFIG_X86_32_SMP=y
 | 
				
			||||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
 | 
					CONFIG_ARCH_SUPPORTS_UPROBES=y
 | 
				
			||||||
CONFIG_FIX_EARLYCON_MEM=y
 | 
					CONFIG_FIX_EARLYCON_MEM=y
 | 
				
			||||||
CONFIG_PGTABLE_LEVELS=3
 | 
					CONFIG_PGTABLE_LEVELS=3
 | 
				
			||||||
 | 
					CONFIG_CC_IS_GCC=y
 | 
				
			||||||
 | 
					CONFIG_GCC_VERSION=70300
 | 
				
			||||||
 | 
					CONFIG_CLANG_VERSION=0
 | 
				
			||||||
CONFIG_IRQ_WORK=y
 | 
					CONFIG_IRQ_WORK=y
 | 
				
			||||||
CONFIG_BUILDTIME_EXTABLE_SORT=y
 | 
					CONFIG_BUILDTIME_EXTABLE_SORT=y
 | 
				
			||||||
CONFIG_THREAD_INFO_IN_TASK=y
 | 
					CONFIG_THREAD_INFO_IN_TASK=y
 | 
				
			||||||
| 
						 | 
					@ -48,7 +53,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 | 
				
			||||||
# General setup
 | 
					# General setup
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_INIT_ENV_ARG_LIMIT=32
 | 
					CONFIG_INIT_ENV_ARG_LIMIT=32
 | 
				
			||||||
CONFIG_CROSS_COMPILE=""
 | 
					 | 
				
			||||||
# CONFIG_COMPILE_TEST is not set
 | 
					# CONFIG_COMPILE_TEST is not set
 | 
				
			||||||
CONFIG_LOCALVERSION=""
 | 
					CONFIG_LOCALVERSION=""
 | 
				
			||||||
# CONFIG_LOCALVERSION_AUTO is not set
 | 
					# CONFIG_LOCALVERSION_AUTO is not set
 | 
				
			||||||
| 
						 | 
					@ -224,6 +228,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 | 
				
			||||||
CONFIG_BPF_SYSCALL=y
 | 
					CONFIG_BPF_SYSCALL=y
 | 
				
			||||||
CONFIG_USERFAULTFD=y
 | 
					CONFIG_USERFAULTFD=y
 | 
				
			||||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
					CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
				
			||||||
 | 
					CONFIG_RSEQ=y
 | 
				
			||||||
 | 
					# CONFIG_DEBUG_RSEQ is not set
 | 
				
			||||||
# CONFIG_EMBEDDED is not set
 | 
					# CONFIG_EMBEDDED is not set
 | 
				
			||||||
CONFIG_HAVE_PERF_EVENTS=y
 | 
					CONFIG_HAVE_PERF_EVENTS=y
 | 
				
			||||||
# CONFIG_PC104 is not set
 | 
					# CONFIG_PC104 is not set
 | 
				
			||||||
| 
						 | 
					@ -277,8 +283,8 @@ CONFIG_ARCH_HAS_SET_MEMORY=y
 | 
				
			||||||
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 | 
					CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 | 
				
			||||||
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 | 
					CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 | 
				
			||||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 | 
					CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 | 
				
			||||||
 | 
					CONFIG_HAVE_RSEQ=y
 | 
				
			||||||
CONFIG_HAVE_CLK=y
 | 
					CONFIG_HAVE_CLK=y
 | 
				
			||||||
CONFIG_HAVE_DMA_API_DEBUG=y
 | 
					 | 
				
			||||||
CONFIG_HAVE_HW_BREAKPOINT=y
 | 
					CONFIG_HAVE_HW_BREAKPOINT=y
 | 
				
			||||||
CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 | 
					CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 | 
				
			||||||
CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 | 
					CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 | 
				
			||||||
| 
						 | 
					@ -295,17 +301,12 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
 | 
				
			||||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 | 
					CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 | 
				
			||||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 | 
					CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 | 
				
			||||||
CONFIG_SECCOMP_FILTER=y
 | 
					CONFIG_SECCOMP_FILTER=y
 | 
				
			||||||
 | 
					CONFIG_PLUGIN_HOSTCC=""
 | 
				
			||||||
CONFIG_HAVE_GCC_PLUGINS=y
 | 
					CONFIG_HAVE_GCC_PLUGINS=y
 | 
				
			||||||
CONFIG_GCC_PLUGINS=y
 | 
					CONFIG_HAVE_STACKPROTECTOR=y
 | 
				
			||||||
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
 | 
					CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 | 
				
			||||||
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 | 
					CONFIG_STACKPROTECTOR=y
 | 
				
			||||||
# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
 | 
					CONFIG_STACKPROTECTOR_STRONG=y
 | 
				
			||||||
# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 | 
					 | 
				
			||||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
 | 
					 | 
				
			||||||
# CONFIG_CC_STACKPROTECTOR_NONE is not set
 | 
					 | 
				
			||||||
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 | 
					 | 
				
			||||||
CONFIG_CC_STACKPROTECTOR_STRONG=y
 | 
					 | 
				
			||||||
# CONFIG_CC_STACKPROTECTOR_AUTO is not set
 | 
					 | 
				
			||||||
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 | 
					CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 | 
				
			||||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 | 
					CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 | 
				
			||||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 | 
					CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 | 
				
			||||||
| 
						 | 
					@ -333,7 +334,6 @@ CONFIG_REFCOUNT_FULL=y
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_GCOV_KERNEL is not set
 | 
					# CONFIG_GCOV_KERNEL is not set
 | 
				
			||||||
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 | 
					CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 | 
				
			||||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 | 
					 | 
				
			||||||
CONFIG_RT_MUTEXES=y
 | 
					CONFIG_RT_MUTEXES=y
 | 
				
			||||||
CONFIG_BASE_SMALL=0
 | 
					CONFIG_BASE_SMALL=0
 | 
				
			||||||
CONFIG_MODULES=y
 | 
					CONFIG_MODULES=y
 | 
				
			||||||
| 
						 | 
					@ -421,6 +421,7 @@ CONFIG_QUEUED_SPINLOCKS=y
 | 
				
			||||||
CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 | 
					CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 | 
				
			||||||
CONFIG_QUEUED_RWLOCKS=y
 | 
					CONFIG_QUEUED_RWLOCKS=y
 | 
				
			||||||
CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
 | 
					CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
 | 
				
			||||||
 | 
					CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 | 
				
			||||||
CONFIG_FREEZER=y
 | 
					CONFIG_FREEZER=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -510,8 +511,6 @@ CONFIG_HPET_TIMER=y
 | 
				
			||||||
CONFIG_HPET_EMULATE_RTC=y
 | 
					CONFIG_HPET_EMULATE_RTC=y
 | 
				
			||||||
CONFIG_APB_TIMER=y
 | 
					CONFIG_APB_TIMER=y
 | 
				
			||||||
CONFIG_DMI=y
 | 
					CONFIG_DMI=y
 | 
				
			||||||
CONFIG_SWIOTLB=y
 | 
					 | 
				
			||||||
CONFIG_IOMMU_HELPER=y
 | 
					 | 
				
			||||||
CONFIG_NR_CPUS_RANGE_BEGIN=2
 | 
					CONFIG_NR_CPUS_RANGE_BEGIN=2
 | 
				
			||||||
CONFIG_NR_CPUS_RANGE_END=8
 | 
					CONFIG_NR_CPUS_RANGE_END=8
 | 
				
			||||||
CONFIG_NR_CPUS_DEFAULT=8
 | 
					CONFIG_NR_CPUS_DEFAULT=8
 | 
				
			||||||
| 
						 | 
					@ -562,8 +561,6 @@ CONFIG_VMSPLIT_3G=y
 | 
				
			||||||
CONFIG_PAGE_OFFSET=0xC0000000
 | 
					CONFIG_PAGE_OFFSET=0xC0000000
 | 
				
			||||||
CONFIG_HIGHMEM=y
 | 
					CONFIG_HIGHMEM=y
 | 
				
			||||||
CONFIG_X86_PAE=y
 | 
					CONFIG_X86_PAE=y
 | 
				
			||||||
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 | 
					 | 
				
			||||||
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 | 
					 | 
				
			||||||
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 | 
					CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 | 
				
			||||||
CONFIG_ARCH_FLATMEM_ENABLE=y
 | 
					CONFIG_ARCH_FLATMEM_ENABLE=y
 | 
				
			||||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
 | 
					CONFIG_ARCH_SPARSEMEM_ENABLE=y
 | 
				
			||||||
| 
						 | 
					@ -619,6 +616,7 @@ CONFIG_IDLE_PAGE_TRACKING=y
 | 
				
			||||||
CONFIG_FRAME_VECTOR=y
 | 
					CONFIG_FRAME_VECTOR=y
 | 
				
			||||||
# CONFIG_PERCPU_STATS is not set
 | 
					# CONFIG_PERCPU_STATS is not set
 | 
				
			||||||
# CONFIG_GUP_BENCHMARK is not set
 | 
					# CONFIG_GUP_BENCHMARK is not set
 | 
				
			||||||
 | 
					CONFIG_ARCH_HAS_PTE_SPECIAL=y
 | 
				
			||||||
CONFIG_X86_PMEM_LEGACY_DEVICE=y
 | 
					CONFIG_X86_PMEM_LEGACY_DEVICE=y
 | 
				
			||||||
CONFIG_X86_PMEM_LEGACY=y
 | 
					CONFIG_X86_PMEM_LEGACY=y
 | 
				
			||||||
CONFIG_HIGHPTE=y
 | 
					CONFIG_HIGHPTE=y
 | 
				
			||||||
| 
						 | 
					@ -821,8 +819,8 @@ CONFIG_PCI_DOMAINS=y
 | 
				
			||||||
CONFIG_PCIEPORTBUS=y
 | 
					CONFIG_PCIEPORTBUS=y
 | 
				
			||||||
CONFIG_HOTPLUG_PCI_PCIE=y
 | 
					CONFIG_HOTPLUG_PCI_PCIE=y
 | 
				
			||||||
CONFIG_PCIEAER=y
 | 
					CONFIG_PCIEAER=y
 | 
				
			||||||
# CONFIG_PCIE_ECRC is not set
 | 
					 | 
				
			||||||
# CONFIG_PCIEAER_INJECT is not set
 | 
					# CONFIG_PCIEAER_INJECT is not set
 | 
				
			||||||
 | 
					# CONFIG_PCIE_ECRC is not set
 | 
				
			||||||
CONFIG_PCIEASPM=y
 | 
					CONFIG_PCIEASPM=y
 | 
				
			||||||
CONFIG_PCIEASPM_DEBUG=y
 | 
					CONFIG_PCIEASPM_DEBUG=y
 | 
				
			||||||
CONFIG_PCIEASPM_DEFAULT=y
 | 
					CONFIG_PCIEASPM_DEFAULT=y
 | 
				
			||||||
| 
						 | 
					@ -832,13 +830,13 @@ CONFIG_PCIEASPM_DEFAULT=y
 | 
				
			||||||
CONFIG_PCIE_PME=y
 | 
					CONFIG_PCIE_PME=y
 | 
				
			||||||
CONFIG_PCIE_DPC=y
 | 
					CONFIG_PCIE_DPC=y
 | 
				
			||||||
CONFIG_PCIE_PTM=y
 | 
					CONFIG_PCIE_PTM=y
 | 
				
			||||||
CONFIG_PCI_BUS_ADDR_T_64BIT=y
 | 
					 | 
				
			||||||
CONFIG_PCI_MSI=y
 | 
					CONFIG_PCI_MSI=y
 | 
				
			||||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
 | 
					CONFIG_PCI_MSI_IRQ_DOMAIN=y
 | 
				
			||||||
CONFIG_PCI_QUIRKS=y
 | 
					CONFIG_PCI_QUIRKS=y
 | 
				
			||||||
# CONFIG_PCI_DEBUG is not set
 | 
					# CONFIG_PCI_DEBUG is not set
 | 
				
			||||||
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 | 
					CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 | 
				
			||||||
CONFIG_PCI_STUB=m
 | 
					CONFIG_PCI_STUB=m
 | 
				
			||||||
 | 
					# CONFIG_PCI_PF_STUB is not set
 | 
				
			||||||
CONFIG_XEN_PCIDEV_FRONTEND=m
 | 
					CONFIG_XEN_PCIDEV_FRONTEND=m
 | 
				
			||||||
CONFIG_PCI_ATS=y
 | 
					CONFIG_PCI_ATS=y
 | 
				
			||||||
CONFIG_PCI_LOCKLESS_CONFIG=y
 | 
					CONFIG_PCI_LOCKLESS_CONFIG=y
 | 
				
			||||||
| 
						 | 
					@ -855,7 +853,11 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 | 
				
			||||||
CONFIG_HOTPLUG_PCI_CPCI=y
 | 
					CONFIG_HOTPLUG_PCI_CPCI=y
 | 
				
			||||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 | 
					CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 | 
				
			||||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 | 
					CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 | 
				
			||||||
CONFIG_HOTPLUG_PCI_SHPC=m
 | 
					# CONFIG_HOTPLUG_PCI_SHPC is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# PCI controller drivers
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Cadence PCIe controllers support
 | 
					# Cadence PCIe controllers support
 | 
				
			||||||
| 
						 | 
					@ -864,11 +866,7 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# DesignWare PCI Core Support
 | 
					# DesignWare PCI Core Support
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# CONFIG_PCIE_DW_PLAT is not set
 | 
					# CONFIG_PCIE_DW_PLAT_HOST is not set
 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# PCI host controller drivers
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# PCI Endpoint
 | 
					# PCI Endpoint
 | 
				
			||||||
| 
						 | 
					@ -958,6 +956,7 @@ CONFIG_PACKET_DIAG=m
 | 
				
			||||||
CONFIG_UNIX=y
 | 
					CONFIG_UNIX=y
 | 
				
			||||||
CONFIG_UNIX_DIAG=m
 | 
					CONFIG_UNIX_DIAG=m
 | 
				
			||||||
CONFIG_TLS=m
 | 
					CONFIG_TLS=m
 | 
				
			||||||
 | 
					# CONFIG_TLS_DEVICE is not set
 | 
				
			||||||
CONFIG_XFRM=y
 | 
					CONFIG_XFRM=y
 | 
				
			||||||
CONFIG_XFRM_OFFLOAD=y
 | 
					CONFIG_XFRM_OFFLOAD=y
 | 
				
			||||||
CONFIG_XFRM_ALGO=m
 | 
					CONFIG_XFRM_ALGO=m
 | 
				
			||||||
| 
						 | 
					@ -969,6 +968,7 @@ CONFIG_XFRM_IPCOMP=m
 | 
				
			||||||
CONFIG_NET_KEY=m
 | 
					CONFIG_NET_KEY=m
 | 
				
			||||||
# CONFIG_NET_KEY_MIGRATE is not set
 | 
					# CONFIG_NET_KEY_MIGRATE is not set
 | 
				
			||||||
# CONFIG_SMC is not set
 | 
					# CONFIG_SMC is not set
 | 
				
			||||||
 | 
					# CONFIG_XDP_SOCKETS is not set
 | 
				
			||||||
CONFIG_INET=y
 | 
					CONFIG_INET=y
 | 
				
			||||||
CONFIG_IP_MULTICAST=y
 | 
					CONFIG_IP_MULTICAST=y
 | 
				
			||||||
CONFIG_IP_ADVANCED_ROUTER=y
 | 
					CONFIG_IP_ADVANCED_ROUTER=y
 | 
				
			||||||
| 
						 | 
					@ -1121,21 +1121,18 @@ CONFIG_NF_NAT_FTP=m
 | 
				
			||||||
CONFIG_NF_NAT_IRC=m
 | 
					CONFIG_NF_NAT_IRC=m
 | 
				
			||||||
CONFIG_NF_NAT_SIP=m
 | 
					CONFIG_NF_NAT_SIP=m
 | 
				
			||||||
CONFIG_NF_NAT_TFTP=m
 | 
					CONFIG_NF_NAT_TFTP=m
 | 
				
			||||||
CONFIG_NF_NAT_REDIRECT=m
 | 
					CONFIG_NF_NAT_REDIRECT=y
 | 
				
			||||||
CONFIG_NETFILTER_SYNPROXY=m
 | 
					CONFIG_NETFILTER_SYNPROXY=m
 | 
				
			||||||
 | 
					CONFIG_NF_OSF=m
 | 
				
			||||||
CONFIG_NF_TABLES=m
 | 
					CONFIG_NF_TABLES=m
 | 
				
			||||||
 | 
					CONFIG_NF_TABLES_SET=m
 | 
				
			||||||
# CONFIG_NF_TABLES_INET is not set
 | 
					# CONFIG_NF_TABLES_INET is not set
 | 
				
			||||||
# CONFIG_NF_TABLES_NETDEV is not set
 | 
					# CONFIG_NF_TABLES_NETDEV is not set
 | 
				
			||||||
CONFIG_NFT_EXTHDR=m
 | 
					 | 
				
			||||||
CONFIG_NFT_META=m
 | 
					 | 
				
			||||||
CONFIG_NFT_RT=m
 | 
					 | 
				
			||||||
CONFIG_NFT_NUMGEN=m
 | 
					CONFIG_NFT_NUMGEN=m
 | 
				
			||||||
CONFIG_NFT_CT=m
 | 
					CONFIG_NFT_CT=m
 | 
				
			||||||
CONFIG_NFT_FLOW_OFFLOAD=m
 | 
					CONFIG_NFT_FLOW_OFFLOAD=m
 | 
				
			||||||
CONFIG_NFT_SET_RBTREE=m
 | 
					 | 
				
			||||||
CONFIG_NFT_SET_HASH=m
 | 
					 | 
				
			||||||
CONFIG_NFT_SET_BITMAP=m
 | 
					 | 
				
			||||||
CONFIG_NFT_COUNTER=m
 | 
					CONFIG_NFT_COUNTER=m
 | 
				
			||||||
 | 
					CONFIG_NFT_CONNLIMIT=m
 | 
				
			||||||
CONFIG_NFT_LOG=m
 | 
					CONFIG_NFT_LOG=m
 | 
				
			||||||
CONFIG_NFT_LIMIT=m
 | 
					CONFIG_NFT_LIMIT=m
 | 
				
			||||||
CONFIG_NFT_MASQ=m
 | 
					CONFIG_NFT_MASQ=m
 | 
				
			||||||
| 
						 | 
					@ -1147,6 +1144,7 @@ CONFIG_NFT_QUOTA=m
 | 
				
			||||||
CONFIG_NFT_REJECT=m
 | 
					CONFIG_NFT_REJECT=m
 | 
				
			||||||
CONFIG_NFT_COMPAT=m
 | 
					CONFIG_NFT_COMPAT=m
 | 
				
			||||||
CONFIG_NFT_HASH=m
 | 
					CONFIG_NFT_HASH=m
 | 
				
			||||||
 | 
					CONFIG_NFT_SOCKET=m
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE_INET=m
 | 
					CONFIG_NF_FLOW_TABLE_INET=m
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE=m
 | 
					CONFIG_NF_FLOW_TABLE=m
 | 
				
			||||||
CONFIG_NETFILTER_XTABLES=m
 | 
					CONFIG_NETFILTER_XTABLES=m
 | 
				
			||||||
| 
						 | 
					@ -1283,6 +1281,7 @@ CONFIG_IP_VS_LBLC=m
 | 
				
			||||||
CONFIG_IP_VS_LBLCR=m
 | 
					CONFIG_IP_VS_LBLCR=m
 | 
				
			||||||
CONFIG_IP_VS_DH=m
 | 
					CONFIG_IP_VS_DH=m
 | 
				
			||||||
CONFIG_IP_VS_SH=m
 | 
					CONFIG_IP_VS_SH=m
 | 
				
			||||||
 | 
					CONFIG_IP_VS_MH=m
 | 
				
			||||||
CONFIG_IP_VS_SED=m
 | 
					CONFIG_IP_VS_SED=m
 | 
				
			||||||
CONFIG_IP_VS_NQ=m
 | 
					CONFIG_IP_VS_NQ=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1291,6 +1290,11 @@ CONFIG_IP_VS_NQ=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_IP_VS_SH_TAB_BITS=8
 | 
					CONFIG_IP_VS_SH_TAB_BITS=8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# IPVS MH scheduler
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_IP_VS_MH_TAB_INDEX=12
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# IPVS application helper
 | 
					# IPVS application helper
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -1304,6 +1308,7 @@ CONFIG_IP_VS_PE_SIP=m
 | 
				
			||||||
CONFIG_NF_DEFRAG_IPV4=m
 | 
					CONFIG_NF_DEFRAG_IPV4=m
 | 
				
			||||||
CONFIG_NF_CONNTRACK_IPV4=m
 | 
					CONFIG_NF_CONNTRACK_IPV4=m
 | 
				
			||||||
CONFIG_NF_SOCKET_IPV4=m
 | 
					CONFIG_NF_SOCKET_IPV4=m
 | 
				
			||||||
 | 
					CONFIG_NF_TPROXY_IPV4=m
 | 
				
			||||||
# CONFIG_NF_TABLES_IPV4 is not set
 | 
					# CONFIG_NF_TABLES_IPV4 is not set
 | 
				
			||||||
# CONFIG_NF_TABLES_ARP is not set
 | 
					# CONFIG_NF_TABLES_ARP is not set
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE_IPV4=m
 | 
					CONFIG_NF_FLOW_TABLE_IPV4=m
 | 
				
			||||||
| 
						 | 
					@ -1312,7 +1317,7 @@ CONFIG_NF_LOG_ARP=m
 | 
				
			||||||
CONFIG_NF_LOG_IPV4=m
 | 
					CONFIG_NF_LOG_IPV4=m
 | 
				
			||||||
CONFIG_NF_REJECT_IPV4=m
 | 
					CONFIG_NF_REJECT_IPV4=m
 | 
				
			||||||
CONFIG_NF_NAT_IPV4=m
 | 
					CONFIG_NF_NAT_IPV4=m
 | 
				
			||||||
CONFIG_NF_NAT_MASQUERADE_IPV4=m
 | 
					CONFIG_NF_NAT_MASQUERADE_IPV4=y
 | 
				
			||||||
CONFIG_NF_NAT_SNMP_BASIC=m
 | 
					CONFIG_NF_NAT_SNMP_BASIC=m
 | 
				
			||||||
CONFIG_NF_NAT_PROTO_GRE=m
 | 
					CONFIG_NF_NAT_PROTO_GRE=m
 | 
				
			||||||
CONFIG_NF_NAT_PPTP=m
 | 
					CONFIG_NF_NAT_PPTP=m
 | 
				
			||||||
| 
						 | 
					@ -1345,13 +1350,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 | 
				
			||||||
CONFIG_NF_DEFRAG_IPV6=m
 | 
					CONFIG_NF_DEFRAG_IPV6=m
 | 
				
			||||||
CONFIG_NF_CONNTRACK_IPV6=m
 | 
					CONFIG_NF_CONNTRACK_IPV6=m
 | 
				
			||||||
CONFIG_NF_SOCKET_IPV6=m
 | 
					CONFIG_NF_SOCKET_IPV6=m
 | 
				
			||||||
 | 
					CONFIG_NF_TPROXY_IPV6=m
 | 
				
			||||||
# CONFIG_NF_TABLES_IPV6 is not set
 | 
					# CONFIG_NF_TABLES_IPV6 is not set
 | 
				
			||||||
CONFIG_NF_FLOW_TABLE_IPV6=m
 | 
					CONFIG_NF_FLOW_TABLE_IPV6=m
 | 
				
			||||||
CONFIG_NF_DUP_IPV6=m
 | 
					CONFIG_NF_DUP_IPV6=m
 | 
				
			||||||
CONFIG_NF_REJECT_IPV6=m
 | 
					CONFIG_NF_REJECT_IPV6=m
 | 
				
			||||||
CONFIG_NF_LOG_IPV6=m
 | 
					CONFIG_NF_LOG_IPV6=m
 | 
				
			||||||
CONFIG_NF_NAT_IPV6=m
 | 
					CONFIG_NF_NAT_IPV6=m
 | 
				
			||||||
CONFIG_NF_NAT_MASQUERADE_IPV6=m
 | 
					CONFIG_NF_NAT_MASQUERADE_IPV6=y
 | 
				
			||||||
CONFIG_IP6_NF_IPTABLES=m
 | 
					CONFIG_IP6_NF_IPTABLES=m
 | 
				
			||||||
CONFIG_IP6_NF_MATCH_AH=m
 | 
					CONFIG_IP6_NF_MATCH_AH=m
 | 
				
			||||||
CONFIG_IP6_NF_MATCH_EUI64=m
 | 
					CONFIG_IP6_NF_MATCH_EUI64=m
 | 
				
			||||||
| 
						 | 
					@ -1400,6 +1406,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 | 
				
			||||||
CONFIG_BRIDGE_EBT_SNAT=m
 | 
					CONFIG_BRIDGE_EBT_SNAT=m
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=m
 | 
					CONFIG_BRIDGE_EBT_LOG=m
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=m
 | 
					CONFIG_BRIDGE_EBT_NFLOG=m
 | 
				
			||||||
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_IP_DCCP=m
 | 
					CONFIG_IP_DCCP=m
 | 
				
			||||||
CONFIG_INET_DCCP_DIAG=m
 | 
					CONFIG_INET_DCCP_DIAG=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1619,6 +1626,7 @@ CONFIG_CGROUP_NET_PRIO=y
 | 
				
			||||||
CONFIG_CGROUP_NET_CLASSID=y
 | 
					CONFIG_CGROUP_NET_CLASSID=y
 | 
				
			||||||
CONFIG_NET_RX_BUSY_POLL=y
 | 
					CONFIG_NET_RX_BUSY_POLL=y
 | 
				
			||||||
CONFIG_BQL=y
 | 
					CONFIG_BQL=y
 | 
				
			||||||
 | 
					# CONFIG_BPF_JIT is not set
 | 
				
			||||||
# CONFIG_BPF_STREAM_PARSER is not set
 | 
					# CONFIG_BPF_STREAM_PARSER is not set
 | 
				
			||||||
CONFIG_NET_FLOW_LIMIT=y
 | 
					CONFIG_NET_FLOW_LIMIT=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1870,6 +1878,9 @@ CONFIG_DST_CACHE=y
 | 
				
			||||||
CONFIG_GRO_CELLS=y
 | 
					CONFIG_GRO_CELLS=y
 | 
				
			||||||
CONFIG_NET_DEVLINK=m
 | 
					CONFIG_NET_DEVLINK=m
 | 
				
			||||||
CONFIG_MAY_USE_DEVLINK=m
 | 
					CONFIG_MAY_USE_DEVLINK=m
 | 
				
			||||||
 | 
					CONFIG_PAGE_POOL=y
 | 
				
			||||||
 | 
					CONFIG_FAILOVER=y
 | 
				
			||||||
 | 
					CONFIG_HAVE_EBPF_JIT=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Device Drivers
 | 
					# Device Drivers
 | 
				
			||||||
| 
						 | 
					@ -1884,6 +1895,10 @@ CONFIG_DEVTMPFS=y
 | 
				
			||||||
CONFIG_DEVTMPFS_MOUNT=y
 | 
					CONFIG_DEVTMPFS_MOUNT=y
 | 
				
			||||||
# CONFIG_STANDALONE is not set
 | 
					# CONFIG_STANDALONE is not set
 | 
				
			||||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
 | 
					CONFIG_PREVENT_FIRMWARE_BUILD=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Firmware loader
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
CONFIG_FW_LOADER=y
 | 
					CONFIG_FW_LOADER=y
 | 
				
			||||||
CONFIG_EXTRA_FIRMWARE=""
 | 
					CONFIG_EXTRA_FIRMWARE=""
 | 
				
			||||||
CONFIG_FW_LOADER_USER_HELPER=y
 | 
					CONFIG_FW_LOADER_USER_HELPER=y
 | 
				
			||||||
| 
						 | 
					@ -2112,6 +2127,7 @@ CONFIG_PARIDE_ON26=m
 | 
				
			||||||
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 | 
					CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 | 
				
			||||||
CONFIG_ZRAM=m
 | 
					CONFIG_ZRAM=m
 | 
				
			||||||
# CONFIG_ZRAM_WRITEBACK is not set
 | 
					# CONFIG_ZRAM_WRITEBACK is not set
 | 
				
			||||||
 | 
					# CONFIG_ZRAM_MEMORY_TRACKING is not set
 | 
				
			||||||
CONFIG_BLK_DEV_DAC960=m
 | 
					CONFIG_BLK_DEV_DAC960=m
 | 
				
			||||||
CONFIG_BLK_DEV_UMEM=m
 | 
					CONFIG_BLK_DEV_UMEM=m
 | 
				
			||||||
CONFIG_BLK_DEV_LOOP=y
 | 
					CONFIG_BLK_DEV_LOOP=y
 | 
				
			||||||
| 
						 | 
					@ -2544,6 +2560,7 @@ CONFIG_DM_SNAPSHOT=m
 | 
				
			||||||
CONFIG_DM_THIN_PROVISIONING=m
 | 
					CONFIG_DM_THIN_PROVISIONING=m
 | 
				
			||||||
CONFIG_DM_CACHE=m
 | 
					CONFIG_DM_CACHE=m
 | 
				
			||||||
CONFIG_DM_CACHE_SMQ=m
 | 
					CONFIG_DM_CACHE_SMQ=m
 | 
				
			||||||
 | 
					CONFIG_DM_WRITECACHE=m
 | 
				
			||||||
CONFIG_DM_ERA=m
 | 
					CONFIG_DM_ERA=m
 | 
				
			||||||
CONFIG_DM_MIRROR=m
 | 
					CONFIG_DM_MIRROR=m
 | 
				
			||||||
CONFIG_DM_LOG_USERSPACE=m
 | 
					CONFIG_DM_LOG_USERSPACE=m
 | 
				
			||||||
| 
						 | 
					@ -2741,10 +2758,6 @@ CONFIG_ATL1C=m
 | 
				
			||||||
CONFIG_ALX=m
 | 
					CONFIG_ALX=m
 | 
				
			||||||
CONFIG_NET_VENDOR_AURORA=y
 | 
					CONFIG_NET_VENDOR_AURORA=y
 | 
				
			||||||
CONFIG_AURORA_NB8800=m
 | 
					CONFIG_AURORA_NB8800=m
 | 
				
			||||||
CONFIG_NET_CADENCE=y
 | 
					 | 
				
			||||||
CONFIG_MACB=m
 | 
					 | 
				
			||||||
CONFIG_MACB_USE_HWSTAMP=y
 | 
					 | 
				
			||||||
CONFIG_MACB_PCI=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_BROADCOM=y
 | 
					CONFIG_NET_VENDOR_BROADCOM=y
 | 
				
			||||||
CONFIG_B44=m
 | 
					CONFIG_B44=m
 | 
				
			||||||
CONFIG_B44_PCI_AUTOSELECT=y
 | 
					CONFIG_B44_PCI_AUTOSELECT=y
 | 
				
			||||||
| 
						 | 
					@ -2762,6 +2775,10 @@ CONFIG_BNXT_FLOWER_OFFLOAD=y
 | 
				
			||||||
# CONFIG_BNXT_DCB is not set
 | 
					# CONFIG_BNXT_DCB is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_BROCADE=y
 | 
					CONFIG_NET_VENDOR_BROCADE=y
 | 
				
			||||||
CONFIG_BNA=m
 | 
					CONFIG_BNA=m
 | 
				
			||||||
 | 
					CONFIG_NET_CADENCE=y
 | 
				
			||||||
 | 
					CONFIG_MACB=m
 | 
				
			||||||
 | 
					CONFIG_MACB_USE_HWSTAMP=y
 | 
				
			||||||
 | 
					CONFIG_MACB_PCI=m
 | 
				
			||||||
CONFIG_NET_VENDOR_CAVIUM=y
 | 
					CONFIG_NET_VENDOR_CAVIUM=y
 | 
				
			||||||
CONFIG_NET_VENDOR_CHELSIO=y
 | 
					CONFIG_NET_VENDOR_CHELSIO=y
 | 
				
			||||||
CONFIG_CHELSIO_T1=m
 | 
					CONFIG_CHELSIO_T1=m
 | 
				
			||||||
| 
						 | 
					@ -2801,16 +2818,13 @@ CONFIG_NET_VENDOR_EMULEX=y
 | 
				
			||||||
CONFIG_BE2NET=m
 | 
					CONFIG_BE2NET=m
 | 
				
			||||||
CONFIG_BE2NET_HWMON=y
 | 
					CONFIG_BE2NET_HWMON=y
 | 
				
			||||||
CONFIG_NET_VENDOR_EZCHIP=y
 | 
					CONFIG_NET_VENDOR_EZCHIP=y
 | 
				
			||||||
CONFIG_NET_VENDOR_EXAR=y
 | 
					 | 
				
			||||||
CONFIG_S2IO=m
 | 
					 | 
				
			||||||
CONFIG_VXGE=m
 | 
					 | 
				
			||||||
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_FUJITSU=y
 | 
					CONFIG_NET_VENDOR_FUJITSU=y
 | 
				
			||||||
CONFIG_PCMCIA_FMVJ18X=m
 | 
					CONFIG_PCMCIA_FMVJ18X=m
 | 
				
			||||||
CONFIG_NET_VENDOR_HP=y
 | 
					CONFIG_NET_VENDOR_HP=y
 | 
				
			||||||
CONFIG_HP100=m
 | 
					CONFIG_HP100=m
 | 
				
			||||||
CONFIG_NET_VENDOR_HUAWEI=y
 | 
					CONFIG_NET_VENDOR_HUAWEI=y
 | 
				
			||||||
CONFIG_HINIC=m
 | 
					CONFIG_HINIC=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_I825XX=y
 | 
				
			||||||
CONFIG_NET_VENDOR_INTEL=y
 | 
					CONFIG_NET_VENDOR_INTEL=y
 | 
				
			||||||
CONFIG_E100=m
 | 
					CONFIG_E100=m
 | 
				
			||||||
CONFIG_E1000=m
 | 
					CONFIG_E1000=m
 | 
				
			||||||
| 
						 | 
					@ -2829,7 +2843,10 @@ CONFIG_I40E_DCB=y
 | 
				
			||||||
CONFIG_I40EVF=m
 | 
					CONFIG_I40EVF=m
 | 
				
			||||||
CONFIG_ICE=m
 | 
					CONFIG_ICE=m
 | 
				
			||||||
CONFIG_FM10K=m
 | 
					CONFIG_FM10K=m
 | 
				
			||||||
CONFIG_NET_VENDOR_I825XX=y
 | 
					CONFIG_NET_VENDOR_EXAR=y
 | 
				
			||||||
 | 
					CONFIG_S2IO=m
 | 
				
			||||||
 | 
					CONFIG_VXGE=m
 | 
				
			||||||
 | 
					# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 | 
				
			||||||
CONFIG_JME=m
 | 
					CONFIG_JME=m
 | 
				
			||||||
CONFIG_NET_VENDOR_MARVELL=y
 | 
					CONFIG_NET_VENDOR_MARVELL=y
 | 
				
			||||||
CONFIG_MVMDIO=m
 | 
					CONFIG_MVMDIO=m
 | 
				
			||||||
| 
						 | 
					@ -2872,6 +2889,9 @@ CONFIG_ENC28J60=m
 | 
				
			||||||
# CONFIG_ENC28J60_WRITEVERIFY is not set
 | 
					# CONFIG_ENC28J60_WRITEVERIFY is not set
 | 
				
			||||||
CONFIG_ENCX24J600=m
 | 
					CONFIG_ENCX24J600=m
 | 
				
			||||||
CONFIG_LAN743X=m
 | 
					CONFIG_LAN743X=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_MICROSEMI=y
 | 
				
			||||||
 | 
					CONFIG_MSCC_OCELOT_SWITCH=m
 | 
				
			||||||
 | 
					CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m
 | 
				
			||||||
CONFIG_NET_VENDOR_MYRI=y
 | 
					CONFIG_NET_VENDOR_MYRI=y
 | 
				
			||||||
CONFIG_MYRI10GE=m
 | 
					CONFIG_MYRI10GE=m
 | 
				
			||||||
CONFIG_FEALNX=m
 | 
					CONFIG_FEALNX=m
 | 
				
			||||||
| 
						 | 
					@ -2881,6 +2901,7 @@ CONFIG_NS83820=m
 | 
				
			||||||
CONFIG_NET_VENDOR_NETRONOME=y
 | 
					CONFIG_NET_VENDOR_NETRONOME=y
 | 
				
			||||||
CONFIG_NFP=m
 | 
					CONFIG_NFP=m
 | 
				
			||||||
# CONFIG_NFP_APP_FLOWER is not set
 | 
					# CONFIG_NFP_APP_FLOWER is not set
 | 
				
			||||||
 | 
					CONFIG_NFP_APP_ABM_NIC=y
 | 
				
			||||||
# CONFIG_NFP_DEBUG is not set
 | 
					# CONFIG_NFP_DEBUG is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_NI=y
 | 
					CONFIG_NET_VENDOR_NI=y
 | 
				
			||||||
CONFIG_NET_VENDOR_8390=y
 | 
					CONFIG_NET_VENDOR_8390=y
 | 
				
			||||||
| 
						 | 
					@ -2916,6 +2937,8 @@ CONFIG_QED_OOO=y
 | 
				
			||||||
CONFIG_NET_VENDOR_QUALCOMM=y
 | 
					CONFIG_NET_VENDOR_QUALCOMM=y
 | 
				
			||||||
CONFIG_QCOM_EMAC=m
 | 
					CONFIG_QCOM_EMAC=m
 | 
				
			||||||
CONFIG_RMNET=m
 | 
					CONFIG_RMNET=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_RDC=y
 | 
				
			||||||
 | 
					CONFIG_R6040=m
 | 
				
			||||||
CONFIG_NET_VENDOR_REALTEK=y
 | 
					CONFIG_NET_VENDOR_REALTEK=y
 | 
				
			||||||
CONFIG_ATP=m
 | 
					CONFIG_ATP=m
 | 
				
			||||||
CONFIG_8139CP=m
 | 
					CONFIG_8139CP=m
 | 
				
			||||||
| 
						 | 
					@ -2926,18 +2949,11 @@ CONFIG_8139TOO_8129=y
 | 
				
			||||||
# CONFIG_8139_OLD_RX_RESET is not set
 | 
					# CONFIG_8139_OLD_RX_RESET is not set
 | 
				
			||||||
CONFIG_R8169=m
 | 
					CONFIG_R8169=m
 | 
				
			||||||
CONFIG_NET_VENDOR_RENESAS=y
 | 
					CONFIG_NET_VENDOR_RENESAS=y
 | 
				
			||||||
CONFIG_NET_VENDOR_RDC=y
 | 
					 | 
				
			||||||
CONFIG_R6040=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_ROCKER=y
 | 
					CONFIG_NET_VENDOR_ROCKER=y
 | 
				
			||||||
CONFIG_ROCKER=m
 | 
					CONFIG_ROCKER=m
 | 
				
			||||||
CONFIG_NET_VENDOR_SAMSUNG=y
 | 
					CONFIG_NET_VENDOR_SAMSUNG=y
 | 
				
			||||||
CONFIG_SXGBE_ETH=m
 | 
					CONFIG_SXGBE_ETH=m
 | 
				
			||||||
CONFIG_NET_VENDOR_SEEQ=y
 | 
					CONFIG_NET_VENDOR_SEEQ=y
 | 
				
			||||||
CONFIG_NET_VENDOR_SILAN=y
 | 
					 | 
				
			||||||
CONFIG_SC92031=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_SIS=y
 | 
					 | 
				
			||||||
CONFIG_SIS900=m
 | 
					 | 
				
			||||||
CONFIG_SIS190=m
 | 
					 | 
				
			||||||
CONFIG_NET_VENDOR_SOLARFLARE=y
 | 
					CONFIG_NET_VENDOR_SOLARFLARE=y
 | 
				
			||||||
CONFIG_SFC=m
 | 
					CONFIG_SFC=m
 | 
				
			||||||
CONFIG_SFC_MTD=y
 | 
					CONFIG_SFC_MTD=y
 | 
				
			||||||
| 
						 | 
					@ -2946,6 +2962,11 @@ CONFIG_SFC_SRIOV=y
 | 
				
			||||||
CONFIG_SFC_MCDI_LOGGING=y
 | 
					CONFIG_SFC_MCDI_LOGGING=y
 | 
				
			||||||
CONFIG_SFC_FALCON=m
 | 
					CONFIG_SFC_FALCON=m
 | 
				
			||||||
CONFIG_SFC_FALCON_MTD=y
 | 
					CONFIG_SFC_FALCON_MTD=y
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_SILAN=y
 | 
				
			||||||
 | 
					CONFIG_SC92031=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_SIS=y
 | 
				
			||||||
 | 
					CONFIG_SIS900=m
 | 
				
			||||||
 | 
					CONFIG_SIS190=m
 | 
				
			||||||
CONFIG_NET_VENDOR_SMSC=y
 | 
					CONFIG_NET_VENDOR_SMSC=y
 | 
				
			||||||
CONFIG_SMC9194=m
 | 
					CONFIG_SMC9194=m
 | 
				
			||||||
CONFIG_PCMCIA_SMC91C92=m
 | 
					CONFIG_PCMCIA_SMC91C92=m
 | 
				
			||||||
| 
						 | 
					@ -2963,6 +2984,9 @@ CONFIG_HAPPYMEAL=m
 | 
				
			||||||
CONFIG_SUNGEM=m
 | 
					CONFIG_SUNGEM=m
 | 
				
			||||||
CONFIG_CASSINI=m
 | 
					CONFIG_CASSINI=m
 | 
				
			||||||
CONFIG_NIU=m
 | 
					CONFIG_NIU=m
 | 
				
			||||||
 | 
					CONFIG_NET_VENDOR_SYNOPSYS=y
 | 
				
			||||||
 | 
					CONFIG_DWC_XLGMAC=m
 | 
				
			||||||
 | 
					CONFIG_DWC_XLGMAC_PCI=m
 | 
				
			||||||
CONFIG_NET_VENDOR_TEHUTI=y
 | 
					CONFIG_NET_VENDOR_TEHUTI=y
 | 
				
			||||||
CONFIG_TEHUTI=m
 | 
					CONFIG_TEHUTI=m
 | 
				
			||||||
CONFIG_NET_VENDOR_TI=y
 | 
					CONFIG_NET_VENDOR_TI=y
 | 
				
			||||||
| 
						 | 
					@ -2981,9 +3005,6 @@ CONFIG_WIZNET_BUS_ANY=y
 | 
				
			||||||
# CONFIG_WIZNET_W5100_SPI is not set
 | 
					# CONFIG_WIZNET_W5100_SPI is not set
 | 
				
			||||||
CONFIG_NET_VENDOR_XIRCOM=y
 | 
					CONFIG_NET_VENDOR_XIRCOM=y
 | 
				
			||||||
CONFIG_PCMCIA_XIRC2PS=m
 | 
					CONFIG_PCMCIA_XIRC2PS=m
 | 
				
			||||||
CONFIG_NET_VENDOR_SYNOPSYS=y
 | 
					 | 
				
			||||||
CONFIG_DWC_XLGMAC=m
 | 
					 | 
				
			||||||
CONFIG_DWC_XLGMAC_PCI=m
 | 
					 | 
				
			||||||
CONFIG_FDDI=y
 | 
					CONFIG_FDDI=y
 | 
				
			||||||
CONFIG_DEFXX=m
 | 
					CONFIG_DEFXX=m
 | 
				
			||||||
# CONFIG_DEFXX_MMIO is not set
 | 
					# CONFIG_DEFXX_MMIO is not set
 | 
				
			||||||
| 
						 | 
					@ -2994,6 +3015,9 @@ CONFIG_MDIO_DEVICE=y
 | 
				
			||||||
CONFIG_MDIO_BUS=y
 | 
					CONFIG_MDIO_BUS=y
 | 
				
			||||||
CONFIG_MDIO_BITBANG=m
 | 
					CONFIG_MDIO_BITBANG=m
 | 
				
			||||||
CONFIG_MDIO_GPIO=m
 | 
					CONFIG_MDIO_GPIO=m
 | 
				
			||||||
 | 
					CONFIG_MDIO_I2C=m
 | 
				
			||||||
 | 
					CONFIG_MDIO_MSCC_MIIM=m
 | 
				
			||||||
 | 
					CONFIG_PHYLINK=m
 | 
				
			||||||
CONFIG_PHYLIB=y
 | 
					CONFIG_PHYLIB=y
 | 
				
			||||||
CONFIG_SWPHY=y
 | 
					CONFIG_SWPHY=y
 | 
				
			||||||
# CONFIG_LED_TRIGGER_PHY is not set
 | 
					# CONFIG_LED_TRIGGER_PHY is not set
 | 
				
			||||||
| 
						 | 
					@ -3001,8 +3025,10 @@ CONFIG_SWPHY=y
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# MII PHY device drivers
 | 
					# MII PHY device drivers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_SFP=m
 | 
				
			||||||
CONFIG_AMD_PHY=m
 | 
					CONFIG_AMD_PHY=m
 | 
				
			||||||
CONFIG_AQUANTIA_PHY=m
 | 
					CONFIG_AQUANTIA_PHY=m
 | 
				
			||||||
 | 
					CONFIG_ASIX_PHY=m
 | 
				
			||||||
CONFIG_AT803X_PHY=m
 | 
					CONFIG_AT803X_PHY=m
 | 
				
			||||||
CONFIG_BCM7XXX_PHY=m
 | 
					CONFIG_BCM7XXX_PHY=m
 | 
				
			||||||
CONFIG_BCM87XX_PHY=m
 | 
					CONFIG_BCM87XX_PHY=m
 | 
				
			||||||
| 
						 | 
					@ -3012,6 +3038,7 @@ CONFIG_CICADA_PHY=m
 | 
				
			||||||
CONFIG_CORTINA_PHY=m
 | 
					CONFIG_CORTINA_PHY=m
 | 
				
			||||||
CONFIG_DAVICOM_PHY=m
 | 
					CONFIG_DAVICOM_PHY=m
 | 
				
			||||||
CONFIG_DP83822_PHY=m
 | 
					CONFIG_DP83822_PHY=m
 | 
				
			||||||
 | 
					CONFIG_DP83TC811_PHY=m
 | 
				
			||||||
CONFIG_DP83848_PHY=m
 | 
					CONFIG_DP83848_PHY=m
 | 
				
			||||||
CONFIG_DP83867_PHY=m
 | 
					CONFIG_DP83867_PHY=m
 | 
				
			||||||
CONFIG_FIXED_PHY=y
 | 
					CONFIG_FIXED_PHY=y
 | 
				
			||||||
| 
						 | 
					@ -3023,6 +3050,7 @@ CONFIG_MARVELL_PHY=m
 | 
				
			||||||
CONFIG_MARVELL_10G_PHY=m
 | 
					CONFIG_MARVELL_10G_PHY=m
 | 
				
			||||||
CONFIG_MICREL_PHY=m
 | 
					CONFIG_MICREL_PHY=m
 | 
				
			||||||
CONFIG_MICROCHIP_PHY=m
 | 
					CONFIG_MICROCHIP_PHY=m
 | 
				
			||||||
 | 
					CONFIG_MICROCHIP_T1_PHY=m
 | 
				
			||||||
CONFIG_MICROSEMI_PHY=m
 | 
					CONFIG_MICROSEMI_PHY=m
 | 
				
			||||||
CONFIG_NATIONAL_PHY=m
 | 
					CONFIG_NATIONAL_PHY=m
 | 
				
			||||||
CONFIG_QSEMI_PHY=m
 | 
					CONFIG_QSEMI_PHY=m
 | 
				
			||||||
| 
						 | 
					@ -3142,6 +3170,7 @@ CONFIG_WIL6210_ISR_COR=y
 | 
				
			||||||
CONFIG_WIL6210_TRACING=y
 | 
					CONFIG_WIL6210_TRACING=y
 | 
				
			||||||
CONFIG_WIL6210_DEBUGFS=y
 | 
					CONFIG_WIL6210_DEBUGFS=y
 | 
				
			||||||
CONFIG_ATH10K=m
 | 
					CONFIG_ATH10K=m
 | 
				
			||||||
 | 
					CONFIG_ATH10K_CE=y
 | 
				
			||||||
CONFIG_ATH10K_PCI=m
 | 
					CONFIG_ATH10K_PCI=m
 | 
				
			||||||
CONFIG_ATH10K_SDIO=m
 | 
					CONFIG_ATH10K_SDIO=m
 | 
				
			||||||
CONFIG_ATH10K_USB=m
 | 
					CONFIG_ATH10K_USB=m
 | 
				
			||||||
| 
						 | 
					@ -3413,6 +3442,7 @@ CONFIG_FUJITSU_ES=m
 | 
				
			||||||
CONFIG_THUNDERBOLT_NET=m
 | 
					CONFIG_THUNDERBOLT_NET=m
 | 
				
			||||||
CONFIG_HYPERV_NET=m
 | 
					CONFIG_HYPERV_NET=m
 | 
				
			||||||
CONFIG_NETDEVSIM=m
 | 
					CONFIG_NETDEVSIM=m
 | 
				
			||||||
 | 
					CONFIG_NET_FAILOVER=y
 | 
				
			||||||
CONFIG_ISDN=y
 | 
					CONFIG_ISDN=y
 | 
				
			||||||
CONFIG_ISDN_I4L=m
 | 
					CONFIG_ISDN_I4L=m
 | 
				
			||||||
CONFIG_ISDN_PPP=y
 | 
					CONFIG_ISDN_PPP=y
 | 
				
			||||||
| 
						 | 
					@ -3608,6 +3638,7 @@ CONFIG_KEYBOARD_TM2_TOUCHKEY=m
 | 
				
			||||||
CONFIG_KEYBOARD_TWL4030=m
 | 
					CONFIG_KEYBOARD_TWL4030=m
 | 
				
			||||||
CONFIG_KEYBOARD_XTKBD=m
 | 
					CONFIG_KEYBOARD_XTKBD=m
 | 
				
			||||||
CONFIG_KEYBOARD_CROS_EC=m
 | 
					CONFIG_KEYBOARD_CROS_EC=m
 | 
				
			||||||
 | 
					CONFIG_KEYBOARD_MTK_PMIC=m
 | 
				
			||||||
CONFIG_INPUT_MOUSE=y
 | 
					CONFIG_INPUT_MOUSE=y
 | 
				
			||||||
CONFIG_MOUSE_PS2=m
 | 
					CONFIG_MOUSE_PS2=m
 | 
				
			||||||
CONFIG_MOUSE_PS2_ALPS=y
 | 
					CONFIG_MOUSE_PS2_ALPS=y
 | 
				
			||||||
| 
						 | 
					@ -3619,6 +3650,7 @@ CONFIG_MOUSE_PS2_CYPRESS=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_LIFEBOOK=y
 | 
					CONFIG_MOUSE_PS2_LIFEBOOK=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_TRACKPOINT=y
 | 
					CONFIG_MOUSE_PS2_TRACKPOINT=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_ELANTECH=y
 | 
					CONFIG_MOUSE_PS2_ELANTECH=y
 | 
				
			||||||
 | 
					CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_SENTELIC=y
 | 
					CONFIG_MOUSE_PS2_SENTELIC=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_TOUCHKIT=y
 | 
					CONFIG_MOUSE_PS2_TOUCHKIT=y
 | 
				
			||||||
CONFIG_MOUSE_PS2_FOCALTECH=y
 | 
					CONFIG_MOUSE_PS2_FOCALTECH=y
 | 
				
			||||||
| 
						 | 
					@ -3692,6 +3724,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 | 
				
			||||||
# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 | 
					# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 | 
				
			||||||
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 | 
					CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 | 
				
			||||||
CONFIG_TOUCHSCREEN_BU21013=m
 | 
					CONFIG_TOUCHSCREEN_BU21013=m
 | 
				
			||||||
 | 
					CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
 | 
				
			||||||
CONFIG_TOUCHSCREEN_CY8CTMG110=m
 | 
					CONFIG_TOUCHSCREEN_CY8CTMG110=m
 | 
				
			||||||
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 | 
					CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 | 
				
			||||||
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 | 
					CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 | 
				
			||||||
| 
						 | 
					@ -3982,7 +4015,6 @@ CONFIG_HVC_XEN_FRONTEND=y
 | 
				
			||||||
CONFIG_VIRTIO_CONSOLE=y
 | 
					CONFIG_VIRTIO_CONSOLE=y
 | 
				
			||||||
CONFIG_IPMI_HANDLER=m
 | 
					CONFIG_IPMI_HANDLER=m
 | 
				
			||||||
CONFIG_IPMI_DMI_DECODE=y
 | 
					CONFIG_IPMI_DMI_DECODE=y
 | 
				
			||||||
CONFIG_IPMI_PROC_INTERFACE=y
 | 
					 | 
				
			||||||
# CONFIG_IPMI_PANIC_EVENT is not set
 | 
					# CONFIG_IPMI_PANIC_EVENT is not set
 | 
				
			||||||
CONFIG_IPMI_DEVICE_INTERFACE=m
 | 
					CONFIG_IPMI_DEVICE_INTERFACE=m
 | 
				
			||||||
CONFIG_IPMI_SI=m
 | 
					CONFIG_IPMI_SI=m
 | 
				
			||||||
| 
						 | 
					@ -4143,6 +4175,7 @@ CONFIG_I2C_SLAVE_EEPROM=m
 | 
				
			||||||
CONFIG_SPI=y
 | 
					CONFIG_SPI=y
 | 
				
			||||||
# CONFIG_SPI_DEBUG is not set
 | 
					# CONFIG_SPI_DEBUG is not set
 | 
				
			||||||
CONFIG_SPI_MASTER=y
 | 
					CONFIG_SPI_MASTER=y
 | 
				
			||||||
 | 
					CONFIG_SPI_MEM=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# SPI Master Controller Drivers
 | 
					# SPI Master Controller Drivers
 | 
				
			||||||
| 
						 | 
					@ -4233,6 +4266,7 @@ CONFIG_PINCTRL_GEMINILAKE=m
 | 
				
			||||||
CONFIG_PINCTRL_LEWISBURG=m
 | 
					CONFIG_PINCTRL_LEWISBURG=m
 | 
				
			||||||
CONFIG_PINCTRL_SUNRISEPOINT=m
 | 
					CONFIG_PINCTRL_SUNRISEPOINT=m
 | 
				
			||||||
CONFIG_GPIOLIB=y
 | 
					CONFIG_GPIOLIB=y
 | 
				
			||||||
 | 
					CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 | 
				
			||||||
CONFIG_GPIO_ACPI=y
 | 
					CONFIG_GPIO_ACPI=y
 | 
				
			||||||
CONFIG_GPIOLIB_IRQCHIP=y
 | 
					CONFIG_GPIOLIB_IRQCHIP=y
 | 
				
			||||||
# CONFIG_DEBUG_GPIO is not set
 | 
					# CONFIG_DEBUG_GPIO is not set
 | 
				
			||||||
| 
						 | 
					@ -4963,6 +4997,7 @@ CONFIG_REGULATOR_WM8350=m
 | 
				
			||||||
CONFIG_REGULATOR_WM8400=m
 | 
					CONFIG_REGULATOR_WM8400=m
 | 
				
			||||||
CONFIG_REGULATOR_WM8994=m
 | 
					CONFIG_REGULATOR_WM8994=m
 | 
				
			||||||
CONFIG_CEC_CORE=m
 | 
					CONFIG_CEC_CORE=m
 | 
				
			||||||
 | 
					CONFIG_CEC_NOTIFIER=y
 | 
				
			||||||
CONFIG_RC_CORE=m
 | 
					CONFIG_RC_CORE=m
 | 
				
			||||||
CONFIG_RC_MAP=m
 | 
					CONFIG_RC_MAP=m
 | 
				
			||||||
CONFIG_LIRC=y
 | 
					CONFIG_LIRC=y
 | 
				
			||||||
| 
						 | 
					@ -5023,7 +5058,6 @@ CONFIG_V4L2_FWNODE=m
 | 
				
			||||||
CONFIG_VIDEOBUF_GEN=m
 | 
					CONFIG_VIDEOBUF_GEN=m
 | 
				
			||||||
CONFIG_VIDEOBUF_DMA_SG=m
 | 
					CONFIG_VIDEOBUF_DMA_SG=m
 | 
				
			||||||
CONFIG_VIDEOBUF_VMALLOC=m
 | 
					CONFIG_VIDEOBUF_VMALLOC=m
 | 
				
			||||||
CONFIG_VIDEOBUF_DVB=m
 | 
					 | 
				
			||||||
CONFIG_DVB_CORE=m
 | 
					CONFIG_DVB_CORE=m
 | 
				
			||||||
# CONFIG_DVB_MMAP is not set
 | 
					# CONFIG_DVB_MMAP is not set
 | 
				
			||||||
CONFIG_DVB_NET=y
 | 
					CONFIG_DVB_NET=y
 | 
				
			||||||
| 
						 | 
					@ -5215,14 +5249,6 @@ CONFIG_VIDEO_SOLO6X10=m
 | 
				
			||||||
CONFIG_VIDEO_TW5864=m
 | 
					CONFIG_VIDEO_TW5864=m
 | 
				
			||||||
CONFIG_VIDEO_TW68=m
 | 
					CONFIG_VIDEO_TW68=m
 | 
				
			||||||
CONFIG_VIDEO_TW686X=m
 | 
					CONFIG_VIDEO_TW686X=m
 | 
				
			||||||
CONFIG_VIDEO_ZORAN=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_DC30=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_ZR36060=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_BUZ=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_DC10=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_LML33=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_LML33R10=m
 | 
					 | 
				
			||||||
CONFIG_VIDEO_ZORAN_AVS6EYES=m
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Media capture/analog TV support
 | 
					# Media capture/analog TV support
 | 
				
			||||||
| 
						 | 
					@ -5291,6 +5317,9 @@ CONFIG_VIDEO_IPU3_CIO2=m
 | 
				
			||||||
CONFIG_V4L_PLATFORM_DRIVERS=y
 | 
					CONFIG_V4L_PLATFORM_DRIVERS=y
 | 
				
			||||||
CONFIG_VIDEO_CAFE_CCIC=m
 | 
					CONFIG_VIDEO_CAFE_CCIC=m
 | 
				
			||||||
CONFIG_VIDEO_VIA_CAMERA=m
 | 
					CONFIG_VIDEO_VIA_CAMERA=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_CADENCE=y
 | 
				
			||||||
 | 
					CONFIG_VIDEO_CADENCE_CSI2RX=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_CADENCE_CSI2TX=m
 | 
				
			||||||
CONFIG_SOC_CAMERA=m
 | 
					CONFIG_SOC_CAMERA=m
 | 
				
			||||||
CONFIG_SOC_CAMERA_PLATFORM=m
 | 
					CONFIG_SOC_CAMERA_PLATFORM=m
 | 
				
			||||||
CONFIG_V4L_MEM2MEM_DRIVERS=y
 | 
					CONFIG_V4L_MEM2MEM_DRIVERS=y
 | 
				
			||||||
| 
						 | 
					@ -5312,7 +5341,7 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
 | 
				
			||||||
CONFIG_SMS_SDIO_DRV=m
 | 
					CONFIG_SMS_SDIO_DRV=m
 | 
				
			||||||
CONFIG_RADIO_ADAPTERS=y
 | 
					CONFIG_RADIO_ADAPTERS=y
 | 
				
			||||||
CONFIG_RADIO_TEA575X=m
 | 
					CONFIG_RADIO_TEA575X=m
 | 
				
			||||||
CONFIG_RADIO_SI470X=y
 | 
					CONFIG_RADIO_SI470X=m
 | 
				
			||||||
CONFIG_USB_SI470X=m
 | 
					CONFIG_USB_SI470X=m
 | 
				
			||||||
CONFIG_I2C_SI470X=m
 | 
					CONFIG_I2C_SI470X=m
 | 
				
			||||||
CONFIG_RADIO_SI4713=m
 | 
					CONFIG_RADIO_SI4713=m
 | 
				
			||||||
| 
						 | 
					@ -5535,6 +5564,7 @@ CONFIG_MEDIA_TUNER_IT913X=m
 | 
				
			||||||
CONFIG_MEDIA_TUNER_R820T=m
 | 
					CONFIG_MEDIA_TUNER_R820T=m
 | 
				
			||||||
CONFIG_MEDIA_TUNER_MXL301RF=m
 | 
					CONFIG_MEDIA_TUNER_MXL301RF=m
 | 
				
			||||||
CONFIG_MEDIA_TUNER_QM1D1C0042=m
 | 
					CONFIG_MEDIA_TUNER_QM1D1C0042=m
 | 
				
			||||||
 | 
					CONFIG_MEDIA_TUNER_QM1D1B0004=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Multistandard (satellite) frontends
 | 
					# Multistandard (satellite) frontends
 | 
				
			||||||
| 
						 | 
					@ -5693,6 +5723,7 @@ CONFIG_DVB_SP2=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Tools to develop new frontends
 | 
					# Tools to develop new frontends
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_DVB_DUMMY_FE=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Graphics support
 | 
					# Graphics support
 | 
				
			||||||
| 
						 | 
					@ -5715,7 +5746,7 @@ CONFIG_VGA_SWITCHEROO=y
 | 
				
			||||||
CONFIG_DRM=m
 | 
					CONFIG_DRM=m
 | 
				
			||||||
CONFIG_DRM_MIPI_DSI=y
 | 
					CONFIG_DRM_MIPI_DSI=y
 | 
				
			||||||
# CONFIG_DRM_DP_AUX_CHARDEV is not set
 | 
					# CONFIG_DRM_DP_AUX_CHARDEV is not set
 | 
				
			||||||
# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 | 
					# CONFIG_DRM_DEBUG_SELFTEST is not set
 | 
				
			||||||
CONFIG_DRM_KMS_HELPER=m
 | 
					CONFIG_DRM_KMS_HELPER=m
 | 
				
			||||||
CONFIG_DRM_KMS_FB_HELPER=y
 | 
					CONFIG_DRM_KMS_FB_HELPER=y
 | 
				
			||||||
CONFIG_DRM_FBDEV_EMULATION=y
 | 
					CONFIG_DRM_FBDEV_EMULATION=y
 | 
				
			||||||
| 
						 | 
					@ -5731,6 +5762,7 @@ CONFIG_DRM_SCHED=m
 | 
				
			||||||
CONFIG_DRM_I2C_CH7006=m
 | 
					CONFIG_DRM_I2C_CH7006=m
 | 
				
			||||||
CONFIG_DRM_I2C_SIL164=m
 | 
					CONFIG_DRM_I2C_SIL164=m
 | 
				
			||||||
CONFIG_DRM_I2C_NXP_TDA998X=m
 | 
					CONFIG_DRM_I2C_NXP_TDA998X=m
 | 
				
			||||||
 | 
					CONFIG_DRM_I2C_NXP_TDA9950=m
 | 
				
			||||||
CONFIG_DRM_RADEON=m
 | 
					CONFIG_DRM_RADEON=m
 | 
				
			||||||
# CONFIG_DRM_RADEON_USERPTR is not set
 | 
					# CONFIG_DRM_RADEON_USERPTR is not set
 | 
				
			||||||
CONFIG_DRM_AMDGPU=m
 | 
					CONFIG_DRM_AMDGPU=m
 | 
				
			||||||
| 
						 | 
					@ -5748,7 +5780,6 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 | 
				
			||||||
# Display Engine Configuration
 | 
					# Display Engine Configuration
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_DRM_AMD_DC=y
 | 
					CONFIG_DRM_AMD_DC=y
 | 
				
			||||||
# CONFIG_DRM_AMD_DC_PRE_VEGA is not set
 | 
					 | 
				
			||||||
# CONFIG_DRM_AMD_DC_FBC is not set
 | 
					# CONFIG_DRM_AMD_DC_FBC is not set
 | 
				
			||||||
# CONFIG_DRM_AMD_DC_DCN1_0 is not set
 | 
					# CONFIG_DRM_AMD_DC_DCN1_0 is not set
 | 
				
			||||||
# CONFIG_DEBUG_KERNEL_DC is not set
 | 
					# CONFIG_DEBUG_KERNEL_DC is not set
 | 
				
			||||||
| 
						 | 
					@ -5777,6 +5808,7 @@ CONFIG_DRM_I915_USERPTR=y
 | 
				
			||||||
# CONFIG_DRM_I915_DEBUG is not set
 | 
					# CONFIG_DRM_I915_DEBUG is not set
 | 
				
			||||||
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 | 
					# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 | 
				
			||||||
# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 | 
					# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 | 
				
			||||||
 | 
					# CONFIG_DRM_I915_DEBUG_GUC is not set
 | 
				
			||||||
# CONFIG_DRM_I915_SELFTEST is not set
 | 
					# CONFIG_DRM_I915_SELFTEST is not set
 | 
				
			||||||
# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 | 
					# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 | 
				
			||||||
# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 | 
					# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 | 
				
			||||||
| 
						 | 
					@ -5809,6 +5841,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 | 
				
			||||||
CONFIG_DRM_ANALOGIX_ANX78XX=m
 | 
					CONFIG_DRM_ANALOGIX_ANX78XX=m
 | 
				
			||||||
CONFIG_DRM_HISI_HIBMC=m
 | 
					CONFIG_DRM_HISI_HIBMC=m
 | 
				
			||||||
# CONFIG_DRM_TINYDRM is not set
 | 
					# CONFIG_DRM_TINYDRM is not set
 | 
				
			||||||
 | 
					CONFIG_DRM_XEN=y
 | 
				
			||||||
 | 
					CONFIG_DRM_XEN_FRONTEND=m
 | 
				
			||||||
# CONFIG_DRM_LEGACY is not set
 | 
					# CONFIG_DRM_LEGACY is not set
 | 
				
			||||||
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 | 
					CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5924,9 +5958,6 @@ CONFIG_FB_MB862XX=m
 | 
				
			||||||
CONFIG_FB_MB862XX_PCI_GDC=y
 | 
					CONFIG_FB_MB862XX_PCI_GDC=y
 | 
				
			||||||
CONFIG_FB_MB862XX_I2C=y
 | 
					CONFIG_FB_MB862XX_I2C=y
 | 
				
			||||||
CONFIG_FB_BROADSHEET=m
 | 
					CONFIG_FB_BROADSHEET=m
 | 
				
			||||||
CONFIG_FB_AUO_K190X=m
 | 
					 | 
				
			||||||
CONFIG_FB_AUO_K1900=m
 | 
					 | 
				
			||||||
CONFIG_FB_AUO_K1901=m
 | 
					 | 
				
			||||||
CONFIG_FB_HYPERV=m
 | 
					CONFIG_FB_HYPERV=m
 | 
				
			||||||
CONFIG_FB_SIMPLE=y
 | 
					CONFIG_FB_SIMPLE=y
 | 
				
			||||||
CONFIG_FB_SM712=m
 | 
					CONFIG_FB_SM712=m
 | 
				
			||||||
| 
						 | 
					@ -5945,6 +5976,7 @@ CONFIG_LCD_LD9040=m
 | 
				
			||||||
CONFIG_LCD_AMS369FG06=m
 | 
					CONFIG_LCD_AMS369FG06=m
 | 
				
			||||||
CONFIG_LCD_LMS501KF03=m
 | 
					CONFIG_LCD_LMS501KF03=m
 | 
				
			||||||
CONFIG_LCD_HX8357=m
 | 
					CONFIG_LCD_HX8357=m
 | 
				
			||||||
 | 
					CONFIG_LCD_OTM3225A=m
 | 
				
			||||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
 | 
					CONFIG_BACKLIGHT_CLASS_DEVICE=y
 | 
				
			||||||
CONFIG_BACKLIGHT_GENERIC=m
 | 
					CONFIG_BACKLIGHT_GENERIC=m
 | 
				
			||||||
CONFIG_BACKLIGHT_LM3533=m
 | 
					CONFIG_BACKLIGHT_LM3533=m
 | 
				
			||||||
| 
						 | 
					@ -5974,7 +6006,9 @@ CONFIG_BACKLIGHT_GPIO=m
 | 
				
			||||||
CONFIG_BACKLIGHT_LV5207LP=m
 | 
					CONFIG_BACKLIGHT_LV5207LP=m
 | 
				
			||||||
CONFIG_BACKLIGHT_BD6107=m
 | 
					CONFIG_BACKLIGHT_BD6107=m
 | 
				
			||||||
CONFIG_BACKLIGHT_ARCXCNN=m
 | 
					CONFIG_BACKLIGHT_ARCXCNN=m
 | 
				
			||||||
 | 
					CONFIG_BACKLIGHT_RAVE_SP=m
 | 
				
			||||||
CONFIG_VGASTATE=m
 | 
					CONFIG_VGASTATE=m
 | 
				
			||||||
 | 
					CONFIG_VIDEOMODE_HELPERS=y
 | 
				
			||||||
CONFIG_HDMI=y
 | 
					CONFIG_HDMI=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -6261,7 +6295,6 @@ CONFIG_SND_SOC_INTEL_SST_ACPI=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_SST=m
 | 
					CONFIG_SND_SOC_INTEL_SST=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
 | 
					CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_HASWELL=m
 | 
					CONFIG_SND_SOC_INTEL_HASWELL=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BAYTRAIL=m
 | 
					 | 
				
			||||||
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 | 
					CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 | 
				
			||||||
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 | 
					CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 | 
				
			||||||
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
 | 
					CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
 | 
				
			||||||
| 
						 | 
					@ -6272,8 +6305,6 @@ CONFIG_SND_SOC_INTEL_MACH=y
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 | 
					CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 | 
					CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 | 
					CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
 | 
					 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
 | 
					 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 | 
					CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 | 
					CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 | 
				
			||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 | 
					CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 | 
				
			||||||
| 
						 | 
					@ -6399,6 +6430,7 @@ CONFIG_SND_SOC_SIGMADSP_I2C=m
 | 
				
			||||||
CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 | 
					CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 | 
				
			||||||
CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
 | 
					CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
 | 
				
			||||||
CONFIG_SND_SOC_SPDIF=m
 | 
					CONFIG_SND_SOC_SPDIF=m
 | 
				
			||||||
 | 
					CONFIG_SND_SOC_SSM2305=m
 | 
				
			||||||
CONFIG_SND_SOC_SSM2602=m
 | 
					CONFIG_SND_SOC_SSM2602=m
 | 
				
			||||||
CONFIG_SND_SOC_SSM2602_SPI=m
 | 
					CONFIG_SND_SOC_SSM2602_SPI=m
 | 
				
			||||||
CONFIG_SND_SOC_SSM2602_I2C=m
 | 
					CONFIG_SND_SOC_SSM2602_I2C=m
 | 
				
			||||||
| 
						 | 
					@ -6423,6 +6455,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 | 
				
			||||||
CONFIG_SND_SOC_TLV320AIC3X=m
 | 
					CONFIG_SND_SOC_TLV320AIC3X=m
 | 
				
			||||||
CONFIG_SND_SOC_TS3A227E=m
 | 
					CONFIG_SND_SOC_TS3A227E=m
 | 
				
			||||||
CONFIG_SND_SOC_TSCS42XX=m
 | 
					CONFIG_SND_SOC_TSCS42XX=m
 | 
				
			||||||
 | 
					CONFIG_SND_SOC_TSCS454=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8510=m
 | 
					CONFIG_SND_SOC_WM8510=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8523=m
 | 
					CONFIG_SND_SOC_WM8523=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8524=m
 | 
					CONFIG_SND_SOC_WM8524=m
 | 
				
			||||||
| 
						 | 
					@ -6436,6 +6469,7 @@ CONFIG_SND_SOC_WM8750=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8753=m
 | 
					CONFIG_SND_SOC_WM8753=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8770=m
 | 
					CONFIG_SND_SOC_WM8770=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8776=m
 | 
					CONFIG_SND_SOC_WM8776=m
 | 
				
			||||||
 | 
					CONFIG_SND_SOC_WM8782=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8804=m
 | 
					CONFIG_SND_SOC_WM8804=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8804_I2C=m
 | 
					CONFIG_SND_SOC_WM8804_I2C=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8804_SPI=m
 | 
					CONFIG_SND_SOC_WM8804_SPI=m
 | 
				
			||||||
| 
						 | 
					@ -6447,6 +6481,7 @@ CONFIG_SND_SOC_WM8978=m
 | 
				
			||||||
CONFIG_SND_SOC_WM8985=m
 | 
					CONFIG_SND_SOC_WM8985=m
 | 
				
			||||||
CONFIG_SND_SOC_ZX_AUD96P22=m
 | 
					CONFIG_SND_SOC_ZX_AUD96P22=m
 | 
				
			||||||
CONFIG_SND_SOC_MAX9759=m
 | 
					CONFIG_SND_SOC_MAX9759=m
 | 
				
			||||||
 | 
					CONFIG_SND_SOC_MT6351=m
 | 
				
			||||||
CONFIG_SND_SOC_NAU8540=m
 | 
					CONFIG_SND_SOC_NAU8540=m
 | 
				
			||||||
CONFIG_SND_SOC_NAU8810=m
 | 
					CONFIG_SND_SOC_NAU8810=m
 | 
				
			||||||
CONFIG_SND_SOC_NAU8824=m
 | 
					CONFIG_SND_SOC_NAU8824=m
 | 
				
			||||||
| 
						 | 
					@ -6457,6 +6492,7 @@ CONFIG_SND_SIMPLE_CARD=m
 | 
				
			||||||
CONFIG_SND_X86=y
 | 
					CONFIG_SND_X86=y
 | 
				
			||||||
CONFIG_HDMI_LPE_AUDIO=m
 | 
					CONFIG_HDMI_LPE_AUDIO=m
 | 
				
			||||||
CONFIG_SND_SYNTH_EMUX=m
 | 
					CONFIG_SND_SYNTH_EMUX=m
 | 
				
			||||||
 | 
					CONFIG_SND_XEN_FRONTEND=m
 | 
				
			||||||
CONFIG_AC97_BUS=m
 | 
					CONFIG_AC97_BUS=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -6523,6 +6559,7 @@ CONFIG_LOGIG940_FF=y
 | 
				
			||||||
CONFIG_LOGIWHEELS_FF=y
 | 
					CONFIG_LOGIWHEELS_FF=y
 | 
				
			||||||
CONFIG_HID_MAGICMOUSE=m
 | 
					CONFIG_HID_MAGICMOUSE=m
 | 
				
			||||||
CONFIG_HID_MAYFLASH=m
 | 
					CONFIG_HID_MAYFLASH=m
 | 
				
			||||||
 | 
					CONFIG_HID_REDRAGON=m
 | 
				
			||||||
CONFIG_HID_MICROSOFT=m
 | 
					CONFIG_HID_MICROSOFT=m
 | 
				
			||||||
CONFIG_HID_MONTEREY=m
 | 
					CONFIG_HID_MONTEREY=m
 | 
				
			||||||
CONFIG_HID_MULTITOUCH=m
 | 
					CONFIG_HID_MULTITOUCH=m
 | 
				
			||||||
| 
						 | 
					@ -6548,6 +6585,7 @@ CONFIG_HID_SAMSUNG=m
 | 
				
			||||||
CONFIG_HID_SONY=m
 | 
					CONFIG_HID_SONY=m
 | 
				
			||||||
CONFIG_SONY_FF=y
 | 
					CONFIG_SONY_FF=y
 | 
				
			||||||
CONFIG_HID_SPEEDLINK=m
 | 
					CONFIG_HID_SPEEDLINK=m
 | 
				
			||||||
 | 
					CONFIG_HID_STEAM=m
 | 
				
			||||||
CONFIG_HID_STEELSERIES=m
 | 
					CONFIG_HID_STEELSERIES=m
 | 
				
			||||||
CONFIG_HID_SUNPLUS=m
 | 
					CONFIG_HID_SUNPLUS=m
 | 
				
			||||||
CONFIG_HID_RMI=m
 | 
					CONFIG_HID_RMI=m
 | 
				
			||||||
| 
						 | 
					@ -6724,7 +6762,6 @@ CONFIG_USB_CHIPIDEA=m
 | 
				
			||||||
CONFIG_USB_CHIPIDEA_PCI=m
 | 
					CONFIG_USB_CHIPIDEA_PCI=m
 | 
				
			||||||
CONFIG_USB_CHIPIDEA_UDC=y
 | 
					CONFIG_USB_CHIPIDEA_UDC=y
 | 
				
			||||||
CONFIG_USB_CHIPIDEA_HOST=y
 | 
					CONFIG_USB_CHIPIDEA_HOST=y
 | 
				
			||||||
CONFIG_USB_CHIPIDEA_ULPI=y
 | 
					 | 
				
			||||||
CONFIG_USB_ISP1760=m
 | 
					CONFIG_USB_ISP1760=m
 | 
				
			||||||
CONFIG_USB_ISP1760_HCD=y
 | 
					CONFIG_USB_ISP1760_HCD=y
 | 
				
			||||||
CONFIG_USB_ISP1761_UDC=y
 | 
					CONFIG_USB_ISP1761_UDC=y
 | 
				
			||||||
| 
						 | 
					@ -7023,6 +7060,7 @@ CONFIG_LEDS_AS3645A=m
 | 
				
			||||||
CONFIG_LEDS_LM3530=m
 | 
					CONFIG_LEDS_LM3530=m
 | 
				
			||||||
CONFIG_LEDS_LM3533=m
 | 
					CONFIG_LEDS_LM3533=m
 | 
				
			||||||
CONFIG_LEDS_LM3642=m
 | 
					CONFIG_LEDS_LM3642=m
 | 
				
			||||||
 | 
					CONFIG_LEDS_LM3601X=m
 | 
				
			||||||
CONFIG_LEDS_MT6323=m
 | 
					CONFIG_LEDS_MT6323=m
 | 
				
			||||||
CONFIG_LEDS_NET48XX=m
 | 
					CONFIG_LEDS_NET48XX=m
 | 
				
			||||||
CONFIG_LEDS_WRAP=m
 | 
					CONFIG_LEDS_WRAP=m
 | 
				
			||||||
| 
						 | 
					@ -7319,7 +7357,6 @@ CONFIG_ASYNC_TX_DMA=y
 | 
				
			||||||
CONFIG_SYNC_FILE=y
 | 
					CONFIG_SYNC_FILE=y
 | 
				
			||||||
# CONFIG_SW_SYNC is not set
 | 
					# CONFIG_SW_SYNC is not set
 | 
				
			||||||
CONFIG_AUXDISPLAY=y
 | 
					CONFIG_AUXDISPLAY=y
 | 
				
			||||||
CONFIG_CHARLCD=m
 | 
					 | 
				
			||||||
CONFIG_HD44780=m
 | 
					CONFIG_HD44780=m
 | 
				
			||||||
CONFIG_KS0108=m
 | 
					CONFIG_KS0108=m
 | 
				
			||||||
CONFIG_KS0108_PORT=0x378
 | 
					CONFIG_KS0108_PORT=0x378
 | 
				
			||||||
| 
						 | 
					@ -7331,6 +7368,7 @@ CONFIG_PANEL=m
 | 
				
			||||||
CONFIG_PANEL_PARPORT=0
 | 
					CONFIG_PANEL_PARPORT=0
 | 
				
			||||||
CONFIG_PANEL_PROFILE=5
 | 
					CONFIG_PANEL_PROFILE=5
 | 
				
			||||||
# CONFIG_PANEL_CHANGE_MESSAGE is not set
 | 
					# CONFIG_PANEL_CHANGE_MESSAGE is not set
 | 
				
			||||||
 | 
					CONFIG_CHARLCD=m
 | 
				
			||||||
CONFIG_UIO=m
 | 
					CONFIG_UIO=m
 | 
				
			||||||
CONFIG_UIO_CIF=m
 | 
					CONFIG_UIO_CIF=m
 | 
				
			||||||
CONFIG_UIO_PDRV_GENIRQ=m
 | 
					CONFIG_UIO_PDRV_GENIRQ=m
 | 
				
			||||||
| 
						 | 
					@ -7402,17 +7440,6 @@ CONFIG_XEN_ACPI=y
 | 
				
			||||||
CONFIG_XEN_SYMS=y
 | 
					CONFIG_XEN_SYMS=y
 | 
				
			||||||
CONFIG_XEN_HAVE_VPMU=y
 | 
					CONFIG_XEN_HAVE_VPMU=y
 | 
				
			||||||
CONFIG_STAGING=y
 | 
					CONFIG_STAGING=y
 | 
				
			||||||
CONFIG_IPX=m
 | 
					 | 
				
			||||||
# CONFIG_IPX_INTERN is not set
 | 
					 | 
				
			||||||
CONFIG_NCP_FS=m
 | 
					 | 
				
			||||||
CONFIG_NCPFS_PACKET_SIGNING=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_IOCTL_LOCKING=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_STRONG=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_NFS_NS=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_OS2_NS=y
 | 
					 | 
				
			||||||
# CONFIG_NCPFS_SMALLDOS is not set
 | 
					 | 
				
			||||||
CONFIG_NCPFS_NLS=y
 | 
					 | 
				
			||||||
CONFIG_NCPFS_EXTRAS=y
 | 
					 | 
				
			||||||
CONFIG_PRISM2_USB=m
 | 
					CONFIG_PRISM2_USB=m
 | 
				
			||||||
CONFIG_COMEDI=m
 | 
					CONFIG_COMEDI=m
 | 
				
			||||||
# CONFIG_COMEDI_DEBUG is not set
 | 
					# CONFIG_COMEDI_DEBUG is not set
 | 
				
			||||||
| 
						 | 
					@ -7576,9 +7603,7 @@ CONFIG_VT6656=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Accelerometers
 | 
					# Accelerometers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_ADIS16201=m
 | 
					 | 
				
			||||||
CONFIG_ADIS16203=m
 | 
					CONFIG_ADIS16203=m
 | 
				
			||||||
CONFIG_ADIS16209=m
 | 
					 | 
				
			||||||
CONFIG_ADIS16240=m
 | 
					CONFIG_ADIS16240=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -7622,18 +7647,9 @@ CONFIG_ADIS16060=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_AD5933=m
 | 
					CONFIG_AD5933=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Light sensors
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_TSL2x7x=m
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Active energy metering IC
 | 
					# Active energy metering IC
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_ADE7753=m
 | 
					 | 
				
			||||||
CONFIG_ADE7754=m
 | 
					 | 
				
			||||||
CONFIG_ADE7758=m
 | 
					 | 
				
			||||||
CONFIG_ADE7759=m
 | 
					 | 
				
			||||||
CONFIG_ADE7854=m
 | 
					CONFIG_ADE7854=m
 | 
				
			||||||
CONFIG_ADE7854_I2C=m
 | 
					CONFIG_ADE7854_I2C=m
 | 
				
			||||||
CONFIG_ADE7854_SPI=m
 | 
					CONFIG_ADE7854_SPI=m
 | 
				
			||||||
| 
						 | 
					@ -7642,7 +7658,6 @@ CONFIG_ADE7854_SPI=m
 | 
				
			||||||
# Resolver to digital converters
 | 
					# Resolver to digital converters
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_AD2S90=m
 | 
					CONFIG_AD2S90=m
 | 
				
			||||||
CONFIG_AD2S1200=m
 | 
					 | 
				
			||||||
CONFIG_AD2S1210=m
 | 
					CONFIG_AD2S1210=m
 | 
				
			||||||
CONFIG_FB_SM750=m
 | 
					CONFIG_FB_SM750=m
 | 
				
			||||||
CONFIG_FB_XGI=m
 | 
					CONFIG_FB_XGI=m
 | 
				
			||||||
| 
						 | 
					@ -7667,10 +7682,17 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 | 
				
			||||||
CONFIG_SPEAKUP_SYNTH_TXPRT=m
 | 
					CONFIG_SPEAKUP_SYNTH_TXPRT=m
 | 
				
			||||||
CONFIG_SPEAKUP_SYNTH_DUMMY=m
 | 
					CONFIG_SPEAKUP_SYNTH_DUMMY=m
 | 
				
			||||||
CONFIG_STAGING_MEDIA=y
 | 
					CONFIG_STAGING_MEDIA=y
 | 
				
			||||||
# CONFIG_INTEL_ATOMISP is not set
 | 
					 | 
				
			||||||
CONFIG_I2C_BCM2048=m
 | 
					CONFIG_I2C_BCM2048=m
 | 
				
			||||||
CONFIG_SOC_CAMERA_IMX074=m
 | 
					CONFIG_SOC_CAMERA_IMX074=m
 | 
				
			||||||
CONFIG_SOC_CAMERA_MT9T031=m
 | 
					CONFIG_SOC_CAMERA_MT9T031=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_DC30=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_ZR36060=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_BUZ=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_DC10=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_LML33=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_LML33R10=m
 | 
				
			||||||
 | 
					CONFIG_VIDEO_ZORAN_AVS6EYES=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Android
 | 
					# Android
 | 
				
			||||||
| 
						 | 
					@ -7681,11 +7703,6 @@ CONFIG_FWTTY_MAX_TOTAL_PORTS=64
 | 
				
			||||||
CONFIG_FWTTY_MAX_CARD_PORTS=32
 | 
					CONFIG_FWTTY_MAX_CARD_PORTS=32
 | 
				
			||||||
CONFIG_MTD_SPINAND_MT29F=m
 | 
					CONFIG_MTD_SPINAND_MT29F=m
 | 
				
			||||||
CONFIG_MTD_SPINAND_ONDIEECC=y
 | 
					CONFIG_MTD_SPINAND_ONDIEECC=y
 | 
				
			||||||
CONFIG_LNET=m
 | 
					 | 
				
			||||||
CONFIG_LNET_MAX_PAYLOAD=1048576
 | 
					 | 
				
			||||||
# CONFIG_LNET_SELFTEST is not set
 | 
					 | 
				
			||||||
CONFIG_LNET_XPRT_IB=m
 | 
					 | 
				
			||||||
# CONFIG_LUSTRE_FS is not set
 | 
					 | 
				
			||||||
CONFIG_DGNC=m
 | 
					CONFIG_DGNC=m
 | 
				
			||||||
CONFIG_GS_FPGABOOT=m
 | 
					CONFIG_GS_FPGABOOT=m
 | 
				
			||||||
# CONFIG_UNISYSSPAR is not set
 | 
					# CONFIG_UNISYSSPAR is not set
 | 
				
			||||||
| 
						 | 
					@ -7732,7 +7749,6 @@ CONFIG_MOST_CDEV=m
 | 
				
			||||||
CONFIG_MOST_NET=m
 | 
					CONFIG_MOST_NET=m
 | 
				
			||||||
CONFIG_MOST_SOUND=m
 | 
					CONFIG_MOST_SOUND=m
 | 
				
			||||||
CONFIG_MOST_VIDEO=m
 | 
					CONFIG_MOST_VIDEO=m
 | 
				
			||||||
CONFIG_MOST_DIM2=m
 | 
					 | 
				
			||||||
CONFIG_MOST_I2C=m
 | 
					CONFIG_MOST_I2C=m
 | 
				
			||||||
CONFIG_MOST_USB=m
 | 
					CONFIG_MOST_USB=m
 | 
				
			||||||
CONFIG_KS7010=m
 | 
					CONFIG_KS7010=m
 | 
				
			||||||
| 
						 | 
					@ -7742,6 +7758,7 @@ CONFIG_KS7010=m
 | 
				
			||||||
# USB Power Delivery and Type-C drivers
 | 
					# USB Power Delivery and Type-C drivers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
CONFIG_TYPEC_TCPCI=m
 | 
					CONFIG_TYPEC_TCPCI=m
 | 
				
			||||||
 | 
					CONFIG_TYPEC_RT1711H=m
 | 
				
			||||||
CONFIG_DRM_VBOXVIDEO=m
 | 
					CONFIG_DRM_VBOXVIDEO=m
 | 
				
			||||||
# CONFIG_PI433 is not set
 | 
					# CONFIG_PI433 is not set
 | 
				
			||||||
CONFIG_MTK_MMC=m
 | 
					CONFIG_MTK_MMC=m
 | 
				
			||||||
| 
						 | 
					@ -7834,6 +7851,7 @@ CONFIG_PMC_ATOM=y
 | 
				
			||||||
CONFIG_CHROME_PLATFORMS=y
 | 
					CONFIG_CHROME_PLATFORMS=y
 | 
				
			||||||
CONFIG_CHROMEOS_LAPTOP=m
 | 
					CONFIG_CHROMEOS_LAPTOP=m
 | 
				
			||||||
CONFIG_CHROMEOS_PSTORE=m
 | 
					CONFIG_CHROMEOS_PSTORE=m
 | 
				
			||||||
 | 
					CONFIG_CHROMEOS_TBMC=m
 | 
				
			||||||
CONFIG_CROS_EC_CTL=m
 | 
					CONFIG_CROS_EC_CTL=m
 | 
				
			||||||
CONFIG_CROS_EC_LPC=m
 | 
					CONFIG_CROS_EC_LPC=m
 | 
				
			||||||
# CONFIG_CROS_EC_LPC_MEC is not set
 | 
					# CONFIG_CROS_EC_LPC_MEC is not set
 | 
				
			||||||
| 
						 | 
					@ -7975,6 +7993,8 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Accelerometers
 | 
					# Accelerometers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_ADIS16201=m
 | 
				
			||||||
 | 
					CONFIG_ADIS16209=m
 | 
				
			||||||
CONFIG_BMA180=m
 | 
					CONFIG_BMA180=m
 | 
				
			||||||
CONFIG_BMA220=m
 | 
					CONFIG_BMA220=m
 | 
				
			||||||
CONFIG_BMC150_ACCEL=m
 | 
					CONFIG_BMC150_ACCEL=m
 | 
				
			||||||
| 
						 | 
					@ -8062,6 +8082,10 @@ CONFIG_TWL4030_MADC=m
 | 
				
			||||||
CONFIG_TWL6030_GPADC=m
 | 
					CONFIG_TWL6030_GPADC=m
 | 
				
			||||||
CONFIG_VIPERBOARD_ADC=m
 | 
					CONFIG_VIPERBOARD_ADC=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Analog Front Ends
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Amplifiers
 | 
					# Amplifiers
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -8113,6 +8137,8 @@ CONFIG_AD5504=m
 | 
				
			||||||
CONFIG_AD5624R_SPI=m
 | 
					CONFIG_AD5624R_SPI=m
 | 
				
			||||||
CONFIG_LTC2632=m
 | 
					CONFIG_LTC2632=m
 | 
				
			||||||
CONFIG_AD5686=m
 | 
					CONFIG_AD5686=m
 | 
				
			||||||
 | 
					CONFIG_AD5686_SPI=m
 | 
				
			||||||
 | 
					CONFIG_AD5696_I2C=m
 | 
				
			||||||
CONFIG_AD5755=m
 | 
					CONFIG_AD5755=m
 | 
				
			||||||
CONFIG_AD5761=m
 | 
					CONFIG_AD5761=m
 | 
				
			||||||
CONFIG_AD5764=m
 | 
					CONFIG_AD5764=m
 | 
				
			||||||
| 
						 | 
					@ -8125,6 +8151,7 @@ CONFIG_MAX517=m
 | 
				
			||||||
CONFIG_MCP4725=m
 | 
					CONFIG_MCP4725=m
 | 
				
			||||||
CONFIG_MCP4922=m
 | 
					CONFIG_MCP4922=m
 | 
				
			||||||
CONFIG_TI_DAC082S085=m
 | 
					CONFIG_TI_DAC082S085=m
 | 
				
			||||||
 | 
					CONFIG_TI_DAC5571=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# IIO dummy driver
 | 
					# IIO dummy driver
 | 
				
			||||||
| 
						 | 
					@ -8248,6 +8275,7 @@ CONFIG_TCS3414=m
 | 
				
			||||||
CONFIG_TCS3472=m
 | 
					CONFIG_TCS3472=m
 | 
				
			||||||
CONFIG_SENSORS_TSL2563=m
 | 
					CONFIG_SENSORS_TSL2563=m
 | 
				
			||||||
CONFIG_TSL2583=m
 | 
					CONFIG_TSL2583=m
 | 
				
			||||||
 | 
					CONFIG_TSL2772=m
 | 
				
			||||||
CONFIG_TSL4531=m
 | 
					CONFIG_TSL4531=m
 | 
				
			||||||
CONFIG_US5182D=m
 | 
					CONFIG_US5182D=m
 | 
				
			||||||
CONFIG_VCNL4000=m
 | 
					CONFIG_VCNL4000=m
 | 
				
			||||||
| 
						 | 
					@ -8349,6 +8377,11 @@ CONFIG_SRF04=m
 | 
				
			||||||
CONFIG_SX9500=m
 | 
					CONFIG_SX9500=m
 | 
				
			||||||
CONFIG_SRF08=m
 | 
					CONFIG_SRF08=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Resolver to digital converters
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					CONFIG_AD2S1200=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Temperature sensors
 | 
					# Temperature sensors
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -8450,6 +8483,7 @@ CONFIG_DAX_DRIVER=y
 | 
				
			||||||
CONFIG_DAX=y
 | 
					CONFIG_DAX=y
 | 
				
			||||||
CONFIG_DEV_DAX=m
 | 
					CONFIG_DEV_DAX=m
 | 
				
			||||||
CONFIG_NVMEM=y
 | 
					CONFIG_NVMEM=y
 | 
				
			||||||
 | 
					CONFIG_RAVE_SP_EEPROM=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# HW tracing support
 | 
					# HW tracing support
 | 
				
			||||||
| 
						 | 
					@ -8472,6 +8506,7 @@ CONFIG_ALTERA_PR_IP_CORE=m
 | 
				
			||||||
CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
 | 
					CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
 | 
				
			||||||
CONFIG_FPGA_MGR_ALTERA_CVP=m
 | 
					CONFIG_FPGA_MGR_ALTERA_CVP=m
 | 
				
			||||||
CONFIG_FPGA_MGR_XILINX_SPI=m
 | 
					CONFIG_FPGA_MGR_XILINX_SPI=m
 | 
				
			||||||
 | 
					CONFIG_FPGA_MGR_MACHXO2_SPI=m
 | 
				
			||||||
CONFIG_FPGA_BRIDGE=m
 | 
					CONFIG_FPGA_BRIDGE=m
 | 
				
			||||||
CONFIG_XILINX_PR_DECOUPLER=m
 | 
					CONFIG_XILINX_PR_DECOUPLER=m
 | 
				
			||||||
CONFIG_FPGA_REGION=m
 | 
					CONFIG_FPGA_REGION=m
 | 
				
			||||||
| 
						 | 
					@ -8513,6 +8548,7 @@ CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
 | 
				
			||||||
CONFIG_APPLE_PROPERTIES=y
 | 
					CONFIG_APPLE_PROPERTIES=y
 | 
				
			||||||
CONFIG_RESET_ATTACK_MITIGATION=y
 | 
					CONFIG_RESET_ATTACK_MITIGATION=y
 | 
				
			||||||
CONFIG_UEFI_CPER=y
 | 
					CONFIG_UEFI_CPER=y
 | 
				
			||||||
 | 
					CONFIG_UEFI_CPER_X86=y
 | 
				
			||||||
CONFIG_EFI_DEV_PATH_PARSER=y
 | 
					CONFIG_EFI_DEV_PATH_PARSER=y
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -8599,6 +8635,7 @@ CONFIG_QFMT_V1=m
 | 
				
			||||||
CONFIG_QFMT_V2=m
 | 
					CONFIG_QFMT_V2=m
 | 
				
			||||||
CONFIG_QUOTACTL=y
 | 
					CONFIG_QUOTACTL=y
 | 
				
			||||||
CONFIG_AUTOFS4_FS=m
 | 
					CONFIG_AUTOFS4_FS=m
 | 
				
			||||||
 | 
					CONFIG_AUTOFS_FS=m
 | 
				
			||||||
CONFIG_FUSE_FS=y
 | 
					CONFIG_FUSE_FS=y
 | 
				
			||||||
CONFIG_CUSE=m
 | 
					CONFIG_CUSE=m
 | 
				
			||||||
CONFIG_OVERLAY_FS=m
 | 
					CONFIG_OVERLAY_FS=m
 | 
				
			||||||
| 
						 | 
					@ -8626,7 +8663,6 @@ CONFIG_ISO9660_FS=m
 | 
				
			||||||
CONFIG_JOLIET=y
 | 
					CONFIG_JOLIET=y
 | 
				
			||||||
CONFIG_ZISOFS=y
 | 
					CONFIG_ZISOFS=y
 | 
				
			||||||
CONFIG_UDF_FS=m
 | 
					CONFIG_UDF_FS=m
 | 
				
			||||||
CONFIG_UDF_NLS=y
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# DOS/FAT/NT Filesystems
 | 
					# DOS/FAT/NT Filesystems
 | 
				
			||||||
| 
						 | 
					@ -8647,6 +8683,7 @@ CONFIG_NTFS_FS=m
 | 
				
			||||||
CONFIG_PROC_FS=y
 | 
					CONFIG_PROC_FS=y
 | 
				
			||||||
CONFIG_PROC_KCORE=y
 | 
					CONFIG_PROC_KCORE=y
 | 
				
			||||||
CONFIG_PROC_VMCORE=y
 | 
					CONFIG_PROC_VMCORE=y
 | 
				
			||||||
 | 
					# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 | 
				
			||||||
CONFIG_PROC_SYSCTL=y
 | 
					CONFIG_PROC_SYSCTL=y
 | 
				
			||||||
CONFIG_PROC_PAGE_MONITOR=y
 | 
					CONFIG_PROC_PAGE_MONITOR=y
 | 
				
			||||||
CONFIG_PROC_CHILDREN=y
 | 
					CONFIG_PROC_CHILDREN=y
 | 
				
			||||||
| 
						 | 
					@ -8657,6 +8694,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 | 
				
			||||||
CONFIG_TMPFS_XATTR=y
 | 
					CONFIG_TMPFS_XATTR=y
 | 
				
			||||||
CONFIG_HUGETLBFS=y
 | 
					CONFIG_HUGETLBFS=y
 | 
				
			||||||
CONFIG_HUGETLB_PAGE=y
 | 
					CONFIG_HUGETLB_PAGE=y
 | 
				
			||||||
 | 
					CONFIG_MEMFD_CREATE=y
 | 
				
			||||||
CONFIG_CONFIGFS_FS=m
 | 
					CONFIG_CONFIGFS_FS=m
 | 
				
			||||||
CONFIG_EFIVAR_FS=y
 | 
					CONFIG_EFIVAR_FS=y
 | 
				
			||||||
CONFIG_MISC_FILESYSTEMS=y
 | 
					CONFIG_MISC_FILESYSTEMS=y
 | 
				
			||||||
| 
						 | 
					@ -8927,6 +8965,7 @@ CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 | 
				
			||||||
# CONFIG_DEBUG_HIGHMEM is not set
 | 
					# CONFIG_DEBUG_HIGHMEM is not set
 | 
				
			||||||
CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 | 
					CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 | 
				
			||||||
# CONFIG_DEBUG_STACKOVERFLOW is not set
 | 
					# CONFIG_DEBUG_STACKOVERFLOW is not set
 | 
				
			||||||
 | 
					CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 | 
				
			||||||
# CONFIG_DEBUG_SHIRQ is not set
 | 
					# CONFIG_DEBUG_SHIRQ is not set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -8995,8 +9034,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 | 
				
			||||||
CONFIG_NOTIFIER_ERROR_INJECTION=m
 | 
					CONFIG_NOTIFIER_ERROR_INJECTION=m
 | 
				
			||||||
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 | 
					CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 | 
				
			||||||
CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
 | 
					CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
 | 
				
			||||||
# CONFIG_FAULT_INJECTION is not set
 | 
					 | 
				
			||||||
CONFIG_FUNCTION_ERROR_INJECTION=y
 | 
					CONFIG_FUNCTION_ERROR_INJECTION=y
 | 
				
			||||||
 | 
					# CONFIG_FAULT_INJECTION is not set
 | 
				
			||||||
# CONFIG_LATENCYTOP is not set
 | 
					# CONFIG_LATENCYTOP is not set
 | 
				
			||||||
CONFIG_USER_STACKTRACE_SUPPORT=y
 | 
					CONFIG_USER_STACKTRACE_SUPPORT=y
 | 
				
			||||||
CONFIG_NOP_TRACER=y
 | 
					CONFIG_NOP_TRACER=y
 | 
				
			||||||
| 
						 | 
					@ -9068,6 +9107,7 @@ CONFIG_TEST_KSTRTOX=m
 | 
				
			||||||
CONFIG_TEST_PRINTF=m
 | 
					CONFIG_TEST_PRINTF=m
 | 
				
			||||||
CONFIG_TEST_BITMAP=m
 | 
					CONFIG_TEST_BITMAP=m
 | 
				
			||||||
CONFIG_TEST_UUID=m
 | 
					CONFIG_TEST_UUID=m
 | 
				
			||||||
 | 
					CONFIG_TEST_OVERFLOW=m
 | 
				
			||||||
# CONFIG_TEST_RHASHTABLE is not set
 | 
					# CONFIG_TEST_RHASHTABLE is not set
 | 
				
			||||||
CONFIG_TEST_HASH=m
 | 
					CONFIG_TEST_HASH=m
 | 
				
			||||||
CONFIG_TEST_PARMAN=m
 | 
					CONFIG_TEST_PARMAN=m
 | 
				
			||||||
| 
						 | 
					@ -9203,6 +9243,7 @@ CONFIG_IMA_BLACKLIST_KEYRING=y
 | 
				
			||||||
CONFIG_EVM=y
 | 
					CONFIG_EVM=y
 | 
				
			||||||
CONFIG_EVM_ATTR_FSUUID=y
 | 
					CONFIG_EVM_ATTR_FSUUID=y
 | 
				
			||||||
CONFIG_EVM_EXTRA_SMACK_XATTRS=y
 | 
					CONFIG_EVM_EXTRA_SMACK_XATTRS=y
 | 
				
			||||||
 | 
					# CONFIG_EVM_ADD_XATTRS is not set
 | 
				
			||||||
# CONFIG_EVM_LOAD_X509 is not set
 | 
					# CONFIG_EVM_LOAD_X509 is not set
 | 
				
			||||||
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
 | 
					# CONFIG_DEFAULT_SECURITY_SELINUX is not set
 | 
				
			||||||
# CONFIG_DEFAULT_SECURITY_SMACK is not set
 | 
					# CONFIG_DEFAULT_SECURITY_SMACK is not set
 | 
				
			||||||
| 
						 | 
					@ -9263,6 +9304,11 @@ CONFIG_CRYPTO_ENGINE=m
 | 
				
			||||||
CONFIG_CRYPTO_CCM=m
 | 
					CONFIG_CRYPTO_CCM=m
 | 
				
			||||||
CONFIG_CRYPTO_GCM=y
 | 
					CONFIG_CRYPTO_GCM=y
 | 
				
			||||||
CONFIG_CRYPTO_CHACHA20POLY1305=m
 | 
					CONFIG_CRYPTO_CHACHA20POLY1305=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_AEGIS128=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_AEGIS128L=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_AEGIS256=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_MORUS640=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_MORUS1280=m
 | 
				
			||||||
CONFIG_CRYPTO_SEQIV=y
 | 
					CONFIG_CRYPTO_SEQIV=y
 | 
				
			||||||
CONFIG_CRYPTO_ECHAINIV=m
 | 
					CONFIG_CRYPTO_ECHAINIV=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9331,7 +9377,6 @@ CONFIG_CRYPTO_DES=m
 | 
				
			||||||
CONFIG_CRYPTO_FCRYPT=m
 | 
					CONFIG_CRYPTO_FCRYPT=m
 | 
				
			||||||
CONFIG_CRYPTO_KHAZAD=m
 | 
					CONFIG_CRYPTO_KHAZAD=m
 | 
				
			||||||
CONFIG_CRYPTO_SALSA20=m
 | 
					CONFIG_CRYPTO_SALSA20=m
 | 
				
			||||||
CONFIG_CRYPTO_SALSA20_586=m
 | 
					 | 
				
			||||||
CONFIG_CRYPTO_CHACHA20=m
 | 
					CONFIG_CRYPTO_CHACHA20=m
 | 
				
			||||||
CONFIG_CRYPTO_SEED=m
 | 
					CONFIG_CRYPTO_SEED=m
 | 
				
			||||||
CONFIG_CRYPTO_SERPENT=m
 | 
					CONFIG_CRYPTO_SERPENT=m
 | 
				
			||||||
| 
						 | 
					@ -9351,6 +9396,7 @@ CONFIG_CRYPTO_LZO=y
 | 
				
			||||||
CONFIG_CRYPTO_842=m
 | 
					CONFIG_CRYPTO_842=m
 | 
				
			||||||
CONFIG_CRYPTO_LZ4=m
 | 
					CONFIG_CRYPTO_LZ4=m
 | 
				
			||||||
CONFIG_CRYPTO_LZ4HC=m
 | 
					CONFIG_CRYPTO_LZ4HC=m
 | 
				
			||||||
 | 
					CONFIG_CRYPTO_ZSTD=m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Random Number Generation
 | 
					# Random Number Generation
 | 
				
			||||||
| 
						 | 
					@ -9501,9 +9547,14 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 | 
				
			||||||
CONFIG_HAS_IOMEM=y
 | 
					CONFIG_HAS_IOMEM=y
 | 
				
			||||||
CONFIG_HAS_IOPORT_MAP=y
 | 
					CONFIG_HAS_IOPORT_MAP=y
 | 
				
			||||||
CONFIG_HAS_DMA=y
 | 
					CONFIG_HAS_DMA=y
 | 
				
			||||||
CONFIG_SGL_ALLOC=y
 | 
					CONFIG_NEED_SG_DMA_LENGTH=y
 | 
				
			||||||
 | 
					CONFIG_NEED_DMA_MAP_STATE=y
 | 
				
			||||||
 | 
					CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 | 
				
			||||||
 | 
					CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 | 
				
			||||||
CONFIG_DMA_DIRECT_OPS=y
 | 
					CONFIG_DMA_DIRECT_OPS=y
 | 
				
			||||||
CONFIG_DMA_VIRT_OPS=y
 | 
					CONFIG_DMA_VIRT_OPS=y
 | 
				
			||||||
 | 
					CONFIG_SWIOTLB=y
 | 
				
			||||||
 | 
					CONFIG_SGL_ALLOC=y
 | 
				
			||||||
CONFIG_CHECK_SIGNATURE=y
 | 
					CONFIG_CHECK_SIGNATURE=y
 | 
				
			||||||
CONFIG_CPU_RMAP=y
 | 
					CONFIG_CPU_RMAP=y
 | 
				
			||||||
CONFIG_DQL=y
 | 
					CONFIG_DQL=y
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
					@ -454,9 +454,27 @@ rsnapshot uses hard links to deduplicate identical files.")
 | 
				
			||||||
                "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
 | 
					                "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
 | 
				
			||||||
              (patches (search-patches "diffutils-gets-undeclared.patch"))))
 | 
					              (patches (search-patches "diffutils-gets-undeclared.patch"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					     '(#:phases (modify-phases %standard-phases
 | 
				
			||||||
 | 
					                  (add-before 'configure 'adjust-configure-script
 | 
				
			||||||
 | 
					                    (lambda _
 | 
				
			||||||
 | 
					                      ;; Mimic upstream commit
 | 
				
			||||||
 | 
					                      ;; 25750ab5ef82fd3cfce5205d5f1ef07b47098091.
 | 
				
			||||||
 | 
					                      (substitute* "configure"
 | 
				
			||||||
 | 
					                        (("GUILE=(.*)--variable bindir`" _ middle)
 | 
				
			||||||
 | 
					                         (string-append "GUILE=" middle
 | 
				
			||||||
 | 
					                                        "--variable bindir`/guile")))
 | 
				
			||||||
 | 
					                      #t))
 | 
				
			||||||
 | 
					                  (add-before 'check 'skip-test
 | 
				
			||||||
 | 
					                    (lambda _
 | 
				
			||||||
 | 
					                      ;; XXX: This test fails (1) because current GnuTLS no
 | 
				
			||||||
 | 
					                      ;; longer supports OpenPGP authentication, and (2) for
 | 
				
			||||||
 | 
					                      ;; some obscure reason.  Better skip it.
 | 
				
			||||||
 | 
					                      (setenv "XFAIL_TESTS" "utils/block-server")
 | 
				
			||||||
 | 
					                      #t)))))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("guile" ,guile-2.0)
 | 
					     `(("guile" ,guile-2.0)
 | 
				
			||||||
       ("gperf" ,gperf)
 | 
					       ("gperf" ,gperf-3.0)                  ;see <https://bugs.gnu.org/32382>
 | 
				
			||||||
       ("pkg-config" ,pkg-config)))
 | 
					       ("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("guile" ,guile-2.0)
 | 
					     `(("guile" ,guile-2.0)
 | 
				
			||||||
| 
						 | 
					@ -881,8 +899,8 @@ is like a time machine for your data. ")
 | 
				
			||||||
             (with-directory-excursion (string-append
 | 
					             (with-directory-excursion (string-append
 | 
				
			||||||
                                        "src/github.com/restic/restic-"
 | 
					                                        "src/github.com/restic/restic-"
 | 
				
			||||||
                                        ,version)
 | 
					                                        ,version)
 | 
				
			||||||
               ;; unexpected error: fusermount: exit status 1
 | 
					               ;; Disable FUSE tests.
 | 
				
			||||||
               (delete-file "cmd/restic/integration_fuse_test.go")
 | 
					               (setenv "RESTIC_TEST_FUSE" "0")
 | 
				
			||||||
               (invoke "go" "run" "build.go" "--test"))))
 | 
					               (invoke "go" "run" "build.go" "--test"))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
         (replace 'install
 | 
					         (replace 'install
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,6 +52,7 @@
 | 
				
			||||||
  #:use-module (gnu packages tls)
 | 
					  #:use-module (gnu packages tls)
 | 
				
			||||||
  #:use-module (gnu packages sdl)
 | 
					  #:use-module (gnu packages sdl)
 | 
				
			||||||
  #:use-module (gnu packages swig)
 | 
					  #:use-module (gnu packages swig)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages valgrind)
 | 
				
			||||||
  #:use-module (gnu packages virtualization)
 | 
					  #:use-module (gnu packages virtualization)
 | 
				
			||||||
  #:use-module (gnu packages web)
 | 
					  #:use-module (gnu packages web)
 | 
				
			||||||
  #:use-module (guix build-system gnu)
 | 
					  #:use-module (guix build-system gnu)
 | 
				
			||||||
| 
						 | 
					@ -322,7 +323,7 @@ menu to select one of the installed operating systems.")
 | 
				
			||||||
(define-public dtc
 | 
					(define-public dtc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "dtc")
 | 
					    (name "dtc")
 | 
				
			||||||
    (version "1.4.6")
 | 
					    (version "1.4.7")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
| 
						 | 
					@ -330,12 +331,13 @@ menu to select one of the installed operating systems.")
 | 
				
			||||||
                    "dtc-" version ".tar.xz"))
 | 
					                    "dtc-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0zkvih0fpwvk31aqyyfy9kn13nbi76c21ihax15p6h1wrjzh48rq"))))
 | 
					                "1rydi5jvhlhsr110h6n0pavv3daqa0cb4m5vcps50qzq1zqfhhv6"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("bison" ,bison)
 | 
					     `(("bison" ,bison)
 | 
				
			||||||
       ("flex" ,flex)
 | 
					       ("flex" ,flex)
 | 
				
			||||||
       ("swig" ,swig)))
 | 
					       ("swig" ,swig)
 | 
				
			||||||
 | 
					       ("valgrind" ,valgrind)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("python-2" ,python-2)))
 | 
					     `(("python-2" ,python-2)))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -185,8 +185,8 @@ their dependencies.")
 | 
				
			||||||
      (license l:gpl3+))))
 | 
					      (license l:gpl3+))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public cuirass
 | 
					(define-public cuirass
 | 
				
			||||||
  (let ((commit "99241ef1af24cadf39e3cad39f9ff27c96b22068")
 | 
					  (let ((commit "4db99f647b3677086a2007763726d05a59b0cdcb")
 | 
				
			||||||
        (revision "17"))
 | 
					        (revision "18"))
 | 
				
			||||||
    (package
 | 
					    (package
 | 
				
			||||||
      (name "cuirass")
 | 
					      (name "cuirass")
 | 
				
			||||||
      (version (string-append "0.0.1-" revision "." (string-take commit 7)))
 | 
					      (version (string-append "0.0.1-" revision "." (string-take commit 7)))
 | 
				
			||||||
| 
						 | 
					@ -198,7 +198,7 @@ their dependencies.")
 | 
				
			||||||
                (file-name (string-append name "-" version))
 | 
					                (file-name (string-append name "-" version))
 | 
				
			||||||
                (sha256
 | 
					                (sha256
 | 
				
			||||||
                 (base32
 | 
					                 (base32
 | 
				
			||||||
                  "1hj17s07sq6nn9wlssd4pi4hzdfyp74kyz5rqv7wr4468xh80pk7"))))
 | 
					                  "1lg3w0xjg6b806y8gfxj2dq1g0djm5pyk886j8g7n5n9ljlhjzxj"))))
 | 
				
			||||||
      (build-system gnu-build-system)
 | 
					      (build-system gnu-build-system)
 | 
				
			||||||
      (arguments
 | 
					      (arguments
 | 
				
			||||||
       '(#:modules ((guix build utils)
 | 
					       '(#:modules ((guix build utils)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -242,16 +242,17 @@ intutive syntax and trivial integration.")
 | 
				
			||||||
(define-public xtl
 | 
					(define-public xtl
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xtl")
 | 
					    (name "xtl")
 | 
				
			||||||
    (version "0.4.8")
 | 
					    (version "0.4.14")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method git-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri
 | 
				
			||||||
                    "https://github.com/QuantStack/xtl/archive/"
 | 
					               (git-reference
 | 
				
			||||||
                    version ".tar.gz"))
 | 
					                (url "https://github.com/QuantStack/xtl.git")
 | 
				
			||||||
 | 
					                (commit version)))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "05bcz9y590b77bxcip0k31rgsapmkwqi1smvsvc84zz7m87d4jvy"))
 | 
					                "0wwnd9adc1wav2299id17k5fbp0ib5gxkbihlk6jlh3v4i5nz11x"))
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))))
 | 
					              (file-name (git-file-name name version))))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("googletest" ,googletest)
 | 
					     `(("googletest" ,googletest)
 | 
				
			||||||
       ("json-modern-cxx" ,json-modern-cxx)))
 | 
					       ("json-modern-cxx" ,json-modern-cxx)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -461,6 +461,24 @@ print, summary, plot, update, etc.
 | 
				
			||||||
@end itemize\n")
 | 
					@end itemize\n")
 | 
				
			||||||
    (license license:gpl2)))
 | 
					    (license license:gpl2)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public r-ps
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "r-ps")
 | 
				
			||||||
 | 
					    (version "1.1.0")
 | 
				
			||||||
 | 
					    (source
 | 
				
			||||||
 | 
					     (origin
 | 
				
			||||||
 | 
					       (method url-fetch)
 | 
				
			||||||
 | 
					       (uri (cran-uri "ps" version))
 | 
				
			||||||
 | 
					       (sha256
 | 
				
			||||||
 | 
					        (base32 "1zm9qkyvy1fvcjvmgw51iqw8x1xzkpy7rx7xnchwfj0xpzal0ljx"))))
 | 
				
			||||||
 | 
					    (build-system r-build-system)
 | 
				
			||||||
 | 
					    (home-page "http://ps.r-lib.org")
 | 
				
			||||||
 | 
					    (synopsis "List, query, and manipulate system processes")
 | 
				
			||||||
 | 
					    (description
 | 
				
			||||||
 | 
					     "The ps package implements an API to list, query, and manipulate system
 | 
				
			||||||
 | 
					processes.  Most of its code is based on the @code{psutil} Python package.")
 | 
				
			||||||
 | 
					    (license license:bsd-3)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public r-rcpp
 | 
					(define-public r-rcpp
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-rcpp")
 | 
					    (name "r-rcpp")
 | 
				
			||||||
| 
						 | 
					@ -1276,14 +1294,14 @@ data).  Weighted versions of MLE, MME and QME are available.")
 | 
				
			||||||
(define-public r-energy
 | 
					(define-public r-energy
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-energy")
 | 
					    (name "r-energy")
 | 
				
			||||||
    (version "1.7-4")
 | 
					    (version "1.7-5")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "energy" version))
 | 
					       (uri (cran-uri "energy" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "12skvlridfq4jd5mh0yxl79ps0zi2xnlh4hsdgxad0gm7qky8awd"))))
 | 
					         "15k9dg0a82cs9ypm0wpcsff3il1hzhnnv86dv5ngby1r144czhi4"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-boot" ,r-boot)
 | 
					     `(("r-boot" ,r-boot)
 | 
				
			||||||
| 
						 | 
					@ -1411,14 +1429,14 @@ available in a vignette.")
 | 
				
			||||||
(define-public r-lava
 | 
					(define-public r-lava
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-lava")
 | 
					    (name "r-lava")
 | 
				
			||||||
    (version "1.6.2")
 | 
					    (version "1.6.3")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "lava" version))
 | 
					       (uri (cran-uri "lava" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "1r47pps39cgvxhg1s0bqknf4jl91pbb0c76q5icxivhwb172fqcm"))))
 | 
					         "0cayjspry3r2lcbvl77v5v52b2zarri3b8xsf87pw5a3jn9anxcf"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-numderiv" ,r-numderiv)
 | 
					     `(("r-numderiv" ,r-numderiv)
 | 
				
			||||||
| 
						 | 
					@ -1887,14 +1905,14 @@ or between integer vectors representing generic sequences.")
 | 
				
			||||||
(define-public r-jomo
 | 
					(define-public r-jomo
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-jomo")
 | 
					    (name "r-jomo")
 | 
				
			||||||
    (version "2.6-2")
 | 
					    (version "2.6-3")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "jomo" version))
 | 
					       (uri (cran-uri "jomo" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0zyqwa2y08asj9xqwnngh6da1b9cqcx8pzc9cxwrmgnxd5nnsjb7"))))
 | 
					         "14s8q0j5zgl1g1pfxg3a4y1jzvs0wl61ir4992wsj7safskj7zvi"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-lme4" ,r-lme4)
 | 
					     `(("r-lme4" ,r-lme4)
 | 
				
			||||||
| 
						 | 
					@ -1933,14 +1951,14 @@ clustered data.")
 | 
				
			||||||
(define-public r-mitml
 | 
					(define-public r-mitml
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-mitml")
 | 
					    (name "r-mitml")
 | 
				
			||||||
    (version "0.3-5")
 | 
					    (version "0.3-6")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "mitml" version))
 | 
					       (uri (cran-uri "mitml" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"))))
 | 
					         "1pkqv4qazih3byws5z6629pp232n8ra56lip7502727b0b4bsndw"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-haven" ,r-haven)
 | 
					     `(("r-haven" ,r-haven)
 | 
				
			||||||
| 
						 | 
					@ -2459,18 +2477,19 @@ constants, and control debugging of packages via environment variables.")
 | 
				
			||||||
(define-public r-processx
 | 
					(define-public r-processx
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-processx")
 | 
					    (name "r-processx")
 | 
				
			||||||
    (version "3.1.0")
 | 
					    (version "3.2.0")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "processx" version))
 | 
					       (uri (cran-uri "processx" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0wjr3cqwvnjxbvln25szffmkns5w0xysivdjr6chxap4nh515b0i"))))
 | 
					         "1pzx4ap4xa07gf9zkd6hacdsnb9sp3kb60a7v7ljl0ywrcpn1fn4"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-assertthat" ,r-assertthat)
 | 
					     `(("r-assertthat" ,r-assertthat)
 | 
				
			||||||
       ("r-crayon" ,r-crayon)
 | 
					       ("r-crayon" ,r-crayon)
 | 
				
			||||||
 | 
					       ("r-ps" ,r-ps)
 | 
				
			||||||
       ("r-r6" ,r-r6)
 | 
					       ("r-r6" ,r-r6)
 | 
				
			||||||
       ("r-testthat" ,r-testthat)))
 | 
					       ("r-testthat" ,r-testthat)))
 | 
				
			||||||
    (home-page "https://github.com/r-lib/processx3")
 | 
					    (home-page "https://github.com/r-lib/processx3")
 | 
				
			||||||
| 
						 | 
					@ -2610,14 +2629,14 @@ iVAT).")
 | 
				
			||||||
(define-public r-xfun
 | 
					(define-public r-xfun
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-xfun")
 | 
					    (name "r-xfun")
 | 
				
			||||||
    (version "0.2")
 | 
					    (version "0.3")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "xfun" version))
 | 
					       (uri (cran-uri "xfun" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0zl22fcw90kdvzkjyf6vbmdmn9rz3bl51522fasvmykypffyng4a"))))
 | 
					         "1r11dd49ngmjgbjdv28a9c1jp8cg1l50x0acbsamzz576p8i2wl9"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (home-page "https://github.com/yihui/xfun")
 | 
					    (home-page "https://github.com/yihui/xfun")
 | 
				
			||||||
    (synopsis "Miscellaneous functions")
 | 
					    (synopsis "Miscellaneous functions")
 | 
				
			||||||
| 
						 | 
					@ -2693,15 +2712,17 @@ terminals.")
 | 
				
			||||||
(define-public r-tinytex
 | 
					(define-public r-tinytex
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-tinytex")
 | 
					    (name "r-tinytex")
 | 
				
			||||||
    (version "0.5")
 | 
					    (version "0.6")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "tinytex" version))
 | 
					       (uri (cran-uri "tinytex" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7"))))
 | 
					         "16y9dldaff2kx1fkm92p7zlph0dcrdmlmavpdgf5y9jbhmc8g83f"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
 | 
					    (propagated-inputs
 | 
				
			||||||
 | 
					     `(("r-xfun" ,r-xfun)))
 | 
				
			||||||
    (home-page "https://github.com/yihui/tinytex")
 | 
					    (home-page "https://github.com/yihui/tinytex")
 | 
				
			||||||
    (synopsis "Helper functions for TeX Live and compiling LaTeX documents")
 | 
					    (synopsis "Helper functions for TeX Live and compiling LaTeX documents")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					@ -3109,14 +3130,14 @@ interface.")
 | 
				
			||||||
(define-public r-trend
 | 
					(define-public r-trend
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-trend")
 | 
					    (name "r-trend")
 | 
				
			||||||
    (version "1.1.0")
 | 
					    (version "1.1.1")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "trend" version))
 | 
					       (uri (cran-uri "trend" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "06yifqbsvxbmk5gld4z2nnyhf59v8ks5xjwacmb25mv9r6bn388b"))))
 | 
					         "1bd567n15k2vpmgbx02584k5kglrc58mlb5kgd07wdss3knpa48q"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-extradistr" ,r-extradistr)))
 | 
					     `(("r-extradistr" ,r-extradistr)))
 | 
				
			||||||
| 
						 | 
					@ -4767,27 +4788,6 @@ approach is the identification of genomic regions, genes, or gene sets
 | 
				
			||||||
containing one or more SNPs that evolved under directional selection.")
 | 
					containing one or more SNPs that evolved under directional selection.")
 | 
				
			||||||
    (license license:gpl2)))
 | 
					    (license license:gpl2)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public r-hash
 | 
					 | 
				
			||||||
  (package
 | 
					 | 
				
			||||||
    (name "r-hash")
 | 
					 | 
				
			||||||
    (version "2.2.6")
 | 
					 | 
				
			||||||
    (source
 | 
					 | 
				
			||||||
     (origin
 | 
					 | 
				
			||||||
       (method url-fetch)
 | 
					 | 
				
			||||||
       (uri (cran-uri "hash" version))
 | 
					 | 
				
			||||||
       (sha256
 | 
					 | 
				
			||||||
        (base32
 | 
					 | 
				
			||||||
         "0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"))))
 | 
					 | 
				
			||||||
    (build-system r-build-system)
 | 
					 | 
				
			||||||
    (home-page "https://cran.r-project.org/web/packages/hash/")
 | 
					 | 
				
			||||||
    (synopsis "Implementation of hash/associated arrays/dictionaries")
 | 
					 | 
				
			||||||
    (description
 | 
					 | 
				
			||||||
     "This package implements a data structure similar to hashes in Perl and
 | 
					 | 
				
			||||||
dictionaries in Python but with a purposefully R flavor.  For objects of
 | 
					 | 
				
			||||||
appreciable size, access using hashes outperforms native named lists and
 | 
					 | 
				
			||||||
vectors.")
 | 
					 | 
				
			||||||
    (license license:gpl2+)))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
(define-public r-proc
 | 
					(define-public r-proc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-proc")
 | 
					    (name "r-proc")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -84,6 +84,7 @@
 | 
				
			||||||
  #:use-module (gnu packages pkg-config)
 | 
					  #:use-module (gnu packages pkg-config)
 | 
				
			||||||
  #:use-module (gnu packages popt)
 | 
					  #:use-module (gnu packages popt)
 | 
				
			||||||
  #:use-module (gnu packages python)
 | 
					  #:use-module (gnu packages python)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages python-crypto)
 | 
				
			||||||
  #:use-module (gnu packages rdf)
 | 
					  #:use-module (gnu packages rdf)
 | 
				
			||||||
  #:use-module (gnu packages readline)
 | 
					  #:use-module (gnu packages readline)
 | 
				
			||||||
  #:use-module (gnu packages ruby)
 | 
					  #:use-module (gnu packages ruby)
 | 
				
			||||||
| 
						 | 
					@ -548,10 +549,26 @@ RDBMS systems (which are deep in functionality).")
 | 
				
			||||||
                   ;; Some parts are licensed under the Apache License
 | 
					                   ;; Some parts are licensed under the Apache License
 | 
				
			||||||
                   license:asl2.0))))
 | 
					                   license:asl2.0))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define boost-for-mysql
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (inherit boost)
 | 
				
			||||||
 | 
					    (version "1.59.0")
 | 
				
			||||||
 | 
					    (source (origin
 | 
				
			||||||
 | 
					              (method url-fetch)
 | 
				
			||||||
 | 
					              (uri (string-append
 | 
				
			||||||
 | 
					                    "mirror://sourceforge/boost/boost/" version "/boost_"
 | 
				
			||||||
 | 
					                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
 | 
				
			||||||
 | 
					                    ".tar.bz2"))
 | 
				
			||||||
 | 
					              (sha256
 | 
				
			||||||
 | 
					               (base32
 | 
				
			||||||
 | 
					                "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					;; XXX When updating, check whether boost-for-mysql is still needed.
 | 
				
			||||||
 | 
					;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
 | 
				
			||||||
(define-public mysql
 | 
					(define-public mysql
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "mysql")
 | 
					    (name "mysql")
 | 
				
			||||||
    (version "5.7.21")
 | 
					    (version "5.7.23")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (list (string-append
 | 
					             (uri (list (string-append
 | 
				
			||||||
| 
						 | 
					@ -563,7 +580,7 @@ RDBMS systems (which are deep in functionality).")
 | 
				
			||||||
                          name "-" version ".tar.gz")))
 | 
					                          name "-" version ".tar.gz")))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "1dq9bgnajf7cq3mrjkwv6w5nwslhs26lkrw56i7w4fbsq9wm087s"))))
 | 
					               "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"))))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:configure-flags
 | 
					     `(#:configure-flags
 | 
				
			||||||
| 
						 | 
					@ -588,15 +605,6 @@ RDBMS systems (which are deep in functionality).")
 | 
				
			||||||
         "-DINSTALL_MYSQLTESTDIR="
 | 
					         "-DINSTALL_MYSQLTESTDIR="
 | 
				
			||||||
         "-DINSTALL_SQLBENCHDIR=")
 | 
					         "-DINSTALL_SQLBENCHDIR=")
 | 
				
			||||||
       #:phases (modify-phases %standard-phases
 | 
					       #:phases (modify-phases %standard-phases
 | 
				
			||||||
                  (add-after
 | 
					 | 
				
			||||||
                   'unpack 'patch-boost-version
 | 
					 | 
				
			||||||
                   (lambda _
 | 
					 | 
				
			||||||
                     ;; Mysql wants boost-1.59.0 specifically
 | 
					 | 
				
			||||||
                     (substitute* "cmake/boost.cmake"
 | 
					 | 
				
			||||||
                       (("59")
 | 
					 | 
				
			||||||
                        ,(match (string-split (package-version boost) #\.)
 | 
					 | 
				
			||||||
                           ((_ minor . _) minor))))
 | 
					 | 
				
			||||||
                     #t))
 | 
					 | 
				
			||||||
                  (add-after
 | 
					                  (add-after
 | 
				
			||||||
                   'install 'remove-extra-binaries
 | 
					                   'install 'remove-extra-binaries
 | 
				
			||||||
                   (lambda* (#:key outputs #:allow-other-keys)
 | 
					                   (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
| 
						 | 
					@ -611,7 +619,7 @@ RDBMS systems (which are deep in functionality).")
 | 
				
			||||||
     `(("bison" ,bison)
 | 
					     `(("bison" ,bison)
 | 
				
			||||||
       ("perl" ,perl)))
 | 
					       ("perl" ,perl)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("boost" ,boost)
 | 
					     `(("boost" ,boost-for-mysql)
 | 
				
			||||||
       ("libaio" ,libaio)
 | 
					       ("libaio" ,libaio)
 | 
				
			||||||
       ("ncurses" ,ncurses)
 | 
					       ("ncurses" ,ncurses)
 | 
				
			||||||
       ("openssl" ,openssl)
 | 
					       ("openssl" ,openssl)
 | 
				
			||||||
| 
						 | 
					@ -867,6 +875,34 @@ pictures, sounds, or video.")
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr"))))))
 | 
					                "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr"))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public python-pymysql
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "python-pymysql")
 | 
				
			||||||
 | 
					    (version "0.9.2")
 | 
				
			||||||
 | 
					    (source
 | 
				
			||||||
 | 
					     (origin
 | 
				
			||||||
 | 
					       (method url-fetch)
 | 
				
			||||||
 | 
					       (uri (pypi-uri "PyMySQL" version))
 | 
				
			||||||
 | 
					       (sha256
 | 
				
			||||||
 | 
					        (base32
 | 
				
			||||||
 | 
					         "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy"))))
 | 
				
			||||||
 | 
					    (build-system python-build-system)
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("python-unittest2" ,python-unittest2)))
 | 
				
			||||||
 | 
					    (inputs
 | 
				
			||||||
 | 
					     `(("python-cryptography" ,python-cryptography)))
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					     `(#:tests? #f))                    ; tests expect a running MySQL
 | 
				
			||||||
 | 
					    (home-page "https://github.com/PyMySQL/PyMySQL/")
 | 
				
			||||||
 | 
					    (synopsis "Pure-Python MySQL driver")
 | 
				
			||||||
 | 
					    (description
 | 
				
			||||||
 | 
					     "PyMySQL is a pure-Python MySQL client library, based on PEP 249.
 | 
				
			||||||
 | 
					Most public APIs are compatible with @command{mysqlclient} and MySQLdb.")
 | 
				
			||||||
 | 
					    (license license:expat)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public python2-pymysql
 | 
				
			||||||
 | 
					  (package-with-python2 python-pymysql))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public qdbm
 | 
					(define-public qdbm
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "qdbm")
 | 
					    (name "qdbm")
 | 
				
			||||||
| 
						 | 
					@ -1113,6 +1149,37 @@ for example from a shell script.")
 | 
				
			||||||
    ;; others (like sparql-query.c) contain a GPLv2+ license header.
 | 
					    ;; others (like sparql-query.c) contain a GPLv2+ license header.
 | 
				
			||||||
    (license (list license:gpl3+))))
 | 
					    (license (list license:gpl3+))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public sqlcrush
 | 
				
			||||||
 | 
					  ;; Unfortunately, there is no proper upstream release and may never be.
 | 
				
			||||||
 | 
					  (let ((commit "b5f6868f189566a26eecc78d0f0659813c1aa98a")
 | 
				
			||||||
 | 
					        (revision "1"))
 | 
				
			||||||
 | 
					    (package
 | 
				
			||||||
 | 
					      (name "sqlcrush")
 | 
				
			||||||
 | 
					      (version (git-version "0.1.5" revision commit))
 | 
				
			||||||
 | 
					      (source (origin
 | 
				
			||||||
 | 
					                (method git-fetch)
 | 
				
			||||||
 | 
					                (uri (git-reference
 | 
				
			||||||
 | 
					                      (url "https://github.com/coffeeandscripts/sqlcrush.git")
 | 
				
			||||||
 | 
					                      (commit commit)))
 | 
				
			||||||
 | 
					                (file-name (git-file-name name version))
 | 
				
			||||||
 | 
					                (sha256
 | 
				
			||||||
 | 
					                 (base32
 | 
				
			||||||
 | 
					                  "0x3wy40r93p0jv3nbwj9a77wa4ff697d13r0wffmm7q9h3mzsww8"))))
 | 
				
			||||||
 | 
					      (build-system python-build-system)
 | 
				
			||||||
 | 
					      (inputs
 | 
				
			||||||
 | 
					       `(("python-cryptography" ,python-cryptography)
 | 
				
			||||||
 | 
					         ("python-psycopg2" ,python-psycopg2)
 | 
				
			||||||
 | 
					         ("python-pymysql" ,python-pymysql)
 | 
				
			||||||
 | 
					         ("python-sqlalchemy" ,python-sqlalchemy)))
 | 
				
			||||||
 | 
					      (home-page "https://github.com/coffeeandscripts/sqlcrush")
 | 
				
			||||||
 | 
					      (synopsis "Text console-based database viewer and editor")
 | 
				
			||||||
 | 
					      (description
 | 
				
			||||||
 | 
					       "SQLcrush lets you view and edit a database directly from the text
 | 
				
			||||||
 | 
					console through an ncurses interface.  You can explore each table's structure,
 | 
				
			||||||
 | 
					browse and edit the contents, add and delete entries, all while tracking your
 | 
				
			||||||
 | 
					changes.")
 | 
				
			||||||
 | 
					      (license license:gpl3+)))) ; no headers, see README.md
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public sqlite
 | 
					(define-public sqlite
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
   (name "sqlite")
 | 
					   (name "sqlite")
 | 
				
			||||||
| 
						 | 
					@ -1432,7 +1499,7 @@ columns, primary keys, unique constraints and relationships.")
 | 
				
			||||||
(define-public perl-dbd-sqlite
 | 
					(define-public perl-dbd-sqlite
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "perl-dbd-sqlite")
 | 
					    (name "perl-dbd-sqlite")
 | 
				
			||||||
    (version "1.54")
 | 
					    (version "1.58")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
| 
						 | 
					@ -1440,7 +1507,7 @@ columns, primary keys, unique constraints and relationships.")
 | 
				
			||||||
                    version ".tar.gz"))
 | 
					                    version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0sbj9lx9syzpknvjv8cz9jndg32qz775vy2prgq305npv3dsca9r"))))
 | 
					                "0fqx386jgs9mmrknr7smmzapf07izgivza7x08lfm39ks2cxs83i"))))
 | 
				
			||||||
    (build-system perl-build-system)
 | 
					    (build-system perl-build-system)
 | 
				
			||||||
    (inputs `(("sqlite" ,sqlite)))
 | 
					    (inputs `(("sqlite" ,sqlite)))
 | 
				
			||||||
    (propagated-inputs `(("perl-dbi" ,perl-dbi)))
 | 
					    (propagated-inputs `(("perl-dbi" ,perl-dbi)))
 | 
				
			||||||
| 
						 | 
					@ -1955,14 +2022,14 @@ for ODBC.")
 | 
				
			||||||
(define-public python-pyodbc
 | 
					(define-public python-pyodbc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "python-pyodbc")
 | 
					    (name "python-pyodbc")
 | 
				
			||||||
    (version "4.0.21")
 | 
					    (version "4.0.24")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (pypi-uri "pyodbc" version))
 | 
					       (uri (pypi-uri "pyodbc" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0a83zwz3h1agshnsc6r7al6q83222w8601gpzzzjvjz5m56ghmcn"))
 | 
					         "1m311vi7vpay1j7rkq71fpsk0gb7454k4lldk5b63hyy6yvsn9j3"))
 | 
				
			||||||
       (file-name (string-append name "-" version ".tar.gz"))))
 | 
					       (file-name (string-append name "-" version ".tar.gz"))))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					@ -2122,7 +2189,7 @@ implementation for Python.")
 | 
				
			||||||
(define-public virtuoso-ose
 | 
					(define-public virtuoso-ose
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "virtuoso-ose")
 | 
					    (name "virtuoso-ose")
 | 
				
			||||||
    (version "7.2.4.2")
 | 
					    (version "7.2.5")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -2130,7 +2197,7 @@ implementation for Python.")
 | 
				
			||||||
             "https://github.com/openlink/virtuoso-opensource/releases/"
 | 
					             "https://github.com/openlink/virtuoso-opensource/releases/"
 | 
				
			||||||
             "download/v" version "/virtuoso-opensource-" version ".tar.gz"))
 | 
					             "download/v" version "/virtuoso-opensource-" version ".tar.gz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32 "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"))))
 | 
					        (base32 "0r1xakclkfi69pzh8z2k16z3x0m49pxp764icj0ad4w4bb97fr42"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f ; Tests require a network connection.
 | 
					     `(#:tests? #f ; Tests require a network connection.
 | 
				
			||||||
| 
						 | 
					@ -2533,14 +2600,14 @@ database).")
 | 
				
			||||||
(define-public python-mysqlclient
 | 
					(define-public python-mysqlclient
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "python-mysqlclient")
 | 
					    (name "python-mysqlclient")
 | 
				
			||||||
    (version "1.3.10")
 | 
					    (version "1.3.13")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (pypi-uri "mysqlclient" version))
 | 
					       (uri (pypi-uri "mysqlclient" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0qkj570x4rbsblji6frvsvp2v1ap32dqzj1lq62zp9515ffsyaj5"))))
 | 
					         "0kv4a1icwdav8jpl7qvnr931lw5h3v22ids6lwq6qpi1hjzf33pz"))))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("mariadb" ,mariadb)
 | 
					     `(("mariadb" ,mariadb)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -498,14 +498,14 @@ Extensions} (DNSSEC).")
 | 
				
			||||||
(define-public knot
 | 
					(define-public knot
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "knot")
 | 
					    (name "knot")
 | 
				
			||||||
    (version "2.6.7")
 | 
					    (version "2.7.1")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://secure.nic.cz/files/knot-dns/"
 | 
					              (uri (string-append "https://secure.nic.cz/files/knot-dns/"
 | 
				
			||||||
                                  name "-" version ".tar.xz"))
 | 
					                                  name "-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0hr2m664ckjicv3pq2lk16m61pscknywxv2ydnrzfqf10m5h0ahw"))
 | 
					                "108k6x3hjsnyf06pv5rlxqhynjbbz13pzwax1mqff3hgv85f4skx"))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
              (snippet
 | 
					              (snippet
 | 
				
			||||||
               '(begin
 | 
					               '(begin
 | 
				
			||||||
| 
						 | 
					@ -526,40 +526,29 @@ Extensions} (DNSSEC).")
 | 
				
			||||||
       ("liburcu" ,liburcu)
 | 
					       ("liburcu" ,liburcu)
 | 
				
			||||||
       ("lmdb" ,lmdb)
 | 
					       ("lmdb" ,lmdb)
 | 
				
			||||||
       ("ncurses" ,ncurses)
 | 
					       ("ncurses" ,ncurses)
 | 
				
			||||||
       ("nettle" ,nettle)
 | 
					       ("protobuf-c" ,protobuf-c)))
 | 
				
			||||||
       ("protobuf-c" ,protobuf-c)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
       ;; For ‘pykeymgr’, needed to migrate keys from versions <= 2.4.
 | 
					 | 
				
			||||||
       ("python" ,python-2)
 | 
					 | 
				
			||||||
       ("python-lmdb" ,python2-lmdb)))
 | 
					 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:phases
 | 
					     `(#:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before 'configure 'disable-directory-pre-creation
 | 
					         (add-before 'configure 'disable-directory-pre-creation
 | 
				
			||||||
           (lambda _
 | 
					           (lambda _
 | 
				
			||||||
             ;; Don't install empty directories like ‘/etc’ outside the store.
 | 
					             ;; Don't install empty directories like ‘/etc’ outside the store.
 | 
				
			||||||
 | 
					             ;; This is needed even when using ‘make config_dir=... install’.
 | 
				
			||||||
             (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))
 | 
					             (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))
 | 
				
			||||||
             #t))
 | 
					             #t))
 | 
				
			||||||
         (replace 'install
 | 
					         (replace 'install
 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					           (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
             (let* ((out (assoc-ref outputs "out"))
 | 
					             (let* ((out (assoc-ref outputs "out"))
 | 
				
			||||||
                    (doc (string-append out "/share/doc/knot"))
 | 
					                    (doc (string-append out "/share/doc/" ,name "-" ,version))
 | 
				
			||||||
                    (etc (string-append doc "/examples/etc")))
 | 
					                    (etc (string-append doc "/examples/etc")))
 | 
				
			||||||
               (invoke "make"
 | 
					               (invoke "make"
 | 
				
			||||||
                       (string-append "config_dir=" etc)
 | 
					                       (string-append "config_dir=" etc)
 | 
				
			||||||
                       "install"))))
 | 
					                       "install")))))
 | 
				
			||||||
         (add-after 'install 'wrap-python-scripts
 | 
					 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					 | 
				
			||||||
             (let* ((out (assoc-ref outputs "out"))
 | 
					 | 
				
			||||||
                    (path (getenv "PYTHONPATH")))
 | 
					 | 
				
			||||||
               (wrap-program (string-append out "/sbin/pykeymgr")
 | 
					 | 
				
			||||||
                 `("PYTHONPATH" ":" prefix (,path))))
 | 
					 | 
				
			||||||
             #t)))
 | 
					 | 
				
			||||||
       #:configure-flags
 | 
					       #:configure-flags
 | 
				
			||||||
       (list "--sysconfdir=/etc"
 | 
					       (list "--sysconfdir=/etc"
 | 
				
			||||||
             "--localstatedir=/var"
 | 
					             "--localstatedir=/var"
 | 
				
			||||||
             "--with-module-rosedb=yes" ; serve static records from a database
 | 
					             "--enable-dnstap"          ; let tools read/write capture files
 | 
				
			||||||
             "--with-module-dnstap=yes" ; allow detailed query logging
 | 
					             "--with-module-dnstap=yes" ; detailed query capturing & logging
 | 
				
			||||||
             (string-append "--with-bash-completions="
 | 
					             (string-append "--with-bash-completions="
 | 
				
			||||||
                            (assoc-ref %outputs "out")
 | 
					                            (assoc-ref %outputs "out")
 | 
				
			||||||
                            "/etc/bash_completion.d"))))
 | 
					                            "/etc/bash_completion.d"))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -392,7 +392,7 @@ when typing parentheses directly or commenting out code line by line.")
 | 
				
			||||||
(define-public git-modes
 | 
					(define-public git-modes
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "emacs-git-modes")
 | 
					    (name "emacs-git-modes")
 | 
				
			||||||
    (version "1.2.7")
 | 
					    (version "1.2.8")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
| 
						 | 
					@ -401,7 +401,7 @@ when typing parentheses directly or commenting out code line by line.")
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1mzl70s0xyysnjq1j10mc5vn9i022n5vd82kxsgp4xxqq7gc4qnx"))))
 | 
					                "0h49f68yn0q4lg054adqii4qja1z2pzybm7nf4kvpq7fzjrzgv1q"))))
 | 
				
			||||||
    (build-system emacs-build-system)
 | 
					    (build-system emacs-build-system)
 | 
				
			||||||
    (home-page "https://github.com/magit/git-modes")
 | 
					    (home-page "https://github.com/magit/git-modes")
 | 
				
			||||||
    (synopsis "Emacs major modes for Git configuration files")
 | 
					    (synopsis "Emacs major modes for Git configuration files")
 | 
				
			||||||
| 
						 | 
					@ -1876,16 +1876,16 @@ Stack Overflow, Super User, and other StackExchange sites.")
 | 
				
			||||||
(define-public emacs-f
 | 
					(define-public emacs-f
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "emacs-f")
 | 
					    (name "emacs-f")
 | 
				
			||||||
    (version "0.19.0")
 | 
					    (version "0.20.0")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method git-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (git-reference
 | 
				
			||||||
                    "https://github.com/rejeep/f.el/archive/v"
 | 
					                    (url "https://github.com/rejeep/f.el.git")
 | 
				
			||||||
                    version ".tar.gz"))
 | 
					                    (commit (string-append "v" version))))
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (git-file-name name version))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "05195n80ywa68qykxn7dza6qd59rhakvlzhaa9l6mcpmjf9l9grs"))))
 | 
					                "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"))))
 | 
				
			||||||
    (build-system emacs-build-system)
 | 
					    (build-system emacs-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("emacs-s" ,emacs-s)
 | 
					     `(("emacs-s" ,emacs-s)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -393,9 +393,7 @@ manager for the current system.")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (string-append
 | 
					       (uri (pypi-uri "pyxdg" version))
 | 
				
			||||||
             "https://pypi.python.org/packages/source/p/pyxdg/pyxdg-"
 | 
					 | 
				
			||||||
             version ".tar.gz"))
 | 
					 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "179767h8m634ydlm4v8lnz01ba42gckfp684id764zaip7h87s41"))))
 | 
					         "179767h8m634ydlm4v8lnz01ba42gckfp684id764zaip7h87s41"))))
 | 
				
			||||||
| 
						 | 
					@ -775,7 +773,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
 | 
				
			||||||
(define-public libmbim
 | 
					(define-public libmbim
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "libmbim")
 | 
					    (name "libmbim")
 | 
				
			||||||
    (version "1.16.0")
 | 
					    (version "1.16.2")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
| 
						 | 
					@ -783,7 +781,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
 | 
				
			||||||
                    name "-" version ".tar.xz"))
 | 
					                    name "-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8"))))
 | 
					                "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("glib:bin" ,glib "bin") ; for glib-mkenums
 | 
					     `(("glib:bin" ,glib "bin") ; for glib-mkenums
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -365,6 +365,7 @@ Go.  It also includes runtime support libraries for these languages.")
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"))
 | 
					                "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"))
 | 
				
			||||||
              (patches (search-patches "gcc-arm-link-spec-fix.patch"
 | 
					              (patches (search-patches "gcc-arm-link-spec-fix.patch"
 | 
				
			||||||
 | 
					                                       "gcc-4.8-libsanitizer-fix.patch"
 | 
				
			||||||
                                       "gcc-asan-missing-include.patch"
 | 
					                                       "gcc-asan-missing-include.patch"
 | 
				
			||||||
                                       "gcc-fix-texi2pod.patch"))
 | 
					                                       "gcc-fix-texi2pod.patch"))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -48,13 +48,13 @@
 | 
				
			||||||
(define-public babl
 | 
					(define-public babl
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "babl")
 | 
					    (name "babl")
 | 
				
			||||||
    (version "0.1.52")
 | 
					    (version "0.1.56")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (list (string-append "https://download.gimp.org/pub/babl/"
 | 
					              (uri (list (string-append "https://download.gimp.org/pub/babl/"
 | 
				
			||||||
                                        (version-major+minor version)
 | 
					                                        (version-major+minor version)
 | 
				
			||||||
                                        "/babl-" version ".tar.bz2")
 | 
					                                        "/babl-" version ".tar.bz2")
 | 
				
			||||||
                         (string-append "http://ftp.gtk.org/pub/babl/"
 | 
					                         (string-append "https://ftp.gtk.org/pub/babl/"
 | 
				
			||||||
                                        (version-major+minor version)
 | 
					                                        (version-major+minor version)
 | 
				
			||||||
                                        "/babl-" version ".tar.bz2")
 | 
					                                        "/babl-" version ".tar.bz2")
 | 
				
			||||||
                         (string-append "ftp://ftp.gtk.org/pub/babl/"
 | 
					                         (string-append "ftp://ftp.gtk.org/pub/babl/"
 | 
				
			||||||
| 
						 | 
					@ -62,7 +62,7 @@
 | 
				
			||||||
                                        "/babl-" version ".tar.bz2")))
 | 
					                                        "/babl-" version ".tar.bz2")))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0v7pkr3qd5jnn0pra88d90ixkl5h9ngg6w660nn1cgh4zjh19xs0"))))
 | 
					                "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (home-page "http://gegl.org/babl/")
 | 
					    (home-page "http://gegl.org/babl/")
 | 
				
			||||||
    (synopsis "Image pixel format conversion library")
 | 
					    (synopsis "Image pixel format conversion library")
 | 
				
			||||||
| 
						 | 
					@ -79,7 +79,7 @@ provided, as well as a framework to add new color models and data types.")
 | 
				
			||||||
(define-public gegl
 | 
					(define-public gegl
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "gegl")
 | 
					    (name "gegl")
 | 
				
			||||||
    (version "0.4.4")
 | 
					    (version "0.4.8")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (list (string-append "https://download.gimp.org/pub/gegl/"
 | 
					              (uri (list (string-append "https://download.gimp.org/pub/gegl/"
 | 
				
			||||||
| 
						 | 
					@ -87,7 +87,7 @@ provided, as well as a framework to add new color models and data types.")
 | 
				
			||||||
                                        "/" name "-" version ".tar.bz2")))
 | 
					                                        "/" name "-" version ".tar.bz2")))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq"))))
 | 
					                "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:configure-flags '("LDFLAGS=-lm")))
 | 
					     '(#:configure-flags '("LDFLAGS=-lm")))
 | 
				
			||||||
| 
						 | 
					@ -117,7 +117,7 @@ buffers.")
 | 
				
			||||||
(define-public gimp
 | 
					(define-public gimp
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "gimp")
 | 
					    (name "gimp")
 | 
				
			||||||
    (version "2.10.4")
 | 
					    (version "2.10.6")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://download.gimp.org/pub/gimp/v"
 | 
					              (uri (string-append "https://download.gimp.org/pub/gimp/v"
 | 
				
			||||||
| 
						 | 
					@ -125,14 +125,17 @@ buffers.")
 | 
				
			||||||
                                  "/gimp-" version ".tar.bz2"))
 | 
					                                  "/gimp-" version ".tar.bz2"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z"))))
 | 
					                "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (outputs '("out"
 | 
					    (outputs '("out"
 | 
				
			||||||
               "doc"))                            ; 9 MiB of gtk-doc HTML
 | 
					               "doc"))                            ; 9 MiB of gtk-doc HTML
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:configure-flags (list (string-append "--with-html-dir="
 | 
					     '(#:configure-flags
 | 
				
			||||||
 | 
					       (list (string-append "--with-html-dir="
 | 
				
			||||||
                            (assoc-ref %outputs "doc")
 | 
					                            (assoc-ref %outputs "doc")
 | 
				
			||||||
                                              "/share/gtk-doc/html"))
 | 
					                            "/share/gtk-doc/html")
 | 
				
			||||||
 | 
					             ;; ./configure requests not to annoy upstream with packaging bugs.
 | 
				
			||||||
 | 
					             "--with-bug-report-url=https://bugs.gnu.org/guix")
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-after 'install 'install-sitecustomize.py
 | 
					         (add-after 'install 'install-sitecustomize.py
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2444,7 +2444,7 @@ library.")
 | 
				
			||||||
     `(("glib"    ,glib)
 | 
					     `(("glib"    ,glib)
 | 
				
			||||||
       ("libsoup" ,libsoup)
 | 
					       ("libsoup" ,libsoup)
 | 
				
			||||||
       ("libxml2" ,libxml2)))
 | 
					       ("libxml2" ,libxml2)))
 | 
				
			||||||
    (home-page "http://www.gtk.org/")
 | 
					    (home-page "https://www.gtk.org/")
 | 
				
			||||||
    (synopsis "RESTful web api query library")
 | 
					    (synopsis "RESTful web api query library")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "This library was designed to make it easier to access web services that
 | 
					     "This library was designed to make it easier to access web services that
 | 
				
			||||||
| 
						 | 
					@ -6708,7 +6708,7 @@ is suitable as a default application in a Desktop environment.")
 | 
				
			||||||
(define-public xpad
 | 
					(define-public xpad
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xpad")
 | 
					    (name "xpad")
 | 
				
			||||||
    (version "5.0.0")
 | 
					    (version "5.1.0")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -6717,14 +6717,8 @@ is suitable as a default application in a Desktop environment.")
 | 
				
			||||||
                           name "-" version ".tar.bz2"))
 | 
					                           name "-" version ".tar.bz2"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb"))))
 | 
					         "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					 | 
				
			||||||
     `(#:phases
 | 
					 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					 | 
				
			||||||
         (add-after 'unpack 'run-autogen
 | 
					 | 
				
			||||||
           (lambda _
 | 
					 | 
				
			||||||
             (system* "sh" "autogen.sh"))))))
 | 
					 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("autoconf" ,autoconf)
 | 
					     `(("autoconf" ,autoconf)
 | 
				
			||||||
       ("automake" ,automake)
 | 
					       ("automake" ,automake)
 | 
				
			||||||
| 
						 | 
					@ -7038,16 +7032,16 @@ views can be printed as PDF or PostScript files, or exported to HTML.")
 | 
				
			||||||
(define-public lollypop
 | 
					(define-public lollypop
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "lollypop")
 | 
					    (name "lollypop")
 | 
				
			||||||
    (version "0.9.306")
 | 
					    (version "0.9.521")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (string-append "https://gitlab.gnome.org/gnumdk/lollypop/uploads/"
 | 
					       (uri (string-append "https://gitlab.gnome.org/World/lollypop/uploads/"
 | 
				
			||||||
                           "b769805b7063ef9807e4e832e7e87ad2/"
 | 
					                           "e4df2ed75c5ed71d64afcc668e579b2a/"
 | 
				
			||||||
                           name "-" version ".tar.xz"))
 | 
					                           name "-" version ".tar.xz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0c49v6793bywvh295xbii9yq21hh3qpmxwbgp9i71kj6r9grvhan"))))
 | 
					         "0knsqh24siyw98vmiq6b1hzq4y4cazs9f1hq1js9c96hqqj9rvdx"))))
 | 
				
			||||||
    (build-system meson-build-system)
 | 
					    (build-system meson-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:imported-modules ((guix build python-build-system)
 | 
					     `(#:imported-modules ((guix build python-build-system)
 | 
				
			||||||
| 
						 | 
					@ -7090,7 +7084,7 @@ views can be printed as PDF or PostScript files, or exported to HTML.")
 | 
				
			||||||
       ;; the others are required to play streaming.
 | 
					       ;; the others are required to play streaming.
 | 
				
			||||||
       ("gst-plugins-good" ,gst-plugins-good)
 | 
					       ("gst-plugins-good" ,gst-plugins-good)
 | 
				
			||||||
       ("gst-plugins-ugly" ,gst-plugins-ugly)))
 | 
					       ("gst-plugins-ugly" ,gst-plugins-ugly)))
 | 
				
			||||||
    (home-page "https://gnumdk.github.io/lollypop-web")
 | 
					    (home-page "https://wiki.gnome.org/Apps/Lollypop")
 | 
				
			||||||
    (synopsis "GNOME music playing application")
 | 
					    (synopsis "GNOME music playing application")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "Lollypop is a music player designed to play well with GNOME desktop.
 | 
					     "Lollypop is a music player designed to play well with GNOME desktop.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
 | 
					;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
 | 
				
			||||||
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
 | 
					;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
 | 
				
			||||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 | 
					;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 | 
				
			||||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 | 
					;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
 | 
				
			||||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 | 
					;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 | 
				
			||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 | 
					;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -167,7 +167,6 @@ This package provides the core library and elements.")
 | 
				
			||||||
       ("orc" ,orc)))              ;required by gstreamer-audio-1.0.pc
 | 
					       ("orc" ,orc)))              ;required by gstreamer-audio-1.0.pc
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("cdparanoia" ,cdparanoia)
 | 
					     `(("cdparanoia" ,cdparanoia)
 | 
				
			||||||
       ("opus" ,opus)
 | 
					 | 
				
			||||||
       ("pango" ,pango)
 | 
					       ("pango" ,pango)
 | 
				
			||||||
       ("libogg" ,libogg)
 | 
					       ("libogg" ,libogg)
 | 
				
			||||||
       ("libtheora" ,libtheora)
 | 
					       ("libtheora" ,libtheora)
 | 
				
			||||||
| 
						 | 
					@ -176,7 +175,12 @@ This package provides the core library and elements.")
 | 
				
			||||||
       ("zlib" ,zlib)
 | 
					       ("zlib" ,zlib)
 | 
				
			||||||
       ("libXext" ,libxext)
 | 
					       ("libXext" ,libxext)
 | 
				
			||||||
       ("libxv" ,libxv)
 | 
					       ("libxv" ,libxv)
 | 
				
			||||||
       ("alsa-lib" ,alsa-lib)))
 | 
					       ("alsa-lib" ,alsa-lib)
 | 
				
			||||||
 | 
					       ;; XXX Don't build with opus on 32-bit systems:
 | 
				
			||||||
 | 
					       ;; <https://bugs.gnu.org/32360>
 | 
				
			||||||
 | 
					       ,@(if (target-64bit?)
 | 
				
			||||||
 | 
					             `(("opus" ,opus))
 | 
				
			||||||
 | 
					             '())))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
      `(("pkg-config" ,pkg-config)
 | 
					      `(("pkg-config" ,pkg-config)
 | 
				
			||||||
        ("glib:bin" ,glib "bin")
 | 
					        ("glib:bin" ,glib "bin")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -664,7 +664,7 @@ graphical user interfaces.  Offering a complete set of widgets, GTK+ is
 | 
				
			||||||
suitable for projects ranging from small one-off tools to complete
 | 
					suitable for projects ranging from small one-off tools to complete
 | 
				
			||||||
application suites.")
 | 
					application suites.")
 | 
				
			||||||
   (license license:lgpl2.0+)
 | 
					   (license license:lgpl2.0+)
 | 
				
			||||||
   (home-page "http://www.gtk.org/")))
 | 
					   (home-page "https://www.gtk.org/")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public gtk+
 | 
					(define-public gtk+
 | 
				
			||||||
  (package (inherit gtk+-2)
 | 
					  (package (inherit gtk+-2)
 | 
				
			||||||
| 
						 | 
					@ -1492,7 +1492,7 @@ information.")
 | 
				
			||||||
       ("source-highlight" ,source-highlight)
 | 
					       ("source-highlight" ,source-highlight)
 | 
				
			||||||
       ("glib" ,glib)
 | 
					       ("glib" ,glib)
 | 
				
			||||||
       ("python-six" ,python-six)))
 | 
					       ("python-six" ,python-six)))
 | 
				
			||||||
    (home-page "http://www.gtk.org/gtk-doc/")
 | 
					    (home-page "https://www.gtk.org/gtk-doc/")
 | 
				
			||||||
    (synopsis "Documentation generator from C source code")
 | 
					    (synopsis "Documentation generator from C source code")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "GTK-Doc generates API documentation from comments added to C code.  It is
 | 
					     "GTK-Doc generates API documentation from comments added to C code.  It is
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -906,7 +906,7 @@ for Guile\".")
 | 
				
			||||||
(define-public guile-json
 | 
					(define-public guile-json
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "guile-json")
 | 
					    (name "guile-json")
 | 
				
			||||||
    (version "1.0.1")
 | 
					    (version "1.1.1")
 | 
				
			||||||
    (home-page "https://github.com/aconchillo/guile-json")
 | 
					    (home-page "https://github.com/aconchillo/guile-json")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -915,23 +915,11 @@ for Guile\".")
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "16155dv30rhagz6dwv7xc87l386i8v0f1kgydqa2ajr166fi9qhr"))
 | 
					                "12jqkn9qgwdlxbasy2n25a2a7apf30dww1nnxqfam5735k3jdngv"))))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					 | 
				
			||||||
              (snippet
 | 
					 | 
				
			||||||
               ;; Make sure everything goes under .../site/X.Y, like Guile's
 | 
					 | 
				
			||||||
               ;; search paths expects.
 | 
					 | 
				
			||||||
               '(begin
 | 
					 | 
				
			||||||
                  (substitute* "configure.ac"
 | 
					 | 
				
			||||||
                    (("GUILE_PROGS")
 | 
					 | 
				
			||||||
                     (string-append "GUILE_PROGS\n"
 | 
					 | 
				
			||||||
                                    "AC_SUBST([GUILE_EFFECTIVE_VERSION])\n")))
 | 
					 | 
				
			||||||
                  (substitute* '("Makefile.am" "json/Makefile.am")
 | 
					 | 
				
			||||||
                    (("moddir[[:blank:]]*=.*/share/guile/site" all)
 | 
					 | 
				
			||||||
                     (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
 | 
					 | 
				
			||||||
                  #t))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs `(("autoconf" ,autoconf)
 | 
					    (native-inputs `(("autoconf" ,autoconf)
 | 
				
			||||||
                     ("automake" ,automake)
 | 
					                     ("automake" ,automake)
 | 
				
			||||||
 | 
					                     ("pkg-config" ,pkg-config)
 | 
				
			||||||
                     ("guile" ,guile-2.2)))
 | 
					                     ("guile" ,guile-2.2)))
 | 
				
			||||||
    (inputs `(("guile" ,guile-2.2)))
 | 
					    (inputs `(("guile" ,guile-2.2)))
 | 
				
			||||||
    (synopsis "JSON module for Guile")
 | 
					    (synopsis "JSON module for Guile")
 | 
				
			||||||
| 
						 | 
					@ -1241,31 +1229,20 @@ above command-line parameters.")
 | 
				
			||||||
(define-public guile-redis
 | 
					(define-public guile-redis
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "guile-redis")
 | 
					    (name "guile-redis")
 | 
				
			||||||
    (version "0.1.0")
 | 
					    (version "1.0.0")
 | 
				
			||||||
 | 
					    (home-page "https://github.com/aconchillo/guile-redis")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "mirror://savannah/guile-redis/guile-redis-"
 | 
					              (uri (string-append home-page "/archive/" version ".tar.gz"))
 | 
				
			||||||
                                  version ".tar.gz"))
 | 
					 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0vx6if6b4r3kwx64vzbs6vpc0cpcr85x11w9vkzq27gw8n7isv56"))
 | 
					                "1dp5fmqvma59pvp1nfpq6hqgbmjici8sd1y8llahl87fynw1dvr9"))))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					 | 
				
			||||||
              (snippet
 | 
					 | 
				
			||||||
               ;; Make sure everything goes under .../site/X.Y, like Guile's
 | 
					 | 
				
			||||||
               ;; search paths expects.
 | 
					 | 
				
			||||||
               '(begin
 | 
					 | 
				
			||||||
                  (substitute* "configure"
 | 
					 | 
				
			||||||
                    (("ac_subst_vars='")
 | 
					 | 
				
			||||||
                     "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
 | 
					 | 
				
			||||||
                  (substitute* '("Makefile.in"
 | 
					 | 
				
			||||||
                                 "redis/Makefile.in"
 | 
					 | 
				
			||||||
                                 "redis/commands/Makefile.in")
 | 
					 | 
				
			||||||
                    (("moddir =.*/share/guile/site" all)
 | 
					 | 
				
			||||||
                     (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
 | 
					 | 
				
			||||||
                  #t))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("guile" ,guile-2.2)))
 | 
					     `(("autoconf" ,autoconf)
 | 
				
			||||||
 | 
					       ("automake" ,automake)
 | 
				
			||||||
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					       ("guile" ,guile-2.2)))
 | 
				
			||||||
    (home-page "https://savannah.nongnu.org/projects/guile-redis/")
 | 
					    (home-page "https://savannah.nongnu.org/projects/guile-redis/")
 | 
				
			||||||
    (synopsis "Redis client library for Guile")
 | 
					    (synopsis "Redis client library for Guile")
 | 
				
			||||||
    (description "Guile-redis provides a Scheme interface to the Redis
 | 
					    (description "Guile-redis provides a Scheme interface to the Redis
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,14 +47,14 @@
 | 
				
			||||||
    ;; The 7 release series has an incompatible API, while the 6 series is still
 | 
					    ;; 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
 | 
					    ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
 | 
				
			||||||
    ;; users are ready for the 7-series API.
 | 
					    ;; users are ready for the 7-series API.
 | 
				
			||||||
    (version "6.9.10-8")
 | 
					    (version "6.9.10-10")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (string-append "mirror://imagemagick/ImageMagick-"
 | 
					             (uri (string-append "mirror://imagemagick/ImageMagick-"
 | 
				
			||||||
                                 version ".tar.xz"))
 | 
					                                 version ".tar.xz"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "0l2fhqrphcx6aw8k2lc6bianfqc1dy17lkyaypfw8scgak8wq6wr"))))
 | 
					               "0b0wwxm6mgaxq0i0hazxcpbk7xd5j1329r1vk9h07iz4v3k8i57h"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
 | 
					     `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
 | 
				
			||||||
| 
						 | 
					@ -169,7 +169,7 @@ script.")
 | 
				
			||||||
(define-public graphicsmagick
 | 
					(define-public graphicsmagick
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "graphicsmagick")
 | 
					    (name "graphicsmagick")
 | 
				
			||||||
    (version "1.3.29")
 | 
					    (version "1.3.30")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri
 | 
					              (uri
 | 
				
			||||||
| 
						 | 
					@ -181,7 +181,7 @@ script.")
 | 
				
			||||||
                                 "/GraphicsMagick-" version ".tar.xz")))
 | 
					                                 "/GraphicsMagick-" version ".tar.xz")))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1"))))
 | 
					                "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:configure-flags
 | 
					     `(#:configure-flags
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -261,17 +261,17 @@ wrapper for accessing libusb-1.0.")
 | 
				
			||||||
(define-public python-pyusb
 | 
					(define-public python-pyusb
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "python-pyusb")
 | 
					    (name "python-pyusb")
 | 
				
			||||||
    (version "1.0.0")
 | 
					    (version "1.0.2")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (pypi-uri "PyUSB" version))
 | 
					       (uri (pypi-uri "pyusb" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"))))
 | 
					         "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf"))))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f  ;no tests
 | 
					     `(#:tests? #f                      ; no tests
 | 
				
			||||||
       #:modules ((srfi srfi-1)
 | 
					       #:modules ((srfi srfi-1)
 | 
				
			||||||
                  (srfi srfi-26)
 | 
					                  (srfi srfi-26)
 | 
				
			||||||
                  (guix build utils)
 | 
					                  (guix build utils)
 | 
				
			||||||
| 
						 | 
					@ -291,7 +291,7 @@ wrapper for accessing libusb-1.0.")
 | 
				
			||||||
             #t)))))
 | 
					             #t)))))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("libusb" ,libusb)))
 | 
					     `(("libusb" ,libusb)))
 | 
				
			||||||
    (home-page "http://walac.github.io/pyusb/")
 | 
					    (home-page "https://pyusb.github.io/pyusb/")
 | 
				
			||||||
    (synopsis "Python bindings to the libusb library")
 | 
					    (synopsis "Python bindings to the libusb library")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "PyUSB aims to be an easy to use Python module to access USB devices.")
 | 
					     "PyUSB aims to be an easy to use Python module to access USB devices.")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -404,17 +404,39 @@ It has been modified to remove all non-free binary blobs.")
 | 
				
			||||||
;; supports qemu "virt" machine and possibly a large number of ARM boards.
 | 
					;; supports qemu "virt" machine and possibly a large number of ARM boards.
 | 
				
			||||||
;; See : https://wiki.debian.org/DebianKernel/ARMMP.
 | 
					;; See : https://wiki.debian.org/DebianKernel/ARMMP.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define %linux-libre-version "4.17.14")
 | 
					(define %linux-libre-version "4.18.3")
 | 
				
			||||||
(define %linux-libre-hash "11yf4s3cq6a9z3sl38kr4li75mhqfnmgwayi1mcaac8hr6ylksss")
 | 
					(define %linux-libre-hash "0z7nnkmk5d2npilviqxa0m6nn30f5arhviysby78kkb3j2isx9jx")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define %linux-libre-4.18-patches
 | 
				
			||||||
 | 
					  (list %boot-logo-patch
 | 
				
			||||||
 | 
					        (origin
 | 
				
			||||||
 | 
					          (method url-fetch)
 | 
				
			||||||
 | 
					          (uri (string-append
 | 
				
			||||||
 | 
					                "https://salsa.debian.org/kernel-team/linux"
 | 
				
			||||||
 | 
					                "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0"
 | 
				
			||||||
 | 
					                "/debian/patches/bugfix/arm/"
 | 
				
			||||||
 | 
					                "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch"))
 | 
				
			||||||
 | 
					          (file-name "linux-libre-4.18-arm-export-__sync_icache_dcache.patch")
 | 
				
			||||||
 | 
					          (sha256
 | 
				
			||||||
 | 
					           (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))
 | 
				
			||||||
 | 
					        (origin
 | 
				
			||||||
 | 
					          (method url-fetch)
 | 
				
			||||||
 | 
					          (uri (string-append
 | 
				
			||||||
 | 
					                "https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git"
 | 
				
			||||||
 | 
					                "/patch/?id=c5157101e7793b42a56e07368c7f4cb73fb58008"))
 | 
				
			||||||
 | 
					          (file-name "linux-libre-4.18-arm64-export-__sync_icache_dcache.patch")
 | 
				
			||||||
 | 
					          (sha256
 | 
				
			||||||
 | 
					           (base32 "0q13arsi8al3l3yq6d76z4h8n45wlpkjyxlrgn1sqbx5xjksycyz")))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public linux-libre
 | 
					(define-public linux-libre
 | 
				
			||||||
  (make-linux-libre %linux-libre-version
 | 
					  (make-linux-libre %linux-libre-version
 | 
				
			||||||
                    %linux-libre-hash
 | 
					                    %linux-libre-hash
 | 
				
			||||||
                    %linux-compatible-systems
 | 
					                    %linux-compatible-systems
 | 
				
			||||||
 | 
					                    #:patches %linux-libre-4.18-patches
 | 
				
			||||||
                    #:configuration-file kernel-config))
 | 
					                    #:configuration-file kernel-config))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define %linux-libre-4.14-version "4.14.62")
 | 
					(define %linux-libre-4.14-version "4.14.65")
 | 
				
			||||||
(define %linux-libre-4.14-hash "0gpcdimig6d833dgxmj1i21dg8n12g4q38n0dq5j5x215w6rxy65")
 | 
					(define %linux-libre-4.14-hash "0sdv2c0ix2mdc5h10d56bwi77hpb4gibmrsl1ydyb95hgg37k6h0")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public linux-libre-4.14
 | 
					(define-public linux-libre-4.14
 | 
				
			||||||
  (make-linux-libre %linux-libre-4.14-version
 | 
					  (make-linux-libre %linux-libre-4.14-version
 | 
				
			||||||
| 
						 | 
					@ -423,14 +445,14 @@ It has been modified to remove all non-free binary blobs.")
 | 
				
			||||||
                    #:configuration-file kernel-config))
 | 
					                    #:configuration-file kernel-config))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public linux-libre-4.9
 | 
					(define-public linux-libre-4.9
 | 
				
			||||||
  (make-linux-libre "4.9.119"
 | 
					  (make-linux-libre "4.9.122"
 | 
				
			||||||
                    "1wqy9163w9srf614p57c3m7h8a2lbwv7f21m4cym397paqfkh4z4"
 | 
					                    "1yjld5q0xpsv4pd285hjp50kr2i41p3yiy1afp8nf88322i2947w"
 | 
				
			||||||
                    %intel-compatible-systems
 | 
					                    %intel-compatible-systems
 | 
				
			||||||
                    #:configuration-file kernel-config))
 | 
					                    #:configuration-file kernel-config))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public linux-libre-4.4
 | 
					(define-public linux-libre-4.4
 | 
				
			||||||
  (make-linux-libre "4.4.147"
 | 
					  (make-linux-libre "4.4.150"
 | 
				
			||||||
                    "0b9pr7qwa5ksj0bk5yh6hcxrjkv41ji0x29hscravmj4ckkxg0l6"
 | 
					                    "0dbz6bzxnr8dgp91lnf3jp42cw6dld4yq7ngigpq7s6ymr59j3ah"
 | 
				
			||||||
                    %intel-compatible-systems
 | 
					                    %intel-compatible-systems
 | 
				
			||||||
                    #:configuration-file kernel-config))
 | 
					                    #:configuration-file kernel-config))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -438,6 +460,7 @@ It has been modified to remove all non-free binary blobs.")
 | 
				
			||||||
  (make-linux-libre %linux-libre-version
 | 
					  (make-linux-libre %linux-libre-version
 | 
				
			||||||
                    %linux-libre-hash
 | 
					                    %linux-libre-hash
 | 
				
			||||||
                    '("armhf-linux")
 | 
					                    '("armhf-linux")
 | 
				
			||||||
 | 
					                    #:patches %linux-libre-4.18-patches
 | 
				
			||||||
                    #:defconfig "multi_v7_defconfig"
 | 
					                    #:defconfig "multi_v7_defconfig"
 | 
				
			||||||
                    #:extra-version "arm-generic"))
 | 
					                    #:extra-version "arm-generic"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -452,6 +475,7 @@ It has been modified to remove all non-free binary blobs.")
 | 
				
			||||||
  (make-linux-libre %linux-libre-version
 | 
					  (make-linux-libre %linux-libre-version
 | 
				
			||||||
                    %linux-libre-hash
 | 
					                    %linux-libre-hash
 | 
				
			||||||
                    '("armhf-linux")
 | 
					                    '("armhf-linux")
 | 
				
			||||||
 | 
					                    #:patches %linux-libre-4.18-patches
 | 
				
			||||||
                    #:defconfig "omap2plus_defconfig"
 | 
					                    #:defconfig "omap2plus_defconfig"
 | 
				
			||||||
                    #:extra-version "arm-omap2plus"))
 | 
					                    #:extra-version "arm-omap2plus"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -539,15 +563,15 @@ at login.  Local and dynamic reconfiguration are its key features.")
 | 
				
			||||||
(define-public psmisc
 | 
					(define-public psmisc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "psmisc")
 | 
					    (name "psmisc")
 | 
				
			||||||
    (version "23.1")
 | 
					    (version "23.2")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
      (method url-fetch)
 | 
					      (method url-fetch)
 | 
				
			||||||
      (uri (string-append "mirror://sourceforge/psmisc/psmisc/psmisc-"
 | 
					      (uri (string-append "mirror://sourceforge/psmisc/psmisc devel/psmisc-"
 | 
				
			||||||
                          version ".tar.xz"))
 | 
					                          version ".tar.xz"))
 | 
				
			||||||
      (sha256
 | 
					      (sha256
 | 
				
			||||||
       (base32
 | 
					       (base32
 | 
				
			||||||
        "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"))))
 | 
					        "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs `(("ncurses" ,ncurses)))
 | 
					    (inputs `(("ncurses" ,ncurses)))
 | 
				
			||||||
    (home-page "https://gitlab.com/psmisc/psmisc")
 | 
					    (home-page "https://gitlab.com/psmisc/psmisc")
 | 
				
			||||||
| 
						 | 
					@ -738,7 +762,7 @@ slabtop, and skill.")
 | 
				
			||||||
(define-public e2fsprogs
 | 
					(define-public e2fsprogs
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "e2fsprogs")
 | 
					    (name "e2fsprogs")
 | 
				
			||||||
    (version "1.43.6")
 | 
					    (version "1.44.3")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (string-append
 | 
					             (uri (string-append
 | 
				
			||||||
| 
						 | 
					@ -747,8 +771,7 @@ slabtop, and skill.")
 | 
				
			||||||
                   name "-" version ".tar.xz"))
 | 
					                   name "-" version ".tar.xz"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "00ilv65dzcgiap435j89xk86shf7rrav3wsik7cahy789qijdcn9"))
 | 
					               "1djb9qnid1j0vvna2bhq4jsz2ig1xckbx7h4d86cr0gl61yrz2ax"))))
 | 
				
			||||||
             (patches (search-patches "e2fsprogs-glibc-2.27.patch"))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs `(("util-linux" ,util-linux)))
 | 
					    (inputs `(("util-linux" ,util-linux)))
 | 
				
			||||||
    (native-inputs `(("pkg-config" ,pkg-config)
 | 
					    (native-inputs `(("pkg-config" ,pkg-config)
 | 
				
			||||||
| 
						 | 
					@ -862,14 +885,16 @@ from the e2fsprogs package.  It is meant to be used in initrds.")
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "extundelete")
 | 
					    (name "extundelete")
 | 
				
			||||||
    (version "0.2.4")
 | 
					    (version "0.2.4")
 | 
				
			||||||
    (source (origin
 | 
					    (source
 | 
				
			||||||
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (string-append "mirror://sourceforge/extundelete/"
 | 
					       (uri (string-append "mirror://sourceforge/extundelete/"
 | 
				
			||||||
                           "extundelete/" version "/extundelete-"
 | 
					                           "extundelete/" version "/extundelete-"
 | 
				
			||||||
                           version ".tar.bz2"))
 | 
					                           version ".tar.bz2"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
                "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1"))))
 | 
					         "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1"))
 | 
				
			||||||
 | 
					       (patches (search-patches "extundelete-e2fsprogs-1.44.patch"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs `(("e2fsprogs" ,e2fsprogs)))
 | 
					    (inputs `(("e2fsprogs" ,e2fsprogs)))
 | 
				
			||||||
    (home-page "http://extundelete.sourceforge.net/")
 | 
					    (home-page "http://extundelete.sourceforge.net/")
 | 
				
			||||||
| 
						 | 
					@ -917,7 +942,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
 | 
				
			||||||
(define-public strace
 | 
					(define-public strace
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "strace")
 | 
					    (name "strace")
 | 
				
			||||||
    (version "4.23")
 | 
					    (version "4.24")
 | 
				
			||||||
    (home-page "https://strace.io")
 | 
					    (home-page "https://strace.io")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -925,7 +950,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
 | 
				
			||||||
                                 "/strace-" version ".tar.xz"))
 | 
					                                 "/strace-" version ".tar.xz"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "1bcsq2gbpcb81ayryvn56a6kjx42fc21la6qgds35n0xbybacq3q"))))
 | 
					               "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:phases
 | 
					     '(#:phases
 | 
				
			||||||
| 
						 | 
					@ -934,7 +959,9 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
 | 
				
			||||||
           (lambda _
 | 
					           (lambda _
 | 
				
			||||||
             (substitute* "strace.c"
 | 
					             (substitute* "strace.c"
 | 
				
			||||||
               (("/bin/sh") (which "sh")))
 | 
					               (("/bin/sh") (which "sh")))
 | 
				
			||||||
             #t)))))
 | 
					             #t)))
 | 
				
			||||||
 | 
					       ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>.
 | 
				
			||||||
 | 
					       #:parallel-tests? #f))           ; undeterministic failures
 | 
				
			||||||
    (native-inputs `(("perl" ,perl)))
 | 
					    (native-inputs `(("perl" ,perl)))
 | 
				
			||||||
    (synopsis "System call tracer for Linux")
 | 
					    (synopsis "System call tracer for Linux")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					@ -2975,7 +3002,7 @@ arrays when needed.")
 | 
				
			||||||
(define-public multipath-tools
 | 
					(define-public multipath-tools
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "multipath-tools")
 | 
					    (name "multipath-tools")
 | 
				
			||||||
    (version "0.7.6")
 | 
					    (version "0.7.7")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://git.opensvc.com/?p=multipath-tools/"
 | 
					              (uri (string-append "https://git.opensvc.com/?p=multipath-tools/"
 | 
				
			||||||
| 
						 | 
					@ -2983,7 +3010,7 @@ arrays when needed.")
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0zkcayi3mmp43ji2zid1gprgsvqhjjapsw7jjd60sf75prf50h2r"))
 | 
					                "1lirhjjv37jnf42r1ylrhi8kbzx9j9xnyfzvxpp6bzcp0fawigig"))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
              (snippet
 | 
					              (snippet
 | 
				
			||||||
               '(begin
 | 
					               '(begin
 | 
				
			||||||
| 
						 | 
					@ -2996,8 +3023,9 @@ arrays when needed.")
 | 
				
			||||||
                  #t))))
 | 
					                  #t))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:tests? #f ; No tests.
 | 
					     '(#:tests? #f                      ; no tests
 | 
				
			||||||
       #:make-flags (list (string-append "DESTDIR="
 | 
					       #:make-flags (list "CC=gcc"
 | 
				
			||||||
 | 
					                          (string-append "DESTDIR="
 | 
				
			||||||
                                         (assoc-ref %outputs "out"))
 | 
					                                         (assoc-ref %outputs "out"))
 | 
				
			||||||
                          "SYSTEMDPATH=lib"
 | 
					                          "SYSTEMDPATH=lib"
 | 
				
			||||||
                          (string-append "LDFLAGS=-Wl,-rpath="
 | 
					                          (string-append "LDFLAGS=-Wl,-rpath="
 | 
				
			||||||
| 
						 | 
					@ -3020,11 +3048,7 @@ arrays when needed.")
 | 
				
			||||||
                 (("/usr/include/libudev.h")
 | 
					                 (("/usr/include/libudev.h")
 | 
				
			||||||
                  (string-append udev "/include/libudev.h")))
 | 
					                  (string-append udev "/include/libudev.h")))
 | 
				
			||||||
               #t)))
 | 
					               #t)))
 | 
				
			||||||
         (delete 'configure)
 | 
					         (delete 'configure))))
 | 
				
			||||||
         (add-before 'build 'set-CC
 | 
					 | 
				
			||||||
           (lambda _
 | 
					 | 
				
			||||||
             (setenv "CC" "gcc")
 | 
					 | 
				
			||||||
             #t)))))
 | 
					 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("perl" ,perl)
 | 
					     `(("perl" ,perl)
 | 
				
			||||||
       ("pkg-config" ,pkg-config)
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
| 
						 | 
					@ -3242,7 +3266,7 @@ and copy/paste text in the console and in xterm.")
 | 
				
			||||||
(define-public btrfs-progs
 | 
					(define-public btrfs-progs
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "btrfs-progs")
 | 
					    (name "btrfs-progs")
 | 
				
			||||||
    (version "4.15.1")
 | 
					    (version "4.17.1")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "mirror://kernel.org/linux/kernel/"
 | 
					              (uri (string-append "mirror://kernel.org/linux/kernel/"
 | 
				
			||||||
| 
						 | 
					@ -3250,8 +3274,7 @@ and copy/paste text in the console and in xterm.")
 | 
				
			||||||
                                  "btrfs-progs-v" version ".tar.xz"))
 | 
					                                  "btrfs-progs-v" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"))
 | 
					                "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz"))))
 | 
				
			||||||
              (patches (search-patches "btrfs-progs-e-value-block.patch"))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (outputs '("out"
 | 
					    (outputs '("out"
 | 
				
			||||||
               "static"))      ; static versions of the binaries in "out"
 | 
					               "static"))      ; static versions of the binaries in "out"
 | 
				
			||||||
| 
						 | 
					@ -3287,6 +3310,7 @@ and copy/paste text in the console and in xterm.")
 | 
				
			||||||
              ("zstd" ,zstd)))
 | 
					              ("zstd" ,zstd)))
 | 
				
			||||||
    (native-inputs `(("pkg-config" ,pkg-config)
 | 
					    (native-inputs `(("pkg-config" ,pkg-config)
 | 
				
			||||||
                     ("asciidoc" ,asciidoc)
 | 
					                     ("asciidoc" ,asciidoc)
 | 
				
			||||||
 | 
					                     ("python" ,python)
 | 
				
			||||||
                     ("xmlto" ,xmlto)
 | 
					                     ("xmlto" ,xmlto)
 | 
				
			||||||
                     ;; For building documentation.
 | 
					                     ;; For building documentation.
 | 
				
			||||||
                     ("libxml2" ,libxml2)
 | 
					                     ("libxml2" ,libxml2)
 | 
				
			||||||
| 
						 | 
					@ -3778,25 +3802,25 @@ native Linux file system, and has been part of the Linux kernel since version
 | 
				
			||||||
(define-public libnfsidmap
 | 
					(define-public libnfsidmap
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "libnfsidmap")
 | 
					    (name "libnfsidmap")
 | 
				
			||||||
    (version "0.25")
 | 
					    (version "0.27")
 | 
				
			||||||
    (source (origin
 | 
					    (source
 | 
				
			||||||
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
             (uri (string-append
 | 
					       (uri (string-append "https://fedorapeople.org/~steved/"
 | 
				
			||||||
                   "http://www.citi.umich.edu/projects/nfsv4/linux/"
 | 
					                           name "/" version "/" name "-" version ".tar.bz2"))
 | 
				
			||||||
                   name "/" name "-" version ".tar.gz"))
 | 
					 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
              (base32
 | 
					        (base32 "0bg2bcii424mf1bnp3fssr8jszbvhdxl7wvifm1yf6g596v8b8i5"))))
 | 
				
			||||||
               "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5"))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:configure-flags (list
 | 
					     `(#:configure-flags (list
 | 
				
			||||||
                          (string-append "--with-pluginpath="
 | 
					                          (string-append "--with-pluginpath="
 | 
				
			||||||
                                         (assoc-ref %outputs "out")
 | 
					                                         (assoc-ref %outputs "out")
 | 
				
			||||||
                                         "/lib/libnfsidmap"))))
 | 
					                                         "/lib/libnfsidmap"))))
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("autoconf" ,autoconf)))         ; 0.27 still needs autoheader
 | 
				
			||||||
    (home-page
 | 
					    (home-page
 | 
				
			||||||
     "http://www.citi.umich.edu/projects/nfsv4/crossrealm/libnfsidmap_config.html")
 | 
					     "http://www.citi.umich.edu/projects/nfsv4/crossrealm/libnfsidmap_config.html")
 | 
				
			||||||
    (synopsis
 | 
					    (synopsis "NFSv4 support library for name/ID mapping")
 | 
				
			||||||
     "NFSv4 support library for name/ID mapping")
 | 
					 | 
				
			||||||
    (description "Libnfsidmap is a library holding mulitiple methods of
 | 
					    (description "Libnfsidmap is a library holding mulitiple methods of
 | 
				
			||||||
mapping names to ids and visa versa, mainly for NFSv4.  It provides an
 | 
					mapping names to ids and visa versa, mainly for NFSv4.  It provides an
 | 
				
			||||||
extensible array of mapping functions, currently consisting of two choices:
 | 
					extensible array of mapping functions, currently consisting of two choices:
 | 
				
			||||||
| 
						 | 
					@ -3983,7 +4007,7 @@ under OpenGL graphics workloads.")
 | 
				
			||||||
    (version "35")
 | 
					    (version "35")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://github.com/rhinstaller/" name
 | 
					              (uri (string-append "https://github.com/rhboot/" name
 | 
				
			||||||
                                  "/releases/download/" version "/" name
 | 
					                                  "/releases/download/" version "/" name
 | 
				
			||||||
                                  "-" version ".tar.bz2"))
 | 
					                                  "-" version ".tar.bz2"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
| 
						 | 
					@ -4004,7 +4028,7 @@ under OpenGL graphics workloads.")
 | 
				
			||||||
     `(("pkg-config" ,pkg-config)))
 | 
					     `(("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("popt" ,popt)))
 | 
					     `(("popt" ,popt)))
 | 
				
			||||||
    (home-page "https://github.com/rhinstaller/efivar")
 | 
					    (home-page "https://github.com/rhboot/efivar")
 | 
				
			||||||
    (synopsis "Tool and library to manipulate EFI variables")
 | 
					    (synopsis "Tool and library to manipulate EFI variables")
 | 
				
			||||||
    (description "This package provides a library and a command line
 | 
					    (description "This package provides a library and a command line
 | 
				
			||||||
interface to the variable facility of UEFI boot firmware.")
 | 
					interface to the variable facility of UEFI boot firmware.")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1011,15 +1011,15 @@ compresses it.")
 | 
				
			||||||
(define-public claws-mail
 | 
					(define-public claws-mail
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "claws-mail")
 | 
					    (name "claws-mail")
 | 
				
			||||||
    (version "3.16.0")
 | 
					    (version "3.17.0")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
                    "http://www.claws-mail.org/releases/" name "-" version
 | 
					                    "https://www.claws-mail.org/releases/" name "-" version
 | 
				
			||||||
                    ".tar.xz"))
 | 
					                    ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2"))))
 | 
					                "119y6q9p8zwm2xqlbkgqd119a529kjqlyldmb4h940z6c2qyjhqm"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs `(("pkg-config" ,pkg-config)))
 | 
					    (native-inputs `(("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (inputs `(("bogofilter" ,bogofilter)
 | 
					    (inputs `(("bogofilter" ,bogofilter)
 | 
				
			||||||
| 
						 | 
					@ -1065,7 +1065,7 @@ appearance and interface are designed to be familiar to new users coming from
 | 
				
			||||||
other popular email clients, as well as experienced users.  Almost all commands
 | 
					other popular email clients, as well as experienced users.  Almost all commands
 | 
				
			||||||
are accessible with the keyboard.  Plus, Claws-Mail is extensible via addons
 | 
					are accessible with the keyboard.  Plus, Claws-Mail is extensible via addons
 | 
				
			||||||
which can add many functionalities to the base client.")
 | 
					which can add many functionalities to the base client.")
 | 
				
			||||||
    (home-page "http://www.claws-mail.org/")
 | 
					    (home-page "https://www.claws-mail.org/")
 | 
				
			||||||
    (license gpl3+))) ; most files are actually public domain or x11
 | 
					    (license gpl3+))) ; most files are actually public domain or x11
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public msmtp
 | 
					(define-public msmtp
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -434,7 +434,7 @@ integer programming problems and computes Markov bases for statistics.")
 | 
				
			||||||
(define-public cddlib
 | 
					(define-public cddlib
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "cddlib")
 | 
					    (name "cddlib")
 | 
				
			||||||
    (version "0.94h")
 | 
					    (version "0.94i")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
      (method url-fetch)
 | 
					      (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -442,7 +442,7 @@ integer programming problems and computes Markov bases for statistics.")
 | 
				
			||||||
                          (string-delete #\. version) ".tar.gz"))
 | 
					                          (string-delete #\. version) ".tar.gz"))
 | 
				
			||||||
      (sha256
 | 
					      (sha256
 | 
				
			||||||
       (base32
 | 
					       (base32
 | 
				
			||||||
        "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy"))))
 | 
					        "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("gmp" ,gmp)))
 | 
					     `(("gmp" ,gmp)))
 | 
				
			||||||
| 
						 | 
					@ -595,7 +595,7 @@ singular value problems.")
 | 
				
			||||||
(define-public gnuplot
 | 
					(define-public gnuplot
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "gnuplot")
 | 
					    (name "gnuplot")
 | 
				
			||||||
    (version "5.2.2")
 | 
					    (version "5.2.4")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
 | 
					              (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
 | 
				
			||||||
| 
						 | 
					@ -603,7 +603,7 @@ singular value problems.")
 | 
				
			||||||
                                  version ".tar.gz"))
 | 
					                                  version ".tar.gz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"))))
 | 
					         "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs `(("readline" ,readline)
 | 
					    (inputs `(("readline" ,readline)
 | 
				
			||||||
              ("cairo" ,cairo)
 | 
					              ("cairo" ,cairo)
 | 
				
			||||||
| 
						 | 
					@ -1353,7 +1353,7 @@ can solve two kinds of problems:
 | 
				
			||||||
(define-public octave
 | 
					(define-public octave
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "octave")
 | 
					    (name "octave")
 | 
				
			||||||
    (version "4.4.0")
 | 
					    (version "4.4.1")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
      (method url-fetch)
 | 
					      (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -1361,7 +1361,7 @@ can solve two kinds of problems:
 | 
				
			||||||
                          version ".tar.lz"))
 | 
					                          version ".tar.lz"))
 | 
				
			||||||
      (sha256
 | 
					      (sha256
 | 
				
			||||||
       (base32
 | 
					       (base32
 | 
				
			||||||
        "0nm766737gbkq9wqry54a026k3dg7rb1065kngfpwgjz8b544xbp"))))
 | 
					        "0jsdgizlv02an2ppfjwk5qf209zpwi3317yb7jvlsjzxnir3lvhy"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("lapack" ,lapack)
 | 
					     `(("lapack" ,lapack)
 | 
				
			||||||
| 
						 | 
					@ -1431,10 +1431,7 @@ script files.")
 | 
				
			||||||
  (package (inherit octave)
 | 
					  (package (inherit octave)
 | 
				
			||||||
    (name "qtoctave")
 | 
					    (name "qtoctave")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (inherit (package-source octave))
 | 
					              (inherit (package-source octave))))
 | 
				
			||||||
              (patches (append (origin-patches (package-source octave))
 | 
					 | 
				
			||||||
                               (search-patches
 | 
					 | 
				
			||||||
                                "qtoctave-qt-5.11-fix.patch")))))
 | 
					 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("qscintilla" ,qscintilla)
 | 
					     `(("qscintilla" ,qscintilla)
 | 
				
			||||||
       ("qt" ,qtbase)
 | 
					       ("qt" ,qtbase)
 | 
				
			||||||
| 
						 | 
					@ -2767,14 +2764,14 @@ full text searching.")
 | 
				
			||||||
(define-public armadillo
 | 
					(define-public armadillo
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "armadillo")
 | 
					    (name "armadillo")
 | 
				
			||||||
    (version "9.100.4")
 | 
					    (version "9.100.5")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "mirror://sourceforge/arma/armadillo-"
 | 
					              (uri (string-append "mirror://sourceforge/arma/armadillo-"
 | 
				
			||||||
                                  version ".tar.xz"))
 | 
					                                  version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1pzvarfj4mf6xmhs6r8dxlgq6h994ajr8hsp09r4w0dw99za2r08"))))
 | 
					                "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"))))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (arguments `(#:tests? #f))          ; no test target
 | 
					    (arguments `(#:tests? #f))          ; no test target
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -116,32 +116,29 @@ Guile-] Scheme interpreter prototype in C and a Nyacc-based C compiler in
 | 
				
			||||||
(define-public mescc-tools
 | 
					(define-public mescc-tools
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "mescc-tools")
 | 
					    (name "mescc-tools")
 | 
				
			||||||
    (version "0.5.1")
 | 
					    (version "0.5.2")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
                    "https://github.com/oriansj/mescc-tools/archive/Release_"
 | 
					                    "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/"
 | 
				
			||||||
                    version
 | 
					                    name "-Release_" version
 | 
				
			||||||
                    ".tar.gz"))
 | 
					                    ".tar.gz"))
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0rsxbjc3bg0jl3h7ai4hndxx2iyyk8bvwj9nd3xv2vgz3bmypnah"))))
 | 
					                "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (supported-systems '("i686-linux" "x86_64-linux"))
 | 
					    (supported-systems '("i686-linux" "x86_64-linux"))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
 | 
					     `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
 | 
				
			||||||
       #:test-target "test"
 | 
					       #:test-target "test"
 | 
				
			||||||
       #:phases (modify-phases %standard-phases
 | 
					       #:phases (modify-phases %standard-phases
 | 
				
			||||||
                  (delete 'configure)
 | 
					                  (delete 'configure))))
 | 
				
			||||||
                  (add-after 'install 'install-2
 | 
					 | 
				
			||||||
                    (lambda _
 | 
					 | 
				
			||||||
                      (let ((out (assoc-ref %outputs "out")))
 | 
					 | 
				
			||||||
                       (copy-file "bin/blood-elf" (string-append out "/bin/blood-elf"))))))))
 | 
					 | 
				
			||||||
    (synopsis "Tools for the full source bootstrapping process")
 | 
					    (synopsis "Tools for the full source bootstrapping process")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "Mescc-tools is a collection of tools for use in a full source
 | 
					     "Mescc-tools is a collection of tools for use in a full source
 | 
				
			||||||
bootstrapping process.  Currently consists of the M1 macro assembler and the
 | 
					bootstrapping process.  It consists of the M1 macro assembler, the hex2
 | 
				
			||||||
hex2 linker.")
 | 
					linker, the blood-elf symbol table generator, the kaem shell, exec_enable and
 | 
				
			||||||
    (home-page "https://github.com/oriansj/mescc-tools")
 | 
					get_machine.")
 | 
				
			||||||
 | 
					    (home-page "https://savannah.nongnu.org/projects/mescc-tools")
 | 
				
			||||||
    (license gpl3+)))
 | 
					    (license gpl3+)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -873,7 +873,7 @@ protocols.")
 | 
				
			||||||
(define-public c-toxcore
 | 
					(define-public c-toxcore
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "c-toxcore")
 | 
					    (name "c-toxcore")
 | 
				
			||||||
    (version "0.2.5")
 | 
					    (version "0.2.6")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -882,7 +882,7 @@ protocols.")
 | 
				
			||||||
       (file-name (string-append name "-" version ".tar.gz"))
 | 
					       (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "1n6j3brfz7kp9a7dd1xnwsa29whrb24zglbz1130l3n8vars7n4s"))))
 | 
					         "04b3ifkj64yy06vph0hlq24mw9fh24zmq1qdf40fmj24vvgfmjpl"))))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable
 | 
					     `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable
 | 
				
			||||||
                     ; for now.
 | 
					                     ; for now.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -88,7 +88,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
 | 
				
			||||||
(define-public mpd
 | 
					(define-public mpd
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "mpd")
 | 
					    (name "mpd")
 | 
				
			||||||
    (version "0.20.20")
 | 
					    (version "0.20.21")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri
 | 
					              (uri
 | 
				
			||||||
| 
						 | 
					@ -97,7 +97,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
 | 
				
			||||||
                              "/mpd-" version ".tar.xz"))
 | 
					                              "/mpd-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "111m4z7zaz60xfxvz5xkxs1al4vzb8g2wwp7kmj65pvww335ir59"))))
 | 
					                "1p2qrhdb1gzfv3y5dvvbc9s2wwmhg3azvzf8r02hzhk5q96pc8l3"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:phases
 | 
					     `(#:phases
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,7 @@
 | 
				
			||||||
;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 | 
					;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 | 
				
			||||||
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 | 
					;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 | 
				
			||||||
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
 | 
					;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
 | 
				
			||||||
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
 | 
					;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
 | 
				
			||||||
;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch>
 | 
					;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch>
 | 
				
			||||||
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
 | 
					;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
 | 
				
			||||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 | 
					;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 | 
				
			||||||
| 
						 | 
					@ -2177,3 +2177,25 @@ Convert the cap file to hccapx format and/or to WPA-PMKID-PBKDF2
 | 
				
			||||||
hashline (16800) with @command{hcxpcaptool} from the @code{hcxtools} package
 | 
					hashline (16800) with @command{hcxpcaptool} from the @code{hcxtools} package
 | 
				
			||||||
and check if the WLAN key or the master key was transmitted unencrypted.")
 | 
					and check if the WLAN key or the master key was transmitted unencrypted.")
 | 
				
			||||||
      (license license:expat))))
 | 
					      (license license:expat))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public dante
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "dante")
 | 
				
			||||||
 | 
					    (version "1.4.2")
 | 
				
			||||||
 | 
					    (source
 | 
				
			||||||
 | 
					     (origin
 | 
				
			||||||
 | 
					       (method url-fetch)
 | 
				
			||||||
 | 
					       (uri (string-append "https://www.inet.no/dante/files/dante-"
 | 
				
			||||||
 | 
					                           version ".tar.gz"))
 | 
				
			||||||
 | 
					       (sha256
 | 
				
			||||||
 | 
					        (base32
 | 
				
			||||||
 | 
					         "19rqzj167q73ag20zxpvswhkk0bj56r5maf83v5016sw7vrcz5sc"))))
 | 
				
			||||||
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
 | 
					    (home-page "https://www.inet.no/dante/")
 | 
				
			||||||
 | 
					    (synopsis "SOCKS server and client")
 | 
				
			||||||
 | 
					    (description "Dante is a SOCKS client and server implementation.  It can
 | 
				
			||||||
 | 
					be installed on a machine with access to an external TCP/IP network and will
 | 
				
			||||||
 | 
					allow all other machines, without direct access to that network, to be relayed
 | 
				
			||||||
 | 
					through the machine the Dante server is running on.  The external network will
 | 
				
			||||||
 | 
					never see any machines other than the one Dante is running on.")
 | 
				
			||||||
 | 
					    (license (license:non-copyleft "file://LICENSE"))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -40,7 +40,7 @@
 | 
				
			||||||
(define-public ntp
 | 
					(define-public ntp
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
   (name "ntp")
 | 
					   (name "ntp")
 | 
				
			||||||
   (version "4.2.8p11")
 | 
					   (version "4.2.8p12")
 | 
				
			||||||
   (source
 | 
					   (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -54,7 +54,7 @@
 | 
				
			||||||
                    "/ntp-" version ".tar.gz")))
 | 
					                    "/ntp-" version ".tar.gz")))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"))
 | 
					         "0m04ndn0674kcf9x0aggjya07a3hlig2nlzzpwk7vmqka0mj56vh"))
 | 
				
			||||||
       (modules '((guix build utils)))
 | 
					       (modules '((guix build utils)))
 | 
				
			||||||
       (snippet
 | 
					       (snippet
 | 
				
			||||||
        '(begin
 | 
					        '(begin
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@
 | 
				
			||||||
;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net>
 | 
					;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net>
 | 
				
			||||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 | 
					;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 | 
				
			||||||
;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
 | 
					;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
 | 
				
			||||||
 | 
					;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -461,8 +462,18 @@ through the pass command.")
 | 
				
			||||||
             (let ((out (assoc-ref outputs "out")))
 | 
					             (let ((out (assoc-ref outputs "out")))
 | 
				
			||||||
               (substitute* "Makefile"
 | 
					               (substitute* "Makefile"
 | 
				
			||||||
                 (("PREFIX = /usr") (string-append "PREFIX = " out)))
 | 
					                 (("PREFIX = /usr") (string-append "PREFIX = " out)))
 | 
				
			||||||
 | 
					               (substitute* "libargon2.pc"
 | 
				
			||||||
 | 
					                 (("prefix=/usr") (string-append "prefix=" out))
 | 
				
			||||||
 | 
					                 (("@HOST_MULTIARCH@") "")
 | 
				
			||||||
 | 
					                 (("@UPSTREAM_VER@") ,version))
 | 
				
			||||||
               #t)))
 | 
					               #t)))
 | 
				
			||||||
         (delete 'configure))))
 | 
					         (delete 'configure)
 | 
				
			||||||
 | 
					         (add-after 'install 'install-argon2.pc
 | 
				
			||||||
 | 
					           (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
 | 
					             (let ((out (assoc-ref outputs "out")))
 | 
				
			||||||
 | 
					               (install-file "libargon2.pc"
 | 
				
			||||||
 | 
					                             (string-append out "/lib/pkgconfig"))
 | 
				
			||||||
 | 
					               #t))))))
 | 
				
			||||||
    (home-page "https://www.argon2.com/")
 | 
					    (home-page "https://www.argon2.com/")
 | 
				
			||||||
    (synopsis "Password hashing library")
 | 
					    (synopsis "Password hashing library")
 | 
				
			||||||
    (description "Argon2 provides a key derivation function that was declared
 | 
					    (description "Argon2 provides a key derivation function that was declared
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,37 +0,0 @@
 | 
				
			||||||
From c78f59a971ce4b543f3177e383b677862b2d9fb5 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Qu Wenruo <wqu@suse.com>
 | 
					 | 
				
			||||||
Date: Wed, 14 Mar 2018 08:56:57 +0800
 | 
					 | 
				
			||||||
Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
 | 
					 | 
				
			||||||
 ext2_ext_attr_entry->e_value_block
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
 | 
					 | 
				
			||||||
removed member e_value_block, as currently ext* doesn't support it set
 | 
					 | 
				
			||||||
anyway.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
So remove such check so that we can pass compile.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Issue: #110
 | 
					 | 
				
			||||||
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071
 | 
					 | 
				
			||||||
Signed-off-by: Qu Wenruo <wqu@suse.com>
 | 
					 | 
				
			||||||
Signed-off-by: David Sterba <dsterba@suse.com>
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 convert/source-ext2.c | 3 +--
 | 
					 | 
				
			||||||
 1 file changed, 1 insertion(+), 2 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/convert/source-ext2.c b/convert/source-ext2.c
 | 
					 | 
				
			||||||
index b1492c78..070126ec 100644
 | 
					 | 
				
			||||||
--- a/convert/source-ext2.c
 | 
					 | 
				
			||||||
+++ b/convert/source-ext2.c
 | 
					 | 
				
			||||||
@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
 	size_t value_size = entry->e_value_size;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-	if (entry->e_value_block != 0 || value_size > size ||
 | 
					 | 
				
			||||||
-	    entry->e_value_offs + value_size > size)
 | 
					 | 
				
			||||||
+	if (value_size > size || entry->e_value_offs + value_size > size)
 | 
					 | 
				
			||||||
 		return -EIO;
 | 
					 | 
				
			||||||
 	return 0;
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
-- 
 | 
					 | 
				
			||||||
2.16.3
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,56 +0,0 @@
 | 
				
			||||||
Copied from:
 | 
					 | 
				
			||||||
https://github.com/openwrt/openwrt/blob/58a95f0f8ff768b43d68eed2b6a786e0f40f723b/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
From 01551bdba16ab16512a01affe02ade32c41ede8a Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Palmer Dabbelt <palmer@dabbelt.com>
 | 
					 | 
				
			||||||
Date: Fri, 29 Dec 2017 10:19:51 -0800
 | 
					 | 
				
			||||||
Subject: [PATCH] misc: rename copy_file_range to copy_file_chunk
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
As of 2.27, glibc will have a copy_file_range library call to wrap the
 | 
					 | 
				
			||||||
new copy_file_range system call.  This conflicts with the function in
 | 
					 | 
				
			||||||
misc/create_inode.c, which this patch renames _copy_file_range.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
 | 
					 | 
				
			||||||
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 misc/create_inode.c | 8 ++++----
 | 
					 | 
				
			||||||
 1 file changed, 4 insertions(+), 4 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
--- a/misc/create_inode.c
 | 
					 | 
				
			||||||
+++ b/misc/create_inode.c
 | 
					 | 
				
			||||||
@@ -392,7 +392,7 @@ static ssize_t my_pread(int fd, void *bu
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
 #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
 | 
					 | 
				
			||||||
+static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file,
 | 
					 | 
				
			||||||
 				 off_t start, off_t end, char *buf,
 | 
					 | 
				
			||||||
 				 char *zerobuf)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
@@ -466,7 +466,7 @@ static errcode_t try_lseek_copy(ext2_fil
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 		data_blk = data & ~(fs->blocksize - 1);
 | 
					 | 
				
			||||||
 		hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1);
 | 
					 | 
				
			||||||
-		err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
 | 
					 | 
				
			||||||
+		err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf,
 | 
					 | 
				
			||||||
 				      zerobuf);
 | 
					 | 
				
			||||||
 		if (err)
 | 
					 | 
				
			||||||
 			return err;
 | 
					 | 
				
			||||||
@@ -516,7 +516,7 @@ static errcode_t try_fiemap_copy(ext2_fi
 | 
					 | 
				
			||||||
 		}
 | 
					 | 
				
			||||||
 		for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents;
 | 
					 | 
				
			||||||
 		     i++, ext++) {
 | 
					 | 
				
			||||||
-			err = copy_file_range(fs, fd, e2_file, ext->fe_logical,
 | 
					 | 
				
			||||||
+			err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical,
 | 
					 | 
				
			||||||
 					      ext->fe_logical + ext->fe_length,
 | 
					 | 
				
			||||||
 					      buf, zerobuf);
 | 
					 | 
				
			||||||
 			if (err)
 | 
					 | 
				
			||||||
@@ -569,7 +569,7 @@ static errcode_t copy_file(ext2_filsys f
 | 
					 | 
				
			||||||
 		goto out;
 | 
					 | 
				
			||||||
 #endif
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-	err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
 | 
					 | 
				
			||||||
+	err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
 | 
					 | 
				
			||||||
 			      zerobuf);
 | 
					 | 
				
			||||||
 out:
 | 
					 | 
				
			||||||
 	ext2fs_free_mem(&zerobuf);
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,245 +0,0 @@
 | 
				
			||||||
# HG changeset patch
 | 
					 | 
				
			||||||
# User Gael Guennebaud <g.gael@free.fr>
 | 
					 | 
				
			||||||
# Date 1497514590 -7200
 | 
					 | 
				
			||||||
# Node ID d781c1de98342c5ca29c2fe719d8d3c96a35dcd4
 | 
					 | 
				
			||||||
# Parent  48cd83b2b459aa9f3f5dca135d38760fe0b02a2f
 | 
					 | 
				
			||||||
Bug 1436: fix compilation of Jacobi rotations with ARM NEON, some specializations of internal::conj_helper were missing.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/Eigen/Core b/Eigen/Core
 | 
					 | 
				
			||||||
--- a/Eigen/Core
 | 
					 | 
				
			||||||
+++ b/Eigen/Core
 | 
					 | 
				
			||||||
@@ -371,6 +371,7 @@
 | 
					 | 
				
			||||||
 #include "src/Core/MathFunctions.h"
 | 
					 | 
				
			||||||
 #include "src/Core/GenericPacketMath.h"
 | 
					 | 
				
			||||||
 #include "src/Core/MathFunctionsImpl.h"
 | 
					 | 
				
			||||||
+#include "src/Core/arch/Default/ConjHelper.h"
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 #if defined EIGEN_VECTORIZE_AVX512
 | 
					 | 
				
			||||||
   #include "src/Core/arch/SSE/PacketMath.h"
 | 
					 | 
				
			||||||
diff --git a/Eigen/src/Core/arch/AVX/Complex.h b/Eigen/src/Core/arch/AVX/Complex.h
 | 
					 | 
				
			||||||
--- a/Eigen/src/Core/arch/AVX/Complex.h
 | 
					 | 
				
			||||||
+++ b/Eigen/src/Core/arch/AVX/Complex.h
 | 
					 | 
				
			||||||
@@ -204,23 +204,7 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet8f, Packet4cf, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet4cf pmadd(const Packet8f& x, const Packet4cf& y, const Packet4cf& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet4cf pmul(const Packet8f& x, const Packet4cf& y) const
 | 
					 | 
				
			||||||
-  { return Packet4cf(Eigen::internal::pmul(x, y.v)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet4cf, Packet8f, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet4cf pmadd(const Packet4cf& x, const Packet8f& y, const Packet4cf& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet4cf pmul(const Packet4cf& x, const Packet8f& y) const
 | 
					 | 
				
			||||||
-  { return Packet4cf(Eigen::internal::pmul(x.v, y)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet4cf,Packet8f)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet4cf pdiv<Packet4cf>(const Packet4cf& a, const Packet4cf& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
@@ -400,23 +384,7 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet4d, Packet2cd, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cd pmadd(const Packet4d& x, const Packet2cd& y, const Packet2cd& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cd pmul(const Packet4d& x, const Packet2cd& y) const
 | 
					 | 
				
			||||||
-  { return Packet2cd(Eigen::internal::pmul(x, y.v)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet2cd, Packet4d, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cd pmadd(const Packet2cd& x, const Packet4d& y, const Packet2cd& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cd pmul(const Packet2cd& x, const Packet4d& y) const
 | 
					 | 
				
			||||||
-  { return Packet2cd(Eigen::internal::pmul(x.v, y)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet2cd,Packet4d)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet2cd pdiv<Packet2cd>(const Packet2cd& a, const Packet2cd& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
diff --git a/Eigen/src/Core/arch/AltiVec/Complex.h b/Eigen/src/Core/arch/AltiVec/Complex.h
 | 
					 | 
				
			||||||
--- a/Eigen/src/Core/arch/AltiVec/Complex.h
 | 
					 | 
				
			||||||
+++ b/Eigen/src/Core/arch/AltiVec/Complex.h
 | 
					 | 
				
			||||||
@@ -224,23 +224,7 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet4f, Packet2cf, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmadd(const Packet4f& x, const Packet2cf& y, const Packet2cf& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmul(const Packet4f& x, const Packet2cf& y) const
 | 
					 | 
				
			||||||
-  { return Packet2cf(internal::pmul<Packet4f>(x, y.v)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet2cf, Packet4f, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmadd(const Packet2cf& x, const Packet4f& y, const Packet2cf& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmul(const Packet2cf& x, const Packet4f& y) const
 | 
					 | 
				
			||||||
-  { return Packet2cf(internal::pmul<Packet4f>(x.v, y)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet2cf,Packet4f)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet2cf pdiv<Packet2cf>(const Packet2cf& a, const Packet2cf& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
@@ -416,23 +400,8 @@
 | 
					 | 
				
			||||||
     return pconj(internal::pmul(a, b));
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet2d, Packet1cd, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmadd(const Packet2d& x, const Packet1cd& y, const Packet1cd& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmul(const Packet2d& x, const Packet1cd& y) const
 | 
					 | 
				
			||||||
-  { return Packet1cd(internal::pmul<Packet2d>(x, y.v)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet1cd, Packet2d, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmadd(const Packet1cd& x, const Packet2d& y, const Packet1cd& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmul(const Packet1cd& x, const Packet2d& y) const
 | 
					 | 
				
			||||||
-  { return Packet1cd(internal::pmul<Packet2d>(x.v, y)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet1cd,Packet2d)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet1cd pdiv<Packet1cd>(const Packet1cd& a, const Packet1cd& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
diff --git a/Eigen/src/Core/arch/Default/ConjHelper.h b/Eigen/src/Core/arch/Default/ConjHelper.h
 | 
					 | 
				
			||||||
new file mode 100644
 | 
					 | 
				
			||||||
--- /dev/null
 | 
					 | 
				
			||||||
+++ b/Eigen/src/Core/arch/Default/ConjHelper.h
 | 
					 | 
				
			||||||
@@ -0,0 +1,29 @@
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+// This file is part of Eigen, a lightweight C++ template library
 | 
					 | 
				
			||||||
+// for linear algebra.
 | 
					 | 
				
			||||||
+//
 | 
					 | 
				
			||||||
+// Copyright (C) 2017 Gael Guennebaud <gael.guennebaud@inria.fr>
 | 
					 | 
				
			||||||
+//
 | 
					 | 
				
			||||||
+// This Source Code Form is subject to the terms of the Mozilla
 | 
					 | 
				
			||||||
+// Public License v. 2.0. If a copy of the MPL was not distributed
 | 
					 | 
				
			||||||
+// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+#ifndef EIGEN_ARCH_CONJ_HELPER_H
 | 
					 | 
				
			||||||
+#define EIGEN_ARCH_CONJ_HELPER_H
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+#define EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(PACKET_CPLX, PACKET_REAL)                                                          \
 | 
					 | 
				
			||||||
+  template<> struct conj_helper<PACKET_REAL, PACKET_CPLX, false,false> {                                          \
 | 
					 | 
				
			||||||
+    EIGEN_STRONG_INLINE PACKET_CPLX pmadd(const PACKET_REAL& x, const PACKET_CPLX& y, const PACKET_CPLX& c) const \
 | 
					 | 
				
			||||||
+    { return padd(c, pmul(x,y)); }                                                                                \
 | 
					 | 
				
			||||||
+    EIGEN_STRONG_INLINE PACKET_CPLX pmul(const PACKET_REAL& x, const PACKET_CPLX& y) const                        \
 | 
					 | 
				
			||||||
+    { return PACKET_CPLX(Eigen::internal::pmul<PACKET_REAL>(x, y.v)); }                                           \
 | 
					 | 
				
			||||||
+  };                                                                                                              \
 | 
					 | 
				
			||||||
+                                                                                                                  \
 | 
					 | 
				
			||||||
+  template<> struct conj_helper<PACKET_CPLX, PACKET_REAL, false,false> {                                          \
 | 
					 | 
				
			||||||
+    EIGEN_STRONG_INLINE PACKET_CPLX pmadd(const PACKET_CPLX& x, const PACKET_REAL& y, const PACKET_CPLX& c) const \
 | 
					 | 
				
			||||||
+    { return padd(c, pmul(x,y)); }                                                                                \
 | 
					 | 
				
			||||||
+    EIGEN_STRONG_INLINE PACKET_CPLX pmul(const PACKET_CPLX& x, const PACKET_REAL& y) const                        \
 | 
					 | 
				
			||||||
+    { return PACKET_CPLX(Eigen::internal::pmul<PACKET_REAL>(x.v, y)); }                                           \
 | 
					 | 
				
			||||||
+  };
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+#endif // EIGEN_ARCH_CONJ_HELPER_H
 | 
					 | 
				
			||||||
diff --git a/Eigen/src/Core/arch/NEON/Complex.h b/Eigen/src/Core/arch/NEON/Complex.h
 | 
					 | 
				
			||||||
--- a/Eigen/src/Core/arch/NEON/Complex.h
 | 
					 | 
				
			||||||
+++ b/Eigen/src/Core/arch/NEON/Complex.h
 | 
					 | 
				
			||||||
@@ -265,6 +265,8 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet2cf,Packet4f)
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet2cf pdiv<Packet2cf>(const Packet2cf& a, const Packet2cf& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
   // TODO optimize it for NEON
 | 
					 | 
				
			||||||
@@ -456,6 +458,8 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet1cd,Packet2d)
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet1cd pdiv<Packet1cd>(const Packet1cd& a, const Packet1cd& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
   // TODO optimize it for NEON
 | 
					 | 
				
			||||||
diff --git a/Eigen/src/Core/arch/SSE/Complex.h b/Eigen/src/Core/arch/SSE/Complex.h
 | 
					 | 
				
			||||||
--- a/Eigen/src/Core/arch/SSE/Complex.h
 | 
					 | 
				
			||||||
+++ b/Eigen/src/Core/arch/SSE/Complex.h
 | 
					 | 
				
			||||||
@@ -229,23 +229,7 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet4f, Packet2cf, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmadd(const Packet4f& x, const Packet2cf& y, const Packet2cf& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmul(const Packet4f& x, const Packet2cf& y) const
 | 
					 | 
				
			||||||
-  { return Packet2cf(Eigen::internal::pmul<Packet4f>(x, y.v)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet2cf, Packet4f, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmadd(const Packet2cf& x, const Packet4f& y, const Packet2cf& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet2cf pmul(const Packet2cf& x, const Packet4f& y) const
 | 
					 | 
				
			||||||
-  { return Packet2cf(Eigen::internal::pmul<Packet4f>(x.v, y)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet2cf,Packet4f)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet2cf pdiv<Packet2cf>(const Packet2cf& a, const Packet2cf& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
@@ -430,23 +414,7 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet2d, Packet1cd, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmadd(const Packet2d& x, const Packet1cd& y, const Packet1cd& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmul(const Packet2d& x, const Packet1cd& y) const
 | 
					 | 
				
			||||||
-  { return Packet1cd(Eigen::internal::pmul<Packet2d>(x, y.v)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-template<> struct conj_helper<Packet1cd, Packet2d, false,false>
 | 
					 | 
				
			||||||
-{
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmadd(const Packet1cd& x, const Packet2d& y, const Packet1cd& c) const
 | 
					 | 
				
			||||||
-  { return padd(c, pmul(x,y)); }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-  EIGEN_STRONG_INLINE Packet1cd pmul(const Packet1cd& x, const Packet2d& y) const
 | 
					 | 
				
			||||||
-  { return Packet1cd(Eigen::internal::pmul<Packet2d>(x.v, y)); }
 | 
					 | 
				
			||||||
-};
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet1cd,Packet2d)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet1cd pdiv<Packet1cd>(const Packet1cd& a, const Packet1cd& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
diff --git a/Eigen/src/Core/arch/ZVector/Complex.h b/Eigen/src/Core/arch/ZVector/Complex.h
 | 
					 | 
				
			||||||
--- a/Eigen/src/Core/arch/ZVector/Complex.h
 | 
					 | 
				
			||||||
+++ b/Eigen/src/Core/arch/ZVector/Complex.h
 | 
					 | 
				
			||||||
@@ -336,6 +336,9 @@
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
 };
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet2cf,Packet4f)
 | 
					 | 
				
			||||||
+EIGEN_MAKE_CONJ_HELPER_CPLX_REAL(Packet1cd,Packet2d)
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 template<> EIGEN_STRONG_INLINE Packet1cd pdiv<Packet1cd>(const Packet1cd& a, const Packet1cd& b)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
   // TODO optimize it for AltiVec
 | 
					 | 
				
			||||||
							
								
								
									
										23
									
								
								gnu/packages/patches/extundelete-e2fsprogs-1.44.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								gnu/packages/patches/extundelete-e2fsprogs-1.44.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,23 @@
 | 
				
			||||||
 | 
					From: Tobias Geerinckx-Rice <me@tobias.gr>
 | 
				
			||||||
 | 
					Date: Thu, 16 Aug 2018 21:12:30 +0200
 | 
				
			||||||
 | 
					Subject: extundelete: Fix build with e2fsprogs 1.44.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					The ‘inode.i_file_acl’ field was replaced with ‘inode.i_size_high’. I'm
 | 
				
			||||||
 | 
					not sure the field name is still accurate or useful, so don't print it
 | 
				
			||||||
 | 
					at all.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Based on this[0] patch by ‘conikost’[1].
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[0]: https://sourceforge.net/p/extundelete/tickets/5/
 | 
				
			||||||
 | 
					[1]: https://sourceforge.net/u/conikost
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					--- a/src/insertionops.cc	2012-12-30 18:23:32.000000000 +0100
 | 
				
			||||||
 | 
					+++ b/src/insertionops.cc	2018-05-07 22:58:13.065868723 +0200
 | 
				
			||||||
 | 
					@@ -33,7 +33,6 @@
 | 
				
			||||||
 | 
					   os << "File flags: " << inode.i_flags << std::endl;
 | 
				
			||||||
 | 
					   os << "File version (for NFS): " << inode.i_generation << std::endl;
 | 
				
			||||||
 | 
					   os << "File ACL: " << inode.i_file_acl << std::endl;
 | 
				
			||||||
 | 
					-  os << "Directory ACL: " << inode.i_dir_acl << std::endl;
 | 
				
			||||||
 | 
					   os << "Fragment address: " << inode.i_faddr << std::endl;
 | 
				
			||||||
 | 
					   os << "Direct blocks: ";
 | 
				
			||||||
 | 
					   for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
 | 
				
			||||||
							
								
								
									
										15
									
								
								gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,15 @@
 | 
				
			||||||
 | 
					This is a backport of part of this patch from 6.5 to 4.8:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=8937b94d1a643fd9760714642296d034a45254a8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					--- a/libsanitizer/tsan/tsan_platform_linux.cc
 | 
				
			||||||
 | 
					+++ b/libsanitizer/tsan/tsan_platform_linux.cc
 | 
				
			||||||
 | 
					@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {
 | 
				
			||||||
 | 
					 // closes within glibc. The code is a pure hack.
 | 
				
			||||||
 | 
					 int ExtractResolvFDs(void *state, int *fds, int nfd) {
 | 
				
			||||||
 | 
					   int cnt = 0;
 | 
				
			||||||
 | 
					-  __res_state *statp = (__res_state*)state;
 | 
				
			||||||
 | 
					+  struct __res_state *statp = (struct __res_state*)state;
 | 
				
			||||||
 | 
					   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
 | 
				
			||||||
 | 
					     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
 | 
				
			||||||
 | 
					       fds[cnt++] = statp->_u._ext.nssocks[i];
 | 
				
			||||||
| 
						 | 
					@ -1,116 +0,0 @@
 | 
				
			||||||
Fix CVE-2018-6556:
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6556
 | 
					 | 
				
			||||||
https://bugzilla.suse.com/show_bug.cgi?id=988348#c8
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Patch copied from upstream source repository:
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
https://github.com/lxc/lxc/commit/c1cf54ebf251fdbad1e971679614e81649f1c032
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
From c1cf54ebf251fdbad1e971679614e81649f1c032 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Christian Brauner <christian.brauner@ubuntu.com>
 | 
					 | 
				
			||||||
Date: Wed, 25 Jul 2018 19:56:54 +0200
 | 
					 | 
				
			||||||
Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 src/lxc/cmd/lxc_user_nic.c | 35 ++++++++++++++++++++++++++++++++---
 | 
					 | 
				
			||||||
 src/lxc/utils.c            | 12 ++++++++++++
 | 
					 | 
				
			||||||
 src/lxc/utils.h            |  5 +++++
 | 
					 | 
				
			||||||
 3 files changed, 49 insertions(+), 3 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
 | 
					 | 
				
			||||||
index ec9cd97e0..c5beb6c8d 100644
 | 
					 | 
				
			||||||
--- a/src/lxc/cmd/lxc_user_nic.c
 | 
					 | 
				
			||||||
+++ b/src/lxc/cmd/lxc_user_nic.c
 | 
					 | 
				
			||||||
@@ -1179,12 +1179,41 @@ int main(int argc, char *argv[])
 | 
					 | 
				
			||||||
 			exit(EXIT_FAILURE);
 | 
					 | 
				
			||||||
 		}
 | 
					 | 
				
			||||||
 	} else if (request == LXC_USERNIC_DELETE) {
 | 
					 | 
				
			||||||
-		netns_fd = open(args.pid, O_RDONLY);
 | 
					 | 
				
			||||||
+		char opath[LXC_PROC_PID_FD_LEN];
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+		/* Open the path with O_PATH which will not trigger an actual
 | 
					 | 
				
			||||||
+		 * open(). Don't report an errno to the caller to not leak
 | 
					 | 
				
			||||||
+		 * information whether the path exists or not.
 | 
					 | 
				
			||||||
+		 * When stracing setuid is stripped so this is not a concern
 | 
					 | 
				
			||||||
+		 * either.
 | 
					 | 
				
			||||||
+		 */
 | 
					 | 
				
			||||||
+		netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
 | 
					 | 
				
			||||||
 		if (netns_fd < 0) {
 | 
					 | 
				
			||||||
-			usernic_error("Could not open \"%s\": %s\n", args.pid,
 | 
					 | 
				
			||||||
-				      strerror(errno));
 | 
					 | 
				
			||||||
+			usernic_error("Failed to open \"%s\"\n", args.pid);
 | 
					 | 
				
			||||||
+			exit(EXIT_FAILURE);
 | 
					 | 
				
			||||||
+		}
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+		if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
 | 
					 | 
				
			||||||
+			usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid);
 | 
					 | 
				
			||||||
+			close(netns_fd);
 | 
					 | 
				
			||||||
+			exit(EXIT_FAILURE);
 | 
					 | 
				
			||||||
+		}
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+		ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", netns_fd);
 | 
					 | 
				
			||||||
+		if (ret < 0 || (size_t)ret >= sizeof(opath)) {
 | 
					 | 
				
			||||||
+			close(netns_fd);
 | 
					 | 
				
			||||||
+			exit(EXIT_FAILURE);
 | 
					 | 
				
			||||||
+		}
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+		/* Now get an fd that we can use in setns() calls. */
 | 
					 | 
				
			||||||
+		ret = open(opath, O_RDONLY | O_CLOEXEC);
 | 
					 | 
				
			||||||
+		if (ret < 0) {
 | 
					 | 
				
			||||||
+			usernic_error("Failed to open \"%s\": %s\n", args.pid, strerror(errno));
 | 
					 | 
				
			||||||
+			close(netns_fd);
 | 
					 | 
				
			||||||
 			exit(EXIT_FAILURE);
 | 
					 | 
				
			||||||
 		}
 | 
					 | 
				
			||||||
+		close(netns_fd);
 | 
					 | 
				
			||||||
+		netns_fd = ret;
 | 
					 | 
				
			||||||
 	}
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	if (!create_db_dir(LXC_USERNIC_DB)) {
 | 
					 | 
				
			||||||
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
 | 
					 | 
				
			||||||
index 530b1f81a..3b854e35b 100644
 | 
					 | 
				
			||||||
--- a/src/lxc/utils.c
 | 
					 | 
				
			||||||
+++ b/src/lxc/utils.c
 | 
					 | 
				
			||||||
@@ -2544,6 +2544,18 @@ bool has_fs_type(const char *path, fs_type_magic magic_val)
 | 
					 | 
				
			||||||
 	return has_type;
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+bool fhas_fs_type(int fd, fs_type_magic magic_val)
 | 
					 | 
				
			||||||
+{
 | 
					 | 
				
			||||||
+	int ret;
 | 
					 | 
				
			||||||
+	struct statfs sb;
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+	ret = fstatfs(fd, &sb);
 | 
					 | 
				
			||||||
+	if (ret < 0)
 | 
					 | 
				
			||||||
+		return false;
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+	return is_fs_type(&sb, magic_val);
 | 
					 | 
				
			||||||
+}
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 bool lxc_nic_exists(char *nic)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
 #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1
 | 
					 | 
				
			||||||
diff --git a/src/lxc/utils.h b/src/lxc/utils.h
 | 
					 | 
				
			||||||
index 6a0bebded..0805f5d0d 100644
 | 
					 | 
				
			||||||
--- a/src/lxc/utils.h
 | 
					 | 
				
			||||||
+++ b/src/lxc/utils.h
 | 
					 | 
				
			||||||
@@ -95,6 +95,10 @@
 | 
					 | 
				
			||||||
 #define CGROUP2_SUPER_MAGIC 0x63677270
 | 
					 | 
				
			||||||
 #endif
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+#ifndef NSFS_MAGIC
 | 
					 | 
				
			||||||
+#define NSFS_MAGIC 0x6e736673
 | 
					 | 
				
			||||||
+#endif
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 /* Useful macros */
 | 
					 | 
				
			||||||
 /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
 | 
					 | 
				
			||||||
 #define LXC_NUMSTRLEN64 21
 | 
					 | 
				
			||||||
@@ -580,6 +584,7 @@ extern void *must_realloc(void *orig, size_t sz);
 | 
					 | 
				
			||||||
 /* __typeof__ should be safe to use with all compilers. */
 | 
					 | 
				
			||||||
 typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic;
 | 
					 | 
				
			||||||
 extern bool has_fs_type(const char *path, fs_type_magic magic_val);
 | 
					 | 
				
			||||||
+extern bool fhas_fs_type(int fd, fs_type_magic magic_val);
 | 
					 | 
				
			||||||
 extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
 | 
					 | 
				
			||||||
 extern bool lxc_nic_exists(char *nic);
 | 
					 | 
				
			||||||
 extern int lxc_make_tmpfile(char *template, bool rm);
 | 
					 | 
				
			||||||
							
								
								
									
										165
									
								
								gnu/packages/patches/openssh-CVE-2018-15473.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										165
									
								
								gnu/packages/patches/openssh-CVE-2018-15473.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,165 @@
 | 
				
			||||||
 | 
					Fix CVE-2018-15473, a method by which remote clients can enumerate
 | 
				
			||||||
 | 
					usernames on the server:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					http://seclists.org/oss-sec/2018/q3/124
 | 
				
			||||||
 | 
					https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-15473
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Patch adapted from upstream source repository:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					https://anongit.mindrot.org/openssh.git/commit/?id=74287f5df9966a0648b4a68417451dd18f079ab8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					From 74287f5df9966a0648b4a68417451dd18f079ab8 Mon Sep 17 00:00:00 2001
 | 
				
			||||||
 | 
					From: "djm@openbsd.org" <djm@openbsd.org>
 | 
				
			||||||
 | 
					Date: Tue, 31 Jul 2018 03:10:27 +0000
 | 
				
			||||||
 | 
					Subject: [PATCH] upstream: delay bailout for invalid authentic
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					=?UTF-8?q?ating=20user=20until=20after=20the=20packet=20containing=20the?=
 | 
				
			||||||
 | 
					=?UTF-8?q?=20request=20has=20been=20fully=20parsed.=20Reported=20by=20Dar?=
 | 
				
			||||||
 | 
					=?UTF-8?q?iusz=20Tytko=20and=20Micha=C5=82=20Sajdak;=20ok=20deraadt?=
 | 
				
			||||||
 | 
					MIME-Version: 1.0
 | 
				
			||||||
 | 
					Content-Type: text/plain; charset=UTF-8
 | 
				
			||||||
 | 
					Content-Transfer-Encoding: 8bit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					OpenBSD-Commit-ID: b4891882fbe413f230fe8ac8a37349b03bd0b70d
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					 auth2-gss.c       | 11 +++++++----
 | 
				
			||||||
 | 
					 auth2-hostbased.c | 11 ++++++-----
 | 
				
			||||||
 | 
					 auth2-pubkey.c    | 25 +++++++++++++++----------
 | 
				
			||||||
 | 
					 3 files changed, 28 insertions(+), 19 deletions(-)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Adapted from upstream to apply to OpenSSH 7.7p1.
 | 
				
			||||||
 | 
					diff --git a/auth2-gss.c b/auth2-gss.c
 | 
				
			||||||
 | 
					index 589283b7..1d7cfb39 100644
 | 
				
			||||||
 | 
					--- a/auth2-gss.c
 | 
				
			||||||
 | 
					+++ b/auth2-gss.c
 | 
				
			||||||
 | 
					@@ -69,9 +69,6 @@ userauth_gssapi(struct ssh *ssh)
 | 
				
			||||||
 | 
					 	u_int len;
 | 
				
			||||||
 | 
					 	u_char *doid = NULL;
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-	if (!authctxt->valid || authctxt->user == NULL)
 | 
				
			||||||
 | 
					-		return (0);
 | 
				
			||||||
 | 
					-
 | 
				
			||||||
 | 
					 	mechs = packet_get_int();
 | 
				
			||||||
 | 
					 	if (mechs == 0) {
 | 
				
			||||||
 | 
					 		debug("Mechanism negotiation is not supported");
 | 
				
			||||||
 | 
					diff --git a/auth2-gss.c b/auth2-gss.c
 | 
				
			||||||
 | 
					index 47308c5c..9351e042 100644
 | 
				
			||||||
 | 
					--- a/auth2-gss.c
 | 
				
			||||||
 | 
					+++ b/auth2-gss.c
 | 
				
			||||||
 | 
					@@ -106,6 +103,12 @@ userauth_gssapi(struct ssh *ssh)
 | 
				
			||||||
 | 
					 		return (0);
 | 
				
			||||||
 | 
					 	}
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+	if (!authctxt->valid || authctxt->user == NULL) {
 | 
				
			||||||
 | 
					+		debug2("%s: disabled because of invalid user", __func__);
 | 
				
			||||||
 | 
					+		free(doid);
 | 
				
			||||||
 | 
					+		return (0);
 | 
				
			||||||
 | 
					+	}
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					 	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
 | 
				
			||||||
 | 
					 		if (ctxt != NULL)
 | 
				
			||||||
 | 
					 			ssh_gssapi_delete_ctx(&ctxt);
 | 
				
			||||||
 | 
					diff --git a/auth2-hostbased.c b/auth2-hostbased.c
 | 
				
			||||||
 | 
					index 60159a56..35939329 100644
 | 
				
			||||||
 | 
					--- a/auth2-hostbased.c
 | 
				
			||||||
 | 
					+++ b/auth2-hostbased.c
 | 
				
			||||||
 | 
					@@ -67,10 +67,6 @@ userauth_hostbased(struct ssh *ssh)
 | 
				
			||||||
 | 
					 	size_t alen, blen, slen;
 | 
				
			||||||
 | 
					 	int r, pktype, authenticated = 0;
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-	if (!authctxt->valid) {
 | 
				
			||||||
 | 
					-		debug2("%s: disabled because of invalid user", __func__);
 | 
				
			||||||
 | 
					-		return 0;
 | 
				
			||||||
 | 
					-	}
 | 
				
			||||||
 | 
					 	/* XXX use sshkey_froms() */
 | 
				
			||||||
 | 
					 	if ((r = sshpkt_get_cstring(ssh, &pkalg, &alen)) != 0 ||
 | 
				
			||||||
 | 
					 	    (r = sshpkt_get_string(ssh, &pkblob, &blen)) != 0 ||
 | 
				
			||||||
 | 
					@@ -117,6 +113,11 @@ userauth_hostbased(struct ssh *ssh)
 | 
				
			||||||
 | 
					 		goto done;
 | 
				
			||||||
 | 
					 	}
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+	if (!authctxt->valid || authctxt->user == NULL) {
 | 
				
			||||||
 | 
					+		debug2("%s: disabled because of invalid user", __func__);
 | 
				
			||||||
 | 
					+		goto done;
 | 
				
			||||||
 | 
					+	}
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					 	if ((b = sshbuf_new()) == NULL)
 | 
				
			||||||
 | 
					 		fatal("%s: sshbuf_new failed", __func__);
 | 
				
			||||||
 | 
					 	/* reconstruct packet */
 | 
				
			||||||
 | 
					diff --git a/auth2-pubkey.c b/auth2-pubkey.c
 | 
				
			||||||
 | 
					index c4d0f790..e1c15040 100644
 | 
				
			||||||
 | 
					--- a/auth2-pubkey.c
 | 
				
			||||||
 | 
					+++ b/auth2-pubkey.c
 | 
				
			||||||
 | 
					@@ -89,19 +89,15 @@ userauth_pubkey(struct ssh *ssh)
 | 
				
			||||||
 | 
					 {
 | 
				
			||||||
 | 
					 	Authctxt *authctxt = ssh->authctxt;
 | 
				
			||||||
 | 
					 	struct passwd *pw = authctxt->pw;
 | 
				
			||||||
 | 
					-	struct sshbuf *b;
 | 
				
			||||||
 | 
					+	struct sshbuf *b = NULL;
 | 
				
			||||||
 | 
					 	struct sshkey *key = NULL;
 | 
				
			||||||
 | 
					-	char *pkalg, *userstyle = NULL, *key_s = NULL, *ca_s = NULL;
 | 
				
			||||||
 | 
					-	u_char *pkblob, *sig, have_sig;
 | 
				
			||||||
 | 
					+	char *pkalg = NULL, *userstyle = NULL, *key_s = NULL, *ca_s = NULL;
 | 
				
			||||||
 | 
					+	u_char *pkblob = NULL, *sig = NULL, have_sig;
 | 
				
			||||||
 | 
					 	size_t blen, slen;
 | 
				
			||||||
 | 
					 	int r, pktype;
 | 
				
			||||||
 | 
					 	int authenticated = 0;
 | 
				
			||||||
 | 
					 	struct sshauthopt *authopts = NULL;
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-	if (!authctxt->valid) {
 | 
				
			||||||
 | 
					-		debug2("%s: disabled because of invalid user", __func__);
 | 
				
			||||||
 | 
					-		return 0;
 | 
				
			||||||
 | 
					-	}
 | 
				
			||||||
 | 
					 	if ((r = sshpkt_get_u8(ssh, &have_sig)) != 0 ||
 | 
				
			||||||
 | 
					 	    (r = sshpkt_get_cstring(ssh, &pkalg, NULL)) != 0 ||
 | 
				
			||||||
 | 
					 	    (r = sshpkt_get_string(ssh, &pkblob, &blen)) != 0)
 | 
				
			||||||
 | 
					@@ -167,6 +163,11 @@ userauth_pubkey(struct ssh *ssh)
 | 
				
			||||||
 | 
					 				fatal("%s: sshbuf_put_string session id: %s",
 | 
				
			||||||
 | 
					 				    __func__, ssh_err(r));
 | 
				
			||||||
 | 
					 		}
 | 
				
			||||||
 | 
					+		if (!authctxt->valid || authctxt->user == NULL) {
 | 
				
			||||||
 | 
					+			debug2("%s: disabled because of invalid user",
 | 
				
			||||||
 | 
					+			    __func__);
 | 
				
			||||||
 | 
					+			goto done;
 | 
				
			||||||
 | 
					+		}
 | 
				
			||||||
 | 
					 		/* reconstruct packet */
 | 
				
			||||||
 | 
					 		xasprintf(&userstyle, "%s%s%s", authctxt->user,
 | 
				
			||||||
 | 
					 		    authctxt->style ? ":" : "",
 | 
				
			||||||
 | 
					@@ -183,7 +184,6 @@ userauth_pubkey(struct ssh *ssh)
 | 
				
			||||||
 | 
					 #ifdef DEBUG_PK
 | 
				
			||||||
 | 
					 		sshbuf_dump(b, stderr);
 | 
				
			||||||
 | 
					 #endif
 | 
				
			||||||
 | 
					-
 | 
				
			||||||
 | 
					 		/* test for correct signature */
 | 
				
			||||||
 | 
					 		authenticated = 0;
 | 
				
			||||||
 | 
					 		if (PRIVSEP(user_key_allowed(ssh, pw, key, 1, &authopts)) &&
 | 
				
			||||||
 | 
					@@ -194,7 +194,6 @@ userauth_pubkey(struct ssh *ssh)
 | 
				
			||||||
 | 
					 			authenticated = 1;
 | 
				
			||||||
 | 
					 		}
 | 
				
			||||||
 | 
					 		sshbuf_free(b);
 | 
				
			||||||
 | 
					-		free(sig);
 | 
				
			||||||
 | 
					 		auth2_record_key(authctxt, authenticated, key);
 | 
				
			||||||
 | 
					 	} else {
 | 
				
			||||||
 | 
					 		debug("%s: test pkalg %s pkblob %s%s%s",
 | 
				
			||||||
 | 
					@@ -205,6 +204,11 @@ userauth_pubkey(struct ssh *ssh)
 | 
				
			||||||
 | 
					 		if ((r = sshpkt_get_end(ssh)) != 0)
 | 
				
			||||||
 | 
					 			fatal("%s: %s", __func__, ssh_err(r));
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+		if (!authctxt->valid || authctxt->user == NULL) {
 | 
				
			||||||
 | 
					+			debug2("%s: disabled because of invalid user",
 | 
				
			||||||
 | 
					+			    __func__);
 | 
				
			||||||
 | 
					+			goto done;
 | 
				
			||||||
 | 
					+		}
 | 
				
			||||||
 | 
					 		/* XXX fake reply and always send PK_OK ? */
 | 
				
			||||||
 | 
					 		/*
 | 
				
			||||||
 | 
					 		 * XXX this allows testing whether a user is allowed
 | 
				
			||||||
 | 
					@@ -238,6 +242,7 @@ done:
 | 
				
			||||||
 | 
					 	free(pkblob);
 | 
				
			||||||
 | 
					 	free(key_s);
 | 
				
			||||||
 | 
					 	free(ca_s);
 | 
				
			||||||
 | 
					+	free(sig);
 | 
				
			||||||
 | 
					 	return authenticated;
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-- 
 | 
				
			||||||
 | 
					2.18.0
 | 
				
			||||||
| 
						 | 
					@ -1,26 +0,0 @@
 | 
				
			||||||
This patch comes from upstream:
 | 
					 | 
				
			||||||
https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# HG changeset patch
 | 
					 | 
				
			||||||
# User Mike Miller <mtmiller@octave.org>
 | 
					 | 
				
			||||||
# Date 1527214835 25200
 | 
					 | 
				
			||||||
# Node ID cdaa884568b159549bd373f04386ff62417f6df9
 | 
					 | 
				
			||||||
# Parent  9e39a53b4e007d3f79f88b711ab9fa5f2f24fbc9
 | 
					 | 
				
			||||||
add Qt include needed to build against Qt 5.11 (bug #53978)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
* settings-dialog.cc: Add missing include for <QButtonGroup> to fix build
 | 
					 | 
				
			||||||
failure with Qt 5.11.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/libgui/src/settings-dialog.cc b/libgui/src/settings-dialog.cc
 | 
					 | 
				
			||||||
--- a/libgui/src/settings-dialog.cc
 | 
					 | 
				
			||||||
+++ b/libgui/src/settings-dialog.cc
 | 
					 | 
				
			||||||
@@ -34,6 +34,8 @@
 | 
					 | 
				
			||||||
 #include "workspace-model.h"
 | 
					 | 
				
			||||||
 #include "settings-dialog.h"
 | 
					 | 
				
			||||||
 #include "ui-settings-dialog.h"
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+#include <QButtonGroup>
 | 
					 | 
				
			||||||
 #include <QDir>
 | 
					 | 
				
			||||||
 #include <QFileInfo>
 | 
					 | 
				
			||||||
 #include <QFileDialog>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,63 +0,0 @@
 | 
				
			||||||
050cdb59839896b41431791f8ee0ef2564231b8f
 | 
					 | 
				
			||||||
Author:     Matthew Flatt <mflatt@racket-lang.org>
 | 
					 | 
				
			||||||
AuthorDate: Tue Mar 6 09:05:08 2018 -0700
 | 
					 | 
				
			||||||
Commit:     Matthew Flatt <mflatt@racket-lang.org>
 | 
					 | 
				
			||||||
CommitDate: Tue Mar 6 09:05:08 2018 -0700
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Parent:     efb9a919fc ffi docs: clarification on `unsafe-socket->port`
 | 
					 | 
				
			||||||
Containing: master
 | 
					 | 
				
			||||||
Follows:    v5.0.1 (21612)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
xform: avoid problems with `__signbitf128`
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Closes #1962 and uses the suggested patch there, among other changes.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
2 files changed, 6 insertions(+), 3 deletions(-)
 | 
					 | 
				
			||||||
racket/collects/compiler/private/xform.rkt | 2 +-
 | 
					 | 
				
			||||||
racket/src/racket/src/number.c             | 7 +++++--
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/racket/collects/compiler/private/xform.rkt b/racket/collects/compiler/private/xform.rkt
 | 
					 | 
				
			||||||
index 28a425c057..89ae848f9c 100644
 | 
					 | 
				
			||||||
--- a/collects/compiler/private/xform.rkt
 | 
					 | 
				
			||||||
+++ b/collects/compiler/private/xform.rkt
 | 
					 | 
				
			||||||
@@ -904,7 +904,7 @@
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
                strlen cos cosl sin sinl exp expl pow powl log logl sqrt sqrtl atan2 atan2l frexp
 | 
					 | 
				
			||||||
                isnan isinf fpclass signbit _signbit _fpclass __fpclassify __fpclassifyf __fpclassifyl
 | 
					 | 
				
			||||||
-	       _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl
 | 
					 | 
				
			||||||
+	       _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl __signbitf128
 | 
					 | 
				
			||||||
                __isinff __isinfl isnanf isinff __isinfd __isnanf __isnand __isinf __isinff128
 | 
					 | 
				
			||||||
                __inline_isnanl __inline_isnan __inline_signbit __inline_signbitf __inline_signbitd __inline_signbitl
 | 
					 | 
				
			||||||
                __builtin_popcount __builtin_clz __builtin_isnan __builtin_isinf __builtin_signbit
 | 
					 | 
				
			||||||
diff --git a/racket/src/racket/src/number.c b/racket/src/racket/src/number.c
 | 
					 | 
				
			||||||
index 71f42aaf3c..3bbad3ba83 100644
 | 
					 | 
				
			||||||
--- a/src/racket/src/number.c
 | 
					 | 
				
			||||||
+++ b/src/racket/src/number.c
 | 
					 | 
				
			||||||
@@ -1796,6 +1796,7 @@ double scheme_real_to_double(Scheme_Object *r)
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
 | 
					 | 
				
			||||||
+  XFORM_SKIP_PROC
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
 #ifdef MZ_IS_NEG_ZERO
 | 
					 | 
				
			||||||
   return MZ_IS_NEG_ZERO(d);
 | 
					 | 
				
			||||||
@@ -1809,7 +1810,9 @@ int scheme_minus_zero_p(double d)
 | 
					 | 
				
			||||||
   return minus_zero_p(d);
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-static int rational_dbl_p(double f) {
 | 
					 | 
				
			||||||
+XFORM_NONGCING static int rational_dbl_p(double f)
 | 
					 | 
				
			||||||
+  XFORM_SKIP_PROC
 | 
					 | 
				
			||||||
+{
 | 
					 | 
				
			||||||
   return !(MZ_IS_NAN(f)
 | 
					 | 
				
			||||||
            || MZ_IS_INFINITY(f));
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
@@ -1955,7 +1958,7 @@ real_p(int argc, Scheme_Object *argv[])
 | 
					 | 
				
			||||||
   return (SCHEME_REALP(o) ? scheme_true : scheme_false);
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-static int is_rational(const Scheme_Object *o)
 | 
					 | 
				
			||||||
+XFORM_NONGCING static int is_rational(const Scheme_Object *o)
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
   if (SCHEME_FLOATP(o))
 | 
					 | 
				
			||||||
     return rational_dbl_p(SCHEME_FLOAT_VAL(o));
 | 
					 | 
				
			||||||
| 
						 | 
					@ -7,19 +7,23 @@ because the store is immutable.  This patch makes Racket ignore
 | 
				
			||||||
checksums for files in the store.
 | 
					checksums for files in the store.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
See <https://debbugs.gnu.org/30680> for details.
 | 
					See <https://debbugs.gnu.org/30680> for details.
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					 collects/compiler/private/cm-minimal.rkt | 8 +++++++-
 | 
				
			||||||
 | 
					 1 file changed, 7 insertions(+), 1 deletion(-)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
diff -ruN racket-6.12/collects/compiler/cm.rkt racket-6.12-patched/collects/compiler/cm.rkt
 | 
					diff --git a/collects/compiler/private/cm-minimal.rkt b/collects/compiler/private/cm-minimal.rkt
 | 
				
			||||||
--- racket-6.12/collects/compiler/cm.rkt	1969-12-31 19:00:00.000000000 -0500
 | 
					index a5a5407..15af6b8 100644
 | 
				
			||||||
+++ racket-6.12-patched/collects/compiler/cm.rkt	2018-08-12 06:36:46.061142149 -0400
 | 
					--- a/collects/compiler/private/cm-minimal.rkt
 | 
				
			||||||
 | 
					+++ b/collects/compiler/private/cm-minimal.rkt
 | 
				
			||||||
@@ -7,6 +7,7 @@
 | 
					@@ -7,6 +7,7 @@
 | 
				
			||||||
          racket/list
 | 
					          racket/list
 | 
				
			||||||
          racket/path
 | 
					          racket/path
 | 
				
			||||||
          racket/promise
 | 
					          racket/promise
 | 
				
			||||||
+         racket/string
 | 
					+         racket/string
 | 
				
			||||||
          openssl/sha1
 | 
					          openssl/sha1
 | 
				
			||||||
          racket/place
 | 
					 | 
				
			||||||
          setup/collects
 | 
					          setup/collects
 | 
				
			||||||
@@ -627,6 +628,10 @@
 | 
					          compiler/compilation-path
 | 
				
			||||||
 | 
					@@ -543,6 +544,10 @@
 | 
				
			||||||
       #f
 | 
					       #f
 | 
				
			||||||
       (list src-hash recorded-hash)))
 | 
					       (list src-hash recorded-hash)))
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
| 
						 | 
					@ -30,7 +34,7 @@ diff -ruN racket-6.12/collects/compiler/cm.rkt racket-6.12-patched/collects/comp
 | 
				
			||||||
 (define (rkt->ss p)
 | 
					 (define (rkt->ss p)
 | 
				
			||||||
   (if (path-has-extension? p #".rkt")
 | 
					   (if (path-has-extension? p #".rkt")
 | 
				
			||||||
       (path-replace-extension p #".ss")
 | 
					       (path-replace-extension p #".ss")
 | 
				
			||||||
@@ -679,7 +684,8 @@
 | 
					@@ -595,7 +600,8 @@
 | 
				
			||||||
               (trace-printf "newer src... ~a > ~a" path-time path-zo-time)
 | 
					               (trace-printf "newer src... ~a > ~a" path-time path-zo-time)
 | 
				
			||||||
               ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
 | 
					               ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
 | 
				
			||||||
               (maybe-compile-zo sha1-only? deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen)]
 | 
					               (maybe-compile-zo sha1-only? deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen)]
 | 
				
			||||||
| 
						 | 
					@ -40,3 +44,6 @@ diff -ruN racket-6.12/collects/compiler/cm.rkt racket-6.12-patched/collects/comp
 | 
				
			||||||
               => (lambda (difference)
 | 
					               => (lambda (difference)
 | 
				
			||||||
                    (trace-printf "different src hash... ~a" difference)
 | 
					                    (trace-printf "different src hash... ~a" difference)
 | 
				
			||||||
                    ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
 | 
					                    ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
 | 
				
			||||||
 | 
					-- 
 | 
				
			||||||
 | 
					2.18.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5305,7 +5305,7 @@ from Moose::Conflicts and moose-outdated.")
 | 
				
			||||||
(define-public perl-module-scandeps
 | 
					(define-public perl-module-scandeps
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "perl-module-scandeps")
 | 
					    (name "perl-module-scandeps")
 | 
				
			||||||
    (version "1.24")
 | 
					    (version "1.25")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -5313,7 +5313,7 @@ from Moose::Conflicts and moose-outdated.")
 | 
				
			||||||
                           "Module-ScanDeps-" version ".tar.gz"))
 | 
					                           "Module-ScanDeps-" version ".tar.gz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0s6cj90ckhy351gql52ksh4ms1x8piv26iadl09fcpzkx7j0srw9"))))
 | 
					         "13280nq0d6zc58mcz3kvs2m85a741czq0fabk69ks1nr4j1w2nl4"))))
 | 
				
			||||||
    (build-system perl-build-system)
 | 
					    (build-system perl-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("perl-test-requires" ,perl-test-requires)))
 | 
					     `(("perl-test-requires" ,perl-test-requires)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -194,7 +194,15 @@ colors, styles, options and details.")
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("gs" ,ghostscript)              ;For tests
 | 
					     `(("gs" ,ghostscript)              ;For tests
 | 
				
			||||||
       ("texinfo" ,texinfo)             ;For generating documentation
 | 
					       ("texinfo" ,texinfo)             ;For generating documentation
 | 
				
			||||||
       ("texlive" ,texlive)             ;For tests and documentation
 | 
					       ;; For the manual and the tests.
 | 
				
			||||||
 | 
					       ("texlive" ,(texlive-union (list texlive-fonts-amsfonts
 | 
				
			||||||
 | 
					                                        texlive-generic-ifxetex
 | 
				
			||||||
 | 
					                                        texlive-latex-amsfonts
 | 
				
			||||||
 | 
					                                        texlive-latex-geometry
 | 
				
			||||||
 | 
					                                        texlive-latex-graphics
 | 
				
			||||||
 | 
					                                        texlive-latex-oberdiek
 | 
				
			||||||
 | 
					                                        texlive-latex-parskip
 | 
				
			||||||
 | 
					                                        texlive-tex-texinfo)))
 | 
				
			||||||
       ("emacs" ,emacs-minimal)
 | 
					       ("emacs" ,emacs-minimal)
 | 
				
			||||||
       ("perl" ,perl)))
 | 
					       ("perl" ,perl)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					@ -234,6 +242,12 @@ colors, styles, options and details.")
 | 
				
			||||||
           ;; "failed to create directory /homeless-shelter/.asy" error.
 | 
					           ;; "failed to create directory /homeless-shelter/.asy" error.
 | 
				
			||||||
           (lambda _
 | 
					           (lambda _
 | 
				
			||||||
             (setenv "HOME" "/tmp")
 | 
					             (setenv "HOME" "/tmp")
 | 
				
			||||||
 | 
					             ;; The "gs" test fails, complaining about an incompatible
 | 
				
			||||||
 | 
					             ;; Ghostscript version.  Not sure what's going on...  Is this
 | 
				
			||||||
 | 
					             ;; because I've just replaced texlive with texlive-union?
 | 
				
			||||||
 | 
					             (substitute* "tests/Makefile"
 | 
				
			||||||
 | 
					               (("^(TESTDIRS =.*) gs(.*)" begin end)
 | 
				
			||||||
 | 
					                (string-append begin " " end)))
 | 
				
			||||||
             #t))
 | 
					             #t))
 | 
				
			||||||
         (add-after 'install 'install-Emacs-data
 | 
					         (add-after 'install 'install-Emacs-data
 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					           (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -216,7 +216,9 @@ This package provides a Python interface for BLAKE2.")
 | 
				
			||||||
     `(;; FIXME: Tests require many unpackaged libraries, see dev-requirements.txt.
 | 
					     `(;; FIXME: Tests require many unpackaged libraries, see dev-requirements.txt.
 | 
				
			||||||
       #:tests? #f))
 | 
					       #:tests? #f))
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("python-pyasn1" ,python-pyasn1)
 | 
					     `(("python-bcrypt" ,python-bcrypt)
 | 
				
			||||||
 | 
					       ("python-pyasn1" ,python-pyasn1)
 | 
				
			||||||
 | 
					       ("python-pynacl" ,python-pynacl)
 | 
				
			||||||
       ("python-cryptography" ,python-cryptography)))
 | 
					       ("python-cryptography" ,python-cryptography)))
 | 
				
			||||||
    (home-page "http://www.paramiko.org/")
 | 
					    (home-page "http://www.paramiko.org/")
 | 
				
			||||||
    (synopsis "SSHv2 protocol library")
 | 
					    (synopsis "SSHv2 protocol library")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1765,7 +1765,7 @@ matching them against a list of media-ranges.")
 | 
				
			||||||
     ;; Expected '/tmp/guix-build-python-py-1.4.31.drv-0/py-1.4.31/py'.
 | 
					     ;; Expected '/tmp/guix-build-python-py-1.4.31.drv-0/py-1.4.31/py'.
 | 
				
			||||||
     ;; Is this module globally installed?"
 | 
					     ;; Is this module globally installed?"
 | 
				
			||||||
     '(#:tests? #f))
 | 
					     '(#:tests? #f))
 | 
				
			||||||
    (home-page "http://pylib.readthedocs.io/")
 | 
					    (home-page "https://pylib.readthedocs.io/")
 | 
				
			||||||
    (synopsis "Python library for parsing, I/O, instrospection, and logging")
 | 
					    (synopsis "Python library for parsing, I/O, instrospection, and logging")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "Py is a Python library for file name parsing, .ini file parsing, I/O,
 | 
					     "Py is a Python library for file name parsing, .ini file parsing, I/O,
 | 
				
			||||||
| 
						 | 
					@ -3669,14 +3669,14 @@ operators such as union, intersection, and difference.")
 | 
				
			||||||
(define-public python-rpy2
 | 
					(define-public python-rpy2
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "python-rpy2")
 | 
					    (name "python-rpy2")
 | 
				
			||||||
    (version "2.9.0")
 | 
					    (version "2.9.4")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (pypi-uri "rpy2" version))
 | 
					       (uri (pypi-uri "rpy2" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0bqihjrdqwj5r1h86shvfb1p5hfr4a6klv1v54bzfr9r144w3rni"))))
 | 
					         "0bl1d2qhavmlrvalir9hmkjh74w21vzkvc2sg3cbb162s10zfmxy"))))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:modules ((ice-9 ftw)
 | 
					     '(#:modules ((ice-9 ftw)
 | 
				
			||||||
| 
						 | 
					@ -3686,14 +3686,6 @@ operators such as union, intersection, and difference.")
 | 
				
			||||||
                  (guix build python-build-system))
 | 
					                  (guix build python-build-system))
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         ;; Without this phase the test loader cannot find the directories, in
 | 
					 | 
				
			||||||
         ;; which it is supposed to look for test files.
 | 
					 | 
				
			||||||
         (add-after 'unpack 'fix-tests
 | 
					 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					 | 
				
			||||||
             (substitute* "rpy/tests.py"
 | 
					 | 
				
			||||||
               (("loader.discover\\(")
 | 
					 | 
				
			||||||
                "loader.discover(rpy_root + '/' +"))
 | 
					 | 
				
			||||||
             #t))
 | 
					 | 
				
			||||||
         (replace 'check
 | 
					         (replace 'check
 | 
				
			||||||
           (lambda* (#:key outputs inputs #:allow-other-keys)
 | 
					           (lambda* (#:key outputs inputs #:allow-other-keys)
 | 
				
			||||||
             (let ((cwd (getcwd)))
 | 
					             (let ((cwd (getcwd)))
 | 
				
			||||||
| 
						 | 
					@ -3703,8 +3695,7 @@ operators such as union, intersection, and difference.")
 | 
				
			||||||
                                            (scandir (string-append cwd "/build")))
 | 
					                                            (scandir (string-append cwd "/build")))
 | 
				
			||||||
                                      ":"
 | 
					                                      ":"
 | 
				
			||||||
                                      (getenv "PYTHONPATH"))))
 | 
					                                      (getenv "PYTHONPATH"))))
 | 
				
			||||||
             ;; FIXME: Even when all tests pass, the check phase will fail.
 | 
					             (invoke "python" "-m" "rpy2.tests" "-v"))))))
 | 
				
			||||||
             (system* "python" "-m" "rpy2.tests" "-v"))))))
 | 
					 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("python-six" ,python-six)
 | 
					     `(("python-six" ,python-six)
 | 
				
			||||||
       ("python-jinja2" ,python-jinja2)
 | 
					       ("python-jinja2" ,python-jinja2)
 | 
				
			||||||
| 
						 | 
					@ -3722,7 +3713,7 @@ operators such as union, intersection, and difference.")
 | 
				
			||||||
       ("python-numpy" ,python-numpy)))
 | 
					       ("python-numpy" ,python-numpy)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("zlib" ,zlib)))
 | 
					     `(("zlib" ,zlib)))
 | 
				
			||||||
    (home-page "http://rpy.sourceforge.net/")
 | 
					    (home-page "https://rpy2.bitbucket.io/")
 | 
				
			||||||
    (synopsis "Python interface to the R language")
 | 
					    (synopsis "Python interface to the R language")
 | 
				
			||||||
    (description "rpy2 is a redesign and rewrite of rpy.  It is providing a
 | 
					    (description "rpy2 is a redesign and rewrite of rpy.  It is providing a
 | 
				
			||||||
low-level interface to R from Python, a proposed high-level interface,
 | 
					low-level interface to R from Python, a proposed high-level interface,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,6 +65,7 @@
 | 
				
			||||||
  #:use-module (gnu packages xorg)
 | 
					  #:use-module (gnu packages xorg)
 | 
				
			||||||
  #:use-module (gnu packages tls)
 | 
					  #:use-module (gnu packages tls)
 | 
				
			||||||
  #:use-module (gnu packages gl)
 | 
					  #:use-module (gnu packages gl)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages libedit)
 | 
				
			||||||
  #:use-module (ice-9 match))
 | 
					  #:use-module (ice-9 match))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (mit-scheme-source-directory system version)
 | 
					(define (mit-scheme-source-directory system version)
 | 
				
			||||||
| 
						 | 
					@ -104,6 +105,10 @@
 | 
				
			||||||
                               (find-files "src/compiler" "^make\\.")))
 | 
					                               (find-files "src/compiler" "^make\\.")))
 | 
				
			||||||
             (chdir "src")
 | 
					             (chdir "src")
 | 
				
			||||||
             #t))
 | 
					             #t))
 | 
				
			||||||
 | 
					         ;; FIXME: the texlive-union insists on regenerating fonts.  It stores
 | 
				
			||||||
 | 
					         ;; them in HOME, so it needs to be writeable.
 | 
				
			||||||
 | 
					         (add-before 'build 'set-HOME
 | 
				
			||||||
 | 
					           (lambda _ (setenv "HOME" "/tmp") #t))
 | 
				
			||||||
         (replace 'build
 | 
					         (replace 'build
 | 
				
			||||||
           (lambda* (#:key system outputs #:allow-other-keys)
 | 
					           (lambda* (#:key system outputs #:allow-other-keys)
 | 
				
			||||||
             (let ((out (assoc-ref outputs "out")))
 | 
					             (let ((out (assoc-ref outputs "out")))
 | 
				
			||||||
| 
						 | 
					@ -150,7 +155,7 @@
 | 
				
			||||||
               (delete-file-recursively old-doc-dir)
 | 
					               (delete-file-recursively old-doc-dir)
 | 
				
			||||||
               #t))))))
 | 
					               #t))))))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("texlive" ,texlive)
 | 
					     `(("texlive" ,(texlive-union (list texlive-tex-texinfo)))
 | 
				
			||||||
       ("texinfo" ,texinfo)
 | 
					       ("texinfo" ,texinfo)
 | 
				
			||||||
       ("m4" ,m4)))
 | 
					       ("m4" ,m4)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					@ -407,7 +412,7 @@ implementation techniques and as an expository tool.")
 | 
				
			||||||
(define-public racket
 | 
					(define-public racket
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "racket")
 | 
					    (name "racket")
 | 
				
			||||||
    (version "6.12")
 | 
					    (version "7.0")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (list (string-append "http://mirror.racket-lang.org/installers/"
 | 
					              (uri (list (string-append "http://mirror.racket-lang.org/installers/"
 | 
				
			||||||
| 
						 | 
					@ -417,11 +422,8 @@ implementation techniques and as an expository tool.")
 | 
				
			||||||
                          version "/racket-" version "-src.tgz")))
 | 
					                          version "/racket-" version "-src.tgz")))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
               "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"))
 | 
					                "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"))
 | 
				
			||||||
              (patches (search-patches
 | 
					              (patches (search-patches
 | 
				
			||||||
                       ;; See: https://github.com/racket/racket/issues/1962
 | 
					 | 
				
			||||||
                       ;; This can be removed in whatever Racket release comes after 6.12
 | 
					 | 
				
			||||||
                       "racket-fix-xform-issue.patch"
 | 
					 | 
				
			||||||
                        "racket-store-checksum-override.patch"))))
 | 
					                        "racket-store-checksum-override.patch"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
| 
						 | 
					@ -485,7 +487,9 @@ implementation techniques and as an expository tool.")
 | 
				
			||||||
                  ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt"
 | 
					                  ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt"
 | 
				
			||||||
                   ("libGL"))
 | 
					                   ("libGL"))
 | 
				
			||||||
                  ("share/pkgs/sgl/gl.rkt"
 | 
					                  ("share/pkgs/sgl/gl.rkt"
 | 
				
			||||||
                   ("libGL" "libGLU")))))
 | 
					                   ("libGL" "libGLU"))
 | 
				
			||||||
 | 
					                  ("share/pkgs/readline-lib/readline/rktrl.rkt"
 | 
				
			||||||
 | 
					                   ("libedit")))))
 | 
				
			||||||
             (chdir "src")
 | 
					             (chdir "src")
 | 
				
			||||||
             #t))
 | 
					             #t))
 | 
				
			||||||
         (add-after 'unpack 'patch-/bin/sh
 | 
					         (add-after 'unpack 'patch-/bin/sh
 | 
				
			||||||
| 
						 | 
					@ -513,7 +517,8 @@ implementation techniques and as an expository tool.")
 | 
				
			||||||
       ("openssl" ,openssl)
 | 
					       ("openssl" ,openssl)
 | 
				
			||||||
       ("pango" ,pango)
 | 
					       ("pango" ,pango)
 | 
				
			||||||
       ("sqlite" ,sqlite)
 | 
					       ("sqlite" ,sqlite)
 | 
				
			||||||
       ("unixodbc" ,unixodbc)))
 | 
					       ("unixodbc" ,unixodbc)
 | 
				
			||||||
 | 
					       ("libedit" ,libedit)))
 | 
				
			||||||
    (home-page "http://racket-lang.org")
 | 
					    (home-page "http://racket-lang.org")
 | 
				
			||||||
    (synopsis "Implementation of Scheme and related languages")
 | 
					    (synopsis "Implementation of Scheme and related languages")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -649,14 +649,14 @@ Shell (pdksh).")
 | 
				
			||||||
(define-public oil-shell
 | 
					(define-public oil-shell
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "oil-shell")
 | 
					    (name "oil-shell")
 | 
				
			||||||
    (version "0.4.0")
 | 
					    (version "0.5.0")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://www.oilshell.org/download/oil-"
 | 
					              (uri (string-append "https://www.oilshell.org/download/oil-"
 | 
				
			||||||
                                  version ".tar.xz"))
 | 
					                                  version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0ca68n46mhibarpfinqfkim6p3xmbz5rrpl4qr3sj9y0q6wm7sa2"))))
 | 
					                "03zc7rhhpl0cybng2i3c33pky1knsnyvn526bn91hg6w4znvn66w"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:tests? #f ; the tests are not distributed in the tarballs
 | 
					     '(#:tests? #f ; the tests are not distributed in the tarballs
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -153,6 +153,7 @@ a server that supports the SSH-2 protocol.")
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (string-append "mirror://openbsd/OpenSSH/portable/"
 | 
					             (uri (string-append "mirror://openbsd/OpenSSH/portable/"
 | 
				
			||||||
                                 name "-" version ".tar.gz"))
 | 
					                                 name "-" version ".tar.gz"))
 | 
				
			||||||
 | 
					             (patches (search-patches "openssh-CVE-2018-15473.patch"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"))))
 | 
					               "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"))))
 | 
				
			||||||
| 
						 | 
					@ -237,7 +238,7 @@ Additionally, various channel-specific options can be negotiated.")
 | 
				
			||||||
(define-public guile-ssh
 | 
					(define-public guile-ssh
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "guile-ssh")
 | 
					    (name "guile-ssh")
 | 
				
			||||||
    (version "0.11.2")
 | 
					    (version "0.11.3")
 | 
				
			||||||
    (home-page "https://github.com/artyom-poptsov/guile-ssh")
 | 
					    (home-page "https://github.com/artyom-poptsov/guile-ssh")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              ;; ftp://memory-heap.org/software/guile-ssh/guile-ssh-VERSION.tar.gz
 | 
					              ;; ftp://memory-heap.org/software/guile-ssh/guile-ssh-VERSION.tar.gz
 | 
				
			||||||
| 
						 | 
					@ -249,11 +250,14 @@ Additionally, various channel-specific options can be negotiated.")
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1w0k5s09xj5xycb7lbp5b7rm0xncclms3jwl98lwj8fxwngi1s90"))))
 | 
					                "1g2jzcg1p25zrkx06j160qb8bgcwa3001ys4q02496xs61pvywqk"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (outputs '("out" "debug"))
 | 
					    (outputs '("out" "debug"))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:phases (modify-phases %standard-phases
 | 
					     '(;; It makes no sense to build libguile-ssh.a.
 | 
				
			||||||
 | 
					       #:configure-flags '("--disable-static")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					       #:phases (modify-phases %standard-phases
 | 
				
			||||||
                  (add-after 'unpack 'autoreconf
 | 
					                  (add-after 'unpack 'autoreconf
 | 
				
			||||||
                    (lambda* (#:key inputs #:allow-other-keys)
 | 
					                    (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
                      (invoke "autoreconf" "-vfi")))
 | 
					                      (invoke "autoreconf" "-vfi")))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -423,14 +423,14 @@ code for possible problems.")
 | 
				
			||||||
(define-public r-foreign
 | 
					(define-public r-foreign
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-foreign")
 | 
					    (name "r-foreign")
 | 
				
			||||||
    (version "0.8-70")
 | 
					    (version "0.8-71")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "foreign" version))
 | 
					       (uri (cran-uri "foreign" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "11mql8q3i1q593dvd351fhvkvfab25li80d1ahl4xjjzy52qdkc6"))))
 | 
					         "1mv04w3ycz0ymsszn8aa87k6k5sb8mg8lhf1b8w4zpfrphpkkliv"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (home-page "https://cran.r-project.org/web/packages/foreign")
 | 
					    (home-page "https://cran.r-project.org/web/packages/foreign")
 | 
				
			||||||
    (synopsis "Read data stored by other statistics software")
 | 
					    (synopsis "Read data stored by other statistics software")
 | 
				
			||||||
| 
						 | 
					@ -614,14 +614,14 @@ analysis.")
 | 
				
			||||||
(define-public r-survival
 | 
					(define-public r-survival
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-survival")
 | 
					    (name "r-survival")
 | 
				
			||||||
    (version "2.42-3")
 | 
					    (version "2.42-6")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "survival" version))
 | 
					       (uri (cran-uri "survival" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "15pasbfzmg2r5bfpsadp9ia4cpybqz6n1kwm7ma02ykzf7bk4xx0"))))
 | 
					         "1bsxc2fir9pbvdzy9n474fkl7har606h9zhspp0z67wnjpp48g73"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-matrix" ,r-matrix)))
 | 
					     `(("r-matrix" ,r-matrix)))
 | 
				
			||||||
| 
						 | 
					@ -1577,13 +1577,13 @@ defined in different packages.")
 | 
				
			||||||
(define-public r-rlang
 | 
					(define-public r-rlang
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-rlang")
 | 
					    (name "r-rlang")
 | 
				
			||||||
    (version "0.2.1")
 | 
					    (version "0.2.2")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (cran-uri "rlang" version))
 | 
					              (uri (cran-uri "rlang" version))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0ghg66vyri8nck4p6kl1nh47qdppbmxvjiyms69nhvipphk4ifpj"))))
 | 
					                "0cqd894wzi53rs53prg0j7i75h0yzgi0127fzjqbdbhczwh984f9"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (home-page "http://rlang.tidyverse.org")
 | 
					    (home-page "http://rlang.tidyverse.org")
 | 
				
			||||||
    (synopsis "Functions for base types, core R and Tidyverse features")
 | 
					    (synopsis "Functions for base types, core R and Tidyverse features")
 | 
				
			||||||
| 
						 | 
					@ -2265,14 +2265,14 @@ collation, and NAMESPACE files.")
 | 
				
			||||||
(define-public r-openssl
 | 
					(define-public r-openssl
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-openssl")
 | 
					    (name "r-openssl")
 | 
				
			||||||
    (version "1.0.1")
 | 
					    (version "1.0.2")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "openssl" version))
 | 
					       (uri (cran-uri "openssl" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "1qyql5gpwf88bkm1qarjhbqbq4hn6w0d8j4pxb5x7i96is30ap30"))))
 | 
					         "1djfpnphkcxx8idk5rjfzg8r8dnqsgc0shh2pw8lns5hap2wc5rc"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("libressl" ,libressl)))
 | 
					     `(("libressl" ,libressl)))
 | 
				
			||||||
| 
						 | 
					@ -2687,13 +2687,13 @@ and draw tables.")
 | 
				
			||||||
(define-public r-pkgconfig
 | 
					(define-public r-pkgconfig
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-pkgconfig")
 | 
					    (name "r-pkgconfig")
 | 
				
			||||||
    (version "2.0.1")
 | 
					    (version "2.0.2")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (cran-uri "pkgconfig" version))
 | 
					              (uri (cran-uri "pkgconfig" version))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"))))
 | 
					                "1jk9ip549xphb3anfixqv1yx5kidnndqgy9v3qjpmgmds5a7g695"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (home-page "https://github.com/gaborcsardi/pkgconfig")
 | 
					    (home-page "https://github.com/gaborcsardi/pkgconfig")
 | 
				
			||||||
    (synopsis "Private configuration for R packages")
 | 
					    (synopsis "Private configuration for R packages")
 | 
				
			||||||
| 
						 | 
					@ -2986,14 +2986,14 @@ standard R subsetting and Kronecker products.")
 | 
				
			||||||
(define-public r-iterators
 | 
					(define-public r-iterators
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-iterators")
 | 
					    (name "r-iterators")
 | 
				
			||||||
    (version "1.0.9")
 | 
					    (version "1.0.10")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "iterators" version))
 | 
					       (uri (cran-uri "iterators" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"))))
 | 
					         "1s3iykfvccpnzs73z90rx18qvbvgw2dgl4nfcrvm5m1850qb5qd9"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (home-page "https://cran.r-project.org/web/packages/iterators")
 | 
					    (home-page "https://cran.r-project.org/web/packages/iterators")
 | 
				
			||||||
    (synopsis "Iterator construct for R")
 | 
					    (synopsis "Iterator construct for R")
 | 
				
			||||||
| 
						 | 
					@ -4607,14 +4607,14 @@ original public code has been corrected.")
 | 
				
			||||||
(define-public r-modeltools
 | 
					(define-public r-modeltools
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-modeltools")
 | 
					    (name "r-modeltools")
 | 
				
			||||||
    (version "0.2-21")
 | 
					    (version "0.2-22")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "modeltools" version))
 | 
					       (uri (cran-uri "modeltools" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"))))
 | 
					         "1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (home-page "https://cran.r-project.org/web/packages/modeltools")
 | 
					    (home-page "https://cran.r-project.org/web/packages/modeltools")
 | 
				
			||||||
    (synopsis "Tools and classes for statistical models")
 | 
					    (synopsis "Tools and classes for statistical models")
 | 
				
			||||||
| 
						 | 
					@ -4653,14 +4653,14 @@ models, generalized linear models and model-based clustering.")
 | 
				
			||||||
(define-public r-mclust
 | 
					(define-public r-mclust
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-mclust")
 | 
					    (name "r-mclust")
 | 
				
			||||||
    (version "5.4")
 | 
					    (version "5.4.1")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "mclust" version))
 | 
					       (uri (cran-uri "mclust" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "1i3v1q8qq0al3ifvjhcvxfsg68cx9mq8jz67jwmiqai78mw0aqvk"))))
 | 
					         "1vcl4nl8by2vj2k9k84imy5m850khkgd8q02a8ica1h8vz9ijgn4"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("gfortran" ,gfortran)))
 | 
					     `(("gfortran" ,gfortran)))
 | 
				
			||||||
| 
						 | 
					@ -4872,14 +4872,14 @@ of the points.")
 | 
				
			||||||
(define-public r-fpc
 | 
					(define-public r-fpc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-fpc")
 | 
					    (name "r-fpc")
 | 
				
			||||||
    (version "2.1-11")
 | 
					    (version "2.1-11.1")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "fpc" version))
 | 
					       (uri (cran-uri "fpc" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "04alsqb5gbhsjg1000d8w52pmpnlwca29r0s12f7n7mdccdv6xar"))))
 | 
					         "1ari57hkgqsxh6khr6j52cfrzc0096cnn1q7ghxk2z4brdd4rznc"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("r-class" ,r-class)
 | 
					     `(("r-class" ,r-class)
 | 
				
			||||||
| 
						 | 
					@ -4906,14 +4906,14 @@ groupings.")
 | 
				
			||||||
(define-public r-vgam
 | 
					(define-public r-vgam
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-vgam")
 | 
					    (name "r-vgam")
 | 
				
			||||||
    (version "1.0-5")
 | 
					    (version "1.0-6")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "VGAM" version))
 | 
					       (uri (cran-uri "VGAM" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0ik3wyv6jj54bg34z0fzzk4xg0h6x98jqx4q2r7g1f0in0qgbb01"))))
 | 
					         "1fg31xz86jblqraifiy3q36d0hjqnll01jxx85xq87j1cyhj060j"))))
 | 
				
			||||||
    (properties `((upstream-name . "VGAM")))
 | 
					    (properties `((upstream-name . "VGAM")))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					@ -5097,14 +5097,14 @@ algorithms.")
 | 
				
			||||||
(define-public r-lme4
 | 
					(define-public r-lme4
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "r-lme4")
 | 
					    (name "r-lme4")
 | 
				
			||||||
    (version "1.1-17")
 | 
					    (version "1.1-18-1")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (cran-uri "lme4" version))
 | 
					       (uri (cran-uri "lme4" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x"))))
 | 
					         "01ar4fak8zj7c1vmh9m576wchxj5qzpfqn637s7fh3fl6cpz0alq"))))
 | 
				
			||||||
    (build-system r-build-system)
 | 
					    (build-system r-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("r-rcpp" ,r-rcpp)
 | 
					     `(("r-rcpp" ,r-rcpp)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,12 +65,12 @@
 | 
				
			||||||
         (replace 'build
 | 
					         (replace 'build
 | 
				
			||||||
           (lambda* (#:key inputs #:allow-other-keys)
 | 
					           (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
             (with-directory-excursion "src/github.com/syncthing/syncthing"
 | 
					             (with-directory-excursion "src/github.com/syncthing/syncthing"
 | 
				
			||||||
               (zero? (system* "go" "run" "build.go" "-no-upgrade")))))
 | 
					               (invoke "go" "run" "build.go" "-no-upgrade"))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
         (replace 'check
 | 
					         (replace 'check
 | 
				
			||||||
           (lambda _
 | 
					           (lambda _
 | 
				
			||||||
             (with-directory-excursion "src/github.com/syncthing/syncthing"
 | 
					             (with-directory-excursion "src/github.com/syncthing/syncthing"
 | 
				
			||||||
               (zero? (system* "go" "run" "build.go" "test")))))
 | 
					               (invoke "go" "run" "build.go" "test"))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
         (replace 'install
 | 
					         (replace 'install
 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					           (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1005,12 +1005,13 @@ book).")
 | 
				
			||||||
                         '("dviluatex" "dvilualatex" "luatex" "lualatex"))
 | 
					                         '("dviluatex" "dvilualatex" "luatex" "lualatex"))
 | 
				
			||||||
               #t))
 | 
					               #t))
 | 
				
			||||||
           (replace 'install
 | 
					           (replace 'install
 | 
				
			||||||
             (lambda* (#:key outputs #:allow-other-keys)
 | 
					             (lambda* (#:key inputs outputs #:allow-other-keys)
 | 
				
			||||||
               (let* ((out (assoc-ref outputs "out"))
 | 
					               (let* ((out (assoc-ref outputs "out"))
 | 
				
			||||||
                      (target (string-append
 | 
					                      (target (string-append
 | 
				
			||||||
                               out "/share/texmf-dist/tex/latex/base"))
 | 
					                               out "/share/texmf-dist/tex/latex/base"))
 | 
				
			||||||
                      (web2c (string-append
 | 
					                      (web2c (string-append
 | 
				
			||||||
                              out "/share/texmf-dist/web2c")))
 | 
					                              out "/share/texmf-dist/web2c"))
 | 
				
			||||||
 | 
					                      (support-files (assoc-ref inputs "texlive-latex-base-support-files")))
 | 
				
			||||||
                 (mkdir-p target)
 | 
					                 (mkdir-p target)
 | 
				
			||||||
                 (mkdir-p web2c)
 | 
					                 (mkdir-p web2c)
 | 
				
			||||||
                 (for-each delete-file (find-files "." "\\.(log|aux)$"))
 | 
					                 (for-each delete-file (find-files "." "\\.(log|aux)$"))
 | 
				
			||||||
| 
						 | 
					@ -1022,6 +1023,14 @@ book).")
 | 
				
			||||||
                 ;; doesn't have its own format file, we need to copy it.
 | 
					                 ;; doesn't have its own format file, we need to copy it.
 | 
				
			||||||
                 (copy-file "web2c/pdfetex.fmt"
 | 
					                 (copy-file "web2c/pdfetex.fmt"
 | 
				
			||||||
                            (string-append web2c "/pdftex.fmt"))
 | 
					                            (string-append web2c "/pdftex.fmt"))
 | 
				
			||||||
 | 
					                 ;; "source" is missing the support files as per doc/latex/base/manifest.txt.
 | 
				
			||||||
 | 
					                 ;; FIXME: We are probably not packaging this right.
 | 
				
			||||||
 | 
					                 (for-each (lambda (file)
 | 
				
			||||||
 | 
					                             (install-file
 | 
				
			||||||
 | 
					                              (string-append support-files "/" file)
 | 
				
			||||||
 | 
					                              target))
 | 
				
			||||||
 | 
					                           '("ltxguide.cls" "ltnews.cls" "minimal.cls" "idx.tex"
 | 
				
			||||||
 | 
					                             "lablst.tex" "testpage.tex" "ltxcheck.tex"))
 | 
				
			||||||
                 #t))))))
 | 
					                 #t))))))
 | 
				
			||||||
      (native-inputs
 | 
					      (native-inputs
 | 
				
			||||||
       `(("texlive-bin" ,texlive-bin)
 | 
					       `(("texlive-bin" ,texlive-bin)
 | 
				
			||||||
| 
						 | 
					@ -1044,6 +1053,18 @@ book).")
 | 
				
			||||||
         ("texlive-generic-config"
 | 
					         ("texlive-generic-config"
 | 
				
			||||||
          ,(texlive-dir "tex/generic/config/"
 | 
					          ,(texlive-dir "tex/generic/config/"
 | 
				
			||||||
                        "19vj088p4kkp6xll0141m4kl6ssgdzhs3g10i232khb07aqiag8s"))
 | 
					                        "19vj088p4kkp6xll0141m4kl6ssgdzhs3g10i232khb07aqiag8s"))
 | 
				
			||||||
 | 
					         ("texlive-latex-base-support-files"
 | 
				
			||||||
 | 
					          ,(origin
 | 
				
			||||||
 | 
					             (method svn-fetch)
 | 
				
			||||||
 | 
					             (uri (svn-reference
 | 
				
			||||||
 | 
					                   (url (string-append "svn://www.tug.org/texlive/tags/"
 | 
				
			||||||
 | 
					                                       %texlive-tag "/Master/texmf-dist/"
 | 
				
			||||||
 | 
					                                       "/tex/latex/base"))
 | 
				
			||||||
 | 
					                   (revision %texlive-revision)))
 | 
				
			||||||
 | 
					             (file-name (string-append name "-" version "-checkout"))
 | 
				
			||||||
 | 
					             (sha256
 | 
				
			||||||
 | 
					              (base32
 | 
				
			||||||
 | 
					               "16bs9pi3nq407xhg59glklqv43v102cg3yim6k3zcri5d9nkbv3a"))))
 | 
				
			||||||
         ("texlive-tex-plain" ,texlive-tex-plain)
 | 
					         ("texlive-tex-plain" ,texlive-tex-plain)
 | 
				
			||||||
         ("texlive-fonts-cm" ,texlive-fonts-cm)
 | 
					         ("texlive-fonts-cm" ,texlive-fonts-cm)
 | 
				
			||||||
         ("texlive-fonts-latex" ,texlive-fonts-latex)
 | 
					         ("texlive-fonts-latex" ,texlive-fonts-latex)
 | 
				
			||||||
| 
						 | 
					@ -4386,3 +4407,88 @@ cross-references, bibliographies, indexes, etc.  It is very good for working
 | 
				
			||||||
with documents of any length in which the usual processing abilities are
 | 
					with documents of any length in which the usual processing abilities are
 | 
				
			||||||
required: automatic sectioning and pagination, spell checking and so forth.")
 | 
					required: automatic sectioning and pagination, spell checking and so forth.")
 | 
				
			||||||
    (license license:gpl2+)))
 | 
					    (license license:gpl2+)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public texlive-latex-media9
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "texlive-latex-media9")
 | 
				
			||||||
 | 
					    (version (number->string %texlive-revision))
 | 
				
			||||||
 | 
					    (source (origin
 | 
				
			||||||
 | 
					              (method svn-fetch)
 | 
				
			||||||
 | 
					              (uri (svn-reference
 | 
				
			||||||
 | 
					                    (url (string-append "svn://www.tug.org/texlive/tags/"
 | 
				
			||||||
 | 
					                                        %texlive-tag "/Master/texmf-dist/"
 | 
				
			||||||
 | 
					                                        "/tex/latex/media9"))
 | 
				
			||||||
 | 
					                    (revision %texlive-revision)))
 | 
				
			||||||
 | 
					              (file-name (string-append name "-" version "-checkout"))
 | 
				
			||||||
 | 
					              (sha256
 | 
				
			||||||
 | 
					               (base32
 | 
				
			||||||
 | 
					                "01ysky8h8s6q12dxfahkzwhbkc9j5wl50xzcczy0cbjx9f6aj9kv"))))
 | 
				
			||||||
 | 
					    (build-system trivial-build-system)
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					     `(#:modules ((guix build utils))
 | 
				
			||||||
 | 
					       #:builder
 | 
				
			||||||
 | 
					       (begin
 | 
				
			||||||
 | 
					         (use-modules (guix build utils))
 | 
				
			||||||
 | 
					         (let ((target (string-append (assoc-ref %outputs "out")
 | 
				
			||||||
 | 
					                                      "/share/texmf-dist/tex/latex/media9")))
 | 
				
			||||||
 | 
					           (mkdir-p target)
 | 
				
			||||||
 | 
					           (copy-recursively (assoc-ref %build-inputs "source") target)
 | 
				
			||||||
 | 
					           #t))))
 | 
				
			||||||
 | 
					    (home-page "https://www.ctan.org/pkg/media9")
 | 
				
			||||||
 | 
					    (synopsis "Multimedia inclusion package with Adobe Reader-9/X compatibility")
 | 
				
			||||||
 | 
					    (description
 | 
				
			||||||
 | 
					     "The package provides an interface to embed interactive Flash (SWF) and 3D
 | 
				
			||||||
 | 
					objects (Adobe U3D & PRC), as well as video and sound files or streams in the
 | 
				
			||||||
 | 
					popular MP4, FLV and MP3 formats into PDF documents with Acrobat-9/X
 | 
				
			||||||
 | 
					compatibility.  Playback of multimedia files uses the built-in Flash Player of
 | 
				
			||||||
 | 
					Adobe Reader and does, therefore, not depend on external plug-ins.  Flash Player
 | 
				
			||||||
 | 
					supports the efficient H.264 codec for video compression.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					The package is based on the RichMedia Annotation, an Adobe addition to the PDF
 | 
				
			||||||
 | 
					specification.  It replaces the now obsolete @code{movie15} package.")
 | 
				
			||||||
 | 
					    (license license:lppl)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public texlive-latex-ocgx2
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "texlive-latex-ocgx2")
 | 
				
			||||||
 | 
					    (version (number->string %texlive-revision))
 | 
				
			||||||
 | 
					    (source (origin
 | 
				
			||||||
 | 
					              (method svn-fetch)
 | 
				
			||||||
 | 
					              (uri (svn-reference
 | 
				
			||||||
 | 
					                    (url (string-append "svn://www.tug.org/texlive/tags/"
 | 
				
			||||||
 | 
					                                        %texlive-tag "/Master/texmf-dist/"
 | 
				
			||||||
 | 
					                                        "/tex/latex/ocgx2"))
 | 
				
			||||||
 | 
					                    (revision %texlive-revision)))
 | 
				
			||||||
 | 
					              (file-name (string-append name "-" version "-checkout"))
 | 
				
			||||||
 | 
					              (sha256
 | 
				
			||||||
 | 
					               (base32
 | 
				
			||||||
 | 
					                "12kkl7n534j0p4frwyrlw22dc3ik50kxv97cxp4xpmji13m0hxpf"))))
 | 
				
			||||||
 | 
					    (build-system trivial-build-system)
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					     `(#:modules ((guix build utils))
 | 
				
			||||||
 | 
					       #:builder
 | 
				
			||||||
 | 
					       (begin
 | 
				
			||||||
 | 
					         (use-modules (guix build utils))
 | 
				
			||||||
 | 
					         (let ((target (string-append (assoc-ref %outputs "out")
 | 
				
			||||||
 | 
					                                      "/share/texmf-dist/tex/latex/ogcx2")))
 | 
				
			||||||
 | 
					           (mkdir-p target)
 | 
				
			||||||
 | 
					           (copy-recursively (assoc-ref %build-inputs "source") target)
 | 
				
			||||||
 | 
					           #t))))
 | 
				
			||||||
 | 
					    (home-page "https://www.ctan.org/pkg/ocgx2")
 | 
				
			||||||
 | 
					    (synopsis "Provide OCG (Optional Content Groups) support within a PDF document")
 | 
				
			||||||
 | 
					    (description
 | 
				
			||||||
 | 
					     "This package provides OCG (Optional Content Groups) support within a PDF
 | 
				
			||||||
 | 
					document.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					It re-implements the functionality of the @code{ocg}, @code{ocgx}, and
 | 
				
			||||||
 | 
					@code{ocg-p} packages and adds support for all known engines and back-ends
 | 
				
			||||||
 | 
					including:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@itemize
 | 
				
			||||||
 | 
					@item LaTeX → dvips → @code{ps2pdf}/Distiller
 | 
				
			||||||
 | 
					@item (Xe)LaTeX(x) → @code{dvipdfmx}
 | 
				
			||||||
 | 
					@item pdfLaTeX and LuaLaTeX .
 | 
				
			||||||
 | 
					@end itemize
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					It also ensures compatibility with the @code{media9} and @code{animate} packages.")
 | 
				
			||||||
 | 
					    (license license:lppl)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 | 
					;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,7 @@
 | 
				
			||||||
(define-module (gnu packages toys)
 | 
					(define-module (gnu packages toys)
 | 
				
			||||||
  #:use-module (gnu packages ncurses)
 | 
					  #:use-module (gnu packages ncurses)
 | 
				
			||||||
  #:use-module (guix build-system gnu)
 | 
					  #:use-module (guix build-system gnu)
 | 
				
			||||||
  #:use-module (guix download)
 | 
					  #:use-module (guix git-download)
 | 
				
			||||||
  #:use-module ((guix licenses) #:prefix license:)
 | 
					  #:use-module ((guix licenses) #:prefix license:)
 | 
				
			||||||
  #:use-module (guix packages))
 | 
					  #:use-module (guix packages))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,12 +29,13 @@
 | 
				
			||||||
    (version "5.02")
 | 
					    (version "5.02")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method git-fetch)
 | 
				
			||||||
       (uri (string-append "https://github.com/mtoyoda/" name
 | 
					       (uri (git-reference
 | 
				
			||||||
                           "/archive/" version ".tar.gz"))
 | 
					             (url "https://github.com/mtoyoda/sl.git")
 | 
				
			||||||
       (file-name (string-append name "-" version ".tar.gz"))
 | 
					             (commit version)))
 | 
				
			||||||
 | 
					       (file-name (git-file-name name version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32 "0fjnnnxxq7zh9bm3yzbj84fgap0rhblxi2m10br83747gxsrcn8y"))))
 | 
					        (base32 "1zrfd71zx2px2xpapg45s8xvi81xii63yl0h60q72j71zh4sif8b"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("ncurses" ,ncurses)))
 | 
					     `(("ncurses" ,ncurses)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1340,7 +1340,7 @@ standards-compliant ChangeLog entries based on the changes that it detects.")
 | 
				
			||||||
(define-public diffstat
 | 
					(define-public diffstat
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "diffstat")
 | 
					    (name "diffstat")
 | 
				
			||||||
    (version "1.61")
 | 
					    (version "1.62")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri
 | 
					              (uri
 | 
				
			||||||
| 
						 | 
					@ -1351,7 +1351,7 @@ standards-compliant ChangeLog entries based on the changes that it detects.")
 | 
				
			||||||
                                name "-" version ".tgz")))
 | 
					                                name "-" version ".tgz")))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95"))))
 | 
					                "07sr482y6iw7n7ddkba0w51kbjc99snvnijkn5ba2xzd8hv1h2bz"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (home-page "https://invisible-island.net/diffstat/")
 | 
					    (home-page "https://invisible-island.net/diffstat/")
 | 
				
			||||||
    (synopsis "Make histograms from the output of @command{diff}")
 | 
					    (synopsis "Make histograms from the output of @command{diff}")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -340,16 +340,15 @@ all common programming languages.  Vala bindings are also provided.")
 | 
				
			||||||
(define-public lxc
 | 
					(define-public lxc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "lxc")
 | 
					    (name "lxc")
 | 
				
			||||||
    (version "3.0.1")
 | 
					    (version "3.0.2")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append
 | 
					              (uri (string-append
 | 
				
			||||||
                    "https://linuxcontainers.org/downloads/lxc/lxc-"
 | 
					                    "https://linuxcontainers.org/downloads/lxc/lxc-"
 | 
				
			||||||
                    version ".tar.gz"))
 | 
					                    version ".tar.gz"))
 | 
				
			||||||
              (patches (search-patches "lxc-CVE-2018-6556.patch"))
 | 
					 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625"))))
 | 
					                "0p1gy553cm4mhwxi85fl6qiwz61rjmvysm8c8pd20qh62xxi3dva"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("pkg-config" ,pkg-config)))
 | 
					     `(("pkg-config" ,pkg-config)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -187,7 +187,9 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
 | 
				
			||||||
               (wrap-program (string-append luakit "/bin/luakit")
 | 
					               (wrap-program (string-append luakit "/bin/luakit")
 | 
				
			||||||
                 `("LUA_CPATH" prefix
 | 
					                 `("LUA_CPATH" prefix
 | 
				
			||||||
                   (,(string-append lua5.1-filesystem
 | 
					                   (,(string-append lua5.1-filesystem
 | 
				
			||||||
                                    "/lib/lua/5.1/?.so;;"))))
 | 
					                                    "/lib/lua/5.1/?.so;;")))
 | 
				
			||||||
 | 
					                 `("XDG_CONFIG_DIRS" prefix
 | 
				
			||||||
 | 
					                   (,(string-append luakit "/etc/xdg/"))))
 | 
				
			||||||
               #t))))))
 | 
					               #t))))))
 | 
				
			||||||
    (synopsis "Fast, lightweight, and simple browser based on WebKit")
 | 
					    (synopsis "Fast, lightweight, and simple browser based on WebKit")
 | 
				
			||||||
    (description "Luakit is a fast, lightweight, and simple to use
 | 
					    (description "Luakit is a fast, lightweight, and simple to use
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,7 @@
 | 
				
			||||||
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 | 
					;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 | 
				
			||||||
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
 | 
					;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
 | 
				
			||||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 | 
					;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 | 
				
			||||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 | 
					;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
 | 
				
			||||||
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
 | 
					;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
 | 
				
			||||||
;;; Copyright © 2017 Petter <petter@mykolab.ch>
 | 
					;;; Copyright © 2017 Petter <petter@mykolab.ch>
 | 
				
			||||||
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
 | 
					;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
 | 
				
			||||||
| 
						 | 
					@ -110,6 +110,7 @@
 | 
				
			||||||
  #:use-module (gnu packages pcre)
 | 
					  #:use-module (gnu packages pcre)
 | 
				
			||||||
  #:use-module (gnu packages pkg-config)
 | 
					  #:use-module (gnu packages pkg-config)
 | 
				
			||||||
  #:use-module (gnu packages qt)
 | 
					  #:use-module (gnu packages qt)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages readline)
 | 
				
			||||||
  #:use-module (gnu packages valgrind)
 | 
					  #:use-module (gnu packages valgrind)
 | 
				
			||||||
  #:use-module (gnu packages xml)
 | 
					  #:use-module (gnu packages xml)
 | 
				
			||||||
  #:use-module (gnu packages curl)
 | 
					  #:use-module (gnu packages curl)
 | 
				
			||||||
| 
						 | 
					@ -4996,6 +4997,100 @@ scalability (including load-balancing), making it suitable for large
 | 
				
			||||||
deployments.")
 | 
					deployments.")
 | 
				
			||||||
  (license l:gpl2+)))
 | 
					  (license l:gpl2+)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public varnish
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "varnish")
 | 
				
			||||||
 | 
					    (home-page "https://varnish-cache.org/")
 | 
				
			||||||
 | 
					    (version "6.0.0")
 | 
				
			||||||
 | 
					    (source (origin
 | 
				
			||||||
 | 
					              (method url-fetch)
 | 
				
			||||||
 | 
					              (uri (string-append home-page "_downloads/varnish-" version ".tgz"))
 | 
				
			||||||
 | 
					              (sha256
 | 
				
			||||||
 | 
					               (base32
 | 
				
			||||||
 | 
					                "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7"))))
 | 
				
			||||||
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					     `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
 | 
				
			||||||
 | 
					                               ;; Use absolute path of GCC so it's found at runtime.
 | 
				
			||||||
 | 
					                               (string-append "PTHREAD_CC="
 | 
				
			||||||
 | 
					                                              (assoc-ref %build-inputs "gcc")
 | 
				
			||||||
 | 
					                                              "/bin/gcc")
 | 
				
			||||||
 | 
					                               "--localstatedir=/var")
 | 
				
			||||||
 | 
					       #:phases
 | 
				
			||||||
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
 | 
					         (add-after 'unpack 'patch-/bin/sh
 | 
				
			||||||
 | 
					           (lambda _
 | 
				
			||||||
 | 
					             (substitute* '("bin/varnishtest/vtc_varnish.c"
 | 
				
			||||||
 | 
					                            "bin/varnishtest/vtc_process.c"
 | 
				
			||||||
 | 
					                            "bin/varnishd/mgt/mgt_vcc.c")
 | 
				
			||||||
 | 
					               (("/bin/sh") (which "sh")))
 | 
				
			||||||
 | 
					             #t))
 | 
				
			||||||
 | 
					         (add-before 'install 'patch-Makefile
 | 
				
			||||||
 | 
					           (lambda _
 | 
				
			||||||
 | 
					             (substitute* "Makefile"
 | 
				
			||||||
 | 
					               ;; Do not create /var/varnish during install.
 | 
				
			||||||
 | 
					               (("^install-data-am: install-data-local") "install-data-am: "))
 | 
				
			||||||
 | 
					             #t))
 | 
				
			||||||
 | 
					         (add-after 'install 'wrap-varnishd
 | 
				
			||||||
 | 
					           ;; Varnish uses GCC to compile VCL, so wrap it with required GCC
 | 
				
			||||||
 | 
					           ;; environment variables to avoid propagating them to profiles.
 | 
				
			||||||
 | 
					           (lambda* (#:key inputs outputs #:allow-other-keys)
 | 
				
			||||||
 | 
					             (let* ((out (assoc-ref outputs "out"))
 | 
				
			||||||
 | 
					                    (varnishd (string-append out "/sbin/varnishd"))
 | 
				
			||||||
 | 
					                    (PATH (string-append (assoc-ref inputs "binutils") "/bin"))
 | 
				
			||||||
 | 
					                    (LIBRARY_PATH (string-append (assoc-ref inputs "libc") "/lib")))
 | 
				
			||||||
 | 
					               (wrap-program varnishd
 | 
				
			||||||
 | 
					                 ;; Add binutils to PATH so gcc finds the 'as' executable.
 | 
				
			||||||
 | 
					                 `("PATH" ":" prefix (,PATH))
 | 
				
			||||||
 | 
					                 ;; Make sure 'crti.o' et.al is found.
 | 
				
			||||||
 | 
					                 `("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH)))
 | 
				
			||||||
 | 
					               #t))))))
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					       ("rst2man" ,python-docutils)))
 | 
				
			||||||
 | 
					    (inputs
 | 
				
			||||||
 | 
					     `(("jemalloc" ,jemalloc)
 | 
				
			||||||
 | 
					       ("ncurses" ,ncurses)
 | 
				
			||||||
 | 
					       ("pcre" ,pcre)
 | 
				
			||||||
 | 
					       ("python" ,python-wrapper)
 | 
				
			||||||
 | 
					       ("readline" ,readline)))
 | 
				
			||||||
 | 
					    (synopsis "Web application accelerator")
 | 
				
			||||||
 | 
					    (description
 | 
				
			||||||
 | 
					     "Varnish is a high-performance HTTP accelerator.  It acts as a caching
 | 
				
			||||||
 | 
					reverse proxy and load balancer.  You install it in front of any server that
 | 
				
			||||||
 | 
					speaks HTTP and configure it to cache the contents through an extensive
 | 
				
			||||||
 | 
					configuration language.")
 | 
				
			||||||
 | 
					    (license (list l:bsd-2           ;main distribution
 | 
				
			||||||
 | 
					                   l:zlib            ;lib/libvgz/*
 | 
				
			||||||
 | 
					                   l:public-domain   ;bin/varnishncsa/as64.c, include/miniobj.h
 | 
				
			||||||
 | 
					                   l:bsd-3))))       ;include/vqueue.h, lib/libvarnishcompat/daemon.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public varnish-modules
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (name "varnish-modules")
 | 
				
			||||||
 | 
					    (home-page "https://github.com/varnish/varnish-modules")
 | 
				
			||||||
 | 
					    (version "0.15.0")
 | 
				
			||||||
 | 
					    (source (origin
 | 
				
			||||||
 | 
					              (method url-fetch)
 | 
				
			||||||
 | 
					              (uri (string-append "https://download.varnish-software.com"
 | 
				
			||||||
 | 
					                                  "/varnish-modules/varnish-modules-"
 | 
				
			||||||
 | 
					                                  version ".tar.gz"))
 | 
				
			||||||
 | 
					              (sha256
 | 
				
			||||||
 | 
					               (base32
 | 
				
			||||||
 | 
					                "09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751"))))
 | 
				
			||||||
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("pkg-config" ,pkg-config)))
 | 
				
			||||||
 | 
					    (inputs
 | 
				
			||||||
 | 
					     `(("python" ,python)
 | 
				
			||||||
 | 
					       ("varnish" ,varnish)))
 | 
				
			||||||
 | 
					    (synopsis "Collection of Varnish modules")
 | 
				
			||||||
 | 
					    (description
 | 
				
			||||||
 | 
					     "This package provides a collection of modules (@dfn{vmods}) for the Varnish
 | 
				
			||||||
 | 
					cache server, extending the @dfn{Varnish Configuration Language} (VCL) with
 | 
				
			||||||
 | 
					additional capabilities.")
 | 
				
			||||||
 | 
					    (license l:bsd-2)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public xinetd
 | 
					(define-public xinetd
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xinetd")
 | 
					    (name "xinetd")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -55,14 +55,14 @@
 | 
				
			||||||
(define-public webkitgtk
 | 
					(define-public webkitgtk
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "webkitgtk")
 | 
					    (name "webkitgtk")
 | 
				
			||||||
    (version "2.20.4")
 | 
					    (version "2.20.5")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://www.webkitgtk.org/releases/"
 | 
					              (uri (string-append "https://www.webkitgtk.org/releases/"
 | 
				
			||||||
                                  name "-" version ".tar.xz"))
 | 
					                                  name "-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0cmfjbfxssgrwhgqmk7kqws91k6pha519bnyjrfsgy640max2zfc"))))
 | 
					                "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:tests? #f ; no tests
 | 
					     '(#:tests? #f ; no tests
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -223,7 +223,7 @@ integrate Windows applications into your desktop.")
 | 
				
			||||||
(define-public wine-staging-patchset-data
 | 
					(define-public wine-staging-patchset-data
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
   (name "wine-staging-patchset-data")
 | 
					   (name "wine-staging-patchset-data")
 | 
				
			||||||
   (version "3.13")
 | 
					   (version "3.14")
 | 
				
			||||||
   (source
 | 
					   (source
 | 
				
			||||||
    (origin
 | 
					    (origin
 | 
				
			||||||
     (method url-fetch)
 | 
					     (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -232,7 +232,7 @@ integrate Windows applications into your desktop.")
 | 
				
			||||||
     (file-name (string-append name "-" version ".zip"))
 | 
					     (file-name (string-append name "-" version ".zip"))
 | 
				
			||||||
     (sha256
 | 
					     (sha256
 | 
				
			||||||
      (base32
 | 
					      (base32
 | 
				
			||||||
       "0h27h4z4m2m77chp3alkv6fagppjhh9ys39d3n21j0yfjknyhdd8"))))
 | 
					       "1w3n90ab3xyhdzxw1mnkp2cw76lpm5l75hy9xkw3kz2fwzq6lwz7"))))
 | 
				
			||||||
   (build-system trivial-build-system)
 | 
					   (build-system trivial-build-system)
 | 
				
			||||||
   (native-inputs
 | 
					   (native-inputs
 | 
				
			||||||
    `(("bash" ,bash)
 | 
					    `(("bash" ,bash)
 | 
				
			||||||
| 
						 | 
					@ -279,7 +279,7 @@ integrate Windows applications into your desktop.")
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.xz"))
 | 
					              (file-name (string-append name "-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "1m5v854r5wgw68b97j6wim1a8692x5sih25c0xp1yb13a94dg187"))))
 | 
					                "01dhn3a6k3dwnrbz4bxvszhh5sxwy6s89y459g805hjmq8s6d2a7"))))
 | 
				
			||||||
    (inputs `(("autoconf" ,autoconf) ; for autoreconf
 | 
					    (inputs `(("autoconf" ,autoconf) ; for autoreconf
 | 
				
			||||||
              ("gtk+" ,gtk+)
 | 
					              ("gtk+" ,gtk+)
 | 
				
			||||||
              ("libva" ,libva)
 | 
					              ("libva" ,libva)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -81,7 +81,7 @@
 | 
				
			||||||
(define-public libconfuse
 | 
					(define-public libconfuse
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "libconfuse")
 | 
					    (name "libconfuse")
 | 
				
			||||||
    (version "3.2.1")
 | 
					    (version "3.2.2")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "https://github.com/martinh/libconfuse/"
 | 
					              (uri (string-append "https://github.com/martinh/libconfuse/"
 | 
				
			||||||
| 
						 | 
					@ -89,7 +89,7 @@
 | 
				
			||||||
                                  "/confuse-" version ".tar.xz"))
 | 
					                                  "/confuse-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0pnjmlj9i0alp407qd7c0vq83sz7gpsjrbdgpcn4xvzjp9r35ii3"))))
 | 
					                "02r1mmzik2m0iigbc2da3y754vj24i18r3ml5p2wzs027mjhn959"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (home-page "https://github.com/martinh/libconfuse")
 | 
					    (home-page "https://github.com/martinh/libconfuse")
 | 
				
			||||||
    (synopsis "Configuration file parser library")
 | 
					    (synopsis "Configuration file parser library")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -987,7 +987,7 @@ color temperature should be set to match the lamps in your room.")
 | 
				
			||||||
(define-public xscreensaver
 | 
					(define-public xscreensaver
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xscreensaver")
 | 
					    (name "xscreensaver")
 | 
				
			||||||
    (version "5.39")
 | 
					    (version "5.40")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -996,7 +996,7 @@ color temperature should be set to match the lamps in your room.")
 | 
				
			||||||
                       version ".tar.gz"))
 | 
					                       version ".tar.gz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "09i47h4hdgwxyqgrsnshl4l5dv5mrsp37h705cc22lwby601ikj8"))))
 | 
					         "1q2sr7h6ps6d3hk8895g12rrcqiihjl7py1ly077ikv4866r181h"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f  ; no check target
 | 
					     `(#:tests? #f  ; no check target
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5926,7 +5926,7 @@ basic eye-candy effects.")
 | 
				
			||||||
(define-public xpra
 | 
					(define-public xpra
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xpra")
 | 
					    (name "xpra")
 | 
				
			||||||
    (version "2.3.2")
 | 
					    (version "2.3.3")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -5934,7 +5934,7 @@ basic eye-candy effects.")
 | 
				
			||||||
                           version ".tar.xz"))
 | 
					                           version ".tar.xz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6"))))
 | 
					         "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"))))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
    (inputs `(("ffmpeg" ,ffmpeg)
 | 
					    (inputs `(("ffmpeg" ,ffmpeg)
 | 
				
			||||||
              ("flac" ,flac)
 | 
					              ("flac" ,flac)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -61,7 +61,7 @@
 | 
				
			||||||
  (interval         cuirass-configuration-interval ;integer (seconds)
 | 
					  (interval         cuirass-configuration-interval ;integer (seconds)
 | 
				
			||||||
                    (default 60))
 | 
					                    (default 60))
 | 
				
			||||||
  (database         cuirass-configuration-database ;string (file-name)
 | 
					  (database         cuirass-configuration-database ;string (file-name)
 | 
				
			||||||
                    (default "/var/run/cuirass/cuirass.db"))
 | 
					                    (default "/var/lib/cuirass/cuirass.db"))
 | 
				
			||||||
  (port             cuirass-configuration-port ;integer (port)
 | 
					  (port             cuirass-configuration-port ;integer (port)
 | 
				
			||||||
                    (default 8081))
 | 
					                    (default 8081))
 | 
				
			||||||
  (host             cuirass-configuration-host ;string
 | 
					  (host             cuirass-configuration-host ;string
 | 
				
			||||||
| 
						 | 
					@ -131,7 +131,7 @@
 | 
				
			||||||
           (group cuirass-group)
 | 
					           (group cuirass-group)
 | 
				
			||||||
           (system? #t)
 | 
					           (system? #t)
 | 
				
			||||||
           (comment "Cuirass privilege separation user")
 | 
					           (comment "Cuirass privilege separation user")
 | 
				
			||||||
           (home-directory (string-append "/var/run/" cuirass-user))
 | 
					           (home-directory (string-append "/var/lib/" cuirass-user))
 | 
				
			||||||
           (shell #~(string-append #$shadow "/sbin/nologin"))))))
 | 
					           (shell #~(string-append #$shadow "/sbin/nologin"))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (cuirass-activation config)
 | 
					(define (cuirass-activation config)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@
 | 
				
			||||||
  #:use-module (gnu services)
 | 
					  #:use-module (gnu services)
 | 
				
			||||||
  #:use-module (gnu services shepherd)
 | 
					  #:use-module (gnu services shepherd)
 | 
				
			||||||
  #:use-module (gnu packages admin)
 | 
					  #:use-module (gnu packages admin)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages base)
 | 
				
			||||||
  #:use-module (gnu packages security-token)
 | 
					  #:use-module (gnu packages security-token)
 | 
				
			||||||
  #:use-module (gnu system shadow)
 | 
					  #:use-module (gnu system shadow)
 | 
				
			||||||
  #:use-module (guix gexp)
 | 
					  #:use-module (guix gexp)
 | 
				
			||||||
| 
						 | 
					@ -62,14 +63,22 @@
 | 
				
			||||||
(define pcscd-activation
 | 
					(define pcscd-activation
 | 
				
			||||||
  (match-lambda
 | 
					  (match-lambda
 | 
				
			||||||
    (($ <pcscd-configuration> pcsc-lite usb-drivers)
 | 
					    (($ <pcscd-configuration> pcsc-lite usb-drivers)
 | 
				
			||||||
 | 
					     (with-imported-modules (source-module-closure
 | 
				
			||||||
 | 
					                             '((guix build utils)))
 | 
				
			||||||
       #~(begin
 | 
					       #~(begin
 | 
				
			||||||
           (use-modules (guix build utils))
 | 
					           (use-modules (guix build utils))
 | 
				
			||||||
 | 
					           ;; XXX: We can't use (guix utils) because it requires a
 | 
				
			||||||
 | 
					           ;; dynamically-linked Guile, hence the duplicate switch-symlinks.
 | 
				
			||||||
 | 
					           (define (switch-symlinks link target)
 | 
				
			||||||
 | 
					             (let ((pivot (string-append link ".new")))
 | 
				
			||||||
 | 
					               (symlink target pivot)
 | 
				
			||||||
 | 
					               (rename-file pivot link)))
 | 
				
			||||||
           (mkdir-p "/var/lib")
 | 
					           (mkdir-p "/var/lib")
 | 
				
			||||||
         (symlink #$(directory-union
 | 
					           (switch-symlinks "/var/lib/pcsc"
 | 
				
			||||||
 | 
					                            #$(directory-union
 | 
				
			||||||
                               "pcsc"
 | 
					                               "pcsc"
 | 
				
			||||||
                               (map (cut file-append <> "/pcsc")
 | 
					                               (map (cut file-append <> "/pcsc")
 | 
				
			||||||
                          usb-drivers))
 | 
					                                    usb-drivers))))))))
 | 
				
			||||||
                  "/var/lib/pcsc")))))
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define pcscd-service-type
 | 
					(define pcscd-service-type
 | 
				
			||||||
  (service-type
 | 
					  (service-type
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -62,7 +62,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (default-lisp implementation)
 | 
					(define (default-lisp implementation)
 | 
				
			||||||
  "Return the default package for the lisp IMPLEMENTATION."
 | 
					  "Return the default package for the lisp IMPLEMENTATION."
 | 
				
			||||||
  ;; Lazily resolve the binding to avoid a circular dependancy.
 | 
					  ;; Lazily resolve the binding to avoid a circular dependency.
 | 
				
			||||||
  (let ((lisp-module (resolve-interface '(gnu packages lisp))))
 | 
					  (let ((lisp-module (resolve-interface '(gnu packages lisp))))
 | 
				
			||||||
    (module-ref lisp-module implementation)))
 | 
					    (module-ref lisp-module implementation)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 | 
					;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 | 
				
			||||||
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
 | 
					;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -120,28 +120,59 @@ repository separated by a forward slash, from a string URL of the form
 | 
				
			||||||
  ;; limit, or #f.
 | 
					  ;; limit, or #f.
 | 
				
			||||||
  (make-parameter (getenv "GUIX_GITHUB_TOKEN")))
 | 
					  (make-parameter (getenv "GUIX_GITHUB_TOKEN")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define (fetch-releases-or-tags url)
 | 
				
			||||||
 | 
					  "Fetch the list of \"releases\" or, if it's empty, the list of tags for the
 | 
				
			||||||
 | 
					repository at URL.  Return the corresponding JSON dictionaries (hash tables),
 | 
				
			||||||
 | 
					or #f if the information could not be retrieved.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					We look at both /releases and /tags because the \"release\" feature of GitHub
 | 
				
			||||||
 | 
					is little used; often, people simply provide a tag.  What's confusing is that
 | 
				
			||||||
 | 
					tags show up in the \"Releases\" tab of the web UI.  For instance,
 | 
				
			||||||
 | 
					'https://github.com/aconchillo/guile-json/releases' shows a number of
 | 
				
			||||||
 | 
					\"releases\" (really: tags), whereas
 | 
				
			||||||
 | 
					'https://api.github.com/repos/aconchillo/guile-json/releases' returns the
 | 
				
			||||||
 | 
					empty list."
 | 
				
			||||||
 | 
					  (define release-url
 | 
				
			||||||
 | 
					    (string-append "https://api.github.com/repos/"
 | 
				
			||||||
 | 
					                   (github-user-slash-repository url)
 | 
				
			||||||
 | 
					                   "/releases"))
 | 
				
			||||||
 | 
					  (define tag-url
 | 
				
			||||||
 | 
					    (string-append "https://api.github.com/repos/"
 | 
				
			||||||
 | 
					                   (github-user-slash-repository url)
 | 
				
			||||||
 | 
					                   "/tags"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  (define headers
 | 
				
			||||||
 | 
					    ;; Ask for version 3 of the API as suggested at
 | 
				
			||||||
 | 
					    ;; <https://developer.github.com/v3/>.
 | 
				
			||||||
 | 
					    `((Accept . "application/vnd.github.v3+json")
 | 
				
			||||||
 | 
					      (user-agent . "GNU Guile")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  (define (decorate url)
 | 
				
			||||||
 | 
					    (if (%github-token)
 | 
				
			||||||
 | 
					        (string-append url "?access_token=" (%github-token))
 | 
				
			||||||
 | 
					        url))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  (match (json-fetch (decorate release-url) #:headers headers)
 | 
				
			||||||
 | 
					    (()
 | 
				
			||||||
 | 
					     ;; We got the empty list, presumably because the user didn't use GitHub's
 | 
				
			||||||
 | 
					     ;; "release" mechanism, but hopefully they did use Git tags.
 | 
				
			||||||
 | 
					     (json-fetch (decorate tag-url) #:headers headers))
 | 
				
			||||||
 | 
					    (x x)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (latest-released-version url package-name)
 | 
					(define (latest-released-version url package-name)
 | 
				
			||||||
  "Return a string of the newest released version name given a string URL like
 | 
					  "Return a string of the newest released version name given a string URL like
 | 
				
			||||||
'https://github.com/arq5x/bedtools2/archive/v2.24.0.tar.gz' and the name of
 | 
					'https://github.com/arq5x/bedtools2/archive/v2.24.0.tar.gz' and the name of
 | 
				
			||||||
the package e.g. 'bedtools2'.  Return #f if there is no releases"
 | 
					the package e.g. 'bedtools2'.  Return #f if there is no releases"
 | 
				
			||||||
  (let* ((token (%github-token))
 | 
					  (let* ((json (fetch-releases-or-tags url)))
 | 
				
			||||||
         (api-url (string-append
 | 
					 | 
				
			||||||
                   "https://api.github.com/repos/"
 | 
					 | 
				
			||||||
                   (github-user-slash-repository url)
 | 
					 | 
				
			||||||
                   "/releases"))
 | 
					 | 
				
			||||||
         (json (json-fetch
 | 
					 | 
				
			||||||
                (if token
 | 
					 | 
				
			||||||
                    (string-append api-url "?access_token=" token)
 | 
					 | 
				
			||||||
                    api-url))))
 | 
					 | 
				
			||||||
    (if (eq? json #f)
 | 
					    (if (eq? json #f)
 | 
				
			||||||
        (if token
 | 
					        (if (%github-token)
 | 
				
			||||||
            (error "Error downloading release information through the GitHub
 | 
					            (error "Error downloading release information through the GitHub
 | 
				
			||||||
API when using a GitHub token")
 | 
					API when using a GitHub token")
 | 
				
			||||||
            (error "Error downloading release information through the GitHub
 | 
					            (error "Error downloading release information through the GitHub
 | 
				
			||||||
API. This may be fixed by using an access token and setting the environment
 | 
					API. This may be fixed by using an access token and setting the environment
 | 
				
			||||||
variable GUIX_GITHUB_TOKEN, for instance one procured from
 | 
					variable GUIX_GITHUB_TOKEN, for instance one procured from
 | 
				
			||||||
https://github.com/settings/tokens"))
 | 
					https://github.com/settings/tokens"))
 | 
				
			||||||
        (let ((proper-releases
 | 
					        (let loop ((releases
 | 
				
			||||||
                    (filter
 | 
					                    (filter
 | 
				
			||||||
                     (lambda (x)
 | 
					                     (lambda (x)
 | 
				
			||||||
                       ;; example pre-release:
 | 
					                       ;; example pre-release:
 | 
				
			||||||
| 
						 | 
					@ -150,11 +181,12 @@ https://github.com/settings/tokens"))
 | 
				
			||||||
                       ;; https://github.com/powertab/powertabeditor/releases
 | 
					                       ;; https://github.com/powertab/powertabeditor/releases
 | 
				
			||||||
                       (not (hash-ref x "prerelease")))
 | 
					                       (not (hash-ref x "prerelease")))
 | 
				
			||||||
                     json)))
 | 
					                     json)))
 | 
				
			||||||
          (match proper-releases
 | 
					          (match releases
 | 
				
			||||||
            (()                                   ;empty release list
 | 
					            (()                                   ;empty release list
 | 
				
			||||||
             #f)
 | 
					             #f)
 | 
				
			||||||
            ((release . rest)                     ;one or more releases
 | 
					            ((release . rest)                     ;one or more releases
 | 
				
			||||||
             (let ((tag (hash-ref release "tag_name"))
 | 
					             (let ((tag (or (hash-ref release "tag_name") ;a "release"
 | 
				
			||||||
 | 
					                            (hash-ref release "name")))   ;a tag
 | 
				
			||||||
                   (name-length (string-length package-name)))
 | 
					                   (name-length (string-length package-name)))
 | 
				
			||||||
               ;; some tags include the name of the package e.g. "fdupes-1.51"
 | 
					               ;; some tags include the name of the package e.g. "fdupes-1.51"
 | 
				
			||||||
               ;; so remove these
 | 
					               ;; so remove these
 | 
				
			||||||
| 
						 | 
					@ -164,8 +196,16 @@ https://github.com/settings/tokens"))
 | 
				
			||||||
                   (substring tag (+ name-length 1))
 | 
					                   (substring tag (+ name-length 1))
 | 
				
			||||||
                   ;; some tags start with a "v" e.g. "v0.25.0"
 | 
					                   ;; some tags start with a "v" e.g. "v0.25.0"
 | 
				
			||||||
                   ;; where some are just the version number
 | 
					                   ;; where some are just the version number
 | 
				
			||||||
                   (if (eq? (string-ref tag 0) #\v)
 | 
					                   (if (string-prefix? "v" tag)
 | 
				
			||||||
                       (substring tag 1) tag)))))))))
 | 
					                       (substring tag 1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                       ;; Finally, reject tags that don't start with a digit:
 | 
				
			||||||
 | 
					                       ;; they may not represent a release.
 | 
				
			||||||
 | 
					                       (if (and (not (string-null? tag))
 | 
				
			||||||
 | 
					                                (char-set-contains? char-set:digit
 | 
				
			||||||
 | 
					                                                    (string-ref tag 0)))
 | 
				
			||||||
 | 
					                           tag
 | 
				
			||||||
 | 
					                           (loop rest)))))))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (latest-release pkg)
 | 
					(define (latest-release pkg)
 | 
				
			||||||
  "Return an <upstream-source> for the latest release of PKG."
 | 
					  "Return an <upstream-source> for the latest release of PKG."
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,7 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2014 David Thompson <davet@gnu.org>
 | 
					;;; Copyright © 2014 David Thompson <davet@gnu.org>
 | 
				
			||||||
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 | 
					;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 | 
				
			||||||
 | 
					;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -25,17 +26,20 @@
 | 
				
			||||||
  #:export (json-fetch
 | 
					  #:export (json-fetch
 | 
				
			||||||
            json-fetch-alist))
 | 
					            json-fetch-alist))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (json-fetch url)
 | 
					(define* (json-fetch url
 | 
				
			||||||
 | 
					                     ;; Note: many websites returns 403 if we omit a
 | 
				
			||||||
 | 
					                     ;; 'User-Agent' header.
 | 
				
			||||||
 | 
					                     #:key (headers `((user-agent . "GNU Guile")
 | 
				
			||||||
 | 
					                                      (Accept . "application/json"))))
 | 
				
			||||||
  "Return a representation of the JSON resource URL (a list or hash table), or
 | 
					  "Return a representation of the JSON resource URL (a list or hash table), or
 | 
				
			||||||
#f if URL returns 403 or 404."
 | 
					#f if URL returns 403 or 404.  HEADERS is a list of HTTP headers to pass in
 | 
				
			||||||
 | 
					the query."
 | 
				
			||||||
  (guard (c ((and (http-get-error? c)
 | 
					  (guard (c ((and (http-get-error? c)
 | 
				
			||||||
                  (let ((error (http-get-error-code c)))
 | 
					                  (let ((error (http-get-error-code c)))
 | 
				
			||||||
                    (or (= 403 error)
 | 
					                    (or (= 403 error)
 | 
				
			||||||
                        (= 404 error))))
 | 
					                        (= 404 error))))
 | 
				
			||||||
             #f))
 | 
					             #f))
 | 
				
			||||||
    ;; Note: many websites returns 403 if we omit a 'User-Agent' header.
 | 
					    (let* ((port   (http-fetch url #:headers headers))
 | 
				
			||||||
    (let* ((port   (http-fetch url #:headers '((user-agent . "GNU Guile")
 | 
					 | 
				
			||||||
                                               (Accept . "application/json"))))
 | 
					 | 
				
			||||||
           (result (json->scm port)))
 | 
					           (result (json->scm port)))
 | 
				
			||||||
      (close-port port)
 | 
					      (close-port port)
 | 
				
			||||||
      result)))
 | 
					      result)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -87,7 +87,10 @@ equivalent.  Return #f if the inferior could not be launched."
 | 
				
			||||||
  (define pipe
 | 
					  (define pipe
 | 
				
			||||||
    (inferior-pipe directory command))
 | 
					    (inferior-pipe directory command))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  (setvbuf pipe _IOLBF)
 | 
					  (cond-expand
 | 
				
			||||||
 | 
					    ((and guile-2 (not guile-2.2)) #t)
 | 
				
			||||||
 | 
					    (else (setvbuf pipe 'line)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  (match (read pipe)
 | 
					  (match (read pipe)
 | 
				
			||||||
    (('repl-version 0 rest ...)
 | 
					    (('repl-version 0 rest ...)
 | 
				
			||||||
     (let ((result (inferior 'pipe pipe (cons 0 rest))))
 | 
					     (let ((result (inferior 'pipe pipe (cons 0 rest))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										43536
									
								
								po/guix/fr.po
									
										
									
									
									
								
							
							
						
						
									
										43536
									
								
								po/guix/fr.po
									
										
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 | 
					;;; Copyright © 2015, 2018 Ludovic Courtès <ludo@gnu.org>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -27,8 +27,8 @@
 | 
				
			||||||
  #:use-module (ice-9 match))
 | 
					  #:use-module (ice-9 match))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define %guile-executable
 | 
					(define %guile-executable
 | 
				
			||||||
  (match (command-line)
 | 
					  (match (false-if-exception (readlink "/proc/self/exe"))
 | 
				
			||||||
    ((program . _)
 | 
					    ((? string? program)
 | 
				
			||||||
     (and (file-exists? program) (elf-file? program)
 | 
					     (and (file-exists? program) (elf-file? program)
 | 
				
			||||||
          program))
 | 
					          program))
 | 
				
			||||||
    (_
 | 
					    (_
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue