fix: devShells merging

This commit is contained in:
2025-02-03 17:42:30 +00:00
parent a481d10194
commit d36617bb21
3 changed files with 10 additions and 16 deletions

7
flake.lock generated
View File

@@ -2,15 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735402525, "lastModified": 1738435198,
"narHash": "sha256-0RzBF9sKEjHo7Sinrs8wFktrUNc90ziOI48RLtZTW6U=", "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0429fa5b552a5c182e23d0e14de644db867961e4", "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@@ -1,7 +1,7 @@
{ {
description = "yukkop's nix utilities"; description = "yukkop's nix utilities";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs = { inputs = {
@@ -94,15 +94,16 @@
else else
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default; pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
in in
shells.default // { shells.default //
(pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
rustToolchain rustToolchain
pkgs.pkg-config pkgs.pkg-config
]; ];
}; });
haskell = shells.default // { haskell = shells.default // (pkgs.mkShell {
buildInputs = [ pkgs.stack ]; buildInputs = [ pkgs.stack ];
}; });
}; };

View File

@@ -1,8 +0,0 @@
[
{
"c": "unique_text_1",
"ln": "en_US",
"lb": "l1",
"s": "0000000000000000000000000000000000000000000000000000000000000001"
}
]