diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
| commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
| tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /distro/packages/lsh.scm | |
| parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
| parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
| download | patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
distro/packages/multiprecision.scm
Diffstat (limited to 'distro/packages/lsh.scm')
| -rw-r--r-- | distro/packages/lsh.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/distro/packages/lsh.scm b/distro/packages/lsh.scm index f6caf52caf..aa74c77b60 100644 --- a/distro/packages/lsh.scm +++ b/distro/packages/lsh.scm @@ -17,13 +17,15 @@ ;;; along with Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (distro packages lsh) + #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (distro) #:use-module (distro packages m4) #:use-module (distro packages linux) - #:use-module (distro packages compression) + #:use-module ((distro packages compression) + #:renamer (symbol-prefix-proc 'guix:)) #:use-module (distro packages multiprecision) #:use-module (distro packages readline) #:use-module (distro packages gperf) @@ -45,7 +47,7 @@ (home-page "http://liboop.ofb.net/") (synopsis "`liboop', an event loop library") (description "liboop is an event loop library.") - (license "LGPLv2.1+"))) + (license lgpl2.1+))) (define-public lsh (package @@ -65,7 +67,7 @@ ("m4" ,m4) ("readline" ,readline) ("liboop" ,liboop) - ("zlib" ,zlib) + ("zlib" ,guix:zlib) ("gmp" ,gmp) ("guile" ,guile-final) ("gperf" ,gperf) @@ -122,4 +124,4 @@ "lsh is a free implementation (in the GNU sense) of the ssh version 2 protocol, currently being standardised by the IETF SECSH working group.") - (license "GPLv2+"))) + (license gpl2+))) |