get rid of flake-utils

This commit is contained in:
Motiejus Jakštys 2024-10-09 22:13:11 -04:00
parent f8a5331b65
commit 8887ea8c33
2 changed files with 12 additions and 55 deletions

34
flake.lock generated
View File

@ -1,23 +1,5 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1728241625,
@ -36,24 +18,8 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View File

@ -4,24 +4,14 @@
trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
extra-experimental-features = "nix-command flakes";
};
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # TODO 24.11
flake-utils.url = "github:numtide/flake-utils";
};
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # TODO 24.11
outputs =
{
self,
nixpkgs,
flake-utils,
...
}:
flake-utils.lib.eachDefaultSystem (
system:
{ self, nixpkgs }:
let
pkgs = import nixpkgs { inherit system; };
in
{
devShells.default = pkgs.mkShellNoCC {
mkShell =
pkgs:
pkgs.mkShellNoCC {
LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
packages = with pkgs; [
hugo
@ -31,8 +21,9 @@
dart-sass
];
};
formatter = pkgs.nixfmt-rfc-style;
}
);
in
{
devShells.x86_64-linux.default = mkShell (import nixpkgs { system = "x86_64-linux"; });
devShells.aarch64-linux.default = mkShell (import nixpkgs { system = "aarch64-linux"; });
};
}