From 6abc81db9438b979d67ce33459316453e6857312 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sun, 26 May 2024 16:59:15 +0530 Subject: [PATCH] remove flake-utils and lazy cross arch outputs --- flake.lock | 34 ------------------------- flake.nix | 73 ++++++++++++++++++++++++++---------------------------- 2 files changed, 35 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 26f74c9..559e0d3 100644 --- a/flake.lock +++ b/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", diff --git a/flake.nix b/flake.nix index 608b92f..43bcbfc 100644 --- a/flake.nix +++ b/flake.nix @@ -12,45 +12,42 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { nixpkgs, flake-utils, ... }: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { - inherit system; - }; + outputs = { nixpkgs, ... }: + let + pkgs = import nixpkgs { + system = "x86_64-linux"; + }; - packages = 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 { - packages = (with pkgs; [ - go_1_22 - gopls - gnumake - meson - ninja - cmake - pkg-config - ruby - rubyPackages.ffi - python3 - ]) ++ (with packages; [ libgovarnam varnam-cli ]); - }; - packages = { - inherit (packages) libgovarnam varnam-cli fcitx5-varnam; - default = packages.varnam-cli; - }; - overlays.default = final: prev: { - inherit (packages) libgovarnam varnam-cli fcitx5-varnam; - }; - } - ); + 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.x86_64-linux = pkgs.nixpkgs-fmt; + devShells.x86_64-linux.default = pkgs.mkShell { + packages = (with pkgs; [ + go_1_22 + gopls + gnumake + meson + ninja + cmake + pkg-config + ruby + rubyPackages.ffi + python3 + ]) ++ (with (packages pkgs); [ libgovarnam varnam-cli ]); + }; + packages.x86_64-linux = rec { + inherit (packages pkgs) libgovarnam varnam-cli fcitx5-varnam; + default = varnam-cli; + }; + overlays.default = final: prev: { + inherit (packages prev) libgovarnam varnam-cli fcitx5-varnam; + }; + }; }