Ditch flake-parts for now

I can try it again after I know I can get the module and vm working again
This commit is contained in:
Tim Van Baak 2025-02-12 11:37:20 -08:00
parent 98c8db289d
commit 71978dbae4
2 changed files with 36 additions and 64 deletions

31
flake.lock generated
View File

@ -1,23 +1,5 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1736798957,
@ -34,21 +16,8 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1735774519,
"narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
}
}

View File

@ -2,45 +2,48 @@
description = "Universal and extensible feed aggregator";
inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};
outputs =
inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
perSystem =
{
pkgs,
self',
...
}:
{
formatter = pkgs.nixfmt-rfc-style;
{
self,
nixpkgs,
}:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in
{
formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
packages = {
intake = pkgs.callPackage ./package.nix { };
default = self'.packages.intake;
};
devShells.default = pkgs.mkShell {
packages = [
pkgs.go
pkgs.gopls
pkgs.go-tools
pkgs.gotools
pkgs.cobra-cli
pkgs.air
];
};
packages.${system} =
let
pkgs = (
import nixpkgs {
inherit system;
overlays = [ self.overlays.default ];
}
);
in
{
default = self.packages.${system}.intake;
inherit (pkgs) intake;
};
flake = {
devShells.${system}.default = pkgs.mkShell {
packages = [
pkgs.go
pkgs.gopls
pkgs.go-tools
pkgs.gotools
pkgs.cobra-cli
pkgs.air
];
};
overlays.default = final: prev: {
intake = final.callPackage ./package.nix { };
};
};
}