Merge remote-tracking branch 'origin/master' into rust-team

Change-Id: Ic45f7071abd6a02c2ccad411500e5103c8272ffb

1 files changed, 22 insertions, 17 deletions

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index c533997027..0351967a64 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -860,25 +860,30 @@ and others.")
 (define-public gerbv
   (package
     (name "gerbv")
-    (version "2.7.0")
+    (version "2.10.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-"
-                                  version "/gerbv-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/gerbv/gerbv")
+                    (commit (string-append "v" version))))
               (sha256
                (base32
-                "1d2k43k7i4yvbpi4sw1263a8d0q98z2n7aqhmpinpkih8a681vn5"))))
+                "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("CFLAGS=-fcommon")))
-    (native-inputs
-     `(("glib:bin" ,glib "bin")         ; for glib-compile-schemas, etc.
-       ("desktop-file-utils" ,desktop-file-utils)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("cairo" ,cairo)
-       ("gtk" ,gtk+-2)))
-    (home-page "http://gerbv.geda-project.org/")
+    (native-inputs (list autoconf
+                         automake
+                         desktop-file-utils
+                         gettext-minimal
+                         `(,glib "bin")
+                         libtool
+                         pkg-config))
+    (inputs (list cairo
+                  ;; As of 2.10.0 gerbv is still GTK+2 only.  GTK 3/4 porting
+                  ;; issue: https://github.com/gerbv/gerbv/issues/71.
+                  gtk+-2))
+    (home-page "https://gerbv.github.io/")
     (synopsis "Gerber file viewer")
     (description
      "Gerbv is a viewer for files in the Gerber format (RS-274X only), which
@@ -2675,7 +2680,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.")
 (define-public python-scikit-rf
   (package
     (name "python-scikit-rf")
-    (version "0.29.1")
+    (version "0.30.0")
     (source (origin
               (method git-fetch) ;PyPI misses some files required for tests
               (uri (git-reference
@@ -2683,7 +2688,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "11pbcgbq34xyjv5gjwi3a8cpgqqwmd73ps1fwyjajl26q2nkmcdh"))
+                "1fbws80glrakd08xzhifna831yk0bd8b0cizhfcjkg4km2nyx65c"))
               (file-name (git-file-name name version))))
     (build-system pyproject-build-system)
     (propagated-inputs (list python-matplotlib
@@ -2820,7 +2825,7 @@ comments.")))
 (define-public freecad
   (package
     (name "freecad")
-    (version "0.21.1")
+    (version "0.21.2")
     (source
      (origin
        (method git-fetch)
@@ -2829,7 +2834,7 @@ comments.")))
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0qwh6b1s432j5piwgfkphvz0slmxf0m8m8pdr3ny9zna9mghz42k"))))
+        (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc"))))
     (build-system qt-build-system)
     (native-inputs
      (list doxygen