Unverified Commit 299dc2b0 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #302255 from dotlambda/corrosion 

corrosion: 0.4.7 -> 0.4.8
parents 7f57e821 87a15554

pkgs/development/tools/build-managers/corrosion/default.nix

+22 −13
Original line number Diff line number Diff line
@@ -3,40 +3,49 @@ 
, fetchFromGitHub

, cargo

, cmake

, rustPlatform

, rustc

, libiconv

}:



stdenv.mkDerivation rec {

  pname = "corrosion";

  version = "0.4.7";

  version = "0.4.8";



  src = fetchFromGitHub {

    owner = "corrosion-rs";

    repo = "corrosion";

    rev = "v${version}";

    hash = "sha256-6jjcBBc1gtMG2sYppOIRa/tYjmUgW4kFxAuoGj7Tpgw=";

  };



  cargoRoot = "generator";



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    sourceRoot = "${src.name}/${cargoRoot}";

    name = "${pname}-${version}";

    hash = "sha256-M5Wnx+SfVvdhC5bHVZa0Di2up3Qt5z1jog8yxIKvG/Y=";

    hash = "sha256-ChoeN7qQRR1YmYYvPdJVJ2SVGTDGlM7PsN9jzFjQEyU=";

  };



  buildInputs = lib.optional stdenv.isDarwin libiconv;



  nativeBuildInputs = [

    cmake

    rustPlatform.cargoSetupHook

    cargo

    rustc

  ];



  doCheck = true;



  checkPhase = let

    excludedTests = [

      "cbindgen_rust2cpp_build"

      "cbindgen_rust2cpp_run_cpp-exe"

      "hostbuild_build"

      "hostbuild_run_rust-host-program"

      "parse_target_triple_build"

      "rustup_proxy_build"

    ];

    excludedTestsRegex = lib.concatStringsSep "|" excludedTests;

  in ''

    runHook preCheck



    ctest -E "${excludedTestsRegex}"



    runHook postCheck

  '';



  meta = with lib; {

    description = "Tool for integrating Rust into an existing CMake project";

    homepage = "https://github.com/corrosion-rs/corrosion";

pkgs/kde/gear/akonadi-search/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ mkKdeDerivation rec { 
  extraNativeBuildInputs = [

    rustPlatform.cargoSetupHook

    cargo

    corrosion

    rustc

  ];



  extraBuildInputs = [corrosion xapian];

  extraBuildInputs = [xapian];

}

pkgs/kde/gear/angelfish/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ mkKdeDerivation rec { 
  extraNativeBuildInputs = [

    rustPlatform.cargoSetupHook

    cargo

    corrosion

    rustc

  ];



  extraBuildInputs = [corrosion qtsvg qtwebengine qcoro];

  extraBuildInputs = [qtsvg qtwebengine qcoro];

}

pkgs/kde/gear/kdepim-addons/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ mkKdeDerivation rec { 
  extraNativeBuildInputs = [

    rustPlatform.cargoSetupHook

    cargo

    corrosion

    rustc

  ];



  extraBuildInputs = [corrosion discount alpaka];

  extraBuildInputs = [discount alpaka];

}