aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2024-10-04 08:22:30 -0700
committerFuwn <[email protected]>2024-10-04 08:22:30 -0700
commit11675972de7e3cf10d11470fc736ec78aa00ee18 (patch)
treea27b5e1df5ba11debc616d3d509340f100c3a878
parentdc1be39312384ff24fadce6fb8f8c9c487ab1f07 (diff)
downloadgigi-11675972de7e3cf10d11470fc736ec78aa00ee18.tar.xz
gigi-11675972de7e3cf10d11470fc736ec78aa00ee18.zip
chore(flake): simplify flake
-rw-r--r--flake.lock80
-rw-r--r--flake.nix40
2 files changed, 3 insertions, 117 deletions
diff --git a/flake.lock b/flake.lock
index c725d28..c8a6530 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
{
"nodes": {
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": [
@@ -36,27 +20,6 @@
"type": "github"
}
},
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1727509811,
@@ -72,53 +35,10 @@
"type": "github"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1720386169,
- "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "pre-commit-hooks": {
- "inputs": {
- "flake-compat": [
- "flake-compat"
- ],
- "gitignore": "gitignore",
- "nixpkgs": [
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1726745158,
- "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "type": "github"
- }
- },
"root": {
"inputs": {
- "flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
- "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems"
}
},
diff --git a/flake.nix b/flake.nix
index 791618e..61c03f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,32 +5,17 @@
nixpkgs.url = "github:NixOS/nixpkgs";
systems.url = "github:nix-systems/default";
- flake-compat = {
- url = "github:edolstra/flake-compat";
- flake = false;
- };
-
flake-utils = {
url = "github:numtide/flake-utils";
inputs.systems.follows = "systems";
};
-
- pre-commit-hooks = {
- url = "github:cachix/git-hooks.nix";
-
- inputs = {
- flake-compat.follows = "flake-compat";
- nixpkgs.follows = "nixpkgs";
- };
- };
};
outputs =
{
- self,
- nixpkgs,
flake-utils,
- pre-commit-hooks,
+ nixpkgs,
+ self,
...
}:
flake-utils.lib.eachDefaultSystem (
@@ -84,26 +69,7 @@
default = self.apps.${system}.gigi;
};
- formatter = nixpkgs.legacyPackages."${system}".nixfmt-rfc-style;
-
- checks.pre-commit-check = pre-commit-hooks.lib.${system}.run {
- src = ./.;
-
- hooks = {
- deadnix.enable = true;
- flake-checker.enable = true;
- nixfmt-rfc-style.enable = true;
- statix.enable = true;
- };
- };
-
- devShells.default = nixpkgs.legacyPackages.${system}.mkShell {
- inherit (self.checks.${system}.pre-commit-check) shellHook;
-
- buildInputs = self.checks.${system}.pre-commit-check.enabledPackages ++ [
- pkgs.go_1_22
- ];
- };
+ devShells.default = pkgs.mkShell { buildInputs = [ pkgs.go_1_22 ]; };
}
);
}