5d8490d2fc
Setting meta.targets to include all derivations in the different package sets in Profpatsch's user folder makes them checked by CI until they do the readTree refactor as promised. To reduce code duplication we handle this in a simple function which is exposed from nix.utils which may be a good place for depot specific bits and bops we accumulate over time. To get around the issue of too nested sets we perform the following renames: * users.Profpatsch.tests gets moved into its own directory * users.Profpatsch.arglib.netencode now lives in its own file instead of the default.nix * users.Profpatsch.netstring.tests gets moved into its own directory Change-Id: Icd039c29d7760a711c1c53554504d6b0cd19e120 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2603 Tested-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de>
62 lines
1.7 KiB
Nix
62 lines
1.7 KiB
Nix
{ lib, pkgs, depot, ... }:
|
|
let
|
|
toNetstring = s:
|
|
"${toString (builtins.stringLength s)}:${s},";
|
|
|
|
toNetstringKeyVal = attrs:
|
|
lib.concatStrings
|
|
(lib.mapAttrsToList
|
|
(k: v: toNetstring (toNetstring k + toNetstring v))
|
|
attrs);
|
|
|
|
python-netstring = depot.users.Profpatsch.writers.python3Lib {
|
|
name = "netstring";
|
|
} ''
|
|
def read_netstring(bytes):
|
|
(int_length, rest) = bytes.split(sep=b':', maxsplit=1)
|
|
val = rest[:int(int_length)]
|
|
# has to end on a ,
|
|
assert(rest[len(val)] == ord(','))
|
|
return (val, rest[len(val) + 1:])
|
|
|
|
def read_netstring_key_val(bytes):
|
|
(keyvalnet, rest) = read_netstring(bytes)
|
|
(key, valnet) = read_netstring(keyvalnet)
|
|
(val, nothing) = read_netstring(valnet)
|
|
assert(nothing == b"")
|
|
return (key, val, rest)
|
|
|
|
def read_netstring_key_val_list(bytes):
|
|
rest = bytes
|
|
res = {}
|
|
while rest != b"":
|
|
(key, val, r) = read_netstring_key_val(rest)
|
|
rest = r
|
|
res[key] = val
|
|
return res
|
|
'';
|
|
|
|
rust-netstring = depot.users.Profpatsch.writers.rustSimpleLib {
|
|
name = "netstring";
|
|
} ''
|
|
pub fn to_netstring(s: &[u8]) -> Vec<u8> {
|
|
let len = s.len();
|
|
// length of the integer as ascii
|
|
let i_len = ((len as f64).log10() as usize) + 1;
|
|
let ns_len = i_len + 1 + len + 1;
|
|
let mut res = Vec::with_capacity(ns_len);
|
|
res.extend_from_slice(format!("{}:", len).as_bytes());
|
|
res.extend_from_slice(s);
|
|
res.push(b',');
|
|
res
|
|
}
|
|
'';
|
|
|
|
in depot.nix.utils.drvTargets {
|
|
inherit
|
|
toNetstring
|
|
toNetstringKeyVal
|
|
python-netstring
|
|
rust-netstring
|
|
;
|
|
}
|