Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/ruby.scm
This commit is contained in:
Jakub Kądziołka 2020-07-23 21:43:06 +02:00
commit d726b954ba
No known key found for this signature in database
GPG key ID: E315A75846131564
445 changed files with 34995 additions and 11457 deletions

View file

@ -606,7 +606,7 @@ multipole-accelerated algorithm.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fritzing/fritzing-app.git")
(url "https://github.com/fritzing/fritzing-app")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -655,7 +655,7 @@ multipole-accelerated algorithm.")
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fritzing/fritzing-parts.git")
(url "https://github.com/fritzing/fritzing-parts")
(commit version)))
(file-name (git-file-name "fritzing-parts" version))
(sha256
@ -713,7 +713,7 @@ as well as pick-place files.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/erichVK5/translate2geda.git")
(url "https://github.com/erichVK5/translate2geda")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -933,7 +933,7 @@ translations for KiCad.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-symbols.git")
(url "https://github.com/KiCad/kicad-symbols")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -962,7 +962,7 @@ libraries.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-footprints.git")
(url "https://github.com/KiCad/kicad-footprints")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -979,7 +979,7 @@ libraries.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-packages3d.git")
(url "https://github.com/KiCad/kicad-packages3d")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -996,7 +996,7 @@ libraries.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-templates.git")
(url "https://github.com/KiCad/kicad-templates")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -2109,7 +2109,7 @@ editors.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/markwal/GPX.git")
(url "https://github.com/markwal/GPX")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -2230,7 +2230,7 @@ engineers for reverse engineers.")
(source
(origin
(method git-fetch)
(uri (git-reference (url "https://github.com/3MFConsortium/lib3mf.git")
(uri (git-reference (url "https://github.com/3MFConsortium/lib3mf")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -2335,7 +2335,7 @@ full programmatic control over your models.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FreeCAD/FreeCAD.git")
(url "https://github.com/FreeCAD/FreeCAD")
(commit version)))
(modules '((guix build utils)))
(snippet
@ -2478,7 +2478,7 @@ interpolation toolkit.")
(source
(origin
(method git-fetch)
(uri (git-reference (url "https://github.com/Heeks/libarea.git")
(uri (git-reference (url "https://github.com/Heeks/libarea")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -2519,7 +2519,7 @@ operations.")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FreeSpacenav/libspnav.git")
(url "https://github.com/FreeSpacenav/libspnav")
(commit (string-append "libspnav-" version))))
(sha256
(base32