diff options
| author | Profpatsch <mail@profpatsch.de> | 2020-07-03 09:38:32 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2020-07-06 20:13:42 +0200 |
| commit | 60f23099bac85492e0587d643416215ed0b071a3 (patch) | |
| tree | a9611725e28c8f90cbe9b2db9a67bf0eadf3fc6d /pkgs | |
| parent | b29bae9974ac0608d9873d6092dce785d427cffe (diff) | |
pkgs/profpatsch: move record-get to netencode
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/profpatsch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/profpatsch/netencode/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/profpatsch/netencode/record-get.rs (renamed from pkgs/profpatsch/profpatsch.de/record-get.rs) | 0 |
3 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index 9f8be88b..90f6345c 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -186,7 +186,6 @@ in rec { inherit (import ./profpatsch.de { inherit pkgs lib toNetstring writeExecline runExecline getBins writeRustSimple netencode-rs el-semicolon el-exec el-substitute netencode; }) websiteStatic - record-get importas-if ; @@ -226,9 +225,10 @@ in rec { Prelude ; - inherit (import ./netencode { inherit pkgs writeRustSimpleLib; }) + inherit (import ./netencode { inherit pkgs writeRustSimpleLib writeRustSimple el-semicolon el-exec; }) netencode-rs netencode-rs-tests + record-get ; inherit (import ./execline/default.nix { inherit pkgs writeRustSimpleLib rust-deps; }) diff --git a/pkgs/profpatsch/netencode/default.nix b/pkgs/profpatsch/netencode/default.nix index 2297db51..8457e1f5 100644 --- a/pkgs/profpatsch/netencode/default.nix +++ b/pkgs/profpatsch/netencode/default.nix @@ -1,4 +1,4 @@ -{ pkgs, writeRustSimpleLib }: +{ pkgs, writeRustSimpleLib, writeRustSimple, el-semicolon, el-exec }: let version-check = pkgs.buildRustCrate { @@ -34,9 +34,18 @@ let netencode-rs = netencode-rs-common false; + record-get = writeRustSimple "record-get" { + dependencies = [ netencode-rs el-semicolon el-exec ]; + # TODO: for some reason the skarnet linker flag + # is propagated by the link target is not? + buildInputs = [ pkgs.skalibs ]; + } ./record-get.rs; + + in { inherit netencode-rs netencode-rs-tests + record-get ; } diff --git a/pkgs/profpatsch/profpatsch.de/record-get.rs b/pkgs/profpatsch/netencode/record-get.rs index bf4db3dd..bf4db3dd 100644 --- a/pkgs/profpatsch/profpatsch.de/record-get.rs +++ b/pkgs/profpatsch/netencode/record-get.rs |