diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
| commit | 74d102ce50f5d71e193a27b899e96739dadeed2f (patch) | |
| tree | 333dadf38ed34c5d783422b0d6b9f0c03a2b4a58 /pkgs/applications/science | |
| parent | 2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1 (diff) | |
| parent | 12c5150ee5702e3d87049e88f58f35cc88e0dccf (diff) | |
| download | nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.gz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.bz2 nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.lz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.xz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.zst nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch | 10 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/magic-vlsi/default.nix | 8 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch deleted file mode 100644 index 1cef96ea140..00000000000 --- a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index fc68969bd49..623f0897a7c 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.277"; + version = "8.3.446"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY="; + sha256 = "sha256-Isg8KAHicfTIETTmYoGsCYWt4+sLWdR+pGLaxu11Fe4="; }; nativeBuildInputs = [ python3 ]; @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; - patches = [ - ./0001-strip-bin-prefix.patch - ]; - meta = with lib; { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; |