figsoda · Dec 30, 2025 · Dec 30, 2025 · Dec 30, 2025 · Dec 30, 2025 · Dec 30, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2024"
 license = "MPL-2.0"
 
 [workspace.dependencies]
-askalono = "0.4.6"
+askalono = "0.5.0"
 
 [package]
 name = "nix-init"
@@ -25,65 +25,65 @@ categories = ["command-line-utilities"]
 include = ["data", "src", "Cargo.lock", "Cargo.toml", "build.rs"]
 
 [dependencies]
-anyhow = "1.0.95"
+anyhow = "1.0.100"
 askalono.workspace = true
-bstr = "1.10.0"
+bstr = "1.12.1"
 cargo = "0.93.0"
-chumsky = "=1.0.0-alpha.6"
+chumsky = "=1.0.0-alpha.8"
 expand = "0.3.0"
-flate2 = "1.0.34"
+flate2 = "1.1.5"
 heck = "0.5.0"
-indoc = "2.0.5"
-is-terminal = "0.4.13"
+indoc = "2.0.7"
+is-terminal = "0.4.17"
 itertools = "0.14.0"
-once_cell = "1.20.2"
-owo-colors = "4.1.0"
+once_cell = "1.21.3"
+owo-colors = "4.2.3"
 parse-display = "0.10.0"
-pep-508 = "0.4.0"
-rayon = "1.10.0"
-regex = "1.11.1"
-reqwest = { version = "0.12.9", features = ["json"] }
+pep-508 = "0.5.0"
+rayon = "1.11.0"
+regex = "1.12.2"
+reqwest = { version = "0.13.1", features = ["json"] }
 rustc-hash = "2.1.1"
 secrecy = { version = "0.10.3", features = ["serde"] }
-semver = "1.0.23"
-serde = { version = "1.0.214", features = ["derive"] }
-serde_json = "1.0.132"
-serde_with = "3.11.0"
+semver = "1.0.27"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.148"
+serde_with = "3.16.1"
 serde_yaml = "0.9.34"
 shlex = "1.3.0"
-spdx = "0.10.8"
-tar = "0.4.43"
-tempfile = "3.15.0"
-time = { version = "0.3.36", features = ["parsing", "serde"] }
-toml = { version = "0.8.19", default-features = false, features = ["parse"] }
-tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-url = "2.5.4"
-xdg = "2.5.2"
-zip = "2.4.2"
+spdx = "0.13.3"
+tar = "0.4.44"
+tempfile = "3.24.0"
+time = { version = "0.3.44", features = ["parsing", "serde"] }
+toml = { version = "0.9.10", default-features = false, features = ["parse"] }
+tracing = "0.1.44"
+tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
+url = "2.5.7"
+xdg = "3.0.0"
+zip = "7.0.0"
 
 [dependencies.clap]
-version = "4.5.37"
+version = "4.5.53"
 features = ["cargo", "derive", "unicode", "wrap_help"]
 
 [dependencies.rustyline]
-version = "14.0.0"
+version = "17.0.2"
 default-features = false
 features = ["derive", "with-fuzzy"]
 
 [dependencies.tokio]
-version = "1.44.2"
+version = "1.48.0"
 features = ["macros", "process", "rt-multi-thread"]
 
 [build-dependencies]
-clap = { version = "4.5.37", features = ["derive"] }
-clap_complete = "4.5.42"
-clap_mangen = "0.2.24"
+clap = { version = "4.5.53", features = ["derive"] }
+clap_complete = "4.5.64"
+clap_mangen = "0.2.31"
 
 [dev-dependencies]
 heck = "0.5.0"
-insta = "1.41.1"
-tempfile = "3.15.0"
+insta = "1.45.1"
+tempfile = "3.24.0"
 
 [features]
 default = ["vendored"]

diff --git a/default.nix b/default.nix
@@ -9,7 +9,6 @@
   openssl,
   zlib,
   zstd,
-  spdx-license-list-data,
   nix,
   nurl,
   get-nix-license,
@@ -19,9 +18,10 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-init";
-  version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).workspace.package.version;
+  inherit ((lib.importTOML ./Cargo.toml).workspace.package) version;
 
   src = ./.;
+
   cargoLock = {
     lockFile = ./Cargo.lock;
   };
