nix: make devshell platform-specific

This commit is contained in:
Mitchell Hashimoto
2023-12-08 07:58:52 -08:00
parent b3082e3925
commit 24c64d4b44
2 changed files with 6 additions and 11 deletions

8
flake.lock generated
View File

@ -115,16 +115,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1702042171, "lastModified": 1702049175,
"narHash": "sha256-abT0/nqbQfvx052z0JLkCDXulyM+YGznbN8tv6DYNpo=", "narHash": "sha256-c/q2+tGHbmLgzT3sXyUKVJR98h1CTks2+nkVaoZPRM0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "357f2203132b749d87d379dfe05245204b2dfe93", "rev": "b15508bd65870620f1df5864e8e861dffbc4e428",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-23.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -1,18 +1,13 @@
{ {
description = "👻"; description = "👻";
nixConfig = {
extra-trusted-substituters = "https://cache.garnix.io/";
extra-trusted-public-keys = "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=";
};
inputs = { inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
# We want to stay as up to date as possible but need to be careful that the # We want to stay as up to date as possible but need to be careful that the
# glibc versions used by our dependencies from Nix are compatible with the # glibc versions used by our dependencies from Nix are compatible with the
# system glibc that the user is building for. # system glibc that the user is building for.
nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.05";
# This is a nixpkgs mirror (based off of nixos-unstable) that contains # This is a nixpkgs mirror (based off of nixos-unstable) that contains
# patches for LLVM 17 and Zig 0.12 (master/nightly). # patches for LLVM 17 and Zig 0.12 (master/nightly).
@ -47,7 +42,7 @@
pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
pkgs-zig-0-12 = nixpkgs-zig-0-12.legacyPackages.${system}; pkgs-zig-0-12 = nixpkgs-zig-0-12.legacyPackages.${system};
in { in {
devShell = pkgs-stable.callPackage ./nix/devShell.nix { devShell.${system} = pkgs-stable.callPackage ./nix/devShell.nix {
inherit (pkgs-unstable) tracy; inherit (pkgs-unstable) tracy;
inherit (zls.packages.${system}) zls; inherit (zls.packages.${system}) zls;