diff options
Diffstat (limited to 'users/Profpatsch')
-rw-r--r-- | users/Profpatsch/blog/default.nix | 4 | ||||
-rw-r--r-- | users/Profpatsch/lib.nix | 7 | ||||
-rw-r--r-- | users/Profpatsch/nixpkgs-rewriter/default.nix | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/users/Profpatsch/blog/default.nix b/users/Profpatsch/blog/default.nix index 584c12d8d73a..9d22e7f770c5 100644 --- a/users/Profpatsch/blog/default.nix +++ b/users/Profpatsch/blog/default.nix @@ -81,7 +81,7 @@ let me.netencode.record-splice-env runOr return500 "importas" "-i" "path" "path" - "if" [ me.lib.eprintf "GET \${path}\n" ] + "if" [ depot.tools.eprintf "GET \${path}\n" ] runOr return404 "backtick" "-ni" "TEMPLATE_DATA" [ "ifelse" [ bins.test "$path" "=" "/notes" ] @@ -118,7 +118,7 @@ let "importas" "?" "?" "ifelse" [ bins.test "$?" "-eq" "0" ] [] - "if" [ me.lib.eprintf "runOr: exited \${?}, running \${1}\n" ] + "if" [ depot.tools.eprintf "runOr: exited \${?}, running \${1}\n" ] "$1" ]; diff --git a/users/Profpatsch/lib.nix b/users/Profpatsch/lib.nix index 1e9652a27986..5d5fb01294cb 100644 --- a/users/Profpatsch/lib.nix +++ b/users/Profpatsch/lib.nix @@ -13,10 +13,6 @@ let "$@" ]; - eprintf = depot.nix.writeExecline "eprintf" {} [ - "fdmove" "-c" "1" "2" bins.printf "$@" - ]; - eprint-stdin = depot.nix.writeExecline "eprint-stdin" {} [ "pipeline" [ bins.multitee "0-1,2" ] "$@" ]; @@ -37,7 +33,7 @@ let eprintenv = depot.nix.writeExecline "eprintenv" { readNArgs = 1; } [ "ifelse" [ "fdmove" "-c" "1" "2" bins.printenv "$1" ] [ "$@" ] - "if" [ eprintf "eprintenv: could not find \"\${1}\" in the environment\n" ] + "if" [ depot.tools.eprintf "eprintenv: could not find \"\${1}\" in the environment\n" ] "$@" ]; @@ -54,7 +50,6 @@ let in { inherit debugExec - eprintf eprint-stdin eprint-stdin-netencode eprintenv diff --git a/users/Profpatsch/nixpkgs-rewriter/default.nix b/users/Profpatsch/nixpkgs-rewriter/default.nix index ff414862fa79..9dac01844165 100644 --- a/users/Profpatsch/nixpkgs-rewriter/default.nix +++ b/users/Profpatsch/nixpkgs-rewriter/default.nix @@ -5,7 +5,6 @@ let ; inherit (depot.users.Profpatsch.lib) debugExec - eprintf ; bins = depot.nix.getBins pkgs.coreutils [ "head" "shuf" ] @@ -41,7 +40,7 @@ let "importas" "-ui" "file" "fileName" "importas" "-ui" "from" "fromLine" "importas" "-ui" "to" "toLine" - "if" [ eprintf "%s-%s\n" "$from" "$to" ] + "if" [ depot.tools.eprintf "%s-%s\n" "$from" "$to" ] (debugExec "adding lib") bins.sed "-e" "\${from},\${to} \${1}" @@ -98,7 +97,7 @@ let "pipeline" [ bins.shuf ] "pipeline" [ bins.head "-n" "1000" ] bins.xargs "-I" "{}" "-n1" - "if" [ eprintf "instantiating %s\n" "{}" ] + "if" [ depot.tools.eprintf "instantiating %s\n" "{}" ] "nix-instantiate" "$1" "-A" "{}" ]; |