From a7cdf124c0b28be6c4e750161c1341753eede7b8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 18 Dec 2019 22:45:53 -0600 Subject: [PATCH] gnu: leocad: Update to 19.07.1. * gnu/packages/lego.scm (leocad): Update to 19.07.1 [source]: Use git-fetch. * .mailmap: Add preferred alias for myself. --- .mailmap | 1 + gnu/packages/lego.scm | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index af3f0e9508..d5578d10ce 100644 --- a/.mailmap +++ b/.mailmap @@ -23,6 +23,7 @@ David Thompson David Thompson Deck Pickard Eric Bavier +Eric Bavier Eric Dvorsak George Clemmer ison diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 3203e1c9b4..396b37ddd9 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Eric Bavier +;;; Copyright © 2016, 2017, 2019 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (gnu packages lego) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (gnu packages) @@ -73,15 +74,16 @@ restrictions that stem from limitations of the standard RCX firmware.") (define-public leocad (package (name "leocad") - (version "18.02") + (version "19.07.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/leozide/leocad/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/leozide/leocad.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "189wj221fn08bnsfwy8050bxkjgjwinkn19qdcvb6c2ry2lnfra9")))) + "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2")))) (build-system gnu-build-system) (native-inputs `(("qttools" ,qttools))) ; for lrelease