Unverified Commit eb4f4904 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

zig: 0.13 -> 0.14 (#387154)

parents c8ea3584 1c82ff0d
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ stdenv.mkDerivation {
  ];

  postPatch = ''
    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
    ln -s ${
      callPackage ./deps.nix {
        zig = zig_0_12;
      }
    } $ZIG_GLOBAL_CACHE_DIR/p
  '';

  passthru.tests = { inherit (nixosTests) ly; };
+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
  pkg-config,
  openssl,
  stdenv,
  zig,
  zig_0_13,
  nix-update-script,
}:

@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
  '';

  postInstall = ''
    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig ]}
    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]}
  '';

  CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
  };
  postPatch = ''
    ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
    ln -s ${
      callPackage ./build.zig.zon.nix {
        zig = zig_0_13;
      }
    } $ZIG_GLOBAL_CACHE_DIR/p
  '';

  nativeBuildInputs = [
+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {

  deps = callPackage ./deps.nix {
    name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
    zig = zig_0_13;
  };

  strictDeps = true;
+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
  zig,
  zig_0_13,
}:

stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [
    zig.hook
    zig_0_13.hook
  ];

  meta = with lib; {
Loading