From 72924facaebb9cf37d9cfd1da43335d5fe51fb6e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 24 Apr 2021 13:32:52 +0200
Subject: fix(nix/writers/rust): remove args override
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can be closed world, so let’s restrict the arguments to the subset
we need for now.

The existing override was wrong, in that `// args` would use the
arguments we already added, again. So instead of deliberating about
how to make this work right in all cases, we don’t need it, we trim
it.

Change-Id: I6443a0808b8bfd5e4db939b669c6afc741954db8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3057
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
---
 nix/writers/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'nix')

diff --git a/nix/writers/default.nix b/nix/writers/default.nix
index f43761865f..b0795ab2c8 100644
--- a/nix/writers/default.nix
+++ b/nix/writers/default.nix
@@ -9,9 +9,7 @@ let
     bins.s6-ln "-s" path "$out"
   ];
 
-  # Build a rust executable.
-  # Takes all arguments that `pkgs.buildRustCrate` accepts.
-  # Rather leaky abstraction.
+  # Build a rust executable, $out is the executable.
   rustSimple = args@{name, ...}: src:
     linkTo name "${rustSimpleBin args src}/bin/${name}";
 
@@ -20,8 +18,7 @@ let
     name,
     dependencies ? [],
     doCheck ? true,
-    ...
-  }@args: src:
+  }: src:
     (if doCheck then testRustSimple else pkgs.lib.id)
     (pkgs.buildRustCrate ({
       pname = name;
@@ -37,7 +34,7 @@ let
         cp "$srcPath" $out/src/bin/${name}.rs
         find $out
       '';
-    } // args));
+    }));
 
   # Build a rust library, that can be used as dependency to `rustSimple`.
   # Wrapper around `pkgs.buildRustCrate`, takes all its arguments.
@@ -45,8 +42,7 @@ let
     name,
     dependencies ? [],
     doCheck ? true,
-    ...
-  }@args: src:
+  }: src:
     (if doCheck then testRustSimple else pkgs.lib.id)
     (pkgs.buildRustCrate ({
       pname = name;
@@ -61,7 +57,7 @@ let
         cp "$srcPath" $out/src/lib.rs
         find $out
       '';
-    } // args));
+    }));
 
   /* Takes a `buildRustCrate` derivation as an input,
     * builds it with `{ buildTests = true; }` and runs
-- 
cgit 1.4.1