From 3f327113b25ce34519fe686bd5531ef0efa31e27 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 27 Apr 2022 15:41:46 +0800
Subject: [PATCH] update dependencies, use upstream inkwell

---
 Cargo.lock                | 12 ++++++------
 flake.lock                |  6 +++---
 flake.nix                 |  2 +-
 nac3artiq/Cargo.toml      |  3 +--
 nac3core/Cargo.toml       |  3 +--
 nac3standalone/Cargo.toml |  3 +--
 nix/windows/default.nix   |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b41b8fc..baa96e6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,7 +321,7 @@ dependencies = [
 [[package]]
 name = "inkwell"
 version = "0.1.0"
-source = "git+https://github.com/nbaksalyar/inkwell.git?branch=llvm14#54f9e286279666d40d5f6e2c3fde8a91334a7b63"
+source = "git+https://github.com/TheDan64/inkwell.git#bff378bee02bcbb5bed35f47e9ed69e6642e9188"
 dependencies = [
  "either",
  "inkwell_internals",
@@ -334,7 +334,7 @@ dependencies = [
 [[package]]
 name = "inkwell_internals"
 version = "0.5.0"
-source = "git+https://github.com/nbaksalyar/inkwell.git?branch=llvm14#54f9e286279666d40d5f6e2c3fde8a91334a7b63"
+source = "git+https://github.com/TheDan64/inkwell.git#bff378bee02bcbb5bed35f47e9ed69e6642e9188"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -419,9 +419,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.123"
+version = "0.2.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd"
+checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
 
 [[package]]
 name = "libloading"
@@ -441,9 +441,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "llvm-sys"
-version = "140.0.0"
+version = "140.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edbec78fa56ea7a1ff451683a51b8ecf79a65ca9e88a4be6c4b0a6fc300d2a6"
+checksum = "0cf9ca02e92ab306f5fabb3d8de94951111ec3f59aa1c5ead7365885c2e2609e"
 dependencies = [
  "cc",
  "lazy_static",
diff --git a/flake.lock b/flake.lock
index 2be48add..d8610453 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1650244918,
-        "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=",
+        "lastModified": 1650921206,
+        "narHash": "sha256-RGlfTC2ktqLVw0gBvZeCM//B4ig2CdQJm39sDvm0DBQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca",
+        "rev": "3a9e0f239d80fa134e8fcbdee4dfc793902da37e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2e923844..ceb3f5db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
             cargoLock = {
               lockFile = ./Cargo.lock;
               outputHashes = {
-                "inkwell-0.1.0" = "sha256-THGKoTqQCSusxMukOiksQ9pCnxdIBUO6MH3fiwQjYVA=";
+                "inkwell-0.1.0" = "sha256-TPvmjByjSHs7U8W3oJU+y88IZcuc9WevymwNq6Ip1iA=";
               };
             };
             passthru.cargoLock = cargoLock;
diff --git a/nac3artiq/Cargo.toml b/nac3artiq/Cargo.toml
index d4bd8095..794cc28d 100644
--- a/nac3artiq/Cargo.toml
+++ b/nac3artiq/Cargo.toml
@@ -16,8 +16,7 @@ nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
 
 [dependencies.inkwell]
-git = "https://github.com/nbaksalyar/inkwell.git"
-branch = "llvm14"
+git = "https://github.com/TheDan64/inkwell.git"
 default-features = false
 features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 
diff --git a/nac3core/Cargo.toml b/nac3core/Cargo.toml
index 17264dea..ec4cd3c1 100644
--- a/nac3core/Cargo.toml
+++ b/nac3core/Cargo.toml
@@ -12,8 +12,7 @@ rayon = "1.5.1"
 nac3parser = { path = "../nac3parser" }
 
 [dependencies.inkwell]
-git = "https://github.com/nbaksalyar/inkwell.git"
-branch = "llvm14"
+git = "https://github.com/TheDan64/inkwell.git"
 default-features = false
 features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 
diff --git a/nac3standalone/Cargo.toml b/nac3standalone/Cargo.toml
index d3943ecb..a4cef423 100644
--- a/nac3standalone/Cargo.toml
+++ b/nac3standalone/Cargo.toml
@@ -10,7 +10,6 @@ nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
 
 [dependencies.inkwell]
-git = "https://github.com/nbaksalyar/inkwell.git"
-branch = "llvm14"
+git = "https://github.com/TheDan64/inkwell.git"
 default-features = false
 features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
diff --git a/nix/windows/default.nix b/nix/windows/default.nix
index 31912f49..1e3aa827 100644
--- a/nix/windows/default.nix
+++ b/nix/windows/default.nix
@@ -83,7 +83,7 @@ in rec {
     cargoLock = {
       lockFile = ../../Cargo.lock;
       outputHashes = {
-        "inkwell-0.1.0" = "sha256-THGKoTqQCSusxMukOiksQ9pCnxdIBUO6MH3fiwQjYVA=";
+        "inkwell-0.1.0" = "sha256-TPvmjByjSHs7U8W3oJU+y88IZcuc9WevymwNq6Ip1iA=";
       };
     };
     nativeBuildInputs = [ pkgs.wineWowPackages.stable ];