diff options
Diffstat (limited to 'pkgs/applications/science/electronics')
7 files changed, 85 insertions, 76 deletions
diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index dac6713a495..96a2c9a0489 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -2,11 +2,11 @@ let pname = "diylc"; - version = "4.17.0"; + version = "4.18.0"; files = { app = fetchurl { url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip"; - sha256 = "0cysqkrddhbs7rprm8xm21c286mz4apw66fxakhzlg50kjn0nwjv"; + sha256 = "09fpp3dn086clgnjz5yj4fh5bnjvj6mvxkx9n3zamcwszjmxr40d"; }; icon16 = fetchurl { url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -d $out/share/diylc - ${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc + mkdir -p $out/share/diylc + unzip -UU ${files.app} -d $out/share/diylc rm $out/share/diylc/diylc.exe rm $out/share/diylc/run.sh @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { install -Dm644 ${files.icon32} $out/share/icons/hicolor/32x32/apps/diylc_icon.png install -Dm644 ${files.icon48} $out/share/icons/hicolor/48x48/apps/diylc_icon.png - install -d $out/share/applications + mkdir -p $out/share/applications ln -s ${launcher}/share/applications/* $out/share/applications/ - install -d $out/bin + mkdir -p $out/bin cat <<EOF > $out/bin/diylc #!${bash}/bin/sh cd $out/share/diylc diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 79c01d3ec71..30cbd8f92b5 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,86 +1,75 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config -, qtbase, qtsvg, qttools, qtserialport, boost, libgit2 +{ mkDerivation +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qtbase +, qtsvg +, qttools +, qtserialport +, boost +, libgit2 }: let # build number corresponding to a release, has no further relation # see https://github.com/fritzing/fritzing-app/releases/tag/CD-498 - fritzingBuild = "498"; + # fritzingBuild = "498"; + # version 0.9.6 is properly tagged, hope it continues + # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "e79a69765026f3fda8aab1b3e7a4952c28047a62"; + partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb"; in mkDerivation rec { pname = "fritzing"; - version = "0.9.4-${fritzingBuild}"; + version = "0.9.6"; src = fetchFromGitHub { - owner = "fritzing"; + owner = pname; repo = "fritzing-app"; - rev = "CD-${fritzingBuild}"; - sha256 = "0aljj2wbmm1vd64nhj6lh9qy856pd5avlgydsznya2vylyz20p34"; + rev = version; + sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"; }; parts = fetchFromGitHub { - owner = "fritzing"; + owner = pname; repo = "fritzing-parts"; name = "fritzing-parts"; rev = partsSha; - sha256 = "0spka33a5qq34aq79j01arw1aly4vh0hzv7mahryhdlcdk22qqvc"; + sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs"; }; buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmake pkg-config qttools ]; - patches = [(fetchpatch { - name = "fix-libgit2-version.patch"; - url = "https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079.patch"; - sha256 = "0v1zi609cjnqac80xgnk23n54z08g1lia37hbzfl8jcq9sn9adak"; - })]; - postPatch = '' substituteInPlace phoenix.pro \ --replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false' - substituteInPlace tools/linux_release_script/release.sh \ - --replace 'git status' 'echo >/dev/null' \ - --replace 'git clean' 'echo >/dev/null' \ - --replace 'git clone' 'echo >/dev/null' \ - --replace 'release_folder="' 'release_folder="$out" #' \ - --replace './Fritzing -db' '# run after fixup' - substituteInPlace src/fapplication.cpp \ --replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' - ''; - - buildPhase = '' - bash tools/linux_release_script/release.sh ${version} - ''; - installPhase = '' - rm "$out/Fritzing" # remove script file - mkdir "$out/bin" - mv "$out/lib/Fritzing" "$out/bin/Fritzing" - mkdir --parents "$out/share/applications" "$out/share/metainfo" - mv --target-directory="$out/share/applications" "$out/org.fritzing.Fritzing.desktop" - mv --target-directory="$out/share/metainfo" "$out/org.fritzing.Fritzing.appdata.xml" - cp --recursive --no-target-directory "$parts" "$out/fritzing-parts" + mkdir parts + cp -a ${parts}/* parts/ ''; postFixup = '' # generate the parts.db file - QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" -db "$out/fritzing-parts/parts.db" -pp "$out/fritzing-parts" -folder "$out" + QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \ + -db "$out/share/fritzing/parts/parts.db" \ + -pp "$out/fritzing/parts" \ + -folder "$out/share/fritzing" ''; qmakeFlags = [ "phoenix.pro" ]; - meta = { + meta = with lib; { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.robberer ]; - platforms = lib.platforms.linux; + license = with licenses; [ gpl3 cc-by-sa-30 ]; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index af5441f07e2..b539df7592a 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.109"; + version = "3.3.110"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-NUYezNm4tEcMqnirmo8U7Ky8ye/2MDPY3OWAk+eG3rc="; + sha256 = "sha256-Ku25IVa8ot3SWxODeMrOaxBY5X022TnvD3l2kAa3Wao="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 9848eb58399..596083c2709 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -62,6 +62,7 @@ assert lib.assertMsg (!(stable && (sanitizeAddress || sanitizeThreads))) "Only kicad-unstable(-small) supports address/thread sanitation"; assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; + let inherit (lib) optional optionals; in @@ -81,14 +82,16 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = optionals (withScripting) [ + cmakeFlags = optionals (stable && withScripting) [ "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_PYTHON3=ON" "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" ] - ++ optional (!withScripting) + ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING=OFF" + "-DKICAD_SCRIPTING_WXPYTHON=OFF" + ] ++ optional (withNgspice) "-DKICAD_SPICE=ON" ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" @@ -152,7 +155,10 @@ stdenv.mkDerivation rec { openssl boost ] - ++ optionals (withScripting) [ swig python wxPython ] + # unstable requires swig and python + # wxPython still optional + ++ optionals (withScripting || (!stable)) [ swig python ] + ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCE) opencascade ++ optional (withOCC) opencascade-occt diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index c30c074a5de..ae403d3f733 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,23 +27,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2021-05-16"; + version = "2021-07-12"; src = { - rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06"; - sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72"; + rev = "76a6177eb7fc2efe8b5fd522355e70c44a33b150"; + sha256 = "1a94z29if73cnxjx75vkgasm339dasbrjwbg2zk1c35pfygnwrj5"; }; }; libVersion = { - version = "2021-05-16"; + version = "2021-07-12"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; - symbols.rev = "32de73ea01347a005790119eb4102c550815685c"; - symbols.sha256 = "0gj10v06rkxlxngc40d1sfmlcagy5p7jfxid0lch4w0wxfjmks7z"; + symbols.rev = "a6f64c12c9cdea4cda25cdd2c92708e7eb461d46"; + symbols.sha256 = "0j6ng3ysqlxcggjyq3bsgqzg6j50if74q2dpyrdh5pckfqvvmv20"; templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71"; templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x"; - footprints.rev = "8fa36dfa3423d8777472e3475c1c2b0b2069624f"; - footprints.sha256 = "138xfkr0prxw2djkwc1m4mlp9km99v12sivbqhm1jkq5yxngdbin"; + footprints.rev = "1bacc7562198e2a2985df7f2fbcd7620b4fd0d46"; + footprints.sha256 = "1h17q0xpl4k4klg3mafzsbl88wzrg73xjsh8llyni2jzs531545a"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 9f959bddf2d..af78fc71ebf 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -1,12 +1,25 @@ -{ lib, mkDerivationWith, wrapQtAppsHook, python3Packages, fetchFromGitHub -, qtbase }: +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +}: let - version = "0.3.8"; + python = python3.override { + packageOverrides = self: super: { + scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy"; + }; + doCheck = false; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - -in mkDerivationWith python3Packages.buildPythonApplication { - inherit pname version; + version = "0.3.8"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; @@ -17,9 +30,9 @@ in mkDerivationWith python3Packages.buildPythonApplication { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ cython - scipy_1_4 + scipy pyqt5 pyserial numpy @@ -30,10 +43,11 @@ in mkDerivationWith python3Packages.buildPythonApplication { dontWrapGApps = true; dontWrapQtApps = true; - postFixup = '' - wrapProgram $out/bin/NanoVNASaver \ - "''${gappsWrapperArgs[@]}" \ + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" "''${qtWrapperArgs[@]}" + ) ''; meta = with lib; { diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index acdac346fd3..d2cdf20ab87 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.3"; + version = "3.2.3"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "1n4l8ks5808d99zj1vj0ck0v1lb9s7iv3ahww7ximbf9iha39pbm"; + sha256 = "0hnd3rdmv76dwwlmkykzwhp5sbxd1fr5ss8zdfdybxw28cxlpq8r"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -23,8 +23,8 @@ mkDerivation rec { meta = with lib; { description = "Free software for Hantek and compatible (Voltcraft/Darkwire/Protek/Acetech) USB digital signal oscilloscopes"; - homepage = "https://github.com/OpenHantek/OpenHantek6022"; - license = licenses.gpl3; + homepage = "https://github.com/OpenHantek/OpenHantek6022"; + license = licenses.gpl3; maintainers = with maintainers; [ baracoder ]; platforms = qtbase.meta.platforms; }; |