nixos-23.05 #229

Merged
teutat3s merged 17 commits from nixos-23.05 into main 2023-06-28 17:31:27 +00:00
6 changed files with 75 additions and 68 deletions
Showing only changes of commit f4f67b3197 - Show all commits

View file

@ -1,7 +1,11 @@
{ lib, config, pkgs, self, ... }: {
lib,
with lib; config,
let pkgs,
self,
...
}:
with lib; let
bootstrap = pkgs.writeScript "bootstrap.sh" '' bootstrap = pkgs.writeScript "bootstrap.sh" ''
#!/usr/bin/env bash #!/usr/bin/env bash
@ -40,8 +44,7 @@ let
''; '';
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.docker-ci-runner; cfg = config.pub-solar.docker-ci-runner;
in in {
{
options.pub-solar.docker-ci-runner = { options.pub-solar.docker-ci-runner = {
enable = lib.mkEnableOption "Enables a docker container running a drone exec runner as unprivileged user."; enable = lib.mkEnableOption "Enables a docker container running a drone exec runner as unprivileged user.";
@ -88,7 +91,7 @@ in
image = "debian"; image = "debian";
autoStart = true; autoStart = true;
entrypoint = "bash"; entrypoint = "bash";
cmd = [ "/bootstrap.sh" ]; cmd = ["/bootstrap.sh"];
volumes = [ volumes = [
"${cfg.runnerVarsFile}:/run/vars" "${cfg.runnerVarsFile}:/run/vars"
@ -98,7 +101,7 @@ in
environment = cfg.runnerEnvironment; environment = cfg.runnerEnvironment;
extraOptions = lib.mkIf cfg.enableKvm [ "--device=/dev/kvm" ]; extraOptions = lib.mkIf cfg.enableKvm ["--device=/dev/kvm"];
}; };
}; };
}; };

View file

@ -34,7 +34,7 @@ in {
nodePackages.vue-language-server nodePackages.vue-language-server
nodePackages.vscode-langservers-extracted nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server nodePackages.yaml-language-server
python39Packages.python-lsp-server python3Packages.python-lsp-server
python3Full python3Full
solargraph solargraph
rnix-lsp rnix-lsp
@ -43,7 +43,8 @@ in {
universal-ctags universal-ctags
]; ];
plugins = with pkgs.vimPlugins; [ ] plugins = with pkgs.vimPlugins;
[]
++ lib.optionals (!cfg.lite) [ ++ lib.optionals (!cfg.lite) [
nvim-cmp nvim-cmp
cmp-nvim-lsp cmp-nvim-lsp

View file

@ -39,7 +39,7 @@ in {
libvirt-glib libvirt-glib
qemu qemu
virt-manager virt-manager
python38Packages.libvirt python3Packages.libvirt
gvfs gvfs
edk2 edk2
OVMF OVMF

View file

@ -1,4 +1,5 @@
self: with self; let self:
with self; let
looking-glass-client = self.looking-glass-client.overrideAttrs (old: { looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
meta.platforms = ["x86_64-linux" "aarch64-linux"]; meta.platforms = ["x86_64-linux" "aarch64-linux"];
}); });

View file

@ -1,19 +1,20 @@
self: with self; let self:
websocket-client = python39.pkgs.buildPythonPackage rec { with self; let
websocket-client = python3.pkgs.buildPythonPackage rec {
pname = "websocket-client"; pname = "websocket-client";
version = "1.2.1"; version = "1.2.1";
doCheck = false; doCheck = false;
src = python39.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-jftxXYqZL1cS//jIQ62ulOIrIqmbLF5rDsShqYHMTg0="; sha256 = "sha256-jftxXYqZL1cS//jIQ62ulOIrIqmbLF5rDsShqYHMTg0=";
}; };
}; };
in in
python39.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
pname = "Mopidy-Jellyfin"; pname = "Mopidy-Jellyfin";
version = "1.0.2"; version = "1.0.2";
doCheck = false; doCheck = false;
propagatedBuildInputs = with python39.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
unidecode unidecode
websocket-client websocket-client
requests requests
@ -21,7 +22,7 @@ in
pykka pykka
mopidy mopidy
]; ];
src = python39.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g="; sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g=";
}; };

View file

@ -1,4 +1,5 @@
self: with self; let self:
with self; let
uhk-agent-bin = stdenv.mkDerivation rec { uhk-agent-bin = stdenv.mkDerivation rec {
pname = "uhk-agent-bin"; pname = "uhk-agent-bin";
version = "1.5.14"; version = "1.5.14";