diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
| commit | ff42d23313880d627c7dea5addf744db4562dee5 (patch) | |
| tree | c9b37f000821c6e8e2e39d983ce8ea25a56e949c /pkgs/development/compilers/ghcjs/8.10/default.nix | |
| parent | 798690dc6b55c17705f9f2faab07d5b86b6d50d4 (diff) | |
| parent | 9ea3a3cfaa995c201b68c1cd3877bd35e1d7dd04 (diff) | |
| download | nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.gz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.bz2 nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.lz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.xz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.zst nixlib-ff42d23313880d627c7dea5addf744db4562dee5.zip | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/dbt-core/default.nix pkgs/development/python-modules/dbt-semantic-interfaces/default.nix Still broken by pydantic 2 bump, though.
Diffstat (limited to 'pkgs/development/compilers/ghcjs/8.10/default.nix')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/8.10/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 78d757efee3c..4363dc32c21e 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -47,6 +47,7 @@ let inherit (bootGhcjs) version; isGhcjs = true; + llvmPackages = null; enableShared = true; socket-io = pkgsHostHost.nodePackages."socket.io"; |