diff options
| author | Robert Schütz <nix@dotlambda.de> | 2023-08-07 02:10:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 02:10:50 +0000 |
| commit | 48377a1934063d63930524b250604103e246d863 (patch) | |
| tree | c4ceae131f9e871fc1864dbd13b397a961b0345d | |
| parent | Merge pull request #242475 from dit7ya/windmill (diff) | |
| parent | clickhouse: own src version of corrosion (diff) | |
| download | nixpkgs-48377a1934063d63930524b250604103e246d863.tar.gz | |
Merge pull request #243413 from dotlambda/corrosion-0.4.1
corrosion: 0.3.5 -> 0.4.2
| -rw-r--r-- | pkgs/development/tools/build-managers/corrosion/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/clickhouse/default.nix | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index e4084051fabc..b2b2e45497d5 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.3.5"; + version = "0.4.2"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-r/jrck4RiQynH1+Hx4GyIHpw/Kkr8dHe1+vTHg+fdRs="; + hash = "sha256-/PSOAEtJtn9OykPiN3RhRv59wgQNJ0HoMyYS5RCdSCI="; }; cargoRoot = "generator"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-d4ep2v1aMQJUiMwwM0QWZo8LQosJoSeVIEx7JXkXHt8="; + hash = "sha256-lJaK+0NmlnTsV3h5Pqpqd8uA3g8PGERWfq2aR7FtYrc="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4a07e129cfd3..16e712d074fd 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -79,7 +79,19 @@ in mkDerivation rec { rustPlatform.cargoSetupHook ]; - corrosionDeps = if rustSupport then corrosion.cargoDeps else null; + # their vendored version is too old and missing this patch: https://github.com/corrosion-rs/corrosion/pull/205 + corrosionSrc = if rustSupport then fetchFromGitHub { + owner = "corrosion-rs"; + repo = "corrosion"; + rev = "v0.3.5"; + hash = "sha256-r/jrck4RiQynH1+Hx4GyIHpw/Kkr8dHe1+vTHg+fdRs="; + } else null; + corrosionDeps = if rustSupport then rustPlatform.fetchCargoTarball { + src = corrosionSrc; + name = "corrosion-deps"; + preBuild = "cd generator"; + hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8="; + } else null; blake3Deps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "blake3-deps"; @@ -97,9 +109,8 @@ in mkDerivation rec { postUnpack = lib.optionalString rustSupport '' pushd source - # their vendored version is too old and missing this patch: https://github.com/corrosion-rs/corrosion/pull/205 rm -rf contrib/corrosion - cp -r --no-preserve=mode ${corrosion.src} contrib/corrosion + cp -r --no-preserve=mode $corrosionSrc contrib/corrosion pushd contrib/corrosion/generator cargoDeps="$corrosionDeps" cargoSetupPostUnpackHook |