From 2df7789f3e4377687f4dfa80df7847d4af1c9d7b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 13 Aug 2023 11:53:23 -0700 Subject: [PATCH 1/2] update to nix 23.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 5df15ddc5..bd53934eb 100644 --- a/flake.lock +++ b/flake.lock @@ -64,16 +64,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1691950488, + "narHash": "sha256-iUNEeudc4dGjx+HsHccnGiuZUVE/nhjXuQ1DVCsHIUY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "720e61ed8de116eec48d6baea1d54469b536b985", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c9a84d81f..70862e179 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ # We want to stay as up to date as possible but need to be careful # that the glibc versions used by our dependencies from Nix are compatible # with the system glibc that the user is building for. - nixpkgs.url = "github:nixos/nixpkgs/release-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/release-23.05"; # Used for shell.nix flake-compat = { url = github:edolstra/flake-compat; flake = false; }; From b18e7393e177aa4d11323d1ca173ca5f3206b5b9 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 13 Aug 2023 11:57:43 -0700 Subject: [PATCH 2/2] build: remove hardcoded glibc, I don't think this error is happening --- build.zig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.zig b/build.zig index c02b51c00..a34ce779a 100644 --- a/build.zig +++ b/build.zig @@ -61,11 +61,6 @@ pub fn build(b: *std.Build) !void { const target = target: { var result = b.standardTargetOptions(.{}); - if (result.isLinux() and result.isGnuLibC()) { - // https://github.com/ziglang/zig/issues/9485 - result.glibc_version = .{ .major = 2, .minor = 28, .patch = 0 }; - } - if (result.isDarwin()) { if (result.os_version_min == null) { result.os_version_min = .{ .semver = .{ .major = 12, .minor = 0, .patch = 0 } };