diff --git a/flake.lock b/flake.lock index cb8f7f1..465cbbd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719249093, - "narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1718626260, - "narHash": "sha256-gbwzreeZxR27HME9mDQL2fAOsim6hh2oikHRrbLypZg=", + "lastModified": 1720530518, + "narHash": "sha256-mGs37Xn5v0LJzrtbfmaQHEdeClWXm7QTRv6w8eexAD0=", "owner": "holochain", "repo": "scaffolding", - "rev": "3fc6f212a547d14b60f29a2a0c5347518b8c4b17", + "rev": "e6556ac727e95d3bced7c09b84a79de8daae19be", "type": "github" }, "original": { @@ -75,16 +75,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1719364139, - "narHash": "sha256-liBVoTcs+vAWxOqViwUhuJa9yFDw3q65nCpBrzBz7KI=", + "lastModified": 1719968525, + "narHash": "sha256-smpK/6bTj6rz4L5JE4LNEPXKS2FHX9TuMj2hg473ggI=", "owner": "holochain", "repo": "holochain", - "rev": "6aedc9c679addea56b8be4d978b7c7839a34ab18", + "rev": "31c75c07234a573b18f07cb05c2961809bf1c0a1", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.10", + "ref": "holochain-0.4.0-dev.11", "repo": "holochain", "type": "github" } @@ -108,11 +108,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -124,14 +124,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "root": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1719368303, - "narHash": "sha256-vhkKOUs9eOZgcPrA6wMw7a7J48pEjVuhzQfitVwVv1g=", + "lastModified": 1720491570, + "narHash": "sha256-PHS2BcQ9kxBpu9GKlDg3uAlrX/ahQOoAiVmwGl6BjD4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "32415b22fd3b454e4a1385af64aa5cef9766ff4c", + "rev": "b970af40fdc4bd80fd764796c5f97c15e2b564eb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a77b5fd..22b5232 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ # Holochain sources holochain = { - url = "github:holochain/holochain/holochain-0.4.0-dev.10"; + url = "github:holochain/holochain/holochain-0.4.0-dev.11"; flake = false; }; @@ -229,15 +229,28 @@ }); hc-scaffold = + let + # Crane filters out all non-cargo related files. Define include filter with files needed for build. + nonCargoBuildFiles = path: _type: builtins.match ".*(gitignore|md)$" path != null; + includeFilesFilter = path: type: + (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type); + in craneLib.buildPackage { pname = "hc-scaffold"; - src = craneLib.cleanCargoSource inputs.hc-scaffold; + src = pkgs.lib.cleanSourceWith { + src = inputs.hc-scaffold; + filter = includeFilesFilter; + }; doCheck = false; buildInputs = [ pkgs.go pkgs.perl + ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ + # Required by the git2 crate, see https://github.com/rust-lang/git2-rs/blob/master/libgit2-sys/build.rs#L251 + pkgs.darwin.apple_sdk.frameworks.Security + pkgs.darwin.apple_sdk.frameworks.CoreFoundation ]; }; in