diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/electronics')
4 files changed, 9 insertions, 40 deletions
diff --git a/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix b/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix index f6b0ff93fff5..abdb0716f370 100644 --- a/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "csxcad"; - version = "unstable-2022-05-18"; + version = "0.6.3"; src = fetchFromGitHub { owner = "thliebig"; repo = "CSXCAD"; - rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1"; - sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn"; + rev = "v${version}"; + sha256 = "sha256-SSV5ulx3rCJg99I/oOQbqe+gOSs+BfcCo6UkWHVhnSs="; }; patches = [./searchPath.patch ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch b/nixpkgs/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch deleted file mode 100644 index d095eada9d6e..000000000000 --- a/nixpkgs/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/shapely/geos.py b/shapely/geos.py -index 88c5f53..1ccd6e4 100644 ---- a/shapely/geos.py -+++ b/shapely/geos.py -@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -+ '@libgeos_c@', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': - "/usr/local/lib/libgeos_c.dylib", - # homebrew Apple Silicon - "/opt/homebrew/lib/libgeos_c.dylib", -+ "@libgeos_c@", - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index c71da8e..c36262c 100644 ---- a/tests/test_dlls.py -+++ b/tests/test_dlls.py -@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): - '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', -- 'libgeos_c.so']) -+ 'libgeos_c.so', -+ '@libgeos_c@']) diff --git a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index dc4991bf480b..284a0b15830b 100644 --- a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.4"; + version = "1.11.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-f4VjSBoJnsGb8MHKegJDlomPG32DuTgFcyv1w0GxKvA="; + hash = "sha256-95vIyBQ38SGpI+gnDqK1MRRzOT6uiYjDr1c//folqZ8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/electronics/openems/default.nix b/nixpkgs/pkgs/applications/science/electronics/openems/default.nix index 083f01a42881..864b120993d9 100644 --- a/nixpkgs/pkgs/applications/science/electronics/openems/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/openems/default.nix @@ -18,15 +18,15 @@ , hyp2mat }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openems"; - version = "unstable-2020-02-15"; + version = "0.0.36"; src = fetchFromGitHub { owner = "thliebig"; repo = "openEMS"; - rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; - sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; + rev = "v${version}"; + sha256 = "sha256-wdH+Zw7G2ZigzBMX8p3GKdFVx/AhbTNL+P3w+YjI/dc="; }; nativeBuildInputs = [ |