srx/fab-city-software-kit
1
0
Fork 0
mirror of https://gitlab.fabcity.hamburg/software/fab-city-software-kit.git synced 2024-09-20 04:18:51 +02:00
Code Packages Projects Releases Activity

fixed flake

Browse source
This commit is contained in:
Sebastian Wendel 2022-07-12 17:45:34 +02:00
parent f0919192be
commit c3654e5cbf
No known key found for this signature in database
GPG key ID: 1422B7DF78144640
4 changed files with 26 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.envrc
View file

@ -1,11 +1,6 @@
watch_file **/*.nix watch_file **/*.nix
watch_file flake.lock watch_file flake.lock
use_flake() {
mkdir -p "$(direnv_layout_dir)"
eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
}
if (nix help flake &> /dev/null) if (nix help flake &> /dev/null)
then then
use flake use flake

34
flake.lock
View file

@ -16,6 +16,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1657425264, "lastModified": 1657425264,
@ -35,23 +50,8 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs", "flake-utils": "flake-utils",
"utils": "utils" "nixpkgs": "nixpkgs"
}
},
"utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
} }
} }
}, },

20
flake.nix
View file

@ -1,22 +1,18 @@
{ {
description = "SRX frugal bioreactor"; description = "SRX frugal bioreactor";
inputs = { inputs = {
nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable-small"; }; nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable-small"; };
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
flake = false; flake = false;
}; };
flake-utils.url = "github:numtide/flake-utils";
utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs, flake-utils, ... }@inputs:
outputs = { self, nixpkgs, utils, ... }@inputs: flake-utils.lib.eachDefaultSystem (system:
utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in
let pkgs = nixpkgs.legacyPackages.${system}; {
in { devShells.default = import ./shell.nix { inherit pkgs; };
devShells.default = import ./shell.nix { }
inherit pkgs; }; );
});
} }

5
shell.nix
View file

@ -4,10 +4,7 @@ with pkgs;
mkShell { mkShell {
name = "fcos.integration"; name = "fcos.integration";
# nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
nativeBuildInputs = [
chart-testing
dotenv-linter
editorconfig-checker editorconfig-checker
git git
hadolint hadolint