about summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-01-01 12:38:12 +0100
committerProfpatsch <mail@profpatsch.de>2021-01-01 12:38:12 +0100
commit38048dc207920a41356ff9e99e473835f699cd05 (patch)
tree12243b2553a9b440b78b6a2935c9dd0c9077fc39
parent985d6ad6326352506f1f71d27de9fd3c637da789 (diff)
pkgs/profpatsch: add nix-eval
Dumb wrapper around `nix-instantiate` for something I often need.
-rw-r--r--machines/profpatsch/shiki.nix4
-rw-r--r--pkgs/profpatsch/default.nix1
-rw-r--r--pkgs/profpatsch/nix-tools.nix7
3 files changed, 11 insertions, 1 deletions
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index 278fa3d0..67e46670 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -265,6 +265,10 @@ in {
           exe = pkgs.vuizvui.profpatsch.nix-run;
           name = "nix-run";
         })
+        (pkgs.vuizvui.profpatsch.binify {
+          exe = pkgs.vuizvui.profpatsch.nix-eval;
+          name = "nix-eval";
+        })
         myPkgs.zoomboxed
       ];
     in systemPkgs ++ xPkgs ++ guiPkgs
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index e3c65803..774d6a9c 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -197,6 +197,7 @@ in rec {
 
   inherit (import ./nix-tools.nix { inherit pkgs getBins writeExecline runblock backtick; })
     nix-run
+    nix-eval
     ;
 
 
diff --git a/pkgs/profpatsch/nix-tools.nix b/pkgs/profpatsch/nix-tools.nix
index 9b6eb339..e00abb89 100644
--- a/pkgs/profpatsch/nix-tools.nix
+++ b/pkgs/profpatsch/nix-tools.nix
@@ -1,7 +1,7 @@
 { pkgs, writeExecline, backtick, runblock, getBins }:
 
 let
-  bins = getBins pkgs.nix [ "nix-build" ];
+  bins = getBins pkgs.nix [ "nix-build" "nix-instantiate" ];
 
   nix-run = writeExecline "nix-run" { argMode = "env"; } [
     (backtick {
@@ -11,8 +11,13 @@ let
     runblock "-r" "2" "exec" "$storepath"
   ];
 
+  nix-eval = writeExecline "nix-eval" {} [
+    bins.nix-instantiate "--eval" "--strict" "$@"
+  ];
+
 in {
   inherit
     nix-run
+    nix-eval
     ;
 }