diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-21 00:12:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 00:12:55 +0000 |
| commit | 0c086da2bb82029fd00e80bdc117a37a804fd7ff (patch) | |
| tree | f2ad4cd84caf83c6d9d37174ea078adc779c6d3f /pkgs/development/compilers | |
| parent | 5dcd7819f7803e0bddcb482507cbd7e9b98cf2e3 (diff) | |
| parent | 573729627d74f5592ad7ae38926eb0ecbdee642d (diff) | |
| download | nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.tar nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.tar.gz nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.tar.bz2 nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.tar.lz nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.tar.xz nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.tar.zst nixlib-0c086da2bb82029fd00e80bdc117a37a804fd7ff.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/bfc/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/circt/default.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/development/compilers/bfc/default.nix index f84026d443f2..2ebf02b18138 100644 --- a/pkgs/development/compilers/bfc/default.nix +++ b/pkgs/development/compilers/bfc/default.nix @@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec { env = { LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev; + } // lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; # process didn't exit successfully: <...> SIGSEGV diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 129388005b5a..4c4f69bc74ff 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.58.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE="; + sha256 = "sha256-HsfvLxXyYvzUL+FO/i8iRbyQV8OFF3Cx8/g8/9aJE2M="; fetchSubmodules = true; }; |