From 0fe041bd9fa87d23b44969a3bcd99b1165a0f06e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Oct 2019 13:31:19 +0200 Subject: gnu: Remove more GCC < 7 workarounds. * gnu/packages/abiword.scm (abiword)[arguments]: Do not pass "-std=c++11" to the GCC command line. * gnu/packages/aidc.scm (zbar)[arguments]: Likewise. * gnu/packages/android.scm (android-libbase, android-libcutils, android-libziparchive, fastboot)[arguments]: Likewise. * gnu/packages/audio.scm (azr3, guitarix, suil)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (bless)[arguments]: Likewise. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Likewise. * gnu/packages/code.scm (rtags)[arguments]: Likewise. * gnu/packages/coq.scm (coq-gappa)[arguments]: Likewise. * gnu/packages/emulators.scm (dolphin-emu)[arguments]: Likewise. * gnu/packages/engineering.scm (xyce-serial, xyce-parallel)[arguments]: Likewise. * gnu/packages/gnupg.scm (pinentry-qt)[arguments]: Likewise. * gnu/packages/gobby.scm (libnet6, obby)[arguments]: Likewise. * gnu/packages/graph.scm (python-faiss)[arguments]: Likewise. * gnu/packages/graphics.scm (povray)[arguments]: Likewise. * gnu/packages/image-processing.scm (opencv, itk-snap)[arguments]: Likewise. * gnu/packages/image.scm (freeimage)[arguments]: Likewise. * gnu/packages/kodi.scm (crossguid)[arguments]: Likewise. * gnu/packages/music.scm (amsynth, qmidiarp, qmidiroute, seq24)[arguments]: Likewise. * gnu/packages/pdf.scm (python-poppler-qt5)[arguments]: Likewise. * gnu/packages/sagemath.scm (lcalc)[arguments]: Likewise. * gnu/packages/video.scm (vlc, mlt, v4l-utils)[arguments]: Likewise. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 169d912c35..d1626f0342 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1546,7 +1546,7 @@ (define-public xyce-serial `(#:tests? #f #:configure-flags (list - "CXXFLAGS=-O3 -std=c++11" + "CXXFLAGS=-O3" (string-append "ARCHDIR=" (assoc-ref %build-inputs "trilinos"))))) (native-inputs @@ -1586,7 +1586,7 @@ (define-public xyce-parallel (arguments `(,@(substitute-keyword-arguments (package-arguments xyce-serial) ((#:configure-flags flags) - `(list "CXXFLAGS=-O3 -std=c++11" + `(list "CXXFLAGS=-O3" "CXX=mpiCC" "CC=mpicc" "F77=mpif77" -- cgit v1.2.3 From f648d681bebf04b01e3b2d0e8dd4d8f6e9084acb Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 3 Nov 2019 19:15:12 +0530 Subject: gnu: kicad: Update to 5.1.4. * gnu/packages/engineering.scm (kicad): Update to 5.1.4. [arguments]: Remove unrecognized flags and flags that are redundant because they specify default values. Use python 3 and the "Phoenix" version of wxPython. Enable the GitHub plugin for pcbnew. Remove adjust-boost-include phase. [inputs]: Replace python-2 with python, wxwidgets-gtk2 with wxwidgets and python2-wxpython with python-wxpython. --- gnu/packages/engineering.scm | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d1626f0342..2c5ae53317 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -767,48 +767,27 @@ (define-public ao (define-public kicad (package (name "kicad") - (version "5.0.2") + (version "5.1.4") (source (origin (method url-fetch) (file-name (string-append name "-" version ".tar.xz")) (uri (string-append - "https://launchpad.net/kicad/" (version-major+minor version) - "/" version "/+download/kicad-" version ".tar.xz")) + "https://launchpad.net/kicad/" (version-major version) + ".0/" version "/+download/kicad-" version ".tar.xz")) (sha256 - (base32 "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g")))) + (base32 "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t #:tests? #f ; no tests #:build-type "Release" #:configure-flags - (list "-DKICAD_STABLE_VERSION=ON" - "-DKICAD_REPO_NAME=stable" - "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_WXPYTHON=ON" - ;; Has to be set explicitly, as we don't have the wxPython - ;; headers in the wxwidgets store item, but in wxPython. - (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "wxpython") - "/include/wx-" - ,(version-major+minor - (package-version python2-wxpython))) - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" - "-DKICAD_SPICE=TRUE" - ;; TODO: Enable this when CA certs are working with curl. - "-DBUILD_GITHUB_PLUGIN=OFF") + (list "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") #:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-boost-include - (lambda _ - ;; The location of this header changed in Boost 1.66. - (substitute* "3d-viewer/3d_cache/3d_cache.cpp" - (("boost/uuid/sha1\\.hpp") - "boost/uuid/detail/sha1.hpp")) - #t)) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -845,9 +824,9 @@ (define-public kicad ("mesa" ,mesa) ("opencascade-oce" ,opencascade-oce) ("openssl" ,openssl) - ("python" ,python-2) - ("wxwidgets" ,wxwidgets-gtk2) - ("wxpython" ,python2-wxpython))) + ("python" ,python) + ("wxwidgets" ,wxwidgets) + ("wxpython" ,python-wxpython))) (home-page "http://kicad-pcb.org/") (synopsis "Electronics Design Automation Suite") (description "Kicad is a program for the formation of printed circuit -- cgit v1.2.3 From c07bc1d2ca1029b89c807cc6e62e4c099aebedbd Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 4 Nov 2019 16:51:23 +0530 Subject: gnu: kicad-symbols: Update to 5.1.4. * gnu/packages/engineering.scm (kicad-symbols): Update to 5.1.4. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2c5ae53317..17d959b870 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -900,7 +900,7 @@ (define-public kicad-library (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.0.2") + (version "5.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -909,7 +909,7 @@ (define-public kicad-symbols (file-name (git-file-name name version)) (sha256 (base32 - "1rjh2pjcrc3bhcgyyskj5pssm7vffrjk0ymwr70fb7sjpmk96yjk")))) + "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests exist -- cgit v1.2.3 From f1d4d79fb3206fa26834b301fae7fc75c7f46ef8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Nov 2019 12:03:51 +0200 Subject: gnu: Add 'file-name' where appropriate. * gnu/packages/admin.scm (detox, neofetch), gnu/packages/algebra.scm (python-fpylll), gnu/packages/bioinformatics.scm (tbsp, genrich), gnu/packages/crypto.scm (hpenc), gnu/packages/digest.scm (xxhash), gnu/packages/emacs-xyz.scm (emacs-tiny, emacs-ergoemacs-mode, emacs-make-it-so, emacs-poet-theme, emacs-deft, emacs-scribble-mode, emacs-helm-mu, emacs-unidecode, emacs-diff-hl, emacs-helm-exwm, emacs-gif-screencast, emacs-exec-path-from-shell), gnu/packages/engineering.scm (gpx), gnu/packages/freedesktop.scm (waylandpp), gnu/packages/golang.scm (go-github-com-sirupsen-logrus, go-github-com-shirou-gopsutil), gnu/packages/guile-xyz.scm (guile-studio, guile-picture-language, jupyter-guile-kernel), gnu/packages/image-viewers.scm (qview), gnu/packages/java-maths.scm (java-jblas), gnu/packages/llvm.scm (libclc), gnu/packages/logging.scm (spdlog), gnu/packages/ocaml.scm (ocaml-cstruct, ocaml-zarith), gnu/packages/terminals.scm (libtsm), gnu/packages/tigervnc.scm (tigervnc-client), gnu/packages/xdisorg.scm (xcalib, xbanish) [source]: Add file-name. --- gnu/packages/admin.scm | 2 ++ gnu/packages/algebra.scm | 1 + gnu/packages/bioinformatics.scm | 2 ++ gnu/packages/crypto.scm | 1 + gnu/packages/digest.scm | 1 + gnu/packages/emacs-xyz.scm | 12 ++++++++++++ gnu/packages/engineering.scm | 1 + gnu/packages/freedesktop.scm | 1 + gnu/packages/golang.scm | 2 ++ gnu/packages/guile-xyz.scm | 3 +++ gnu/packages/image-viewers.scm | 1 + gnu/packages/java-maths.scm | 1 + gnu/packages/llvm.scm | 1 + gnu/packages/logging.scm | 1 + gnu/packages/ocaml.scm | 2 ++ gnu/packages/terminals.scm | 1 + gnu/packages/tigervnc.scm | 1 + gnu/packages/xdisorg.scm | 2 ++ 18 files changed, 36 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c675db582f..c4723c5a9d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1599,6 +1599,7 @@ (define-public detox (uri (git-reference (url "https://github.com/dharple/detox.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1dd608c7g65s5lj02cddvani3q9kzirddgkjqa22ap9d4f8b9xgr")))) @@ -2834,6 +2835,7 @@ (define-public neofetch (uri (git-reference (url "https://github.com/dylanaraps/neofetch") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch")))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index e1680d4b91..f626c0de97 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -201,6 +201,7 @@ (define-public python-fpylll (uri (git-reference (url "https://github.com/fplll/fpylll.git") (commit (string-append version "dev")))) + (file-name (git-file-name name version)) (sha256 (base32 "01x2sqdv0sbjj4g4waj0hj4rcn4bq7h17442xaqwbznym9azmn9w")))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e5d7081bc3..4a88e67191 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12849,6 +12849,7 @@ (define-public genrich (uri (git-reference (url "https://github.com/jsh58/Genrich.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0x0q6z0208n3cxzqjla4rgjqpyqgwpmz27852lcvzkzaigymq4zp")))) @@ -14798,6 +14799,7 @@ (define-public tbsp (uri (git-reference (url "https://github.com/phoenixding/tbsp.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "025ym14x8gbd6hb55lsinqj6f5qzw36i10klgs7ldzxxd7s39ki1")))) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 1f5bfc1631..2ae867f45b 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -952,6 +952,7 @@ (define-public hpenc (uri (git-reference (url "https://github.com/vstakhov/hpenc") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1fb5yi3d2k8kd4zm7liiqagpz610y168xrr1cvn7cbq314jm2my1")))) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index d5533bc474..7ec4ca1495 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -32,6 +32,7 @@ (define-public xxhash (uri (git-reference (url "https://github.com/Cyan4973/xxHash") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks")))) (build-system gnu-build-system) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f02da5460a..52a22ccca5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -621,6 +621,7 @@ (define-public emacs-scribble-mode (uri (git-reference (url "https://github.com/emacs-pe/scribble-mode.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii")))) @@ -4818,6 +4819,7 @@ (define-public emacs-poet-theme (uri (git-reference (url "https://github.com/kunalb/poet.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0a84jdaj619mb59a46dmkk2sfs42rylqk9ryl1drgs8d3lia79mz")))) @@ -8899,6 +8901,7 @@ (define-public emacs-diff-hl (uri (git-reference (url "https://github.com/dgutov/diff-hl") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1xlsg728mz3cwhrsqvisa0aidic67nymd9g7h4c1h3q63j39yb2s")))) @@ -10519,6 +10522,7 @@ (define-public emacs-tiny (uri (git-reference (url "https://github.com/abo-abo/tiny.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1498j392ap2mk4zmsm2id16pfgvj78r428da9vw7hdrzzibai2cx")))) @@ -10574,6 +10578,7 @@ (define-public emacs-make-it-so (uri (git-reference (url "https://github.com/abo-abo/make-it-so") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0p6xhyinzzkrwzbpxqfm8hlii0ikvmmylya240bwsa77w0g1k6xq")))) @@ -10603,6 +10608,7 @@ (define-public emacs-unidecode (uri (git-reference (url "https://github.com/sindikat/unidecode") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn")))) @@ -11449,6 +11455,7 @@ (define-public emacs-exec-path-from-shell (uri (git-reference (url "https://github.com/purcell/exec-path-from-shell") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p")))) @@ -11529,6 +11536,7 @@ (define-public emacs-deft (uri (git-reference (url "https://github.com/jrblevin/deft.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2")))) @@ -11618,6 +11626,7 @@ (define-public emacs-ergoemacs-mode (uri (git-reference (url "https://github.com/ergoemacs/ergoemacs-mode.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l")))) @@ -15177,6 +15186,7 @@ (define-public emacs-gif-screencast (uri (git-reference (url "https://gitlab.com/Ambrevar/emacs-gif-screencast.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "19xqi5mgalnnhb4hw0fh7py2s2dllldx1xxbhwhknkdpifai8hl8")))) @@ -15333,6 +15343,7 @@ (define-public emacs-helm-exwm (uri (git-reference (url "https://github.com/emacs-helm/helm-exwm.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8")))) (build-system emacs-build-system) @@ -15423,6 +15434,7 @@ (define-public emacs-helm-mu (uri (git-reference (url "https://github.com/emacs-helm/helm-mu.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz")))) (build-system emacs-build-system) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 17d959b870..01b3163130 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1986,6 +1986,7 @@ (define-public gpx (uri (git-reference (url "https://github.com/markwal/GPX.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5")))) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2574153cef..c7eed86418 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -617,6 +617,7 @@ (define-public waylandpp (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n")))) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e3b22c13a2..7db6565cb5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1166,6 +1166,7 @@ (define-public go-github-com-sirupsen-logrus (uri (git-reference (url "https://github.com/sirupsen/logrus.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz")))) @@ -3022,6 +3023,7 @@ (define-public go-github-com-shirou-gopsutil (uri (git-reference (url "https://github.com/shirou/gopsutil") (commit commit))) ; XXX + (file-name (git-file-name name version)) (sha256 (base32 "0x1g4r32q4201nr2b754xnrrndmwsrhfr7zg37spya86qrmijnws")))) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a3d2e8fad3..eef102432f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -779,6 +779,7 @@ (define-public jupyter-guile-kernel (uri (git-reference (url "https://github.com/jerry40/guile-kernel") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) @@ -1975,6 +1976,7 @@ (define-public guile-picture-language (uri (git-reference (url "https://git.elephly.net/software/guile-picture-language.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1ydvw9dvssdvlvhh1dr8inyzy2x6m41qgp8hsivca1xysr4gc23a")))) @@ -2005,6 +2007,7 @@ (define-public guile-studio (uri (git-reference (url "https://git.elephly.net/software/guile-studio.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0rxl5gv2mavycwkl33lcwyb3z71j2f4zyzk60k7vl3hzszpr08iq")))) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 51062df7a3..d237a27c4a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -460,6 +460,7 @@ (define-public qview (uri (git-reference (url "https://github.com/jurplel/qView.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5")))) diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm index 6c22f2938d..748ae67b58 100644 --- a/gnu/packages/java-maths.scm +++ b/gnu/packages/java-maths.scm @@ -39,6 +39,7 @@ (define-public java-jblas (uri (git-reference (url "https://github.com/mikiobraun/jblas.git") (commit (string-append "jblas-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0afh48hq8i8li5z11x415c8slwsfrlib0w1xjfbg186mximqvv3g")))) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9a42d4fe07..33a72cf640 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -321,6 +321,7 @@ (define-public libclc (uri (git-reference (url "https://github.com/llvm/llvm-project.git") (commit (string-append "llvmorg-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "052h16wjcnqginzp7ki4il2xmm25v9nyk0wcz7cg03gbryhl7aqa")))) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 1481f5b5ee..7bd29b80ba 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -187,6 +187,7 @@ (define-public spdlog (uri (git-reference (url "https://github.com/gabime/spdlog.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd")))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7984e40382..52896634ef 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1115,6 +1115,7 @@ (define-public ocaml-zarith (uri (git-reference (url "https://github.com/ocaml/Zarith") (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0hv5ywz1q2cgn8apfz490clwk5hcynr937g2v8i13x2ax4bnv0lz")))) @@ -2645,6 +2646,7 @@ (define-public ocaml-cstruct (uri (git-reference (url "https://github.com/mirage/ocaml-cstruct") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0m4bz0digcsc8l2msfikwcbi1y371kccx6xnkwrz212mf5mp98bv")))) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index b934d0c142..75c0092064 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -219,6 +219,7 @@ (define-public libtsm (uri (git-reference (url (string-append "https://github.com/Aetf/" name)) (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx")))) diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm index cb44d355c6..85ac730f3d 100644 --- a/gnu/packages/tigervnc.scm +++ b/gnu/packages/tigervnc.scm @@ -47,6 +47,7 @@ (define-public tigervnc-client (git-reference (url "https://github.com/TigerVNC/tigervnc.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 772e09d5b2..8c24ff92ec 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -737,6 +737,7 @@ (define-public xbanish (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8")))) @@ -1458,6 +1459,7 @@ (define-public xcalib (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr")) -- cgit v1.2.3 From 18a69803e2eea4f7555d6eafb6497a645c2d094f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 04:17:55 +0100 Subject: gnu: libspnav: Fix typo in description. * gnu/packages/engineering.scm (libspnav)[description]: Fix typo. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 01b3163130..ee013994c3 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2407,7 +2407,7 @@ (define-public libspnav Also, libspnav provides a magellan API wrapper on top of the new API. So, any applications that were using the magellan library, can switch to libspnav -without any changes. And programmers that are familliar with the magellan API +without any changes. And programmers that are familiar with the magellan API can continue using it with a free library without the restrictions of the official SDK.") (license license:bsd-3))) -- cgit v1.2.3 From ae5525c59114e54698c3e24e1a672ad333153a96 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 14 Nov 2019 07:37:31 +0000 Subject: gnu: freecad: Update to 0.18.4. * gnu/packages/engineering.scm (freecad): Update to 0.18.4. Signed-off-by: Mathieu Othacehe --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ee013994c3..294105a757 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2204,7 +2204,7 @@ (define-public openscad (define-public freecad (package (name "freecad") - (version "0.18.3") + (version "0.18.4") (source (origin (method git-fetch) @@ -2214,7 +2214,7 @@ (define-public freecad (file-name (git-file-name name version)) (sha256 (base32 - "1ny29y0h8smg1bwi5yn4kcnyfprqh3v7v2z8837cmmhcwp8dr95m")))) + "170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3