diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/science/electronics')
19 files changed, 207 insertions, 176 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix index d2b7c0d66a15..c2d7cefec9b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -27,7 +27,6 @@ mkDerivation { nativeBuildInputs = [ cmake - wrapQtAppsHook ]; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix index 4d3acb331d5d..e61017ea330d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, -libzip, boost, fftw, qtbase, -libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl +{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl +, libsigrokdecode4dsl, python3, fetchpatch }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "dsview"; - version = "0.99"; + version = "1.12"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; - rev = version; - sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2"; + rev = "v${version}"; + sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U="; }; - postUnpack = '' - export sourceRoot=$sourceRoot/DSView - ''; + sourceRoot = "source/DSView"; patches = [ # Fix absolute install paths ./install.patch + + # Fix buld with Qt5.15 already merged upstream for future release + # Using local file instead of content of commit #33e3d896a47 because + # sourceRoot make it unappliable + ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + python3 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; + maintainers = with maintainers; [ bachp ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch index e30a28d80fa3..75c3e9628656 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch @@ -2,10 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c1c33e1..208a184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) - install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) - install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) - install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) +@@ -427,8 +427,8 @@ + install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) + install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) + install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/) +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/qt515.patch b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/qt515.patch new file mode 100644 index 000000000000..552f2062ec57 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/dsview/qt515.patch @@ -0,0 +1,13 @@ +diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp +index 921d3db..16cdce9 100755 +--- a/pv/view/viewport.cpp ++++ b/pv/view/viewport.cpp +@@ -37,7 +37,7 @@ + + #include <QMouseEvent> + #include <QStyleOption> +- ++#include <QPainterPath> + + #include <math.h> + diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix index 360c6df7fe60..b8a80c5e9c11 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromBitbucket { owner = "jpcgt"; - repo = "${pname}"; + repo = pname; rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index 36cc19142d19..ad5e9e55c575 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.106"; + version = "3.3.107"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "0ma53s27735x16dq5qi91kvlypkiwkxh2jhw0gziyccnk1mkdsji"; + sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index 3b6a4c7b7383..6b9f07ee68f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "0b1bi99xdhbkb2vdb9y6kyqm0h8y0q168jf2xi8kd0z7kww8li2p"; + sha256 = "13c4p60vrmwmnrv2jcr2gc1cxnimy7j8yp1p6434pbbk2py9k8mx"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 3d83e905103b..7f11f483a9d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -55,17 +55,6 @@ stdenv.mkDerivation rec { src = kicadSrc; - # quick fix for #72248 - # should be removed if a a more permanent fix is published - patches = [ - ( - fetchpatch { - url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch"; - sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd"; - } - ) - ]; - # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 7290503311d3..48a5779d207a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -212,11 +212,10 @@ stdenv.mkDerivation rec { # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # kicad-ogltest's source seems to indicate that crashing is expected behaviour... installPhase = let tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; - utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; in (concatStringsSep "\n" (flatten [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh index 8c154c302c84..cfd78323b77a 100755 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh @@ -110,7 +110,7 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 @@ -130,7 +130,7 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 @@ -146,7 +146,7 @@ for version in "${all_versions[@]}"; do url="${gitlab}/libraries/kicad-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 1afb33b6fbd8..9f00f3fa8ba8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,49 +3,49 @@ { "kicad" = { kicadVersion = { - version = "5.1.6"; + version = "5.1.8"; src = { - rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; - sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; + rev = "db9833491010954bc27fac92c83d2864bd95c23c"; + sha256 = "08ni9j2lw2hjc1csk6rkydcxwdal6da17ch60zkjij5vfsif2hix"; }; }; libVersion = { - version = "5.1.6"; + version = "5.1.8"; libSources = { - i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; - i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; - symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; - symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; - templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; - templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; - footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; - packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; - packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; + i18n.rev = "78adcd19e7ed53f4889d6db65a33dd8ec2d323e9"; + i18n.sha256 = "0x0w2m6d3xfm22y4anp5j2j67iwzby149ynj6qjlw2kcsi8kwk1j"; + symbols.rev = "bf475af94877e8fd9cf80e667578ff61835e02bb"; + symbols.sha256 = "1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3"; + templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; + templates.sha256 = "1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs"; + footprints.rev = "302ac78bac21825532f970fb92714fa5973ad79b"; + footprints.sha256 = "0gyqxryda273hjn2rv8dha461j9bjh054y5dlpiw1wiha65lrf9i"; + packages3d.rev = "7abe02f30fd79b8f4f66c01589861df7f8f72f04"; + packages3d.sha256 = "1szcin52fcsyb55bj7xq7lz6ig187dpz3lk7blwab7b9c4dn3c3y"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2020-10-09"; + version = "2020-12-01"; src = { - rev = "560428a70f0196fb4ade620042c5ddefc1685ebe"; - sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka"; + rev = "3c521942ed52e83482c82d426170b4fbf327f846"; + sha256 = "sha256:09qab69sy3n44kjlzxxx7gbksyr1kg8n14kz0zf8n71zfcqagci4"; }; }; libVersion = { - version = "2020-10-09"; + version = "2020-12-01"; libSources = { - i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549"; - i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf"; - symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d"; - symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k"; - templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af"; - templates.sha256 = "0xxfkpsgbnafmpaxpz1747zn7fhqp0kfl32rzjrx4vzxyp25q805"; - footprints.rev = "50015af7e603cc499199c7e1c6daa7c85dd732ae"; - footprints.sha256 = "16bic67klbj7sgj7cab8ha2fg3ypp9ap82gxkn6ijvpl7dka8bhb"; - packages3d.rev = "df0dc0074491bb665b2c3ce569cbd4aa16118ad6"; - packages3d.sha256 = "027jlcp9fpryldjkcxhb1b5bpwqna9kl6r0lnkd86x238kj3rd8v"; + i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; + i18n.sha256 = "sha256:04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; + symbols.rev = "e538abb015b4f289910a6f26b2f1b9cb8bf2efdb"; + symbols.sha256 = "sha256:117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; + templates.rev = "32a4f6fab863976fdcfa232e3e08fdcf3323a954"; + templates.sha256 = "sha256:13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; + footprints.rev = "15ffd67e01257d4d8134dbd6708cb58977eeccbe"; + footprints.sha256 = "sha256:1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; + packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; + packages3d.sha256 = "sha256:0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index de01b095e381..4b0a4108ab22 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,39 +1,47 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitHub +, qtbase, qttools, qmake, wrapQtAppsHook +}: -mkDerivation { +stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { - owner = "LibrePCB"; - repo = "LibrePCB"; + owner = pname; + repo = pname; + rev = version; + sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx"; fetchSubmodules = true; - rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535"; - sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; - buildInputs = [ qtbase ]; qmakeFlags = ["-r"]; + enableParallelBuilding = true; postInstall = '' - mkdir -p $out/share/librepcb/fontobene - cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ - ''; + mkdir -p $out/share/librepcb/fontobene + cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ + ''; + + # the build system tries to use 'git' at build time to find the HEAD hash. + # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment + # at the end of the line to remove the git call. + patchPhase = '' + substituteInPlace ./libs/librepcb/common/common.pro \ + --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' + ''; preFixup = '' wrapQtApp $out/bin/librepcb ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A free EDA software to develop printed circuit boards"; - homepage = "https://librepcb.org/"; - maintainers = with maintainers; [ luz ]; - license = licenses.gpl3; - platforms = platforms.linux; + homepage = "https://librepcb.org/"; + maintainers = with maintainers; [ luz thoughtpolice ]; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix index 96849c300298..6667f2be9c3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: +{ stdenv, fetchurl +, m4, tcsh, libX11, tcl, tk +, cairo, ncurses, mesa_glu, python3 +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.5"; + version = "8.3.80"; src = fetchurl { - url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; - sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; + sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j"; }; buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; nativeBuildInputs = [ python3 ]; + enableParallelBuilding = true; configureFlags = [ "--with-tcl=${tcl}" @@ -22,6 +26,8 @@ stdenv.mkDerivation { patchShebangs scripts/* ''; + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + patches = [ ./0001-strip-bin-prefix.patch ./0002-fix-format-security.patch @@ -29,8 +35,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VLSI layout tool written in Tcl"; - homepage = "http://opencircuitdesign.com/magic/"; - license = licenses.mit; - maintainers = [ maintainers.anna328p ]; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = with maintainers; [ anna328p thoughtpolice ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix new file mode 100644 index 000000000000..62bda91e5008 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -0,0 +1,51 @@ +{ lib, mkDerivationWith, wrapQtAppsHook, python3Packages, fetchFromGitHub +, qtbase }: + +let + version = "0.3.7"; + pname = "nanovna-saver"; + +in mkDerivationWith python3Packages.buildPythonApplication { + inherit pname version; + + src = fetchFromGitHub { + owner = "NanoVNA-Saver"; + repo = pname; + rev = "v${version}"; + sha256 = "0c22ckyypg91gfb2sdc684msw28nnb6r8cq3b362gafvv00a35mi"; + }; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + propagatedBuildInputs = with python3Packages; [ + cython + scipy_1_4 + pyqt5 + pyserial + numpy + ]; + + doCheck = false; + + dontWrapGApps = true; + dontWrapQtApps = true; + + postFixup = '' + wrapProgram $out/bin/NanoVNASaver \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" + ''; + + meta = with lib; { + homepage = "https://github.com/NanoVNA-Saver/nanovna-saver"; + description = + "A tool for reading, displaying and saving data from the NanoVNA"; + longDescription = '' + A multiplatform tool to save Touchstone files from the NanoVNA, sweep + frequency spans in segments to gain more than 101 data points, and + generally display and analyze the resulting data. + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zaninime ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix index ab2861d53f20..5113dc778f62 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "32"; + version = "33"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wiys30c9mqzxr7iv1sws0jnn4xi0mj3lanhnk2qfvaiji70rn9w"; + sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; }; nativeBuildInputs = [ flex bison ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix index ad8fa3c7a7ae..acdac346fd3b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03"; + sha256 = "1n4l8ks5808d99zj1vj0ck0v1lb9s7iv3ahww7ximbf9iha39pbm"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/qcsxcad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/qcsxcad/default.nix deleted file mode 100644 index c12678c0047d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/qcsxcad/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, csxcad -, tinyxml -, vtkWithQt5 -, wrapQtAppsHook -, qtbase -}: - -mkDerivation { - pname = "qcsxcad"; - version = "unstable-2020-01-04"; - - src = fetchFromGitHub { - owner = "thliebig"; - repo = "QCSXCAD"; - rev = "0dabbaf2bc1190adec300871cf309791af842c8e"; - sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCSXCAD_ROOT_DIR=${csxcad}" - "-DENABLE_RPATH=OFF" - ]; - - buildInputs = [ - csxcad - tinyxml - vtkWithQt5 - qtbase - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Qt library for CSXCAD"; - homepage = "https://github.com/thliebig/QCSXCAD"; - license = licenses.gpl3; - maintainers = with maintainers; [ matthuszagh ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix index df1ce7b7235f..6217df2db8f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix @@ -1,43 +1,45 @@ -{ stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses -, bzip2, zlib -# Test inputs +{ stdenv +, fetchFromGitHub +, autoconf +, bison +, bzip2 +, flex +, gperf +, ncurses , perl +, readline +, zlib }: let iverilog-test = fetchFromGitHub { - owner = "steveicarus"; - repo = "ivtest"; - rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c"; - sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x"; + owner = "steveicarus"; + repo = "ivtest"; + rev = "253609b89576355b3bef2f91e90db62223ecf2be"; + sha256 = "18i7jlr2csp7mplcrwjhllwvb6w3v7x7mnx7vdw48nd3g5scrydx"; }; in stdenv.mkDerivation rec { - pname = "iverilog"; - version = "unstable-2020-08-24"; + pname = "iverilog"; + version = "11.0"; src = fetchFromGitHub { - owner = "steveicarus"; - repo = pname; - rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd"; - sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs="; + owner = "steveicarus"; + repo = pname; + rev = "v${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ autoconf bison flex gperf ]; - preConfigure = '' - chmod +x $PWD/autoconf.sh - $PWD/autoconf.sh - ''; + buildInputs = [ bzip2 ncurses readline zlib ]; - nativeBuildInputs = [ autoconf gperf flex bison ]; + preConfigure = "sh autoconf.sh"; + + enableParallelBuilding = true; - buildInputs = [ readline ncurses bzip2 zlib ]; + doCheck = true; - # tests from .travis.yml - doCheck = true; # runs ``make check`` - # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64. - doInstallCheck = !stdenv.isAarch64; installCheckInputs = [ perl ]; installCheckPhase = '' @@ -58,9 +60,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - homepage = "http://iverilog.icarus.com/"; - license = with licenses; [ gpl2Plus lgpl21Plus] ; - maintainers = with maintainers; [ winden ]; - platforms = platforms.all; + homepage = "http://iverilog.icarus.com/"; # https does not work + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ winden thoughtpolice ]; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix index 43dfdcabd02f..be9e890fc8d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , bison , flex , verilog @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; }; + patches = stdenv.lib.optionals (!stdenv.isAarch64) [ + # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 + # for some strange reason, this is not needed for aarch64 + (fetchpatch { + url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch"; + sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf"; + }) + ]; + nativeBuildInputs = [ bison flex |