diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-17 07:18:11 +0000 |
|---|---|---|
| committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-17 07:18:11 +0000 |
| commit | 8ead81a60f410dd4db6df106254c087b6b333967 (patch) | |
| tree | 94256dd40acd6d0846bd108d726ca0a5867ebee9 /pkgs/development/compilers | |
| parent | 2178d8d8574be160b52888ddd02cc3b9225ac920 (diff) | |
| parent | a3d99d0bd385f4cdc4c77d2704c7aced3d9ea669 (diff) | |
| download | nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.gz nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.bz2 nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.lz nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.xz nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.zst nixlib-8ead81a60f410dd4db6df106254c087b6b333967.zip | |
Merge remote-tracking branch 'upstream/master' into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ciao/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/swift/default.nix | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index bc85f6e1009f..98c26b3e9a08 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.22.0-m7"; + version = "1.23.0-m1"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU="; + sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0="; }; configurePhase = '' diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 2a56a03766b9..c111a8d86bfa 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -25,9 +25,13 @@ let # # The following selects the correct Clang version, matching the version # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. - clang = if pkgs.stdenv.isDarwin + clang = let + # https://github.com/NixOS/nixpkgs/issues/295322 + clangNoMarch = swiftLlvmPackages.clang.override { disableMarch = true; }; + in + if pkgs.stdenv.isDarwin then - swiftLlvmPackages.clang.override rec { + clangNoMarch.override rec { libc = apple_sdk.Libsystem; bintools = pkgs.bintools.override { inherit libc; }; # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the @@ -37,7 +41,7 @@ let inherit (llvmPackages) libcxx; } else - swiftLlvmPackages.clang; + clangNoMarch; # Overrides that create a useful environment for swift packages, allowing # packaging with `swiftPackages.callPackage`. These are similar to |