build: update nixpkgs and cargo

Updates nixpkgs to 24.05 Updates cargo stable to 1.82.0 Updates cargo nightly to 2024-10-30 Signed-off-by: Tiago Castro <[email protected]>
openebs · Oct 30, 2024 · 0088b29 · 0088b29
1 parent 77bf9d3
commit 0088b29
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/nix/lib/rust.nix b/nix/lib/rust.nix
@@ -2,8 +2,8 @@
 let
   pkgs =
     import sources.nixpkgs { overlays = [ (import sources.rust-overlay) ]; };
-  nightly_version = "2023-08-25";
-  stable_version = "1.72.0";
+  nightly_version = "2024-10-30";
+  stable_version = "1.82.0";
 in
 with pkgs; rec  {
   nightly = rust-bin.nightly.${nightly_version}.default;

diff --git a/nix/shell/default.nix b/nix/shell/default.nix
@@ -24,6 +24,7 @@ rec {
   ++ cfg.buildInputs;
 
   LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
+  NODE_PATH = "${pkgs.nodePackages."@commitlint/config-conventional"}/lib/node_modules";
 
   shellHook = ''
     echo "Running shell hooks..."

diff --git a/nix/sources.json b/nix/sources.json
@@ -11,18 +11,6 @@
         "url": "https://github.com/linux-nvme/libnvme/archive/v1.0-rc3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "nvme-cli": {
-        "branch": "master",
-        "description": "NVM-Express user space tooling for Linux.",
-        "homepage": "https://github.com/linux-nvme/nvme-cli",
-        "owner": "linux-nvme",
-        "repo": "nvme-cli",
-        "rev": "v1.16",
-        "sha256": "130x5cf6kkcnyg5qd35igii249ysfjnbxp1pxfwkickmqg3d007z",
-        "type": "tarball",
-        "url": "https://github.com/linux-nvme/nvme-cli/archive/refs/tags/v1.16.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",
@@ -36,15 +24,27 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "master",
+        "branch": "release-24.05",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22.11",
-        "sha256": "11w3wn2yjhaa5pv20gbfbirvjq6i3m7pqrq2msf0g7cv44vijwgw",
+        "rev": "0b25d0b60e5aafad4ffab239ed21b8caf56dd8e1",
+        "sha256": "08xr03dc8h50qziyrj4xp69zsf95pbhfx9qai42iym4v86qh1k14",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/22.11.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/0b25d0b60e5aafad4ffab239ed21b8caf56dd8e1.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nvme-cli": {
+        "branch": "master",
+        "description": "NVM-Express user space tooling for Linux.",
+        "homepage": "https://github.com/linux-nvme/nvme-cli",
+        "owner": "linux-nvme",
+        "repo": "nvme-cli",
+        "rev": "v1.16",
+        "sha256": "130x5cf6kkcnyg5qd35igii249ysfjnbxp1pxfwkickmqg3d007z",
+        "type": "tarball",
+        "url": "https://github.com/linux-nvme/nvme-cli/archive/refs/tags/v1.16.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rust-overlay": {
@@ -53,10 +53,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "673e2d3d2a3951adc6f5e3351c9fce6ad130baed",
-        "sha256": "sha256:1vgjkaikv8lwm3kmb4jbc96kxhdy38nmf1v4s7nmx6j4bd8pmlyd",
+        "rev": "7509d76ce2b3d22b40bd25368b45c0a9f7f36c89",
+        "sha256": "12gh5a0clc11b219xrvh08f35v959wnnmm089ys1cmqfdxx9v77n",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/673e2d3d2a3951adc6f5e3351c9fce6ad130baed.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/7509d76ce2b3d22b40bd25368b45c0a9f7f36c89.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/scripts/rust-linter-env.sh b/scripts/rust-linter-env.sh
@@ -42,14 +42,14 @@ if [[ $(uname) != "Linux" ]]; then
   err_exit "must be run on Linux with Mayastor prerequisities installed"
 fi
 
-# Rust nightly toolchain "2021-11-30" installs cargo version "2021-11-24" and
+# Example, Rust nightly toolchain "2021-11-30" installs cargo version "2021-11-24" and
 # rustfmt and clippy "2021-11-29".
 # When upgrading Rust toolchain version, check 'cargo --version',
 # 'cargo fmt --version', 'cargo clippy --version' and put them here.
-RUST_TOOLCHAIN_VER="2023-08-25"
-WANTED_CARGO_VER="cargo 1.74.0-nightly (* 2023-08-22)"
-WANTED_RUSTFMT_VER="rustfmt 1.6.0-nightly (* 2023-08-24)"
-WANTED_CLIPPY_VER="clippy 0.1.73 (* 2023-08-24)"
+RUST_TOOLCHAIN_VER="2024-10-30"
+WANTED_CARGO_VER="cargo 1.84.0-nightly (* 2024-10-25)"
+WANTED_RUSTFMT_VER="rustfmt 1.8.0-nightly (* 2024-10-29)"
+WANTED_CLIPPY_VER="clippy 0.1.84 (* 2024-10-29)"
 CARGO="cargo"
 CARGO_MODE="system"