Jaculabilis/intake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ditch flake-parts for now

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
flake.lock generated
View File

@ -1,23 +1,5 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736798957, "lastModified": 1736798957,
@ -34,21 +16,8 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

69
flake.nix
View File

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