diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 7e84d78e0d8e..f3ed8a45b88a 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -1,36 +1,33 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "kind2"; - version = "0.2.79"; + version = "0.3.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-QRPk7BpGVvhGHcDxCWJtJp5d3QOq72ESt5VbaSq5jBU="; + sha256 = "sha256-ZG0BbGcjQBqeNTqfy7WweVHK7sUuKeQSsFi9KIsyIE4="; }; - cargoSha256 = "sha256-i7RAJmhUQzjMe9w7z7hPrpiap64L12Shu4DL+e5A6oc="; + cargoSha256 = "sha256-j64L3HNk2r+MH9eDHWT/ARJ9DT4CchcuVxtIYYVsDxo="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - # these tests are flaky - checkFlags = [ - "--skip=test_checker" - "--skip=test_run_hvm" + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation ]; + # requires nightly features + RUSTC_BOOTSTRAP = true; + meta = with lib; { description = "A functional programming language and proof assistant"; - homepage = "https://github.com/kindelia/kind2"; + homepage = "https://github.com/kindelia/kind"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7681b11a7217..235b6c1229b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14949,9 +14949,7 @@ with pkgs; jwasm = callPackage ../development/compilers/jwasm { }; - kind2 = callPackage ../development/compilers/kind2 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };