public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77380 from curiousleo/lorri-unstable-2020-01-09 

lorri: unstable-2019-10-30 -> unstable-2020-01-09
This commit is contained in:
Florian Klink 2020-01-10 11:45:22 +01:00 committed by GitHub
parent 0c26ef9e76 c976dc165b
commit fe414f371f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/lorri/default.nix
View File

@ -14,7 +14,7 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "lorri"; pname = "lorri";
version = "unstable-2019-10-30"; version = "unstable-2020-01-09";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Your project's nix-env"; description = "Your project's nix-env";
@ -27,17 +27,17 @@ rustPlatform.buildRustPackage rec {
owner = "target"; owner = "target";
repo = pname; repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision! # Run `eval $(nix-build -A lorri.updater)` after updating the revision!
rev = "03f10395943449b1fc5026d3386ab8c94c520ee3"; rev = "7b84837b9988d121dd72178e81afd440288106c5";
sha256 = "0fcl79ndaziwd8d74mk1lsijz34p2inn64b4b4am3wsyk184brzq"; sha256 = "0rkga944jl6i0051vbsddfqbvzy12168cbg4ly2ng1rk0x97dbr8";
}; };
cargoSha256 = "1daff4plh7hwclfp21hkx4fiflh9r80y2c7k2sd3zm4lmpy0jpfz"; cargoSha256 = "0k7l0zhk2vzf4nlwv4xr207irqib2dqjxfdjk1fprff84c4kblx8";
doCheck = false; doCheck = false;
BUILD_REV_COUNT = src.revCount or 1; BUILD_REV_COUNT = src.revCount or 1;
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {}; RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
nativeBuildInputs = with pkgs; [ nix direnv which ]; nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
buildInputs = buildInputs =
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];

35
pkgs/tools/misc/lorri/runtime.nix
View File

@ -1,9 +1,13 @@
{ {
# Plumbing tools: # Plumbing tools:
closureInfo, runCommand, writeText, buildEnv, closureInfo
, runCommand
# Actual dependencies to propagate: , writeText
bash, coreutils }: , buildEnv
, # Actual dependencies to propagate:
bash
, coreutils
}:
let let
tools = buildEnv { tools = buildEnv {
name = "lorri-runtime-tools"; name = "lorri-runtime-tools";
@ -15,19 +19,20 @@ let
}; };
closureToNix = runCommand "closure.nix" {} closureToNix = runCommand "closure.nix" {}
'' ''
( (
echo '{ dep, ... }: [' echo '{ dep, ... }: ['
sed -E 's/^(.*)$/ (dep \1)/' ${runtimeClosureInfo}/store-paths sed -E 's/^(.*)$/ (dep \1)/' ${runtimeClosureInfo}/store-paths
echo ']' echo ']'
) > $out ) > $out
''; '';
runtimeClosureInfoAsNix = runCommand "runtime-closure.nix" { runtimeClosureInfoAsNix = runCommand "runtime-closure.nix" {
runtime_closure_list = closureToNix; runtime_closure_list = closureToNix;
tools_build_host = tools; tools_build_host = tools;
} }
'' ''
substituteAll ${./runtime-closure.nix.template} $out substituteAll ${./runtime-closure.nix.template} $out
''; '';
in runtimeClosureInfoAsNix in
runtimeClosureInfoAsNix