diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
| commit | ae0badf5bb791428423a98d4e4e2b8d297a5d4be (patch) | |
| tree | 4282d243db3e90839a5f7d3b5878674ccd0e2e14 /gnu/packages/engineering.scm | |
| parent | ee401ed9249fbe284ef1b9b437d39207ca88131b (diff) | |
| parent | 927f3655662b41f25225ea03baa3ded687aa7cbb (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/web.scm
Diffstat (limited to 'gnu/packages/engineering.scm')
| -rw-r--r-- | gnu/packages/engineering.scm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f8ff1bbf0ee..55af90bc822 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm | |||
| @@ -791,9 +791,6 @@ language.") | |||
| 791 | (license (list license:mpl2.0 ;library | 791 | (license (list license:mpl2.0 ;library |
| 792 | license:gpl2+))))) ;Guile bindings and GUI | 792 | license:gpl2+))))) ;Guile bindings and GUI |
| 793 | 793 | ||
| 794 | (define-public ao | ||
| 795 | (deprecated-package "ao-cad" libfive)) | ||
| 796 | |||
| 797 | ;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master | 794 | ;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master |
| 798 | (define-public kicad | 795 | (define-public kicad |
| 799 | (package | 796 | (package |