ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Use license: prefix in (gnu packages samba).

Browse source 
* gnu/packages/samba.scm: Import (guix licenses) with the "license:" prefix to
  solve the conflict between the 'openssl' variables from (guix licenses) and
  from (gnu packages tls). Adjust all license fields.
  (ppp)[inputs]: Simplify list of inputs.
This commit is contained in:
Guillaume Le Vaillant 2022-06-25 18:16:33 +02:00
parent 2383144417
commit f65ac6556d
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/samba.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -33,7 +34,7 @@ (define-module (gnu packages samba)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
@ -117,7 +118,7 @@ (define-public cifs-utils
the Linux kernel CIFS client.")
(home-page "https://wiki.samba.org/index.php/LinuxCIFS_utils")
;; cifs-utils is licensed as GPL3 or later, but 3 files contain LGPL code.
(license gpl3+)))
(license license:gpl3+)))
(define-public iniparser
(package
@ -179,7 +180,7 @@ (define (install dir)
The library is small, thread safe, and written in portable ANSI C with no
external dependencies.")
(license x11)))
(license license:x11)))
(define-public samba
(package
@ -283,7 +284,7 @@ (define-public samba
Samba is an important component to seamlessly integrate Linux/Unix Servers and
Desktops into Active Directory environments using the winbind daemon.")
(license gpl3+)))
(license license:gpl3+)))
(define-public samba/fixed
;; Version that rarely changes, depended on by libsoup.
@ -330,7 +331,7 @@ (define-public talloc
(description
"Talloc is a hierarchical, reference counted memory pool system with
destructors. It is the core memory allocator used in Samba.")
(license gpl3+))) ;; The bundled "replace" library uses LGPL3.
(license license:gpl3+))) ;; The bundled "replace" library uses LGPL3.
(define-public talloc/static
(package
@ -397,7 +398,7 @@ (define-public tevent
"Tevent is an event system based on the talloc memory management library.
It is the core event system used in Samba. The low level tevent has support for
many event types, including timers, signals, and the classic file descriptor events.")
(license lgpl3+)))
(license license:lgpl3+)))
(define-public ldb
(package
@ -453,7 +454,7 @@ (define-public ldb
is provide a fast database with an LDAP-like API designed to be used within an
application. In some ways it can be seen as a intermediate solution between
key-value pair databases and a real LDAP database.")
(license lgpl3+)))
(license license:lgpl3+)))
(define-public ppp
(package
@ -487,8 +488,7 @@ (define-public ppp
(("des\\.h") "openssl/des.h")))
#t)))))
(inputs
(list libpcap
(@ (gnu packages tls) openssl)))
(list libpcap openssl))
(synopsis "Implementation of the Point-to-Point Protocol")
(home-page "https://ppp.samba.org/")
(description
@ -498,5 +498,7 @@ (define-public ppp
;; pppd, pppstats and pppdump are under BSD-style notices.
;; some of the pppd plugins are GPL'd.
;; chat is public domain.
(license (list bsd-3 bsd-4 gpl2+ public-domain))))
(license (list license:bsd-3
license:bsd-4
license:gpl2+
license:public-domain))))