diff options
author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-11-13 14:31:51 -0600 |
---|---|---|
committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-11-13 14:31:51 -0600 |
commit | 884449105ea418fb8d205c0e1cd37a32b49c18db (patch) | |
tree | 20dce878c7b27691383a4da487379b4a04eb81ba /pkgs/applications/science | |
parent | c1eb661271bf5c3e0baa7b32ebd9d455883d95d0 (diff) | |
parent | 5c6e85ee472d37c904dd43f8f76b680602b9128f (diff) | |
download | nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.gz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.bz2 nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.lz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.xz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.zst nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/electronics/magic-vlsi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/physics/xnec2c/default.nix | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 623f0897a7c..c816b356267 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.446"; + version = "8.3.447"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-Isg8KAHicfTIETTmYoGsCYWt4+sLWdR+pGLaxu11Fe4="; + sha256 = "sha256-t/gJ43VIdBIiozLfqaTy7tJsXK674gWBbW1aPHKEj3U="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix index 47fb7cf61df..87daa8cac85 100644 --- a/pkgs/applications/science/physics/xnec2c/default.nix +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , autoreconfHook +, wrapGAppsHook , pkg-config , which , gtk3 @@ -20,7 +21,12 @@ stdenv.mkDerivation rec { hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; }; - nativeBuildInputs = [ autoreconfHook pkg-config which ]; + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + pkg-config + which + ]; buildInputs = [ gtk3 blas lapack ]; meta = with lib; { |