sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format with nixpkgs-fmt

Browse source
This commit is contained in:
zimbatm 2021-01-03 00:07:49 +01:00
parent 2ca351fdac
commit be65264a3f
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
20 changed files with 203 additions and 213 deletions

5
build01/cache.nix
View file

@ -1,7 +1,5 @@
{ config, pkgs, ... }:
let
postBuildHook = pkgs.writeScript "post-build-hook.sh" ''
#!${pkgs.runtimeShell}
export PATH=$PATH:${pkgs.nix}/bin
@ -16,7 +14,8 @@ let
sources = import ../nix/sources.nix;
in {
in
{
nixpkgs.overlays = [
(self: super: {

3
build01/configuration.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userImports =
let
@ -7,7 +6,7 @@ let
onlyUserFiles = x:
lib.hasSuffix ".nix" x &&
x != "lib.nix"
;
;
userDirEntries = builtins.readDir ../users;
userFiles = builtins.filter onlyUserFiles (lib.attrNames userDirEntries);
in

1
build01/gitlab.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
let
gitlabModule = builtins.fetchTarball {
url = "https://gitlab.com/arianvp/nixos-gitlab-runner/-/archive/9126927c701aa399bd1734e7e5230c3a0010c1b7/nixos-gitlab-runner-9126927c701aa399bd1734e7e5230c3a0010c1b7.tar.gz";

4
build01/hardware-configuration.nix
View file

@ -8,7 +8,7 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
@ -34,7 +34,7 @@
fsType = "ext4";
};
swapDevices = [];
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 16;
}

48
build01/hydra.nix
View file

@ -1,7 +1,6 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config;
@ -17,10 +16,11 @@ let
postFixup = ''
wrapProgram "$out/bin/create-declarative-project" \
--prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]}
'';
'';
};
in {
in
{
options.services.hydra = {
adminPasswordFile = mkOption {
type = types.str;
@ -29,7 +29,7 @@ in {
declarativeProjects = mkOption {
description = "Declarative projects";
default = {};
default = { };
type = with types; attrsOf (submodule {
options = {
inputValue = mkOption {
@ -82,7 +82,7 @@ in {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://localhost:${toString(hydraPort)}";
proxyPass = "http://localhost:${toString (hydraPort)}";
extraConfig = ''
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
@ -119,12 +119,13 @@ in {
allowed-uris = https://github.com/nix-community/ https://github.com/NixOS/
'';
buildMachines = [
{
hostName = "localhost";
systems = [ "x86_64-linux" "builtin" ];
maxJobs = 8;
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" ];
}];
{
hostName = "localhost";
systems = [ "x86_64-linux" "builtin" ];
maxJobs = 8;
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" ];
}
];
};
# Create a admin user and configure a declarative project
@ -134,7 +135,7 @@ in {
TimeoutStartSec = "60";
};
wantedBy = [ "multi-user.target" ];
after = ["hydra-server.service" ];
after = [ "hydra-server.service" ];
requires = [ "hydra-server.service" ];
environment = {
inherit (cfg.systemd.services.hydra-init.environment) HYDRA_DBI;
@ -151,17 +152,18 @@ in {
export URL=http://localhost:${toString hydraPort}
'' +
(concatStringsSep "\n" (mapAttrsToList (n: v: ''
export DECL_PROJECT_NAME="${n}"
export DECL_DISPLAY_NAME="${v.displayName}"
export DECL_VALUE="${v.inputValue}"
export DECL_TYPE="${v.inputType}"
export DECL_FILE="${v.specFile}"
export DECL_DESCRIPTION="${v.description}"
export DECL_HOMEPAGE="${v.homepage}"
${createDeclarativeProjectScript}/bin/create-declarative-project
'') cfg.services.hydra.declarativeProjects));
(concatStringsSep "\n" (mapAttrsToList
(n: v: ''
export DECL_PROJECT_NAME="${n}"
export DECL_DISPLAY_NAME="${v.displayName}"
export DECL_VALUE="${v.inputValue}"
export DECL_TYPE="${v.inputType}"
export DECL_FILE="${v.specFile}"
export DECL_DESCRIPTION="${v.description}"
export DECL_HOMEPAGE="${v.homepage}"
${createDeclarativeProjectScript}/bin/create-declarative-project
'')
cfg.services.hydra.declarativeProjects));
};
};
}

2
build01/marvin-mk2.nix
View file

@ -3,7 +3,7 @@ let
userLib = import ../users/lib.nix { inherit lib; };
sources = import ../nix/sources.nix;
marvinNixpkgs = (import (sources.marvin-mk2.outPath + "/definitions.nix") {}).pkgs;
marvinNixpkgs = (import (sources.marvin-mk2.outPath + "/definitions.nix") { }).pkgs;
marvin-mk2 = marvinNixpkgs.python3.pkgs.buildPythonApplication rec {
pname = "marvin-mk2";

2
build01/matterbridge.nix
View file

@ -2,5 +2,5 @@
services.matterbridge.enable = true;
services.matterbridge.configPath = "/run/keys/matterbridge.toml";
# Allow to access /run/keys
users.users.matterbridge.extraGroups = ["keys"];
users.users.matterbridge.extraGroups = [ "keys" ];
}

5
build01/nixpkgs-update.nix
View file

@ -1,5 +1,4 @@
{ pkgs, lib, config, ... }:
let
userLib = import ../users/lib.nix { inherit lib; };
@ -20,7 +19,7 @@ let
in
{
users.groups.r-ryantm = {};
users.groups.r-ryantm = { };
users.users.r-ryantm = {
useDefaultShell = true;
isNormalUser = true; # The hub cli seems to really want stuff to be set up like a normal user
@ -42,7 +41,7 @@ in
# Used by nixpkgs-update-pypi-releases
environment.NIX_PATH = "nixpkgs=/var/cache/nixpkgs-update/nixpkgs";
serviceConfig = {
serviceConfig = {
Type = "simple";
User = "r-ryantm";
Group = "r-ryantm";

223
deployment.nix
View file

@ -1,5 +1,4 @@
with builtins;
let
secrets = import ./secrets.nix;
@ -23,119 +22,119 @@ in
build01 =
{ resources, ... }:
{
imports = [
./build01/configuration.nix
];
{
imports = [
./build01/configuration.nix
];
deployment.targetHost = "94.130.143.84";
deployment.keys.buildkite-token = {
text = removeSuffix "\n" secrets.buildkite-token;
user = "buildkite-agent-ci";
permissions = "0600";
};
deployment.keys.buildkite-agent-key = {
text = secrets.buildkite-agent-key;
user = "buildkite-agent-ci";
permissions = "0600";
};
deployment.keys."buildkite-agent-key.pub" = {
text = secrets."buildkite-agent-key.pub";
user = "buildkite-agent-ci";
permissions = "0600";
};
deployment.keys.gitlab-runner-registration = {
text = secrets.gitlab-runner-registration;
user = "gitlab-runner";
permissions = "0600";
};
deployment.keys."id_rsa" = {
text = secrets.github-r-ryantm-key;
destDir = "/home/r-ryantm/.ssh";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."github_token.txt" = {
text = secrets.github-r-ryantm-token;
destDir = "/var/lib/nixpkgs-update";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."github_token_with_username.txt" = {
text = "r-ryantm:${secrets.github-r-ryantm-token}";
destDir = "/var/lib/nixpkgs-update";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."marvin-mk2-key.pem" = {
text = secrets."marvin-mk2-key.pem";
destDir = "/var/lib/marvin-mk2";
user = "marvin-mk2";
group = "marvin-mk2";
permissions = "0600";
};
deployment.keys."marvin_mk2_id.txt" = {
text = secrets."marvin_mk2_id.txt";
destDir = "/var/lib/marvin-mk2";
user = "marvin-mk2";
group = "marvin-mk2";
permissions = "0600";
};
deployment.keys."marvin-mk2-webhook-secret.txt" = {
text = secrets."marvin-mk2-webhook-secret.txt";
destDir = "/var/lib/marvin-mk2";
user = "marvin-mk2";
group = "marvin-mk2";
permissions = "0600";
};
deployment.keys."matterbridge.toml" = {
text = secrets."matterbridge.toml";
user = "matterbridge";
group = "matterbridge";
permissions = "0400";
};
deployment.keys."cachix.dhall" = {
text = secrets."cachix.dhall";
destDir = "/var/lib/nixpkgs-update/cachix";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."nix-community-cachix.dhall" = {
text = secrets."nix-community-cachix.dhall";
destDir = "/var/lib/post-build-hook";
user = "root";
permissions = "0400";
};
deployment.keys.github-nixpkgs-swh-key = {
text = secrets.github-nixpkgs-swh-key;
user = "buildkite-agent-ci";
permissions = "0400";
};
deployment.keys.hydra-admin-password = {
text = secrets.hydra-admin-password;
user = "hydra";
permissions = "0400";
};
deployment.targetHost = "94.130.143.84";
deployment.keys.buildkite-token = {
text = removeSuffix "\n" secrets.buildkite-token;
user = "buildkite-agent-ci";
permissions = "0600";
};
deployment.keys.buildkite-agent-key = {
text = secrets.buildkite-agent-key;
user = "buildkite-agent-ci";
permissions = "0600";
};
deployment.keys."buildkite-agent-key.pub" = {
text = secrets."buildkite-agent-key.pub";
user = "buildkite-agent-ci";
permissions = "0600";
};
deployment.keys.gitlab-runner-registration = {
text = secrets.gitlab-runner-registration;
user = "gitlab-runner";
permissions = "0600";
};
deployment.keys."id_rsa" = {
text = secrets.github-r-ryantm-key;
destDir = "/home/r-ryantm/.ssh";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."github_token.txt" = {
text = secrets.github-r-ryantm-token;
destDir = "/var/lib/nixpkgs-update";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."github_token_with_username.txt" = {
text = "r-ryantm:${secrets.github-r-ryantm-token}";
destDir = "/var/lib/nixpkgs-update";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."marvin-mk2-key.pem" = {
text = secrets."marvin-mk2-key.pem";
destDir = "/var/lib/marvin-mk2";
user = "marvin-mk2";
group = "marvin-mk2";
permissions = "0600";
};
deployment.keys."marvin_mk2_id.txt" = {
text = secrets."marvin_mk2_id.txt";
destDir = "/var/lib/marvin-mk2";
user = "marvin-mk2";
group = "marvin-mk2";
permissions = "0600";
};
deployment.keys."marvin-mk2-webhook-secret.txt" = {
text = secrets."marvin-mk2-webhook-secret.txt";
destDir = "/var/lib/marvin-mk2";
user = "marvin-mk2";
group = "marvin-mk2";
permissions = "0600";
};
deployment.keys."matterbridge.toml" = {
text = secrets."matterbridge.toml";
user = "matterbridge";
group = "matterbridge";
permissions = "0400";
};
deployment.keys."cachix.dhall" = {
text = secrets."cachix.dhall";
destDir = "/var/lib/nixpkgs-update/cachix";
user = "r-ryantm";
group = "r-ryantm";
permissions = "0600";
};
deployment.keys."nix-community-cachix.dhall" = {
text = secrets."nix-community-cachix.dhall";
destDir = "/var/lib/post-build-hook";
user = "root";
permissions = "0400";
};
deployment.keys.github-nixpkgs-swh-key = {
text = secrets.github-nixpkgs-swh-key;
user = "buildkite-agent-ci";
permissions = "0400";
};
deployment.keys.hydra-admin-password = {
text = secrets.hydra-admin-password;
user = "hydra";
permissions = "0400";
};
};
}

4
nix/default.nix
View file

@ -4,8 +4,8 @@ let
pkgs = import sources.nixpkgs {
inherit system;
config = {};
config = { };
overlays = import ./overlays.nix;
};
in
pkgs
pkgs

15
nix/overlays.nix
View file

@ -7,7 +7,7 @@ let
;
terraform-provider-vpsadmin =
pkgs.callPackage ./terraform-provider-vpsadmin.nix {};
pkgs.callPackage ./terraform-provider-vpsadmin.nix { };
terraform = pkgs.terraform.withPlugins (
p: [
@ -20,10 +20,9 @@ let
};
in
[
(self: super: { sources = import ./sources.nix; })
(self: super: {
nix-community-infra = nix-community-infra super;
})
]
[
(self: super: { sources = import ./sources.nix; })
(self: super: {
nix-community-infra = nix-community-infra super;
})
]

91
nix/sources.nix
View file

@ -1,7 +1,5 @@
# This file has been generated by Niv.
let
#
# The fetchers. fetch_<type> fetches specs of type <type>.
#
@ -10,29 +8,29 @@ let
let
name' = sanitizeName name + "-src";
in
if spec.builtin or true then
builtins_fetchurl { inherit (spec) url sha256; name = name'; }
else
pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
if spec.builtin or true then
builtins_fetchurl { inherit (spec) url sha256; name = name'; }
else
pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
fetch_tarball = pkgs: name: spec:
let
name' = sanitizeName name + "-src";
in
if spec.builtin or true then
builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
else
pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
if spec.builtin or true then
builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
else
pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
fetch_git = name: spec:
let
ref =
if spec ? ref then spec.ref else
if spec ? branch then "refs/heads/${spec.branch}" else
if spec ? tag then "refs/tags/${spec.tag}" else
abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
if spec ? branch then "refs/heads/${spec.branch}" else
if spec ? tag then "refs/tags/${spec.tag}" else
abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
in
builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
builtins.fetchGit { url = spec.repo; inherit (spec) rev;inherit ref; };
fetch_local = spec: spec.path;
@ -66,16 +64,16 @@ let
hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
hasThisAsNixpkgsPath = <nixpkgs> == ./.;
in
if builtins.hasAttr "nixpkgs" sources
then sourcesNixpkgs
else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
import <nixpkgs> {}
else
abort
''
Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
add a package called "nixpkgs" to your sources.json.
'';
if builtins.hasAttr "nixpkgs" sources
then sourcesNixpkgs
else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
import <nixpkgs> { }
else
abort
''
Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
add a package called "nixpkgs" to your sources.json.
'';
# The actual fetching function.
fetch = pkgs: name: spec:
@ -98,7 +96,7 @@ let
saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
in
if ersatz == "" then drv else ersatz;
if ersatz == "" then drv else ersatz;
# Ports of functions for older nix versions
@ -109,7 +107,7 @@ let
);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@ -120,43 +118,46 @@ let
concatStrings = builtins.concatStringsSep "";
# https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
optionalAttrs = cond: as: if cond then as else {};
optionalAttrs = cond: as: if cond then as else { };
# fetchTarball version that is compatible between all the versions of Nix
builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchTarball;
in
if lessThan nixVersion "1.12" then
fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
else
fetchTarball attrs;
if lessThan nixVersion "1.12" then
fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
else
fetchTarball attrs;
# fetchurl version that is compatible between all the versions of Nix
builtins_fetchurl = { url, name ? null, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchurl;
in
if lessThan nixVersion "1.12" then
fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
else
fetchurl attrs;
if lessThan nixVersion "1.12" then
fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
else
fetchurl attrs;
# Create the final "sources" from the config
mkSources = config:
mapAttrs (
name: spec:
if builtins.hasAttr "outPath" spec
then abort
"The values in sources.json should not have an 'outPath' attribute"
else
spec // { outPath = replace name (fetch config.pkgs name spec); }
) config.sources;
mapAttrs
(
name: spec:
if builtins.hasAttr "outPath" spec
then
abort
"The values in sources.json should not have an 'outPath' attribute"
else
spec // { outPath = replace name (fetch config.pkgs name spec); }
)
config.sources;
# The "config" used by the fetchers
mkConfig =
{ sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
, sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
, sources ? if isNull sourcesFile then { } else builtins.fromJSON (builtins.readFile sourcesFile)
, system ? builtins.currentSystem
, pkgs ? mkPkgs sources system
}: rec {
@ -168,4 +169,4 @@ let
};
in
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }

1
users/adisbladis.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [

1
users/flokli.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [

1
users/lewo.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [

6
users/lib.nix
View file

@ -11,7 +11,7 @@ in
n = builtins.map (c: lib.mod (ord c) 10) chars;
s = builtins.concatStringsSep "" (builtins.map (i: builtins.toString i) n);
in
assert builtins.stringLength id >= 4;
assert builtins.length chars == 4;
1000 + lib.toInt s;
assert builtins.stringLength id >= 4;
assert builtins.length chars == 4;
1000 + lib.toInt s;
}

1
users/ryantm.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [

1
users/timokau.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [

1
users/worldofpeace.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [

1
users/zimbatm.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
let
userLib = import ./lib.nix { inherit lib; };
keys = [