Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix: bump nixpkgs to nixos-unstable (#31055)

Browse source 
* Nix: bump nixpkgs to nixos-unstable (except gnumake + clang)

* we can get clang 11 from nixos-unstable

* bump clang to 15

* simplify approach now that we get clang from nixos-unstable

* drop clang to version 14 (#31059)
This commit is contained in:
Delan Azabani 2024-01-11 16:10:51 +08:00 • committed by GitHub
parent 92196d985d
commit 1f1cf1499d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
etc/shell.nix
View file

@ -2,7 +2,7 @@
# NOTE: This does not work offline or for nix-build
with import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/70bdadeb94ffc8806c0570eb5c2695ad29f0e421.tar.gz";
url = "https://github.com/NixOS/nixpkgs/archive/46ae0210ce163b3cba6c7da08840c1d63de9c701.tar.gz";
}) {
overlays = [
(import (builtins.fetchTarball {
@ -20,8 +20,15 @@ let
pkgs_gnumake_4_3 = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/6adf48f53d819a7b6e15672817fa1e78e5f4e84f.tar.gz";
}) {};
# We need clangStdenv with:
# - clang < 16 (#30587)
# - clang < 15 (#31059)
# - glibc 2.38 (#31054)
llvmPackages = llvmPackages_14;
stdenv = llvmPackages.stdenv;
in
clangStdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "servo-env";
buildInputs = [