mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-17 07:41:23 +01:00
don't use file type flake inputs
Because they aren't supported by flake-compat and can't be without IFD.
This commit is contained in:
parent
114e7ba577
commit
adb174d985
2 changed files with 9 additions and 22 deletions
16
flake.nix
16
flake.nix
|
|
@ -9,16 +9,16 @@
|
|||
nix-filter.url = "github:numtide/nix-filter?ref=main";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
|
||||
rocksdb = { url = "github:facebook/rocksdb?ref=v9.7.4"; flake = false; };
|
||||
|
||||
rust-manifest = {
|
||||
# Keep version in sync with rust-toolchain.toml
|
||||
url = "https://static.rust-lang.org/dist/channel-rust-1.84.0.toml";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs:
|
||||
let
|
||||
rust-manifest = builtins.fetchurl {
|
||||
# Keep version in sync with rust-toolchain.toml
|
||||
url = "https://static.rust-lang.org/dist/channel-rust-1.84.0.toml";
|
||||
sha256 = "sha256-lMLAupxng4Fd9F1oDw8gx+qA0RuF7ou7xhNU8wgs0PU=";
|
||||
};
|
||||
|
||||
# Keep sorted
|
||||
mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
|
||||
craneLib =
|
||||
|
|
@ -60,11 +60,11 @@
|
|||
targets = toolchainFile.toolchain.targets;
|
||||
fenix = inputs.fenix.packages.${pkgs.stdenv.buildPlatform.system};
|
||||
|
||||
nativeToolchain = (fenix.fromManifestFile inputs.rust-manifest)
|
||||
nativeToolchain = (fenix.fromManifestFile rust-manifest)
|
||||
.withComponents components;
|
||||
crossComponents = builtins.map
|
||||
(target:
|
||||
(fenix.targets.${target}.fromManifestFile inputs.rust-manifest)
|
||||
(fenix.targets.${target}.fromManifestFile rust-manifest)
|
||||
.rust-std)
|
||||
targets;
|
||||
in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue