From 227900cb28ec81587f5977c81371b448048b8318 Mon Sep 17 00:00:00 2001 From: Peter Neuroth Date: Mon, 5 May 2025 14:05:42 +0200 Subject: [PATCH 1/2] nix: Update path to cctools cctools have been moved into the darwin system packages Signed-off-by: Peter Neuroth --- nix/pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 44c9301802ed..368b0ed54eea 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ] ++ lib.optionals postgresSupport [ postgresql ] ++ lib.optionals stdenv.isDarwin [ - cctools + darwin.cctools darwin.autoSignDarwinBinariesHook ]; From 469b332a89659d38a280484d891e240c0e02a183 Mon Sep 17 00:00:00 2001 From: Peter Neuroth Date: Mon, 5 May 2025 14:12:12 +0200 Subject: [PATCH 2/2] rs: Update rust version Update Cargo.lock and nixpkgs to support current stable rust releases. We need to update as upgrading rustc past v1.77 changes the syntax used in for the lockfile. Changelog-None Signed-off-by: Peter Neuroth --- Cargo.lock | 2 +- flake.lock | 14 +++++++------- flake.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a56ec51970e8..76626fac999e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" diff --git a/flake.lock b/flake.lock index 2b4169eb0ce8..0b04631335fb 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "crane": { "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", + "lastModified": 1745454774, + "narHash": "sha256-oLvmxOnsEKGtwczxp/CwhrfmQUG2ym24OMWowcoRhH8=", "owner": "ipetkov", "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", + "rev": "efd36682371678e2b6da3f108fdb5c613b3ec598", "type": "github" }, "original": { @@ -51,16 +51,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 7c44aafe616b..f2b58ba1094f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Core Lightning (CLN): A specification compliant Lightning Network implementation in C"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; flake-parts.url = "github:hercules-ci/flake-parts";