From 5ae4b910048fd6f1cbd7658d9f9ce922736317c7 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Wed, 21 Feb 2024 15:18:44 -0500 Subject: [PATCH] fix: nix builds after darwin update --- flake.lock | 48 +++++++++++++++++++++++++++++++++--------------- flake.nix | 2 +- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 412ba87..c643901 100644 --- a/flake.lock +++ b/flake.lock @@ -32,12 +32,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -51,11 +54,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1651574473, - "narHash": "sha256-wQhFORvRjo8LB2hTmETmv6cbyKGDPbfWqvZ/0chnDE4=", + "lastModified": 1698420672, + "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "owner": "nix-community", "repo": "naersk", - "rev": "f21309b38e1da0d61b881b6b6d41b81c1aed4e1d", + "rev": "aeb58d5e8faead8980a807c840232697982d47b9", "type": "github" }, "original": { @@ -66,11 +69,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652252629, - "narHash": "sha256-SvT64apetqc8P5nYp1/fOZvUmHUPdPFUZbhSpKy+1aI=", + "lastModified": 1708501555, + "narHash": "sha256-zJaF0RkdIPbh8LTmnpW/E7tZYpqIE+MePzlWwUNob4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2fc6856824cb87742177eefc8dd534bdb6c3439", + "rev": "b50a77c03d640716296021ad58950b1bb0345799", "type": "github" }, "original": { @@ -80,11 +83,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1652487699, - "narHash": "sha256-2RajAmUE+13kBh7ToxJC5ZpTYuJopZPMZig4hErZcBk=", + "lastModified": 1708542344, + "narHash": "sha256-IXJJMaRv1RlaXPsJlohwiQKM5775g+dujrPqtg5PhmQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be2ceab96f3aee5e586a427a2d28331ccbd4c7da", + "rev": "7394735942afb1f0f826ac9aa29f419339c85b22", "type": "github" }, "original": { @@ -110,11 +113,11 @@ ] }, "locked": { - "lastModified": 1673836088, - "narHash": "sha256-cAlfrHbX9sLcRdydMP8vhyxZChlVHqkEkumgc2LK4FY=", + "lastModified": 1708481452, + "narHash": "sha256-s07K6pwJtnB7Z/3wbkf4iaYXj+H5CuDD94I8hohm3Ig=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8f201a1adfddf715b708befd18164c8cbe65a268", + "rev": "3d6647bf9d1f8e537b0d026c51ea25c0cdd92055", "type": "github" }, "original": { @@ -122,6 +125,21 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 87953ab..e715988 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ let overlays = [ rust-overlay.overlays.default ]; pkgs = import nixpkgs { inherit system overlays; }; - rust-bin = pkgs.rust-bin.stable."1.64.0".default.override { + rust-bin = pkgs.rust-bin.stable."1.70.0".default.override { extensions = [ "rust-src" ]; # Add wasm32 as an extra target besides the native target. targets = [ "wasm32-unknown-unknown" ];