v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

updates
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse source
This commit is contained in:
Vivian 2023-04-24 09:35:28 +02:00
parent 1de0699aa3
commit 15631ffcfe
8 changed files with 28 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.woodpecker.yml
View file

@ -1,7 +1,3 @@
clone:
git:
image: rancher/pause
pipeline:
check:
image: nixos/nix:2.15.0

30
flake.lock
View file

@ -88,11 +88,11 @@
"stable": "stable"
},
"locked": {
"lastModified": 1675730932,
"narHash": "sha256-XcmirehPIcZGS7PzkS3WvAYQ9GBlBvCxYToIOIV2PVE=",
"lastModified": 1682202576,
"narHash": "sha256-vcTEEEHKx4PTfY80bUmZMwXRy0cTDJCkULHhqe1HJS8=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "e034c15825c439131e4489de5a82cf8e5398fa61",
"rev": "089431737e283ed3e402a7dff578cb442444c431",
"type": "github"
},
"original": {
@ -484,11 +484,11 @@
]
},
"locked": {
"lastModified": 1682176386,
"narHash": "sha256-xwYjQ8PjfdHlggi8Dq0PXWby/1oXegSUuNuBvoTcnpA=",
"lastModified": 1682273416,
"narHash": "sha256-YvRc5TOyf92Fcvt6cYfsqxfjqalAUME3Klv4IbdhkBE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6169690ae38175295605d521bd778d999fbd85cd",
"rev": "a5a294a622a7d3a837aaa145334e4d813c1bc5b1",
"type": "github"
},
"original": {
@ -799,11 +799,11 @@
},
"nixpkgs_22-11": {
"locked": {
"lastModified": 1682134069,
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
"lastModified": 1682173319,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
"type": "github"
},
"original": {
@ -831,11 +831,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1681920287,
"narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=",
"lastModified": 1682181988,
"narHash": "sha256-CYWhlNi16cjGzMby9h57gpYE59quBcsHPXiFgX4Sw5k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
"rev": "6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe",
"type": "github"
},
"original": {
@ -946,11 +946,11 @@
},
"nur": {
"locked": {
"lastModified": 1682197907,
"narHash": "sha256-lmN70ThAOkTTHu2uul1GE6oU6En+b1yFpLY8obzJopU=",
"lastModified": 1682319022,
"narHash": "sha256-v5pkzaE8ygTEyK4Sqtwn+hgMxXfo+kySRBQenPD+P2o=",
"owner": "nix-community",
"repo": "NUR",
"rev": "56f2104ae98978ae8d351a43f6f6226364d844aa",
"rev": "08e8360bdeda32317aa4060c8c5b2c55136ae82b",
"type": "github"
},
"original": {

2
nixos/hosts/hades/minio/configuration.nix
View file

@ -13,6 +13,6 @@ in {
services.minio = {
enable = true;
rootCredentialsFile = "${vs.minio}/environment";
package = pkgs.v.minio-old;
package = pkgs.minio_legacy_fs;
};
}

2
nixos/hosts/olympus/minio/configuration.nix
View file

@ -27,7 +27,7 @@ in {
services.minio = {
enable = true;
package = pkgs.v.minio-old;
package = pkgs.minio_legacy_fs;
rootCredentialsFile = "${vs.minio}/environment";
listenAddress = ":${toString listenPort}";
consoleAddress = ":${toString consolePort}";

3
nixos/hosts/thalassa/aoife/configuration.nix
View file

@ -120,4 +120,7 @@
];
nix.settings.extra-sandbox-paths =
[ (toString config.programs.ccache.cacheDir) ];
# Enable Ozone rendering for Chromium and Electron apps.
environment.sessionVariables.NIXOS_OZONE_WL = "1";
}

9
nixos/hosts/thalassa/aoife/home/default.nix
View file

@ -14,7 +14,7 @@ in {
imports = [
./dconf.nix
./theme.nix
./neovim.nix
./neovim.nix
];
home.packages = with pkgs; [
@ -189,5 +189,12 @@ in {
videos = "${home}/cloud/Videos";
};
# xdg.configFile."electron-flags.conf".text = ''
# --enable-features=UseOzonePlatform
# --ozone-platform=wayland
# --enable-features=WaylandWindowDecorations
# --ozone-platform-hint=auto
# '';
services.syncthing.enable = true;
}

3
nixos/pkgs/default.nix
View file

@ -1,9 +1,6 @@
# nix-build -E 'with import <nixpkgs> {}; callPackage ./default.nix {}'
final: prev: {
v = {
# nixos 22.11 version of minio, need to upgrade backend from fs to xl
minio-old = prev.callPackage ./minio-old { };
glitch-soc = prev.callPackage ./glitch-soc { };
deemix-gui = prev.callPackage ./deemix-gui { };

51
nixos/pkgs/minio-old/default.nix
View file

@ -1,51 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
let
# The web client verifies, that the server version is a valid datetime string:
# https://github.com/minio/minio/blob/3a0e7347cad25c60b2e51ff3194588b34d9e424c/browser/app/js/web.js#L51-L53
#
# Example:
# versionToTimestamp "2021-04-22T15-44-28Z"
# => "2021-04-22T15:44:28Z"
versionToTimestamp = version:
let
splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1;
in
builtins.concatStringsSep "" [ (builtins.elemAt splitTS 0) (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) ];
in
buildGoModule rec {
pname = "minio";
version = "2022-10-24T18-35-07Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-sABNzhyfBNU5pWyE/VWHUzuSyKsx0glj01ectJPakV8=";
};
vendorSha256 = "sha256-wB3UiuptT6D0CIUlHC1d5k0rjIxNeh5yAWOmYpyLGmA=";
doCheck = false;
subPackages = [ "." ];
CGO_ENABLED = 0;
tags = [ "kqueue" ];
ldflags = let t = "github.com/minio/minio/cmd"; in [
"-s" "-w" "-X ${t}.Version=${versionToTimestamp version}" "-X ${t}.ReleaseTag=RELEASE.${version}" "-X ${t}.CommitID=${src.rev}"
];
passthru.tests.minio = nixosTests.minio;
meta = with lib; {
homepage = "https://www.minio.io/";
description = "An S3-compatible object storage server";
changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";
maintainers = with maintainers; [ eelco bachp ];
platforms = platforms.unix;
license = licenses.agpl3Plus;
};
}