Skip to content

Commit

Permalink
Nix: bump nixpkgs to nixos-unstable (#31055)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
delan committed Jan 11, 2024
1 parent 92196d9 commit 1f1cf14
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions etc/shell.nix
Expand Up @@ -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 {
Expand All @@ -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 = [
Expand Down

0 comments on commit 1f1cf14

Please sign in to comment.