diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/lego.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/lego.scm')
| -rw-r--r-- | gnu/packages/lego.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 5b72c0e0be..19a4a5eba0 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,7 +101,7 @@ restrictions that stem from limitations of the standard RCX firmware.") (define-public leocad (package (name "leocad") - (version "19.07.1") + (version "21.06") (source (origin (method git-fetch) (uri (git-reference @@ -109,14 +110,12 @@ restrictions that stem from limitations of the standard RCX firmware.") (file-name (git-file-name name version)) (sha256 (base32 - "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2")))) + "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq")))) (build-system gnu-build-system) (native-inputs - `(("qttools" ,qttools))) ; for lrelease + (list qttools)) ; for lrelease (inputs - `(("mesa" ,mesa) - ("qtbase" ,qtbase-5) - ("zlib" ,zlib))) + (list mesa qtbase-5 zlib)) (arguments '(#:tests? #f #:phases |