remove flake-utils and lazy cross arch outputs
This commit is contained in:
parent
cdbc7c9e15
commit
6abc81db94
2 changed files with 35 additions and 72 deletions
34
flake.lock
34
flake.lock
|
@ -1,23 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716220750,
|
||||
|
@ -36,24 +18,8 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
25
flake.nix
25
flake.nix
|
@ -12,25 +12,23 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, flake-utils, ... }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
outputs = { nixpkgs, ... }:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
|
||||
packages = rec {
|
||||
packages = pkgs: rec {
|
||||
libgovarnam = pkgs.callPackage ./govarnam/libgovarnam.nix { };
|
||||
varnam-cli = pkgs.callPackage ./govarnam { inherit libgovarnam; };
|
||||
fcitx5-varnam = pkgs.callPackage ./varnam-fcitx5 { inherit libgovarnam; };
|
||||
};
|
||||
in
|
||||
{
|
||||
formatter = pkgs.nixpkgs-fmt;
|
||||
devShells.default = pkgs.mkShell {
|
||||
formatter.x86_64-linux = pkgs.nixpkgs-fmt;
|
||||
devShells.x86_64-linux.default = pkgs.mkShell {
|
||||
packages = (with pkgs; [
|
||||
go_1_22
|
||||
gopls
|
||||
|
@ -42,15 +40,14 @@
|
|||
ruby
|
||||
rubyPackages.ffi
|
||||
python3
|
||||
]) ++ (with packages; [ libgovarnam varnam-cli ]);
|
||||
]) ++ (with (packages pkgs); [ libgovarnam varnam-cli ]);
|
||||
};
|
||||
packages = {
|
||||
inherit (packages) libgovarnam varnam-cli fcitx5-varnam;
|
||||
default = packages.varnam-cli;
|
||||
packages.x86_64-linux = rec {
|
||||
inherit (packages pkgs) libgovarnam varnam-cli fcitx5-varnam;
|
||||
default = varnam-cli;
|
||||
};
|
||||
overlays.default = final: prev: {
|
||||
inherit (packages) libgovarnam varnam-cli fcitx5-varnam;
|
||||
inherit (packages prev) libgovarnam varnam-cli fcitx5-varnam;
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue