mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
Merge remote-tracking branch 'origin/master' into core-updates
This commit is contained in:
commit
b3d2be945d
90 changed files with 2948 additions and 1001 deletions
|
@ -497,7 +497,7 @@ To use substitutes from @code{hydra.gnu.org} or one of its mirrors
|
|||
@end enumerate
|
||||
|
||||
This completes root-level install of Guix. Each user will need to
|
||||
perform additional steps to make their Guix envionment ready for use,
|
||||
perform additional steps to make their Guix environment ready for use,
|
||||
@pxref{Application Setup}.
|
||||
|
||||
You can confirm that Guix is working by installing a sample package into
|
||||
|
@ -2125,7 +2125,7 @@ database of the daemon actually exist in @file{/gnu/store}.
|
|||
When provided, @var{options} must be a comma-separated list containing one
|
||||
or more of @code{contents} and @code{repair}.
|
||||
|
||||
When passing @option{--verify=contents}, the daemon computse the
|
||||
When passing @option{--verify=contents}, the daemon computes the
|
||||
content hash of each store item and compares it against its hash in the
|
||||
database. Hash mismatches are reported as data corruptions. Because it
|
||||
traverses @emph{all the files in the store}, this command can take a
|
||||
|
@ -7223,6 +7223,10 @@ A comment about the account, such as the account owner's full name.
|
|||
@item @code{home-directory}
|
||||
This is the name of the home directory for the account.
|
||||
|
||||
@item @code{create-home-directory?} (default: @code{#t})
|
||||
Indicates whether the home directory of this account should be created
|
||||
if it does not exist yet.
|
||||
|
||||
@item @code{shell} (default: Bash)
|
||||
This is a G-expression denoting the file name of a program to be used as
|
||||
the shell (@pxref{G-Expressions}).
|
||||
|
@ -7680,9 +7684,16 @@ Name of the group for build user accounts.
|
|||
Number of build user accounts to create.
|
||||
|
||||
@item @code{authorize-key?} (default: @code{#t})
|
||||
Whether to authorize the substitute key for @code{hydra.gnu.org}
|
||||
Whether to authorize the substitute keys listed in
|
||||
@code{authorized-keys}---by default that of @code{hydra.gnu.org}
|
||||
(@pxref{Substitutes}).
|
||||
|
||||
@vindex %default-authorized-guix-keys
|
||||
@item @code{authorized-keys} (default: @var{%default-authorized-guix-keys})
|
||||
The list of authorized key files for archive imports, as a list of
|
||||
string-valued gexps (@pxref{Invoking guix archive}). By default, it
|
||||
contains that of @code{hydra.gnu.org} (@pxref{Substitutes}).
|
||||
|
||||
@item @code{use-substitutes?} (default: @code{#t})
|
||||
Whether to use substitutes.
|
||||
|
||||
|
@ -8505,7 +8516,7 @@ Data type representing the configuration of @var{mysql-service}.
|
|||
Package object of the MySQL database server, can be either @var{mariadb}
|
||||
or @var{mysql}.
|
||||
|
||||
For MySQL, a temorary root password will be displayed at activation time.
|
||||
For MySQL, a temporary root password will be displayed at activation time.
|
||||
For MariaDB, the root password is empty.
|
||||
@end table
|
||||
@end deftp
|
||||
|
@ -9856,7 +9867,7 @@ inspect and transform configurations from within Scheme.
|
|||
|
||||
However, it could be that you just want to get a @code{dovecot.conf} up
|
||||
and running. In that case, you can pass an
|
||||
@code{opaque-dovecot-configuration} as the @code{#:config} paramter to
|
||||
@code{opaque-dovecot-configuration} as the @code{#:config} parameter to
|
||||
@code{dovecot-service}. As its name indicates, an opaque configuration
|
||||
does not have easy reflective capabilities.
|
||||
|
||||
|
@ -10709,7 +10720,7 @@ faster.
|
|||
|
||||
@item -m 256
|
||||
RAM available to the guest OS, in mebibytes. Defaults to 128@tie{}MiB,
|
||||
which may be insufficent for some operations.
|
||||
which may be insufficient for some operations.
|
||||
|
||||
@item /tmp/qemu-image
|
||||
The file name of the qcow2 image.
|
||||
|
@ -10954,7 +10965,7 @@ Here is an example of how a service is created and manipulated:
|
|||
The @code{modify-services} form provides a handy way to change the
|
||||
parameters of some of the services of a list such as
|
||||
@var{%base-services} (@pxref{Base Services, @code{%base-services}}). It
|
||||
evalutes to a list of services. Of course, you could always use
|
||||
evaluates to a list of services. Of course, you could always use
|
||||
standard list combinators such as @code{map} and @code{fold} to do that
|
||||
(@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual});
|
||||
@code{modify-services} simply provides a more concise form for this
|
||||
|
@ -10979,7 +10990,7 @@ bound within the @var{body} to the service parameters---e.g., a
|
|||
The @var{body} should evaluate to the new service parameters, which will
|
||||
be used to configure the new service. This new service will replace the
|
||||
original in the resulting list. Because a service's service parameters
|
||||
are created using @code{define-record-type*}, you can write a succint
|
||||
are created using @code{define-record-type*}, you can write a succinct
|
||||
@var{body} that evaluates to the new service parameters by using the
|
||||
@code{inherit} feature that @code{define-record-type*} provides.
|
||||
|
||||
|
|
|
@ -110,7 +110,8 @@ (define* (make-skeletons-writable home
|
|||
files)))
|
||||
|
||||
(define* (add-user name group
|
||||
#:key uid comment home shell password system?
|
||||
#:key uid comment home create-home?
|
||||
shell password system?
|
||||
(supplementary-groups '())
|
||||
(log-port (current-error-port)))
|
||||
"Create an account for user NAME part of GROUP, with the specified
|
||||
|
@ -139,7 +140,7 @@ (define* (add-user name group
|
|||
`("-G" ,(string-join supplementary-groups ","))
|
||||
'())
|
||||
,@(if comment `("-c" ,comment) '())
|
||||
,@(if home
|
||||
,@(if (and home create-home?)
|
||||
(if (file-exists? home)
|
||||
`("-d" ,home) ; avoid warning from 'useradd'
|
||||
`("-d" ,home "--create-home"))
|
||||
|
@ -158,7 +159,8 @@ (define* (add-user name group
|
|||
#t)))))
|
||||
|
||||
(define* (modify-user name group
|
||||
#:key uid comment home shell password system?
|
||||
#:key uid comment home create-home?
|
||||
shell password system?
|
||||
(supplementary-groups '())
|
||||
(log-port (current-error-port)))
|
||||
"Modify user account NAME to have all the given settings."
|
||||
|
@ -186,7 +188,8 @@ (define* (delete-group name #:key (log-port (current-error-port)))
|
|||
(zero? (system* "groupdel" name)))
|
||||
|
||||
(define* (ensure-user name group
|
||||
#:key uid comment home shell password system?
|
||||
#:key uid comment home create-home?
|
||||
shell password system?
|
||||
(supplementary-groups '())
|
||||
(log-port (current-error-port))
|
||||
#:rest rest)
|
||||
|
@ -207,7 +210,8 @@ (define (touch file)
|
|||
|
||||
(define activate-user
|
||||
(match-lambda
|
||||
((name uid group supplementary-groups comment home shell password system?)
|
||||
((name uid group supplementary-groups comment home create-home?
|
||||
shell password system?)
|
||||
(let ((profile-dir (string-append "/var/guix/profiles/per-user/"
|
||||
name)))
|
||||
(ensure-user name group
|
||||
|
@ -216,6 +220,7 @@ (define activate-user
|
|||
#:supplementary-groups supplementary-groups
|
||||
#:comment comment
|
||||
#:home home
|
||||
#:create-home? create-home?
|
||||
#:shell shell
|
||||
#:password password)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -118,6 +118,10 @@ (define (directives store)
|
|||
("/var/guix/gcroots/booted-system" -> "/run/booted-system")
|
||||
("/var/guix/gcroots/current-system" -> "/run/current-system")
|
||||
|
||||
;; XXX: 'guix-register' creates this symlink with a wrong target, so
|
||||
;; create it upfront to be sure.
|
||||
("/var/guix/gcroots/profiles" -> "/var/guix/profiles")
|
||||
|
||||
(directory "/bin")
|
||||
(directory "/tmp" 0 0 #o1777) ; sticky bit
|
||||
(directory "/var/tmp" 0 0 #o1777)
|
||||
|
|
|
@ -297,6 +297,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/rdesktop.scm \
|
||||
%D%/packages/rdf.scm \
|
||||
%D%/packages/readline.scm \
|
||||
%D%/packages/regex.scm \
|
||||
%D%/packages/rrdtool.scm \
|
||||
%D%/packages/rsync.scm \
|
||||
%D%/packages/ruby.scm \
|
||||
|
@ -523,7 +524,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/geoclue-config.patch \
|
||||
%D%/packages/patches/ghostscript-CVE-2015-3228.patch \
|
||||
%D%/packages/patches/ghostscript-runpath.patch \
|
||||
%D%/packages/patches/gimp-CVE-2016-4994.patch \
|
||||
%D%/packages/patches/glib-networking-ssl-cert-file.patch \
|
||||
%D%/packages/patches/glib-tests-timer.patch \
|
||||
%D%/packages/patches/glibc-bootstrap-system.patch \
|
||||
|
@ -668,6 +668,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mplayer2-theora-fix.patch \
|
||||
%D%/packages/patches/module-init-tools-moduledir.patch \
|
||||
%D%/packages/patches/mumps-build-parallelism.patch \
|
||||
%D%/packages/patches/mupdf-CVE-2016-6265.patch \
|
||||
%D%/packages/patches/mupdf-CVE-2016-6525.patch \
|
||||
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||
%D%/packages/patches/mutt-store-references.patch \
|
||||
%D%/packages/patches/mysql-fix-failing-test.patch \
|
||||
|
@ -851,7 +853,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xf86-video-intel-glibc-2.20.patch \
|
||||
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
|
||||
%D%/packages/patches/xf86-video-nv-remove-mibstore.patch \
|
||||
%D%/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
|
||||
%D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
|
||||
%D%/packages/patches/xfce4-panel-plugins.patch \
|
||||
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
|
||||
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
|
||||
;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -1244,21 +1245,24 @@ (define-public smartmontools
|
|||
(define-public fdupes
|
||||
(package
|
||||
(name "fdupes")
|
||||
(version "1.51")
|
||||
(version "1.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/adrianlopezroche/fdupes/archive/fdupes-"
|
||||
"https://github.com/adrianlopezroche/fdupes/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11j96vxl9vg3jsnxqxskrv3gad6dh7hz2zpyc8n31xzyxka1c7kn"))))
|
||||
"1sj9pa40pbz6xdwbxfwhdhkvhdf1xc5gvggk9mdq26c41gdnyswx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (alist-delete 'configure %standard-phases)
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))
|
||||
#:tests? #f ; no 'check' target
|
||||
#:make-flags (list (string-append "PREFIX="
|
||||
#:make-flags (list "CC=gcc"
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))))
|
||||
(home-page "https://github.com/adrianlopezroche/fdupes")
|
||||
(synopsis "Identify duplicate files")
|
||||
|
@ -1388,7 +1392,7 @@ (define-public cpulimit
|
|||
(define-public autojump
|
||||
(package
|
||||
(name "autojump")
|
||||
(version "22.2.4")
|
||||
(version "22.3.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1397,7 +1401,7 @@ (define-public autojump
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xglj7nb8xczaqy2dhn78drqdwqj64rqpymxhqmmwwqzfaqassw1"))))
|
||||
"113rcpr37ngf2xs8da41qdarq5qmj0dwx8ggqy3lhlb0kvqq7g9z"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs ;for tests
|
||||
`(("python-mock" ,python-mock)
|
||||
|
@ -1647,7 +1651,7 @@ (define-public dstat
|
|||
(define-public thefuck
|
||||
(package
|
||||
(name "thefuck")
|
||||
(version "3.9")
|
||||
(version "3.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/nvbn/thefuck/archive/"
|
||||
|
@ -1655,7 +1659,7 @@ (define-public thefuck
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g4s2vkpl0mqhkdkbzib07qr4xf0cq25fvhdhna52290qgd69pwf"))))
|
||||
"04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-setuptools" ,python-setuptools)))
|
||||
|
@ -1734,3 +1738,36 @@ (define-public cbatticon
|
|||
the status of your battery in the system tray.")
|
||||
(home-page "https://github.com/valr/cbatticon")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public interrobang
|
||||
(let ((revision "1")
|
||||
(commit "896543735e1c99144765fdbd7b6e6b5afbd8b881"))
|
||||
(package
|
||||
(name "interrobang")
|
||||
(version (string-append "0.0.0-" revision "." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "git://github.com/TrilbyWhite/interrobang")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1n13m70p1hfba5dy3i8hfclbr6k9q3d9dai3dg4jvhdhmxcpjzdf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)) ; no configure script
|
||||
#:make-flags (list (string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(synopsis "Scriptable launcher menu")
|
||||
(description "Interrobang is a scriptable launcher menu with a customizable
|
||||
shortcut syntax and completion options.")
|
||||
(home-page "https://github.com/TrilbyWhite/interrobang")
|
||||
(license license:gpl3+))))
|
||||
|
|
|
@ -85,7 +85,9 @@ (define-public alsa-modular-synth
|
|||
"1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-qt5")
|
||||
`(#:configure-flags
|
||||
'("--enable-qt5"
|
||||
"CXXFLAGS=-std=gnu++11")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Insert an extra space between linker flags.
|
||||
|
@ -2111,10 +2113,15 @@ (define-public qsynth
|
|||
(base32 "034p6mbwrjnxd9b6h20cidxi4ilkk3cgpjp154j0jzjs1ipf7x2h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no "check" phase
|
||||
`(#:tests? #f ; no "check" phase
|
||||
#:configure-flags
|
||||
'("CXXFLAGS=-std=gnu++11")))
|
||||
(native-inputs
|
||||
`(("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("qt" ,qt)
|
||||
("fluidsynth" ,fluidsynth)))
|
||||
`(("fluidsynth" ,fluidsynth)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(home-page "http://qsynth.sourceforge.net")
|
||||
(synopsis "Graphical user interface for FluidSynth")
|
||||
(description
|
||||
|
@ -2430,7 +2437,7 @@ (define-public dcadec
|
|||
(define-public bs1770gain
|
||||
(package
|
||||
(name "bs1770gain")
|
||||
(version "0.4.10")
|
||||
(version "0.4.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2438,7 +2445,7 @@ (define-public bs1770gain
|
|||
version "/bs1770gain-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1syr8qchs8091z9ayivj723szlidx81gll099bmk9kgpykmckd62"))))
|
||||
"0j765drdb7h3y5ipjv9sg1a0if6zh8cksbv3rdk5ppd7kxcrjnlb"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ffmpeg" ,ffmpeg)
|
||||
("sox" ,sox)))
|
||||
|
|
|
@ -406,14 +406,14 @@ (define-public libchop
|
|||
(define-public borg
|
||||
(package
|
||||
(name "borg")
|
||||
(version "1.0.6")
|
||||
(version "1.0.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "borgbackup" version))
|
||||
|
||||
(sha256
|
||||
(base32
|
||||
"1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p"))))
|
||||
"1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -6325,6 +6325,61 @@ (define-public r-zlibbioc
|
|||
libraries for systems that do not have these available via other means.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public r-rhtslib
|
||||
(package
|
||||
(name "r-rhtslib")
|
||||
(version "1.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Rhtslib" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wgpn9x8abjj7fc087pdavqc3fz0pl5xdh231mgjila18irwlhb3"))))
|
||||
(properties `((upstream-name . "Rhtslib")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-zlibbioc" ,r-zlibbioc)))
|
||||
(inputs
|
||||
`(("zlib" ,zlib)))
|
||||
(home-page "https://github.com/nhayden/Rhtslib")
|
||||
(synopsis "High-throughput sequencing library as an R package")
|
||||
(description
|
||||
"This package provides the HTSlib C library for high-throughput
|
||||
nucleotide sequence analysis. The package is primarily useful to developers
|
||||
of other R packages who wish to make use of HTSlib.")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public r-bamsignals
|
||||
(package
|
||||
(name "r-bamsignals")
|
||||
(version "1.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "bamsignals" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xqiqvg52p6fcvhr4146djbz79r3j1kmh75mq7rndwglmiybpwmy"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-biocgenerics" ,r-biocgenerics)
|
||||
("r-genomicranges" ,r-genomicranges)
|
||||
("r-iranges" ,r-iranges)
|
||||
("r-rcpp" ,r-rcpp)
|
||||
("r-rhtslib" ,r-rhtslib)
|
||||
("r-zlibbioc" ,r-zlibbioc)))
|
||||
(inputs
|
||||
`(("zlib" ,zlib)))
|
||||
(home-page "http://bioconductor.org/packages/bamsignals")
|
||||
(synopsis "Extract read count signals from bam files")
|
||||
(description
|
||||
"This package allows to efficiently obtain count vectors from indexed bam
|
||||
files. It counts the number of nucleotide sequence reads in given genomic
|
||||
ranges and it computes reads profiles and coverage profiles. It also handles
|
||||
paired-end data.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public emboss
|
||||
(package
|
||||
(name "emboss")
|
||||
|
|
|
@ -207,7 +207,7 @@ (define-public transmission-remote-cli
|
|||
(define-public aria2
|
||||
(package
|
||||
(name "aria2")
|
||||
(version "1.25.0")
|
||||
(version "1.26.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/tatsuhiro-t/aria2/"
|
||||
|
@ -215,10 +215,12 @@ (define-public aria2
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0d8drwc5m5ps4bw63iq2gng36gyc2vadzixbynk1dj6gfr6fp2gz"))))
|
||||
"1388qswa0in7kb1dx7qb10wp60p58zvvpys7jwim3clsbqvz6a68"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-libaria2")
|
||||
`(#:configure-flags (list "--enable-libaria2"
|
||||
(string-append "--with-bashcompletiondir="
|
||||
%output "/etc/bash_completion.d/"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-socket-tests
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -871,3 +872,26 @@ (define-public lrzip
|
|||
well as bzip2.")
|
||||
(license (list license:gpl3+
|
||||
license:public-domain)))) ; most files in lzma/
|
||||
|
||||
(define-public snappy
|
||||
(package
|
||||
(name "snappy")
|
||||
(version "1.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/google/snappy/releases/download/"
|
||||
version "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wzf8yif5ym2gj52db6v5m1pxnmn258i38x7llk9x346y2nq47ig"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://github.com/google/snappy")
|
||||
(synopsis "Fast compressor/decompressor")
|
||||
(description "Snappy is a compression/decompression library. It does not
|
||||
aim for maximum compression, or compatibility with any other compression library;
|
||||
instead, it aims for very high speeds and reasonable compression. For instance,
|
||||
compared to the fastest mode of zlib, Snappy is an order of magnitude faster
|
||||
for most inputs, but the resulting compressed files are anywhere from 20% to
|
||||
100% bigger.")
|
||||
(license license:asl2.0)))
|
||||
|
|
|
@ -65,7 +65,7 @@ (define-public libsodium
|
|||
(define-public signify
|
||||
(package
|
||||
(name "signify")
|
||||
(version "18")
|
||||
(version "19")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/aperezdc/signify/"
|
||||
|
@ -73,7 +73,7 @@ (define-public signify
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00lbjiy0gv1b1fvrd6ni4qah96ah4qf6aig05vd2hji4vs00jgwg"))))
|
||||
"0d2wrss1xl9wm3yzl571cv6h7zdp170v7a45f953bgsy64hkqavh"))))
|
||||
(build-system gnu-build-system)
|
||||
;; TODO Build with libwaive (described in README.md), to implement something
|
||||
;; like OpenBSD's pledge().
|
||||
|
@ -223,3 +223,43 @@ (define-public encfs
|
|||
the wrong hands.")
|
||||
(license (list license:lgpl3+ ;encfs library
|
||||
license:gpl3+)))) ;command-line tools
|
||||
|
||||
(define-public keyutils
|
||||
(package
|
||||
(name "keyutils")
|
||||
(version "1.5.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://people.redhat.com/dhowells/keyutils/keyutils-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"))
|
||||
(modules '((guix build utils)))
|
||||
;; Create relative symbolic links instead of absolute ones to /lib/*
|
||||
(snippet '(substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/")
|
||||
"$(LNS) ")))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)) ; no configure script
|
||||
#:make-flags (list "CC=gcc"
|
||||
"RPATH=-Wl,-rpath,$(DESTDIR)$(LIBDIR)"
|
||||
(string-append "DESTDIR="
|
||||
(assoc-ref %outputs "out"))
|
||||
"INCLUDEDIR=/include"
|
||||
"LIBDIR=/lib"
|
||||
"MANDIR=/share/man"
|
||||
"SHAREDIR=/share/keyutils")
|
||||
#:test-target "test"))
|
||||
(home-page "https://people.redhat.com/dhowells/keyutils/")
|
||||
(synopsis "Linux key management utilities")
|
||||
(description
|
||||
"Keyutils is a set of utilities for managing the key retention facility in
|
||||
the Linux kernel, which can be used by file systems, block devices, and more to
|
||||
gain and retain the authorization and encryption keys required to perform
|
||||
secure operations. ")
|
||||
(license (list license:lgpl2.1+ ; the files keyutils.*
|
||||
license:gpl2+)))) ; the rest
|
||||
|
|
|
@ -301,14 +301,14 @@ (define-public cups
|
|||
(define-public hplip
|
||||
(package
|
||||
(name "hplip")
|
||||
(version "3.16.7")
|
||||
(version "3.16.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
|
||||
"/hplip-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hpzyf9ifs0vilsbwxcgpv8g9557p1x8w5qwgz5l0avgcd10dzlx"))))
|
||||
"1svcalf2nc7mvxndp9zz3xp43w66z45rrsr5syl8fx61a6p6gnm9"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://hplipopensource.com/")
|
||||
(synopsis "HP Printer Drivers")
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -57,6 +58,7 @@ (define-module (gnu packages databases)
|
|||
#:use-module ((guix licenses)
|
||||
#:select (gpl2 gpl3 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
|
||||
bsd-2 bsd-3 public-domain))
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
@ -1064,3 +1066,31 @@ (define-public perl-db-file
|
|||
(description
|
||||
"The DB::File module provides Perl bindings to the Berkeley DB version 1.x.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public lmdb
|
||||
(package
|
||||
(name "lmdb")
|
||||
(version "0.9.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/LMDB/lmdb/archive/"
|
||||
"LMDB_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12crvzxky8in99ibh22k4ppmkgqs28yy3v7yy944za7fsrqv8dfx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(chdir (string-append
|
||||
(getenv "PWD") "/lmdb-LMDB_" ,version "/libraries/liblmdb"))
|
||||
(substitute* "Makefile"
|
||||
(("/usr/local") (assoc-ref outputs "out")))
|
||||
#t)))))
|
||||
(home-page "https://symas.com/products/lightning-memory-mapped-database")
|
||||
(synopsis "Lightning memory-mapped database library")
|
||||
(description "Lightning memory-mapped database library.")
|
||||
(license license:openldap2.8)))
|
||||
|
|
|
@ -52,13 +52,13 @@ (define-public radicale
|
|||
(define-public vdirsyncer
|
||||
(package
|
||||
(name "vdirsyncer")
|
||||
(version "0.11.3")
|
||||
(version "0.12.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"10majl58vdpxgbddjqgwblvl7akvvr4c2c8iaxnf3kgyh01jq6k9"))))
|
||||
"1y3xpl83p4y1m5ks44drhwpygzwbjwhraycrhxlkhwk8bhnsifrz"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -22,20 +23,27 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages disk)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages compression))
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public parted
|
||||
(package
|
||||
|
@ -73,7 +81,7 @@ (define-public parted
|
|||
(description
|
||||
"GNU Parted is a package for creating and manipulating disk partition
|
||||
tables. It includes a library and command-line utility.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public fdisk
|
||||
(package
|
||||
|
@ -99,7 +107,7 @@ (define-public fdisk
|
|||
"GNU fdisk provides a GNU version of the common disk partitioning tool
|
||||
fdisk. fdisk is used for the creation and manipulation of disk partition
|
||||
tables, and it understands a variety of different formats.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public gptfdisk
|
||||
(package
|
||||
|
@ -139,7 +147,7 @@ (define-public gptfdisk
|
|||
works on Globally Unique Identifier (GUID) Partition Table (GPT) disks, rather
|
||||
than on the more common (through 2009) Master Boot Record (MBR) partition
|
||||
tables.")
|
||||
(license gpl2)))
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public ddrescue
|
||||
(package
|
||||
|
@ -162,7 +170,7 @@ (define-public ddrescue
|
|||
from one file to another, working to rescue data in case of read errors. The
|
||||
program also includes a tool for manipulating its log files, which are used
|
||||
to recover data more efficiently by only reading the necessary blocks.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public dosfstools
|
||||
(package
|
||||
|
@ -187,7 +195,7 @@ (define-public dosfstools
|
|||
(description
|
||||
"The dosfstools package includes the mkfs.fat and fsck.fat utilities,
|
||||
which respectively make and check MS-DOS FAT filesystems.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public sdparm
|
||||
(package
|
||||
|
@ -213,7 +221,7 @@ (define-public sdparm
|
|||
transport), SCSI and ATAPI tape drives, and SCSI enclosures. This utility can
|
||||
also send commands associated with starting and stopping the media, loading
|
||||
and unloading removable media and some other housekeeping functions.")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public idle3-tools
|
||||
(package
|
||||
|
@ -245,4 +253,43 @@ (define-public idle3-tools
|
|||
\"IntelliPark\" feature that stops the disk when not in use. Unfortunately,
|
||||
the default timer setting is not well suited to Linux or other *nix systems,
|
||||
and can dramatically shorten the lifespan of the drive if left unchecked.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public gparted
|
||||
(package
|
||||
(name "gparted")
|
||||
(version "0.26.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
|
||||
version "/gparted-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1h9d6x335wxpm49yphzm9n1hbh2hcg0p2rphv76mrvsss91bcm1g"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; Tests require a network connection.
|
||||
#:configure-flags '("--disable-scrollkeeper")))
|
||||
(inputs
|
||||
`(("util-linux" ,util-linux)
|
||||
("parted" ,parted)
|
||||
("glib" ,glib)
|
||||
("gtkmm" ,gtkmm-2)
|
||||
("libxml2" ,libxml2)
|
||||
("libxslt" ,libxslt)
|
||||
("gnome-doc-utils" ,gnome-doc-utils)
|
||||
("docbook-xml" ,docbook-xml-4.2)
|
||||
("python" ,python-2)
|
||||
("python-libxml2" ,python2-libxml2)
|
||||
("which" ,which)))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://sourceforge.net/projects/gparted/")
|
||||
(synopsis "Partition editor to graphically manage disk partitions")
|
||||
(description "GParted is a GNOME partition editor for creating,
|
||||
reorganizing, and deleting disk partitions. It uses libparted from the parted
|
||||
project to detect and manipulate partition tables. Optional file system tools
|
||||
permit managing file systems not included in libparted.")
|
||||
;; The home page says GPLv2, but the source code says GPLv2+.
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -49,8 +49,25 @@ (define-public asciidoc
|
|||
(base32
|
||||
"1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:tests? #f)) ; no 'check' target
|
||||
(inputs `(("python" ,python-2)))
|
||||
(arguments
|
||||
`(#:tests? #f ; no 'check' target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Make asciidoc use the local docbook-xsl package instead of fetching
|
||||
;; it from the internet at run-time.
|
||||
(add-before 'install 'make-local-docbook-xsl
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* (find-files "docbook-xsl" ".*\\.xsl$")
|
||||
(("xsl:import href=\"http://docbook.sourceforge.net/\
|
||||
release/xsl/current")
|
||||
(string-append
|
||||
"xsl:import href=\""
|
||||
(string-append (assoc-ref inputs "docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl)))))
|
||||
#t)))))
|
||||
(inputs `(("python" ,python-2)
|
||||
("docbook-xsl" ,docbook-xsl)))
|
||||
(home-page "http://www.methods.co.nz/asciidoc/")
|
||||
(synopsis "Text-based document generation system")
|
||||
(description
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -410,7 +412,7 @@ (define-public git-modes
|
|||
(define-public emacs-with-editor
|
||||
(package
|
||||
(name "emacs-with-editor")
|
||||
(version "2.5.1")
|
||||
(version "2.5.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -419,7 +421,7 @@ (define-public emacs-with-editor
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lqm0msc9lzb05ys96bsx8bf2y1qrw27dh5h6qz8lf5i4cbhflw2"))))
|
||||
"0k57f2wqng7510nzyzgjgbapplia23l3zrphl816nfm4s58sy1ka"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)))
|
||||
|
@ -435,7 +437,7 @@ (define-public emacs-with-editor
|
|||
(define-public magit
|
||||
(package
|
||||
(name "magit")
|
||||
(version "2.7.0")
|
||||
(version "2.8.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -443,7 +445,7 @@ (define-public magit
|
|||
version "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kzd8k2n0lcr04jvn5b6d29zf765mxgshfhzflkzndwmvyxmlqpl"))))
|
||||
"1znvb7inwinrhifqzwp4lp9j6yp1l25j7riczc0zmvcjbpl5yhfq"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
|
@ -571,7 +573,7 @@ (define-public emacs-magit-popup
|
|||
(file-name (string-append "magit-popup-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"144nl7j5mn86ccan6qxgg40bsxpkbc83vwnhd5y657gqki74972r"))))
|
||||
"0lmw824zp8c0vhikfkiay9wn4nmaksz6mfy0fldvy4wlx5c26yh3"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)))
|
||||
|
@ -1187,7 +1189,7 @@ (define-public emacs-pdf-tools
|
|||
(define-public emacs-dash
|
||||
(package
|
||||
(name "emacs-dash")
|
||||
(version "2.12.1")
|
||||
(version "2.13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1196,7 +1198,7 @@ (define-public emacs-dash
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1"))))
|
||||
"1pjlkrzr8n45bnp3xs3dybvy0nz3gwamrfc7vsi1nhpkkw99ihhb"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1233,7 +1235,7 @@ (define-public emacs-undo-tree
|
|||
(define-public emacs-s
|
||||
(package
|
||||
(name "emacs-s")
|
||||
(version "1.9.0")
|
||||
(version "1.11.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1242,7 +1244,7 @@ (define-public emacs-s
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091"))))
|
||||
"0krq5nz3llfx0vwdqn18pmq777ja0fac185w0h9qymppb1j1hvc2"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1259,7 +1261,7 @@ (define-public emacs-s
|
|||
(define-public emacs-f
|
||||
(package
|
||||
(name "emacs-f")
|
||||
(version "0.17.2")
|
||||
(version "0.18.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1268,7 +1270,7 @@ (define-public emacs-f
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n5gcldf43wmkr7jxgs519v21zavwr0yn8048iv6gvgfwicnyjlx"))))
|
||||
"1926shh2ymdsgz05c6q181mzzz1rci99ch568j151xi865jinyg5"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-s" ,emacs-s)
|
||||
|
@ -2091,6 +2093,26 @@ (define-public emacs-solarized-theme
|
|||
package provides a light and a dark variant.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-ahungry-theme
|
||||
(package
|
||||
(name "emacs-ahungry-theme")
|
||||
(version "1.3.0")
|
||||
(source
|
||||
(origin (method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/ahungry-theme-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/ahungry/color-theme-ahungry")
|
||||
(synopsis "Ahungry color theme for Emacs")
|
||||
(description "Ahungry theme for Emacs provides bright and bold colors.
|
||||
If you load it from a terminal, you will be able to make use of the
|
||||
transparent background. If you load it from a GUI, it will default to a
|
||||
dark background.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-smartparens
|
||||
(package
|
||||
(name "emacs-smartparens")
|
||||
|
@ -2960,3 +2982,23 @@ (define-public emacs-neotree
|
|||
(synopsis "Folder tree view for Emacs")
|
||||
(description "This Emacs package provides a folder tree view.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-org
|
||||
(package
|
||||
(name "emacs-org")
|
||||
(version "20160815")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://orgmode.org/elpa/org-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"0k9pa13kpmpi6irmbavxffgqfanhjnijz4mkmmi0zp7kgjfbaliw"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://orgmode.org/")
|
||||
(synopsis "Outline-based notes management and organizer")
|
||||
(description "Org is an Emacs mode for keeping notes, maintaining TODO
|
||||
lists, and project planning with a fast and effective plain-text system. It
|
||||
also is an authoring system with unique support for literate programming and
|
||||
reproducible research.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -388,7 +388,9 @@ (define-public fritzing
|
|||
(assoc-ref outputs "out"))
|
||||
"phoenix.pro"))))))))
|
||||
(inputs
|
||||
`(("qt" ,qt)
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtserialport" ,qtserialport)
|
||||
("qtsvg" ,qtsvg)
|
||||
("boost" ,boost)
|
||||
("zlib" ,zlib)
|
||||
("fritzing-parts-db"
|
||||
|
|
|
@ -53,7 +53,7 @@ (define-module (gnu packages enlightenment)
|
|||
(define-public efl
|
||||
(package
|
||||
(name "efl")
|
||||
(version "1.17.2")
|
||||
(version "1.18.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -61,7 +61,7 @@ (define-public efl
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dpq5flygrjg931nzsr2ra8icqffzrzbs1lnrzarbpsbmgq3zacs"))))
|
||||
"17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -69,13 +69,15 @@ (define-public efl
|
|||
`(("alsa-lib" ,alsa-lib)
|
||||
("compositeproto" ,compositeproto)
|
||||
("curl" ,curl)
|
||||
("ghostscript" ,ghostscript)
|
||||
("giflib" ,giflib)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("harfbuzz" ,harfbuzz)
|
||||
("libexif" ,libexif)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libraw" ,libraw)
|
||||
("librsvg" ,librsvg)
|
||||
("libspectre" ,libspectre)
|
||||
("libtiff" ,libtiff)
|
||||
("libx11" ,libx11)
|
||||
("libxcomposite" ,libxcomposite)
|
||||
|
@ -89,7 +91,10 @@ (define-public efl
|
|||
("libxrandr" ,libxrandr)
|
||||
("libxscrnsaver" ,libxscrnsaver)
|
||||
("libxtst" ,libxtst)
|
||||
("lz4" ,lz4)
|
||||
("mesa" ,mesa)
|
||||
("openjpeg" ,openjpeg-1)
|
||||
("poppler" ,poppler)
|
||||
("printproto" ,printproto)
|
||||
("scrnsaverproto" ,scrnsaverproto)
|
||||
("xextproto" ,xextproto)
|
||||
|
@ -100,28 +105,41 @@ (define-public efl
|
|||
;; All these inputs are in package config files in section
|
||||
;; Require.private.
|
||||
`(("bullet" ,bullet) ; ephysics.pc
|
||||
("dbus" ,dbus) ; eldbus.pc
|
||||
("dbus" ,dbus) ; eldbus.pc, elementary.pc, elocation.pc, ethumb_client.pc
|
||||
("eudev" ,eudev) ; eeze.pc
|
||||
("fontconfig" ,fontconfig) ; evas.pc
|
||||
("freetype" ,freetype) ; evas.pc
|
||||
("fribidi" ,fribidi) ; evas.pc
|
||||
("glib" ,glib) ; ecore.pc
|
||||
("fontconfig" ,fontconfig) ; evas.pc, evas-cxx.pc
|
||||
("freetype" ,freetype) ; evas.pc, evas-cxx.pc
|
||||
("fribidi" ,fribidi) ; evas.pc, evas-cxx.pc
|
||||
("glib" ,glib) ; ecore.pc, ecore-cxx.pc
|
||||
("harfbuzz" ,harfbuzz) ; evas.pc, evas-cxx.pc
|
||||
("luajit" ,luajit) ; elua.pc, evas.pc, evas-cxx.pc
|
||||
("libpng" ,libpng) ; evas.pc, evas-cxx.pc
|
||||
("libsndfile" ,libsndfile) ; ecore-audio.pc, ecore-audio-cxx.pc
|
||||
("luajit" ,luajit) ; evas.pc, edje.pc
|
||||
("openssl" ,openssl) ; eet.pc, ecore-con.pc
|
||||
("openssl" ,openssl) ; ecore-con.pc, eet.pc, eet-cxx.pc, emile.pc
|
||||
("pulseaudio" ,pulseaudio) ; ecore-audio.pc, ecore-audio-cxx.pc
|
||||
("util-linux" ,util-linux) ; eeze.pc
|
||||
("zlib" ,zlib))) ; eet.pc
|
||||
("zlib" ,zlib))) ; eet.pc, eet-cxx.pc, emile.pc
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-silent-rules")
|
||||
`(#:configure-flags '("--disable-silent-rules"
|
||||
"--enable-liblz4"
|
||||
"--enable-harfbuzz")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-config-files
|
||||
;; ecore_audio cannot find pulseaudio or libsndfile when compiled.
|
||||
;; Starting in version 1.18.0, these two libraries are dlopened so
|
||||
;; we hardcode their locations as a temporary workaround.
|
||||
(add-after 'configure 'hardlink-dlopen-files
|
||||
(lambda _
|
||||
(substitute* "po/Makefile.in.in"
|
||||
(("/bin/sh") (which "bash"))))))))
|
||||
(home-page "http://www.enlightenment.org")
|
||||
(substitute* "src/lib/ecore_audio/ecore_audio.c"
|
||||
(("libpulse.so.0")
|
||||
(string-append (assoc-ref %build-inputs "pulseaudio")
|
||||
"/lib/libpulse.so.0")))
|
||||
(substitute* "src/lib/ecore_audio/ecore_audio.c"
|
||||
(("libsndfile.so.1")
|
||||
(string-append (assoc-ref %build-inputs "libsndfile")
|
||||
"/lib/libsndfile.so.1")))
|
||||
#t)))))
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(synopsis "Enlightenment Foundation Libraries")
|
||||
(description
|
||||
"Enlightenment Foundation Libraries is a set of libraries developed
|
||||
|
@ -148,7 +166,7 @@ (define-public elementary
|
|||
`(("pkg-config" ,pkg-config)))
|
||||
(propagated-inputs
|
||||
`(("efl" ,efl))) ; elementary.pc, elementary-cxx.pc
|
||||
(home-page "http://www.enlightenment.org")
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(synopsis "Widget library of Enlightenment world")
|
||||
(description
|
||||
"Elementary is a widget library/toolkit, part of the Enlightenment
|
||||
|
@ -180,7 +198,7 @@ (define-public evas-generic-loaders
|
|||
("librsvg" ,librsvg)
|
||||
("libspectre" ,libspectre)
|
||||
("poppler" ,poppler)))
|
||||
(home-page "http://www.enlightenment.org")
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(synopsis "Plugins for integration of various file types into Evas")
|
||||
(description
|
||||
"Evas-generic-loaders is a collection of interfaces to outside libraries
|
||||
|
@ -207,7 +225,7 @@ (define-public emotion-generic-players
|
|||
(inputs
|
||||
`(("efl" ,efl)
|
||||
("vlc" ,vlc)))
|
||||
(home-page "http://www.enlightenment.org")
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(synopsis "Plugins for integrating media players in EFL based applications")
|
||||
(description
|
||||
"Emotion-generic-players is a collection of interfaces to outside libraries
|
||||
|
@ -231,9 +249,8 @@ (define-public terminology
|
|||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("efl" ,efl)
|
||||
("elementary" ,elementary)))
|
||||
(home-page "http://www.enlightenment.org")
|
||||
`(("efl" ,efl)))
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(synopsis "Powerful terminal emulator based on EFL")
|
||||
(description
|
||||
"Terminology is fast and feature rich terminal emulator. It is solely
|
||||
|
@ -245,21 +262,21 @@ (define-public terminology
|
|||
(define-public rage
|
||||
(package
|
||||
(name "rage")
|
||||
(version "0.1.4")
|
||||
(version "0.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append
|
||||
"https://download.enlightenment.org/rel/apps/rage/rage-"
|
||||
version ".tar.gz"))
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"))))
|
||||
(base32
|
||||
"07mfh0k83nrm557x72qafxawxizilqgkr6sngbia3ikprc8556zy"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("efl" ,efl)
|
||||
("elementary" ,elementary)))
|
||||
`(("efl" ,efl)))
|
||||
(home-page "https://www.enlightenment.org/about-rage")
|
||||
(synopsis "Video and audio player based on EFL")
|
||||
(description
|
||||
|
@ -270,7 +287,7 @@ (define-public rage
|
|||
(define-public enlightenment
|
||||
(package
|
||||
(name "enlightenment")
|
||||
(version "0.21.1")
|
||||
(version "0.21.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -278,25 +295,22 @@ (define-public enlightenment
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"119sxrgrz163c01yx0q9n2jpmmbv0a58akmz0c2z4xy37f1m02rx"))))
|
||||
"0fi5dxrprnvhnn2y51gnfpsjj44snriqi20k20a73vhaqxfn8xx8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-mount-eeze")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("gettext" ,gnu-gettext)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
("dbus" ,dbus)
|
||||
("efl" ,efl)
|
||||
("freetype" ,freetype)
|
||||
("gettext" ,gnu-gettext)
|
||||
("libxcb" ,libxcb)
|
||||
("libxext" ,libxext)
|
||||
("linux-pam" ,linux-pam)
|
||||
("xcb-util-keysyms" ,xcb-util-keysyms)))
|
||||
(propagated-inputs
|
||||
;; both these inputs are present in pkgconfig file in Require section
|
||||
`(("efl" ,efl) ; enlightenment.pc
|
||||
("elementary" ,elementary))) ; enlightenment.pc
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(synopsis "Lightweight desktop environment")
|
||||
(description
|
||||
|
@ -309,14 +323,14 @@ (define-public enlightenment
|
|||
(define-public python-efl
|
||||
(package
|
||||
(name "python-efl")
|
||||
(version "1.16.0")
|
||||
(version "1.18.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "python-efl" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ihay90agl2jx12m7jj8j1cspd7vsak1w7q95rhb6r2srkq0ppxk"))))
|
||||
"0x49rb7mx7ysjp23m919r2rx8qnl4xackhl9s9x2697m7cs77n1r"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -335,7 +349,6 @@ (define-public python-efl
|
|||
("python-cython" ,python-cython)))
|
||||
(inputs
|
||||
`(("efl" ,efl)
|
||||
("elementary" ,elementary)
|
||||
("python-dbus" ,python-dbus)))
|
||||
(home-page "https://www.enlightenment.org/")
|
||||
(synopsis "Python bindings for EFL")
|
||||
|
|
|
@ -67,7 +67,7 @@ (define-public bitcoin-core
|
|||
("miniupnpc" ,miniupnpc)
|
||||
("openssl" ,openssl)
|
||||
("protobuf" ,protobuf)
|
||||
("qt" ,qt)))
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list
|
||||
|
|
|
@ -295,6 +295,28 @@ (define-public wayland
|
|||
applications, X servers (rootless or fullscreen) or other display servers.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public wayland-protocols
|
||||
(package
|
||||
(name "wayland-protocols")
|
||||
(version "1.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://wayland.freedesktop.org/releases/"
|
||||
"wayland-protocols-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wpm7mz7ww6nn3vrgz7a9iyk7mk6za73wnq0n54lzl8yq8irljh1"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("wayland" ,wayland)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(synopsis "Wayland protocols")
|
||||
(description "This package contains XML definitions of the Wayland protocols.")
|
||||
(home-page "https://wayland.freedesktop.org")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public exempi
|
||||
(package
|
||||
(name "exempi")
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Julian Graham <joolean@gmail.com>
|
||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Julian Graham <joolean@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -93,14 +93,14 @@ (define-public bullet
|
|||
(define-public gzochi
|
||||
(package
|
||||
(name "gzochi")
|
||||
(version "0.9")
|
||||
(version "0.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/gzochi/gzochi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nf8naqbc4hmhy99b8n70yswg9j71nh5mfpwwh6d8pdw5mp9b46a"))))
|
||||
"055m7ywgl48ljwxf0kjhl76ldck890y5afdwjhk5s3p65xyaxh0k"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
|
@ -116,7 +116,6 @@ (define-public gzochi
|
|||
(native-inputs `(("pkgconfig" ,pkg-config)))
|
||||
(inputs `(("bdb" ,bdb)
|
||||
("glib" ,glib)
|
||||
("gmp" ,gmp)
|
||||
("guile" ,guile-2.0)
|
||||
("libmicrohttpd" ,libmicrohttpd)
|
||||
("ncurses" ,ncurses)
|
||||
|
@ -136,7 +135,7 @@ (define-public gzochi
|
|||
(define-public tiled
|
||||
(package
|
||||
(name "tiled")
|
||||
(version "0.16.1")
|
||||
(version "0.17.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/bjorn/tiled/archive/v"
|
||||
|
@ -144,7 +143,7 @@ (define-public tiled
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0s1i6yhm1z9ayzjh8cprcc9jvj5m87l9snyqg6w7zlj3q9zn4rn6"))))
|
||||
"0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("qt" ,qt)
|
||||
("zlib" ,zlib)))
|
||||
|
|
|
@ -1198,7 +1198,7 @@ (define-public raincat
|
|||
(define-public manaplus
|
||||
(package
|
||||
(name "manaplus")
|
||||
(version "1.6.6.4")
|
||||
(version "1.6.8.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1206,7 +1206,7 @@ (define-public manaplus
|
|||
version "/manaplus-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00sdw2mspdhrqvz0vl6jbnhiclj7vmvyjih9qf8dbkfw2s921ybc"))))
|
||||
"1mah4w6ng0j76cjzbw8y9m2ds5f1w5ka9b1k3gzgvxh4yaphqnff"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
|
|
@ -359,14 +359,14 @@ (define-public gcc-5
|
|||
(define-public gcc-6
|
||||
(package
|
||||
(inherit gcc-5)
|
||||
(version "6.1.0")
|
||||
(version "6.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ld3y4rgimyqgx1nwvzqyl5gr4wzc0ch4akkvsqp3fgbmdfcii09"))
|
||||
"1idpf43988v1a6i8lw9ak1r7igcfg1bm5kn011iydlr2qygmhi4r"))
|
||||
(patches (search-patches "gcc-5.0-libvtv-runpath.patch"))))))
|
||||
|
||||
;; Note: When changing the default gcc version, update
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -35,7 +36,7 @@ (define-module (gnu packages geo)
|
|||
(define-public gnome-maps
|
||||
(package
|
||||
(name "gnome-maps")
|
||||
(version "3.18.2")
|
||||
(version "3.18.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -43,7 +44,7 @@ (define-public gnome-maps
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y4jmh5hwskh2mnladh9hxp9k8as7crm8wwwiifvxsjjj9az2gv9"))))
|
||||
"1vdnr2wmhqhql2gxd5n1ijwk88qhim14izbkczncg35846hfsr5i"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags ; Ensure that geoclue is referred to by output.
|
||||
|
|
|
@ -43,16 +43,18 @@ (define-module (gnu packages gimp)
|
|||
(define-public babl
|
||||
(package
|
||||
(name "babl")
|
||||
(version "0.1.10")
|
||||
(version "0.1.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "http://ftp.gtk.org/pub/babl/0.1/babl-"
|
||||
(uri (list (string-append "https://download.gimp.org/pub/babl/"
|
||||
"0.1/babl-" version ".tar.bz2")
|
||||
(string-append "http://ftp.gtk.org/pub/babl/0.1/babl-"
|
||||
version ".tar.bz2")
|
||||
(string-append "ftp://ftp.gtk.org/pub/babl/0.1/babl-"
|
||||
version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32
|
||||
"1x2mb7zfbvk9d0a7h5cpdff9hhjsadxvqml2jay2bpf7x9nc6gwl"))))
|
||||
"1ygvnq22pf0zvf3bj7h67vvbpz7b8hhjvrr79ribws7sr5dljfj8"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://gegl.org/babl/")
|
||||
(synopsis "Image pixel format conversion library")
|
||||
|
@ -124,23 +126,38 @@ (define-public gegl
|
|||
(define-public gimp
|
||||
(package
|
||||
(name "gimp")
|
||||
(version "2.8.16")
|
||||
(version "2.8.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.gimp.org/pub/gimp/v"
|
||||
(version-major+minor version)
|
||||
"/gimp-" version ".tar.bz2"))
|
||||
(patches (search-patches "gimp-CVE-2016-4994.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm"))))
|
||||
"0halh6sl3d2j9gahyabj6h6r3yyldcy7sfb4qrfazpkqqr3j5p9r"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;8 MiB of gtk-doc HTML
|
||||
(arguments
|
||||
'(#:configure-flags (list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))))
|
||||
"/share/gtk-doc/html"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'install-sitecustomize.py
|
||||
;; Install 'sitecustomize.py' into gimp's python directory to
|
||||
;; add pygobject and pygtk to pygimp's search path.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((pythonpath (getenv "PYTHONPATH"))
|
||||
(out (assoc-ref outputs "out"))
|
||||
(sitecustomize.py
|
||||
(string-append
|
||||
out "/lib/gimp/2.0/python/sitecustomize.py")))
|
||||
(call-with-output-file sitecustomize.py
|
||||
(lambda (port)
|
||||
(format port "import site~%")
|
||||
(format port "for dir in '~a'.split(':'):~%" pythonpath)
|
||||
(format port " site.addsitedir(dir)~%")))))))))
|
||||
(inputs
|
||||
`(("babl" ,babl)
|
||||
("glib" ,glib)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
|
||||
;;; Copyright © 2014 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -22,6 +22,7 @@
|
|||
(define-module (gnu packages gl)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
|
@ -547,3 +548,36 @@ (define-public soil
|
|||
"SOIL is a tiny C library used primarily for uploading textures into
|
||||
OpenGL.")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define-public glfw
|
||||
(package
|
||||
(name "glfw")
|
||||
(version "3.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/glfw/glfw"
|
||||
"/releases/download/" version
|
||||
"/glfw-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"09kk5yc1zhss9add8ryqrngrr16hdmc94rszgng135bhw09mxmdp"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no test target
|
||||
#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
("unzip" ,unzip)))
|
||||
(inputs
|
||||
`(("mesa" ,mesa)
|
||||
("libx11" ,libx11)
|
||||
("libxrandr" ,libxrandr)
|
||||
("libxinerama" ,libxinerama)
|
||||
("libxcursor" ,libxcursor)))
|
||||
(home-page "http://www.glfw.org")
|
||||
(synopsis "OpenGL application development library")
|
||||
(description
|
||||
"GLFW is a library for OpenGL, OpenGL ES and Vulkan development for
|
||||
desktop computers. It provides a simple API for creating windows, contexts
|
||||
and surfaces, receiving input and events.")
|
||||
(license license:zlib)))
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -85,7 +87,6 @@ (define-module (gnu packages gnome)
|
|||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages lirc)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages password-utils)
|
||||
|
@ -3284,7 +3285,7 @@ (define-public totem
|
|||
(define-public rhythmbox
|
||||
(package
|
||||
(name "rhythmbox")
|
||||
(version "3.2.1")
|
||||
(version "3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -3292,7 +3293,7 @@ (define-public rhythmbox
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz"))))
|
||||
"1347747m90aiz47wny1f8rdk5195qf2ph0554c6y91711sm951gg"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -3310,11 +3311,13 @@ (define-public rhythmbox
|
|||
(let ((out (assoc-ref outputs "out"))
|
||||
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
|
||||
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
|
||||
(grl-plugin-path (getenv "GRL_PLUGIN_PATH")))
|
||||
(grl-plugin-path (getenv "GRL_PLUGIN_PATH"))
|
||||
(python-path (getenv "PYTHONPATH")))
|
||||
(wrap-program (string-append out "/bin/rhythmbox")
|
||||
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
|
||||
`("GRL_PLUGIN_PATH" ":" prefix (,grl-plugin-path))))
|
||||
`("GRL_PLUGIN_PATH" ":" prefix (,grl-plugin-path))
|
||||
`("PYTHONPATH" ":" prefix (,python-path))))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("dconf" ,dconf)))
|
||||
|
@ -3360,7 +3363,6 @@ (define-public rhythmbox
|
|||
;; TODO:
|
||||
;; * libgpod
|
||||
;; * mx
|
||||
;; * webkit
|
||||
("brasero" ,brasero)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Rhythmbox")
|
||||
(synopsis "Music player for GNOME")
|
||||
|
@ -3600,7 +3602,7 @@ (define-public simple-scan
|
|||
(define-public epiphany
|
||||
(package
|
||||
(name "epiphany")
|
||||
(version "3.20.1")
|
||||
(version "3.20.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -3608,7 +3610,7 @@ (define-public epiphany
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ry9z6d51gjbv5n8kspwdyfrdai2hrin2ixdicmyiq6xbryzcwbi"))))
|
||||
"18i4nk4k4q2yaj4zw0gbyp7ja2g67pm05p56bbras52cnjyy37ad"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
;; FIXME: tests run under Xvfb, but fail with:
|
||||
|
@ -3862,7 +3864,7 @@ (define-public gexiv2
|
|||
(define-public shotwell
|
||||
(package
|
||||
(name "shotwell")
|
||||
(version "0.23.1")
|
||||
(version "0.23.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -3870,39 +3872,28 @@ (define-public shotwell
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12imip32mav0zqg1fh4xm6zk4qsgg2435xsyb6ljz47i37zk6kg2"))))
|
||||
"0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no "check" target
|
||||
#:make-flags '("CC=gcc")
|
||||
#:configure-flags '("--disable-gsettings-convert-install")
|
||||
#:out-of-source? #f))
|
||||
(propagated-inputs
|
||||
`(("dconf" ,dconf)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("itstool" ,itstool)
|
||||
("gettext" ,gnu-gettext)
|
||||
("m4" ,m4)
|
||||
("desktop-file-utils" ,desktop-file-utils)
|
||||
("vala" ,vala)
|
||||
("which" ,which)
|
||||
("gnome-doc-utils" ,gnome-doc-utils)
|
||||
;; FIXME: I only added python2-libxml2 because xml2po needs it at
|
||||
;; runtime. It should be propagated.
|
||||
("python2-libxml2" ,python2-libxml2)
|
||||
("python2" ,python-2)))
|
||||
("itstool" ,itstool)
|
||||
("vala" ,vala)))
|
||||
(inputs
|
||||
`(("gstreamer" ,gstreamer)
|
||||
`(("glib:bin" ,glib "bin")
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("gst-plugins-good" ,gst-plugins-good)
|
||||
("libgee" ,libgee)
|
||||
("gexiv2" ,gexiv2)
|
||||
("libraw" ,libraw)
|
||||
("json-glib" ,json-glib)
|
||||
("rest" ,rest)
|
||||
("webkitgtk" ,webkitgtk)
|
||||
("sqlite" ,sqlite)
|
||||
("libsoup" ,libsoup)
|
||||
("libxml2" ,libxml2)
|
||||
("gtk+" ,gtk+)
|
||||
("libgudev" ,libgudev)
|
||||
("libgphoto2" ,libgphoto2)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Shotwell")
|
||||
|
@ -4489,6 +4480,27 @@ (define-public network-manager
|
|||
services.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public mobile-broadband-provider-info
|
||||
(package
|
||||
(name "mobile-broadband-provider-info")
|
||||
(version "20151214")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://gnome/sources/"
|
||||
"mobile-broadband-provider-info/" version "/"
|
||||
"mobile-broadband-provider-info-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1905nab1h8p4hx0m1w0rn4mkg9209x680dcr4l77bngy21pmvr4a"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No tests
|
||||
(home-page "https://wiki.gnome.org/Projects/NetworkManager")
|
||||
(synopsis "Database of broadband connection configuration")
|
||||
(description "Database of broadband connection configuration.")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define-public network-manager-applet
|
||||
(package
|
||||
(name "network-manager-applet")
|
||||
|
@ -5458,3 +5470,43 @@ (define-public libgnomekbd
|
|||
"Libgnomekbd is a keyboard configuration library for the GNOME desktop
|
||||
environment, which can notably display keyboard layouts.")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
;;; This package is no longer maintained:
|
||||
;;; https://wiki.gnome.org/Attic/LibUnique
|
||||
;;; "Unique is now in maintenance mode, and its usage is strongly discouraged.
|
||||
;;; Applications should use the GtkApplication class provided by GTK+ 3.0."
|
||||
(define-public libunique
|
||||
(package
|
||||
(name "libunique")
|
||||
(version "3.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static"
|
||||
"--disable-dbus" ; use gdbus
|
||||
"--enable-introspection")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gtk-doc" ,gtk-doc)))
|
||||
(propagated-inputs
|
||||
;; Referred to in .h files and .pc.
|
||||
`(("gtk+" ,gtk+)))
|
||||
(home-page "https://wiki.gnome.org/Attic/LibUnique")
|
||||
(synopsis "Library for writing single instance applications")
|
||||
(description
|
||||
"Libunique is a library for writing single instance applications. If you
|
||||
launch a single instance application twice, the second instance will either just
|
||||
quit or will send a message to the running instance. Libunique makes it easy to
|
||||
write this kind of application, by providing a base class, taking care of all
|
||||
the IPC machinery needed to send messages to a running instance, and also
|
||||
handling the startup notification side.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
|
|
@ -126,14 +126,14 @@ (define-public libextractor
|
|||
(define-public libmicrohttpd
|
||||
(package
|
||||
(name "libmicrohttpd")
|
||||
(version "0.9.50")
|
||||
(version "0.9.51")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni"))))
|
||||
"1ir3ga328zkyynznnw71dj64wsaz7pmbhl82lqp1y1hrl85vn01h"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
|
@ -325,7 +325,7 @@ (define-public gnunet-gtk
|
|||
"1p38k1s6a2fmcfc9a7cf1zrdycm9h06kqdyand4s3k500nj6mb4g"))))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--without-libunique"
|
||||
(list "--with-libunique"
|
||||
"--with-qrencode"
|
||||
(string-append "--with-gnunet="
|
||||
(assoc-ref %build-inputs "gnunet")))))
|
||||
|
@ -335,7 +335,8 @@ (define-public gnunet-gtk
|
|||
("gtk+" ,gtk+)
|
||||
("libextractor" ,libextractor)
|
||||
("glade3" ,glade3)
|
||||
("qrencode" ,qrencode)))
|
||||
("qrencode" ,qrencode)
|
||||
("libunique" ,libunique)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("libglade" ,libglade)))
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;;
|
||||
|
@ -149,7 +150,7 @@ (define-public libassuan
|
|||
(define-public libksba
|
||||
(package
|
||||
(name "libksba")
|
||||
(version "1.3.4")
|
||||
(version "1.3.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -158,7 +159,7 @@ (define-public libksba
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn"))))
|
||||
"0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libgpg-error" ,libgpg-error)))
|
||||
|
@ -397,9 +398,7 @@ (define-public python-pygpgme
|
|||
(zero? (system* "make" "check")))))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(;; setuptools required for python-2 variant
|
||||
("python-setuptools" ,python-setuptools)
|
||||
("gnupg" ,gnupg-2.0)
|
||||
`(("gnupg" ,gnupg-2.0)
|
||||
("gpgme" ,gpgme)))
|
||||
(home-page "https://launchpad.net/pygpgme")
|
||||
(synopsis "Python module for working with OpenPGP messages")
|
||||
|
@ -409,7 +408,12 @@ (define-public python-pygpgme
|
|||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public python2-pygpgme
|
||||
(package-with-python2 python-pygpgme))
|
||||
(let ((base (package-with-python2 python-pygpgme)))
|
||||
(package
|
||||
(inherit base)
|
||||
(native-inputs
|
||||
`(("python2-setuptools" ,python2-setuptools)
|
||||
,@(package-native-inputs base))))))
|
||||
|
||||
(define-public python-gnupg
|
||||
(package
|
||||
|
@ -427,20 +431,18 @@ (define-public python-gnupg
|
|||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "test_gnupg.py"
|
||||
;; Test keyrings are missing, so this test fails.
|
||||
(("'test_scan_keys'") "True")
|
||||
(("def test_scan_keys") "def disabled__scan_keys")
|
||||
;; Unsure why this test fails.
|
||||
(("'test_search_keys'") "True")
|
||||
(("def test_search_keys") "def disabled__search_keys"))
|
||||
(setenv "GPGBINARY" "gpg")
|
||||
(setenv "USERNAME" "guixbuilder")
|
||||
;; The doctests are extremely slow and sometimes time out,
|
||||
;; so we disable them.
|
||||
(zero? (system* "python"
|
||||
"test_gnupg.py" "--no-doctests")))))))
|
||||
(lambda _
|
||||
(substitute* "test_gnupg.py"
|
||||
;; Exported keys don't have a version line!
|
||||
(("del k1\\[1\\]") "#")
|
||||
;; Unsure why this test fails.
|
||||
(("'test_search_keys'") "True")
|
||||
(("def test_search_keys") "def disabled__search_keys"))
|
||||
(setenv "USERNAME" "guixbuilder")
|
||||
;; The doctests are extremely slow and sometimes time out,
|
||||
;; so we disable them.
|
||||
(zero? (system* "python"
|
||||
"test_gnupg.py" "--no-doctests")))))))
|
||||
(native-inputs
|
||||
`(("gnupg" ,gnupg-1)))
|
||||
(home-page "https://packages.python.org/python-gnupg/index.html")
|
||||
|
@ -477,7 +479,7 @@ (define-public pius
|
|||
'build 'set-gpg-file-name
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((gpg (string-append (assoc-ref inputs "gpg")
|
||||
"/bin/gpg2")))
|
||||
"/bin/gpg")))
|
||||
(substitute* "libpius/constants.py"
|
||||
(("/usr/bin/gpg2") gpg))))))))
|
||||
(synopsis "Programs to simplify GnuPG key signing")
|
||||
|
@ -499,8 +501,8 @@ (define-public signing-party
|
|||
(version "1.1.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://ftp.debian.org/debian/pool/main/s/signing-party/signing-party_"
|
||||
version ".orig.tar.gz"))
|
||||
(uri (string-append "mirror://debian/pool/main/s/signing-party/"
|
||||
"signing-party_" version ".orig.tar.gz"))
|
||||
(sha256 (base32
|
||||
"188gp0prbh8qs29lq3pbf0qibfd6jq4fk7i0pfrybl8aahvm84rx"))))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -508,85 +510,71 @@ (define-public signing-party
|
|||
(arguments
|
||||
`(#:tests? #f
|
||||
#:phases
|
||||
(alist-cons-after
|
||||
'unpack 'remove-spurious-links
|
||||
(lambda _ (delete-file "keyanalyze/pgpring/depcomp"))
|
||||
(alist-replace
|
||||
'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "keyanalyze/Makefile"
|
||||
(("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS")))
|
||||
(substitute* "keyanalyze/Makefile"
|
||||
(("./configure") (string-append "./configure --prefix=" out)))
|
||||
(substitute* "keyanalyze/pgpring/configure"
|
||||
(("/bin/sh") (which "bash")))
|
||||
(substitute* "gpgwrap/Makefile"
|
||||
(("\\} clean") (string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap "
|
||||
out "/bin/gpgwrap\n")))
|
||||
(substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile"
|
||||
"keylookup/Makefile" "sig2dot/Makefile"
|
||||
"springgraph/Makefile")
|
||||
(("/usr") out))))
|
||||
(alist-replace
|
||||
'install
|
||||
(lambda* (#:key outputs #:allow-other-keys #:rest args)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(install (assoc-ref %standard-phases 'install)))
|
||||
(apply install args)
|
||||
(for-each
|
||||
(lambda (dir file)
|
||||
(copy-file (string-append dir "/" file)
|
||||
(string-append out "/bin/" file)))
|
||||
'("caff" "caff" "caff" "gpgdir" "gpg-key2ps"
|
||||
"gpglist" "gpg-mailkeys" "gpgparticipants")
|
||||
'("caff" "pgp-clean" "pgp-fixkey" "gpgdir" "gpg-key2ps"
|
||||
"gpglist" "gpg-mailkeys" "gpgparticipants"))
|
||||
(for-each
|
||||
(lambda (dir file)
|
||||
(copy-file (string-append dir "/" file)
|
||||
(string-append out "/share/man/man1/" file)))
|
||||
'("caff" "caff" "caff" "gpgdir"
|
||||
"gpg-key2ps" "gpglist" "gpg-mailkeys"
|
||||
"gpgparticipants" "gpgsigs" "gpgwrap/doc"
|
||||
"keyanalyze" "keyanalyze/pgpring" "keyanalyze")
|
||||
'("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1"
|
||||
"gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1"
|
||||
"gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
|
||||
"process_keys.1" "pgpring.1" "keyanalyze.1"))))
|
||||
%standard-phases)))))
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-spurious-links
|
||||
(lambda _ (delete-file "keyanalyze/pgpring/depcomp")))
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "keyanalyze/Makefile"
|
||||
(("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS")))
|
||||
(substitute* "keyanalyze/Makefile"
|
||||
(("./configure") (string-append "./configure --prefix=" out)))
|
||||
(substitute* "keyanalyze/pgpring/configure"
|
||||
(("/bin/sh") (which "bash")))
|
||||
(substitute* "gpgwrap/Makefile"
|
||||
(("\\} clean")
|
||||
(string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap "
|
||||
out "/bin/gpgwrap\n")))
|
||||
(substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile"
|
||||
"keylookup/Makefile" "sig2dot/Makefile"
|
||||
"springgraph/Makefile")
|
||||
(("/usr") out)))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys #:rest args)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(install (assoc-ref %standard-phases 'install)))
|
||||
(apply install args)
|
||||
(for-each
|
||||
(lambda (dir file)
|
||||
(copy-file (string-append dir "/" file)
|
||||
(string-append out "/bin/" file)))
|
||||
'("caff" "caff" "caff" "gpgdir" "gpg-key2ps"
|
||||
"gpglist" "gpg-mailkeys" "gpgparticipants")
|
||||
'("caff" "pgp-clean" "pgp-fixkey" "gpgdir" "gpg-key2ps"
|
||||
"gpglist" "gpg-mailkeys" "gpgparticipants"))
|
||||
(for-each
|
||||
(lambda (dir file)
|
||||
(copy-file (string-append dir "/" file)
|
||||
(string-append out "/share/man/man1/" file)))
|
||||
'("caff" "caff" "caff" "gpgdir"
|
||||
"gpg-key2ps" "gpglist" "gpg-mailkeys"
|
||||
"gpgparticipants" "gpgsigs" "gpgwrap/doc"
|
||||
"keyanalyze" "keyanalyze/pgpring" "keyanalyze")
|
||||
'("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1"
|
||||
"gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1"
|
||||
"gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
|
||||
"process_keys.1" "pgpring.1" "keyanalyze.1"))))))))
|
||||
(synopsis "Collection of scripts for simplifying gnupg key signing")
|
||||
(description
|
||||
"Signing-party is a collection for all kinds of PGP/GnuPG related things,
|
||||
including tools for signing keys, keyring analysis, and party preparation.
|
||||
|
||||
* caff: CA - Fire and Forget signs and mails a key
|
||||
|
||||
* pgp-clean: removes all non-self signatures from key
|
||||
|
||||
* pgp-fixkey: removes broken packets from keys
|
||||
|
||||
* gpg-mailkeys: simply mail out a signed key to its owner
|
||||
|
||||
* gpg-key2ps: generate PostScript file with fingerprint paper strips
|
||||
|
||||
* gpgdir: recursive directory encryption tool
|
||||
|
||||
* gpglist: show who signed which of your UIDs
|
||||
|
||||
* gpgsigs: annotates list of GnuPG keys with already done signatures
|
||||
|
||||
* gpgparticipants: create list of party participants for the organiser
|
||||
|
||||
* gpgwrap: a passphrase wrapper
|
||||
|
||||
* keyanalyze: minimum signing distance (MSD) analysis on keyrings
|
||||
|
||||
* keylookup: ncurses wrapper around gpg --search
|
||||
|
||||
* sig2dot: converts a list of GnuPG signatures to a .dot file
|
||||
|
||||
* springgraph: creates a graph from a .dot file")
|
||||
@enumerate
|
||||
@item caff: CA - Fire and Forget signs and mails a key
|
||||
@item pgp-clean: removes all non-self signatures from key
|
||||
@item pgp-fixkey: removes broken packets from keys
|
||||
@item gpg-mailkeys: simply mail out a signed key to its owner
|
||||
@item gpg-key2ps: generate PostScript file with fingerprint paper strips
|
||||
@item gpgdir: recursive directory encryption tool
|
||||
@item gpglist: show who signed which of your UIDs
|
||||
@item gpgsigs: annotates list of GnuPG keys with already done signatures
|
||||
@item gpgparticipants: create list of party participants for the organiser
|
||||
@item gpgwrap: a passphrase wrapper
|
||||
@item keyanalyze: minimum signing distance (MSD) analysis on keyrings
|
||||
@item keylookup: ncurses wrapper around gpg --search
|
||||
@item sig2dot: converts a list of GnuPG signatures to a .dot file
|
||||
@item springgraph: creates a graph from a .dot file
|
||||
@end enumerate")
|
||||
;; gpl2+ for almost all programs, except for keyanalyze: gpl2
|
||||
;; and caff and gpgsigs: bsd-3, see
|
||||
;; http://packages.debian.org/changelogs/pool/main/s/signing-party/current/copyright
|
||||
|
@ -639,6 +627,8 @@ (define-public pinentry-qt
|
|||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
,@(package-inputs pinentry-tty)))
|
||||
(arguments
|
||||
`(#:configure-flags '("CXXFLAGS=-std=gnu++11")))
|
||||
(description
|
||||
"Pinentry provides a console and a Qt GUI that allows users to enter a
|
||||
passphrase when @code{gpg} or @code{gpg2} is run and needs it.")))
|
||||
|
@ -662,13 +652,13 @@ (define-public paperkey
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(alist-cons-before
|
||||
'check 'patch-check-scripts
|
||||
(lambda _
|
||||
(substitute* '("checks/roundtrip.sh"
|
||||
"checks/roundtrip-raw.sh")
|
||||
(("/bin/echo") "echo")))
|
||||
%standard-phases)))
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'patch-check-scripts
|
||||
(lambda _
|
||||
(substitute* '("checks/roundtrip.sh"
|
||||
"checks/roundtrip-raw.sh")
|
||||
(("/bin/echo") "echo"))
|
||||
#t)))))
|
||||
(home-page "http://www.jabberwocky.com/software/paperkey/")
|
||||
(synopsis "Backup OpenPGP keys to paper")
|
||||
(description
|
||||
|
|
|
@ -48,7 +48,9 @@ (define-public gpsbabel
|
|||
"0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-zlib=system")
|
||||
`(#:configure-flags
|
||||
'("--with-zlib=system"
|
||||
"CXXFLAGS=-std=gnu++11")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'pre-configure
|
||||
|
@ -59,7 +61,9 @@ (define-public gpsbabel
|
|||
;; On i686, 'raymarine.test' fails because of a rounding error:
|
||||
;; <http://hydra.gnu.org/build/133040>. As a workaround, disable tests
|
||||
;; on these platforms.
|
||||
#:tests? ,(not (string-prefix? "i686" (%current-system)))))
|
||||
;; FIXME: On x86_64 with -std=gnu++11 tests also fail due to rounding
|
||||
;; error.
|
||||
#:tests? #f))
|
||||
(inputs
|
||||
`(("expat" ,expat)
|
||||
("zlib" ,zlib)
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages gstreamer)
|
||||
#:use-module ((guix licenses) #:select (lgpl2.0+ lgpl2.1+ bsd-2 bsd-3 gpl2+))
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
@ -92,7 +92,7 @@ (define-public orc
|
|||
arrays of data.")
|
||||
;; The source code implementing the Marsenne Twister algorithm is licensed
|
||||
;; under the 3-clause BSD license, the rest is under 2-clause BSD license.
|
||||
(license (list bsd-2 bsd-3))))
|
||||
(license (list license:bsd-2 license:bsd-3))))
|
||||
|
||||
(define-public gstreamer
|
||||
(package
|
||||
|
@ -140,7 +140,7 @@ (define-public gstreamer
|
|||
simple plugin with a clean, generic interface.
|
||||
|
||||
This package provides the core library and elements.")
|
||||
(license lgpl2.0+)))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public gst-plugins-base
|
||||
(package
|
||||
|
@ -192,7 +192,7 @@ (define-public gst-plugins-base
|
|||
"Plugins for the GStreamer multimedia library")
|
||||
(description "This package provides an essential exemplary set of plug-ins
|
||||
for the GStreamer multimedia library.")
|
||||
(license lgpl2.0+)))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
|
||||
(define-public gst-plugins-good
|
||||
|
@ -258,7 +258,7 @@ (define-public gst-plugins-good
|
|||
(description "GStreamer Good Plug-ins is a set of plug-ins for the
|
||||
GStreamer multimedia library. This set contains those plug-ins which the
|
||||
developers consider to have good quality code and correct functionality.")
|
||||
(license lgpl2.0+)))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public gst-plugins-bad
|
||||
(package
|
||||
|
@ -323,7 +323,7 @@ (define-public gst-plugins-bad
|
|||
("openssl" ,openssl)
|
||||
("opus" ,opus)
|
||||
("orc" ,orc)
|
||||
("qt" ,qt)
|
||||
("qtbase" ,qtbase)
|
||||
("soundtouch" ,soundtouch)
|
||||
("wayland" ,wayland)))
|
||||
(home-page "http://gstreamer.freedesktop.org/")
|
||||
|
@ -331,7 +331,7 @@ (define-public gst-plugins-bad
|
|||
(description
|
||||
"GStreamer Bad Plug-ins is a set of plug-ins whose quality aren't up to
|
||||
par compared to the rest.")
|
||||
(license lgpl2.0+)))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
|
@ -369,7 +369,7 @@ (define-public gst-plugins-ugly
|
|||
(description "GStreamer Ugly Plug-ins. This set contains those plug-ins
|
||||
which the developers consider to have good quality code but that might pose
|
||||
distribution problems in some jurisdictions, e.g. due to patent threats.")
|
||||
(license lgpl2.0+)))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public gst-libav
|
||||
(package
|
||||
|
@ -406,7 +406,7 @@ (define-public gst-libav
|
|||
(description
|
||||
"This GStreamer plugin supports a large number of audio and video
|
||||
compression formats through the use of the libav library.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public python-gst
|
||||
(package
|
||||
|
@ -446,7 +446,7 @@ (define-public python-gst
|
|||
(description
|
||||
"This package contains GObject Introspection overrides for Python that can
|
||||
be used by Python applications using GStreamer.")
|
||||
(license lgpl2.1+)
|
||||
(license license:lgpl2.1+)
|
||||
(properties `((python2-variant . ,(delay python2-gst))))))
|
||||
|
||||
(define-public python2-gst
|
||||
|
|
|
@ -1128,7 +1128,7 @@ (define-public guile-dbd-sqlite3
|
|||
(define-public guile-xosd
|
||||
(package
|
||||
(name "guile-xosd")
|
||||
(version "0.2")
|
||||
(version "0.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alezost/" name
|
||||
|
@ -1136,7 +1136,7 @@ (define-public guile-xosd
|
|||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j0b07kycccfslp5n6q0hz7adwc7k41fpzds2dvrly67gavjqljv"))))
|
||||
"1ri5065c16kmgrf2pysn2ymxjqi5302lhpb07wkl1jr75ym8fn8p"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -1157,7 +1157,7 @@ (define-public guile-xosd
|
|||
(define-public guile-daemon
|
||||
(package
|
||||
(name "guile-daemon")
|
||||
(version "0.1")
|
||||
(version "0.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alezost/" name
|
||||
|
@ -1165,7 +1165,7 @@ (define-public guile-daemon
|
|||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s90h8qhblhhz4ahn3p5d573a24px6cdjq2w311ibpgwnsni4qvq"))))
|
||||
"0wsq9l6a4sijq4i1r3kcddfaznsak2jc5k59gzkhs5il5d2kn5yi"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;;
|
||||
|
@ -36,7 +36,8 @@ (define-module (gnu packages ibus)
|
|||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages iso-codes)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python))
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public ibus
|
||||
(package
|
||||
|
@ -62,24 +63,42 @@ (define-public ibus
|
|||
(assoc-ref %outputs "out")
|
||||
"/lib/python2.7/site-packages/gi/overrides/"))
|
||||
#:phases
|
||||
(alist-cons-before
|
||||
'configure 'disable-dconf-update
|
||||
(lambda _
|
||||
(substitute* "data/dconf/Makefile.in"
|
||||
(("dconf update") "echo dconf update"))
|
||||
#t)
|
||||
(alist-cons-after
|
||||
'wrap-program 'wrap-with-additional-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
|
||||
;; GI_TYPELIB_PATH.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/ibus-setup")
|
||||
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
|
||||
`("GI_TYPELIB_PATH" ":" prefix
|
||||
(,(getenv "GI_TYPELIB_PATH")
|
||||
,(string-append out "/lib/girepository-1.0"))))))
|
||||
%standard-phases))))
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'disable-dconf-update
|
||||
(lambda _
|
||||
(substitute* "data/dconf/Makefile.in"
|
||||
(("dconf update") "echo dconf update"))
|
||||
#t))
|
||||
(add-after 'unpack 'delete-generated-files
|
||||
(lambda _
|
||||
(for-each (lambda (file)
|
||||
(let ((c (string-append (string-drop-right file 4) "c")))
|
||||
(when (file-exists? c)
|
||||
(format #t "deleting ~a\n" c)
|
||||
(delete-file c))))
|
||||
(find-files "." "\\.vala"))
|
||||
#t))
|
||||
(add-after 'unpack 'fix-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "src/ibusenginesimple.c"
|
||||
(("/usr/share/X11/locale")
|
||||
(string-append (assoc-ref inputs "libx11")
|
||||
"/share/X11/locale")))
|
||||
(substitute* "ui/gtk3/xkblayout.vala"
|
||||
(("\"(setxkbmap|xmodmap)\"" _ prog)
|
||||
(string-append "\"" (assoc-ref inputs prog) "\"")))
|
||||
#t))
|
||||
(add-after 'wrap-program 'wrap-with-additional-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
|
||||
;; GI_TYPELIB_PATH.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/ibus-setup")
|
||||
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
|
||||
`("GI_TYPELIB_PATH" ":" prefix
|
||||
(,(getenv "GI_TYPELIB_PATH")
|
||||
,(string-append out "/lib/girepository-1.0")))))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("dconf" ,dconf)
|
||||
|
@ -88,12 +107,16 @@ (define-public ibus
|
|||
("gtk+" ,gtk+)
|
||||
("intltool" ,intltool)
|
||||
("libnotify" ,libnotify)
|
||||
("libx11" ,libx11)
|
||||
("setxkbmap" ,setxkbmap)
|
||||
("xmodmap" ,xmodmap)
|
||||
("iso-codes" ,iso-codes)
|
||||
("pygobject2" ,python2-pygobject)
|
||||
("python2" ,python-2)))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ; for glib-genmarshal
|
||||
("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler
|
||||
("vala" ,vala)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
|
|
|
@ -51,7 +51,7 @@ (define-public imagemagick
|
|||
"00arcvyhsy9i5gp3b0lhfvs04qwhxpmq0bfsv4ipllinb6mjgxf5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths")
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before
|
||||
'build 'pre-build
|
||||
|
@ -100,7 +100,7 @@ (define-public imagemagick
|
|||
(home-page "http://www.imagemagick.org/")
|
||||
(synopsis "Create, edit, compose, or convert bitmap images")
|
||||
(description
|
||||
"ImageMagick® is a software suite to create, edit, compose, or convert
|
||||
"ImageMagick is a software suite to create, edit, compose, or convert
|
||||
bitmap images. It can read and write images in a variety of formats (over 100)
|
||||
including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
|
||||
and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
|
||||
|
|
|
@ -26,16 +26,24 @@ (define-module (gnu packages kde-frameworks)
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages attr)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages polkit)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public extra-cmake-modules
|
||||
|
@ -77,6 +85,60 @@ (define-public extra-cmake-modules
|
|||
common build settings used in software produced by the KDE community.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public phonon
|
||||
(package
|
||||
(name "phonon")
|
||||
(version "4.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/phonon"
|
||||
"/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
'("-DCMAKE_CXX_FLAGS=-fPIC"
|
||||
"-DPHONON_BUILD_PHONON4QT5=ON")))
|
||||
(home-page "https://phonon.kde.org")
|
||||
(synopsis "KDE's multimedia library")
|
||||
(description "KDE's multimedia library.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public gpgmepp
|
||||
(package
|
||||
(name "gpgmepp")
|
||||
(version "16.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/applications"
|
||||
"/" version "/src/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1850pdysi7c1w0nxnhcbrhnkrfqyrcl0laxyjcw1g1ln764pwcmj"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(propagated-inputs
|
||||
`(("boost" ,boost)
|
||||
("gpgme" ,gpgme)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "C++ bindings/wrapper for gpgme")
|
||||
(description "C++ bindings/wrapper for gpgme.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
|
||||
;; Tier 1
|
||||
;;
|
||||
;; Tier 1 frameworks depend only on Qt (and possibly a small number of other
|
||||
|
@ -331,7 +393,7 @@ (define-public kconfig
|
|||
KConfigCore provides access to the configuration files themselves.
|
||||
It features:
|
||||
|
||||
@itemize
|
||||
@enumerate
|
||||
@item Code generation: describe your configuration in an XML file, and use
|
||||
`kconfig_compiler to generate classes that read and write configuration
|
||||
entries.
|
||||
|
@ -342,7 +404,7 @@ (define-public kconfig
|
|||
@item Optional shell expansion support (see docs/options.md).
|
||||
|
||||
@item The ability to lock down configuration options (see docs/options.md).
|
||||
@end itemize
|
||||
@end enumerate
|
||||
|
||||
KConfigGui provides a way to hook widgets to the configuration so that they
|
||||
are automatically initialized from the configuration and automatically
|
||||
|
@ -477,13 +539,10 @@ (define-public kguiaddons
|
|||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(add-before 'check 'check-setup
|
||||
(lambda* _
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Utilities for graphical user interfaces")
|
||||
(description "The KDE GUI addons provide utilities for graphical user
|
||||
|
@ -592,7 +651,7 @@ (define-public kitemmodels
|
|||
(synopsis "Set of item models extending the Qt model-view framework")
|
||||
(description "KItemModels provides the following models:
|
||||
|
||||
@itemize
|
||||
@enumerate
|
||||
@item KBreadcrumbSelectionModel - Selects the parents of selected items to
|
||||
create breadcrumbs.
|
||||
|
||||
|
@ -617,7 +676,7 @@ (define-public kitemmodels
|
|||
|
||||
@item KSelectionProxyModel - A Proxy Model which presents a subset of its source
|
||||
model to observers
|
||||
@end itemize")
|
||||
@end enumerate")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kitemviews
|
||||
|
@ -757,21 +816,25 @@ (define-public kwidgetsaddons
|
|||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: libGL error: failed to load driver: swrast.
|
||||
`(#:tests? #f ; FIXME: Regression after update to qt 5.7
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda* _
|
||||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output
|
||||
(setenv "LIBGL_DEBUG" "verbose") ; enable debug output
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")))
|
||||
(lambda _
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen") ; a better solution to Xvfb
|
||||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
#t))
|
||||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
;; Xvfb doesn't have proper glx support and needs a pixeldepth
|
||||
;; of 24 bit to avoid "libGL error: failed to load driver: swrast"
|
||||
;; "Could not initialize GLX"
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Large set of desktop widgets")
|
||||
(description "Provided are action classes that can be added to toolbars or
|
||||
|
@ -838,9 +901,11 @@ (define-public modemmanager-qt
|
|||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("dbus" ,dbus)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(propagated-inputs
|
||||
; Headers contain #include <ModemManager/ModemManager.h>
|
||||
`(("modem-manager", modem-manager)))
|
||||
(inputs
|
||||
`(("modem-manager", modem-manager)
|
||||
("qtbase" ,qtbase)))
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -874,9 +939,12 @@ (define-public networkmanager-qt
|
|||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("dbus" ,dbus)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(propagated-inputs
|
||||
; Headers contain #include <NetworkManager.h> and
|
||||
; #include <libnm/NetworkManager.h>
|
||||
`(("network-manager" ,network-manager)))
|
||||
(inputs
|
||||
`(("network-manager", network-manager)
|
||||
("qtbase" ,qtbase)))
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -992,3 +1060,404 @@ (define-public threadweaver
|
|||
(description "ThreadWeaver is a helper for multithreaded programming. It
|
||||
uses a job-based interface to queue tasks and execute them in an efficient way.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
|
||||
;; Tier 2
|
||||
;;
|
||||
;; Tier 2 frameworks additionally depend on tier 1 frameworks, but still have
|
||||
;; easily manageable dependencies.
|
||||
|
||||
(define-public kauth
|
||||
(package
|
||||
(name "kauth")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14sjjfgl3arqyqcr77w9qhpnd8mrnh53r5rfss6bvlk26bmihs49"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("dbus" ,dbus)
|
||||
("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("kcoreaddons" ,kcoreaddons)
|
||||
("polkit-qt" ,polkit-qt)
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* _
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
(zero? (system* "dbus-launch" "ctest" ".")))))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Execute actions as privileged user")
|
||||
(description "KAuth provides a convenient, system-integrated way to offload
|
||||
actions that need to be performed as a privileged user to small set of helper
|
||||
utilities.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kcompletion
|
||||
(package
|
||||
(name "kcompletion")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qln0v31gn86kzwhnkijr1ydf129n32jmiybbckrp4w6hyx6xfxv"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("qttools" ,qttools)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(inputs
|
||||
`(("kconfig" ,kconfig)
|
||||
("kwidgetsaddons" ,kwidgetsaddons)
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda _
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Powerful autocompletion framework and widgets")
|
||||
(description "This framework helps implement autocompletion in Qt-based
|
||||
applications. It provides a set of completion-ready widgets, or can be
|
||||
integrated it into your application's other widgets.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kcrash
|
||||
(package
|
||||
(name "kcrash")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lahgfwlp9b5rsl244kzp7rsl4ybv1q4qlvpv0xxz5ygssk48l0w"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(inputs
|
||||
`(("kcoreaddons" ,kcoreaddons)
|
||||
("kwindowsystem" ,kwindowsystem)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Graceful handling of application crashes")
|
||||
(description "KCrash provides support for intercepting and handling
|
||||
application crashes.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kdoctools
|
||||
(package
|
||||
(name "kdoctools")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r129kpq0d11b9l87cqbal6fm5ycwhsps1g3r1a7jsxz70scz4ri"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(inputs
|
||||
`(("docbook-xml" ,docbook-xml)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("karchive" ,karchive)
|
||||
("ki18n" ,ki18n)
|
||||
("libxml2" ,libxml2)
|
||||
("libxslt" ,libxslt)
|
||||
("perl" ,perl)
|
||||
("perl-uri" ,perl-uri)
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'cmake-find-docbook
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* (find-files "cmake" "\\.cmake$")
|
||||
(("CMAKE_SYSTEM_PREFIX_PATH")
|
||||
"CMAKE_PREFIX_PATH"))
|
||||
(substitute* "cmake/FindDocBookXML4.cmake"
|
||||
(("^.*xml/docbook/schema/dtd.*$")
|
||||
"xml/dtd/docbook\n"))
|
||||
(substitute* "cmake/FindDocBookXSL.cmake"
|
||||
(("^.*xml/docbook/stylesheet.*$")
|
||||
(string-append "xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl) "\n"))))))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Create documentation from DocBook")
|
||||
(description "Provides tools to generate documentation in various format
|
||||
from DocBook files.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kfilemetadata
|
||||
(package
|
||||
(name "kfilemetadata")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02n9qhpr0jlwdgdbid0k34abhs3bzhlsa56ybl5dq1aib6izk1sy"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("python-2" ,python-2)))
|
||||
(inputs
|
||||
`(("attr" ,attr)
|
||||
("karchive" ,karchive)
|
||||
("ki18n" ,ki18n)
|
||||
("qtbase" ,qtbase)))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Extract metadata from different fileformats")
|
||||
(description "KFileMetaData provides a simple library for extracting the
|
||||
text and metadata from a number of different files. This library is typically
|
||||
used by file indexers to retreive the metadata. This library can also be used
|
||||
by applications to write metadata.")
|
||||
(license (list license:lgpl2.0 license:lgpl2.1 license:lgpl3))))
|
||||
|
||||
(define-public kimageformats
|
||||
(package
|
||||
(name "kimageformats")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12mhgckmhnvcnm8k7mk15mipxrnm7i9ip7ykbjh8nxjiwyk1pmwc"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Plugins to allow QImage to support extra file formats")
|
||||
(description "This framework provides additional image format plugins for
|
||||
QtGui. As such it is not required for the compilation of any other software,
|
||||
but may be a runtime requirement for Qt-based software to support certain image
|
||||
formats.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kjobwidgets
|
||||
(package
|
||||
(name "kjobwidgets")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mcvrz66xcqjgbp08zpqsf943cm462wbqm5gh719p9s25hx8hwrc"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("kcoreaddons" ,kcoreaddons)
|
||||
("kwidgetsaddons" ,kwidgetsaddons)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Widgets for showing progress of asynchronous jobs")
|
||||
(description "KJobWIdgets provides widgets for showing progress of
|
||||
asynchronous jobs.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public knotifications
|
||||
(package
|
||||
(name "knotifications")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qryp41phnpx4r9wa6rfhmnzy7nxl0ijnyrafadf2n2xb53ipkpa"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("dbus" ,dbus)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("kcodecs" ,kcodecs)
|
||||
("kconfig" ,kconfig)
|
||||
("kcoreaddons" ,kcoreaddons)
|
||||
("kwindowsystem" ,kwindowsystem)
|
||||
("phonon" ,phonon)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda* _
|
||||
(setenv "HOME" (getcwd))))
|
||||
(replace 'check
|
||||
(lambda* _
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
(zero? (system* "dbus-launch" "ctest" ".")))))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Desktop notifications")
|
||||
(description "KNotification is used to notify the user of an event. It
|
||||
covers feedback and persistent events.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public kpackage
|
||||
(package
|
||||
(name "kpackage")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03aqzkpqz3c1v4qgwfbs3ncdbapiyg7psrkhxqv3z48rklavk1ri"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(inputs
|
||||
`(("karchive" ,karchive)
|
||||
("kconfig" ,kconfig)
|
||||
("kcoreaddons" ,kcoreaddons)
|
||||
("ki18n" ,ki18n)
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: 1/4 tests fail.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda* _
|
||||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output
|
||||
(setenv "HOME" (getcwd)))))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Installation and loading of additional content as packages")
|
||||
(description "The Package framework lets the user install and load packages
|
||||
of non binary content such as scripted extensions or graphic assets, as if they
|
||||
were traditional plugins.")
|
||||
(license (list license:gpl2+ license:lgpl2.1+))))
|
||||
|
||||
(define-public kpty
|
||||
(package
|
||||
(name "kpty")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ybvdzqpa53kkki9p5da0ff9x3c63rmksk7865wqwlgy8apzi2fs"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(inputs
|
||||
`(("kcoreaddons" ,kcoreaddons)
|
||||
("ki18n" ,ki18n)
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: 1/1 tests fail.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-tests
|
||||
(lambda _
|
||||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
|
||||
(substitute* "autotests/kptyprocesstest.cpp"
|
||||
(("/bin/bash") (which "bash")))
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Interfacing with pseudo terminal devices")
|
||||
(description "This library provides primitives to interface with pseudo
|
||||
terminal devices as well as a KProcess derived class for running child processes
|
||||
and communicating with them using a pty.")
|
||||
(license (list license:gpl2+ license:lgpl2.1+))))
|
||||
|
||||
(define-public kunitconversion
|
||||
(package
|
||||
(name "kunitconversion")
|
||||
(version "5.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/frameworks/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03dfjn4lm6sl2zcdrvw0b9irzvkyc2w2j5xixag5j8nw373742h8"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(inputs
|
||||
`(("ki18n" ,ki18n)
|
||||
("qtbase" ,qtbase)))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Converting physical units")
|
||||
(description "KUnitConversion provides functions to convert values in
|
||||
different physical units. It supports converting different prefixes (e.g. kilo,
|
||||
mega, giga) as well as converting between different unit systems (e.g. liters,
|
||||
gallons).")
|
||||
(license license:lgpl2.1+)))
|
||||
|
|
|
@ -40,6 +40,7 @@ (define-module (gnu packages linux)
|
|||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages calendar)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages docbook)
|
||||
|
@ -50,6 +51,7 @@ (define-module (gnu packages linux)
|
|||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnuzilla)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages libusb)
|
||||
|
@ -227,7 +229,7 @@ (define* (kernel-config system #:key variant)
|
|||
(search-path %load-path file)))
|
||||
|
||||
(define-public linux-libre
|
||||
(let* ((version "4.7.1")
|
||||
(let* ((version "4.7.2")
|
||||
(build-phase
|
||||
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
|
||||
;; Avoid introducing timestamps
|
||||
|
@ -305,7 +307,7 @@ (define-public linux-libre
|
|||
(uri (linux-libre-urls version))
|
||||
(sha256
|
||||
(base32
|
||||
"08b8yv5grhzacahmhs3q1031d6a4k7qf1qj7i5vsk33fhgg1nvzx"))))
|
||||
"1rp09y2hv0hvdybm2n2im9717kzxmklpgzs8k1bmdfzqxyg8cb85"))))
|
||||
(build-system gnu-build-system)
|
||||
(supported-systems '("x86_64-linux" "i686-linux"))
|
||||
(native-inputs `(("perl" ,perl)
|
||||
|
@ -342,13 +344,13 @@ (define-public linux-libre
|
|||
(define-public linux-libre-4.4
|
||||
(package
|
||||
(inherit linux-libre)
|
||||
(version "4.4.18")
|
||||
(version "4.4.19")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (linux-libre-urls version))
|
||||
(sha256
|
||||
(base32
|
||||
"0k8k17in7dkjd9d8zg3i8l1ax466dba6bxw28flxizzyq8znljps"))))
|
||||
"0nddjs7prmb0g7g3w2k4qfyq02a9szm5nvsgflxcaarbq1slibb5"))))
|
||||
(native-inputs
|
||||
(let ((conf (kernel-config (or (%current-target-system)
|
||||
(%current-system))
|
||||
|
@ -359,13 +361,13 @@ (define-public linux-libre-4.4
|
|||
(define-public linux-libre-4.1
|
||||
(package
|
||||
(inherit linux-libre)
|
||||
(version "4.1.30")
|
||||
(version "4.1.31")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (linux-libre-urls version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nwmwbskfni3fnbd7v6jh8yfah915zh80xg4g7n38lb66rk3bxvi"))))
|
||||
"0grffah921k136w1qwcswxv6m810s8q54nr2rk7kyqka3a1b81yw"))))
|
||||
(native-inputs
|
||||
(let ((conf (kernel-config (or (%current-target-system)
|
||||
(%current-system))
|
||||
|
@ -2609,7 +2611,7 @@ (define-public gpm
|
|||
(define-public btrfs-progs
|
||||
(package
|
||||
(name "btrfs-progs")
|
||||
(version "4.6.1")
|
||||
(version "4.7.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/kernel/"
|
||||
|
@ -2617,7 +2619,7 @@ (define-public btrfs-progs
|
|||
"btrfs-progs-v" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06c9l6m3w29dndk17jrlpgr01wykl10h34zva8zc2c571z6mrlaf"))))
|
||||
"15jsa12ijc6z49v1csc62x9zidrgcf307lwy1rbffdwk3gsrczww"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"static")) ; static versions of binaries in "out" (~16MiB!)
|
||||
|
@ -2648,6 +2650,7 @@ (define-public btrfs-progs
|
|||
("libxml2" ,libxml2)
|
||||
("docbook-xml" ,docbook-xml)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
;; For tests
|
||||
("which" ,which)))
|
||||
(home-page "https://btrfs.wiki.kernel.org/")
|
||||
(synopsis "Create and manage btrfs copy-on-write file systems")
|
||||
|
@ -2869,3 +2872,40 @@ (define-public haveged
|
|||
(license:non-copyleft "file://nist/packtest.c")
|
||||
license:public-domain ; nist/dfft.c
|
||||
license:gpl3+)))) ; everything else
|
||||
|
||||
(define-public ecryptfs-utils
|
||||
(package
|
||||
(name "ecryptfs-utils")
|
||||
(version "111")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://launchpad.net/ecryptfs/trunk/"
|
||||
version "/+download/ecryptfs-utils_"
|
||||
version ".orig.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zwq19siiwf09h7lwa7n7mgmrr8cxifp45lmwgcfr8c1gviv6b0i"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "--disable-pywrap")))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("perl" ,perl) ; for pod2man
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("keyutils" ,keyutils)
|
||||
("linux-pam" ,linux-pam)
|
||||
("nss" ,nss)))
|
||||
(home-page "http://ecryptfs.org/")
|
||||
(synopsis "eCryptfs cryptographic file system utilities")
|
||||
(description
|
||||
"eCryptfs is a POSIX-compliant stacked cryptographic file system for Linux.
|
||||
Each file's cryptographic meta-data is stored inside the file itself, along
|
||||
with the encrypted contents. This allows individual encrypted files to be
|
||||
copied between hosts and still be decrypted with the proper key. eCryptfs is a
|
||||
native Linux file system, and has been part of the Linux kernel since version
|
||||
2.6.19. This package contains the userland utilities to manage it.")
|
||||
;; The files src/key_mod/ecryptfs_key_mod_{openssl,pkcs11_helper,tspi}.c
|
||||
;; grant additional permission to link with OpenSSL.
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -89,50 +89,50 @@ (define-public lirc
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public python-lirc
|
||||
(let ((commit "4091fe918f3eed2513dad008828565cace408d2f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "python-lirc")
|
||||
(version (string-append "1.2.1-" revision "." (string-take commit 7)))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tompreston/python-lirc.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0cm47s5pvijfs3v2k7hmpxv3mvp4n5la0ihnsczk5ym3iq166jil"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("lirc" ,lirc)))
|
||||
(native-inputs
|
||||
`(("python-cython" ,python-cython)))
|
||||
(arguments
|
||||
`(#:tests? #f ; the only tests that exist are human-interactive
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'build-from-cython-files
|
||||
(lambda _
|
||||
(zero? (system* "make" "py3")))))))
|
||||
(home-page "https://github.com/tompreston/python-lirc")
|
||||
(synopsis "Python bindings for LIRC")
|
||||
(description "@code{lirc} is a Python module which provides LIRC bindings.")
|
||||
(license license:gpl3)
|
||||
(properties `((python2-variant . ,(delay python2-lirc)))))))
|
||||
|
||||
(define-public python2-lirc
|
||||
(let ((base (package-with-python2 (strip-python2-variant python-lirc))))
|
||||
(let ((commit "4091fe918f3eed2513dad008828565cace408d2f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(inherit base)
|
||||
(arguments
|
||||
`(#:tests? #f ; the only tests there are are human-interactive
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'build-from-cython-files
|
||||
(lambda _
|
||||
(zero? (system* "make" "py2")))))))
|
||||
(name "python-lirc")
|
||||
(version (string-append "1.2.1-" revision "." (string-take commit 7)))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tompreston/python-lirc.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0cm47s5pvijfs3v2k7hmpxv3mvp4n5la0ihnsczk5ym3iq166jil"))
|
||||
(file-name (string-append name "-" version))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("lirc" ,lirc)))
|
||||
(native-inputs
|
||||
`(("python2-setuptools" ,python2-setuptools)
|
||||
("python2-cython" ,python2-cython))))))
|
||||
`(("python-cython" ,python-cython)))
|
||||
(arguments
|
||||
`(#:tests? #f ; the only tests that exist are human-interactive
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'build-from-cython-files
|
||||
(lambda _
|
||||
(zero? (system* "make" "py3")))))))
|
||||
(home-page "https://github.com/tompreston/python-lirc")
|
||||
(synopsis "Python bindings for LIRC")
|
||||
(description "@code{lirc} is a Python module which provides LIRC bindings.")
|
||||
(license license:gpl3)
|
||||
(properties `((python2-variant . ,(delay python2-lirc)))))))
|
||||
|
||||
(define-public python2-lirc
|
||||
(let ((base (package-with-python2 (strip-python2-variant python-lirc))))
|
||||
(package
|
||||
(inherit base)
|
||||
(arguments
|
||||
`(#:tests? #f ; the only tests that exist are human-interactive
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'build-from-cython-files
|
||||
(lambda _
|
||||
(zero? (system* "make" "py2")))))))
|
||||
(native-inputs
|
||||
`(("python2-setuptools" ,python2-setuptools)
|
||||
("python2-cython" ,python2-cython))))))
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -21,12 +22,14 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages lua)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages readline))
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public lua
|
||||
(package
|
||||
|
@ -44,14 +47,15 @@ (define-public lua
|
|||
(inputs `(("readline" ,readline)))
|
||||
(arguments
|
||||
'(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-1))
|
||||
(guix build utils)
|
||||
(srfi srfi-1))
|
||||
#:test-target "test"
|
||||
#:make-flags
|
||||
'("CFLAGS=-fPIC -DLUA_DL_DLOPEN -DLUA_USE_POSIX"
|
||||
"linux")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
|
@ -68,7 +72,7 @@ (define-public lua
|
|||
runs by interpreting bytecode for a register-based virtual machine, and has
|
||||
automatic memory management with incremental garbage collection, making it ideal
|
||||
for configuration, scripting, and rapid prototyping.")
|
||||
(license x11)))
|
||||
(license license:x11)))
|
||||
|
||||
(define-public lua-5.1
|
||||
(package (inherit lua)
|
||||
|
@ -106,4 +110,152 @@ (define-public luajit
|
|||
programming language. Lua is a powerful, dynamic and light-weight programming
|
||||
language. It may be embedded or used as a general-purpose, stand-alone
|
||||
language.")
|
||||
(license x11)))
|
||||
(license license:x11)))
|
||||
|
||||
(define-public lua5.1-expat
|
||||
(package
|
||||
(name "lua5.1-expat")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://matthewwild.co.uk/projects/"
|
||||
"luaexpat/luaexpat-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list "CC=gcc"
|
||||
(string-append "LUA_LDIR=" out "/share/lua/$(LUA_V)")
|
||||
(string-append "LUA_CDIR=" out "/lib/lua/$(LUA_V)")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(setenv "LUA_CPATH" "src/?.so;;")
|
||||
(setenv "LUA_PATH" "src/?.lua;;")
|
||||
(and (zero? (system* "lua" "tests/test.lua"))
|
||||
(zero? (system* "lua" "tests/test-lom.lua"))))))))
|
||||
(inputs
|
||||
`(("lua" ,lua-5.1)
|
||||
("expat" ,expat)))
|
||||
(home-page "http://matthewwild.co.uk/projects/luaexpat/")
|
||||
(synopsis "SAX XML parser based on the Expat library")
|
||||
(description "LuaExpat is a SAX XML parser based on the Expat library.")
|
||||
(license (package-license lua-5.1))))
|
||||
|
||||
(define-public lua5.1-socket
|
||||
(package
|
||||
(name "lua5.1-socket")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://files.luaforge.net/releases/"
|
||||
"luasocket/luasocket/luasocket-"
|
||||
version "/luasocket-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "INSTALL_TOP_SHARE=" out "/share/lua/5.1")
|
||||
(string-append "INSTALL_TOP_LIB=" out "/lib/lua/5.1")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(setenv "LUA_CPATH" (string-append "src/?.so." ,version ";;"))
|
||||
(setenv "LUA_PATH" "src/?.lua;;")
|
||||
(when (zero? (primitive-fork))
|
||||
(system* "lua" "test/testsrvr.lua"))
|
||||
(zero? (system* "lua" "test/testclnt.lua")))))))
|
||||
(inputs
|
||||
`(("lua" ,lua-5.1)))
|
||||
(home-page "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/")
|
||||
(synopsis "Socket library for Lua")
|
||||
(description "LuaSocket is a Lua extension library that is composed by two
|
||||
parts: a C core that provides support for the TCP and UDP transport layers,
|
||||
and a set of Lua modules that add support for functionality commonly needed by
|
||||
applications that deal with the Internet.
|
||||
|
||||
Among the supported modules, the most commonly used implement the
|
||||
SMTP (sending e-mails), HTTP (WWW access) and FTP (uploading and downloading
|
||||
files) client protocols. These provide a very natural and generic interface
|
||||
to the functionality defined by each protocol. In addition, you will find
|
||||
that the MIME (common encodings), URL (anything you could possible want to do
|
||||
with one) and LTN12 (filters, sinks, sources and pumps) modules can be very
|
||||
handy.")
|
||||
(license (package-license lua-5.1))))
|
||||
|
||||
(define-public lua5.1-filesystem
|
||||
(package
|
||||
(name "lua5.1-filesystem")
|
||||
(version "1.6.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/keplerproject/"
|
||||
"luafilesystem/archive/v_"
|
||||
"1_6_3" ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0s10ckxin0bysd6gaywqhxkpw3ybjhprr8m655b8cx3pxjwd49am"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
`(("lua" ,lua-5.1)))
|
||||
(home-page "https://keplerproject.github.io/luafilesystem/index.html")
|
||||
(synopsis "File system library for Lua")
|
||||
(description "LuaFileSystem is a Lua library developed to complement the
|
||||
set of functions related to file systems offered by the standard Lua
|
||||
distribution. LuaFileSystem offers a portable way to access the underlying
|
||||
directory structure and file attributes.")
|
||||
(license (package-license lua-5.1))))
|
||||
|
||||
(define-public lua5.1-sec
|
||||
(package
|
||||
(name "lua5.1-sec")
|
||||
(version "0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/brunoos/luasec/archive/"
|
||||
"luasec-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pgd1anzznl4s0h16wg8dlw9mgdb9h52drlcki6sbf5y31fa7wyf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list "linux"
|
||||
"CC=gcc"
|
||||
"LD=gcc"
|
||||
(string-append "LUAPATH=" out "/share/lua/5.1")
|
||||
(string-append "LUACPATH=" out "/lib/lua/5.1")))
|
||||
#:tests? #f ; no tests included
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
`(("lua" ,lua-5.1)
|
||||
("openssl" ,openssl)))
|
||||
(propagated-inputs
|
||||
`(("lua-socket" ,lua5.1-socket)))
|
||||
(home-page "https://github.com/brunoos/luasec/wiki")
|
||||
(synopsis "OpenSSL bindings for Lua")
|
||||
(description "LuaSec is a binding for OpenSSL library to provide TLS/SSL
|
||||
communication. It takes an already established TCP connection and creates a
|
||||
secure session between the peers.")
|
||||
(license (package-license lua-5.1))))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -27,18 +28,21 @@ (define-module (gnu packages machine-learning)
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system r)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages dejagnu)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages statistics)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages xml))
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public libsvm
|
||||
(package
|
||||
|
@ -467,3 +471,64 @@ (define-public r-nnet
|
|||
"This package provides functions for feed-forward neural networks with a
|
||||
single hidden layer, and for multinomial log-linear models.")
|
||||
(license (list license:gpl2+ license:gpl3+))))
|
||||
|
||||
(define-public dlib
|
||||
(package
|
||||
(name "dlib")
|
||||
(version "19.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://dlib.net/files/dlib-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p2pvcdalc6jhb6r99ybvjd9x74sclr0ngswdg9j2xl5pj7knbr4"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete ~13MB of bundled dependencies.
|
||||
(delete-file-recursively "dlib/external")
|
||||
(delete-file-recursively "docs/dlib/external")))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-asserts
|
||||
(lambda _
|
||||
;; config.h recommends explicitly enabling or disabling asserts
|
||||
;; when building as a shared library. By default neither is set.
|
||||
(substitute* "dlib/config.h"
|
||||
(("^//#define DLIB_DISABLE_ASSERTS") "#define DLIB_DISABLE_ASSERTS"))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; No test target, so we build and run the unit tests here.
|
||||
(let ((test-dir (string-append "../dlib-" ,version "/dlib/test/build")))
|
||||
(mkdir-p test-dir)
|
||||
(with-directory-excursion test-dir
|
||||
(and (zero? (system* "cmake" ".."))
|
||||
(zero? (system* "cmake" "--build" "." "--config" "Release"))
|
||||
(zero? (system* "./dtest" "--runall")))))))
|
||||
(add-after 'install 'delete-static-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(delete-file (string-append (assoc-ref outputs "out") "/lib/libdlib.a")))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("fftw" ,fftw)
|
||||
("giflib" ,giflib)
|
||||
;("lapack" ,lapack) XXX lapack here causes test failures in some setups.
|
||||
("libjpeg" ,libjpeg)
|
||||
("libpng" ,libpng)
|
||||
("libx11" ,libx11)
|
||||
("openblas" ,openblas)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis
|
||||
"Toolkit for making machine learning and data analysis applications in C++")
|
||||
(description
|
||||
"Dlib is a modern C++ toolkit containing machine learning algorithms and
|
||||
tools. It is used in both industry and academia in a wide range of domains
|
||||
including robotics, embedded devices, mobile phones, and large high performance
|
||||
computing environments.")
|
||||
(home-page "http://dlib.net")
|
||||
(license license:boost1.0)))
|
||||
|
|
|
@ -182,14 +182,14 @@ (define-public fetchmail
|
|||
(define-public mutt
|
||||
(package
|
||||
(name "mutt")
|
||||
(version "1.6.2")
|
||||
(version "1.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.mutt.org/pub/mutt/mutt-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13hxmji7v9m2agmvzrs7gzx8s3c9jiwrv7pbkr7z1kc6ckq2xl65"))
|
||||
"0idkamdiwj9fgqaz1vzkfg78cnmkzp74skv0ibw2xjfq6ds9hghx"))
|
||||
(patches (search-patches "mutt-store-references.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
@ -205,6 +205,7 @@ (define-public mutt
|
|||
"--enable-pop"
|
||||
"--enable-gpgme"
|
||||
"--enable-hcache" ; for header caching
|
||||
"--enable-sidebar"
|
||||
"--with-ssl"
|
||||
"--with-sasl"
|
||||
;; so that mutt does not check whether the path
|
||||
|
@ -296,7 +297,7 @@ (define-public bogofilter
|
|||
(define-public offlineimap
|
||||
(package
|
||||
(name "offlineimap")
|
||||
(version "7.0.5")
|
||||
(version "7.0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/OfflineIMAP/offlineimap/"
|
||||
|
@ -304,7 +305,7 @@ (define-public offlineimap
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05wm7qix4ikx6hi57a1qc3hb5fv1vksbg6dgvmd8871y5l1qqrkn"))))
|
||||
"1msg0v5i3v4mvjm2c5alzz91dk5y20h4xdr60lcz3507fv80407m"))))
|
||||
(build-system python-build-system)
|
||||
(inputs `(("python2-pysqlite" ,python2-pysqlite)
|
||||
("python2-six" ,python2-six)))
|
||||
|
@ -407,7 +408,9 @@ (define-public alot
|
|||
(version "0.3.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
; v0.3.7 not on PyPi yet, so use github instead
|
||||
;; package author intends on distributing via github rather
|
||||
;; than pypi:
|
||||
;; https://github.com/pazz/alot/issues/877#issuecomment-230173331
|
||||
(uri (string-append "https://github.com/pazz/alot/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append "alot-" version ".tar.gz"))
|
||||
|
@ -417,8 +420,8 @@ (define-public alot
|
|||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
; python 3 is unsupported, more info:
|
||||
; https://github.com/pazz/alot/blob/0.3.7/docs/source/faq.rst
|
||||
;; python 3 is unsupported, more info:
|
||||
;; https://github.com/pazz/alot/blob/0.3.7/docs/source/faq.rst
|
||||
#:python ,python-2))
|
||||
(inputs
|
||||
`(("python2-magic" ,python2-magic)
|
||||
|
|
|
@ -692,15 +692,15 @@ (define-public ceres
|
|||
(define-public octave
|
||||
(package
|
||||
(name "octave")
|
||||
(version "4.0.2")
|
||||
(version "4.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/octave/octave-"
|
||||
version ".tar.gz"))
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hdxap3j88rpqjimnfhinym6z73wdi5dfa6fv85c13r1dk9qzk9r"))))
|
||||
"11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("lapack" ,lapack)
|
||||
|
@ -709,9 +709,7 @@ (define-public octave
|
|||
("fftw" ,fftw)
|
||||
("fftwf" ,fftwf)
|
||||
("arpack" ,arpack-ng)
|
||||
("curl" ,curl)
|
||||
("pcre" ,pcre)
|
||||
("cyrus-sasl" ,cyrus-sasl)
|
||||
("fltk" ,fltk)
|
||||
("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
|
@ -719,7 +717,6 @@ (define-public octave
|
|||
("libxft" ,libxft)
|
||||
("mesa" ,mesa)
|
||||
("glu" ,glu)
|
||||
("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)
|
||||
|
@ -2025,14 +2022,14 @@ (define-public suitesparse
|
|||
(define-public atlas
|
||||
(package
|
||||
(name "atlas")
|
||||
(version "3.10.2")
|
||||
(version "3.10.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/math-atlas/Stable/"
|
||||
version "/atlas" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"))))
|
||||
"1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://math-atlas.sourceforge.net/")
|
||||
(inputs `(("gfortran" ,gfortran)
|
||||
|
@ -2079,59 +2076,54 @@ (define-public atlas
|
|||
,(string-append "--with-netlib-lapack-tarfile="
|
||||
(assoc-ref %build-inputs "lapack-tar")))
|
||||
#:phases
|
||||
(alist-cons-after
|
||||
'install 'install-doc
|
||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||
(let ((doc (string-append (assoc-ref outputs "doc")
|
||||
"/share/doc/atlas")))
|
||||
(mkdir-p doc)
|
||||
(fold (lambda (file previous)
|
||||
(and previous (zero? (system* "cp" file doc))))
|
||||
#t (find-files "../ATLAS/doc" ".*"))))
|
||||
(alist-cons-after
|
||||
'check 'check-pt
|
||||
(lambda _ (zero? (system* "make" "ptcheck")))
|
||||
;; Fix files required to run configure.
|
||||
(alist-cons-before
|
||||
'configure 'fix-/bin/sh
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'install-doc
|
||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||
(let ((doc (string-append (assoc-ref outputs "doc")
|
||||
"/share/doc/atlas")))
|
||||
(mkdir-p doc)
|
||||
(fold (lambda (file previous)
|
||||
(and previous (zero? (system* "cp" file doc))))
|
||||
#t (find-files "../ATLAS/doc" ".*")))))
|
||||
(add-after 'check 'check-pt
|
||||
(lambda _ (zero? (system* "make" "ptcheck"))))
|
||||
;; Fix files required to run configure.
|
||||
(add-before 'configure 'fix-/bin/sh
|
||||
(lambda _
|
||||
;; Use `sh', not `/bin/sh'.
|
||||
(substitute* (find-files "." "Makefile|configure|SpewMakeInc\\.c")
|
||||
(("/bin/sh")
|
||||
"sh")))
|
||||
;; Fix /bin/sh in generated make files.
|
||||
(alist-cons-after
|
||||
'configure 'fix-/bin/sh-in-generated-files
|
||||
(lambda _
|
||||
(substitute* (find-files "." "^[Mm]ake\\.inc.*")
|
||||
(("/bin/sh")
|
||||
"sh")))
|
||||
;; ATLAS configure program does not accepts the default flags
|
||||
;; passed by the 'gnu-build-system'.
|
||||
(alist-replace
|
||||
'configure
|
||||
(lambda* (#:key native-inputs inputs outputs
|
||||
(configure-flags '())
|
||||
#:allow-other-keys #:rest args)
|
||||
(let* ((prefix (assoc-ref outputs "out"))
|
||||
(bash (or (and=> (assoc-ref
|
||||
(or native-inputs inputs) "bash")
|
||||
(cut string-append <> "/bin/bash"))
|
||||
"/bin/sh"))
|
||||
(flags `(,(string-append "--prefix=" prefix)
|
||||
,@configure-flags))
|
||||
(abs-srcdir (getcwd))
|
||||
(srcdir (string-append "../" (basename abs-srcdir))))
|
||||
(format #t "source directory: ~s (relative from build: ~s)~%"
|
||||
abs-srcdir srcdir)
|
||||
(mkdir "../build")
|
||||
(chdir "../build")
|
||||
(format #t "build directory: ~s~%" (getcwd))
|
||||
(format #t "configure flags: ~s~%" flags)
|
||||
(zero? (apply system* bash
|
||||
(string-append srcdir "/configure")
|
||||
flags))))
|
||||
%standard-phases)))))))
|
||||
"sh"))))
|
||||
;; Fix /bin/sh in generated make files.
|
||||
(add-after 'configure 'fix-/bin/sh-in-generated-files
|
||||
(lambda _
|
||||
(substitute* (find-files "." "^[Mm]ake\\.inc.*")
|
||||
(("/bin/sh")
|
||||
"sh"))))
|
||||
;; ATLAS configure program does not accepts the default flags
|
||||
;; passed by the 'gnu-build-system'.
|
||||
(replace 'configure
|
||||
(lambda* (#:key native-inputs inputs outputs
|
||||
(configure-flags '())
|
||||
#:allow-other-keys #:rest args)
|
||||
(let* ((prefix (assoc-ref outputs "out"))
|
||||
(bash (or (and=> (assoc-ref
|
||||
(or native-inputs inputs) "bash")
|
||||
(cut string-append <> "/bin/bash"))
|
||||
"/bin/sh"))
|
||||
(flags `(,(string-append "--prefix=" prefix)
|
||||
,@configure-flags))
|
||||
(abs-srcdir (getcwd))
|
||||
(srcdir (string-append "../" (basename abs-srcdir))))
|
||||
(format #t "source directory: ~s (relative from build: ~s)~%"
|
||||
abs-srcdir srcdir)
|
||||
(mkdir "../build")
|
||||
(chdir "../build")
|
||||
(format #t "build directory: ~s~%" (getcwd))
|
||||
(format #t "configure flags: ~s~%" flags)
|
||||
(zero? (apply system* bash
|
||||
(string-append srcdir "/configure")
|
||||
flags))))))))
|
||||
(synopsis "Automatically Tuned Linear Algebra Software")
|
||||
(description
|
||||
"ATLAS is an automatically tuned linear algebra software library
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -24,7 +24,7 @@
|
|||
(define-module (gnu packages messaging)
|
||||
#:use-module ((guix licenses)
|
||||
#:select (gpl3+ gpl2+ gpl2 lgpl2.1 lgpl2.0+ bsd-2 non-copyleft
|
||||
asl2.0))
|
||||
asl2.0 x11))
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
|
@ -45,6 +45,7 @@ (define-module (gnu packages messaging)
|
|||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages ncurses)
|
||||
|
@ -492,4 +493,77 @@ (define-public gajim
|
|||
end-to-end encryption support; XML console.")
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public prosody
|
||||
(package
|
||||
(name "prosody")
|
||||
(version "0.9.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://prosody.im/downloads/source/"
|
||||
"prosody-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" target
|
||||
#:modules ((ice-9 match)
|
||||
(srfi srfi-1)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-configure-script
|
||||
(lambda _
|
||||
;; The configure script aborts when it encounters unexpected
|
||||
;; arguments. Make it more tolerant.
|
||||
(substitute* "configure"
|
||||
(("exit 1") ""))
|
||||
#t))
|
||||
(add-after 'install 'wrap-programs
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Make sure all executables in "bin" find the required Lua
|
||||
;; modules at runtime.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin/"))
|
||||
(deps (delete #f (map (match-lambda
|
||||
((label . directory)
|
||||
(if (string-prefix? "lua" label)
|
||||
directory #f)))
|
||||
inputs)))
|
||||
(path (string-join
|
||||
(map (lambda (path)
|
||||
(string-append path "/share/lua/5.1/?.lua;"
|
||||
path "/share/lua/5.1/?/?.lua"))
|
||||
(cons out deps))
|
||||
";"))
|
||||
(cpath (string-join
|
||||
(map (lambda (path)
|
||||
(string-append path "/lib/lua/5.1/?.so;"
|
||||
path "/lib/lua/5.1/?/?.so"))
|
||||
(cons out deps))
|
||||
";")))
|
||||
(for-each (lambda (file)
|
||||
(wrap-program file
|
||||
`("LUA_PATH" ";" = (,path))
|
||||
`("LUA_CPATH" ";" = (,cpath))))
|
||||
(find-files bin ".*"))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("libidn" ,libidn)
|
||||
("openssl" ,openssl)
|
||||
("lua" ,lua-5.1)
|
||||
("lua5.1-expat" ,lua5.1-expat)
|
||||
("lua5.1-socket" ,lua5.1-socket)
|
||||
("lua5.1-filesystem" ,lua5.1-filesystem)
|
||||
("lua5.1-sec" ,lua5.1-sec)))
|
||||
(home-page "https://prosody.im/")
|
||||
(synopsis "Jabber (XMPP) server")
|
||||
(description "Prosody is a modern XMPP communication server. It aims to
|
||||
be easy to set up and configure, and efficient with system resources.
|
||||
Additionally, for developers it aims to be easy to extend and give a flexible
|
||||
system on which to rapidly develop added functionality, or prototype new
|
||||
protocols.")
|
||||
(license x11)))
|
||||
|
||||
;;; messaging.scm ends here
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -30,6 +31,7 @@ (define-module (gnu packages mit-krb5)
|
|||
(define-public mit-krb5
|
||||
(package
|
||||
(name "mit-krb5")
|
||||
(replacement mit-krb5-1.14.3)
|
||||
(version "1.14.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -82,3 +84,17 @@ (define-public mit-krb5
|
|||
(license (non-copyleft "file://NOTICE"
|
||||
"See NOTICE in the distribution."))
|
||||
(home-page "http://web.mit.edu/kerberos/")))
|
||||
|
||||
(define mit-krb5-1.14.3
|
||||
(package
|
||||
(inherit mit-krb5)
|
||||
(source
|
||||
(let ((version "1.14.3"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://web.mit.edu/kerberos/dist/krb5/"
|
||||
(version-major+minor version)
|
||||
"/krb5-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind")))))))
|
||||
|
|
|
@ -32,9 +32,14 @@ (define-public moreutils
|
|||
(version "0.58")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://debian/pool/main/m/moreutils/moreutils_"
|
||||
version ".orig.tar.gz"))
|
||||
(uri (list
|
||||
(string-append
|
||||
"mirror://debian/pool/main/m/moreutils/moreutils_"
|
||||
version ".orig.tar.gz")
|
||||
;; The main Debian mirrors only hold the current packages
|
||||
(string-append
|
||||
"http://snapshot.debian.org/archive/debian/20160304T165744Z"
|
||||
"/pool/main/m/moreutils/moreutils_0.58.orig.tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww"))))
|
||||
|
|
|
@ -71,7 +71,7 @@ (define-public libmpdclient
|
|||
(define-public mpd
|
||||
(package
|
||||
(name "mpd")
|
||||
(version "0.19.18")
|
||||
(version "0.19.19")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -80,7 +80,7 @@ (define-public mpd
|
|||
"/mpd-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0izd0ph570055s1np6dynxhwbh0h6kb6agvfhxzbj34qahf9jk3n"))))
|
||||
"07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ao" ,ao)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
|
@ -134,7 +134,7 @@ (define-public mpd
|
|||
(define-public mpd-mpc
|
||||
(package
|
||||
(name "mpd-mpc")
|
||||
(version "0.27")
|
||||
(version "0.28")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -143,7 +143,7 @@ (define-public mpd-mpc
|
|||
"/mpc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r10wsqxsi07gns6mfnicvpci0sbwwj4qa9iyr1ysrgadl5bx8j5"))))
|
||||
"0iy5mdffkk61255f62si7p8mhyhkib70zlr1i1iimj2xr037scx4"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libmpdclient" ,libmpdclient)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
|
@ -156,7 +156,7 @@ (define-public mpd-mpc
|
|||
(define-public ncmpc
|
||||
(package
|
||||
(name "ncmpc")
|
||||
(version "0.24")
|
||||
(version "0.25")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -165,7 +165,7 @@ (define-public ncmpc
|
|||
"/ncmpc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sf3nirs3mcx0r5i7acm9bsvzqzlh730m0yjg6jcyj8ln6r7cvqf"))))
|
||||
"196f9s0qmc4srr10n4vk3amvqy5f52y9kvgwqpkfjsnhf75qlckf"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("glib" ,glib)
|
||||
("libmpdclient" ,libmpdclient)
|
||||
|
@ -180,7 +180,7 @@ (define-public ncmpc
|
|||
(define-public ncmpcpp
|
||||
(package
|
||||
(name "ncmpcpp")
|
||||
(version "0.7.4")
|
||||
(version "0.7.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -188,7 +188,7 @@ (define-public ncmpcpp
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qqy3w2vw3i9rxz0z8n0plmwwfv6gzrxip86l894l1xbvzqja16p"))))
|
||||
"0zg084m06y7dd8ccy6aq9hx8q7qi2s5kl0br5139hrmk40q68kvy"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libmpdclient" ,libmpdclient)
|
||||
("boost" ,boost)
|
||||
|
|
|
@ -702,8 +702,10 @@ (define-public synthv1
|
|||
(base32
|
||||
"0h5zja78phf9705i9g54zh61iczb24iv7rxhljyms30sjgajig1y"))))
|
||||
(build-system gnu-build-system)
|
||||
;; There are no tests.
|
||||
(arguments `(#:tests? #f))
|
||||
(arguments
|
||||
`(#:tests? #f ; There are no tests.
|
||||
#:configure-flags
|
||||
'("CXXFLAGS=-std=gnu++11")))
|
||||
(inputs
|
||||
`(("jack" ,jack-1)
|
||||
("lv2" ,lv2)
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Coypright © 2016 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -419,6 +420,26 @@ (define-public httping
|
|||
application stack itself.")
|
||||
(license license:gpl2))) ; with permission to link with OpenSSL
|
||||
|
||||
(define-public bwm-ng
|
||||
(package
|
||||
(name "bwm-ng")
|
||||
(version "0.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.gropp.org/bwm-ng/bwm-ng-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ncurses" ,ncurses)))
|
||||
(synopsis "Console based live network and disk I/O bandwidth monitor")
|
||||
(description "Bandwidth Monitor NG is a small and simple console based
|
||||
live network and disk I/O bandwidth monitor.")
|
||||
(home-page "https://www.gropp.org/?id=projects&sub=bwm-ng")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public aircrack-ng
|
||||
(package
|
||||
(name "aircrack-ng")
|
||||
|
|
|
@ -149,7 +149,7 @@ (define-public ocaml
|
|||
(define-public opam
|
||||
(package
|
||||
(name "opam")
|
||||
(version "1.1.1")
|
||||
(version "1.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; Use the '-full' version, which includes all the dependencies.
|
||||
|
@ -161,7 +161,7 @@ (define-public opam
|
|||
)
|
||||
(sha256
|
||||
(base32
|
||||
"1frzqkx6yn1pnyd9qz3bv3rbwv74bmc1xji8kl41r1dkqzfl3xqv"))))
|
||||
"004gwn6rbpcb53y3rpb3v23vk39rp2xmf0liyd5iy12ij8bigrhm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(;; Sometimes, 'make -jX' would fail right after ./configure with
|
||||
|
@ -169,30 +169,34 @@ (define-public opam
|
|||
#:parallel-build? #f
|
||||
|
||||
;; For some reason, 'ocp-build' needs $TERM to be set.
|
||||
#:make-flags '("TERM=screen")
|
||||
#:make-flags `("TERM=screen"
|
||||
,(string-append "SHELL="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh"))
|
||||
#:test-target "tests"
|
||||
|
||||
;; FIXME: There's an obscure test failure:
|
||||
;; …/_obuild/opam/opam.asm install P1' failed.
|
||||
#:tests? #f
|
||||
|
||||
#:phases (alist-cons-before
|
||||
'build 'pre-build
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((bash (assoc-ref inputs "bash")))
|
||||
(substitute* "src/core/opamSystem.ml"
|
||||
(("\"/bin/sh\"")
|
||||
(string-append "\"" bash "/bin/sh\"")))))
|
||||
(alist-cons-before
|
||||
'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
(and (system "git config --global user.email guix@gnu.org")
|
||||
(system "git config --global user.name Guix")))
|
||||
%standard-phases))))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'build 'pre-build
|
||||
(lambda* (#:key inputs make-flags #:allow-other-keys)
|
||||
(let ((bash (assoc-ref inputs "bash")))
|
||||
(substitute* "src/core/opamSystem.ml"
|
||||
(("\"/bin/sh\"")
|
||||
(string-append "\"" bash "/bin/sh\"")))
|
||||
;; Build dependencies
|
||||
(zero? (apply system* "make" "lib-ext" make-flags)))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
(and (system "git config --global user.email guix@gnu.org")
|
||||
(system "git config --global user.name Guix")))))))
|
||||
(native-inputs
|
||||
`(("git" ,git) ;for the tests
|
||||
("python" ,python))) ;for the tests
|
||||
("python" ,python) ;for the tests
|
||||
("camlp4" ,camlp4)))
|
||||
(inputs
|
||||
`(("ocaml" ,ocaml)
|
||||
("ncurses" ,ncurses)
|
||||
|
|
|
@ -1,96 +0,0 @@
|
|||
Fix CVE-2016-4994:
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-4994
|
||||
|
||||
Copied from upstream repository:
|
||||
https://git.gnome.org/browse/gimp/patch/?id=e82aaa4b4ee0703c879e35ea9321fff6be3e9b6f
|
||||
|
||||
From e82aaa4b4ee0703c879e35ea9321fff6be3e9b6f Mon Sep 17 00:00:00 2001
|
||||
From: Shmuel H <shmuelgimp@gmail.com>
|
||||
Date: Mon, 20 Jun 2016 17:14:41 +0300
|
||||
Subject: Bug 767873 - (CVE-2016-4994) Multiple Use-After-Free when parsing...
|
||||
|
||||
...XCF channel and layer properties
|
||||
|
||||
The properties PROP_ACTIVE_LAYER, PROP_FLOATING_SELECTION,
|
||||
PROP_ACTIVE_CHANNEL saves the current object pointer the @info
|
||||
structure. Others like PROP_SELECTION (for channel) and
|
||||
PROP_GROUP_ITEM (for layer) will delete the current object and create
|
||||
a new object, leaving the pointers in @info invalid (dangling).
|
||||
|
||||
Therefore, if a property from the first type will come before the
|
||||
second, the result will be an UaF in the last lines of xcf_load_image
|
||||
(when it actually using the pointers from @info).
|
||||
|
||||
I wasn't able to exploit this bug because that
|
||||
g_object_instance->c_class gets cleared by the last g_object_unref and
|
||||
GIMP_IS_{LAYER,CHANNEL} detects that and return FALSE.
|
||||
|
||||
(cherry picked from commit 6d804bf9ae77bc86a0a97f9b944a129844df9395)
|
||||
---
|
||||
app/xcf/xcf-load.c | 29 +++++++++++++++++++++++++++++
|
||||
1 file changed, 29 insertions(+)
|
||||
|
||||
diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
|
||||
index b180377..67cc6d4 100644
|
||||
--- a/app/xcf/xcf-load.c
|
||||
+++ b/app/xcf/xcf-load.c
|
||||
@@ -904,6 +904,18 @@ xcf_load_layer_props (XcfInfo *info,
|
||||
case PROP_GROUP_ITEM:
|
||||
{
|
||||
GimpLayer *group;
|
||||
+ gboolean is_active_layer;
|
||||
+
|
||||
+ /* We're going to delete *layer, Don't leave its pointers
|
||||
+ * in @info. After that, we'll restore them back with the
|
||||
+ * new pointer. See bug #767873.
|
||||
+ */
|
||||
+ is_active_layer = (*layer == info->active_layer);
|
||||
+ if (is_active_layer)
|
||||
+ info->active_layer = NULL;
|
||||
+
|
||||
+ if (*layer == info->floating_sel)
|
||||
+ info->floating_sel = NULL;
|
||||
|
||||
group = gimp_group_layer_new (image);
|
||||
|
||||
@@ -916,6 +928,13 @@ xcf_load_layer_props (XcfInfo *info,
|
||||
g_object_ref_sink (*layer);
|
||||
g_object_unref (*layer);
|
||||
*layer = group;
|
||||
+
|
||||
+ if (is_active_layer)
|
||||
+ info->active_layer = *layer;
|
||||
+
|
||||
+ /* Don't restore info->floating_sel because group layers
|
||||
+ * can't be floating selections
|
||||
+ */
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -986,6 +1005,12 @@ xcf_load_channel_props (XcfInfo *info,
|
||||
{
|
||||
GimpChannel *mask;
|
||||
|
||||
+ /* We're going to delete *channel, Don't leave its pointer
|
||||
+ * in @info. See bug #767873.
|
||||
+ */
|
||||
+ if (*channel == info->active_channel)
|
||||
+ info->active_channel = NULL;
|
||||
+
|
||||
mask =
|
||||
gimp_selection_new (image,
|
||||
gimp_item_get_width (GIMP_ITEM (*channel)),
|
||||
@@ -1000,6 +1025,10 @@ xcf_load_channel_props (XcfInfo *info,
|
||||
*channel = mask;
|
||||
(*channel)->boundary_known = FALSE;
|
||||
(*channel)->bounds_known = FALSE;
|
||||
+
|
||||
+ /* Don't restore info->active_channel because the
|
||||
+ * selection can't be the active channel
|
||||
+ */
|
||||
}
|
||||
break;
|
||||
|
||||
--
|
||||
cgit v0.12
|
||||
|
30
gnu/packages/patches/mupdf-CVE-2016-6265.patch
Normal file
30
gnu/packages/patches/mupdf-CVE-2016-6265.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
Fix CVE-2016-6265 (use after free in pdf_load_xref()).
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6265
|
||||
https://security-tracker.debian.org/tracker/CVE-2016-6265
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
http://git.ghostscript.com/?p=mupdf.git;h=fa1936405b6a84e5c9bb440912c23d532772f958
|
||||
|
||||
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
|
||||
index 576c315..3222599 100644
|
||||
--- a/source/pdf/pdf-xref.c
|
||||
+++ b/source/pdf/pdf-xref.c
|
||||
@@ -1184,8 +1184,14 @@ pdf_load_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
|
||||
fz_throw(ctx, FZ_ERROR_GENERIC, "object offset out of range: %d (%d 0 R)", (int)entry->ofs, i);
|
||||
}
|
||||
if (entry->type == 'o')
|
||||
- if (entry->ofs <= 0 || entry->ofs >= xref_len || pdf_get_xref_entry(ctx, doc, entry->ofs)->type != 'n')
|
||||
- fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)entry->ofs, i);
|
||||
+ {
|
||||
+ /* Read this into a local variable here, because pdf_get_xref_entry
|
||||
+ * may solidify the xref, hence invalidating "entry", meaning we
|
||||
+ * need a stashed value for the throw. */
|
||||
+ fz_off_t ofs = entry->ofs;
|
||||
+ if (ofs <= 0 || ofs >= xref_len || pdf_get_xref_entry(ctx, doc, ofs)->type != 'n')
|
||||
+ fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)ofs, i);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
21
gnu/packages/patches/mupdf-CVE-2016-6525.patch
Normal file
21
gnu/packages/patches/mupdf-CVE-2016-6525.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
Fix CVE-2016-6525 (heap overflow in pdf_load_mesh_params()).
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6525
|
||||
https://security-tracker.debian.org/tracker/CVE-2016-6525
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
http://git.ghostscript.com/?p=mupdf.git;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e
|
||||
|
||||
diff --git a/source/pdf/pdf-shade.c b/source/pdf/pdf-shade.c
|
||||
index 7815b3c..6e25efa 100644
|
||||
--- a/source/pdf/pdf-shade.c
|
||||
+++ b/source/pdf/pdf-shade.c
|
||||
@@ -206,7 +206,7 @@ pdf_load_mesh_params(fz_context *ctx, pdf_document *doc, fz_shade *shade, pdf_ob
|
||||
obj = pdf_dict_get(ctx, dict, PDF_NAME_Decode);
|
||||
if (pdf_array_len(ctx, obj) >= 6)
|
||||
{
|
||||
- n = (pdf_array_len(ctx, obj) - 4) / 2;
|
||||
+ n = fz_mini(FZ_MAX_COLORS, (pdf_array_len(ctx, obj) - 4) / 2);
|
||||
shade->u.m.x0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 0));
|
||||
shade->u.m.x1 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 1));
|
||||
shade->u.m.y0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 2));
|
|
@ -1,15 +0,0 @@
|
|||
Allow builds with glibc 2.20.
|
||||
Based on a patch by Peter Hutterer <peter.hutterer@who-t.net>.
|
||||
See <https://raw.githubusercontent.com/openembedded/oe-core/master/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch>.
|
||||
|
||||
--- xf86-video-openchrome-0.3.3/src/via_3d.h.~1~ 2013-05-23 11:11:28.000000000 -0400
|
||||
+++ xf86-video-openchrome-0.3.3/src/via_3d.h 2014-12-19 01:17:04.000953259 -0500
|
||||
@@ -24,6 +24,8 @@
|
||||
#ifndef VIA_3D_H
|
||||
#define VIA_3D_H
|
||||
|
||||
+#include <xorg-server.h>
|
||||
+
|
||||
#include "xf86.h"
|
||||
#include "via_dmabuffer.h"
|
||||
|
|
@ -27,6 +27,7 @@ (define-module (gnu packages pdf)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system python)
|
||||
|
@ -120,8 +121,12 @@ (define-public poppler-qt4
|
|||
(define-public poppler-qt5
|
||||
(package (inherit poppler)
|
||||
(name "poppler-qt5")
|
||||
(inputs `(("qt" ,qt)
|
||||
(inputs `(("qtbase" ,qtbase)
|
||||
,@(package-inputs poppler)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments poppler)
|
||||
((#:configure-flags flags)
|
||||
`(cons "CXXFLAGS=-std=gnu++11" ,flags))))
|
||||
(synopsis "Qt5 frontend for the Poppler PDF rendering library")))
|
||||
|
||||
(define-public python-poppler-qt4
|
||||
|
@ -469,6 +474,8 @@ (define-public mupdf
|
|||
name "-" version "-source.tar.gz"))
|
||||
(sha256
|
||||
(base32 "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2"))
|
||||
(patches (search-patches "mupdf-CVE-2016-6265.patch"
|
||||
"mupdf-CVE-2016-6525.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Don't build the bundled-in third party libraries.
|
||||
|
|
|
@ -142,7 +142,7 @@ (define-public polkit-qt
|
|||
(inputs
|
||||
`(("polkit" ,polkit)))
|
||||
(propagated-inputs
|
||||
`(("qt" ,qt))) ; qt-4 according to the pkg-config files
|
||||
`(("qtbase" ,qtbase)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(arguments
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -69,14 +69,14 @@ (define (qemu-patch commit file-name sha256)
|
|||
(define-public qemu
|
||||
(package
|
||||
(name "qemu")
|
||||
(version "2.6.0")
|
||||
(version "2.6.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://wiki.qemu-project.org/download/qemu-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v1lhhd6m59hqgmiz100g779rjq70pik5v4b3g936ci73djlmb69"))))
|
||||
"1l88iqk0swqccrnjwczgl9arqsvy77bis862zxajy7z3dqdzshj9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(;; Running tests in parallel can occasionally lead to failures, like:
|
||||
|
|
|
@ -313,7 +313,7 @@ (define-public qt-4
|
|||
(define-public qtbase
|
||||
(package
|
||||
(name "qtbase")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -322,7 +322,7 @@ (define-public qtbase
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fbwprlhqmdyhh2wb9122fcpq7pbil530iak482b9sy5gqs7i5ij"))
|
||||
"0ip6xnizsn269r4s1nq9lkx8cdxkjqr1fidwrj3sa8xb7h96syry"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -445,7 +445,36 @@ (define-public qtbase
|
|||
"-no-avx"
|
||||
"-no-avx2"
|
||||
"-no-mips_dsp"
|
||||
"-no-mips_dspr2"))))))))
|
||||
"-no-mips_dspr2")))))
|
||||
(add-after 'install 'patch-qt_config.prf
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(qt_config.prf (string-append
|
||||
out "/mkspecs/features/qt_config.prf")))
|
||||
;; For each Qt module, let `qmake' uses search paths in the
|
||||
;; module directory instead of all in QT_INSTALL_PREFIX.
|
||||
(substitute* qt_config.prf
|
||||
(("\\$\\$\\[QT_INSTALL_HEADERS\\]")
|
||||
"$$replace(dir, mkspecs/modules, include)")
|
||||
(("\\$\\$\\[QT_INSTALL_LIBS\\]")
|
||||
"$$replace(dir, mkspecs/modules, lib)")
|
||||
(("\\$\\$\\[QT_HOST_LIBS\\]")
|
||||
"$$replace(dir, mkspecs/modules, lib)")
|
||||
(("\\$\\$\\[QT_INSTALL_PLUGINS\\]")
|
||||
"$$replace(dir, mkspecs/modules, plugins)")
|
||||
(("\\$\\$\\[QT_INSTALL_LIBEXECS\\]")
|
||||
"$$replace(dir, mkspecs/modules, libexec)")
|
||||
(("\\$\\$\\[QT_INSTALL_BINS\\]")
|
||||
"$$replace(dir, mkspecs/modules, bin)")
|
||||
(("\\$\\$\\[QT_INSTALL_IMPORTS\\]")
|
||||
"$$replace(dir, mkspecs/modules, imports)")
|
||||
(("\\$\\$\\[QT_INSTALL_QML\\]")
|
||||
"$$replace(dir, mkspecs/modules, qml)"))
|
||||
#t))))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "QMAKEPATH")
|
||||
(files '("")))))
|
||||
(home-page "https://www.qt.io/")
|
||||
(synopsis "Cross-platform GUI library")
|
||||
(description "Qt is a cross-platform application and UI framework for
|
||||
|
@ -455,7 +484,7 @@ (define-public qtbase
|
|||
(define-public qtsvg
|
||||
(package (inherit qtbase)
|
||||
(name "qtsvg")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -464,7 +493,7 @@ (define-public qtsvg
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1w0jvhgaiddafcms2nv8wl1klg07lncmjwm1zhdw3l6rxi9071sw"))))
|
||||
"10fqrlqkiq83xhx79g8d2sjy7hjdnp28067z8f4byj7db81rzy51"))))
|
||||
(propagated-inputs `())
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
|
@ -489,7 +518,7 @@ (define-public qtsvg
|
|||
(define-public qtimageformats
|
||||
(package (inherit qtsvg)
|
||||
(name "qtimageformats")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -498,7 +527,7 @@ (define-public qtimageformats
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p98acvsm3azka2by1ph4gdb31qbnndrr5k5wns4xk2d760y8ifc"))))
|
||||
"1rb27x7i2pmvsck6wax2cg31gqpzaakciy45wm5l3lcl86j48czg"))))
|
||||
(native-inputs `())
|
||||
(inputs
|
||||
`(("libmng" ,libmng)
|
||||
|
@ -511,7 +540,7 @@ (define-public qtimageformats
|
|||
(define-public qtx11extras
|
||||
(package (inherit qtsvg)
|
||||
(name "qtx11extras")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -520,7 +549,7 @@ (define-public qtx11extras
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yj5yg2dqkrwbgbicmk2rpqsagmi8dsffkrprpsj0fmkx4awhv5y"))))
|
||||
"1yrkn8pqdbvbqykas3wx1vdfimhjkgx3s5jgdxib9dgmgyx6vjzw"))))
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
`(("mesa" ,mesa)
|
||||
|
@ -529,7 +558,7 @@ (define-public qtx11extras
|
|||
(define-public qtxmlpatterns
|
||||
(package (inherit qtsvg)
|
||||
(name "qtxmlpatterns")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -538,14 +567,14 @@ (define-public qtxmlpatterns
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1966rrk7f6c55k57j33rffdjs77kk4mawrnnl8yv1ckcirxc3np1"))))
|
||||
"02z2qxamslg6sphnaykjcjfpypq4b69pb586s43vw4fplm72m21q"))))
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs `(("qtbase" ,qtbase)))))
|
||||
|
||||
(define-public qtdeclarative
|
||||
(package (inherit qtsvg)
|
||||
(name "qtdeclarative")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -554,7 +583,7 @@ (define-public qtdeclarative
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"094gx5mzqzcga97y7ihf052b6i5iv512lh7m0702m5q94nsn1pqw"))))
|
||||
"1x7rij423g5chlfd2kix54f393vxwjvdfsn1c7sybqmfycwn5pl6"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
|
@ -568,7 +597,7 @@ (define-public qtdeclarative
|
|||
(define-public qtconnectivity
|
||||
(package (inherit qtsvg)
|
||||
(name "qtconnectivity")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -577,7 +606,7 @@ (define-public qtconnectivity
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sr6sxp0q45pacs25knr28139xdrphcjgrwlksdhdpsryfw19mzi"))))
|
||||
"00r7lc1w3snfp2qfqmviqzv0cw16zd8m1sfpvxvpl65yqmzcli4q"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
|
@ -589,7 +618,7 @@ (define-public qtconnectivity
|
|||
(define-public qtwebsockets
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebsockets")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -598,7 +627,7 @@ (define-public qtwebsockets
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fz0x8570zxc00a22skd848svma3p2g3xyxj14jq10559jihqqil"))))
|
||||
"0hwb2l7iwf4wf7l95dli8j3b7h0nffp56skfg1x810kzj0df26vl"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
|
@ -607,7 +636,7 @@ (define-public qtwebsockets
|
|||
(define-public qtsensors
|
||||
(package (inherit qtsvg)
|
||||
(name "qtsensors")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -616,7 +645,7 @@ (define-public qtsensors
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kcrvf6vzn6g2v2m70f9r3raalzmfp48rwjlqhss3w84jfz3y04r"))))
|
||||
"1gii6wg2xd3bkb86y5hgpmwcpl04xav030zscpl6fhscl9kcqg98"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
|
@ -625,7 +654,7 @@ (define-public qtsensors
|
|||
(define-public qtmultimedia
|
||||
(package (inherit qtsvg)
|
||||
(name "qtmultimedia")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -634,7 +663,7 @@ (define-public qtmultimedia
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0paffx0614ivjbf87lr9klpbqik6r1pzbc14l41np6d9jv3dqa2f"))))
|
||||
"0ndmhiflmyr144nq8drd5njsdi282ixsm4730q5n0ji2v9dp1bh5"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
|
@ -649,7 +678,7 @@ (define-public qtmultimedia
|
|||
(define-public qtwayland
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwayland")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -658,7 +687,7 @@ (define-public qtwayland
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fnvgpi49ilds3ah9iizxj9qhhb5rnwqd9h03bhkwf0ydywv52c4"))))
|
||||
"04dynjcr6gxi3hcqdf688a4hkabi2l17slpcx9k0f3dxygwcgf96"))))
|
||||
(native-inputs
|
||||
`(("glib" ,glib)
|
||||
("perl" ,perl)
|
||||
|
@ -680,7 +709,7 @@ (define-public qtwayland
|
|||
(define-public qtserialport
|
||||
(package (inherit qtsvg)
|
||||
(name "qtserialport")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -689,7 +718,7 @@ (define-public qtserialport
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"135cbgghxk0c6dblmyyrw6znfb9m8sac9hhyc2dm6vq7vzy8id52"))))
|
||||
"0rc2l14s59qskp16wqlkizfai32s41qlm7a86r3qahx28gc51qaw"))))
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
@ -698,7 +727,7 @@ (define-public qtserialport
|
|||
(define-public qtwebchannel
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebchannel")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -707,7 +736,7 @@ (define-public qtwebchannel
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10kys3ppjkj60fs1s335fdcpdsbxsjn6ibvm6zph9gqbncabd2l7"))))
|
||||
"05lqfidlh1ahdd1j9y20p2037qbcq51zkdzj2m8fwhn7ghbwvd1s"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
|
@ -717,7 +746,7 @@ (define-public qtwebchannel
|
|||
(define-public qtlocation
|
||||
(package (inherit qtsvg)
|
||||
(name "qtlocation")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -726,18 +755,18 @@ (define-public qtlocation
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0my4pbcxa58yzvdh65l5qx99ln03chjr5c3ml5v37wfk7nx23k69"))))
|
||||
"0rd898gndn41jrp78203lxd94ybfv693l0qg0myag4r46ikk69vh"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
;("qtquickcontrols" ,qtquickcontrols)
|
||||
("qtquickcontrols" ,qtquickcontrols)
|
||||
("qtserialport" ,qtserialport)))
|
||||
(inputs `(("qtbase" ,qtbase)))))
|
||||
|
||||
(define-public qttools
|
||||
(package (inherit qtsvg)
|
||||
(name "qttools")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -746,7 +775,7 @@ (define-public qttools
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0haic027a2d7p7k8xz83fbvci4a4dln34360rlwgy7hlyy5m4nip"))))
|
||||
"004m9l7bgh7qnncbyl3d5fkggdrqx58ib21xv4hflvvarxrssibg"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
|
@ -757,7 +786,7 @@ (define-public qttools
|
|||
(define-public qtscript
|
||||
(package (inherit qtsvg)
|
||||
(name "qtscript")
|
||||
(version "5.6.1-1")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -766,13 +795,64 @@ (define-public qtscript
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gini9483flqa9q4a4bl81bh7g5s408bycqykqhgbklmfd29y5lx"))))
|
||||
"0040890p5ilyrmcpndz1hhp08x2ms5gw4lp4n5iax2a957yy2i4w"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))))
|
||||
|
||||
(define-public qtquickcontrols
|
||||
(package (inherit qtsvg)
|
||||
(name "qtquickcontrols")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" name "-opensource-src-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))))
|
||||
|
||||
(define-public qtquickcontrols2
|
||||
(package (inherit qtsvg)
|
||||
(name "qtquickcontrols2")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" name "-opensource-src-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0i8h933vhvx1bmniqdx0idg6vk82w9byd3dq0bb2phwjg5vv1xb3"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))))
|
||||
|
||||
(define-public qtgraphicaleffects
|
||||
(package (inherit qtsvg)
|
||||
(name "qtgraphicaleffects")
|
||||
(version "5.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" name "-opensource-src-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rwdjg5mk6xpadmxfq64xfp573zp5lrj9illb9105ra5wff565n8"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))))
|
||||
|
||||
(define-public python-sip
|
||||
(package
|
||||
(name "python-sip")
|
||||
|
@ -990,8 +1070,10 @@ (define-public qtkeychain
|
|||
(sha256
|
||||
(base32 "0fka5q5cdzlf79igcjgbnb2smvwbwfasqawkzkbr34whispgm6lz"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("qt" ,qt)))
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests included
|
||||
#:phases
|
||||
|
|
57
gnu/packages/regex.scm
Normal file
57
gnu/packages/regex.scm
Normal file
|
@ -0,0 +1,57 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages regex)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public re2
|
||||
(package
|
||||
(name "re2")
|
||||
(version "2016-08-01")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append
|
||||
"https://github.com/google/re2/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06pfm3xi5irrrij85m0c46rsn9jyg1rc2r431wi2knhjvbw9f0bx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
;; There is no configure step, but the Makefile respects a prefix.
|
||||
#:make-flags (list (string-append "prefix=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'install 'delete-static-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; No make target for shared-only; delete the static version.
|
||||
(delete-file (string-append (assoc-ref outputs "out")
|
||||
"/lib/libre2.a")))))))
|
||||
(home-page "https://github.com/google/re2")
|
||||
(synopsis "Fast, safe, thread-friendly regular expression engine")
|
||||
(description "RE2 is a fast, safe, thread-friendly alternative to
|
||||
backtracking regular expression engines like those used in PCRE, Perl and
|
||||
Python. It is a C++ library.")
|
||||
(license license:bsd-3)))
|
|
@ -49,7 +49,10 @@ (define-public scribus
|
|||
(base32
|
||||
"0f2adwg58w37sdi3xrk8xqw486p3pcfjaypcsswjl76r2f3yd0hq"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments `(#:tests? #f)) ; no test target
|
||||
(arguments
|
||||
`(#:tests? #f ; no test target
|
||||
#:configure-flags
|
||||
'("-DCMAKE_CXX_FLAGS=-std=gnu++11")))
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("cups" ,cups)
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -25,10 +27,12 @@ (define-module (gnu packages serialization)
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages pkg-config))
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python))
|
||||
|
||||
(define-public cereal
|
||||
(package
|
||||
|
@ -123,3 +127,76 @@ (define-public msgpack
|
|||
(description "Msgpack is a library for C/C++ that implements binary
|
||||
serialization.")
|
||||
(license license:boost1.0)))
|
||||
|
||||
(define-public yaml-cpp
|
||||
(package
|
||||
(name "yaml-cpp")
|
||||
(version "0.5.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/jbeder/yaml-cpp/archive/"
|
||||
"yaml-cpp-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vk6pjh0f5k6jwk2sszb9z5169whmiha9ainbdpa1arxlkq7v3b6"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("boost" ,boost)))
|
||||
(native-inputs
|
||||
`(("python" ,python)))
|
||||
(home-page "https://github.com/jbeder/yaml-cpp")
|
||||
(synopsis "YAML parser and emitter in C++")
|
||||
(description "YAML parser and emitter in C++ matching the YAML 1.2 spec.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public jsoncpp
|
||||
(package
|
||||
(name "jsoncpp")
|
||||
(version "1.7.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/open-source-parsers/jsoncpp/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sgp6nc4c6pfn92f369v08zdwpqswn9j2ihy59bpwwl0grkx1p0h"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://github.com/open-source-parsers/jsoncpp")
|
||||
(synopsis "C++ library for interacting with JSON")
|
||||
(description "JsonCpp is a C++ library that allows manipulating JSON values,
|
||||
including serialization and deserialization to and from strings. It can also
|
||||
preserve existing comment in unserialization/serialization steps, making
|
||||
it a convenient format to store user input files.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public capnproto
|
||||
(package
|
||||
(name "capnproto")
|
||||
(version "0.5.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://capnproto.org/capnproto-c++-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'do-not-require-/etc/services
|
||||
(lambda _
|
||||
;; Workaround for test that tries to resolve port name from
|
||||
;; /etc/services, which is not present in build environment.
|
||||
(substitute* "src/kj/async-io-test.c++" ((":http") ":80"))
|
||||
#t)))))
|
||||
(home-page "https://capnproto.org")
|
||||
(synopsis "Capability-based RPC and serialization system")
|
||||
(description
|
||||
"Cap'n Proto is a very fast data interchange format and capability-based
|
||||
RPC system. Think JSON, except binary. Or think Protocol Buffers, except faster.")
|
||||
(license license:expat)))
|
||||
|
|
|
@ -20,6 +20,7 @@ (define-module (gnu packages spice)
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools) ; remove after updating usbredir to 0.7.1+
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cyrus-sasl)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
|
@ -199,7 +200,7 @@ (define-public spice-gtk
|
|||
(define-public spice
|
||||
(package
|
||||
(name "spice")
|
||||
(version "0.13.1")
|
||||
(version "0.12.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -207,14 +208,15 @@ (define-public spice
|
|||
"spice-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"18hxk47z58cqbix5h477qmvcdmsrwzv984jw4c6fj0ns4h217jwy"))))
|
||||
"0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("openssl" ,openssl)
|
||||
("pixman" ,pixman)
|
||||
("spice-protocol" ,spice-protocol)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
`(("cyrus-sasl" ,cyrus-sasl)
|
||||
("glib" ,glib)
|
||||
("libjpeg" ,libjpeg)
|
||||
("lz4" ,lz4)
|
||||
("opus" ,opus)
|
||||
|
|
|
@ -139,10 +139,19 @@ (define-public openssh
|
|||
(build-system gnu-build-system)
|
||||
(inputs `(("groff" ,groff)
|
||||
("openssl" ,openssl)
|
||||
("pam" ,linux-pam)
|
||||
("zlib" ,zlib)
|
||||
("xauth" ,xauth))) ;for 'ssh -X' and 'ssh -Y'
|
||||
(arguments
|
||||
`(#:test-target "tests"
|
||||
#:configure-flags '("--sysconfdir=/etc"
|
||||
|
||||
;; Default value of 'PATH' used by sshd.
|
||||
"--with-default-path=/run/current-system/profile/bin"
|
||||
|
||||
;; Enable PAM support in sshd.
|
||||
"--with-pam")
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'configure 'reset-/var/empty
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -33,7 +33,7 @@ (define-module (gnu packages synergy)
|
|||
(define-public synergy
|
||||
(package
|
||||
(name "synergy")
|
||||
(version "1.7.6")
|
||||
(version "1.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -42,7 +42,7 @@ (define-public synergy
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07a1g2kh4f064nqjdqgfzrjfayls31scnssphbndmnvfc20bhlx4"))
|
||||
"1ym9lmnm64i1bw4spxq40drb4nvzsq5z7zq1935aq0kgccccg11g"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove ~14MB of unnecessary bundled source and binaries
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -27,16 +28,20 @@ (define-module (gnu packages terminals)
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages wm)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages gnome))
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages xdisorg))
|
||||
|
||||
(define-public tilda
|
||||
(package
|
||||
|
@ -159,3 +164,69 @@ (define-public asciinema
|
|||
Forget screen recording apps and blurry video. Enjoy a lightweight, purely
|
||||
text-based approach to terminal recording.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public libtsm
|
||||
(package
|
||||
(name "libtsm")
|
||||
(version "3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://freedesktop.org/software/kmscon/releases/"
|
||||
"libtsm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libxkbcommon" ,libxkbcommon)))
|
||||
(synopsis "Xterm state machine library")
|
||||
(description "TSM is a state machine for DEC VT100-VT520 compatible
|
||||
terminal emulators. It tries to support all common standards while keeping
|
||||
compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/libtsm")
|
||||
;; Hash table implementation is lgpl2.1+ licensed.
|
||||
;; The wcwidth implementation in external/wcwidth.{h,c} uses a license
|
||||
;; derived from ISC.
|
||||
;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released
|
||||
;; under the bsd 2 license.
|
||||
(license (list license:expat license:lgpl2.1+ license:isc license:bsd-2))))
|
||||
|
||||
(define-public kmscon
|
||||
(package
|
||||
(name "kmscon")
|
||||
(version "8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://freedesktop.org/software/kmscon/releases/"
|
||||
"kmscon-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libdrm" ,libdrm)
|
||||
("libtsm" ,libtsm)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("logind" ,elogind)
|
||||
("mesa" ,mesa)
|
||||
("pango" ,pango)
|
||||
("udev" ,eudev)))
|
||||
(synopsis "Simple terminal emulator")
|
||||
(description "Kmscon is a simple terminal emulator based on linux kernel
|
||||
mode setting (KMS). It is an attempt to replace the in-kernel VT implementation
|
||||
with a userspace console. See kmscon(1) man-page for usage information.")
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/kmscon")
|
||||
;; Hash table implementation is lgpl2.1+ licensed.
|
||||
;; The wcwidth implementation in external/wcwidth.{h,c} uses a license
|
||||
;; derived from ISC.
|
||||
;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released
|
||||
;; under the bsd 2 license.
|
||||
;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed
|
||||
;; under the terms of the GNU GPL.
|
||||
(license (list license:expat license:lgpl2.1+ license:bsd-2 license:gpl2+))))
|
||||
|
|
|
@ -38,14 +38,14 @@ (define-module (gnu packages tor)
|
|||
(define-public tor
|
||||
(package
|
||||
(name "tor")
|
||||
(version "0.2.8.6")
|
||||
(version "0.2.8.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.torproject.org/dist/tor-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nmbwcr8s1qkrc2ahrk7jz81nax74sdhszkhrrgys8ndyw1grj9x"))))
|
||||
"1iigfi8ljl88s8b5y1g4ak8im57simazscl467zvfbg8k6vf4i5f"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("python" ,python-2))) ; for tests
|
||||
|
|
|
@ -53,6 +53,7 @@ (define-module (gnu packages video)
|
|||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages fribidi)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
|
@ -399,14 +400,14 @@ (define-public libva
|
|||
(define-public ffmpeg
|
||||
(package
|
||||
(name "ffmpeg")
|
||||
(version "3.1.2")
|
||||
(version "3.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qdxp6r6x47jzi6nmbsv3dhvm073c8n5hpnlmj5gwihgkyva5ljq"))))
|
||||
"08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("fontconfig" ,fontconfig)
|
||||
|
@ -626,6 +627,7 @@ (define-public vlc
|
|||
("libvorbis" ,libvorbis)
|
||||
("libtheora" ,libtheora)
|
||||
("libxext" ,libxext)
|
||||
("libxi" ,libxi)
|
||||
("libxinerama" ,libxinerama)
|
||||
("libxml2" ,libxml2)
|
||||
("libxpm" ,libxpm)
|
||||
|
@ -635,7 +637,8 @@ (define-public vlc
|
|||
("perl" ,perl)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("python" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
("qt" ,qt) ; FIXME: reenable modular qt after update - requires building
|
||||
;("qtbase" ,qtbase) with -std=gnu++11.
|
||||
;("qtx11extras" ,qtx11extras)
|
||||
("sdl" ,sdl)
|
||||
("sdl-image" ,sdl-image)
|
||||
|
@ -1141,8 +1144,9 @@ (define-public avidemux
|
|||
("perl" ,perl)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("python" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
("qttools" ,qttools)
|
||||
("qt" ,qt) ; FIXME: reenable modular qt after update - requires building
|
||||
;("qtbase" ,qtbase) with -std=gnu++11.
|
||||
;("qttools" ,qttools)
|
||||
("sdl" ,sdl)
|
||||
("sqlite" ,sqlite)
|
||||
("yasm" ,yasm)
|
||||
|
@ -1396,7 +1400,8 @@ (define-public v4l-utils
|
|||
'(#:configure-flags
|
||||
(list (string-append "--with-udevdir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/udev"))))
|
||||
"/lib/udev")
|
||||
"CXXFLAGS=-std=gnu++11")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
|
|
@ -2615,11 +2615,11 @@ (define-public perl-net-smtp-ssl
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/"
|
||||
(uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/"
|
||||
"Net-SMTP-SSL-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h"))))
|
||||
(base32
|
||||
"05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-io-socket-ssl" ,perl-io-socket-ssl)))
|
||||
|
|
|
@ -53,14 +53,14 @@ (define-module (gnu packages webkit)
|
|||
(define-public webkitgtk
|
||||
(package
|
||||
(name "webkitgtk")
|
||||
(version "2.12.3")
|
||||
(version "2.12.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.webkitgtk.org/releases/"
|
||||
(uri (string-append "https://www.webkitgtk.org/releases/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01y34v62khf03w25fnzgd42rrai5mf1m95lr5vjyw8ya5sdbng0p"))))
|
||||
"0xwsc2lpb4q55vdgmwljx43219l0sa6r5mqs3bmw3fwsb5vk2ka2"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
|
|
|
@ -83,7 +83,7 @@ (define-public wordnet
|
|||
(home-page "http://wordnet.princeton.edu/")
|
||||
(synopsis "Lexical database for the English language")
|
||||
(description
|
||||
"WordNet® is a large lexical database of English. Nouns, verbs,
|
||||
"WordNet is a large lexical database of English. Nouns, verbs,
|
||||
adjectives and adverbs are grouped into sets of cognitive synonyms (synsets),
|
||||
each expressing a distinct concept. Synsets are interlinked by means of
|
||||
conceptual-semantic and lexical relations. The resulting network of
|
||||
|
|
|
@ -182,14 +182,14 @@ (define-public xdotool
|
|||
(arguments
|
||||
'(#:tests? #f ; Test suite requires a lot of black magic
|
||||
#:phases
|
||||
(alist-replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys #:rest args)
|
||||
(setenv "PREFIX" (assoc-ref outputs "out"))
|
||||
(setenv "LDFLAGS" (string-append "-Wl,-rpath="
|
||||
(assoc-ref
|
||||
%outputs "out") "/lib"))
|
||||
(setenv "CC" "gcc"))
|
||||
%standard-phases)))
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys #:rest args)
|
||||
(setenv "PREFIX" (assoc-ref outputs "out"))
|
||||
(setenv "LDFLAGS"
|
||||
(string-append "-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib"))
|
||||
(setenv "CC" "gcc"))))))
|
||||
(native-inputs `(("perl" ,perl))) ; for pod2man
|
||||
(inputs `(("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
|
@ -514,21 +514,20 @@ (define-public unclutter
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target
|
||||
#:phases (alist-delete
|
||||
'configure
|
||||
(alist-replace
|
||||
'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(man1 (string-append out "/share/man/man1")))
|
||||
(mkdir-p bin)
|
||||
(mkdir-p man1)
|
||||
(zero?
|
||||
(system* "make" "install" "install.man"
|
||||
(string-append "BINDIR=" bin)
|
||||
(string-append "MANDIR=" man1)))))
|
||||
%standard-phases))))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(man1 (string-append out "/share/man/man1")))
|
||||
(mkdir-p bin)
|
||||
(mkdir-p man1)
|
||||
(zero?
|
||||
(system* "make" "install" "install.man"
|
||||
(string-append "BINDIR=" bin)
|
||||
(string-append "MANDIR=" man1)))))))))
|
||||
(inputs `(("libx11" ,libx11)))
|
||||
(home-page "http://ftp.x.org/contrib/utilities/")
|
||||
(synopsis "Hide idle mouse cursor")
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
||||
|
|
|
@ -133,6 +133,29 @@ (define-public imake
|
|||
autotools system.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public lndir
|
||||
(package
|
||||
(name "lndir")
|
||||
(version "1.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://xorg/individual/util/"
|
||||
"lndir-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("xproto" ,xproto)))
|
||||
(home-page "http://www.x.org")
|
||||
(synopsis "Symlink directory into tree")
|
||||
(description "Create a shadow directory of symbolic links to another
|
||||
directory tree.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public bdftopcf
|
||||
(package
|
||||
(name "bdftopcf")
|
||||
|
@ -2361,7 +2384,7 @@ (define-public libevdev
|
|||
(define-public xf86-input-evdev
|
||||
(package
|
||||
(name "xf86-input-evdev")
|
||||
(version "2.10.1")
|
||||
(version "2.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2371,7 +2394,7 @@ (define-public xf86-input-evdev
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g"))))
|
||||
"18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("udev" ,eudev)
|
||||
|
@ -2511,7 +2534,7 @@ (define-public xf86-input-mouse
|
|||
(define-public xf86-input-synaptics
|
||||
(package
|
||||
(name "xf86-input-synaptics")
|
||||
(version "1.8.3")
|
||||
(version "1.8.99.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2521,7 +2544,7 @@ (define-public xf86-input-synaptics
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"))))
|
||||
"1apbcwn20p7sy07ghlldmqcnxag2r9sdjqmb4xxzki0hz8wm72ac"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libx11" ,libx11)
|
||||
("libxi" ,libxi)
|
||||
|
@ -2623,7 +2646,7 @@ (define-public xf86-video-ark
|
|||
(define-public xf86-video-ati
|
||||
(package
|
||||
(name "xf86-video-ati")
|
||||
(version "7.6.1")
|
||||
(version "7.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2633,7 +2656,7 @@ (define-public xf86-video-ati
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0k6kw69mcarlmxlb4jlhz887jxqr94qx2pin04xcv2ysp3pdj5i5"))))
|
||||
"1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("mesa" ,mesa)
|
||||
("xxf86driproto" ,xf86driproto)
|
||||
|
@ -3049,7 +3072,7 @@ (define-public xf86-video-nouveau
|
|||
(define-public xf86-video-openchrome
|
||||
(package
|
||||
(name "xf86-video-openchrome")
|
||||
(version "0.3.3")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3058,9 +3081,8 @@ (define-public xf86-video-openchrome
|
|||
version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"))
|
||||
(patches (search-patches "xf86-video-openchrome-glibc-2.20.patch"))))
|
||||
(base32
|
||||
"1fsmr455lk89zl795d6b5ypyqjim40j3h2vjch52lcssjw9xdza9"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
|
|
|
@ -49,7 +49,7 @@ (define-module (gnu services base)
|
|||
#:use-module (ice-9 format)
|
||||
#:export (fstab-service-type
|
||||
root-file-system-service
|
||||
file-system-service
|
||||
file-system-service-type
|
||||
user-unmount-service
|
||||
swap-service
|
||||
user-processes-service
|
||||
|
@ -86,6 +86,7 @@ (define-module (gnu services base)
|
|||
syslog-service-type
|
||||
%default-syslog.conf
|
||||
|
||||
%default-authorized-guix-keys
|
||||
guix-configuration
|
||||
guix-configuration?
|
||||
guix-service
|
||||
|
@ -163,7 +164,7 @@ (define fstab-service-type
|
|||
(extensions
|
||||
(list (service-extension etc-service-type
|
||||
file-systems->fstab)))
|
||||
(compose identity)
|
||||
(compose concatenate)
|
||||
(extend append)))
|
||||
|
||||
(define %root-file-system-shepherd-service
|
||||
|
@ -229,7 +230,8 @@ (define dependency->shepherd-service-name
|
|||
(file-system->shepherd-service-name fs))))
|
||||
|
||||
(define (file-system-shepherd-service file-system)
|
||||
"Return a list containing the shepherd service for @var{file-system}."
|
||||
"Return the shepherd service for @var{file-system}, or @code{#f} if
|
||||
@var{file-system} is not auto-mounted upon boot."
|
||||
(let ((target (file-system-mount-point file-system))
|
||||
(device (file-system-device file-system))
|
||||
(type (file-system-type file-system))
|
||||
|
@ -237,10 +239,9 @@ (define (file-system-shepherd-service file-system)
|
|||
(check? (file-system-check? file-system))
|
||||
(create? (file-system-create-mount-point? file-system))
|
||||
(dependencies (file-system-dependencies file-system)))
|
||||
(if (file-system-mount? file-system)
|
||||
(with-imported-modules '((gnu build file-systems)
|
||||
(guix build bournish))
|
||||
(list
|
||||
(and (file-system-mount? file-system)
|
||||
(with-imported-modules '((gnu build file-systems)
|
||||
(guix build bournish))
|
||||
(shepherd-service
|
||||
(provision (list (file-system->shepherd-service-name file-system)))
|
||||
(requirement `(root-file-system
|
||||
|
@ -289,23 +290,19 @@ (define (file-system-shepherd-service file-system)
|
|||
;; We need an additional module.
|
||||
(modules `(((gnu build file-systems)
|
||||
#:select (check-file-system canonicalize-device-spec))
|
||||
,@%default-modules)))))
|
||||
'())))
|
||||
,@%default-modules)))))))
|
||||
|
||||
(define file-system-service-type
|
||||
;; TODO(?): Make this an extensible service that takes <file-system> objects
|
||||
;; and returns a list of <shepherd-service>.
|
||||
(service-type (name 'file-system)
|
||||
(service-type (name 'file-systems)
|
||||
(extensions
|
||||
(list (service-extension shepherd-root-service-type
|
||||
file-system-shepherd-service)
|
||||
(lambda (file-systems)
|
||||
(filter-map file-system-shepherd-service
|
||||
file-systems)))
|
||||
(service-extension fstab-service-type
|
||||
identity)))))
|
||||
|
||||
(define* (file-system-service file-system)
|
||||
"Return a service that mounts @var{file-system}, a @code{<file-system>}
|
||||
object."
|
||||
(service file-system-service-type file-system))
|
||||
identity)))
|
||||
(compose concatenate)
|
||||
(extend append)))
|
||||
|
||||
(define user-unmount-service-type
|
||||
(shepherd-service-type
|
||||
|
@ -1003,15 +1000,14 @@ (define* (guix-build-accounts count #:key
|
|||
1+
|
||||
1))
|
||||
|
||||
(define (hydra-key-authorization guix)
|
||||
"Return a gexp with code to register the hydra.gnu.org public key with
|
||||
GUIX."
|
||||
(define (hydra-key-authorization key guix)
|
||||
"Return a gexp with code to register KEY, a file containing a 'guix archive'
|
||||
public key, with GUIX."
|
||||
#~(unless (file-exists? "/etc/guix/acl")
|
||||
(let ((pid (primitive-fork)))
|
||||
(case pid
|
||||
((0)
|
||||
(let* ((key (string-append #$guix
|
||||
"/share/guix/hydra.gnu.org.pub"))
|
||||
(let* ((key #$key)
|
||||
(port (open-file key "r0b")))
|
||||
(format #t "registering public key '~a'...~%" key)
|
||||
(close-port (current-input-port))
|
||||
|
@ -1025,6 +1021,10 @@ (define (hydra-key-authorization guix)
|
|||
(format (current-error-port) "warning: \
|
||||
failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
||||
|
||||
(define %default-authorized-guix-keys
|
||||
;; List of authorized substitute keys.
|
||||
(list #~(string-append #$guix "/share/guix/hydra.gnu.org.pub")))
|
||||
|
||||
(define-record-type* <guix-configuration>
|
||||
guix-configuration make-guix-configuration
|
||||
guix-configuration?
|
||||
|
@ -1036,6 +1036,8 @@ (define-record-type* <guix-configuration>
|
|||
(default 10))
|
||||
(authorize-key? guix-configuration-authorize-key? ;Boolean
|
||||
(default #t))
|
||||
(authorized-keys guix-configuration-authorized-keys ;list of gexps
|
||||
(default %default-authorized-guix-keys))
|
||||
(use-substitutes? guix-configuration-use-substitutes? ;Boolean
|
||||
(default #t))
|
||||
(substitute-urls guix-configuration-substitute-urls ;list of strings
|
||||
|
@ -1053,7 +1055,8 @@ (define %default-guix-configuration
|
|||
(define (guix-shepherd-service config)
|
||||
"Return a <shepherd-service> for the Guix daemon service with CONFIG."
|
||||
(match config
|
||||
(($ <guix-configuration> guix build-group build-accounts authorize-key?
|
||||
(($ <guix-configuration> guix build-group build-accounts
|
||||
authorize-key? keys
|
||||
use-substitutes? substitute-urls extra-options
|
||||
lsof lsh)
|
||||
(list (shepherd-service
|
||||
|
@ -1093,14 +1096,15 @@ (define (guix-accounts config)
|
|||
(define (guix-activation config)
|
||||
"Return the activation gexp for CONFIG."
|
||||
(match config
|
||||
(($ <guix-configuration> guix build-group build-accounts authorize-key?)
|
||||
(($ <guix-configuration> guix build-group build-accounts authorize-key? keys)
|
||||
;; Assume that the store has BUILD-GROUP as its group. We could
|
||||
;; otherwise call 'chown' here, but the problem is that on a COW unionfs,
|
||||
;; chown leads to an entire copy of the tree, which is a bad idea.
|
||||
|
||||
;; Optionally authorize hydra.gnu.org's key.
|
||||
(if authorize-key?
|
||||
(hydra-key-authorization guix)
|
||||
#~(begin
|
||||
#$@(map (cut hydra-key-authorization <> guix) keys))
|
||||
#~#f))))
|
||||
|
||||
(define guix-service-type
|
||||
|
|
|
@ -178,9 +178,9 @@ (define-record-type* <operating-system> operating-system
|
|||
;;; Services.
|
||||
;;;
|
||||
|
||||
(define (other-file-system-services os)
|
||||
"Return file system services for the file systems of OS that are not marked
|
||||
as 'needed-for-boot'."
|
||||
(define (non-boot-file-system-service os)
|
||||
"Return the file system service for the file systems of OS that are not
|
||||
marked as 'needed-for-boot'."
|
||||
(define file-systems
|
||||
(remove file-system-needed-for-boot?
|
||||
(operating-system-file-systems os)))
|
||||
|
@ -204,7 +204,8 @@ (define (add-dependencies fs)
|
|||
(file-system-dependencies fs))
|
||||
eq?))))
|
||||
|
||||
(map (compose file-system-service add-dependencies) file-systems))
|
||||
(service file-system-service-type
|
||||
(map add-dependencies file-systems)))
|
||||
|
||||
(define (mapped-device-user device file-systems)
|
||||
"Return a file system among FILE-SYSTEMS that uses DEVICE, or #f."
|
||||
|
@ -270,11 +271,11 @@ (define known-fs
|
|||
|
||||
(let* ((mappings (device-mapping-services os))
|
||||
(root-fs (root-file-system-service))
|
||||
(other-fs (other-file-system-services os))
|
||||
(other-fs (non-boot-file-system-service os))
|
||||
(unmount (user-unmount-service known-fs))
|
||||
(swaps (swap-services os))
|
||||
(procs (user-processes-service
|
||||
(map service-parameters other-fs)))
|
||||
(service-parameters other-fs)))
|
||||
(host-name (host-name-service (operating-system-host-name os)))
|
||||
(entries (operating-system-directory-base-entries
|
||||
os #:container? container?)))
|
||||
|
@ -302,7 +303,8 @@ (define known-fs
|
|||
(operating-system-setuid-programs os))
|
||||
(service profile-service-type
|
||||
(operating-system-packages os))
|
||||
(append other-fs mappings swaps
|
||||
other-fs
|
||||
(append mappings swaps
|
||||
|
||||
;; Add the firmware service, unless we are building for a
|
||||
;; container.
|
||||
|
|
|
@ -78,6 +78,8 @@ (define-record-type* <user-account>
|
|||
(default '())) ; list of strings
|
||||
(comment user-account-comment (default ""))
|
||||
(home-directory user-account-home-directory)
|
||||
(create-home-directory? user-account-create-home-directory? ;Boolean
|
||||
(default #t))
|
||||
(shell user-account-shell ; gexp
|
||||
(default #~(string-append #$bash "/bin/bash")))
|
||||
(system? user-account-system? ; Boolean
|
||||
|
@ -128,6 +130,7 @@ (define %base-user-accounts
|
|||
(group "nogroup")
|
||||
(shell #~(string-append #$shadow "/sbin/nologin"))
|
||||
(home-directory "/nonexistent")
|
||||
(create-home-directory? #f)
|
||||
(system? #t))))
|
||||
|
||||
(define (default-skeletons)
|
||||
|
@ -255,6 +258,7 @@ (define (user-account->gexp account)
|
|||
#$(user-account-supplementary-groups account)
|
||||
#$(user-account-comment account)
|
||||
#$(user-account-home-directory account)
|
||||
#$(user-account-create-home-directory? account)
|
||||
,#$(user-account-shell account) ; this one is a gexp
|
||||
#$(user-account-password account)
|
||||
#$(user-account-system? account)))
|
||||
|
|
|
@ -190,6 +190,42 @@ (define marionette
|
|||
(setlocale LC_ALL before)))
|
||||
marionette))
|
||||
|
||||
(test-assert "/run/current-system is a GC root"
|
||||
(marionette-eval '(begin
|
||||
;; Make sure the (guix …) modules are found.
|
||||
(eval-when (expand load eval)
|
||||
(set! %load-path
|
||||
(cons
|
||||
(string-append
|
||||
"/run/current-system/profile/share/guile/site/"
|
||||
(effective-version))
|
||||
%load-path))
|
||||
(set! %load-compiled-path
|
||||
(cons
|
||||
(string-append
|
||||
"/run/current-system/profile/share/guile/site/"
|
||||
(effective-version))
|
||||
%load-compiled-path)))
|
||||
|
||||
(use-modules (srfi srfi-34) (guix store))
|
||||
|
||||
(let ((system (readlink "/run/current-system")))
|
||||
(guard (c ((nix-protocol-error? c)
|
||||
(file-exists? system)))
|
||||
(with-store store
|
||||
(delete-paths store (list system))
|
||||
#f))))
|
||||
marionette))
|
||||
|
||||
;; This symlink is currently unused, but better have it point to the
|
||||
;; right place. See
|
||||
;; <https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01641.html>.
|
||||
(test-equal "/var/guix/gcroots/profiles is a valid symlink"
|
||||
"/var/guix/profiles"
|
||||
(marionette-eval '(readlink "/var/guix/gcroots/profiles")
|
||||
marionette))
|
||||
|
||||
|
||||
(test-assert "screendump"
|
||||
(begin
|
||||
(marionette-control (string-append "screendump " #$output
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
;;
|
||||
;; Some optimizations made by Ludovic Courtès <ludo@gnu.org>, 2015.
|
||||
;;
|
||||
;; Copyright © 2009, 2010 Göran Weinholt <goran@weinholt.se>
|
||||
;;
|
||||
;; 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
|
||||
;; the Free Software Foundation, either version 3 of the License, or
|
||||
|
@ -20,6 +18,30 @@
|
|||
;;
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
;;
|
||||
;; This file incorporates work covered by the following copyright and
|
||||
;; permission notice:
|
||||
;;
|
||||
;; Copyright © 2009, 2010 Göran Weinholt <goran@weinholt.se>
|
||||
;;
|
||||
;; Permission is hereby granted, free of charge, to any person obtaining a
|
||||
;; copy of this software and associated documentation files (the "Software"),
|
||||
;; to deal in the Software without restriction, including without limitation
|
||||
;; the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
;; and/or sell copies of the Software, and to permit persons to whom the
|
||||
;; Software is furnished to do so, subject to the following conditions:
|
||||
;;
|
||||
;; The above copyright notice and this permission notice shall be included in
|
||||
;; all copies or substantial portions of the Software.
|
||||
;;
|
||||
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
;; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
;; DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#!r6rs
|
||||
|
||||
;; RFC 4648 Base-N Encodings
|
||||
|
|
|
@ -22,7 +22,7 @@ (define-module (guix import utils)
|
|||
#:use-module (srfi srfi-1)
|
||||
#:use-module (guix hash)
|
||||
#:use-module (guix base32)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module ((guix build download) #:prefix build:)
|
||||
#:export (factorize-uri
|
||||
|
@ -112,12 +112,12 @@ (define (guix-hash-url filename)
|
|||
(define (string->license str)
|
||||
"Convert the string STR into a license object."
|
||||
(match str
|
||||
("GNU LGPL" lgpl2.0)
|
||||
("GPL" gpl3)
|
||||
((or "BSD" "BSD License") bsd-3)
|
||||
((or "MIT" "MIT license" "Expat license") expat)
|
||||
("Public domain" public-domain)
|
||||
((or "Apache License, Version 2.0" "Apache 2.0") asl2.0)
|
||||
("GNU LGPL" license:lgpl2.0)
|
||||
("GPL" license:gpl3)
|
||||
((or "BSD" "BSD License") license:bsd-3)
|
||||
((or "MIT" "MIT license" "Expat license") license:expat)
|
||||
("Public domain" license:public-domain)
|
||||
((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0)
|
||||
(_ #f)))
|
||||
|
||||
(define (license->symbol license)
|
||||
|
@ -125,12 +125,12 @@ (define (license->symbol license)
|
|||
to in the (guix licenses) module, or #f if there is no such known license."
|
||||
;; TODO: Traverse list public variables in (guix licenses) instead so we
|
||||
;; don't have to maintain a list manualy.
|
||||
(assoc-ref `((,lgpl2.0 . lgpl2.0)
|
||||
(,gpl3 . gpl3)
|
||||
(,bsd-3 . bsd-3)
|
||||
(,expat . expat)
|
||||
(,public-domain . public-domain)
|
||||
(,asl2.0 . asl2.0))
|
||||
(assoc-ref `((,license:lgpl2.0 . license:lgpl2.0)
|
||||
(,license:gpl3 . license:gpl3)
|
||||
(,license:bsd-3 . license:bsd-3)
|
||||
(,license:expat . license:expat)
|
||||
(,license:public-domain . license:public-domain)
|
||||
(,license:asl2.0 . license:asl2.0))
|
||||
license))
|
||||
|
||||
(define (snake-case str)
|
||||
|
|
|
@ -162,7 +162,7 @@ (define %options
|
|||
(alist-cons 'expression arg result)))
|
||||
(option '(#\n "dry-run") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'dry-run? #t result)))
|
||||
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
||||
|
||||
%standard-build-options))
|
||||
|
||||
|
|
|
@ -541,7 +541,7 @@ (define %options
|
|||
(alist-cons 'file arg result)))
|
||||
(option '(#\n "dry-run") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'dry-run? #t result)))
|
||||
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
||||
(option '(#\r "root") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'gc-root arg result)))
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -74,9 +74,16 @@ (define (package->location-specification package)
|
|||
|
||||
|
||||
(define (guix-edit . args)
|
||||
(define (parse-arguments)
|
||||
;; Return the list of package names.
|
||||
(args-fold* args %options
|
||||
(lambda (opt name arg result)
|
||||
(leave (_ "~A: unrecognized option~%") name))
|
||||
cons
|
||||
'()))
|
||||
|
||||
(with-error-handling
|
||||
(let* ((specs (parse-command-line args %options '(())
|
||||
#:argument-handler cons))
|
||||
(let* ((specs (reverse (parse-arguments)))
|
||||
(packages (map specification->package specs)))
|
||||
(for-each (lambda (package)
|
||||
(unless (package-location package)
|
||||
|
|
|
@ -226,7 +226,7 @@ (define %options
|
|||
(alist-cons 'ad-hoc? #t result)))
|
||||
(option '(#\n "dry-run") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'dry-run? #t result)))
|
||||
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
||||
(option '(#\s "system") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'system arg
|
||||
|
|
|
@ -161,6 +161,18 @@ (define (check-texinfo-markup description)
|
|||
'description)
|
||||
#f)))
|
||||
|
||||
(define (check-trademarks description)
|
||||
"Check that DESCRIPTION does not contain '™' or '®' characters. See
|
||||
http://www.gnu.org/prep/standards/html_node/Trademarks.html."
|
||||
(match (string-index description (char-set #\™ #\®))
|
||||
((and (? number?) index)
|
||||
(emit-warning package
|
||||
(format #f (_ "description should not contain ~
|
||||
trademark sign '~a' at ~d")
|
||||
(string-ref description index) index)
|
||||
'description))
|
||||
(else #t)))
|
||||
|
||||
(define (check-proper-start description)
|
||||
(unless (or (properly-starts-sentence? description)
|
||||
(string-prefix-ci? (package-name package) description))
|
||||
|
@ -191,6 +203,7 @@ (define (check-end-of-sentence-space description)
|
|||
(if (string? description)
|
||||
(begin
|
||||
(check-not-empty description)
|
||||
(check-trademarks description)
|
||||
;; Use raw description for this because Texinfo rendering
|
||||
;; automatically fixes end of sentence space.
|
||||
(check-end-of-sentence-space description)
|
||||
|
|
|
@ -486,7 +486,8 @@ (define %options
|
|||
#f)))
|
||||
(option '(#\n "dry-run") #f #f
|
||||
(lambda (opt name arg result arg-handler)
|
||||
(values (alist-cons 'dry-run? #t result)
|
||||
(values (alist-cons 'dry-run? #t
|
||||
(alist-cons 'graft? #f result))
|
||||
#f)))
|
||||
(option '("bootstrap") #f #f
|
||||
(lambda (opt name arg result arg-handler)
|
||||
|
|
|
@ -52,6 +52,7 @@ (define-module (guix scripts system)
|
|||
#:use-module (srfi srfi-35)
|
||||
#:use-module (srfi srfi-37)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (rnrs bytevectors)
|
||||
#:export (guix-system
|
||||
read-operating-system))
|
||||
|
||||
|
@ -397,6 +398,9 @@ (define (system->grub-entry system number time)
|
|||
read-boot-parameters))
|
||||
(label (boot-parameters-label params))
|
||||
(root (boot-parameters-root-device params))
|
||||
(root-device (if (bytevector? root)
|
||||
(uuid->string root)
|
||||
root))
|
||||
(kernel (boot-parameters-kernel params))
|
||||
(kernel-arguments (boot-parameters-kernel-arguments params)))
|
||||
(menu-entry
|
||||
|
@ -405,7 +409,7 @@ (define (system->grub-entry system number time)
|
|||
(seconds->string time) ")"))
|
||||
(linux kernel)
|
||||
(linux-arguments
|
||||
(cons* (string-append "--root=" root)
|
||||
(cons* (string-append "--root=" root-device)
|
||||
#~(string-append "--system=" #$system)
|
||||
#~(string-append "--load=" #$system "/boot")
|
||||
kernel-arguments))
|
||||
|
@ -473,18 +477,21 @@ (define* (display-system-generation number
|
|||
#:optional (profile %system-profile))
|
||||
"Display a summary of system generation NUMBER in a human-readable format."
|
||||
(unless (zero? number)
|
||||
(let* ((generation (generation-file-name profile number))
|
||||
(param-file (string-append generation "/parameters"))
|
||||
(params (call-with-input-file param-file read-boot-parameters))
|
||||
(label (boot-parameters-label params))
|
||||
(root (boot-parameters-root-device params))
|
||||
(kernel (boot-parameters-kernel params)))
|
||||
(let* ((generation (generation-file-name profile number))
|
||||
(param-file (string-append generation "/parameters"))
|
||||
(params (call-with-input-file param-file read-boot-parameters))
|
||||
(label (boot-parameters-label params))
|
||||
(root (boot-parameters-root-device params))
|
||||
(root-device (if (bytevector? root)
|
||||
(uuid->string root)
|
||||
root))
|
||||
(kernel (boot-parameters-kernel params)))
|
||||
(display-generation profile number)
|
||||
(format #t (_ " file name: ~a~%") generation)
|
||||
(format #t (_ " canonical file name: ~a~%") (readlink* generation))
|
||||
;; TRANSLATORS: Please preserve the two-space indentation.
|
||||
(format #t (_ " label: ~a~%") label)
|
||||
(format #t (_ " root device: ~a~%") root)
|
||||
(format #t (_ " root device: ~a~%") root-device)
|
||||
(format #t (_ " kernel: ~a~%") kernel))))
|
||||
|
||||
(define* (list-generations pattern #:optional (profile %system-profile))
|
||||
|
@ -743,7 +750,7 @@ (define %options
|
|||
|
||||
(option '(#\n "dry-run") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'dry-run? #t result)))
|
||||
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
||||
(option '(#\s "system") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'system arg
|
||||
|
|
|
@ -71,7 +71,7 @@ (define test-json
|
|||
('synopsis "A cool gem")
|
||||
('description "This package provides a cool gem")
|
||||
('home-page "https://example.com")
|
||||
('license ('list 'expat 'asl2.0)))
|
||||
('license ('list 'license:expat 'license:asl2.0)))
|
||||
#t)
|
||||
(x
|
||||
(pk 'fail x #f)))))
|
||||
|
|
|
@ -72,7 +72,7 @@ mount_test_code="
|
|||
;; correspond to a parent file system.
|
||||
((_ mount (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\"
|
||||
\"devpts\" \"cgroup\" \"mqueue\") _ _ _)
|
||||
(and (string-prefix? mount (getcwd))
|
||||
(and (string-prefix? (getcwd) mount)
|
||||
mount))
|
||||
((_ mount _ _ _ _)
|
||||
mount)))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com>
|
||||
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;;
|
||||
|
@ -203,6 +203,20 @@ (define-syntax-rule (with-warnings body ...)
|
|||
"E.g. Foo, i.e. Bar resp. Baz (a.k.a. DVD)."))))
|
||||
(check-description-style pkg)))))
|
||||
|
||||
(test-assert "description: may not contain trademark signs"
|
||||
(and (->bool
|
||||
(string-contains (with-warnings
|
||||
(let ((pkg (dummy-package "x"
|
||||
(description "Does The Right Thing™"))))
|
||||
(check-description-style pkg)))
|
||||
"should not contain trademark sign"))
|
||||
(->bool
|
||||
(string-contains (with-warnings
|
||||
(let ((pkg (dummy-package "x"
|
||||
(description "Works with Format®"))))
|
||||
(check-description-style pkg)))
|
||||
"should not contain trademark sign"))))
|
||||
|
||||
(test-assert "synopsis: not a string"
|
||||
(->bool
|
||||
(string-contains (with-warnings
|
||||
|
|
|
@ -130,7 +130,7 @@ (define test-metadata
|
|||
('home-page "http://example.com")
|
||||
('synopsis "summary")
|
||||
('description "summary")
|
||||
('license 'lgpl2.0))
|
||||
('license 'license:lgpl2.0))
|
||||
(string=? (bytevector->nix-base32-string
|
||||
test-source-hash)
|
||||
hash))
|
||||
|
@ -190,7 +190,7 @@ (define test-metadata
|
|||
('home-page "http://example.com")
|
||||
('synopsis "summary")
|
||||
('description "summary")
|
||||
('license 'lgpl2.0))
|
||||
('license 'license:lgpl2.0))
|
||||
(string=? (bytevector->nix-base32-string
|
||||
test-source-hash)
|
||||
hash))
|
||||
|
|
Loading…
Reference in a new issue