Merge pull request #409 from nix-community/flake

update dependencies

Cargo.toml

@@ -25,7 +25,7 @@ categories = ["command-line-utilities"]
 include = ["data", "src", "Cargo.lock", "Cargo.toml", "build.rs"]
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.80"
 askalono.workspace = true
 bstr = "1.9.0"
 cargo = "0.75.1"
@@ -45,11 +45,11 @@ regex = "1.10.3"
 reqwest = { version = "0.11.24", features = ["json"] }
 rustc-hash = "1.1.0"
 secrecy = { version = "0.8.0", features = ["serde"] }
-semver = "1.0.21"
+semver = "1.0.22"
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
-serde_with = "3.6.0"
-serde_yaml = "0.9.31"
+serde_with = "3.6.1"
+serde_yaml = "0.9.32"
 shlex = "1.3.0"
 spdx = "0.10.3"
 tar = "0.4.40"
@@ -63,7 +63,7 @@ xdg = "2.5.2"
 zip = "0.6.6"
 
 [dependencies.clap]
-version = "4.4.18"
+version = "4.5.1"
 features = ["cargo", "derive", "unicode", "wrap_help"]
 
 [dependencies.rustyline]
@@ -76,13 +76,13 @@ version = "1.36.0"
 features = ["macros", "process", "rt-multi-thread"]
 
 [build-dependencies]
-clap = { version = "4.4.18", features = ["derive"] }
-clap_complete = "4.4.10"
-clap_mangen = "0.2.19"
+clap = { version = "4.5.1", features = ["derive"] }
+clap_complete = "4.5.1"
+clap_mangen = "0.2.20"
 
 [dev-dependencies]
 heck = "0.4.1"
-insta = "1.34.0"
+insta = "1.35.0"
 tempfile = "3.10.0"
 
 [features]

flake.lock

@@ -2,19 +2,16 @@
   "nodes": {
     "crane": {
       "inputs": {
-        "flake-compat": [],
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "rust-overlay": []
+        ]
       },
       "locked": {
-        "lastModified": 1691089569,
-        "narHash": "sha256-PYiaVen8kZKOl8Fd+IiChhRwR5oc9HwCqscvIArEEhU=",
+        "lastModified": 1707685877,
+        "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "1a551ae11bff91521cbeaebb8ca59a101c9f33f8",
+        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
         "type": "github"
       },
       "original": {
@@ -31,11 +28,11 @@
         "rust-analyzer-src": []
       },
       "locked": {
-        "lastModified": 1691216367,
-        "narHash": "sha256-hGAJLlrxlUjf2rNQDrUVOevYVxMjAHGiHVPNv5UmqvA=",
+        "lastModified": 1708323807,
+        "narHash": "sha256-ruXYKlIAuvSIyaV6DsoYFqtcSWIS8x4QbtZ4lZyn5no=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "accce4f7f29327614501543c79dd421a6ac6f0fc",
+        "rev": "cacd01c5149b8b1f9ec0e667c551f0fbcd6edd0f",
         "type": "github"
       },
       "original": {
@@ -51,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690933134,
-        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
+        "lastModified": 1706830856,
+        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
+        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
         "type": "github"
       },
       "original": {
@@ -64,31 +61,13 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688590700,
-        "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
+        "lastModified": 1708118438,
+        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
+        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
         "type": "github"
       },
       "original": {
@@ -105,21 +84,6 @@
         "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -4,11 +4,7 @@
   inputs = {
     crane = {
       url = "github:ipetkov/crane";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "";
-        rust-overlay.follows = "";
-      };
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     fenix = {
       url = "github:nix-community/fenix";
@@ -180,6 +176,7 @@
               in
               cargoNextest (args // {
                 cargoArtifacts = null;
+                cargoLock = lock;
                 cargoLockParsed = importTOML lock // {
                   package = attrValues (getPackages lock // concatMapAttrs
                     (name: _: optionalAttrs

src/main.rs

@@ -353,7 +353,7 @@ async fn run() -> Result<()> {
         if cargo_lock.map_or(true, |file| {
             BufReader::new(file)
                 .lines()
-                .flatten()
+                .map_while(Result::ok)
                 .any(|line| line.starts_with(r#"source = "git+"#))
         }) {
             &[RustVendor::ImportCargoLock, RustVendor::FetchCargoTarball]