diff options
| author | Federico Beffa <beffa@fbengineering.ch> | 2023-12-07 14:30:19 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-12-17 20:55:59 +0000 |
| commit | 20a44fa86515219593f6b4c14c99c15ff6a70531 (patch) | |
| tree | 882e361d98bf6216a2050a8fc54b38356d06dde0 | |
| parent | Merge pull request #275010 from NixOS/backport-272637-to-release-23.11 (diff) | |
| download | nixpkgs-20a44fa86515219593f6b4c14c99c15ff6a70531.tar.gz | |
xyce: 7.6.0 -> 7.7.0
(cherry picked from commit 344d4e77da0abbc482025bd2da7ac069d97aaad0)
| -rw-r--r-- | pkgs/applications/science/electronics/xyce/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 663d6e025c5c..30d8e0b8186d 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -32,21 +32,21 @@ assert withMPI -> trilinos.withMPI; let - version = "7.6.0"; + version = "7.7.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-F0kO86eliD1AfUUjeVllxJ231ZElXkfBfGJ3jhT0s9w="; }; regression_src = fetchFromGitHub { owner = "Xyce"; repo = "Xyce_Regression"; rev = "Release-${version}"; - sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74="; + sha256 = "sha256-iDxm0Vcn3JuuREciCt3/b7q94E8GhXoIUD/BCx0mW6Q="; }; in @@ -154,8 +154,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 |