chore(deps): set nix input to latest-release branch

Co-authored-by: ruben beck <[email protected]> Co-authored-by: Ishwar <[email protected]>
mobusoperandi · Apr 11, 2024 · 307e422 · 307e422
1 parent b478c9d
commit 307e422
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 55 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,8 @@
   inputs.fenix.url = "github:nix-community/fenix";
   inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nix.url = "github:NixOS/nix/2.18.2";
+  inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.nix.url = "github:NixOS/nix/latest-release";
 
   outputs = {
     self,

diff --git a/src/app/state.rs b/src/app/state.rs
@@ -136,7 +136,7 @@ impl State {
                 acc.push(ch.into());
                 let string = String::from_utf8(strip_ansi_escapes::strip(acc)?)?;
 
-                if string == "nix-repl> " {
+                if string.ends_with("nix-repl> ") {
                     session_live.expecting = ReplSessionExpecting::Nothing;
                     self.next_query(&id)?
                 } else {
@@ -158,7 +158,7 @@ impl State {
                             expected_result: expected_result.clone(),
                         }
                     } else {
-                        ReplSessionExpecting::BlankLine { saw_cr: false }
+                        ReplSessionExpecting::Prompt(String::new())
                     };
                     vec![]
                 } else {
@@ -188,20 +188,6 @@ impl State {
                 session_live.expecting = ReplSessionExpecting::Prompt(String::new());
                 vec![]
             }
-            ReplSessionExpecting::BlankLine { saw_cr: false } => {
-                anyhow::ensure!(
-                    ch == b'\r',
-                    "expecting carriage return, got {:?}",
-                    ch as char,
-                );
-                session_live.expecting = ReplSessionExpecting::BlankLine { saw_cr: true };
-                vec![]
-            }
-            ReplSessionExpecting::BlankLine { saw_cr: true } => {
-                anyhow::ensure!(ch == b'\n', "expecting line feed, got {:?}", ch as char,);
-                session_live.expecting = ReplSessionExpecting::Prompt(String::new());
-                vec![]
-            }
         };
 
         Ok(output)

diff --git a/src/app/state/repl_state.rs b/src/app/state/repl_state.rs
@@ -55,9 +55,6 @@ pub(crate) enum ReplSessionExpecting {
         acc: String,
         expected_result: ExpectedResult,
     },
-    BlankLine {
-        saw_cr: bool,
-    },
 }
 
 impl ReplSessionLive {