darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

update stuff

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-05-09 19:47:52 +01:00
parent 6210af565d
commit 6136a45bcc
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
9 changed files with 68 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config/programs/vscode/extensions.nix
View file

@ -50,8 +50,8 @@
{
name = "copilot";
publisher = "GitHub";
version = "1.17.5850";
sha256 = "0rzrga8yz0n2gmya4q5d683m0zfflf75ms9nnl6iqd13rxgk8psa";
version = "1.18.5858";
sha256 = "0gqxqlc8n7qvl9nyi7xr2a1di77zrpapxgg9i8llnz4jr19ciah6";
}
{
name = "vscode-test-explorer";
@ -92,8 +92,8 @@
{
name = "cmake-tools";
publisher = "ms-vscode";
version = "1.11.15";
sha256 = "0gb2vdls0g7jhrc53z4qlddi27kj3cz7d3pgszlzf82w2l9cya1w";
version = "1.11.17";
sha256 = "1gl5dr8z0l8p08g858j235s5m3f2qvdkjynhz91ng45qm7hnlfy8";
}
{
name = "cpptools";
@ -134,8 +134,8 @@
{
name = "material-icon-theme";
publisher = "PKief";
version = "4.16.0";
sha256 = "1alj7xbldfj35sajfkas3fspz5n3c6h9q1016qdagns1hmdfzq80";
version = "4.17.0";
sha256 = "1dmmqc003v45pmiz6yccpnvw94hbvbg7fhy24njii0kwpxbv4q7l";
}
{
name = "vscode-yaml";
@ -192,4 +192,4 @@
sha256 = "0z0sdb5vmx1waln5k9fk6s6lj1pzpcm3hwm4xc47jz62iq8930m3";
}
];
}
}

1
config/services/mastodon.nix
View file

@ -45,6 +45,7 @@ in
S3_READ_TIMEOUT = "120";
S3_MULTIPART_THRESHOLD = "5242880";
STATSD_ADDR = "127.0.0.1:9125";
MAX_TOOT_CHARS = "58913";
};
redis.createLocally = false;
otpSecretFile = config.sops.secrets."services/mastodon/otpSecret".path;

1
flake.nix
View file

@ -91,6 +91,7 @@ rec {
sops
ssh-to-age
nix-prefetch
nix-prefetch-git
jq
bundix
];

