Fix mismatched cargoDeps in nix and update attribute syntax (#682)

default.nix

@@ -3,23 +3,24 @@
   debug ? false,
 }:
 let
-  deps = import ./nix/deps.nix { pkgs = pkgs; };
+  src = ./.;
+  deps = import ./nix/deps.nix { inherit pkgs; };
   kimeVersion = builtins.readFile ./VERSION;
   testArgs = if debug then "" else "--release";
+  inherit (pkgs) llvmPackages_18 rustPlatform qt5;
 in
-with pkgs;
-llvmPackages_18.stdenv.mkDerivation rec {
+llvmPackages_18.stdenv.mkDerivation {
   name = "kime";
-  src = ./.;
+  inherit src;
   buildInputs = deps.kimeBuildInputs;
   nativeBuildInputs = deps.kimeNativeBuildInputs ++ [ rustPlatform.cargoSetupHook ];
   version = kimeVersion;
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    #sha256 = "0000000000000000000000000000000000000000000000000000";
-    sha256 = "sha256-hlTxyaE/300CBGIJtFzIh6CT5PcmmqWt8CN428sr2U8=";
+    #hash = "0000000000000000000000000000000000000000000000000000";
+    hash = "sha256-2MG6xigiKdvQX8PR457d6AXswTRPRJBPERvZqemjv24=";
   };
-  LIBCLANG_PATH = "${pkgs.llvmPackages_18.libclang.lib}/lib";
+  LIBCLANG_PATH = "${llvmPackages_18.libclang.lib}/lib";
   dontUseCmakeConfigure = true;
   dontWrapQtApps = true;
   buildPhase = if debug then "bash scripts/build.sh -ad" else "bash scripts/build.sh -ar";
@@ -30,7 +31,7 @@ llvmPackages_18.stdenv.mkDerivation rec {
     KIME_ICON_DIR=share/icons \
     KIME_LIB_DIR=lib \
     KIME_DOC_DIR=share/doc/kime \
-    KIME_QT5_DIR=lib/qt-${pkgs.qt5.qtbase.version} \
+    KIME_QT5_DIR=lib/qt-${qt5.qtbase.version} \
     bash scripts/install.sh "$out"
   '';
   doCheck = true;

docs/CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Breaking
 
 ### Improve
+- Fix mismatched cargoDeps in nix and update attribute syntax **[@nakoo]**
 
 ## 3.1.1
 

flake.nix

@@ -10,11 +10,11 @@
     flake-utils.lib.eachDefaultSystem
       (system:
         let pkgs = import nixpkgs {
-          system = system;
+          inherit system;
         }; in
         {
-          devShell = import ./shell.nix { inherit pkgs; };
-          defaultPackage = import ./default.nix { inherit pkgs; };
+          devShells.default = import ./shell.nix { inherit pkgs; };
+          packages.default = import ./default.nix { inherit pkgs; };
         }
       );
 }

nix/deps.nix

@@ -1,7 +1,6 @@
 { pkgs }:
-with pkgs;
 {
-  kimeBuildInputs = [
+  kimeBuildInputs = with pkgs; [
     dbus
     libdbusmenu
 
@@ -17,7 +16,7 @@ with pkgs;
     # qt6.qtbase
   ];
 
-  kimeNativeBuildInputs = [
+  kimeNativeBuildInputs = with pkgs; [
     python3 # xcb 0.9.0
     pkg-config
     llvmPackages_18.clang

shell.nix

@@ -2,11 +2,11 @@
   pkgs ? import <nixpkgs> { },
 }:
 let
-  deps = import ./nix/deps.nix { pkgs = pkgs; };
+  deps = import ./nix/deps.nix { inherit pkgs; };
   stdenv = pkgs.llvmPackages_18.stdenv;
-  mkShell = (pkgs.mkShell.override { stdenv = stdenv; });
+  mkShell = (pkgs.mkShell.override { inherit stdenv; });
 in
-mkShell {
+pkgs.mkShell {
   name = "kime-shell";
   dontUseCmakeConfigure = true;
   dontWrapQtApps = true;