From 7663e301cdda3912c1170fbf9b560f0ede0b56c2 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 14 Aug 2023 11:43:10 -0700 Subject: [PATCH 1/2] build: updates nixpkgs to include latest rustc --- .prettierrc | 2 +- flake.lock | 38 ++++++++++++++++++++++++++---------- nix/automation/devshells.nix | 2 +- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.prettierrc b/.prettierrc index ab17fde390..41df92917a 120000 --- a/.prettierrc +++ b/.prettierrc @@ -1 +1 @@ -/nix/store/rk3pi12b5l1i7fz2vvzpxcwc5s6z5d82-prettierrc \ No newline at end of file +/nix/store/85gg09vzjy36yzmshgq7qd24i4kk368k-prettierrc \ No newline at end of file diff --git a/flake.lock b/flake.lock index cec68d9bf9..865967d51f 100644 --- a/flake.lock +++ b/flake.lock @@ -507,12 +507,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -1266,11 +1269,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672633908, - "narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=", + "lastModified": 1691976506, + "narHash": "sha256-EqdSK1LBlzQ56oFRYVmk7xdWrqtqZJy9G1xy0cQekjw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7", + "rev": "81b970640e56a5c07a336d2c05018b0c9bf57a51", "type": "github" }, "original": { @@ -1695,11 +1698,11 @@ ] }, "locked": { - "lastModified": 1672712534, - "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", + "lastModified": 1691979003, + "narHash": "sha256-kT7FB6+wiTPzXtzNdQJmBGyFGM3/9QvjDTF5YK3eYTs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", + "rev": "ce646c4052c4979078a1ed263bc6e8c1a14c0d07", "type": "github" }, "original": { @@ -1835,6 +1838,21 @@ "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" + } + }, "tullia": { "inputs": { "nix-nomad": "nix-nomad", @@ -2006,4 +2024,4 @@ }, "root": "root", "version": 7 -} \ No newline at end of file +} diff --git a/nix/automation/devshells.nix b/nix/automation/devshells.nix index 98d9f32f6c..6147457dae 100644 --- a/nix/automation/devshells.nix +++ b/nix/automation/devshells.nix @@ -36,7 +36,7 @@ rustToolchain # rustNightly protobuf - uniffi-bindgen + #uniffi-bindgen postgresql # Misc tools From 5ccd1e35fc3d9a6073b5c43cfa92eed009df85bd Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 14 Aug 2023 11:45:34 -0700 Subject: [PATCH 2/2] fix: don't track .prettierrc --- .prettierrc | 1 - 1 file changed, 1 deletion(-) delete mode 120000 .prettierrc diff --git a/.prettierrc b/.prettierrc deleted file mode 120000 index 41df92917a..0000000000 --- a/.prettierrc +++ /dev/null @@ -1 +0,0 @@ -/nix/store/85gg09vzjy36yzmshgq7qd24i4kk368k-prettierrc \ No newline at end of file