2
packages/mastodon/default.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-Uys2iSo5PE39ixZBpKBMP3t3+q0aPNbb6aKp1P4CC2M=";
sha256 = "sha256-Wb1/jBoH7Urktcl90zlzrEidUOrGn6n33k+idR/QcpA=";
};
mastodon-gems = bundlerEnv {

123
packages/mastodon/gemset.nix
View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz";
sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh";
sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf";
sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w";
sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib";
sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi";
sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
active_model_serializers = {
dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
@ -92,10 +92,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws";
sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
activemodel = {
dependencies = ["activesupport"];
@ -103,10 +103,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195";
sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939";
sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -125,10 +125,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph";
sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -136,10 +136,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4";
sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
addressable = {
dependencies = ["public_suffix"];
@ -250,10 +250,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ilhspsph7icrrz94f3qngjkj585hsyv9bnxr44iabcqqwymr79w";
sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc";
type = "gem";
};
version = "1.579.0";
version = "1.582.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -283,10 +283,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kxcc3abjxld66ryrivfq9wxxpik8ngr2b2dr7shgrsgf5zmrkh8";
sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i";
type = "gem";
};
version = "1.113.1";
version = "1.113.2";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -379,10 +379,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14";
sha256 = "1m188ypcl2lb1hin21fmyk9d4fbjw4w7cr2k6l37jasw3rmgnvjv";
type = "gem";
};
version = "5.2.2";
version = "5.2.3";
};
browser = {
groups = ["default"];
@ -775,16 +775,6 @@
};
version = "2.7.6";
};
e2mmap = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
type = "gem";
};
version = "0.1.0";
};
ed25519 = {
groups = ["default"];
platforms = [];
@ -1556,10 +1546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr";
type = "gem";
};
version = "2.16.0";
version = "2.17.0";
};
mail = {
dependencies = ["mini_mime"];
@ -1910,10 +1900,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
type = "gem";
};
version = "3.1.1.0";
version = "3.1.2.0";
};
parslet = {
groups = ["default"];
@ -1952,10 +1942,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8";
sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a";
type = "gem";
};
version = "2.8.2";
version = "2.8.3";
};
pkg-config = {
groups = ["default"];
@ -2165,10 +2155,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv";
sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@ -2231,10 +2221,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93";
sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9";
type = "gem";
};
version = "6.1.5";
version = "6.1.5.1";
};
rainbow = {
groups = ["default" "development" "test"];
@ -2314,10 +2304,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k";
sha256 = "073f8wivvmlm6rd44k03wda0rnyhczbysxl95g8snnnrnz345ks6";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
request_store = {
dependencies = ["rack"];
@ -2420,10 +2410,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";
sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm";
type = "gem";
};
version = "3.11.0";
version = "3.11.1";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
@ -2431,10 +2421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa";
sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l";
type = "gem";
};
version = "5.1.1";
version = "5.1.2";
};
rspec-sidekiq = {
dependencies = ["rspec-core" "sidekiq"];
@ -2474,10 +2464,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk";
sha256 = "0xxkghaph53200mfria115swdq6j7p5ssc6gqr1xwvnqiw8g96qd";
type = "gem";
};
version = "1.27.0";
version = "1.28.2";
};
rubocop-ast = {
dependencies = ["parser"];
@ -2619,15 +2609,15 @@
version = "0.2.0";
};
sidekiq-scheduler = {
dependencies = ["e2mmap" "redis" "rufus-scheduler" "sidekiq" "thwait" "tilt"];
dependencies = ["redis" "rufus-scheduler" "sidekiq" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3";
sha256 = "0kn0zzpl778345a9pc3dfc7lkgr8h1gwajs6miylmyd9krkh0yfm";
type = "gem";
};
version = "3.2.0";
version = "4.0.0";
};
sidekiq-unique-jobs = {
dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];
@ -2761,10 +2751,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ixpwp14hrygif8c1wn05gh4d4nq1940p3grh95r4dqmpjdqn0sr";
sha256 = "1628qf2ynldqz20h5lkaivk166qknk15gxg130n9pvz568k1sdp8";
type = "gem";
};
version = "2.2.1";
version = "3.0.0";
};
strong_migrations = {
dependencies = ["activerecord"];
@ -2830,17 +2820,6 @@
};
version = "1.2.1";
};
thwait = {
dependencies = ["e2mmap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q0fqlh0668j66z0g3s5yhqs39368az2ycxyphsx4c5nib5r4kak";
type = "gem";
};
version = "0.2.0";
};
tilt = {
groups = ["default"];
platforms = [];

4
packages/mastodon/source.nix
View file

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/glitch-soc/mastodon";
rev = "252deefe3433d0cedafd973becd0d85b5182eb49";
sha256 = "0ld2nadl48blwcabgrp9wjx3ha750s9dvvrdf0l5dv9qy6nipw4l";
rev = "e8b8ac8908c6623f0fd7ffccc7de3882a773b72f";
sha256 = "09b783zmk8hmliyf52jf2ffyq1lyx8p39dyp80ybpd1affq09smk";
};
in applyPatches {
inherit src;

2
packages/mastodon/version.nix
View file

@ -1 +1 @@
"3.5.1"
"3.5.2"

4
packages/minecraft/luckperms.nix
View file

@ -110,6 +110,6 @@ in
}*/
fetchurl {
url = "https://ci.lucko.me/job/LuckPerms/1426/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-5.4.18.jar";
sha256 = "3fa8900bce939de37dc75622177ff3f9883fbc552a1fd6f7582e4fadbf2c4acb";
url = "https://ci.lucko.me/job/LuckPerms/1429/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-5.4.21.jar";
sha256 = "bd9090b3cf1412d77ff58ee0c2c7229184306cc83ff18ff4681ea1b7116b3747";
}

4
packages/minecraft/paper.nix
View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, bash, openjdk17_headless }:
let
mcVersion = "1.18.2";
buildNum = "313";
buildNum = "332";
jar = fetchurl {
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
sha256 = "c28b64d0fbb5c0aa268fcde7302cb3ccf67e63d4644146df7968d119a4adee51";
sha256 = "333f4a7d1d2048d222dc5a02e5c26871905f980ab6a7f394153b0818ebada49e";
};
in
stdenv.mkDerivation {