From 405205e15f93371d16dfee6a8e44d7bf1216709b Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Mon, 2 Sep 2024 17:25:04 +0100 Subject: [PATCH] Update Nix env --- flake.lock | 60 ++++++++++++++++++++++++------------------------------ flake.nix | 5 +++-- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index e8c12e15..e037c765 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "nixpkgs": [ - "holonix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724006180, - "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -26,11 +20,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -59,11 +53,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1723558677, - "narHash": "sha256-s5WjtXlu8d7U/zY2Kv4daaH0TlSiVc+D+UqR6B7+qj4=", + "lastModified": 1724063689, + "narHash": "sha256-OJOf55lwbIYnr1GbMGBYkgYFkNe/Aw4+MchQtos7RcU=", "owner": "holochain", "repo": "scaffolding", - "rev": "80edba8c2f5512ba0babcc8d84b78c1d79f0d1d8", + "rev": "3a9849020d4c525d200cf5675eeb2cb0923edd01", "type": "github" }, "original": { @@ -76,16 +70,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1723718736, - "narHash": "sha256-f8Hi7HvANahU5lJjtWk+XpnCcIjfMiV0yFxGqzqEXqU=", + "lastModified": 1724806844, + "narHash": "sha256-O2+EB0mK8MCiM2avQ+dHAA9El4iBjdJ6RTUjK4UWlqU=", "owner": "holochain", "repo": "holochain", - "rev": "a3384305850735b1b71fa0ab6f36f2318ec56d28", + "rev": "c5050c4c7b8d2d4015c9ec0c11936f608fdef42d", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.18", + "ref": "holochain-0.4.0-dev.21", "repo": "holochain", "type": "github" } @@ -106,11 +100,11 @@ ] }, "locked": { - "lastModified": 1723737493, - "narHash": "sha256-zP22A91tT/i+chslSATQvjKrZTXelwTcDqeNTLLTcyc=", + "lastModified": 1725284592, + "narHash": "sha256-3IxjsTq4Pasy0gt6rtaRfuG0BgZwUnix2cW85EfoEr0=", "owner": "holochain", "repo": "holonix", - "rev": "6438098657b9441e65db1543f0200f22453238de", + "rev": "029e93ba2d9e0d3f539e305c55056db8c90c59e4", "type": "github" }, "original": { @@ -123,16 +117,16 @@ "lair-keystore": { "flake": false, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1724340490, + "narHash": "sha256-zKcYTefiJaDkgNLhH7bUEmL6j1QfiSNCK/hwBv9/Hxs=", "owner": "holochain", "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "rev": "70e2bd906af7f757cc03ac54b257df884b442ae8", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", + "ref": "lair_keystore-v0.5.0", "repo": "lair", "type": "github" } @@ -155,14 +149,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "root": { @@ -184,11 +178,11 @@ ] }, "locked": { - "lastModified": 1724293269, - "narHash": "sha256-x/XhOAszT/ejditCHUtGOjQcVg2AQhrC/QVew3i7kTI=", + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc6d34a3a217457d7044dcce32b6d537480a6a1", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c06659e3..ba98db7d 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ # lib to build a nix package from a rust crate crane = { url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "holonix/nixpkgs"; }; # Rust toolchain @@ -59,7 +58,7 @@ overlays = [ (import rust-overlay) ]; }; - rustToolchain = pkgs.rust-bin.stable."1.78.0".minimal; + rustToolchain = pkgs.rust-bin.stable."1.80.0".minimal; craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; @@ -71,6 +70,8 @@ src = craneLib.cleanCargoSource (craneLib.path ./.); doCheck = false; + cargoExtraArgs = "-p trycp_server"; + buildInputs = [ ] ++ (lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [