From 479c2431692fa30fb928a170f114b90383edc23c Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 15 Nov 2024 18:38:29 +0100 Subject: [PATCH 1/2] kind2: format using nixfmt --- pkgs/development/compilers/kind2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index a5a8585d020e..7c81578abc2f 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchCrate -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchCrate, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { From a015a1fef302a05a8df4193d1c6803728ccc0bb0 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 15 Nov 2024 19:19:09 +0100 Subject: [PATCH 2/2] kind2: fix build --- pkgs/development/compilers/kind2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 7c81578abc2f..4af6762da2a7 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -17,6 +17,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; + postPatch = '' + substituteInPlace src/main.rs \ + --replace-fail "#![feature(panic_info_message)]" "" + substituteInPlace src/main.rs \ + --replace-fail "e.message().unwrap()" "e.payload()" + ''; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];