diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-04-08 00:54:01 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-08 00:54:01 +0200 |
commit | ba00235a9652bb129ff6867ffc3c7cfafe1cca09 (patch) | |
tree | 1ce56f512707e89362e1fed3d5b26d690462fbda /gnu/packages/package-management.scm | |
parent | f19ccdc62ca721b68745c35b046826b356f46c62 (diff) | |
parent | 0e2b0b05accdea7c3f016f8483d0ec04021114d3 (diff) | |
download | guix-patches-ba00235a9652bb129ff6867ffc3c7cfafe1cca09.tar guix-patches-ba00235a9652bb129ff6867ffc3c7cfafe1cca09.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r-- | gnu/packages/package-management.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 07a6c24bc8..ad0b8f06f8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -50,7 +50,6 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnuzilla) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -59,6 +58,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages man) #:use-module (gnu packages nettle) + #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) @@ -1010,7 +1010,7 @@ the bootloader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) @@ -1018,7 +1018,7 @@ the bootloader configuration.") version "/flatpak-" version ".tar.xz")) (sha256 (base32 - "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv")))) + "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. |