movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

treewide: format all inactive Nix files

Browse source 
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
This commit is contained in:
Silvan Mosberger 2024-12-10 20:26:33 +01:00
parent b32a094368
commit 4f0dadbf38
21293 changed files with 701351 additions and 428307 deletions
Download patch file Download diff file Expand all files Collapse all files

67
nixos/modules/services/continuous-integration/jenkins/default.nix
View file

@ -1,8 +1,14 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.jenkins;
jenkinsUrl = "http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}";
in {
in
{
options = {
services.jenkins = {
enable = lib.mkOption {
@ -33,7 +39,10 @@ in {
extraGroups = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
example = [ "wheel" "dialout" ];
example = [
"wheel"
"dialout"
];
description = ''
List of extra groups that the "jenkins" user should be a part of.
'';
@ -81,7 +90,13 @@ in {
package = lib.mkPackageOption pkgs "jenkins" { };
packages = lib.mkOption {
default = [ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ];
default = [
pkgs.stdenv
pkgs.git
pkgs.jdk17
config.programs.ssh.package
pkgs.nix
];
defaultText = lib.literalExpression "[ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ]";
type = lib.types.listOf lib.types.package;
description = ''
@ -158,7 +173,8 @@ in {
pkgs.dejavu_fonts
] ++ lib.optional cfg.withCLI cfg.package;
variables = {}
variables =
{ }
// lib.optionalAttrs cfg.withCLI {
# Make it more convenient to use the `jenkins-cli`.
JENKINS_URL = jenkinsUrl;
@ -188,32 +204,35 @@ in {
environment =
let
selectedSessionVars =
lib.filterAttrs (n: v: builtins.elem n [ "NIX_PATH" ])
config.environment.sessionVariables;
selectedSessionVars = lib.filterAttrs (
n: v: builtins.elem n [ "NIX_PATH" ]
) config.environment.sessionVariables;
in
selectedSessionVars //
{ JENKINS_HOME = cfg.home;
NIX_REMOTE = "daemon";
} //
cfg.environment;
selectedSessionVars
// {
JENKINS_HOME = cfg.home;
NIX_REMOTE = "daemon";
}
// cfg.environment;
path = cfg.packages;
# Force .war (re)extraction, or else we might run stale Jenkins.
preStart =
let replacePlugins =
lib.optionalString (cfg.plugins != null) (
let pluginCmds = lib.mapAttrsToList
(n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")
cfg.plugins;
in ''
rm -r ${cfg.home}/plugins || true
mkdir -p ${cfg.home}/plugins
${lib.concatStringsSep "\n" pluginCmds}
'');
in ''
let
replacePlugins = lib.optionalString (cfg.plugins != null) (
let
pluginCmds = lib.mapAttrsToList (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi") cfg.plugins;
in
''
rm -r ${cfg.home}/plugins || true
mkdir -p ${cfg.home}/plugins
${lib.concatStringsSep "\n" pluginCmds}
''
);
in
''
rm -rf ${cfg.home}/war
${replacePlugins}
'';