diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/electronics')
8 files changed, 129 insertions, 52 deletions
diff --git a/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix index f016b53d553c..9d643c6eda3c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix @@ -1,18 +1,18 @@ -{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake -, libzip, boost, fftw, qtbase, libusb1 +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook +, libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1 , python3, fetchpatch }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "dsview"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q="; + sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM="; }; patches = [ @@ -20,10 +20,10 @@ mkDerivation rec { ./install.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - boost fftw qtbase libusb1 libzip + boost fftw qtbase qtwayland qtsvg libusb1 libzip python3 ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index 276c59aee7d5..3259f0f4ca95 100644 --- a/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.115"; + version = "3.3.117"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-rbenwCsYygg1oGS2cvbNxR+HXEVLAYmnQ/LOi5HmSqU="; + sha256 = "sha256-PPFTdYapEcuwYBr4+hjPbacIyKFKcfac48uRGOhXHbk="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "VCD/Waveform viewer for Unix and Win32"; homepage = "https://gtkwave.sourceforge.net"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ thoughtpolice jiegec ]; + maintainers = with lib.maintainers; [ thoughtpolice jiegec jleightcap ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 8bfd4681f785..9c98d7302f2b 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "7.0.6"; + version = "7.0.7"; src = { - rev = "c1a1259ded090202d87d49f4eb4e42f367764622"; - sha256 = "1bifg73id0grn37a4n5wpq440z9xz14q0fvkva5vajx0xfd34llv"; + rev = "dc7665e950aa0d42de36e928af48be3b060ba5d1"; + sha256 = "1xbzf29rhqh6kl0vggdn2dblgp927096fc1lr3y4yw63b8n0qq50"; }; }; libVersion = { - version = "7.0.6"; + version = "7.0.7"; libSources = { - symbols.rev = "b591556d93f52d3394b45f3f4c7d1b89f0caacc7"; - symbols.sha256 = "0p60dvig7xx8svzsgp871r0aix2m95bmzg3snz372nmgnza2nnvf"; - templates.rev = "39d8fccb7400713f3f917799d8b770ad3e786963"; + symbols.rev = "c7df225d1c79b3ea842c77d928ce1f9bc1a63c5b"; + symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"; + templates.rev = "1561dd81d116a661a17147c3b941a3e96335eecc"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "5fca0686ef0d6c4a9eafb307e346c7b9444e8045"; - footprints.sha256 = "0fqnviaxsai0xwyq8xq5ks26j4vd390ns6h6lr0fx2ikv1ghaml5"; - packages3d.rev = "6acf40ee68422ea952c3ba8078bbe4cc05d64bff"; - packages3d.sha256 = "0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8"; + footprints.rev = "ecb85886616b7a6bb957699037f6fb680ce01d30"; + footprints.sha256 = "0xnnivlqgcyaz9qay73p43jnvmvshp2b3fbh3569j7rmgi5pn8x0"; + packages3d.rev = "4fb0672db1d405b661d0cde8edb5d54ac0a95fc7"; + packages3d.sha256 = "141r5wd8s1bgyf77kvb9q14cpsiwwv4zmfzwbgcd42rflsk2lcbc"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2023-06-24"; + version = "2023-08-15"; src = { - rev = "1c1849ec1a6614247abe4c623c086def2b3192e0"; - sha256 = "0faf4fw7nrfwdrl4pjqdyfzqbvb9jd4nk4aq83v1w358yqyk7zg9"; + rev = "e0d4cf2d5b023a7e5b70d854452376aa3510acd8"; + sha256 = "0666j4q3vz24smcjw9m4ib3ca2dqiqgx2amhv7ys4rzqb6v2pvn2"; }; }; libVersion = { - version = "2023-06-24"; + version = "2023-08-15"; libSources = { - symbols.rev = "43456780d309682f6da4a6f14710355b06fc4c5d"; - symbols.sha256 = "1ql2w3q3dv13ascw8s0hzwda486763qma7i2m877jw3p78gjhldr"; + symbols.rev = "06d20a4b9f7e5375329194d141b096dcdcb7518a"; + symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "6a59a2d3940dbab7b3e8254a5b9bf06cc5330301"; - footprints.sha256 = "0jlz0ln9vzj1av1fmw8ma8kfqlb8w0r9vrfng19bkc3cgh9lvh9x"; - packages3d.rev = "8a2c5c4c85457832f3320902456d066d29561806"; - packages3d.sha256 = "0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8"; + footprints.rev = "5d2ac73ae72bfe8b8ee9eeb081a7851b2ca84c24"; + footprints.sha256 = "1qg016ysf0ddm3bd5bkjawlrc0z4r3zhmdjkqkwaaaydnpwp23qz"; + packages3d.rev = "f1dae9f95e59216f3b974f585e5b420db853da9e"; + packages3d.sha256 = "0ciri6lhnh0w9i00z167snj5acnjndi1rgmyls08p45zj4rma8y2"; }; }; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/linux-gpib/common.nix b/nixpkgs/pkgs/applications/science/electronics/linux-gpib/common.nix new file mode 100644 index 000000000000..e87751a18860 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/linux-gpib/common.nix @@ -0,0 +1,24 @@ +{ pname, fetchurl, lib }: rec { + version = "4.3.6"; + inherit pname; + + src = fetchurl { + url = "mirror://sourceforge/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/${version}/linux-gpib-${version}.tar.gz"; + hash = "sha256-Gze4xrvkhEgn+J5Jhrycezjp2uhlD1v6aX0WGv4J2Jg="; + }; + + unpackPhase = '' + tar xf $src + tar xf linux-gpib-${version}/${pname}-${version}.tar.gz + ''; + + sourceRoot = "${pname}-${version}"; + + meta = with lib; { + description = "Support package for GPIB (IEEE 488) hardware"; + homepage = "https://linux-gpib.sourceforge.io/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fsagbuya ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/science/electronics/linux-gpib/kernel.nix b/nixpkgs/pkgs/applications/science/electronics/linux-gpib/kernel.nix new file mode 100644 index 000000000000..d64e2fc81fbd --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/linux-gpib/kernel.nix @@ -0,0 +1,23 @@ +{ lib +, stdenv +, fetchurl +, kernel +, pahole +}: + +stdenv.mkDerivation (import ./common.nix { inherit fetchurl lib; pname = "linux-gpib-kernel"; } // { + + postPatch = '' + sed -i 's@/sbin/depmod -A@@g' Makefile + ''; + + buildInputs = [ pahole ] ++ kernel.moduleBuildDependencies; + + makeFlags = [ + "LINUX_SRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installFlags = [ + "INSTALL_MOD_PATH=$(out)" + ]; +}) diff --git a/nixpkgs/pkgs/applications/science/electronics/linux-gpib/user.nix b/nixpkgs/pkgs/applications/science/electronics/linux-gpib/user.nix new file mode 100644 index 000000000000..f9c9a2e1e6cb --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/linux-gpib/user.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, libtool +, bison +, flex +, automake +}: + +stdenv.mkDerivation (import ./common.nix { inherit fetchurl lib; pname = "linux-gpib-user"; } // { + + nativeBuildInputs = [ + autoconf + libtool + bison + flex + automake + ]; + + configureFlags = [ + "--sysconfdir=$(out)/etc" + "--prefix=$(out)" + ]; +}) diff --git a/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix b/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix index f5ecbac9e852..b6e5d89a3e97 100644 --- a/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.3.2.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "sha256-0k9Q60+T28m1hPYf5viSdpt0s4d828lfjVo3GjLDm7c="; + sha256 = "sha256-y2pNLAa0P/r0YEdKjQ3iP66cqtTWERG8lTOZDR64WTk="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index 06872eae740f..4709065e45bd 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -31,27 +31,32 @@ assert withMPI -> trilinos.withMPI; +let + version = "7.6.0"; + + # useing fetchurl or fetchFromGitHub doesn't include the manuals + # due to .gitattributes files + xyce_src = fetchgit { + url = "https://github.com/Xyce/Xyce.git"; + rev = "Release-${version}"; + sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw="; + }; + + regression_src = fetchFromGitHub { + owner = "Xyce"; + repo = "Xyce_Regression"; + rev = "Release-${version}"; + sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74="; + }; +in + stdenv.mkDerivation rec { pname = "xyce"; - version = "7.6.0"; + inherit version; - srcs = [ - # useing fetchurl or fetchFromGitHub doesn't include the manuals - # due to .gitattributes files - (fetchgit { - url = "https://github.com/Xyce/Xyce.git"; - rev = "Release-${version}"; - sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw="; - }) - (fetchFromGitHub { - owner = "Xyce"; - repo = "Xyce_Regression"; - rev = "Release-${version}"; - sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74="; - }) - ]; + srcs = [ xyce_src regression_src ]; - sourceRoot = "./Xyce"; + sourceRoot = "./${xyce_src.name}"; preConfigure = "./bootstrap"; @@ -101,7 +106,7 @@ stdenv.mkDerivation rec { doCheck = enableTests; postPatch = '' - pushd ../source + pushd ../${regression_src.name} find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \; # some tests generate new files, some overwrite netlists find . -type d -exec chmod u+w {} \; @@ -124,7 +129,7 @@ stdenv.mkDerivation rec { checkPhase = '' XYCE_BINARY="$(pwd)/src/Xyce" EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY" - TEST_ROOT="$(pwd)/../source" + TEST_ROOT="$(pwd)/../${regression_src.name}" # Honor the TMP variable sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh |