From 80f7b78e56b6e445f4d9126f0700e29fbb77f591 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 5 Jan 2022 18:48:51 +0100
Subject: pkgs/profpatsch/execline: remove backtick nix abstraction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s not worth the indirection.
---
 pkgs/profpatsch/backup/default.nix     |  2 +-
 pkgs/profpatsch/default.nix            |  7 +++----
 pkgs/profpatsch/execline/nixecline.nix | 16 ----------------
 pkgs/profpatsch/nix-tools.nix          |  9 ++++-----
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/profpatsch/execline/nixecline.nix

(limited to 'pkgs/profpatsch')

diff --git a/pkgs/profpatsch/backup/default.nix b/pkgs/profpatsch/backup/default.nix
index bccb3024..6b3851e3 100644
--- a/pkgs/profpatsch/backup/default.nix
+++ b/pkgs/profpatsch/backup/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, getBins, writeExecline, backtick }:
+{ pkgs, getBins, writeExecline }:
 
 let
 
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index 99ca4420..4488c3a8 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -220,8 +220,6 @@ in rec {
     writeExecline writeExeclineBin;
   inherit (import ./execline/runblock.nix { inherit pkgs; })
     runblock;
-  inherit (import ./execline/nixecline.nix { inherit writeExecline; })
-    backtick;
   inherit (import ./execline/e.nix { inherit pkgs writeExecline getBins writeRustSimple; })
     e;
 
@@ -259,7 +257,7 @@ in rec {
     concatenatedCss
     ;
 
-  inherit (import ./nix-tools.nix { inherit pkgs getBins writeExecline runblock backtick; })
+  inherit (import ./nix-tools.nix { inherit pkgs getBins writeExecline runblock; })
     nix-run
     nix-eval
     ;
@@ -328,7 +326,8 @@ in rec {
     ;
 
 
-  backup = import ./backup { inherit pkgs writeExecline getBins backtick; };
+  backup = import ./backup { inherit pkgs writeExecline getBins; };
+
   gpg-private-offline-key = import ./gpg-private-offline-key { inherit pkgs writeExecline getBins; };
 
 }
diff --git a/pkgs/profpatsch/execline/nixecline.nix b/pkgs/profpatsch/execline/nixecline.nix
deleted file mode 100644
index 518bce2e..00000000
--- a/pkgs/profpatsch/execline/nixecline.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# wrappers around execline commands ensuring sane default behaviours
-{ writeExecline }:
-
-let
-  backtick = {
-    var,
-    cmd,
-    importVar ? [ "importas" "-ui" var var ]
-  }: writeExecline "nix-backtick" {}
-    ([ "backtick" "-in" var cmd ]
-    ++ importVar
-    ++ [ "$@" ]);
-
-in {
- inherit backtick;
-}
diff --git a/pkgs/profpatsch/nix-tools.nix b/pkgs/profpatsch/nix-tools.nix
index 0ea3fc00..557e6680 100644
--- a/pkgs/profpatsch/nix-tools.nix
+++ b/pkgs/profpatsch/nix-tools.nix
@@ -1,13 +1,12 @@
-{ pkgs, writeExecline, backtick, runblock, getBins }:
+{ pkgs, writeExecline, runblock, getBins }:
 
 let
   bins = getBins pkgs.nix [ "nix-build" "nix-instantiate" ];
 
   nix-run = writeExecline "nix-run" { argMode = "env"; } [
-    (backtick {
-      var = "storepath";
-      cmd = [ runblock "1" bins.nix-build ];
-    })
+    "backtick" "-iE" "storepath" [
+      runblock "1" bins.nix-build
+    ]
     runblock "-r" "2" "exec" "$storepath"
   ];
 
-- 
cgit 1.4.1