adtya/varnam-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove flake-utils and lazy cross arch outputs

Browse source
This commit is contained in:
Adithya 2024-05-26 16:59:15 +05:30
parent cdbc7c9e15
commit 6abc81db94
Signed by: adtya
GPG key ID: B8857BFBA2C47B9C
2 changed files with 35 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
flake.lock
View file

@ -1,23 +1,5 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716220750, "lastModified": 1716220750,
@ -36,24 +18,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "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", "root": "root",

25
flake.nix
View file

@ -12,25 +12,23 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { nixpkgs, flake-utils, ... }: outputs = { nixpkgs, ... }:
flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; system = "x86_64-linux";
}; };
packages = rec { packages = pkgs: rec {
libgovarnam = pkgs.callPackage ./govarnam/libgovarnam.nix { }; libgovarnam = pkgs.callPackage ./govarnam/libgovarnam.nix { };
varnam-cli = pkgs.callPackage ./govarnam { inherit libgovarnam; }; varnam-cli = pkgs.callPackage ./govarnam { inherit libgovarnam; };
fcitx5-varnam = pkgs.callPackage ./varnam-fcitx5 { inherit libgovarnam; }; fcitx5-varnam = pkgs.callPackage ./varnam-fcitx5 { inherit libgovarnam; };
}; };
in in
{ {
formatter = pkgs.nixpkgs-fmt; formatter.x86_64-linux = pkgs.nixpkgs-fmt;
devShells.default = pkgs.mkShell { devShells.x86_64-linux.default = pkgs.mkShell {
packages = (with pkgs; [ packages = (with pkgs; [
go_1_22 go_1_22
gopls gopls
@ -42,15 +40,14 @@
ruby ruby
rubyPackages.ffi rubyPackages.ffi
python3 python3
]) ++ (with packages; [ libgovarnam varnam-cli ]); ]) ++ (with (packages pkgs); [ libgovarnam varnam-cli ]);
}; };
packages = { packages.x86_64-linux = rec {
inherit (packages) libgovarnam varnam-cli fcitx5-varnam; inherit (packages pkgs) libgovarnam varnam-cli fcitx5-varnam;
default = packages.varnam-cli; default = varnam-cli;
}; };
overlays.default = final: prev: { overlays.default = final: prev: {
inherit (packages) libgovarnam varnam-cli fcitx5-varnam; inherit (packages prev) libgovarnam varnam-cli fcitx5-varnam;
};
}; };
}
);
} }