Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 06bed5356901
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b21541772e4
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 27, 2020

  1. magic-vlsi: init at 8.3.5

    @anna328p
    anna328p committed Apr 27, 2020
    Copy the full SHA
    69f54c1 View commit details

Commits on May 2, 2020

  1. Merge pull request #86101 from dkudriavtsev/magic-vlsi 

    magic-vlsi: init at 8.3.5
    @bhipple
    bhipple authored May 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b21541 View commit details
10 changes: 10 additions & 0 deletions pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/scripts/makedbh b/scripts/makedbh
index 01e4fa5..d6299c6 100755
--- a/scripts/makedbh
+++ b/scripts/makedbh
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/usr/bin/env tcsh
#
# makes the "database.h" (1st argument, $1) file from "database.h.in"
# (2nd argument, $2), setting various mask operation definitions
19 changes: 19 additions & 0 deletions pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
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);\
}

36 changes: 36 additions & 0 deletions pkgs/applications/science/electronics/magic-vlsi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }:

stdenv.mkDerivation {
pname = "magic-vlsi";
version = "8.3.5";

src = fetchurl {
url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz";
sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq";
};

buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ];
nativeBuildInputs = [ python3 ];

configureFlags = [
"--with-tcl=${tcl}"
"--with-tk=${tk}"
"--disable-werror"
];

postPatch = ''
patchShebangs scripts/*
'';

patches = [
./0001-strip-bin-prefix.patch
./0002-fix-format-security.patch
];

meta = with stdenv.lib; {
description = "VLSI layout tool written in Tcl";
homepage = "http://opencircuitdesign.com/magic/";
license = licenses.mit;
maintainers = [ maintainers.dkudriavtsev ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3066,6 +3066,8 @@ in

kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };

magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { };

mcrcon = callPackage ../tools/networking/mcrcon {};

rage = callPackage ../tools/security/rage {