updated things in the flake so the dev shell works now again

This commit is contained in:
2026-02-05 21:48:03 +01:00
parent e135a34d4c
commit a398911527
2 changed files with 32 additions and 28 deletions

32
flake.lock generated
View File

@@ -6,11 +6,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1763880175, "lastModified": 1770275419,
"narHash": "sha256-WfItZn6duisxCxyltbu7Hs7kxzNeylgZGOwCYwHe26g=", "narHash": "sha256-g2wfAevB/IFF6Y1C74TbhRERlUVFVGQsgGp/lLR4lQM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "a563f057979806c59da53070297502eb7af22f62", "rev": "aa3fbaab2bdc73c5c1e25a124c272dde295bc957",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -47,11 +47,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1763384566, "lastModified": 1769799857,
"narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=", "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a", "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -63,11 +63,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763678758, "lastModified": 1770197578,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -95,16 +95,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1688392541, "lastModified": 1770197578,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -119,11 +119,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763846202, "lastModified": 1770200365,
"narHash": "sha256-f5PvQONttEQCjnQ52zAEVJvXDZ5l2gbItLfDyfcyGgk=", "narHash": "sha256-Z3V5v8tSwZ3l4COVSt0b6Av0wZwTUf7Qj0SQ2/Z5RX0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "50621856a594a357c3aff0c5176ba8db4118133d", "rev": "1433910d1ffaff2c7a5fb7ba701f82ea578a99e3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -2,7 +2,7 @@
inputs = { inputs = {
fenix.url = "github:nix-community/fenix"; fenix.url = "github:nix-community/fenix";
naersk.url = "github:nix-community/naersk/master"; naersk.url = "github:nix-community/naersk/master";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
outputs = outputs =
@@ -101,23 +101,27 @@
in in
{ {
shell = eachSystem (buildTargets) ( devShells = eachSystem (builtins.attrNames buildTargets) (
system: system:
let let
pkgs = mkPkgs system null; pkgs = mkPkgs system null;
in in
pkgs.mkShell { {
buildInputs = with pkgs; [ default = pkgs.mkShell {
gcc name = "snooze-pal";
openssl.dev buildInputs = with pkgs; [
pkg-config gcc
libiconv openssl.dev
rustc pkg-config
cargo libiconv
sea-orm-cli rustc
]; cargo
sea-orm-cli
];
};
} }
); );
packages = eachCrossSystem (builtins.attrNames buildTargets) ( packages = eachCrossSystem (builtins.attrNames buildTargets) (
buildSystem: targetSystem: buildSystem: targetSystem:
let let