From 002d6e0fe9ab5aa5117c900b449946482c6f107b Mon Sep 17 00:00:00 2001
From: Cristian Oliveira <c.oliveiradarosa@gmail.com>
Date: Wed, 3 Jul 2024 15:00:34 +0200
Subject: [PATCH] nix: fix inputs and tests in devshell (#52)

Co-authored-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
---
 flake.lock                          | 15 ++++++---------
 flake.nix                           |  7 +++----
 tests/exec/nonexistent.unix.toml    |  3 +++
 tests/exec/nonexistent.windows.toml |  3 +++
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 25404c6..a4fd2a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713805509,
-        "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
+        "lastModified": 1719931832,
+        "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4",
+        "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0",
         "type": "github"
       },
       "original": {
@@ -43,19 +43,16 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1713924823,
-        "narHash": "sha256-kOeyS3GFwgnKvzuBMmFqEAX0xwZ7Nj4/5tXuvpZ0d4U=",
+        "lastModified": 1719973106,
+        "narHash": "sha256-IGCdN/m7DfwUfxZjFnlTiTtpwSHCb01P/LWavAKD2jw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8a2edac3ae926a2a6ce60f4595dcc4540fc8cad4",
+        "rev": "fb733500aead50880b9b301f34a0061bf997d6f2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 771aaa5..6489b8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,7 @@
 
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -50,6 +47,8 @@
           rustc
           cargo
           rustfmt
+
+          libiconv
         ];
 
         RUST_BACKTRACE = 1;
diff --git a/tests/exec/nonexistent.unix.toml b/tests/exec/nonexistent.unix.toml
index 76adab8..ee00ada 100644
--- a/tests/exec/nonexistent.unix.toml
+++ b/tests/exec/nonexistent.unix.toml
@@ -11,3 +11,6 @@ Run with RUST_BACKTRACE=full to include source snippets.
 """
 
 status.code = 1
+
+[env.add]
+RUST_BACKTRACE = "0"
diff --git a/tests/exec/nonexistent.windows.toml b/tests/exec/nonexistent.windows.toml
index 9e936cc..2db9e57 100644
--- a/tests/exec/nonexistent.windows.toml
+++ b/tests/exec/nonexistent.windows.toml
@@ -11,3 +11,6 @@ Run with RUST_BACKTRACE=full to include source snippets.
 """
 
 status.code = 1
+
+[env.add]
+RUST_BACKTRACE = "0"