remove devshells, prefer less deps

This commit is contained in:
Chris Kruining 2025-09-22 08:05:17 +02:00
parent 33aadaaecd
commit e45b2bfd7f
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
3 changed files with 15 additions and 52 deletions

View file

@ -0,0 +1,12 @@
{
perSystem = { pkgs, inputs', ... }: {
devShells.default = pkgs.mkShellNoCC {
packages = with pkgs; [
bash
sops
inputs'.clan-core.packages.clan-cli
];
};
};
}

37
flake.lock generated
View file

@ -56,24 +56,6 @@
"url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz" "url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz"
} }
}, },
"devshell": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1741473158,
"narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
"owner": "numtide",
"repo": "devshell",
"rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -165,22 +147,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1722073938,
"narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1757745802,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
@ -199,9 +165,8 @@
"root": { "root": {
"inputs": { "inputs": {
"clan-core": "clan-core", "clan-core": "clan-core",
"devshell": "devshell",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"systems": "systems_2" "systems": "systems_2"
} }
}, },

View file

@ -14,10 +14,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
}; };
devshell = {
url = "github:numtide/devshell";
};
}; };
outputs = outputs =
@ -31,8 +27,9 @@
flake-parts.flakeModules.modules flake-parts.flakeModules.modules
inputs.clan-core.flakeModules.default inputs.clan-core.flakeModules.default
inputs.clan-core.flakeModules.testModule inputs.clan-core.flakeModules.testModule
inputs.devshell.flakeModule
./devShells/flake-module.nix
./clanServices/flake-module.nix ./clanServices/flake-module.nix
]; ];
@ -51,16 +48,5 @@
}; };
}; };
}; };
perSystem = { system, pkgs, ... }: {
devshells = {
default = {
packages = [
pkgs.just
inputs.clan-core.packages.${system}.clan-cli
];
};
};
};
}); });
} }