mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-08-04 18:18:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

improve nix flake by moving to fenix

Browse source
This commit is contained in:
Ethan Niser 2024-07-16 19:52:39 -07:00
parent ad70a240d4
commit 5c8719175d
2 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

39
flake.lock generated
View file

@ -1,5 +1,26 @@
{
"nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1721111394,
"narHash": "sha256-hCN0NCmqPdosiyGt2thVRqg9ltctTROzGAoMq57QXPs=",
"owner": "nix-community",
"repo": "fenix",
"rev": "e63599e3186cfb3284933bc815d33a509addd00e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1720910238,
@ -17,8 +38,26 @@
},
"root": {
"inputs": {
"fenix": "fenix",
"nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1721048109,
"narHash": "sha256-X3tDuTPGKrAzTeQ9mkaGZL6srpsVEbZGW9PVdOLgfJo=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "0c95aaa08e5f870d269f0ca13010eda9a4dc3402",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
}
},
"root": "root",

16
flake.nix
View file

@ -3,14 +3,21 @@
nixpkgs = {
url = "github:nixos/nixpkgs";
};
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {nixpkgs, ...}: let
outputs = { nixpkgs, fenix, ... }: let
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
forAllSystems = nixpkgs.lib.genAttrs systems;
in {
devShells = forAllSystems (
system: let
pkgs = nixpkgs.legacyPackages.${system};
rustStable = fenix.packages.${system}.stable.toolchain;
wasmTarget = fenix.packages.${system}.targets.wasm32-wasi.latest.rust-std;
in {
default = with pkgs;
mkShell {
@ -18,12 +25,11 @@
clang
libiconv
sqlite
rustup
gnumake
rustup # not used to install the toolchain, but the makefile uses it
rustStable
wasmTarget
];
shellHook = ''
rustup default stable
'';
};
}
);