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

update fedi & add shield ip
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
Vivian 2023-04-10 12:18:47 +02:00
parent f495040478
commit c0ea8308b2
5 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/hosts/olympus/default.nix
View file

@ -152,6 +152,12 @@
mac = "1C:69:7A:62:30:88";
nix = false;
};
"shield" = {
ip = "10.42.42.43";
ip6 = "2001:41f0:9639:1::43";
mac = "48:b0:2d:4e:29:c0";
nix = false;
};
"eevee" = {
ip = "10.42.42.69";
ip6 = "2001:41f0:9639:1:a83:e416:dc99:5ed3";

4
nixos/pkgs/glitch-soc/default.nix
View file

@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
# sha256 = lib.fakeSha256;
sha256 = "sha256-LfpNEZAV4xCiPDQrSOezgRqOLQgDqMplIbu48dOlk3k=";
#sha256 = lib.fakeSha256;
sha256 = "sha256-uDQ06rWvXxwSv7I41Gu7RMKKiB+cA21Jq/gfWpfZ6Mg=";
};
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];

70
nixos/pkgs/glitch-soc/gemset.nix
View file

@ -240,10 +240,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "096ah69q3nqrjbwzax6ln60c9j38zlxigsin90r7i9f9jkppai8w";
sha256 = "037avf47v67zfc0g7nzax57in14s37kn1vzmarj09lmhhprxs9al";
type = "gem";
};
version = "1.711.0";
version = "1.735.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -251,10 +251,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r";
sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39";
type = "gem";
};
version = "3.170.0";
version = "3.171.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -262,10 +262,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr";
sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
type = "gem";
};
version = "1.62.0";
version = "1.63.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -273,10 +273,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp";
sha256 = "1100ir42jf60rf7kffgq16070g0sqg52pcwwnvy2113c8qk5zlkz";
type = "gem";
};
version = "1.119.1";
version = "1.119.2";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -662,10 +662,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jrr9q2sna266blc85sfsh9nbxdr85y9s76cld7m59c43xjm5mdy";
sha256 = "0vpd7d61d4pfmyb2plnnv82wmczzlhw4k4gjhd2fv4r6vq8ilqqi";
type = "gem";
};
version = "4.9.0";
version = "4.9.2";
};
devise-two-factor = {
dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@ -737,10 +737,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0skb0mbbsjcs61pixsb5g6dx45zjg0filfaynzqnyv6pgzz71sll";
sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13";
type = "gem";
};
version = "5.6.5";
version = "5.6.6";
};
dotenv = {
groups = ["default"];
@ -1537,10 +1537,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8";
type = "gem";
};
version = "2.19.1";
version = "2.20.0";
};
mail = {
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
@ -1989,10 +1989,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yl95pkan8hi7jm1kbrqn2s32h5b04i94rnnxraf1i7k39360204";
sha256 = "0p6g756bx24sj2nvrvrj09n0z51djjawijcixp5lymmphvjk3ymx";
type = "gem";
};
version = "3.3.0";
version = "3.3.1";
};
pkg-config = {
groups = ["default"];
@ -2125,10 +2125,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7";
sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw";
type = "gem";
};
version = "1.1.1";
version = "2.0.1";
};
rack-oauth2 = {
dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
@ -2519,14 +2519,14 @@
};
rubocop-capybara = {
dependencies = ["rubocop"];
groups = ["default" "development" "test"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v";
sha256 = "1pz52ml0qbxgcjlmp8y0wsq8xy398n6ypkbrwfaa8zb0v7pscj6n";
type = "gem";
};
version = "2.17.0";
version = "2.17.1";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -2545,10 +2545,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140";
sha256 = "13gx0dmi5jhs4x2617jclwc57sy4gvw3v8l91dpgc63b8dpmcim6";
type = "gem";
};
version = "2.17.4";
version = "2.18.0";
};
rubocop-rspec = {
dependencies = ["rubocop" "rubocop-capybara"];
@ -2556,20 +2556,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1";
sha256 = "1k8yh0nzlz0g8igmj5smnxq71qmi2b005nkl25wkpjkwvzn2wfdx";
type = "gem";
};
version = "2.18.1";
version = "2.19.0";
};
ruby-progressbar = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem";
};
version = "1.11.0";
version = "1.13.0";
};
ruby-saml = {
dependencies = ["nokogiri" "rexml"];
@ -2791,10 +2791,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw";
sha256 = "1m16qc3zrwx79a8p9q2xnsm2hhdd8q3vp6xihyf8j5b6dn9k5py5";
type = "gem";
};
version = "0.2.23";
version = "0.2.24";
};
statsd-ruby = {
groups = ["default"];
@ -2823,10 +2823,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yk45ri2rnp00x4mdsvwdzdd9yziqxj5v9sjk74nzw0y927y3m1w";
sha256 = "0wz4zhsp4xia8zcpi98v4sgjlv2prd515l8jz4f7j0wk45dfkjs1";
type = "gem";
};
version = "0.7.9";
version = "0.8.0";
};
swd = {
dependencies = ["activesupport" "attr_required" "httpclient"];
@ -3002,10 +3002,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp";
sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5";
type = "gem";
};
version = "1.2022.7";
version = "1.2023.3";
};
unf = {
dependencies = ["unf_ext"];
@ -3043,10 +3043,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11c4n5rri8d45c47krpg76n98mqh36l0kp2qrkb4dxnkp4flay6y";
sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc";
type = "gem";
};
version = "0.12.0";
version = "0.12.1";
};
validate_email = {
dependencies = ["activemodel" "mail"];

4
nixos/pkgs/glitch-soc/source.nix
View file

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/glitch-soc/mastodon.git";
rev = "00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69";
sha256 = "1shpwdxf2cjm0bqlsnarm6x3h7db784r7qda80bqy3ki5w65lwaf";
rev = "ff168ef2024626f37fa776fde5739dcd58ecb9f2";
sha256 = "16w1hzx45i2kf5jgy32v96l4zaa1zzmvda19yqckc48l0fxcn39p";
};
in applyPatches {
inherit src;

2
nixos/pkgs/glitch-soc/version.nix
View file

@ -1 +1 @@
"4.1.1"
"4.1.2"