lorri: unstable-2019-10-30 -> unstable-2020-01-09
`rustfmt` is now a compile time dependency because the varlink generated code is formatted with it.
This commit is contained in:
parent
5934692d6a
commit
c976dc165b
|
@ -14,7 +14,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
version = "unstable-2019-10-30";
|
||||
version = "unstable-2020-01-09";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Your project's nix-env";
|
||||
|
@ -27,17 +27,17 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "target";
|
||||
repo = pname;
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
rev = "03f10395943449b1fc5026d3386ab8c94c520ee3";
|
||||
sha256 = "0fcl79ndaziwd8d74mk1lsijz34p2inn64b4b4am3wsyk184brzq";
|
||||
rev = "7b84837b9988d121dd72178e81afd440288106c5";
|
||||
sha256 = "0rkga944jl6i0051vbsddfqbvzy12168cbg4ly2ng1rk0x97dbr8";
|
||||
};
|
||||
|
||||
cargoSha256 = "1daff4plh7hwclfp21hkx4fiflh9r80y2c7k2sd3zm4lmpy0jpfz";
|
||||
cargoSha256 = "0k7l0zhk2vzf4nlwv4xr207irqib2dqjxfdjk1fprff84c4kblx8";
|
||||
doCheck = false;
|
||||
|
||||
BUILD_REV_COUNT = src.revCount or 1;
|
||||
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
|
||||
|
||||
nativeBuildInputs = with pkgs; [ nix direnv which ];
|
||||
nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
|
||||
buildInputs =
|
||||
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
|
||||
|
|
|
@ -1,9 +1,13 @@
|
|||
{
|
||||
# Plumbing tools:
|
||||
closureInfo, runCommand, writeText, buildEnv,
|
||||
|
||||
# Actual dependencies to propagate:
|
||||
bash, coreutils }:
|
||||
closureInfo
|
||||
, runCommand
|
||||
, writeText
|
||||
, buildEnv
|
||||
, # Actual dependencies to propagate:
|
||||
bash
|
||||
, coreutils
|
||||
}:
|
||||
let
|
||||
tools = buildEnv {
|
||||
name = "lorri-runtime-tools";
|
||||
|
@ -30,4 +34,5 @@ let
|
|||
''
|
||||
substituteAll ${./runtime-closure.nix.template} $out
|
||||
'';
|
||||
in runtimeClosureInfoAsNix
|
||||
in
|
||||
runtimeClosureInfoAsNix
|
||||
|
|
Loading…
Reference in a new issue