diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/electronics')
5 files changed, 18 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix b/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix index abdb0716f370..83ee992f4b28 100644 --- a/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix @@ -4,7 +4,7 @@ , fparser , tinyxml , hdf5 -, cgal_5 +, cgal , vtk , boost , gmp @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [./searchPath.patch ]; buildInputs = [ - cgal_5 + cgal boost gmp mpfr diff --git a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix index 8d28e4da0f14..2e4ef8003d15 100644 --- a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.449"; + version = "8.3.454"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-y0+HS1LkIFwcgDbHEvs5SXJY2b340RDT7KVupp+ZX9Y="; + sha256 = "sha256-nHZJ2L54J2x+H7S29TeGPInTgjEhRFv3h2ki0ccGYB0="; }; nativeBuildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index 284a0b15830b..a6f2c9d44731 100644 --- a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-95vIyBQ38SGpI+gnDqK1MRRzOT6uiYjDr1c//folqZ8="; + hash = "sha256-aBH3TtPFuJXtVvGTJcGJev5DYVwqjUAM9cf5PatJq9Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/electronics/picoscope/default.nix b/nixpkgs/pkgs/applications/science/electronics/picoscope/default.nix index 596f220242bb..c7242117b68c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/picoscope/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/picoscope/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0 -, glib, libusb1 , zlib, gtk3-x11, callPackage +, glib, libusb1 , zlib, gtk3-x11, callPackage, writeTextDir , scopes ? [ "picocv" "ps2000" @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { # services.udev.packages = [ pkgs.picoscope.rules ]; # users.groups.pico = {}; # users.users.you.extraGroups = [ "pico" ]; - passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" '' + passthru.rules = writeTextDir "lib/udev/rules.d/95-pico.rules" '' SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" ''; diff --git a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index 663d6e025c5c..93c155038a22 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -32,21 +32,21 @@ assert withMPI -> trilinos.withMPI; let - version = "7.6.0"; + version = "7.8.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="; + sha256 = "sha256-+aNy2bGuFQ517FZUvU0YqN0gmChRpVuFEmFGTCx9AgY="; }; regression_src = fetchFromGitHub { owner = "Xyce"; repo = "Xyce_Regression"; rev = "Release-${version}"; - sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74="; + sha256 = "sha256-Fxi/NpXXIw/bseWaLi2iQ4sg4S9Z+othGgSvQoxyJ9c="; }; in @@ -82,11 +82,13 @@ stdenv.mkDerivation rec { libtool_2 ] ++ lib.optionals enableDocs [ (texliveMedium.withPackages (ps: with ps; [ + enumitem koma-script optional framed enumitem multirow + newtx preprint ])) ]; @@ -154,8 +156,11 @@ stdenv.mkDerivation rec { "doc/Reference_Guide/Xyce_RG" "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}") - # Release notes refer to an image not in the repo. - sed -i -E 's/\\includegraphics\[height=(0.5in)\]\{snllineblubrd\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/' ''${docFiles[2]}.tex + # SANDIA LaTeX class and some organization logos are not publicly available see + # https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ + for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do + sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex + done install -d $doc/share/doc/${pname}-${version}/ for d in ''${docFiles[@]}; do |