diff options
| author | Profpatsch <mail@profpatsch.de> | 2020-06-29 00:59:17 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2020-06-29 00:59:17 +0200 |
| commit | ef2a9798cc4751ca069ee0e7f764812b8ed50da9 (patch) | |
| tree | 196525c0df0c300c112beaef09dcef7f3eca5444 /pkgs/profpatsch | |
| parent | eb73fb94264d486ff1be0ea756aad3708f21b065 (diff) | |
pkgs/profpatsch: export toNetstring from the toplevel
Diffstat (limited to 'pkgs/profpatsch')
| -rw-r--r-- | pkgs/profpatsch/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/profpatsch/execline/symlink.nix | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index f39831b2..a9bff57b 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -168,13 +168,16 @@ in rec { inherit (import ./execline/e.nix { inherit pkgs writeExecline getBins; }) e; + toNetstring = s: + "${toString (builtins.stringLength s)}:${s},"; + inherit getBins binify; inherit (import ./sandbox.nix {inherit pkgs writeExecline; }) sandbox runInEmptyEnv; symlink = pkgs.callPackage ./execline/symlink.nix { - inherit runExecline; + inherit runExecline toNetstring; }; importer = pkgs.callPackage ./execline/importer.nix { diff --git a/pkgs/profpatsch/execline/symlink.nix b/pkgs/profpatsch/execline/symlink.nix index c6a311d8..30c21ea4 100644 --- a/pkgs/profpatsch/execline/symlink.nix +++ b/pkgs/profpatsch/execline/symlink.nix @@ -1,4 +1,4 @@ -{ lib, s6-portable-utils, coreutils, runExecline }: +{ lib, s6-portable-utils, coreutils, runExecline, toNetstring }: # DrvPath :: path relative to the derivation # AbsPath :: absolute path in the store # Name @@ -6,11 +6,6 @@ # -> Drv name: links: -let - toNetstring = s: - "${toString (builtins.stringLength s)}:${s},"; - -in runExecline name { derivationArgs = { pathTuples = lib.concatMapStrings |