From 42b46eb5ae350aac942c1506eb6dec1979ae29ae Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@ideascup.me>
Date: Fri, 25 Nov 2022 23:20:04 +0300
Subject: [PATCH] nix: remove unused sonic-server

---
 flake.lock            | 26 +-------------------------
 flake.nix             | 22 ++++++++++------------
 tests/list_command.rs |  2 +-
 3 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index 72f9a74..c1a8d7c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,31 +34,7 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "sonic-server": "sonic-server"
-      }
-    },
-    "sonic-server": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1666618211,
-        "narHash": "sha256-kKeIM9dXUi8eYcvSomx8kqSqq9zmqMx4mE5wdpEZ6O8=",
-        "owner": "pleshevskiy",
-        "repo": "sonic",
-        "rev": "e83de87ebd2e29b210c8cc6e7dfed5d2f14a0d24",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pleshevskiy",
-        "repo": "sonic",
-        "type": "github"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 015bbfa..dad550a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,25 +2,23 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-
-    sonic-server = {
-      url = "github:pleshevskiy/sonic";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
   };
 
-  outputs = inputs @ { self, nixpkgs, flake-utils, ... }:
+  outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ inputs.sonic-server.overlays.default ];
-        };
+        pkgs = import nixpkgs { inherit system; };
       in
       {
         devShell = pkgs.mkShell {
-          packages = with pkgs; [ cargo rustc rustfmt clippy rust-analyzer sonic-server inetutils ];
+          packages = with pkgs; [
+            cargo
+            cargo-watch
+            rustc
+            rustfmt
+            clippy
+            rust-analyzer
+          ];
           RUST_SRC_PATH = pkgs.rustPlatform.rustLibSrc;
         };
       });
diff --git a/tests/list_command.rs b/tests/list_command.rs
index 8a259ce..054d1b7 100644
--- a/tests/list_command.rs
+++ b/tests/list_command.rs
@@ -20,7 +20,7 @@ fn should_list_all_words() {
     let search_channel = search_start();
     match search_channel.list(ListRequest::new(dest.clone())) {
         Ok(object_ids) => assert_eq!(object_ids, vec!["beef", "skewers", "sweet", "teriyaki"]),
-        Err(e) => unreachable!(),
+        Err(_) => unreachable!(),
     }
 
     flush_bucket(COLLECTION, bucket);