diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/by-name/nv/nvc/package.nix similarity index 58% rename from pkgs/applications/science/electronics/nvc/default.nix rename to pkgs/by-name/nv/nvc/package.nix index 0ec5dcb683a5..1afeaf9673d9 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -1,27 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, check -, flex -, pkg-config -, which -, elfutils -, libffi -, llvm -, zlib -, zstd +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + check, + flex, + pkg-config, + which, + elfutils, + libffi, + llvm, + zlib, + zstd, + apple-sdk_11, }: stdenv.mkDerivation rec { pname = "nvc"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-EPnHm2bZCui8K/H1a6+pgec3Lrf+zAlFoKYBnLspdQQ="; + hash = "sha256-ppZ6rvSmny4wKCpdlJvvaLOTUn3/hUAiEhEkj33oF3c="; }; nativeBuildInputs = [ @@ -32,14 +34,19 @@ stdenv.mkDerivation rec { which ]; - buildInputs = [ - libffi - llvm - zlib - zstd - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ - elfutils - ]; + buildInputs = + [ + libffi + llvm + zlib + zstd + ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + ]; preConfigure = '' mkdir build diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3db07786cc0f..95f8bcb93ca3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17975,8 +17975,6 @@ with pkgs; withNgshared = false; }; - nvc = darwin.apple_sdk_11_0.callPackage ../applications/science/electronics/nvc { }; - openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; };