Merge pull request #279 from mitchellh/nix-update

update to nix 23.05
This commit is contained in:
Mitchell Hashimoto
2023-08-13 12:16:41 -07:00
committed by GitHub
3 changed files with 5 additions and 10 deletions

View File

@ -61,11 +61,6 @@ pub fn build(b: *std.Build) !void {
const target = target: { const target = target: {
var result = b.standardTargetOptions(.{}); 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.isDarwin()) {
if (result.os_version_min == null) { if (result.os_version_min == null) {
result.os_version_min = .{ .semver = .{ .major = 12, .minor = 0, .patch = 0 } }; result.os_version_min = .{ .semver = .{ .major = 12, .minor = 0, .patch = 0 } };

8
flake.lock generated
View File

@ -64,16 +64,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1688392541, "lastModified": 1691950488,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "narHash": "sha256-iUNEeudc4dGjx+HsHccnGiuZUVE/nhjXuQ1DVCsHIUY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "rev": "720e61ed8de116eec48d6baea1d54469b536b985",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -9,7 +9,7 @@
# We want to stay as up to date as possible but need to be careful # 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 # that the glibc versions used by our dependencies from Nix are compatible
# with the system glibc that the user is building for. # 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 # Used for shell.nix
flake-compat = { url = github:edolstra/flake-compat; flake = false; }; flake-compat = { url = github:edolstra/flake-compat; flake = false; };