From 7c5948b7f99f1cd23e9c074976653e20baa0da45 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 24 Nov 2024 12:51:40 +0100
Subject: [PATCH 1/3] nvc: move to pkgs/by-name

---
 .../electronics/nvc/default.nix => by-name/nv/nvc/package.nix} | 3 +++
 pkgs/top-level/all-packages.nix                                | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/{applications/science/electronics/nvc/default.nix => by-name/nv/nvc/package.nix} (92%)

diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/by-name/nv/nvc/package.nix
similarity index 92%
rename from pkgs/applications/science/electronics/nvc/default.nix
rename to pkgs/by-name/nv/nvc/package.nix
index 0ec5dcb683a5..7f865f6af2f0 100644
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -11,6 +11,7 @@
 , llvm
 , zlib
 , zstd
+, apple-sdk_11
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +40,8 @@ stdenv.mkDerivation rec {
     zstd
   ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
     elfutils
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df20c08d69d0..0e6b43d2b8f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18030,8 +18030,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;
   };

From 4f1da3ec5e74be151e62a3a748e392f6d4b80c71 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 24 Nov 2024 12:52:08 +0100
Subject: [PATCH 2/3] nvc: reformat

---
 pkgs/by-name/nv/nvc/package.nix | 52 ++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 7f865f6af2f0..56677784e467 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -1,17 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, check
-, flex
-, pkg-config
-, which
-, elfutils
-, libffi
-, llvm
-, zlib
-, zstd
-, apple-sdk_11
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  check,
+  flex,
+  pkg-config,
+  which,
+  elfutils,
+  libffi,
+  llvm,
+  zlib,
+  zstd,
+  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -33,16 +34,19 @@ stdenv.mkDerivation rec {
     which
   ];
 
-  buildInputs = [
-    libffi
-    llvm
-    zlib
-    zstd
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-    elfutils
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
+  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

From 2acfd434f46f1d81c7adcabd53ecf21148e4ee40 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 24 Nov 2024 13:01:40 +0100
Subject: [PATCH 3/3] nvc: 1.14.1 -> 1.14.2

---
 pkgs/by-name/nv/nvc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 56677784e467..1afeaf9673d9 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -17,13 +17,13 @@
 
 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 = [