Radish alpha
h
heartwood
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
Patches › cff338b7
nix, rust: Update
Merged lorenz opened 1 year ago
  • Update the flake’s dependencies so that Rust 1.80 is available.
  • Migrate from rust-toolchain to rust-toolchain.toml, allowing us to specify components such as rust-src to be installed.
  • Set RUST_SRC_DIR in Nix development shell, which is used by Rust tooling.
Activity Changes +21 -19
4 files changed +21 -19 757483f3 → 19c7e672
modified flake.lock
@@ -3,11 +3,11 @@
    "advisory-db": {

      "flake": false,

      "locked": {
- 
        "lastModified": 1714183630,
- 
        "narHash": "sha256-1BVft7ggSN2XXFeXQjazU3jN9wVECd9qp2mZx/8GDMk=",
+ 
        "lastModified": 1722017365,
+ 
        "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=",

        "owner": "rustsec",

        "repo": "advisory-db",
- 
        "rev": "35e7459a331d3e0c585e56dabd03006b9b354088",
+ 
        "rev": "9d024c07ee8c18609b43436bc865abf46636e250",

        "type": "github"

      },

      "original": {
@@ -23,11 +23,11 @@
        ]

      },

      "locked": {
- 
        "lastModified": 1715274763,
- 
        "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=",
+ 
        "lastModified": 1722907532,
+ 
        "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=",

        "owner": "ipetkov",

        "repo": "crane",
- 
        "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5",
+ 
        "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c",

        "type": "github"

      },

      "original": {
@@ -56,16 +56,16 @@
    },

    "nixpkgs": {

      "locked": {
- 
        "lastModified": 1715336739,
- 
        "narHash": "sha256-JpcAHWgeVo6z3uUg+xzaeZSLn7MlcZMo9y6QQ7+Ue6A=",
+ 
        "lastModified": 1722940684,
+ 
        "narHash": "sha256-X8JnSq0ruRWsU4PdYuxV+8W4W66F1lnCcxIZZMWzo4E=",

        "owner": "NixOS",

        "repo": "nixpkgs",
- 
        "rev": "baefb35c627d6bc698fd376774506f5f616bc1f3",
+ 
        "rev": "a3103d68517c6ad262ea27c96fc4a38ad81be7a0",

        "type": "github"

      },

      "original": {

        "owner": "NixOS",
- 
        "ref": "release-23.11",
+ 
        "ref": "release-24.05",

        "repo": "nixpkgs",

        "type": "github"

      }
@@ -81,19 +81,16 @@
    },

    "rust-overlay": {

      "inputs": {
- 
        "flake-utils": [
- 
          "flake-utils"
- 
        ],

        "nixpkgs": [

          "nixpkgs"

        ]

      },

      "locked": {
- 
        "lastModified": 1715307487,
- 
        "narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=",
+ 
        "lastModified": 1722910815,
+ 
        "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",

        "owner": "oxalica",

        "repo": "rust-overlay",
- 
        "rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f",
+ 
        "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",

        "type": "github"

      },

      "original": {
modified flake.nix
@@ -2,7 +2,7 @@
  description = "Radicle";



  inputs = {
- 
    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+ 
    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";



    crane = {

      url = "github:ipetkov/crane";
@@ -45,7 +45,7 @@
        overlays = [(import rust-overlay)];

      };
- 
      rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain;
+ 
      rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;

      craneLib = (crane.mkLib pkgs).overrideToolchain rustToolChain;



      srcFilters = path: type:
@@ -238,6 +238,8 @@
          rust-analyzer

          sqlite

        ];
+
+ 
        env.RUST_SRC_PATH = "${rustToolChain}/lib/rustlib/src/rust/library";

      };

    });

}
deleted rust-toolchain
@@ -1 +0,0 @@
- 
1.80
added rust-toolchain.toml
@@ -0,0 +1,4 @@
+ 
[toolchain]
+ 
channel = "1.80"
+ 
profile = "default"
+ 
components = [ "rust-src" ]