From 4e3953bc30410fa0d16fd574931507a1b8e9f348 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Fri, 28 Apr 2023 19:57:22 +0200 Subject: [PATCH] use nix commit with rust 1.66 --- default.nix | 2 +- flake.lock | 8 ++++---- flake.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index be5998d752..bcb047986c 100644 --- a/default.nix +++ b/default.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage { python3 llvmPkgs.clang llvmPkgs.llvm.dev - zig_0_9 + zig ]); buildInputs = (with pkgs; diff --git a/flake.lock b/flake.lock index ee9dc54436..ff6fc7a207 100644 --- a/flake.lock +++ b/flake.lock @@ -74,17 +74,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678658056, - "narHash": "sha256-TOR5Og2CG2fArjKhqY+X4htOmBNzdC/37wYSm+fEA2w=", + "lastModified": 1674860021, + "narHash": "sha256-ES4XUf/AlPp8RetKR6WlWgYEZ7bLWI7k6reHp2q9rqY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf2e058449f536faa4c67b5cad12476755db689c", + "rev": "9f4346eac544cc0db5eb7d889e71eac0f9c8b9eb", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "bf2e058449f536faa4c67b5cad12476755db689c", + "rev": "9f4346eac544cc0db5eb7d889e71eac0f9c8b9eb", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f05af5abd3..d5ead80599 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Roc flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?rev=bf2e058449f536faa4c67b5cad12476755db689c"; + nixpkgs.url = "github:nixos/nixpkgs?rev=9f4346eac544cc0db5eb7d889e71eac0f9c8b9eb"; # rust from nixpkgs has some libc problems, this is patched in the rust-overlay rust-overlay = { @@ -90,7 +90,7 @@ llvmPkgs.clang libxkbcommon pkg-config - zig_0_9 # roc builtins are implemented in zig, see compiler/builtins/bitcode/ + zig # roc builtins are implemented in zig, see compiler/builtins/bitcode/ # lib deps libffi