amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates-frozen

Browse source 
Conflicts:
	gnu/packages/bioinformatics.scm
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/gpodder.scm
	gnu/packages/music.scm
	gnu/packages/patches/glibc-bootstrap-system.patch
	gnu/packages/python-xyz.scm
	gnu/packages/shells.scm
	gnu/packages/statistics.scm
This commit is contained in:
Marius Bakke 2021-07-29 22:34:57 +02:00
commit b029be2ee0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
100 changed files with 5664 additions and 43929 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/curl.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;;
;;; This file is part of GNU Guix.
;;;
@ -46,6 +47,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (srfi srfi-1))
@ -146,6 +148,17 @@ tunneling, and so on.")
(define-public curl-minimal
(deprecated-package "curl-minimal" curl))
(define-public curl-ssh
(package/inherit curl
(arguments
(substitute-keyword-arguments (package-arguments curl)
((#:configure-flags flags)
`(cons "--with-libssh2" ,flags))))
(inputs
`(("libssh2" ,libssh2)
,@(package-inputs curl)))
(properties `((hidden? . #t)))))
(define-public kurly
(package
(name "kurly")