diff options
| author | Profpatsch <mail@profpatsch.de> | 2019-12-08 15:06:59 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2019-12-08 15:09:33 +0100 |
| commit | 6cd157f0133bcd074ff947f3e5397f0e8cdc2830 (patch) | |
| tree | 4352a8b2f2be4cc508cdae672af8a679e98bb6f0 /machines | |
| parent | d4097ecdd5af72b803b622d0139095dacd9a3bdd (diff) | |
machines/profpatsch,pkgs/profpatsch: rm `execlineb-with-builtins`
This has been upstreamed to nixpkgs proper, as a C wrapper script, in https://github.com/NixOS/nixpkgs/pull/71357 So we don’t even need bash to run execline anymore :P
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/profpatsch/pkgs.nix | 11 | ||||
| -rw-r--r-- | machines/profpatsch/shiki.nix | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index 80e73829..df60fb62 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -102,16 +102,6 @@ let --replace 'notify-send' '${notify-send}' ''; - # wrapper for execlineb that doesn’t need the execline commands - # in PATH to work (making them appear like “builtins”) - execlineb-with-builtins = - let eldir = "${pkgs.execline}/bin"; - in pkgs.writeScriptBin "execlineb" '' - #!${eldir}/execlineb -s0 - ${eldir}/importas oldpath PATH - env PATH=${eldir}:''${oldpath} ${eldir}/execlineb $@ - ''; - dhall-flycheck = pkgs.vuizvui.profpatsch.haskellPackages.callPackage (import "${pkgs.fetchFromGitHub { owner = "Profpatsch"; @@ -133,7 +123,6 @@ in saneGhci /*searx*/ pyrnotify - execlineb-with-builtins dhall-flycheck ; } diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index c51bab2c..9a80001f 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -176,7 +176,7 @@ in { # pkgs.vuizvui.profpatsch.nix-gen # generate nix expressions pkgs.vuizvui.profpatsch.watch-server # restart server on code change pkgs.vuizvui.profpatsch.until # restart until cmd succeeds - myPkgs.execlineb-with-builtins + execline dhall myPkgs.dhall-flycheck ]; |