chore: switch from import to callPackage
This commit is contained in:
parent
74e001e522
commit
12e5a42ed5
2 changed files with 20 additions and 26 deletions
37
flake.nix
37
flake.nix
|
@ -27,28 +27,29 @@
|
||||||
perSystem = { inputs', system, config, pkgs, lib, ... }: {
|
perSystem = { inputs', system, config, pkgs, lib, ... }: {
|
||||||
packages =
|
packages =
|
||||||
let
|
let
|
||||||
|
inherit (pkgs) callPackage;
|
||||||
|
|
||||||
darwinPackages =
|
darwinPackages =
|
||||||
if lib.hasSuffix "darwin" system then rec {
|
if lib.hasSuffix "darwin" system then {
|
||||||
cliclick = import ./packages/cliclick.nix { inherit pkgs lib; };
|
cliclick = callPackage ./packages/cliclick.nix { };
|
||||||
phantomjs = import ./packages/phantomjs.nix { inherit pkgs lib; };
|
phantomjs = callPackage ./packages/phantomjs.nix { };
|
||||||
tabnine = import ./packages/tabnine { inherit pkgs lib; };
|
tabnine = callPackage ./packages/tabnine { };
|
||||||
} else { };
|
} else { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
anonymous-overflow = import ./packages/anonymous-overflow.nix { inherit pkgs lib; };
|
anonymous-overflow = callPackage ./packages/anonymous-overflow.nix { };
|
||||||
bulk-downloader-for-reddit = import ./packages/bulk-downloader-for-reddit.nix { inherit pkgs lib; };
|
bulk-downloader-for-reddit = callPackage ./packages/bulk-downloader-for-reddit.nix { };
|
||||||
discord-downloader-go = import ./packages/discord-downloader-go.nix { inherit pkgs lib; };
|
discord-downloader-go = callPackage ./packages/discord-downloader-go.nix { };
|
||||||
fennel-ls = import ./packages/fennel-ls.nix { inherit pkgs lib; };
|
fennel-ls = callPackage ./packages/fennel-ls.nix { };
|
||||||
headscale-ui = import ./packages/headscale-ui.nix { inherit pkgs lib; };
|
headscale-ui = callPackage ./packages/headscale-ui.nix { };
|
||||||
lexical = import ./packages/lexical.nix { inherit pkgs lib; };
|
lexical = callPackage ./packages/lexical.nix { };
|
||||||
neovim-nightly = import ./packages/neovim-nightly.nix { inherit (inputs'.neovim-flake.packages) neovim; inherit pkgs lib; };
|
neovim-nightly = callPackage ./packages/neovim-nightly.nix { inherit (inputs'.neovim-flake.packages) neovim; };
|
||||||
q = import ./packages/q.nix { inherit pkgs lib; };
|
q = callPackage ./packages/q.nix { };
|
||||||
redlib = import ./packages/redlib.nix { inherit pkgs lib; };
|
redlib = callPackage ./packages/redlib.nix { };
|
||||||
rexit = import ./packages/rexit.nix { inherit pkgs lib; };
|
rexit = callPackage ./packages/rexit.nix { };
|
||||||
tg-archive = import ./packages/tg-archive.nix { inherit pkgs lib; };
|
tg-archive = callPackage ./packages/tg-archive.nix { };
|
||||||
vuetorrent = import ./packages/vuetorrent.nix { inherit pkgs lib; };
|
vuetorrent = callPackage ./packages/vuetorrent.nix { };
|
||||||
|
weewx-proxy = callPackage ./packages/weewx-proxy.nix { };
|
||||||
weewx-proxy = import ./packages/weewx-proxy.nix { inherit pkgs lib; };
|
|
||||||
} // darwinPackages;
|
} // darwinPackages;
|
||||||
|
|
||||||
overlayAttrs = config.packages;
|
overlayAttrs = config.packages;
|
||||||
|
|
|
@ -1,13 +1,6 @@
|
||||||
{ neovim, pkgs, lib, ... }:
|
{ neovim, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
latest-libvterm = pkgs.libvterm-neovim.overrideAttrs (_: rec {
|
latest-libvterm = pkgs.libvterm-neovim;
|
||||||
version = "0.3.3";
|
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
url = "https://github.com/neovim/libvterm/archive/v${version}.tar.gz";
|
|
||||||
sha256 = "0babe3ab42c354925dadede90d352f054aa9c4ae6842ea803a20c9741e172e56";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
in
|
in
|
||||||
neovim.override { libvterm-neovim = latest-libvterm; }
|
neovim.override { libvterm-neovim = latest-libvterm; }
|
||||||
|
|
Loading…
Reference in a new issue