diff options
Diffstat (limited to 'gnu')
61 files changed, 1365 insertions, 793 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 639dd943d6..ec11b26632 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -575,7 +575,6 @@ dist_patch_DATA = \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ - %D%/packages/patches/bcftools-regidx-unsigned-char.patch \ %D%/packages/patches/binutils-ld-new-dtags.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ @@ -793,6 +792,7 @@ dist_patch_DATA = \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ + %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ @@ -978,7 +978,6 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/pcmanfm-CVE-2017-8934.patch \ %D%/packages/patches/pcre2-CVE-2017-7186.patch \ %D%/packages/patches/pcre2-CVE-2017-8786.patch \ %D%/packages/patches/perl-file-path-CVE-2017-6512.patch \ @@ -1016,7 +1015,6 @@ dist_patch_DATA = \ %D%/packages/patches/psm-arch.patch \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ - %D%/packages/patches/pt-scotch-build-parallelism.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pycairo-wscript.patch \ @@ -1065,7 +1063,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ - %D%/packages/patches/quassel-fix-tls-check.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ @@ -1089,6 +1086,9 @@ dist_patch_DATA = \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-test-threading.patch \ + %D%/packages/patches/scotch-build-parallelism.patch \ + %D%/packages/patches/scotch-graph-diam-64.patch \ + %D%/packages/patches/scotch-graph-induce-type-64.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/shadow-CVE-2018-7169.patch \ @@ -1196,9 +1196,7 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ %D%/packages/patches/libyaml-CVE-2014-9130.patch \ - %D%/packages/patches/zathura-plugindir-environment-variable.patch \ - %D%/packages/patches/zsh-CVE-2018-7548.patch \ - %D%/packages/patches/zsh-CVE-2018-7549.patch + %D%/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5e2cf2d7ad..2b9b43bc50 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -245,16 +245,16 @@ services.") (define-public dfc (package (name "dfc") - (version "3.0.4") + (version "3.1.1") (source (origin (method url-fetch) (uri (string-append - "http://projects.gw-computing.net/attachments/download/79/dfc-" + "http://projects.gw-computing.net/attachments/download/615/dfc-" version ".tar.gz")) (sha256 (base32 - "0zk1ppx93ijimf4sbgqilxxikpsa2gmpbynknyh41xy7jbdjxp0b")))) + "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; There are no tests. (native-inputs `(("gettext" ,gettext-minimal))) @@ -1941,7 +1941,7 @@ throughput (in the same interval).") (define-public thefuck (package (name "thefuck") - (version "3.25") + (version "3.26") (source (origin (method url-fetch) (uri (string-append "https://github.com/nvbn/thefuck/archive/" @@ -1949,7 +1949,7 @@ throughput (in the same interval).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "088bn2l1376qlndbpnjya4q1x3913nj3yj3wc7s2w3bz66d23skk")) + "0ddlf25ik97z34bcpc52xyfhlfm6a3hdi43l6cz4ggwcawdwvn1p")) (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments @@ -1962,7 +1962,8 @@ throughput (in the same interval).") (add-installed-pythonpath inputs outputs) ;; Some tests need write access to $HOME. (setenv "HOME" "/tmp") - (zero? (system* "py.test" "-v"))))))) + (invoke "py.test" "-v") + #t))))) (propagated-inputs `(("python-colorama" ,python-colorama) ("python-decorator" ,python-decorator) @@ -2334,21 +2335,23 @@ Intel DRM Driver.") (define-public fabric (package (name "fabric") - (version "1.13.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "Fabric" version)) (sha256 (base32 - "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq")))) + "13r0b0hllgf8j9rh6x1knmbgvingbdmx046aazv6vck2ll120mw1")))) (build-system python-build-system) (arguments `(#:python ,python-2)) ; Python 2 only (native-inputs `(("python2-fudge" ,python2-fudge) ("python2-jinja2" ,python2-jinja2) - ("python2-nose" ,python2-nose))) + ("python2-nose" ,python2-nose) + ("python2-pynacl" ,python2-pynacl) + ("python2-bcrypt" ,python2-bcrypt))) (propagated-inputs `(("python2-paramiko" ,python2-paramiko))) (home-page "http://fabfile.org") @@ -2415,7 +2418,7 @@ you are running, what theme or icon set you are using, etc.") (define-public nnn (package (name "nnn") - (version "1.5") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/" @@ -2423,7 +2426,7 @@ you are running, what theme or icon set you are using, etc.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0zswf8lb29zr1z642i1d0zi1y2mxal8qjqdrpdiqjh197jamj3zm")))) + "0z3lqbfx3y1caxvn7yq90b7whwyq2y32zf8kyd976ilbxpxnxqpv")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d468899065..61e8fa3392 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -553,7 +553,7 @@ based on human speech recordings.") (define-public infamous-plugins (package (name "infamous-plugins") - (version "0.2.02") + (version "0.2.04") (source (origin (method url-fetch) (uri (string-append "https://github.com/ssj71/infamousPlugins/" @@ -561,10 +561,10 @@ based on human speech recordings.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qm3ak07vc1l3f5c3c2lq9gkfknlxwn8ks03cysw1pk8hj7dwnv6")))) + "1n6rhqsmvad7692w2h01niw5gqg5yk7a09wxl5ivs77zyp93vf7z")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; There are no tests + `(#:tests? #f ; there are no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-compiler-flags @@ -579,7 +579,7 @@ based on human speech recordings.") "src/powercut/CMakeLists.txt" "src/powerup/CMakeLists.txt" "src/stuck/CMakeLists.txt") - (("-msse2 -mfpmath=sse") "")) + (("-msse2 -mfpmath=sse") "")) #t))))) (inputs `(("cairo" ,cairo) @@ -589,7 +589,7 @@ based on human speech recordings.") ("zita-resampler" ,zita-resampler))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://ssj71.github.io/infamousPlugins") + (home-page "https://ssj71.github.io/infamousPlugins") (synopsis "LV2 plugins for live use") (description "The infamous plugins are a collection of LV2 audio plugins for live diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index bf88bd4919..ebc8bdb5f2 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -67,8 +67,9 @@ ;; The configure script doesn't understand some of the ;; GNU options, so we can't use #:configure-flags. (let ((out (assoc-ref outputs "out"))) - (zero? (system* "./configure" - (string-append "--prefix=" out)))))) + (invoke "./configure" + (string-append "--prefix=" out)) + #t))) ;; The main `fio` executable is fairly small and self contained. ;; Moving the auxiliary python and gnuplot scripts to a separate ;; output saves almost 400 MiB on the closure. diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3e93d94651..019c46adbd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -252,7 +252,7 @@ instance, it implements several methods to assess contig-wise read coverage.") (define-public bamtools (package (name "bamtools") - (version "2.4.1") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append @@ -261,7 +261,7 @@ instance, it implements several methods to assess contig-wise read coverage.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0jr024kcrhjb82cm69i7p5fcg5375zlc1h3qh2n1v368hcd0qflk")))) + "1z3kg24qrwq13a88n9d86izngrar4fll7gr6phddb2faw75pdgaa")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no "check" target @@ -285,7 +285,7 @@ BAM files.") (define-public bcftools (package (name "bcftools") - (version "1.5") + (version "1.8") (source (origin (method url-fetch) (uri (string-append @@ -293,12 +293,11 @@ BAM files.") version "/bcftools-" version ".tar.bz2")) (sha256 (base32 - "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz")) - (patches (search-patches "bcftools-regidx-unsigned-char.patch")) + "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa")) (modules '((guix build utils))) (snippet ;; Delete bundled htslib. - '(delete-file-recursively "htslib-1.5")))) + '(delete-file-recursively "htslib-1.8")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -338,7 +337,7 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") (define-public bedops (package (name "bedops") - (version "2.4.14") + (version "2.4.33") (source (origin (method url-fetch) (uri (string-append "https://github.com/bedops/bedops/archive/v" @@ -346,7 +345,7 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1kqbac547wyqma81cyky9n7mkgikjpsfd3nnmcm6hpqwanqgh10v")))) + "0kx4awrwby8f33wqyx8w7ms7v25xhf0d421csgf96a3hfzn2mb0m")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -2080,7 +2079,7 @@ accurately delineate genomic rearrangements throughout the genome.") (define-public diamond (package (name "diamond") - (version "0.9.19") + (version "0.9.21") (source (origin (method url-fetch) (uri (string-append @@ -2089,7 +2088,7 @@ accurately delineate genomic rearrangements throughout the genome.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c4y8l90vdxmglb0w37y0413v11qzcwg8sdmy9k0c0gr3bsq7dzs")))) + "1cf98vcsiwcv3c4apg50w1240v1mpw0zln1sdw3g692dqa4y041z")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target @@ -2340,7 +2339,8 @@ dynamic programming or a variety of heuristics.") (string-append (assoc-ref inputs "bamtools") "/include/bamtools"))) (substitute* "src/CMakeLists.txt" (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib") - (string-append (assoc-ref inputs "bamtools") "/lib/bamtools"))) + (string-append (assoc-ref inputs "bamtools") "/lib")) + (("libprotobuf.a") "libprotobuf.so")) #t))))) (inputs `(("boost" ,boost) @@ -3453,7 +3453,7 @@ The main functions of FastQC are: (define-public htslib (package (name "htslib") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append @@ -3461,7 +3461,7 @@ The main functions of FastQC are: version "/htslib-" version ".tar.bz2")) (sha256 (base32 - "1il6i2p84b0y9c93dhvzzki1ifw9bvapm2mvpr0xvb2nq8jlwgdy")))) + "18bw0mn9pj5wgarnlaxmf1bb8pdqgl1zd6czirqcr62ajpn1xvy0")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) @@ -4575,7 +4575,7 @@ partial genes, and identifies translation initiation sites.") (define-public roary (package (name "roary") - (version "3.11.0") + (version "3.12.0") (source (origin (method url-fetch) @@ -4584,7 +4584,7 @@ partial genes, and identifies translation initiation sites.") version ".tar.gz")) (sha256 (base32 - "10lw78x1xzvn7xzvnmh4bm3cak3ah5cssapl0yidvhaj1f44h29i")))) + "0qxrds9wx7cfhlkihrp6697kx0flhhxymap9fwan0b3rbdhcnmff")))) (build-system perl-build-system) (arguments `(#:phases @@ -4921,7 +4921,7 @@ to the user's query of interest.") (define-public samtools (package (name "samtools") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -4930,7 +4930,7 @@ to the user's query of interest.") version "/samtools-" version ".tar.bz2")) (sha256 (base32 - "18acyqysbxpydlc44lqv2hpp57l06bs9a3yqmcvjk8va2xrrdc77")))) + "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) @@ -5769,7 +5769,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (define-public star (package (name "star") - (version "2.5.3a") + (version "2.6.0a") (source (origin (method url-fetch) (uri (string-append "https://github.com/alexdobin/STAR/archive/" @@ -5777,7 +5777,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "013wirlz8lllgjyagl48l75n1isxyabqb3sj7qlsl0x1rmvqw99a")) + "0yci4ymy4407kjh0lqp021nzccp6r31wgrkixkmix5p130cxvc56")) (modules '((guix build utils))) (snippet '(begin @@ -5964,13 +5964,13 @@ Cuffdiff or Ballgown programs.") (define-public taxtastic (package (name "taxtastic") - (version "0.6.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (pypi-uri "taxtastic" version)) (sha256 (base32 - "0s79z8kfl853x7l4h8ms05k31q87aw62nrchlk20w9n227j35929")))) + "03pysw79lsrvz4lwzis88j15067ffqbi4cid5pqhrlxmd6bh8rrk")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -6605,7 +6605,7 @@ SELECT or UPDATE queries to an end-point.") (define-public vsearch (package (name "vsearch") - (version "2.7.1") + (version "2.8.0") (source (origin (method url-fetch) @@ -6615,7 +6615,7 @@ SELECT or UPDATE queries to an end-point.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0jlzfgh79fzmb4g7sngzdjjsjyc37icvs1k7vmc2ksxglj6x5i7f")) + "15pbirgzhvflj4pi5n82vybbzjy9mlb0lv5l3qhrmdkfzpbyahw3")) (patches (search-patches "vsearch-unbundle-cityhash.patch")) (snippet '(begin @@ -9063,14 +9063,14 @@ replacement for strverscmp.") (define-public multiqc (package (name "multiqc") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (pypi-uri "multiqc" version)) (sha256 (base32 - "0ihx4rzmsfphv4byn05qv6f1y95g2dxs6viwziipl4wjk96acgm8")))) + "02iihfl0w0hpnr4pa0sbd1y9qxrg3ycyhjp5lidkcrqh1lmzs3zy")))) (build-system python-build-system) (propagated-inputs `(("python-jinja2" ,python-jinja2) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 281bb98fa9..0db6ad3f6a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -72,22 +72,6 @@ (base32 "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; <https://lists.gnu.org/archive/html/bug-grub/2018-02/msg00004.html>. -;; TODO: When grub no longer needs this version, move to gnu/packages/debug.scm. -(define qemu-minimal-2.10 - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")))))) - (define-public grub (package (name "grub") @@ -424,7 +408,7 @@ also initializes the boards (RAM etc).") (libexec (string-append out "/libexec")) (uboot-files (append (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb)$") - (find-files "." "^MLO$")))) + (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) (for-each @@ -479,6 +463,12 @@ also initializes the boards (RAM etc).") (define-public u-boot-nintendo-nes-classic-edition (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf")) +(define-public u-boot-wandboard + (make-u-boot-package "wandboard" "arm-linux-gnueabihf")) + +(define-public u-boot-mx6cuboxi + (make-u-boot-package "mx6cuboxi" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fe9fbebcc2..1026ee8929 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1026,7 +1026,10 @@ COREUTILS-FINAL vs. COREUTILS, etc." (union-build (assoc-ref %outputs "debug") (list (assoc-ref %build-inputs - "libc-debug"))))))) + "libc-debug"))) + (union-build (assoc-ref %outputs "static") + (list (assoc-ref %build-inputs + "libc-static"))))))) (native-search-paths (package-native-search-paths gcc)) (search-paths (package-search-paths gcc)) @@ -1038,7 +1041,7 @@ COREUTILS-FINAL vs. COREUTILS, etc." be installed in user profiles. This includes GCC, as well as libc (headers and binaries, plus debugging symbols in the 'debug' output), and Binutils.") (home-page "https://gcc.gnu.org/") - (outputs '("out" "debug")) + (outputs '("out" "debug" "static")) ;; The main raison d'être of this "meta-package" is (1) to conveniently ;; install everything that we need, and (2) to make sure ld-wrapper comes @@ -1047,7 +1050,8 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.") ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper"))) ("binutils" ,binutils-final) ("libc" ,glibc-final) - ("libc-debug" ,glibc-final "debug"))))) + ("libc-debug" ,glibc-final "debug") + ("libc-static" ,glibc-final "static"))))) (define-public gcc-toolchain-4.8 (make-gcc-toolchain gcc-4.8)) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 77e5054314..bc95fd2aa4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2571,14 +2571,14 @@ display.") (define-public r-pillar (package (name "r-pillar") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "pillar" version)) (sha256 (base32 - "1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd")))) + "1kmqvny3rw4p5kgxz6mhqfpp7j3nnpp22dfai4kjrr2cfmj6wvb7")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) @@ -2637,14 +2637,14 @@ automatically.") (define-public r-metap (package (name "r-metap") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (cran-uri "metap" version)) (sha256 (base32 - "06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh")))) + "03vg0mb6q7j2z0pkxykbak0hcp6dcak7zxs1lw9hswz9kqrq5jhz")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -3946,3 +3946,30 @@ if no cluster is present or wished. The package is also designed as connector to the cluster management tool @code{sfCluster}, but can also used without it.") (license license:gpl2+))) + +(define-public r-codedepends + (package + (name "r-codedepends") + (version "0.5-3") + (source + (origin + (method url-fetch) + (uri (cran-uri "CodeDepends" version)) + (sha256 + (base32 + "03p82s0abca2jimzqvxdzykfzca7c7fhm5xsjxybcksr4gggr5sc")))) + (properties `((upstream-name . "CodeDepends"))) + (build-system r-build-system) + (propagated-inputs + `(("r-codetools" ,r-codetools) + ("r-xml" ,r-xml))) + (home-page "http://cran.r-project.org/web/packages/CodeDepends") + (synopsis "Analysis of R code for reproducible research and code comprehension") + (description + "This package provides tools for analyzing R expressions or blocks of +code and determining the dependencies between them. It focuses on R scripts, +but can be used on the bodies of functions. There are many facilities +including the ability to summarize or get a high-level view of code, +determining dependencies between variables, code improvement suggestions.") + ;; Any version of the GPL + (license (list license:gpl2+ license:gpl3+)))) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 62e308a07e..d6722702d8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -605,7 +605,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public escpr (package (name "escpr") - (version "1.6.18") + (version "1.6.20") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -613,12 +613,12 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) ;; The uri has to be chopped up in order to satisfy guix lint. - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/06/86/80/" - "9955e43f3aead20366851d24cea65de779cf5aa7/" - "epson-inkjet-printer-escpr-1.6.18-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/07/16/23/" + "804253d188a31ae6a0f2722648248ef952afedfb/" + "epson-inkjet-printer-escpr-1.6.20-1lsb3.2.tar.gz")) (sha256 (base32 - "137jf52dhi5v2rkmlw4b73f7r7f98m61dpgsb7yvqs2f0yhsjsb3")))) + "19800pl7kbbgdzbsy9ijmd7dm3ly4kr2h1dxypqpd075g6n0i770")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 112c656ff8..c12baf4e2b 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,7 +170,7 @@ tools that process C/C++ code.") (inputs `(("custom-qemu" ;; The afl-qemu tool builds qemu 2.10.0 with a few patches applied. - ,(package (inherit (@@ (gnu packages bootloaders) qemu-minimal-2.10)) + ,(package (inherit qemu-minimal-2.10) (name "afl-qemu") (inputs `(("afl-src" ,source) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 595000bf88..d7bf726830 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> +;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages gettext) @@ -502,3 +504,29 @@ your data as it changes, without having to re-checksum unchanged data. Duperemove can also take input from the @command{fdupes} program.") (license license:gpl2))) + +(define-public ranger + (package + (name "ranger") + (version "1.9.1") + (source (origin + (method url-fetch) + (uri (string-append "https://ranger.github.io/" + "ranger-" version ".tar.gz")) + (sha256 + (base32 + "1lnzkrxcnlwnyi3z0v8ybyp8d5rm26qm35rr68kbs2lbs06inha0")))) + (build-system python-build-system) + (native-inputs ;for tests + `(("python-pytest" ,python-pytest) + ("python-pylint" ,python-pylint) + ("python-flake8" ,python-flake8) + ("which" ,which))) + (arguments '(#:test-target "test")) + (home-page "https://ranger.github.io/") + (synopsis "Console file manager") + (description "ranger is a console file manager with Vi key bindings. It +provides a minimalistic and nice curses interface with a view on the directory +hierarchy. It ships with @code{rifle}, a file launcher that is good at +automatically finding out which program to use for what file type.") + (license license:gpl3))) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 802f289c6d..4738310320 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com> +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Chris Marusich <cmmarusich@gmail.com> @@ -319,14 +319,14 @@ editor (without an X toolkit)" ) (define-public geiser (package (name "geiser") - (version "0.9") + (version "0.10") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/geiser/" version "/geiser-" version ".tar.gz")) (sha256 (base32 - "0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss")))) + "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv")))) (build-system gnu-build-system) (arguments '(#:phases @@ -351,10 +351,6 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live metadata.") (license license:bsd-3))) -(define-public geiser-next - ;; This has become "geiser". - (deprecated-package "geiser-next" geiser)) - (define-public paredit (package (name "emacs-paredit") @@ -380,9 +376,6 @@ for those who may want transient periods of unbalanced parentheses, such as when typing parentheses directly or commenting out code line by line.") (license license:gpl3+))) -(define-public paredit/old-name - (deprecated-package "paredit" paredit)) - (define-public git-modes (package (name "emacs-git-modes") @@ -410,7 +403,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "2.7.0") + (version "2.7.2") (source (origin (method url-fetch) (uri (string-append @@ -419,7 +412,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kah7pv211zx9fsb5g4hd51bqcq2bxd1chdykd488ihvfz1l5y14")))) + "1jqi3axcs0cb1pcv1jxxc2a09v6psrm33wwl6hmyshzl8kbxs2mv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) @@ -558,7 +551,7 @@ support for Git-SVN.") (define-public emacs-magit-popup (package (name "emacs-magit-popup") - (version "2.12.0") + (version "2.12.3") (source (origin (method url-fetch) (uri (string-append @@ -567,7 +560,7 @@ support for Git-SVN.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dnk611f7lww6rb03hk8ijg2jwxx9f26pjfff4bwjmnjz7hnd6vz")))) + "1kz6vj67awkwf9y2wj6m3l2him3znm08z6bkdvnmfr6rwd96dr39")))) (build-system emacs-build-system) (arguments `(#:phases @@ -4527,6 +4520,31 @@ main features of Vim, and provides facilities for writing custom extensions.") (license license:gpl3+))) +(define-public emacs-evil-collection + (let ((commit "f40704a57fd33b4bfad64147a2b771fc8961fdfc") + (revision "1")) + (package + (name "emacs-evil-collection") + (version (git-version "20180425" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-evil/evil-collection") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0qn19k0f3isnbi1hkmcf3qjxbyvp23m5ak5ny7623qgwb2nwz1l5")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-evil" ,emacs-evil))) + (home-page "https://github.com/emacs-evil/evil-collection") + (synopsis "Collection of Evil bindings for many major and minor modes") + (description "This is a collection of Evil bindings for the parts of +Emacs that Evil does not cover properly by default, such as @code{help-mode}, +@code{M-x calendar}, Eshell and more.") + (license license:gpl3+)))) + (define-public emacs-goto-chg (package (name "emacs-goto-chg") @@ -5190,6 +5208,34 @@ To make YASnippet aware of these snippets, add the above directory to Yasnippet.") (license license:gpl2+)))) +(define-public emacs-helm-system-packages + (let ((commit "986b7bd360a705053500c4ce2c9bea03dd7b24a6") + (revision "1")) + (package + (name "emacs-helm-system-packages") + (version (git-version "1.9.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-system-packages") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "19iklhpxgh5xx6h4dysf58nd46lmyb46xj601lf7kbwl6yq0y61f")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/emacs-helm/helm-system-packages") + (synopsis "Helm System Packages is an interface to your package manager") + (description "List all available packages in Helm (with installed +packages displayed in their own respective face). Fuzzy-search, mark and +execute the desired action over any selections of packages: Install, +uninstall, display packages details (in Org Mode) or insert details at point, +find files owned by packages... And much more, including performing all the +above over the network.") + (license license:gpl3+)))) + (define-public emacs-memoize (package (name "emacs-memoize") @@ -6823,15 +6869,17 @@ well as Github-style emojis like @code{:smile:}. It provides a minor mode (define-public emacs-websocket (package (name "emacs-websocket") - (version "1.8") + (version "1.10") (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/websocket-" - version ".tar")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahyatt/emacs-websocket.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9")))) + "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") @@ -6895,8 +6943,8 @@ want to use it.") (license license:gpl3+))) (define-public emacs-slack - (let ((commit "92724604879149cf331fa8778d089813a9d4ce1a") - (revision "3")) + (let ((commit "d90395482d26175ce38fd935e978c428be8af9a0") + (revision "4")) (package (name "emacs-slack") (version (string-append "0-" revision "." (string-take commit 7))) @@ -6908,7 +6956,7 @@ want to use it.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1fdf8s3ca356k7m7f5kqzfamfl2nrqjj2pynjv3kkrr0ad15nxmw")))) + "14f6wjcbl09cfd3yngr6m1k1d4nr764im666mbnqbk9nmqf50nib")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-alert" ,emacs-alert) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9bf78ce05f..82283e1bcf 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1051,7 +1051,7 @@ emulation community. It provides highly accurate emulation.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1sk3cp8y4rdiyhk2rgk1asdla5mpmybr778v0zqb5m4iyhrd1m2y")))) + (base32 "1y9fakr41h6xpddpkj12mcw1kgldvy76nzvxm5jk5v7iyiks4c6k")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 0138b7287f..d5e97523dc 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages pdf) + #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -179,7 +180,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri @@ -187,24 +188,17 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns")) + "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx")) (modules '((guix build utils))) ;; Remove the bundled fonts. ;; TODO: Remove bundled lz4. (snippet '(begin (delete-file-recursively "data/fonts") - (substitute* '("data/Makefile.in" "data/Makefile.am") - (("fonts") "")) - (substitute* "configure" - (("data/fonts/Makefile") "") - (("\\\"data/fonts/Makefile") "# \"data/fonts/Makefile")) - (substitute* '("data/themes/Makefile.in" - "data/themes/Makefile.am" - "data/themes/nyanology/Makefile.in" - "data/themes/nyanology/Makefile.am") - (("-fd \\$\\(top_srcdir\\)/data/fonts") "")))))) - (build-system gnu-build-system) + (substitute* "data/meson.build" + (("subdir\\('fonts'\\)") "")) + #t)))) + (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -213,6 +207,7 @@ removable devices or support for multimedia.") (lambda _ (setenv "HOME" "/tmp") #t))))) (native-inputs `(("gettext" ,gettext-minimal) + ("perl" ,perl) ("pkg-config" ,pkg-config))) (inputs `(("efl" ,efl))) @@ -259,7 +254,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.22.2") + (version "0.22.3") (source (origin (method url-fetch) (uri @@ -267,7 +262,7 @@ Libraries with some extra bells and whistles.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d")))) + "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-mount-eeze") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 11a58d1b2f..05b12789af 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -343,7 +343,7 @@ of a the system to know what users are logged in, and where.") (define-public packagekit (package (name "packagekit") - (version "1.1.5") + (version "1.1.10") (source (origin (method url-fetch) (uri (string-append @@ -352,7 +352,7 @@ of a the system to know what users are logged in, and where.") "PackageKit-" version ".tar.xz")) (sha256 (base32 - "035pqxgkyki813hyw2frrbpfllq113zfk5qcp9wvsq5lsp74ix2h")))) + "1msfmb22cm4s3l6vsbr86b8s0v897sy6gcga3qg87z7640a0di2b")))) (build-system gnu-build-system) (arguments `(#:tests? #f diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0039a738cc..86abf9f37c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1064,16 +1065,34 @@ games.") (define-public godot (package (name "godot") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/godotengine/godot/archive/" version "-stable.tar.gz")) - (file-name (string-append name "-" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p")))) + "0ldnk3j4w2kh454mzclmq8nk7zqrn758yrqq85i4kzljpkf93g0m")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop libraries that we take from Guix. Note that some + ;; of these may be modified; see "thirdparty/README.md". + (with-directory-excursion "thirdparty" + (for-each delete-file-recursively + '("freetype" + "libogg" + "libpng" + "libtheora" + "libvorbis" + "libvpx" + "libwebp" + "openssl" + "opus" + "zlib")) + #t))))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 @@ -1091,6 +1110,7 @@ games.") "builtin_libpng=no" "builtin_libtheora=no" "builtin_libvorbis=no" + "builtin_libvpx=no" "builtin_libwebp=no" "builtin_openssl=no" "builtin_opus=no" @@ -1146,6 +1166,7 @@ games.") ("glu" ,glu) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) + ("libvpx" ,libvpx) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcursor" ,libxcursor) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aac1f08978..0147b20c09 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -533,7 +533,7 @@ and keep up to date translations of documentation.") (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.26.2") + (version "3.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -541,7 +541,7 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1wjnw9hpjqyhrr116491rfzd0837g6jqvzq2z1ndx2sdqv19caxa")))) + "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") @@ -725,7 +725,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.28.0") + (version "3.28.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -733,7 +733,7 @@ forgotten when the session ends.") name "-" version ".tar.xz")) (sha256 (base32 - "1a3kcls18dcz1lj8hrx8skcli9xxfyi71c17xjwayh71cm5jc8zs")))) + "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") @@ -2062,7 +2062,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.50.2") + (version "0.52.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2070,7 +2070,7 @@ libraries written in C.") name "-" version ".tar.xz")) (sha256 (base32 - "1kq9bxf7waap190zx5k78d21y3l31npblrnhfkxz4j7zz9mk3pbr")))) + "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -2731,7 +2731,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.26.2") + (version "3.28.1") (source (origin (method url-fetch) @@ -2740,7 +2740,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "1c05f2lrlm8jfx2394k6nabg4ml07lqasxaja5v98mhlm0aa96rs")))) + "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags @@ -6294,7 +6294,7 @@ existing databases over the internet.") (define-public gnome-tweak-tool (package (name "gnome-tweak-tool") - (version "3.24.1") + (version "3.26.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/" @@ -6304,7 +6304,7 @@ existing databases over the internet.") (search-patch "gnome-tweak-tool-search-paths.patch"))) (sha256 (base32 - "0rgmm7n6jwc5hz64sprm4jxnky62hw839a7r18rn1mj884vnn8hr")))) + "1pq5a0kzh1sz7s7ax5c7p6212k9d51nk5bfvjfyqn99cs928187x")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--localstatedir=/tmp" @@ -6312,6 +6312,16 @@ existing databases over the internet.") #:imported-modules ((guix build python-build-system) ,@%glib-or-gtk-build-system-modules) #:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (invoke "meson" "build" + "--prefix" (assoc-ref outputs "out")))) + (replace 'check + (lambda _ (invoke "ninja" "-C" "build" "test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "ninja" "-C" "build" "install"))) (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -6322,17 +6332,21 @@ existing databases over the internet.") (add-after 'install 'wrap (@@ (guix build python-build-system) wrap))))) (native-inputs - `(("intltool" ,intltool) + `(("gtk+:bin" ,gtk+ "bin") ; For gtk-update-icon-cache + ("intltool" ,intltool) + ("meson" ,meson-for-build) + ("ninja" ,ninja) ("pkg-config" ,pkg-config))) (inputs - `(("python" ,python-2) - ("python2-pygobject" ,python2-pygobject) - ("gnome-desktop" ,gnome-desktop) - ("libsoup" ,libsoup) - ("libnotify" ,libnotify) + `(("gnome-desktop" ,gnome-desktop) + ("gtk+" ,gtk+) ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+))) + ("libnotify" ,libnotify) + ("libsoup" ,libsoup) + ("nautilus" ,nautilus) + ("python" ,python) + ("python-pygobject" ,python-pygobject))) (synopsis "Customize advanced GNOME 3 options") (home-page "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool") (description diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 29421446ed..f397482ab0 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -795,7 +795,7 @@ passphrase when @code{gpg} is run and needs it."))) (define-public paperkey (package (name "paperkey") - (version "1.3") + (version "1.5") (source (origin (method url-fetch) (uri (string-append "http://www.jabberwocky.com/" @@ -803,7 +803,7 @@ passphrase when @code{gpg} is run and needs it."))) version ".tar.gz")) (sha256 (base32 - "1yybj8bj68v4lxwpn596b6ismh2fyixw5vlqqg26byrn4d9dfmsv")))) + "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b954988712..2af6f875e9 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1481,7 +1481,7 @@ users and in some situations.") (description "Sly is a 2D/3D game engine written in Guile Scheme. Sly features a functional reactive programming interface and live coding capabilities.") - (home-page "http://dthompson.us/pages/software/sly.html") + (home-page "https://dthompson.us/projects/sly.html") (license license:gpl3+))) (define-public g-wrap diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 38a1fb3a2d..219e803089 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -65,18 +65,17 @@ (define-public quassel (package (name "quassel") - (version "0.12.4") + (version "0.12.5") (source (origin (method url-fetch) (uri (string-append "http://quassel-irc.org/pub/quassel-" version ".tar.bz2")) - (patches (search-patches "quassel-fix-tls-check.patch")) (sha256 (base32 - "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k")) + "1qkl3sb4ijx4k17m0c42j2p5bc4jymypwhmplm942rbrzm6mg50q")) (modules '((guix build utils))) - ;; We don't want to install the bundles scripts + ;; We don't want to install the bundled scripts. (snippet '(begin (delete-file-recursively "data/scripts") @@ -104,7 +103,7 @@ ("qtscript" ,qtscript) ("snorenotify" ,snorenotify) ("zlib" ,zlib))) - (home-page "http://quassel-irc.org/") + (home-page "https://quassel-irc.org/") (synopsis "Distributed IRC client") (description "Quassel is a distributed IRC client, meaning that one or more clients can attach to and detach from the central core. It resembles the diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 500f27dcf2..90fd07c597 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8145,70 +8145,50 @@ by technical operatives or consultants working with enterprise platforms.") algorithms and xxHash hashing algorithm.") (license license:asl2.0))) -(define-public java-bouncycastle-bcprov +(define-public java-bouncycastle (package - (name "java-bouncycastle-bcprov") - (version "1.58") + (name "java-bouncycastle") + (version "1.59") (source (origin (method url-fetch) - (uri "https://bouncycastle.org/download/bcprov-jdk15on-158.tar.gz") + (uri (string-append "https://github.com/bcgit/bc-java/archive/r" + (substring version 0 1) "rv" + (substring version 2 4) ".tar.gz")) (sha256 (base32 - "1hgkg96llbvgs8i0krwz2n0j7wlg6jfnq8w8kg0cc899j0wfmf3n")))) + "1bwl499whlbq896w18idqw2dkp8v0wp0npv9g71i5fgf8xjh0k3q")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file + (find-files "." "\\.jar$")) + #t)))) (build-system ant-build-system) (arguments - `(#:jar-name "bouncycastle-bcprov.jar" - #:tests? #f; no tests - #:source-dir "src" + `(#:jdk ,icedtea-8 #:phases (modify-phases %standard-phases - (add-before 'configure 'unzip-src + (replace 'build (lambda _ - (mkdir-p "src") - (with-directory-excursion "src" - (invoke "unzip" "../src.zip")) - #t))))) - (native-inputs - `(("unzip" ,unzip) - ("junit" ,java-junit))) - (home-page "https://www.bouncycastle.org") - (synopsis "Cryptographic library") - (description "Bouncy Castle Provider (bcprov) is a cryptographic library -for the Java programming language.") - (license license:expat))) - -(define-public java-bouncycastle-bcpkix - (package - (name "java-bouncycastle-bcpkix") - (version "1.58") - (source (origin - (method url-fetch) - (uri "https://bouncycastle.org/download/bcpkix-jdk15on-158.tar.gz") - (sha256 - (base32 - "0is7qay02803s9f7lhnfcjlz61ni3hq5d7apg0iil7nbqkbfbcq2")))) - (build-system ant-build-system) - (arguments - `(#:jar-name "bouncycastle-bcpkix.jar" - #:tests? #f; no tests - #:source-dir "src" - #:phases - (modify-phases %standard-phases - (add-before 'configure 'unzip-src + (invoke "ant" "-f" "ant/jdk15+.xml" "build-provider") + (invoke "ant" "-f" "ant/jdk15+.xml" "build") + #t)) + (replace 'check (lambda _ - (mkdir-p "src") - (with-directory-excursion "src" - (invoke "unzip" "../src.zip")) - #t))))) + (invoke "ant" "-f" "ant/jdk15+.xml" "test"))) + (replace 'install + (install-jars "build/artifacts/jdk1.5/jars"))))) + (inputs + `(("java-javax-mail" ,java-javax-mail))) (native-inputs `(("unzip" ,unzip) - ("junit" ,java-junit))) - (inputs - `(("bcprov" ,java-bouncycastle-bcprov))) + ("junit" ,java-junit) + ("java-native-access" ,java-native-access) + ("java-native-access-platform" ,java-native-access-platform))) (home-page "https://www.bouncycastle.org") (synopsis "Cryptographic library") - (description "Bouncy Castle Java API for PKIX, CMS, EAC, TSP, PKCS, OCSP, -CMP, and CRMF.") + (description "Bouncy Castle is a cryptographic library for the Java +programming language.") (license license:expat))) (define-public java-lmax-disruptor @@ -8631,8 +8611,7 @@ protocol-independent framework to build mail and messaging applications.") ("powermock-junit4-common" ,java-powermock-modules-junit4-common) ("powermock-junit4" ,java-powermock-modules-junit4) ("powermock-support" ,java-powermock-api-support) - ("bouncycastle" ,java-bouncycastle-bcprov) - ("bouncycastle-bcpkix" ,java-bouncycastle-bcpkix))) + ("java-bouncycastle" ,java-bouncycastle))) (home-page "https://kafka.apache.org") (synopsis "Distributed streaming platform") (description "Kafka is a distributed streaming platform, which means: @@ -9605,3 +9584,225 @@ Java method invocation.") and mappings for a number of commonly used platform functions, including a large number of Win32 mappings as well as a set of utility classes that simplify native access."))) + +(define-public java-jsch-agentproxy-core + (package + (name "java-jsch-agentproxy-core") + (version "0.0.8") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ymnk/jsch-agent-proxy/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02iqg6jbc1kxvfzqcg6wy9ygqxfm82bw5rf6vnswqy4y572niz4q")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jsch-agentproxy-core.jar" + #:source-dir "jsch-agent-proxy-core/src/main/java" + #:tests? #f)); no tests + (home-page "https://github.com/ymnk/jsch-agent-proxy") + (synopsis "Core component of the proxy to ssh-agent and Pageant in Java") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included Putty. It will be easily integrated into JSch, and users +will be allowed to use these programs for authentication.") + (license license:bsd-3))) + +(define-public java-jsch-agentproxy-sshagent + (package + (inherit java-jsch-agentproxy-core) + (name "java-jsch-agentproxy-sshagent") + (arguments + `(#:jar-name "jsch-agentproxy-sshagent.jar" + #:source-dir "jsch-agent-proxy-sshagent/src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core))) + (synopsis "Proxy to ssh-agent") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included in Putty. This component contains the code for a proxy to +ssh-agent."))) + +(define-public java-jsch-agentproxy-usocket-jna + (package + (inherit java-jsch-agentproxy-core) + (name "java-jsch-agentproxy-usocket-jna") + (arguments + `(#:jar-name "jsch-agentproxy-usocket-jna.jar" + #:source-dir "jsch-agent-proxy-usocket-jna/src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core) + ("java-native-access" ,java-native-access))) + (synopsis "USocketFactory implementation using JNA") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included in Putty. This component contains an implementation of +USocketFactory using @dfn{JNA} (Java Native Access)."))) + +(define-public java-jsch-agentproxy-pageant + (package + (inherit java-jsch-agentproxy-core) + (name "java-jsch-agentproxy-pageant") + (arguments + `(#:jar-name "jsch-agentproxy-pageant.jar" + #:source-dir "jsch-agent-proxy-pageant/src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core) + ("java-native-access" ,java-native-access) + ("java-native-access-platform" ,java-native-access-platform))) + (synopsis "Proxy to pageant") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included in Putty. This component contains the code for a proxy to +pageant."))) + +(define-public java-jsch-agentproxy-usocket-nc + (package + (inherit java-jsch-agentproxy-core) + (name "java-jsch-agentproxy-usocket-nc") + (arguments + `(#:jar-name "jsch-agentproxy-usocket-nc.jar" + #:source-dir "jsch-agent-proxy-usocket-nc/src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core))) + (synopsis "USocketFactory implementation using netcat") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included in Putty. This component contains an implementation of +USocketFactory using netcat."))) + +(define-public java-jsch-agentproxy-connector-factory + (package + (inherit java-jsch-agentproxy-core) + (name "java-jsch-agentproxy-connector-factory") + (arguments + `(#:jar-name "jsch-agentproxy-connector-factory.jar" + #:source-dir "jsch-agent-proxy-connector-factory/src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core) + ("java-jsch-agentproxy-sshagent" ,java-jsch-agentproxy-sshagent) + ("java-jsch-agentproxy-usocket-jna" ,java-jsch-agentproxy-usocket-jna) + ("java-jsch-agentproxy-pageant" ,java-jsch-agentproxy-pageant) + ("java-jsch-agentproxy-usocket-nc" ,java-jsch-agentproxy-usocket-nc))) + (synopsis "Connector factory for jsch agent proxy") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included in Putty. This component contains a connector factory."))) + +(define-public java-jsch-agentproxy-jsch + (package + (inherit java-jsch-agentproxy-core) + (name "java-jsch-agentproxy-jsch") + (arguments + `(#:jar-name "jsch-agentproxy-jsch.jar" + #:source-dir "jsch-agent-proxy-jsch/src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-jsch" ,java-jsch) + ("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core))) + (synopsis "JSch integration library for agentproxy") + (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent +and Pageant included in Putty. This component contains a library to use +jsch-agent-proxy with JSch."))) + +(define-public java-apache-ivy + (package + (name "java-apache-ivy") + (version "2.4.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache//ant/ivy/" version + "/apache-ivy-" version "-src.tar.gz")) + (sha256 + (base32 + "1xkfn57g2m7l6y0xdq75x5rnrgk52m9jx2xah70g3ggl8750hbr0")) + (patches + (search-patches + "java-apache-ivy-port-to-latest-bouncycastle.patch")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "ivy.jar" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'remove-example + (lambda _ + (delete-file-recursively "src/example") + #t)) + (add-before 'build 'copy-resources + (lambda _ + (with-directory-excursion "src/java" + (for-each (lambda (file) + (install-file file (string-append "../../build/classes/" (dirname file)))) + (append + (find-files "." ".*.css") + (find-files "." ".*.ent") + (find-files "." ".*.html") + (find-files "." ".*.properties") + (find-files "." ".*.xsd") + (find-files "." ".*.xsl") + (find-files "." ".*.xml")))))) + (add-before 'build 'fix-vfs + (lambda _ + (substitute* + '("src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java" + "src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java") + (("import org.apache.commons.vfs") "import org.apache.commons.vfs2")) + #t)) + (add-before 'install 'copy-manifest + (lambda _ + (install-file "META-INF/MANIFEST.MF" "build/classes/META-INF") + #t)) + (add-before 'install 'repack + (lambda _ + (invoke "jar" "-cmf" "build/classes/META-INF/MANIFEST.MF" "build/jar/ivy.jar" + "-C" "build/classes" ".") + #t)) + (add-after 'install 'install-bin + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) + (ivy (string-append bin "/ivy")) + (jar (string-append (assoc-ref outputs "out") "/share/java/ivy.jar"))) + (mkdir-p bin) + (with-output-to-file ivy + (lambda _ + (display (string-append + "#!" (which "sh") "\n" + "if [[ -z $CLASSPATH ]]; then\n" + " cp=\"" (getenv "CLASSPATH") ":" jar "\"\n" + "else\n" + " cp=\"" (getenv "CLASSPATH") ":" jar ":$CLASSPATH\"\n" + "fi\n" + (which "java") " -cp $cp org.apache.ivy.Main $@\n")))) + (chmod ivy #o755) + #t)))))) + (inputs + `(("java-bouncycastle" ,java-bouncycastle) + ("java-commons-cli" ,java-commons-cli) + ("java-commons-collections" ,java-commons-collections) + ("java-commons-httpclient" ,java-commons-httpclient) + ("java-commons-lang" ,java-commons-lang) + ("java-commons-vfs" ,java-commons-vfs) + ("java-jakarta-oro" ,java-jakarta-oro) + ("java-jsch" ,java-jsch) + ("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core) + ("java-jsch-agentproxy-connector-factory" ,java-jsch-agentproxy-connector-factory) + ("java-jsch-agentproxy-jsch" ,java-jsch-agentproxy-jsch) + ("java-junit" ,java-junit))) + (home-page "https://ant.apache.org/ivy") + (synopsis "Dependency manager for the Java programming language") + (description "Ivy is a tool for managing (recording, tracking, resolving +and reporting) project dependencies. It is characterized by the following: + +@itemize +@item flexibility and configurability - Ivy is essentially process agnostic + and is not tied to any methodology or structure. Instead it provides the + necessary flexibility and configurability to be adapted to a broad range + of dependency management and build processes. +@item tight integration with Apache Ant - while available as a standalone tool, + Ivy works particularly well with Apache Ant providing a number of + powerful Ant tasks ranging from dependency resolution to dependency + reporting and publication. +@end itemize") + (license license:asl2.0))) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 7a44abdec2..6fb1eee6cc 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -384,7 +384,7 @@ ;; Julia is not officially released for ARM and MIPS. ;; See https://github.com/JuliaLang/julia/issues/10639 (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) - (home-page "http://julialang.org/") + (home-page "https://julialang.org/") (synopsis "High-performance dynamic language for technical computing") (description "Julia is a high-level, high-performance dynamic programming language for diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index ef40e018b1..adcdff1ca1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -359,14 +359,14 @@ CorelDRAW documents of all versions.") (define-public libetonyek (package (name "libetonyek") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1b1lqy6g7flximlv0bp8jbsivyhdp679yj0d0q4jzm968h6y3nv9")))) + "0bfq9rwm040xhh7b3v0gsdavwvnrz4hkwnhpggarxk70mr3j7jcx")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-mdds=1.2"))) @@ -611,14 +611,14 @@ spreadsheet documents.") (define-public libstaroffice (package (name "libstaroffice") - (version "0.0.5") + (version "0.0.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/fosnola/libstaroffice/releases/download/" version "/libstaroffice-" version ".tar.xz")) (sha256 (base32 - "10m9imcgqf7kdhn1a5ara62fdayidwm7qzj3binsls40snnhfm9i")))) + "1i0ykl0c94lc1qzb5mbyf9jr7qw8p38ja424whmhgrllh7ny203b")))) (build-system gnu-build-system) (inputs `(("librevenge" ,librevenge) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d0acca8836..4ebdca3b57 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 Dave Love <fx@gnu.org> +;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -391,8 +392,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.16.4") -(define %linux-libre-hash "0lq3yv88yd9zcz52bl4hfllb41vy1i826gcim6qjjc88assqib9i") +(define %linux-libre-version "4.16.6") +(define %linux-libre-hash "069bxqx27xib1gz4aayy8ar2hfp68cpdi8h51g6453k0w14pkchn") (define-public linux-libre (make-linux-libre %linux-libre-version @@ -400,8 +401,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.36") -(define %linux-libre-4.14-hash "03iwsaa5bb43v2yq81n0i9ysj63fik0nnhlrvwq8zsk8ni9sl6yb") +(define %linux-libre-4.14-version "4.14.38") +(define %linux-libre-4.14-hash "09lmz8zbd3c1qf8z3d2lkhcqcwawajh76s85zdhgqdmd2idpwach") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -410,14 +411,14 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.96" - "0w4j8pfpa1qfyv1ipqvdalfydsw2d1ygqd4aj9ls7f16rxq3clw0" + (make-linux-libre "4.9.97" + "1xc3mj1qi51n1kr5bxmdf1rlpyj78x9imhfc7gihn8qjc6zsf1sp" %intel-compatible-systems #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.129" - "1m4434iabnpn77521lm59wzjprq5brx8vr1952jd5a4gqwilmnnb" + (make-linux-libre "4.4.130" + "15cayafj7d9y5fs9flg115kzrcrjycbvax9hgfzz6yym94v9k8lk" %intel-compatible-systems #:configuration-file kernel-config)) @@ -4304,20 +4305,20 @@ available in the kernel Linux.") (define-public cpuid (package (name "cpuid") - (version "20170122") + (version "20180419") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "0ra8ph9m1dckqaikfnbsh408fp2w9k49fkl423fl2hvhwsm14xk6")))) + "0cnxj72pjalsszhn862r6shw64zbrkw0k3mm36fn93bivswjnj12")))) (build-system gnu-build-system) (arguments '(#:make-flags '("CC=gcc") - #:tests? #f ; no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure) + (delete 'configure) ; no configure script (add-before 'install 'fix-makefile (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile" @@ -4631,3 +4632,98 @@ the @code{coretemp} module and sets the fan speed using the @code{applesmc} module. It can be executed as a daemon or in the foreground with root privileges.") (license license:gpl3+))) + +(define-public psm2 + (package + (name "psm2") + (version "10.3-46") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/opa-psm2.git") + (commit (string-append "PSM2_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wadphv4rl5p38x6a3dgpbijlzqdvcn02cfafnp72nh9faz0zvlx")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + `(,(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-Makefiles + (lambda _ + (substitute* "Makefile" + (("/lib64") "/lib") + (("/usr") "")) + (substitute* "compat/Makefile" + (("/lib64") "/lib") + (("/usr") "")) + #t)) + (replace 'install + (lambda _ + (setenv "DESTDIR" %output) + (invoke "make" "install") + #t))))) + (inputs + `(("rdma-core" ,rdma-core) + ("numactl" ,numactl))) + (synopsis "Intel Performance Scaled Messaging 2 (PSM2) library") + (description + "This package is low-level user-level Intel's communications interface. +The PSM2 API is a high-performance vendor-specific protocol that provides a +low-level communications interface for the Intel Omni-Path family of +high-speed networking devices.") + (home-page "https://github.com/intel/opa-psm2") + ;; Only the x86_64 architecure is supported. + (supported-systems '("x86_64-linux")) + (license (list license:bsd-3 license:gpl2)))) ; dual + +(define-public libpfm4 + (package + (name "libpfm4") + (version "4.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/perfmon2/" + name "/libpfm-" version ".tar.gz")) + (sha256 + (base32 + "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv")))) + (build-system gnu-build-system) + (arguments + '(#:modules ((guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (setenv "CC" "gcc") + (invoke "make") + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (invoke "make" + (string-append "PREFIX=" out) + "install") + #t)))))) + (synopsis "Performance event monitoring library") + (description + "This package provides a library called libpfm4, which is used to develop +monitoring tools exploiting the performance monitoring events such as those +provided by the Performance Monitoring Unit (PMU) of modern processors. + +Libpfm4 helps convert from an event name, expressed as a string, to the event +encoding that is either the raw event as documented by the hardware vendor or +the OS-specific encoding. In the latter case, the library is able to prepare +the OS-specific data structures needed by the kernel to setup the event. + +libpfm4 provides support for the @code{perf_events} interface, which was +introduced in Linux 2.6.31.") + (home-page "http://perfmon2.sourceforge.net/") + (license license:expat))) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 58961d2452..67e66f8f6b 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -48,7 +48,7 @@ (define-public libfm (package (name "libfm") - (version "1.2.5") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcmanfm/" @@ -56,7 +56,7 @@ "%29/LibFM/" name "-" version ".tar.xz")) (sha256 (base32 - "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7")))) + "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("gtk+" ,gtk+-2))) @@ -205,26 +205,25 @@ speed up the access to freedesktop.org defined application menus.") (define-public pcmanfm (package (name "pcmanfm") - (version "1.2.5") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" "PCManFM%20%2B%20Libfm%20%28tarball%20release" "%29/PCManFM/" name "-" version ".tar.xz")) - (patches (search-patches "pcmanfm-CVE-2017-8934.patch")) (sha256 (base32 - "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc")))) + "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) - ("gvfs" ,gvfs) ;for trash and mount support + ("gvfs" ,gvfs) ; for trash and mount support ("libfm" ,libfm) ("libx11" ,libx11))) (native-inputs `(("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("lxmenu-data" ,lxmenu-data))) ;for "Open With..." application list + `(("lxmenu-data" ,lxmenu-data))) ; for "Open With..." application list (synopsis "LXDE file manager") (description "PCMan is a lightweight GTK+ based file manager, compliant with freedesktop.org standard.") diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 12384a1031..f0d35484ea 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Mark Meyer <mark@ofosos.org> ;;; Copyright © 2018 Ben Woodcroft <donttrustben@gmail.com> +;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -688,3 +689,46 @@ mining and data analysis.") (define-public python2-scikit-learn (package-with-python2 python-scikit-learn)) + +(define-public python-autograd + (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (package + (name "python-autograd") + (home-page "https://github.com/HIPS/autograd") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "189sv2xb0mwnjawa9z7mrgdglc1miaq93pnck26r28fi1jdwg0z4")) + (file-name (git-file-name name version)))) + (version version) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-future" ,python-future) + ("python-numpy" ,python-numpy))) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "py.test" "-v")))))) + (synopsis "Efficiently computes derivatives of NumPy code") + (description "Autograd can automatically differentiate native Python and +NumPy code. It can handle a large subset of Python's features, including loops, +ifs, recursion and closures, and it can even take derivatives of derivatives +of derivatives. It supports reverse-mode differentiation +(a.k.a. backpropagation), which means it can efficiently take gradients of +scalar-valued functions with respect to array-valued arguments, as well as +forward-mode differentiation, and the two can be composed arbitrarily. The +main intended application of Autograd is gradient-based optimization.") + (license license:expat)))) + +(define-public python2-autograd + (package-with-python2 python-autograd)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 77e4a1d800..c492f3163d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -744,14 +744,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.26.1") + (version "0.26.2") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.gz")) (sha256 (base32 - "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk")))) + "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 353aa41167..00f35659eb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1772,7 +1772,7 @@ arising after the discretization of partial differential equations.") (define-public mumps (package (name "mumps") - (version "5.0.2") + (version "5.1.2") (source (origin (method url-fetch) @@ -1780,7 +1780,7 @@ arising after the discretization of partial differential equations.") version ".tar.gz")) (sha256 (base32 - "0igyc1pfzxdhpbad3v3lb86ixkdbqa1a8gbs15b04r2294h2nabp")) + "1s9asin08zqzmh08257sdghhivvy9vjif7c53fhaxaax2kd5qd7b")) (patches (search-patches "mumps-build-parallelism.patch")))) (build-system gnu-build-system) (inputs @@ -2199,16 +2199,18 @@ implemented in ANSI C, and MPI for communications.") (define-public scotch (package (name "scotch") - (version "6.0.4") + (version "6.0.5a") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php/" "latestfile/298/scotch_" version ".tar.gz")) (sha256 - (base32 "1ir088mvrqggyqdkx9qfynmiaffqbyih5qfl5mga2nrlm1qlsgzm")) + (base32 "0vsmgjz8qv80di3ljmc7hbdsizxxxwy2b9rgd2fl1mdc6dgbj8av")) (patches (search-patches "scotch-test-threading.patch" - "pt-scotch-build-parallelism.patch")))) + "scotch-build-parallelism.patch" + "scotch-graph-induce-type-64.patch" + "scotch-graph-diam-64.patch")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 5c832f9d13..d2ce394a03 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -60,16 +60,15 @@ extensive examples, including parsers for the Javascript and C99 languages.") (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes" - "/repository/archive.tar.gz?ref=v" - version)) - (file-name (string-append name "-" version ".tar.gz")) + "/-/archive/v" version + "/mes-" version ".tar.gz")) (sha256 (base32 - "0lbwmyl5262z28kpac6kmxxx8aglzy8n6bsicp5lyzkmzkzvjnh2")))) + "0db4f32rak839ff3n7ywkkng9672457pd2pvvgvcsyndqmmdsqw0")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0e2acedf7f..a9d317eb7b 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -88,7 +88,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.20.18") + (version "0.20.19") (source (origin (method url-fetch) (uri @@ -97,7 +97,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "0d6lz8ykyvxkl0fwnd9c5vzbbhmjh1yzv7rzhprlzfchmv12sn3a")))) + "1hsng4mnaz1jr2s3fy3q78vf2f6102lwphjdls7qln0pj8dyzk81")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4a7a3157dd..7e98fa74cf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1599,7 +1599,7 @@ is subjective.") (define-public tuxguitar (package (name "tuxguitar") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (string-append @@ -1607,7 +1607,7 @@ is subjective.") version "/tuxguitar-" version "-src.tar.gz")) (sha256 (base32 - "041275vwfr82kass7wiq9g2y82w9qrbzfinzcvfij2f2q45njwmc")) + "1yd5wv17sh6i8pkndxayfd6r2k1ccgnc4w3nda3lpniv8cpjzz3k")) (modules '((guix build utils))) (snippet '(begin @@ -1689,7 +1689,7 @@ is subjective.") #t)))))) (inputs `(("java-swt" ,java-swt))) - (home-page "http://tuxguitar.pw") + (home-page "http://tuxguitar.com.ar/") (synopsis "Multitrack tablature editor and player") (description "TuxGuitar is a guitar tablature editor with player support through midi. @@ -1881,17 +1881,17 @@ browser.") (define-public drumstick (package (name "drumstick") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df")))) + "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no test target + `(#:tests? #f ; no test target #:configure-flags '("-DLIB_SUFFIX=") #:phases (modify-phases %standard-phases @@ -1907,11 +1907,10 @@ browser.") (inputs `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg) - ("alsa-lib" ,alsa-lib) - ("fluidsynth" ,fluidsynth))) + ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) - ("libxslt" ,libxslt) ;for xsltproc + ("libxslt" ,libxslt) ; for xsltproc ("docbook-xsl" ,docbook-xsl) ("doxygen" ,doxygen))) (home-page "http://drumstick.sourceforge.net/") @@ -2148,14 +2147,14 @@ computer's keyboard.") (define-public aj-snapshot (package (name "aj-snapshot") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/aj-snapshot/" "aj-snapshot-" version ".tar.bz2")) (sha256 (base32 - "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8")))) + "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p")))) (build-system gnu-build-system) (inputs `(("minixml" ,minixml) diff --git a/gnu/packages/patches/bcftools-regidx-unsigned-char.patch b/gnu/packages/patches/bcftools-regidx-unsigned-char.patch deleted file mode 100644 index af5bc160f5..0000000000 --- a/gnu/packages/patches/bcftools-regidx-unsigned-char.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix test-regidx argument parsing on archs with unsigned char - On architectures where char is unsigned "c >= 0" was always true. -Author: Adrian Bunk <bunk@debian.org> -Bug-Debian: https://bugs.debian.org/865060 - ---- a/test/test-regidx.c -+++ b/test/test-regidx.c -@@ -336,7 +336,7 @@ - {"seed",1,0,'s'}, - {0,0,0,0} - }; -- char c; -+ int c; - int seed = (int)time(NULL); - while ((c = getopt_long(argc, argv, "hvs:",loptions,NULL)) >= 0) - { diff --git a/gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch b/gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch new file mode 100644 index 0000000000..506de833dd --- /dev/null +++ b/gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch @@ -0,0 +1,81 @@ +From 29055a825af5405e44ffcd59a776f8952bdc7203 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller <julien@lepiller.eu> +Date: Fri, 15 Dec 2017 16:03:23 +0100 +Subject: [PATCH] Port to latest bouncycastle. + +--- + .../bouncycastle/OpenPGPSignatureGenerator.java | 34 ++++++++++------------ + 1 file changed, 16 insertions(+), 18 deletions(-) + +diff --git a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java +index af7beae..34c204f 100644 +--- a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java ++++ b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java +@@ -41,6 +41,11 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; + import org.bouncycastle.openpgp.PGPSignature; + import org.bouncycastle.openpgp.PGPSignatureGenerator; + import org.bouncycastle.openpgp.PGPUtil; ++import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; ++import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; ++import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; ++import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; ++import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; + + public class OpenPGPSignatureGenerator implements SignatureGenerator { + +@@ -101,11 +106,15 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { + pgpSec = readSecretKey(keyIn); + } + +- PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(), +- BouncyCastleProvider.PROVIDER_NAME); +- PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey() +- .getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME); +- sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); ++ PBESecretKeyDecryptor decryptor = ++ new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider()) ++ .build(password.toCharArray()); ++ PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(decryptor); ++ BcPGPContentSignerBuilder builder = new BcPGPContentSignerBuilder( ++ pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1); ++ ++ PGPSignatureGenerator sGen = new PGPSignatureGenerator(builder); ++ sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); + + in = new FileInputStream(src); + out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest))); +@@ -116,22 +125,10 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { + } + + sGen.generate().encode(out); +- } catch (SignatureException e) { +- IOException ioexc = new IOException(); +- ioexc.initCause(e); +- throw ioexc; + } catch (PGPException e) { + IOException ioexc = new IOException(); + ioexc.initCause(e); + throw ioexc; +- } catch (NoSuchAlgorithmException e) { +- IOException ioexc = new IOException(); +- ioexc.initCause(e); +- throw ioexc; +- } catch (NoSuchProviderException e) { +- IOException ioexc = new IOException(); +- ioexc.initCause(e); +- throw ioexc; + } finally { + if (out != null) { + try { +@@ -156,7 +153,8 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { + + private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException { + in = PGPUtil.getDecoderStream(in); +- PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in); ++ PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in, ++ new BcKeyFingerprintCalculator()); + + PGPSecretKey key = null; + for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext();) { +-- +2.15.1 diff --git a/gnu/packages/patches/pcmanfm-CVE-2017-8934.patch b/gnu/packages/patches/pcmanfm-CVE-2017-8934.patch deleted file mode 100644 index 489d22c83b..0000000000 --- a/gnu/packages/patches/pcmanfm-CVE-2017-8934.patch +++ /dev/null @@ -1,56 +0,0 @@ -From bc8c3d871e9ecc67c47ff002b68cf049793faf08 Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko <andrej@rep.kiev.ua> -Date: Sun, 14 May 2017 21:35:40 +0300 -Subject: [PATCH] Fix potential access violation, use runtime user dir instead - of tmp dir. - ---- - NEWS | 4 ++++ - src/single-inst.c | 7 ++++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 8c2049a..876f7f3 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,7 @@ -+* Fixed potential access violation, use runtime user dir instead of tmp dir -+ for single instance socket. -+ -+ - Changes on 1.2.5 since 1.2.4: - - * Removed options to Cut, Remove and Rename from context menu on mounted -diff --git a/src/single-inst.c b/src/single-inst.c -index 62c37b3..aaf84ab 100644 ---- a/src/single-inst.c -+++ b/src/single-inst.c -@@ -2,7 +2,7 @@ - * single-inst.c: simple IPC mechanism for single instance app - * - * Copyright 2010 Hong Jen Yee (PCMan) <pcman.tw@gmail.com> -- * Copyright 2012 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua> -+ * Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -404,11 +404,16 @@ static void get_socket_name(SingleInstData* data, char* buf, int len) - } - else - dpynum = 0; -+#if GLIB_CHECK_VERSION(2, 28, 0) -+ g_snprintf(buf, len, "%s/%s-socket-%s-%d", g_get_user_runtime_dir(), -+ data->prog_name, host ? host : "", dpynum); -+#else - g_snprintf(buf, len, "%s/.%s-socket-%s-%d-%s", - g_get_tmp_dir(), - data->prog_name, - host ? host : "", - dpynum, - g_get_user_name()); -+#endif - } - --- -2.1.4 - diff --git a/gnu/packages/patches/pt-scotch-build-parallelism.patch b/gnu/packages/patches/pt-scotch-build-parallelism.patch deleted file mode 100644 index 2ac5f27f52..0000000000 --- a/gnu/packages/patches/pt-scotch-build-parallelism.patch +++ /dev/null @@ -1,13 +0,0 @@ -Building with -j may cause the esmumps_main target to fail with a "no rule for -dependency libptesmumps.a" error. Fix the dependency name. - ---- scotch_6.0.4/src/esmumps/Makefile 2012-12-01 08:29:29.000000000 -0600 -+++ scotch_6.0.4/src/esmumps/Makefile 2015-06-15 17:29:23.279605734 -0500 -@@ -160,6 +160,6 @@ - order.h \ - symbol.h \ - esmumps.h \ -- lib$(ESMUMPSLIB)$(LIB) \ -+ libesmumps$(LIB) \ - $(libdir)/lib$(SCOTCHLIB)$(LIB) \ - $(libdir)/lib$(SCOTCHLIB)errexit$(LIB) diff --git a/gnu/packages/patches/quassel-fix-tls-check.patch b/gnu/packages/patches/quassel-fix-tls-check.patch deleted file mode 100644 index 057bc02a14..0000000000 --- a/gnu/packages/patches/quassel-fix-tls-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -This allows quasselclient to connect to SSL-enabled quasselcore instances. - -The check in qglobal.h requires -fPIC (not -fPIE as it is now). When this check -fails SSL / TLS is disabled. - -This patch comes from the upstream source repository [0] and can be -removed when the next version is packaged. - -[0] https://github.com/quassel/quassel/commit/4768c9e99f99b581d4e32e797db91d0182391696 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -428,6 +428,11 @@ endif() - cmake_push_check_state(RESET) - set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") -+ -+if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE) -+ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING") -+endif() -+ - check_cxx_source_compiles(" - #include \"qglobal.h\" - #if defined QT_NO_SSL - diff --git a/gnu/packages/patches/scotch-build-parallelism.patch b/gnu/packages/patches/scotch-build-parallelism.patch new file mode 100644 index 0000000000..a669f1dbeb --- /dev/null +++ b/gnu/packages/patches/scotch-build-parallelism.patch @@ -0,0 +1,39 @@ +Fixes make with -j, otherwise scotch.h may not be generated by the time make +tries to compile library_graph_diam.o et al. + +Reported upstream at +https://gforge.inria.fr/tracker/index.php?func=detail&aid=21651&group_id=248&atid=1081 + +diff --git a/src/libscotch/Makefile b/src/libscotch/Makefile +index 9898894..b0ee14c 100644 +--- a/src/libscotch/Makefile ++++ b/src/libscotch/Makefile +@@ -2229,6 +2229,28 @@ library_graph_color_f$(OBJ) : library_graph_color_f.c \ + common.h \ + scotch.h + ++library_graph_diam$(OBJ) : library_graph_diam.c \ ++ module.h \ ++ common.h \ ++ graph.h \ ++ scotch.h ++ ++library_graph_diam_f$(OBJ) : library_graph_diam.c \ ++ module.h \ ++ common.h \ ++ scotch.h ++ ++library_graph_induce$(OBJ) : library_graph_diam.c \ ++ module.h \ ++ common.h \ ++ graph.h \ ++ scotch.h ++ ++library_graph_induce_f$(OBJ) : library_graph_diam.c \ ++ module.h \ ++ common.h \ ++ scotch.h ++ + library_graph_io_chac$(OBJ) : library_graph_io_chac.c \ + module.h \ + common.h \ diff --git a/gnu/packages/patches/scotch-graph-diam-64.patch b/gnu/packages/patches/scotch-graph-diam-64.patch new file mode 100644 index 0000000000..2ae31e3c3b --- /dev/null +++ b/gnu/packages/patches/scotch-graph-diam-64.patch @@ -0,0 +1,27 @@ +Fixes test_scotch_graph_diam test with -DINTSIZE64. + +Reported upstream at +https://gforge.inria.fr/tracker/index.php?func=detail&aid=21650&group_id=248&atid=1081 + +--- scotch-6.0.5a/src/libscotch/library.h ++++ scotch-6.0.5a/src/libscotch/library.h +@@ -187,6 +187,7 @@ SCOTCH_Num SCOTCH_graphBase (SCOTCH_Graph * const, const SCO + int SCOTCH_graphCheck (const SCOTCH_Graph * const); + void SCOTCH_graphSize (const SCOTCH_Graph * const, SCOTCH_Num * const, SCOTCH_Num * const); + void SCOTCH_graphData (const SCOTCH_Graph * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num ** const, SCOTCH_Num ** const, SCOTCH_Num ** const, SCOTCH_Num ** const, SCOTCH_Num * const, SCOTCH_Num ** const, SCOTCH_Num ** const); ++SCOTCH_Num SCOTCH_graphDiamPV (SCOTCH_Graph * const); + void SCOTCH_graphStat (const SCOTCH_Graph * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, double * const, double * const, SCOTCH_Num * const, SCOTCH_Num * const, double * const, double * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, double * const, double * const); + int SCOTCH_graphCoarsen (const SCOTCH_Graph * const, const SCOTCH_Num, const double, const SCOTCH_Num, SCOTCH_Graph * const, SCOTCH_Num * const); + int SCOTCH_graphCoarsenMatch (const SCOTCH_Graph * const, SCOTCH_Num * const, const double, const SCOTCH_Num, SCOTCH_Num * const); +--- scotch-6.0.5a/src/libscotch/library_graph_diam.c ++++ scotch-6.0.5a/src/libscotch/library_graph_diam.c +@@ -72,8 +72,7 @@ + + SCOTCH_Num + SCOTCH_graphDiamPV ( +-SCOTCH_Graph * const grafptr, +-const SCOTCH_Num baseval) ++SCOTCH_Graph * const grafptr) + { + return ((SCOTCH_Num) graphDiamPV ((Graph * const) grafptr)); + } diff --git a/gnu/packages/patches/scotch-graph-induce-type-64.patch b/gnu/packages/patches/scotch-graph-induce-type-64.patch new file mode 100644 index 0000000000..d2eee52a7b --- /dev/null +++ b/gnu/packages/patches/scotch-graph-induce-type-64.patch @@ -0,0 +1,19 @@ +Fixes return type of SCOTCH_graphInduceList and SCOTCH_graphInducePart +so that the definition matches with -DINTSIZE64. + +Reported upstream at +https://gforge.inria.fr/tracker/index.php?func=detail&aid=21608&group_id=248&atid=1081 + +--- scotch_6.0.5a/src/libscotch/library.h.orig 2018-02-11 10:52:38.000000000 -0600 ++++ scotch_6.0.5a/src/libscotch/library.h 2018-02-23 16:56:41.000000000 -0600 +@@ -199,8 +199,8 @@ + int SCOTCH_graphGeomSaveChac (const SCOTCH_Graph * const, const SCOTCH_Geom * const, FILE * const, FILE * const, const char * const); + int SCOTCH_graphGeomSaveMmkt (const SCOTCH_Graph * const, const SCOTCH_Geom * const, FILE * const, FILE * const, const char * const); + int SCOTCH_graphGeomSaveScot (const SCOTCH_Graph * const, const SCOTCH_Geom * const, FILE * const, FILE * const, const char * const); +-int SCOTCH_graphInduceList (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, SCOTCH_Graph * const); +-int SCOTCH_graphInducePart (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_GraphPart2 * const, const SCOTCH_GraphPart2, SCOTCH_Graph * const); ++SCOTCH_Num SCOTCH_graphInduceList (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, SCOTCH_Graph * const); ++SCOTCH_Num SCOTCH_graphInducePart (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_GraphPart2 * const, const SCOTCH_GraphPart2, SCOTCH_Graph * const); + + int SCOTCH_graphMapInit (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Arch * const, SCOTCH_Num * const); + void SCOTCH_graphMapExit (const SCOTCH_Graph * const, SCOTCH_Mapping * const); diff --git a/gnu/packages/patches/zsh-CVE-2018-7548.patch b/gnu/packages/patches/zsh-CVE-2018-7548.patch deleted file mode 100644 index 1ee15fad73..0000000000 --- a/gnu/packages/patches/zsh-CVE-2018-7548.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix CVE-2018-7548: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7548 - -Patch copied from upstream source repository: - -https://sourceforge.net/p/zsh/code/ci/110b13e1090bc31ac1352b28adc2d02b6d25a102 - -From 110b13e1090bc31ac1352b28adc2d02b6d25a102 Mon Sep 17 00:00:00 2001 -From: Joey Pabalinas <joeypabalinas@gmail.com> -Date: Tue, 23 Jan 2018 22:28:08 -0800 -Subject: [PATCH] 42313: avoid null-pointer deref when using ${(PA)...} on an - empty array result - ---- - ChangeLog | 5 +++++ - Src/subst.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -#diff --git a/ChangeLog b/ChangeLog -#index d2ba94afc..3037edda4 100644 -#--- a/ChangeLog -#+++ b/ChangeLog -#@@ -1,3 +1,8 @@ -#+2018-01-23 Barton E. Schaefer <schaefer@zsh.org> -#+ -#+ * Joey Pabalinas: 42313: Src/subst.c: avoid null-pointer deref -#+ when using ${(PA)...} on an empty array result -#+ -# 2018-01-23 Oliver Kiddle <okiddle@yahoo.co.uk> -# -# * 42317: Completion/Linux/Command/_cryptsetup, -diff --git a/Src/subst.c b/Src/subst.c -index d027e3d83..a265a187e 100644 ---- a/Src/subst.c -+++ b/Src/subst.c -@@ -2430,7 +2430,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, - val = aval[0]; - isarr = 0; - } -- s = dyncat(val, s); -+ s = val ? dyncat(val, s) : dupstring(s); - /* Now behave po-faced as if it was always like that... */ - subexp = 0; - /* --- -2.16.2 - diff --git a/gnu/packages/patches/zsh-CVE-2018-7549.patch b/gnu/packages/patches/zsh-CVE-2018-7549.patch deleted file mode 100644 index abefcdf2f9..0000000000 --- a/gnu/packages/patches/zsh-CVE-2018-7549.patch +++ /dev/null @@ -1,56 +0,0 @@ -Fix CVE-2018-7549: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7549 - -Patch copied from upstream source repository: - -https://sourceforge.net/p/zsh/code/ci/c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd - -From c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd Mon Sep 17 00:00:00 2001 -From: Stephane Chazelas <stephane.chazelas@gmail.com> -Date: Fri, 22 Dec 2017 22:17:09 +0000 -Subject: [PATCH] Avoid crash copying empty hash table. - -Visible with typeset -p. ---- - ChangeLog | 2 ++ - Src/params.c | 11 +++++++---- - 2 files changed, 9 insertions(+), 4 deletions(-) - -#diff --git a/ChangeLog b/ChangeLog -#index f74c26b88..e3628cfa7 100644 -#--- a/ChangeLog -#+++ b/ChangeLog -#@@ -1,5 +1,7 @@ -# 2018-01-04 Peter Stephenson <p.stephenson@samsung.com> -# -#+ * Stephane: 42159: Src/params.c: avoid crash copying empty hash table. -#+ -# * Sebastian: 42188: Src/Modules/system.c: It is necessary to -# close the lock descriptor in some failure cases. -# -diff --git a/Src/params.c b/Src/params.c -index 31ff0445b..de7730ae7 100644 ---- a/Src/params.c -+++ b/Src/params.c -@@ -549,10 +549,13 @@ scancopyparams(HashNode hn, UNUSED(int flags)) - HashTable - copyparamtable(HashTable ht, char *name) - { -- HashTable nht = newparamtable(ht->hsize, name); -- outtable = nht; -- scanhashtable(ht, 0, 0, 0, scancopyparams, 0); -- outtable = NULL; -+ HashTable nht = 0; -+ if (ht) { -+ nht = newparamtable(ht->hsize, name); -+ outtable = nht; -+ scanhashtable(ht, 0, 0, 0, scancopyparams, 0); -+ outtable = NULL; -+ } - return nht; - } - --- -2.16.2 - diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 832efc2b78..9c17733d4c 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -96,7 +96,7 @@ warning content is outputted via diag.") (define-public perl-test-base (package (name "perl-test-base") - (version "0.88") + (version "0.89") (source (origin (method url-fetch) @@ -104,7 +104,7 @@ warning content is outputted via diag.") "Test-Base-" version ".tar.gz")) (sha256 (base32 - "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj")))) + "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517")))) (build-system perl-build-system) (native-inputs `(("perl-algorithm-diff" ,perl-algorithm-diff) @@ -317,7 +317,7 @@ structures without getting caught in an infinite loop.") (define-public perl-test-differences (package (name "perl-test-differences") - (version "0.63") + (version "0.64") (source (origin (method url-fetch) @@ -325,7 +325,7 @@ structures without getting caught in an infinite loop.") "Test-Differences-" version ".tar.gz")) (sha256 (base32 - "0rhs4q6qn64ji06ns7lwl6iiiw3mggvd9xk9nkiqvx1jihbplrbw")))) + "0xmj5vgklq4yqvi7l63ky1k6g7fhww68llpmw9rhlaihqbcrsicz")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) @@ -798,7 +798,7 @@ If used in a subtest, the remainder of the subtest will be skipped.") (define-public perl-test-notabs (package (name "perl-test-notabs") - (version "2.00") + (version "2.02") (source (origin (method url-fetch) @@ -808,7 +808,7 @@ If used in a subtest, the remainder of the subtest will be skipped.") ".tar.gz")) (sha256 (base32 - "127kpl1va267qar2ia4c22xb96jby2jqnda3sj5pjgmxg8si26cg")))) + "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Test-NoTabs/") @@ -869,14 +869,14 @@ usually called epsilon. This module provides such a function for use with (define-public perl-test-output (package (name "perl-test-output") - (version "1.03") + (version "1.031") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/" "Test-Output-" version ".tar.gz")) (sha256 (base32 - "12991jnzj4cbw9whhprmqvnzd1ayii84g2mh8vxbjngwqrjsy41i")))) + "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q")))) (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny) @@ -894,7 +894,7 @@ as flexible as possible to the tester.") (define-public perl-test-pod (package (name "perl-test-pod") - (version "1.51") + (version "1.52") (source (origin (method url-fetch) @@ -902,7 +902,7 @@ as flexible as possible to the tester.") "Test-Pod-" version ".tar.gz")) (sha256 (base32 - "1yvy5mc4j3s2h4aizryvark2nm58g2c6zhw9mlx9wmsavz7d78f1")))) + "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Test-Pod/") @@ -1077,14 +1077,14 @@ makes fork(2) safe to use in test cases.") (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302122") + (version "1.302136") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "117m707cbvrh01s3w6g371i9xvpnklifiqpcmky4f49jgck8izgm")))) + "0inlv8f4rbhsw6qnqhf1w6ay153xbw27fldmb2pmg4ihn19mr6ld")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 3edb2b6168..225065fd3b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -161,7 +161,7 @@ ;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913. ;; See <https://metacpan.org/changes/release/SHAY/perl-5.26.2>. -(define-public perl-5.26.2 +(define perl-5.26.2 (package (inherit perl) (version "5.26.2") @@ -385,7 +385,7 @@ error when it would have happened.") (define-public perl-bareword-filehandles (package (name "perl-bareword-filehandles") - (version "0.005") + (version "0.006") (source (origin (method url-fetch) @@ -394,7 +394,7 @@ error when it would have happened.") version ".tar.gz")) (sha256 (base32 - "0fdirls2pg7d6ymvlzzz59q3dy6hgh08k0qpr2mw51w127s8rav6")))) + "1yxz6likpfshpyfrgwyi7dw6ig1wjhh0vnvbcs6ypr62pv00fv5d")))) (build-system perl-build-system) (native-inputs `(("perl-b-hooks-op-check" ,perl-b-hooks-op-check) @@ -452,7 +452,7 @@ all known commands are checked.") (define-public perl-b-hooks-endofscope (package (name "perl-b-hooks-endofscope") - (version "0.21") + (version "0.24") (source (origin (method url-fetch) @@ -460,7 +460,7 @@ all known commands are checked.") "B-Hooks-EndOfScope-" version ".tar.gz")) (sha256 (base32 - "0b70vbpabsy9ia366k330cz1zbdyb1pwhb0l7j28pmpih045iwwh")))) + "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3")))) (build-system perl-build-system) (propagated-inputs `(("perl-module-runtime" ,perl-module-runtime) @@ -720,7 +720,7 @@ algorithm to keep the most used entries in the cache.") (define-public perl-capture-tiny (package (name "perl-capture-tiny") - (version "0.46") + (version "0.48") (source (origin (method url-fetch) @@ -729,7 +729,7 @@ algorithm to keep the most used entries in the cache.") version ".tar.gz")) (sha256 (base32 - "05bhlx6d4nzamhkkh0pkckg7wlvaq6mazf7q1fbb5wpp1j1nlyjx")))) + "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Capture-Tiny/") (synopsis "Capture STDOUT and STDERR from Perl, XS or external programs") @@ -1120,7 +1120,7 @@ to the calling program.") (define-public perl-class-inspector (package (name "perl-class-inspector") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) @@ -1128,7 +1128,7 @@ to the calling program.") "Class-Inspector-" version ".tar.gz")) (sha256 (base32 - "1sqfjgzxx1f951fykc6vgfvys4j8rxaw2zf3jq26yrvs3ygn8pq6")))) + "0d85rihxahdvhj8cysqrgg0kbmcqghz5hgy41dbkxr1qaf5xrynf")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Class-Inspector/") (synopsis "Get information about a class and its structure") @@ -1320,14 +1320,14 @@ arrays for their internal representation.") (define-public perl-clone (package (name "perl-clone") - (version "0.38") + (version "0.39") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/G/GA/GARU/" "Clone-" version ".tar.gz")) (sha256 (base32 - "1s5xrv9zlckqqzyhxi0l9lwj9m6na2bz5hqxrkva2v7gnx5m7c4z")))) + "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c")))) (build-system perl-build-system) (synopsis "Recursively copy Perl datatypes") (description @@ -2712,7 +2712,7 @@ variable in a subroutines scope to one of your choosing.") (define-public perl-devel-overloadinfo (package (name "perl-devel-overloadinfo") - (version "0.004") + (version "0.005") (source (origin (method url-fetch) @@ -2720,7 +2720,7 @@ variable in a subroutines scope to one of your choosing.") "Devel-OverloadInfo-" version ".tar.gz")) (sha256 (base32 - "0zckjhzdqa6smpp98y15mqafsyzwjxwrvk10snzhn2sb0r889s43")))) + "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) @@ -3025,14 +3025,14 @@ separator.") (define-public perl-error (package (name "perl-error") - (version "0.17023") + (version "0.17025") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SH/SHLOMIF/" "Error-" version ".tar.gz")) (sha256 (base32 - "0dsxic78mxy30qvbbdzfyp501hbkwhnbmafqfxipr0yqfy8f2j5g")))) + "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Error/") @@ -3370,7 +3370,7 @@ type.") (define-public perl-file-find-rule (package (name "perl-file-find-rule") - (version "0.33") + (version "0.34") (source (origin (method url-fetch) @@ -3378,7 +3378,7 @@ type.") "File-Find-Rule-" version ".tar.gz")) (sha256 (base32 - "0w73b4jr2fcrd74a1w3b2jryq3mqzc8z5mk7ia9p85xn3qmpa5r4")))) + "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy")))) (build-system perl-build-system) (propagated-inputs `(("perl-text-glob" ,perl-text-glob) @@ -3635,7 +3635,7 @@ distributions. It is a companion module to File::ShareDir.") (define-public perl-file-sharedir-install (package (name "perl-file-sharedir-install") - (version "0.11") + (version "0.13") (source (origin (method url-fetch) @@ -3643,7 +3643,7 @@ distributions. It is a companion module to File::ShareDir.") "File-ShareDir-Install-" version ".tar.gz")) (sha256 (base32 - "1j0cw1aq9fdv9kl1a6fnfa4zihsvmcqzy9sb0xk0i9pyx5r8ggrj")))) + "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) @@ -4521,17 +4521,17 @@ logging mechanism.") (define-public perl-log-any-adapter-log4perl (package (name "perl-log-any-adapter-log4perl") - (version "0.08") + (version "0.09") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/D/DA/DAGOLDEN/Log-Any-Adapter-Log4perl-" + "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-" version ".tar.gz")) (sha256 (base32 - "0xf4fnrsznvg0hf36q481124ja1hp3lybki1xjgnk82z9990jmxn")))) + "19f1drqnzr6g4xwjm6jk4iaa3zmiax8bzxqch04f4jr12bjd75qi")))) (build-system perl-build-system) (propagated-inputs `(("perl-log-any" ,perl-log-any) @@ -4980,7 +4980,7 @@ messages.") (define-public perl-mime-types (package (name "perl-mime-types") - (version "2.16") + (version "2.17") (source (origin (method url-fetch) @@ -4988,7 +4988,7 @@ messages.") "MIME-Types-" version ".tar.gz")) (sha256 (base32 - "0nkv99yd8bxa6h8c52nd07142f0mdzjnhcdw66s3wljmzsi9z8hk")))) + "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/MIME-Types/") (synopsis "Definition of MIME types") @@ -5126,7 +5126,7 @@ debug options. (define-public perl-module-find (package (name "perl-module-find") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) @@ -5134,7 +5134,7 @@ debug options. "Module-Find-" version ".tar.gz")) (sha256 (base32 - "1lc33jdv4pgmm7nkr9bff0lhwjhhw91kaf6iiy2n7i7mw8dfv47l")))) + "0s45y5lvd9k89g7lds83c0bn1p29c13hfsbrd7x64jfaf8h8cisa")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Module-Find/") (synopsis "Find and use installed modules in a (sub)category") @@ -6257,7 +6257,7 @@ and libraries based on OpenSSL.") (define-public perl-multidimensional (package (name "perl-multidimensional") - (version "0.013") + (version "0.014") (source (origin (method url-fetch) @@ -6266,7 +6266,7 @@ and libraries based on OpenSSL.") version ".tar.gz")) (sha256 (base32 - "02p5zv68i39hnkmzzxsk1fi7xy56pfcsslrd7yqwzhq74czcw81x")))) + "0prchsg547ziysjl8ghiid6ph3m2xnwpsrwrjymibga7fhqi9sqj")))) (build-system perl-build-system) (native-inputs `(("perl-b-hooks-op-check" ,perl-b-hooks-op-check) @@ -7171,7 +7171,7 @@ and @code{deserialize_regexp}.") (define-public perl-safe-isa (package (name "perl-safe-isa") - (version "1.000008") + (version "1.000010") (source (origin (method url-fetch) @@ -7179,7 +7179,7 @@ and @code{deserialize_regexp}.") "Safe-Isa-" version ".tar.gz")) (sha256 (base32 - "08r74hwxq5b3bibnbwjr9anybg15l3zqdgcirpw1xm2qpvcxgdkx")))) + "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Safe-Isa/") (synopsis "Call isa, can, does, and DOES safely") @@ -7451,7 +7451,7 @@ run from within a source-controlled directory.") (define-public perl-strictures-2 (package (inherit perl-strictures) - (version "2.000003") + (version "2.000004") (source (origin (method url-fetch) @@ -7459,7 +7459,7 @@ run from within a source-controlled directory.") "strictures-" version ".tar.gz")) (sha256 (base32 - "08mgvf1d2651gsg3jgjfs13878ndqa4ji8vfsda9f7jjd84ymy17")))))) + "0lzp0q6kwk6vgf7zdlvy9zz28fj6n1b776irm556c7gylcq29113")))))) (define-public perl-string-camelcase (package @@ -7690,7 +7690,7 @@ return value is the sub.") (define-public perl-sub-quote (package (name "perl-sub-quote") - (version "2.005000") + (version "2.005001") (source (origin (method url-fetch) @@ -7699,7 +7699,7 @@ return value is the sub.") version ".tar.gz")) (sha256 (base32 - "1zv45cvj4ifkbr61ydcpphnj6lvib37gfxwfh40h0yzf3c8lbca4")))) + "01xsvfdpxzimsbrp9mqipsr93y83nhj21q05g8v1bw6yfl3lzayn")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) @@ -7871,7 +7871,7 @@ of a system.") (define-public perl-task-weaken (package (name "perl-task-weaken") - (version "1.05") + (version "1.06") (source (origin (method url-fetch) @@ -7879,7 +7879,7 @@ of a system.") "Task-Weaken-" version ".tar.gz")) (sha256 (base32 - "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5")))) + "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3")))) (build-system perl-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -8259,7 +8259,7 @@ to tabs.") (define-public perl-text-glob (package (name "perl-text-glob") - (version "0.09") + (version "0.11") (source (origin (method url-fetch) @@ -8267,7 +8267,7 @@ to tabs.") "Text-Glob-" version ".tar.gz")) (sha256 (base32 - "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5")))) + "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Text-Glob/") diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index d56cd6ecce..2c0c2313f4 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -330,7 +330,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (string-append @@ -339,7 +339,7 @@ photographic equipment.") version "/darktable-" version ".tar.xz")) (sha256 (base32 - "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r")))) + "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; There are no tests. diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index dda1024b39..cdd74d3053 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -717,28 +717,28 @@ Python.") (define-public python-josepy (package (name "python-josepy") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "josepy" version)) (sha256 (base32 - "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z")))) + "11khz8malzrv375b27jjkv66z6z6khdx1v5mkkr4vq16gp3n4p7v")))) (build-system python-build-system) (arguments - ;; The tests require pytest >= 3.2, which is not yet packaged. + ;; The tests require flake8 >= 3.5, which is not yet packaged. '(#:tests? #f)) (propagated-inputs `(("python-cryptography" ,python-cryptography) ("python-pyopenssl" ,python-pyopenssl) ("python-six" ,python-six))) -;; TODO Enable when we have pytest >= 3.2. +;; TODO Enable when we have flake8 >= 3.5. ; (native-inputs ; `(("python-coverage" ,python-coverage) ; ("python-flake8" ,python-flake8) ; ("python-isort" ,python-isort) ; ("python-mock" ,python-mock) -; ("python-pytest" ,python-pytest-3.0) +; ("python-pytest" ,python-pytest) ; ("python-pytest-cov" ,python-pytest-cov) ; ("python-pytest-cache" ,python-pytest-cache) ; ("python-pytest-flake8" ,python-pytest-flake8))) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d15ad92a56..6e8d9ab954 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -44,6 +44,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system python) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -214,13 +215,13 @@ and written in Python.") (define-public python-html5-parser (package (name "python-html5-parser") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (pypi-uri "html5-parser" version)) (sha256 (base32 - "1d8sxhl41ffh7qlk7wlsy17xw6slzx5v1yna9s72wx5qrpaa3wxr")))) + "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -998,13 +999,13 @@ facilities for defining, registering and looking up components.") (define-public python-ndg-httpsclient (package (name "python-ndg-httpsclient") - (version "0.4.4") + (version "0.5.0") (source (origin (method url-fetch) (uri (pypi-uri "ndg_httpsclient" version)) (sha256 (base32 - "0sl5ak1r1xil9ms0a9fh9fm6ncml65kgnjpjfic9dhnaimwx997v")))) + "12q8rjvsvjphj6lvvcka2izdjr36a5lgkygajwx6p4wh0x1za2f0")))) (build-system python-build-system) (arguments '(;; The tests appear to require networking. @@ -1024,7 +1025,9 @@ of the SSL peer.") (define-public python2-ndg-httpsclient (package (inherit python-ndg-httpsclient) (name "python2-ndg-httpsclient") - (arguments `(#:python ,python-2)) + (arguments + (substitute-keyword-arguments (package-arguments python-ndg-httpsclient) + ((#:python _) python-2))) (propagated-inputs `(("python2-pyopenssl" ,python2-pyopenssl))))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f36e4c770d..a359eebd12 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1212,14 +1212,14 @@ after Andy Lester’s Perl module WWW::Mechanize.") (define-public python-simplejson (package (name "python-simplejson") - (version "3.13.2") + (version "3.14.0") (source (origin (method url-fetch) (uri (pypi-uri "simplejson" version)) (sha256 (base32 - "02jg5nixffqyicfqdl4dil82fh1z9p2as758wp0nqwalw0hcykjc")))) + "1lkv3xlf7ryzi69zqfdbkvpxdfy1rg1rq2yzcnxgf4km5m6difqy")))) (build-system python-build-system) (home-page "http://simplejson.readthedocs.org/en/latest/") (synopsis @@ -2438,13 +2438,13 @@ sources.") (define-public python-sphinx-1.6 (package (inherit python-sphinx) (name "python-sphinx") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "1rj6f3i8hmrx2qlkshi5kp5xcy98dlynwlyl05yvflj5f66dp2xg")))) + "0gjakw9fv5pwqb5yyclxycs36sapxizk1vx6mkcdizmzgzcfy0gi")))) (arguments `(#:phases (modify-phases %standard-phases @@ -2551,14 +2551,14 @@ and several other projects.") (define-public python-rst.linker (package (name "python-rst.linker") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) (uri (pypi-uri "rst.linker" version)) (sha256 (base32 - "0bh4lnj2p1nh0wf5pgxgfbrp27xhb1rinahkb5j7s3qprq6qn0sr")))) + "16crgnai6020vdmnpwdimw1vm3jb74ysfyb3kmcidb0lgma5xq2d")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) @@ -3788,28 +3788,28 @@ multivalue dictionary that retains the order of insertions and deletions.") (define-public python-autopep8 (package - (name "python-autopep8") - (version "1.3.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "autopep8" version)) - (sha256 - (base32 - "1p9pa1ffg4iy96l918808jggg9a69iaka5awmj8xid36yc5mk0ky")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pycodestyle" ,python-pycodestyle))) - (home-page "https://github.com/hhatto/autopep8") - (synopsis "Format Python code according to the PEP 8 style guide") - (description - "@code{autopep8} automatically formats Python code to conform to + (name "python-autopep8") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "autopep8" version)) + (sha256 + (base32 + "192bvhzi4d0claqxgzymvv7k3qnj627742bc8sgxpzjj42pd9112")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pycodestyle" ,python-pycodestyle))) + (home-page "https://github.com/hhatto/autopep8") + (synopsis "Format Python code according to the PEP 8 style guide") + (description + "@code{autopep8} automatically formats Python code to conform to the PEP 8 style guide. It uses the pycodestyle utility to determine what parts of the code needs to be formatted. @code{autopep8} is capable of fixing most of the formatting issues that can be reported by pycodestyle.") - (license (license:non-copyleft - "https://github.com/hhatto/autopep8/blob/master/LICENSE")))) + (license (license:non-copyleft + "https://github.com/hhatto/autopep8/blob/master/LICENSE")))) (define-public python2-autopep8 (package-with-python2 python-autopep8)) @@ -8175,13 +8175,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.3.0") + (version "2.3.2") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk")))) + "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf")))) (build-system python-build-system) ;; We only need the the Python 2 variant, since for Python 3 our minimum ;; version is 3.4 which already includes this package as part of the @@ -9357,25 +9357,30 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.9.0") + (version "0.12.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "jedi" version)) - (sha256 - (base32 - "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v")))) + (origin + (method url-fetch) + (uri (pypi-uri "jedi" version)) + (sha256 + (base32 + "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr")))) (build-system python-build-system) (arguments - ;; FIXME: One test fails (use "py.test" instead of 'setup.py test'). - '(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (replace 'check (lambda _ + (invoke "py.test" "-vv")))))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-parso" ,python-parso) + ("python-docopt" ,python-docopt))) (home-page "https://github.com/davidhalter/jedi") (synopsis - "Autocompletion for Python that can be used for text editors") + "Autocompletion for Python that can be used for text editors") (description - "Jedi is an autocompletion tool for Python that can be used for text editors.") + "Jedi is an autocompletion tool for Python that can be used for text + editors.") (license license:expat))) (define-public python2-jedi @@ -10393,14 +10398,14 @@ a file-like object from which an arbitrarly-sized key can be read.") (define-public python-qrcode (package (name "python-qrcode") - (version "5.3") + (version "6.0") (source (origin (method url-fetch) (uri (pypi-uri "qrcode" version)) (sha256 (base32 - "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1")))) + "1gz1g2n9kqwqkak78aavr354z1v3yyiksk7q6xp5hi1zr6s0syq3")))) (build-system python-build-system) (arguments ;; FIXME: Tests require packaging 'pymaging'. @@ -12689,14 +12694,14 @@ and works only with Python 2 and NumPy < 1.9.") (define-public python-yapf (package (name "python-yapf") - (version "0.20.1") + (version "0.21.0") (source (origin (method url-fetch) (uri (pypi-uri "yapf" version)) (sha256 (base32 - "0s7l6afzxvpx39kzd0lwshlaxw8m4fwh4iy0rlmav4vipr3g46dx")))) + "144gc7d6b1415vh02409rnb8qd5kxi6mxlr7y64d5cizgxbf72kx")))) (build-system python-build-system) (home-page "https://github.com/google/yapf") (synopsis "Formatter for Python code") @@ -13145,3 +13150,27 @@ in Python. You can simply type pybtex instead of bibtex.") (description "Python one-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords.") (license license:expat))) + +(define-public python-parso + (package + (name "python-parso") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "parso" version)) + (sha256 + (base32 + "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2")))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (build-system python-build-system) + (home-page "https://github.com/davidhalter/parso") + (synopsis "Python Parser") + (description "Parso is a Python parser that supports error recovery and +round-trip parsing for different Python versions (in multiple Python versions). +Parso is also able to list multiple syntax errors in your Python file.") + (license license:expat))) + +(define-public python2-parso + (package-with-python2 python-parso)) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 30d18aa1c3..7ed4e5ca6e 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -502,7 +502,7 @@ sound and device input (keyboards, joysticks, mice, etc.).") (string-append "--with-libsdl2-mixer-prefix=" (assoc-ref %build-inputs "sdl2-mixer"))))) (native-inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) (inputs `(("sdl2" ,sdl2) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8f3aa9b5f1..f0f25a0120 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -291,20 +291,18 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.4.2") + (version "5.5.1") (source (origin (method url-fetch) (uri (list (string-append "http://www.zsh.org/pub/zsh-" version - ".tar.gz") + ".tar.xz") (string-append "http://www.zsh.org/pub/old/zsh-" version - ".tar.gz"))) - (patches (search-patches "zsh-CVE-2018-7548.patch" - "zsh-CVE-2018-7549.patch")) + ".tar.xz"))) (sha256 (base32 - "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm")))) + "105aqkdfsdxc4531anrj2zis2ywz6icagjam9lsc235yzh48ihz1")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm index f10acaec70..12bdd1a2fa 100644 --- a/gnu/packages/skribilo.scm +++ b/gnu/packages/skribilo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,22 +31,18 @@ (define-public skribilo (package (name "skribilo") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/skribilo/skribilo-" version ".tar.gz")) (sha256 (base32 - "04d8xa76jvlz25jnc6p1gzsplwcwcqrmi3f7ixdhddhl1chyz66y")))) + "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf")))) (build-system gnu-build-system) (arguments ;; Make the modules available under the usual location. - '(#:configure-flags (list (string-append "--with-guilemoduledir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.0")) - - #:phases + '(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) @@ -57,8 +53,8 @@ (substitute* "src/skribilo.in" (("^exec (.*) -c" _ things) (string-append "exec " things - " -L " reader "/share/guile/site/2.0" - " -C " reader "/share/guile/site/2.0" + " -L " reader "/share/guile/site/2.2" + " -C " reader "/lib/guile/2.2/site-ccache" " -c")))) #t))) @@ -66,7 +62,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("imagemagick" ,imagemagick) ("ghostscript" ,ghostscript) ; for 'convert' ("ploticus" ,ploticus) @@ -74,8 +70,8 @@ ;; The 'skribilo' command needs them, and for people using Skribilo as a ;; library, these inputs are needed as well. - (propagated-inputs `(("guile-reader" ,guile2.0-reader) - ("guile-lib" ,guile2.0-lib))) + (propagated-inputs `(("guile-reader" ,guile-reader) + ("guile-lib" ,guile-lib))) (home-page "https://www.nongnu.org/skribilo/") (synopsis "Document production tool written in Guile Scheme") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f3fa7271a7..11c7daca0b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -402,14 +402,14 @@ code for possible problems.") (define-public r-foreign (package (name "r-foreign") - (version "0.8-69") + (version "0.8-70") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k")))) + "11mql8q3i1q593dvd351fhvkvfab25li80d1ahl4xjjzy52qdkc6")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") @@ -3399,13 +3399,13 @@ want to migrate to S4.") (define-public r-r-oo (package (name "r-r-oo") - (version "1.21.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (cran-uri "R.oo" version)) (sha256 (base32 - "0723gxjazgqq7v3lwnl7axw3brzcnizvhbd71ijkkv8mz31fwp34")))) + "0k6xwy93fpb2p7bs76lzk52br9rv5xnd9524xj8qyazv1132x1n0")))) (properties `((upstream-name . "R.oo"))) (build-system r-build-system) (propagated-inputs @@ -4211,13 +4211,13 @@ series of numeric vectors/matrices and factors.") (define-public r-ztable (package (name "r-ztable") - (version "0.1.5") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "ztable" version)) (sha256 (base32 - "1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r")))) + "1hk5k9614n52dpfrhdws06w4gvwhnz8q47x4cwxx88qmrzm8z2m3")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/ztable") (synopsis "Zebra-striped tables in LaTeX and HTML formats for R") @@ -4270,14 +4270,14 @@ closely-packed, non-overlapping points.") (define-public r-sourcetools (package (name "r-sourcetools") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (cran-uri "sourcetools" version)) (sha256 (base32 - "0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69")))) + "1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sourcetools") (synopsis "Tools for reading, tokenizing and parsing R code") @@ -4686,14 +4686,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.92-8") + (version "0.93-0") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "080ynchq8pvhnmbivj4fp74n0x9lyr9923sg0s9gq5irgm68kgxw")))) + "130pzibn5cb8mycv8byc6npzcpddghz8m7jqwk15qmx4g3cj8zgy")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) @@ -5262,14 +5262,14 @@ first and second order derivatives.") (define-public r-sn (package (name "r-sn") - (version "1.5-1") + (version "1.5-2") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w")))) + "16gwr68zzj5v83bqfmzxnzwig3dnjrkxdhs6clri1caqkvrq6aig")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 6d8d800fd4..d12e3d706f 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -237,14 +237,16 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on (define-public mg (package (name "mg") - (version "20171014") + (version "20180408") (source (origin - (method url-fetch) - (uri (string-append "https://homepage.boetes.org/software/mg/mg-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hboetes/mg") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai")) + "06w86xk7sjl2x2h3z6msn8kpmwj05qdimcym77wzhz5s94dzh1bl")) (modules '((guix build utils))) (snippet '(begin @@ -260,10 +262,9 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on ;; No test suite available. '(#:tests? #f #:make-flags (list (string-append "prefix=" %output) - "CURSES_LIBS=-lncurses" "CC=gcc") #:phases (modify-phases %standard-phases - (delete 'configure) + (delete 'configure) ; no configure script (add-before 'build 'correct-location-of-difftool (lambda _ (substitute* "buffer.c" @@ -292,7 +293,7 @@ team.") (define-public ghostwriter (package (name "ghostwriter") - (version "1.6.1") + (version "1.6.2") (source (origin (method git-fetch) (uri (git-reference @@ -301,7 +302,7 @@ team.") (file-name (git-file-name name version)) (sha256 (base32 - "1ihdr4xk0j83q83xknbikxb7yf9qhlkgvc89w33lhj090cv376gd")))) + "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 2108a0a6d1..a06bf31176 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -136,7 +136,7 @@ libenca and several charset conversion libraries and tools.") (define-public utf8proc (package (name "utf8proc") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) @@ -145,9 +145,9 @@ libenca and several charset conversion libraries and tools.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15")))) + (base32 "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17")))) (build-system gnu-build-system) - (inputs ;test data that is otherwise downloaded with curl + (inputs ; test data that is otherwise downloaded with curl `(("NormalizationTest.txt" ,(origin (method url-fetch) @@ -177,7 +177,7 @@ libenca and several charset conversion libraries and tools.") (substitute* "data/GraphemeBreakTest.txt" (("÷") "/") (("×") "+"))))))) - (home-page "http://julialang.org/utf8proc/") + (home-page "https://julialang.org/utf8proc/") (synopsis "C library for processing UTF-8 Unicode data") (description "utf8proc is a small C library that provides Unicode normalization, case-folding, and other operations for data in the UTF-8 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7c2e20527f..58fd35558c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> -;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> +;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org> @@ -1310,7 +1310,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.3.3") + (version "3.3.4") (source (origin (method url-fetch) (uri (string-append @@ -1319,7 +1319,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1j572his6qmazlmyrbnfq62s9bqml875ay7wy26byy9hfc7m0vgk")))) + "1dqaxkz5svv0lmxds6lppcpzhkq6gar2raw9gx6imrd7yz02fpgn")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) @@ -2852,3 +2852,41 @@ the results, download the highest-rated result in the requested language and save it to the appropriate filename.") (license license:gpl3+) (home-page "https://github.com/alexanderwink/subdl")))) + +(define-public l-smash + (package + (name "l-smash") + (version "2.14.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/" name "/" name "/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dary0h65kq6sv93iabv25djlvzr5ckdcp3ywagbix44wqfw7xz6")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags + (list (string-append "LDFLAGS=-Wl,-L.,-rpath=" + (assoc-ref %outputs "out") "/lib")) + #:phases + (modify-phases %standard-phases + ;; configure fails if it is followed by CONFIG_SHELL + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" (string-append "--prefix=" out) + "--disable-static"))))))) + (native-inputs + `(("which" ,which))) + (home-page "https://l-smash.github.io/l-smash/") + (synopsis "MP4 multiplexer and demultiplexer library") + (description + "L-SMASH is a cross-platform library that handles the ISO base media file +format and some of its derived file formats, including MP4. It operates as a +multiplexer and demultiplexer, and can mux video and audio in several formats +using standalone executable files.") + (license license:isc))) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 86f4d71364..b73287c826 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca> -;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> @@ -39,6 +39,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -173,6 +174,7 @@ exec smbd $@"))) `(("alsa-lib" ,alsa-lib) ("attr" ,attr) ("glib" ,glib) + ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) ("libcap" ,libcap) ; virtfs support requires libcap & libattr @@ -187,17 +189,18 @@ exec smbd $@"))) ;; ("pciutils" ,pciutils) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) - ("sdl" ,sdl) + ("sdl2" ,sdl2) ("spice" ,spice) ("usbredir" ,usbredir) ("util-linux" ,util-linux) ;; ("vde2" ,vde2) ("virglrenderer" ,virglrenderer) ("zlib" ,zlib))) - (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. + (native-inputs `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; gtester, etc. ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) ; incompatible with Python 3 according to error message + ("python-wrapper" ,python-wrapper) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") @@ -232,10 +235,33 @@ server and embedded PowerPC, and S390 guests.") ''("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu")))) ;; Remove dependencies on optional libraries, notably GUI libraries. + (native-inputs (fold alist-delete (package-native-inputs qemu) + '("gettext"))) (inputs (fold alist-delete (package-inputs qemu) - '("libusb" "mesa" "sdl" "spice" "virglrenderer" + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) +;; The GRUB test suite fails with later versions of Qemu, so we +;; keep it at 2.10 for now. See +;; <https://lists.gnu.org/archive/html/bug-grub/2018-02/msg00004.html>. +;; This package is hidden since we do not backport updates to it. +(define-public qemu-minimal-2.10 + (hidden-package + (package + (inherit qemu-minimal) + (version "2.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")))) + ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. + (native-inputs `(("python-2" ,python-2) + ,@(fold alist-delete (package-native-inputs qemu) + '("python-wrapper"))))))) + (define-public libosinfo (package (name "libosinfo") @@ -522,7 +548,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "1.4.3") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -530,7 +556,7 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj")))) + "1ardmd4sxdmd57y7qpka44gf09c1yq2g0xs074d3k1h925crv27f")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -792,7 +818,9 @@ monitor/GPU.") (arguments '(#:import-path "github.com/opencontainers/runc" #:install-source? #f - #:tests? #f ; FIXME: 20/139 tests fail. + ;; XXX: 20/139 tests fail due to missing /var, cgroups and apparmor in + ;; the build environment. + #:tests? #f #:phases (modify-phases %standard-phases (replace 'unpack diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6ba3677a90..c93960bc05 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -278,7 +278,7 @@ and probably others.") (define-public openvpn (package (name "openvpn") - (version "2.4.5") + (version "2.4.6") (source (origin (method url-fetch) (uri (string-append @@ -286,7 +286,7 @@ and probably others.") version ".tar.xz")) (sha256 (base32 - "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23")))) + "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index beef52d0da..914b70d0c8 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -115,6 +116,7 @@ ("libXinerama" ,libxinerama) ("libXxf86vm" ,libxxf86vm) ("libXcomposite" ,libxcomposite) + ("mit-krb5" ,mit-krb5) ("ncurses" ,ncurses) ("openal" ,openal) ("pulseaudio" ,pulseaudio) @@ -221,7 +223,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.6") + (version "3.7") (source (origin (method url-fetch) @@ -230,7 +232,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1q5mgq7lk3sh82im65g51yk110ci9afl5wgqs2q6i8qd2nj5pv7d")))) + "112sy32sja4cc3rv8x6v4cdi3jfxdgzwfra8f78hzdf8a2wrjqz6")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -276,7 +278,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0p4h0ynb5yf8rx5badpxg7b6vsrqdqafwszn5qm0shv0kb3jsl3q")))) + "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index be1bfce578..eb82b2ddcf 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -26,7 +26,6 @@ #:use-module (guix store) #:use-module (gnu services) #:use-module (gnu services shepherd) - #:use-module (gnu services networking) #:use-module (gnu system pam) #:use-module (gnu system shadow) ; 'user-account', etc. #:use-module (gnu system uuid) @@ -64,6 +63,18 @@ console-font-service virtual-terminal-service-type + static-networking + + static-networking? + static-networking-interface + static-networking-ip + static-networking-netmask + static-networking-gateway + static-networking-requirement + + static-networking-service + static-networking-service-type + udev-configuration udev-configuration? udev-configuration-rules @@ -1951,10 +1962,16 @@ extra rules from the packages listed in @var{rules}." "Return a service that uses @var{device} as a swap device." (service swap-service-type device)) +(define %default-gpm-options + ;; Default options for GPM. + '("-m" "/dev/input/mice" "-t" "ps2")) + (define-record-type* <gpm-configuration> gpm-configuration make-gpm-configuration gpm-configuration? - (gpm gpm-configuration-gpm) ;package - (options gpm-configuration-options)) ;list of strings + (gpm gpm-configuration-gpm ;package + (default gpm)) + (options gpm-configuration-options ;list of strings + (default %default-gpm-options))) (define gpm-shepherd-service (match-lambda @@ -1989,14 +2006,15 @@ extra rules from the packages listed in @var{rules}." (extensions (list (service-extension shepherd-root-service-type gpm-shepherd-service))) + (default-value (gpm-configuration)) (description "Run GPM, the general-purpose mouse daemon, with the given command-line options. GPM allows users to use the mouse in the console, notably to select, copy, and paste text. The default options use the @code{ps2} protocol, which works for both USB and PS/2 mice."))) -(define* (gpm-service #:key (gpm gpm) - (options '("-m" "/dev/input/mice" "-t" "ps2"))) +(define* (gpm-service #:key (gpm gpm) ;deprecated + (options %default-gpm-options)) "Run @var{gpm}, the general-purpose mouse daemon, with the given command-line @var{options}. GPM allows users to use the mouse in the console, notably to select, copy, and paste text. The default value of @var{options} @@ -2045,6 +2063,153 @@ This service is not part of @var{%base-services}." (start #~(make-forkexec-constructor #$kmscon-command)) (stop #~(make-kill-destructor))))))) +(define-record-type* <static-networking> + static-networking make-static-networking + static-networking? + (interface static-networking-interface) + (ip static-networking-ip) + (netmask static-networking-netmask + (default #f)) + (gateway static-networking-gateway ;FIXME: doesn't belong here + (default #f)) + (provision static-networking-provision + (default #f)) + (requirement static-networking-requirement + (default '())) + (name-servers static-networking-name-servers ;FIXME: doesn't belong here + (default '()))) + +(define static-networking-shepherd-service + (match-lambda + (($ <static-networking> interface ip netmask gateway provision + requirement name-servers) + (let ((loopback? (and provision (memq 'loopback provision)))) + (shepherd-service + + (documentation + "Bring up the networking interface using a static IP address.") + (requirement requirement) + (provision (or provision + (list (symbol-append 'networking- + (string->symbol interface))))) + + (start #~(lambda _ + ;; Return #t if successfully started. + (let* ((addr (inet-pton AF_INET #$ip)) + (sockaddr (make-socket-address AF_INET addr 0)) + (mask (and #$netmask + (inet-pton AF_INET #$netmask))) + (maskaddr (and mask + (make-socket-address AF_INET + mask 0))) + (gateway (and #$gateway + (inet-pton AF_INET #$gateway))) + (gatewayaddr (and gateway + (make-socket-address AF_INET + gateway 0)))) + (configure-network-interface #$interface sockaddr + (logior IFF_UP + #$(if loopback? + #~IFF_LOOPBACK + 0)) + #:netmask maskaddr) + (when gateway + (let ((sock (socket AF_INET SOCK_DGRAM 0))) + (add-network-route/gateway sock gatewayaddr) + (close-port sock)))))) + (stop #~(lambda _ + ;; Return #f is successfully stopped. + (let ((sock (socket AF_INET SOCK_STREAM 0))) + (when #$gateway + (delete-network-route sock + (make-socket-address + AF_INET INADDR_ANY 0))) + (set-network-interface-flags sock #$interface 0) + (close-port sock) +: #f))) + (respawn? #f)))))) + +(define (static-networking-etc-files interfaces) + "Return a /etc/resolv.conf entry for INTERFACES or the empty list." + (match (delete-duplicates + (append-map static-networking-name-servers + interfaces)) + (() + '()) + ((name-servers ...) + (let ((content (string-join + (map (cut string-append "nameserver " <>) + name-servers) + "\n" 'suffix))) + `(("resolv.conf" + ,(plain-file "resolv.conf" + (string-append "\ +# Generated by 'static-networking-service'.\n" + content)))))))) + +(define (static-networking-shepherd-services interfaces) + "Return the list of Shepherd services to bring up INTERFACES, a list of +<static-networking> objects." + (define (loopback? service) + (memq 'loopback (shepherd-service-provision service))) + + (let ((services (map static-networking-shepherd-service interfaces))) + (match (remove loopback? services) + (() + ;; There's no interface other than 'loopback', so we assume that the + ;; 'networking' service will be provided by dhclient or similar. + services) + ((non-loopback ...) + ;; Assume we're providing all the interfaces, and thus, provide a + ;; 'networking' service. + (cons (shepherd-service + (provision '(networking)) + (requirement (append-map shepherd-service-provision + services)) + (start #~(const #t)) + (stop #~(const #f)) + (documentation "Bring up all the networking interfaces.")) + services))))) + +(define static-networking-service-type + ;; The service type for statically-defined network interfaces. + (service-type (name 'static-networking) + (extensions + (list + (service-extension shepherd-root-service-type + static-networking-shepherd-services) + (service-extension etc-service-type + static-networking-etc-files))) + (compose concatenate) + (extend append) + (description + "Turn up the specified network interfaces upon startup, +with the given IP address, gateway, netmask, and so on. The value for +services of this type is a list of @code{static-networking} objects, one per +network interface."))) + +(define* (static-networking-service interface ip + #:key + netmask gateway provision + ;; Most interfaces require udev to be usable. + (requirement '(udev)) + (name-servers '())) + "Return a service that starts @var{interface} with address @var{ip}. If +@var{netmask} is true, use it as the network mask. If @var{gateway} is true, +it must be a string specifying the default network gateway. + +This procedure can be called several times, one for each network +interface of interest. Behind the scenes what it does is extend +@code{static-networking-service-type} with additional network interfaces +to handle." + (simple-service 'static-network-interface + static-networking-service-type + (list (static-networking (interface interface) (ip ip) + (netmask netmask) (gateway gateway) + (provision provision) + (requirement requirement) + (name-servers name-servers))))) + (define %base-services ;; Convenience variable holding the basic services. diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index be34f32395..0c9c69eef5 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -24,12 +24,14 @@ (define-module (gnu services networking) #:use-module (gnu services) + #:use-module (gnu services base) #:use-module (gnu services shepherd) #:use-module (gnu services dbus) #:use-module (gnu system shadow) #:use-module (gnu system pam) #:use-module (gnu packages admin) #:use-module (gnu packages connman) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages linux) #:use-module (gnu packages tor) #:use-module (gnu packages messaging) @@ -44,18 +46,9 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (ice-9 match) + #:re-export (static-networking-service + static-networking-service-type) #:export (%facebook-host-aliases - static-networking - - static-networking? - static-networking-interface - static-networking-ip - static-networking-netmask - static-networking-gateway - static-networking-requirement - - static-networking-service - static-networking-service-type dhcp-client-service dhcpd-service-type @@ -102,6 +95,9 @@ connman-configuration? connman-service-type + modem-manager-configuration + modem-manager-configuration? + modem-manager-service-type wpa-supplicant-service-type openvswitch-service-type @@ -146,154 +142,6 @@ fe80::1%lo0 connect.facebook.net fe80::1%lo0 www.connect.facebook.net fe80::1%lo0 apps.facebook.com\n") - -(define-record-type* <static-networking> - static-networking make-static-networking - static-networking? - (interface static-networking-interface) - (ip static-networking-ip) - (netmask static-networking-netmask - (default #f)) - (gateway static-networking-gateway ;FIXME: doesn't belong here - (default #f)) - (provision static-networking-provision - (default #f)) - (requirement static-networking-requirement - (default '())) - (name-servers static-networking-name-servers ;FIXME: doesn't belong here - (default '()))) - -(define static-networking-shepherd-service - (match-lambda - (($ <static-networking> interface ip netmask gateway provision - requirement name-servers) - (let ((loopback? (and provision (memq 'loopback provision)))) - (shepherd-service - - (documentation - "Bring up the networking interface using a static IP address.") - (requirement requirement) - (provision (or provision - (list (symbol-append 'networking- - (string->symbol interface))))) - - (start #~(lambda _ - ;; Return #t if successfully started. - (let* ((addr (inet-pton AF_INET #$ip)) - (sockaddr (make-socket-address AF_INET addr 0)) - (mask (and #$netmask - (inet-pton AF_INET #$netmask))) - (maskaddr (and mask - (make-socket-address AF_INET - mask 0))) - (gateway (and #$gateway - (inet-pton AF_INET #$gateway))) - (gatewayaddr (and gateway - (make-socket-address AF_INET - gateway 0)))) - (configure-network-interface #$interface sockaddr - (logior IFF_UP - #$(if loopback? - #~IFF_LOOPBACK - 0)) - #:netmask maskaddr) - (when gateway - (let ((sock (socket AF_INET SOCK_DGRAM 0))) - (add-network-route/gateway sock gatewayaddr) - (close-port sock)))))) - (stop #~(lambda _ - ;; Return #f is successfully stopped. - (let ((sock (socket AF_INET SOCK_STREAM 0))) - (when #$gateway - (delete-network-route sock - (make-socket-address - AF_INET INADDR_ANY 0))) - (set-network-interface-flags sock #$interface 0) - (close-port sock) - #f))) - (respawn? #f)))))) - -(define (static-networking-etc-files interfaces) - "Return a /etc/resolv.conf entry for INTERFACES or the empty list." - (match (delete-duplicates - (append-map static-networking-name-servers - interfaces)) - (() - '()) - ((name-servers ...) - (let ((content (string-join - (map (cut string-append "nameserver " <>) - name-servers) - "\n" 'suffix))) - `(("resolv.conf" - ,(plain-file "resolv.conf" - (string-append "\ -# Generated by 'static-networking-service'.\n" - content)))))))) - -(define (static-networking-shepherd-services interfaces) - "Return the list of Shepherd services to bring up INTERFACES, a list of -<static-networking> objects." - (define (loopback? service) - (memq 'loopback (shepherd-service-provision service))) - - (let ((services (map static-networking-shepherd-service interfaces))) - (match (remove loopback? services) - (() - ;; There's no interface other than 'loopback', so we assume that the - ;; 'networking' service will be provided by dhclient or similar. - services) - ((non-loopback ...) - ;; Assume we're providing all the interfaces, and thus, provide a - ;; 'networking' service. - (cons (shepherd-service - (provision '(networking)) - (requirement (append-map shepherd-service-provision - services)) - (start #~(const #t)) - (stop #~(const #f)) - (documentation "Bring up all the networking interfaces.")) - services))))) - -(define static-networking-service-type - ;; The service type for statically-defined network interfaces. - (service-type (name 'static-networking) - (extensions - (list - (service-extension shepherd-root-service-type - static-networking-shepherd-services) - (service-extension etc-service-type - static-networking-etc-files))) - (compose concatenate) - (extend append) - (description - "Turn up the specified network interfaces upon startup, -with the given IP address, gateway, netmask, and so on. The value for -services of this type is a list of @code{static-networking} objects, one per -network interface."))) - -(define* (static-networking-service interface ip - #:key - netmask gateway provision - ;; Most interfaces require udev to be usable. - (requirement '(udev)) - (name-servers '())) - "Return a service that starts @var{interface} with address @var{ip}. If -@var{netmask} is true, use it as the network mask. If @var{gateway} is true, -it must be a string specifying the default network gateway. - -This procedure can be called several times, one for each network -interface of interest. Behind the scenes what it does is extend -@code{static-networking-service-type} with additional network interfaces -to handle." - (simple-service 'static-network-interface - static-networking-service-type - (list (static-networking (interface interface) (ip ip) - (netmask netmask) (gateway gateway) - (provision provision) - (requirement requirement) - (name-servers name-servers))))) - (define dhcp-client-service-type (shepherd-service-type 'dhcp-client @@ -361,7 +209,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces." (config-file dhcpd-configuration-config-file ;file-like (default #f)) (version dhcpd-configuration-version ;"4", "6", or "4o6" - (default "6")) + (default "4")) (run-directory dhcpd-configuration-run-directory (default "/run/dhcpd")) (lease-file dhcpd-configuration-lease-file @@ -969,6 +817,17 @@ and @command{wicd-curses} user interfaces." ;;; +;;; ModemManager +;;; + +(define-record-type* <modem-manager-configuration> + modem-manager-configuration make-modem-manager-configuration + modem-manager-configuration? + (modem-manager modem-manager-configuration-modem-manager + (default modem-manager))) + + +;;; ;;; NetworkManager ;;; @@ -1106,6 +965,30 @@ a network connection manager.")))) ;;; +;;; Modem manager +;;; + +(define modem-manager-service-type + (let ((config->package + (match-lambda + (($ <modem-manager-configuration> modem-manager) + (list modem-manager))))) + (service-type (name 'modem-manager) + (extensions + (list (service-extension dbus-root-service-type + config->package) + (service-extension udev-service-type + config->package) + (service-extension polkit-service-type + config->package))) + (default-value (modem-manager-configuration)) + (description + "Run @uref{https://wiki.gnome.org/Projects/ModemManager, +ModemManager}, a modem management daemon that aims to simplify dialup +networking.")))) + + +;;; ;;; WPA supplicant ;;; diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 7f5afb00fe..d2acd705de 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +47,7 @@ spec->file-system specification->file-system-mapping + %pseudo-file-system-types %fuse-control-file-system %binary-format-file-system %shared-memory-file-system @@ -203,6 +204,12 @@ TARGET in the other system." ;;; Common file systems. ;;; +(define %pseudo-file-system-types + ;; List of know pseudo file system types. This is used when validating file + ;; system definitions. + '("binfmt_misc" "cgroup" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl" + "hugetlbfs" "overlay" "proc" "securityfs" "sysfs" "tmpfs")) + (define %fuse-control-file-system ;; Control file system for Linux' file systems in user-space (FUSE). (file-system diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 171c636e5f..323679e7fc 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -22,6 +22,7 @@ #:use-module (gnu system) #:use-module (gnu system vm) #:use-module (gnu services) + #:use-module (gnu services base) #:use-module (gnu services networking) #:use-module (guix gexp) #:use-module (guix store) |