@@ -53,16 +53,8 @@ rustPlatform.buildRustPackage rec {
     ln -s ${get-nix-license} data/get_nix_license.rs
   '';
 
-  shellHook = ''
-    mkdir -p data
-    ln -sf ${get-nix-license} data/get_nix_license.rs
-    ln -sf ${license-store-cache} data/license-store-cache.zstd
-  '';
-
   preBuild = ''
-    cargo run -p license-store-cache \
-      -j $NIX_BUILD_CORES --frozen \
-      data/license-store-cache.zstd ${spdx-license-list-data.json}/json/details
+    ln -s ${license-store-cache} data/license-store-cache.zstd
   '';
 
   postInstall = ''
@@ -72,7 +64,7 @@ rustPlatform.buildRustPackage rec {
 
   env = {
     GEN_ARTIFACTS = "artifacts";
-    LIBGIT2_NO_VENDOR = 1;
+    LIBGIT2_NO_VENDOR = true;
     NIX = lib.getExe nix;
     NURL = lib.getExe nurl;
     ZSTD_SYS_USE_PKG_CONFIG = true;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -51,12 +51,14 @@
             '';
           };
 
-          packages.nix-init = pkgs.callPackage ./default.nix {
-            inherit (config.packages) get-nix-license license-store-cache;
+          packages = {
+            nix-init = pkgs.callPackage ./. {
+              inherit (config.packages) get-nix-license license-store-cache;
+            };
+            get-nix-license = pkgs.callPackage ./src/get_nix_license.nix { };
+            license-store-cache = pkgs.callPackage ./license-store-cache { };
+            default = config.packages.nix-init;
           };
-          packages.get-nix-license = pkgs.callPackage ./src/get_nix_license.nix { };
-          packages.license-store-cache = pkgs.callPackage ./license-store-cache.nix { };
-          packages.default = config.packages.nix-init;
 
           checks =
             let

diff --git a/formatters.nix b/formatters.nix
@@ -3,7 +3,7 @@
   imports = [ inputs.treefmt-nix.flakeModule ];
 
   perSystem =
-    { inputs', pkgs, ... }:
+    { inputs', ... }:
     {
       treefmt = {
         # Used to find the project root
@@ -12,7 +12,6 @@
         programs = {
           rustfmt.enable = true;
           nixfmt.enable = true;
-          nixfmt.package = pkgs.nixfmt-rfc-style;
           deno.enable = true;
           deadnix.enable = true;
           actionlint.enable = true;

diff --git a/license-store-cache.nix → license-store-cache/default.nix b/license-store-cache.nix → license-store-cache/default.nix
@@ -1,23 +1,21 @@
 {
-  rustPlatform,
-  stdenv,
-  libiconv,
   lib,
+  rustPlatform,
   spdx-license-list-data,
 }:
 rustPlatform.buildRustPackage {
-  name = "license-store-cache";
+  pname = "license-store-cache";
+  inherit ((lib.importTOML ../Cargo.toml).workspace.package) version;
 
-  src = ./.;
+  src = ../.;
 
   cargoLock = {
-    lockFile = ./Cargo.lock;
+    lockFile = ../Cargo.lock;
   };
 
-  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
   doCheck = false;
 
-  cargoBuildFlags = [ "-p license-store-cache" ];
+  cargoBuildFlags = [ "-p=license-store-cache" ];
 
   postInstall = ''
     cache=$(mktemp)

diff --git a/src/cfg.rs b/src/cfg.rs
@@ -69,11 +69,7 @@ enum AccessToken {
 
 pub fn load_config(cfg: Option<PathBuf>) -> Result<Config> {
     Ok(cfg
-        .or_else(|| {
-            BaseDirectories::with_prefix("nix-init")
-                .ok()
-                .and_then(|dirs| dirs.find_config_file("config.toml"))
-        })
+        .or_else(|| BaseDirectories::with_prefix("nix-init").find_config_file("config.toml"))
         .map(|cfg| {
             anyhow::Ok(
                 toml::from_str(&fs::read_to_string(cfg).context("failed to read config file")?)

diff --git a/src/fetcher/crates_io.rs b/src/fetcher/crates_io.rs
@@ -71,7 +71,7 @@ pub async fn get_package_info(cl: &Client, pname: &str) -> PackageInfo {
             (
                 version
                     .parse::<semver::Version>()
-                    .map_or(false, |version| version.pre.is_empty()),
+                    .is_ok_and(|version| version.pre.is_empty()),
                 version,
                 Some(license),
             )
@@ -83,7 +83,7 @@ pub async fn get_package_info(cl: &Client, pname: &str) -> PackageInfo {
         if !found_latest
             && version
                 .parse::<semver::Version>()
-                .map_or(false, |version| version.pre.is_empty())
+                .is_ok_and(|version| version.pre.is_empty())
         {
             found_latest = true;
             latest = version.clone();

diff --git a/src/fetcher/gitea.rs b/src/fetcher/gitea.rs
@@ -70,10 +70,10 @@ pub async fn get_package_info(cl: &Client, domain: &str, owner: &str, repo: &str
     };
 
     if let Some(tags) = tags {
-        if latest.is_empty() {
-            if let Some(Tag { name }) = tags.first() {
-                latest = name.clone();
-            }
+        if latest.is_empty()
+            && let Some(Tag { name }) = tags.first()
+        {
+            latest = name.clone();
         }
 
         for Tag { name } in tags {

diff --git a/src/fetcher/github.rs b/src/fetcher/github.rs
@@ -84,15 +84,15 @@ pub async fn get_package_info(
             })
             .take(12);
 
-        if latest.is_empty() {
-            if let Some(tag) = tags.next() {
-                latest = tag.clone();
-                completions.push(Pair {
-                    display: format!("{tag} (tag)"),
-                    replacement: tag.clone(),
-                });
-                versions.insert(tag, Version::Tag);
-            }
+        if latest.is_empty()
+            && let Some(tag) = tags.next()
+        {
+            latest = tag.clone();
+            completions.push(Pair {
+                display: format!("{tag} (tag)"),
+                replacement: tag.clone(),
+            });
+            versions.insert(tag, Version::Tag);
         }
 
         for tag in tags {

diff --git a/src/fetcher/gitlab.rs b/src/fetcher/gitlab.rs
@@ -70,10 +70,10 @@ pub async fn get_package_info(
     };
 
     if let Some(tags) = tags {
-        if latest.is_empty() {
-            if let Some(Tag { name }) = tags.first() {
-                latest = name.clone();
-            }
+        if latest.is_empty()
+            && let Some(Tag { name }) = tags.first()
+        {
+            latest = name.clone();
         }
 
         for Tag { name } in tags {

diff --git a/src/fetcher/mod.rs b/src/fetcher/mod.rs
@@ -201,5 +201,5 @@ pub async fn success(cl: &Client, url: impl IntoUrl) -> bool {
     cl.get(url)
         .send()
         .await
-        .map_or(false, |resp| resp.status().is_success())
+        .is_ok_and(|resp| resp.status().is_success())
 }
diff --git a/src/fetcher/pypi.rs b/src/fetcher/pypi.rs
@@ -75,10 +75,10 @@ pub async fn get_package_info(cl: &Client, pname: &str) -> PackageInfo {
                         PypiFormat::TarGz,
                     ));
                 }
-                if zip.is_none() {
-                    if let Some(pname) = get_pname(&release, &version, ".zip") {
-                        zip = Some((pname.into(), release.upload_time));
-                    }
+                if zip.is_none()
+                    && let Some(pname) = get_pname(&release, &version, ".zip")
+                {
+                    zip = Some((pname.into(), release.upload_time));
                 }
             }
             zip.map(|(pname, time)| (pname, version, time, PypiFormat::Zip))

diff --git a/src/lang/go/goreleaser.rs b/src/lang/go/goreleaser.rs
@@ -34,11 +34,11 @@ pub fn write_ldflags(out: &mut impl Write, src_dir: &Path) -> Result<()> {
     let mut len = 0;
     let mut processed = Vec::new();
     while let Some(mut flag) = raw.next() {
-        if flag == "-X" {
-            if let Some(xflag) = raw.next() {
-                flag.push('=');
-                flag.push_str(&xflag);
-            }
+        if flag == "-X"
+            && let Some(xflag) = raw.next()
+        {
+            flag.push('=');
+            flag.push_str(&xflag);
         }
         len += flag.len();
         processed.push(flag);