forked from pub-solar/os
chore: python3{9,10}Packages -> python3Packages
- Apply treefmt
This commit is contained in:
parent
97239d1fbb
commit
f4f67b3197
|
@ -1,7 +1,11 @@
|
|||
{ lib, config, pkgs, self, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
bootstrap = pkgs.writeScript "bootstrap.sh" ''
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
@ -40,8 +44,7 @@ let
|
|||
'';
|
||||
psCfg = config.pub-solar;
|
||||
cfg = config.pub-solar.docker-ci-runner;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.pub-solar.docker-ci-runner = {
|
||||
enable = lib.mkEnableOption "Enables a docker container running a drone exec runner as unprivileged user.";
|
||||
|
||||
|
@ -88,7 +91,7 @@ in
|
|||
image = "debian";
|
||||
autoStart = true;
|
||||
entrypoint = "bash";
|
||||
cmd = [ "/bootstrap.sh" ];
|
||||
cmd = ["/bootstrap.sh"];
|
||||
|
||||
volumes = [
|
||||
"${cfg.runnerVarsFile}:/run/vars"
|
||||
|
@ -98,7 +101,7 @@ in
|
|||
|
||||
environment = cfg.runnerEnvironment;
|
||||
|
||||
extraOptions = lib.mkIf cfg.enableKvm [ "--device=/dev/kvm" ];
|
||||
extraOptions = lib.mkIf cfg.enableKvm ["--device=/dev/kvm"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -34,7 +34,7 @@ in {
|
|||
nodePackages.vue-language-server
|
||||
nodePackages.vscode-langservers-extracted
|
||||
nodePackages.yaml-language-server
|
||||
python39Packages.python-lsp-server
|
||||
python3Packages.python-lsp-server
|
||||
python3Full
|
||||
solargraph
|
||||
rnix-lsp
|
||||
|
@ -43,65 +43,66 @@ in {
|
|||
universal-ctags
|
||||
];
|
||||
|
||||
plugins = with pkgs.vimPlugins; [ ]
|
||||
++ lib.optionals (!cfg.lite) [
|
||||
nvim-cmp
|
||||
cmp-nvim-lsp
|
||||
cmp_luasnip
|
||||
luasnip
|
||||
plugins = with pkgs.vimPlugins;
|
||||
[]
|
||||
++ lib.optionals (!cfg.lite) [
|
||||
nvim-cmp
|
||||
cmp-nvim-lsp
|
||||
cmp_luasnip
|
||||
luasnip
|
||||
|
||||
lsp_extensions-nvim
|
||||
nvim-lspconfig
|
||||
lsp_extensions-nvim
|
||||
nvim-lspconfig
|
||||
|
||||
instant-nvim-nvfetcher
|
||||
instant-nvim-nvfetcher
|
||||
|
||||
ack-vim
|
||||
vim-airline
|
||||
editorconfig-vim
|
||||
nnn-vim
|
||||
quick-scope
|
||||
suda-vim
|
||||
syntastic
|
||||
vim-gutentags
|
||||
vim-vinegar
|
||||
vim-workspace-nvfetcher
|
||||
ack-vim
|
||||
vim-airline
|
||||
editorconfig-vim
|
||||
nnn-vim
|
||||
quick-scope
|
||||
suda-vim
|
||||
syntastic
|
||||
vim-gutentags
|
||||
vim-vinegar
|
||||
vim-workspace-nvfetcher
|
||||
|
||||
sonokai
|
||||
vim-hybrid-material
|
||||
vim-airline-themes
|
||||
vim-apprentice-nvfetcher
|
||||
sonokai
|
||||
vim-hybrid-material
|
||||
vim-airline-themes
|
||||
vim-apprentice-nvfetcher
|
||||
|
||||
fugitive
|
||||
vim-gitgutter
|
||||
vim-rhubarb
|
||||
vimagit-nvfetcher
|
||||
fugitive
|
||||
vim-gitgutter
|
||||
vim-rhubarb
|
||||
vimagit-nvfetcher
|
||||
|
||||
fzf-vim
|
||||
fzfWrapper
|
||||
vim-highlightedyank
|
||||
fzf-vim
|
||||
fzfWrapper
|
||||
vim-highlightedyank
|
||||
|
||||
vim-beautify-nvfetcher
|
||||
vim-surround
|
||||
vim-beautify-nvfetcher
|
||||
vim-surround
|
||||
|
||||
vim-bufkill
|
||||
vim-sensible
|
||||
vim-bufkill
|
||||
vim-sensible
|
||||
|
||||
ansible-vim
|
||||
emmet-vim
|
||||
rust-vim
|
||||
vim-caddyfile-nvfetcher
|
||||
vim-go
|
||||
vim-javascript
|
||||
vim-json
|
||||
SchemaStore-nvim
|
||||
vim-markdown
|
||||
vim-nix
|
||||
vim-nixhash
|
||||
vim-ruby
|
||||
vim-toml
|
||||
vim-vue
|
||||
yats-vim
|
||||
];
|
||||
ansible-vim
|
||||
emmet-vim
|
||||
rust-vim
|
||||
vim-caddyfile-nvfetcher
|
||||
vim-go
|
||||
vim-javascript
|
||||
vim-json
|
||||
SchemaStore-nvim
|
||||
vim-markdown
|
||||
vim-nix
|
||||
vim-nixhash
|
||||
vim-ruby
|
||||
vim-toml
|
||||
vim-vue
|
||||
yats-vim
|
||||
];
|
||||
|
||||
extraConfig = builtins.concatStringsSep "\n" [
|
||||
''
|
||||
|
|
|
@ -39,7 +39,7 @@ in {
|
|||
libvirt-glib
|
||||
qemu
|
||||
virt-manager
|
||||
python38Packages.libvirt
|
||||
python3Packages.libvirt
|
||||
gvfs
|
||||
edk2
|
||||
OVMF
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; let
|
||||
self:
|
||||
with self; let
|
||||
looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
|
||||
meta.platforms = ["x86_64-linux" "aarch64-linux"];
|
||||
});
|
||||
|
|
|
@ -1,19 +1,20 @@
|
|||
self: with self; let
|
||||
websocket-client = python39.pkgs.buildPythonPackage rec {
|
||||
self:
|
||||
with self; let
|
||||
websocket-client = python3.pkgs.buildPythonPackage rec {
|
||||
pname = "websocket-client";
|
||||
version = "1.2.1";
|
||||
doCheck = false;
|
||||
src = python39.pkgs.fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jftxXYqZL1cS//jIQ62ulOIrIqmbLF5rDsShqYHMTg0=";
|
||||
};
|
||||
};
|
||||
in
|
||||
python39.pkgs.buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "Mopidy-Jellyfin";
|
||||
version = "1.0.2";
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = with python39.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
unidecode
|
||||
websocket-client
|
||||
requests
|
||||
|
@ -21,7 +22,7 @@ in
|
|||
pykka
|
||||
mopidy
|
||||
];
|
||||
src = python39.pkgs.fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g=";
|
||||
};
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; let
|
||||
self:
|
||||
with self; let
|
||||
uhk-agent-bin = stdenv.mkDerivation rec {
|
||||
pname = "uhk-agent-bin";
|
||||
version = "1.5.14";
|
||||
|
|
Loading…
Reference in a new issue