about summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2022-03-22 22:00:17 +0100
committerGitHub <noreply@github.com>2022-03-22 22:00:17 +0100
commit9dd3e78f7e4368f96e14deff3d6b2c254831acdd (patch)
treefa8371c8286a980c796e4acc501a1ef6385e3f54 /pkgs/applications/science
parent22bf6be3e06a6c658d679eb0147975190cb837a3 (diff)
parent8171e0a24ebc714937752b1fb74c8f758dd3ab3e (diff)
downloadnixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.tar
nixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.tar.gz
nixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.tar.bz2
nixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.tar.lz
nixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.tar.xz
nixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.tar.zst
nixlib-9dd3e78f7e4368f96e14deff3d6b2c254831acdd.zip
Merge pull request #165194 from q3k/q3k/magic-vlsi-8.7.277
magic-vlsi: 8.3.109 -> 8.3.277
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch19
-rw-r--r--pkgs/applications/science/electronics/magic-vlsi/default.nix5
2 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch
deleted file mode 100644
index 37ae35195503..000000000000
--- a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/database/DBio.c b/database/DBio.c
-index 93c4b0b..292ea5f 100644
---- a/database/DBio.c
-+++ b/database/DBio.c
-@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f)
- 
- #define FPRINTF(f,s)\
- {\
--     if (fprintf(f,s) == EOF) goto ioerror;\
-+     if (fprintf(f,"%s",s) == EOF) goto ioerror;\
-      DBFileOffset += strlen(s);\
- }
- #define FPRINTR(f,s)\
- {\
--     if (fprintf(f,s) == EOF) return 1;\
-+     if (fprintf(f,"%s",s) == EOF) return 1;\
-      DBFileOffset += strlen(s);\
- }
- 
diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix
index 82d8dbd2ddc4..edee5946d946 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.109";
+  version = "8.3.277";
 
   src = fetchurl {
     url    = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
-    sha256 = "sha256-ZK4OF5XwjW1OJmOVUFqLklfpM10eIwCILygqIyjRbEQ=";
+    sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY=";
   };
 
   nativeBuildInputs = [ python3 ];
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./0001-strip-bin-prefix.patch
-    ./0002-fix-format-security.patch
   ];
 
   meta = with lib; {