Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2022-01-02 22:53:37 +01:00
commit 4b977044b9
20 changed files with 60 additions and 1 deletions

View File

@ -22,6 +22,12 @@ with import <stockholm/lib>;
(krebs.genipv6 "retiolum" "makefu" { inherit hostName; }).address;
};
})
# Retiolum ed25519 keys
(let
pubkey-path = ./retiolum + "/${hostName}_ed25519.pub";
in optionalAttrs (pathExists pubkey-path) {
nets.retiolum.tinc.pubkey_ed25519 = builtins.trace "using ed25519 key for host ${hostName}" (readFile pubkey-path);
})
# Wiregrill defaults
(let
pubkey-path = ./wiregrill + "/${hostName}.pub";

View File

@ -0,0 +1 @@
zlfSyJdG7vJmvkk1Ul3ZXUix2YduFYUMhM89nRdy8aE

View File

@ -1,4 +1,3 @@
Ed25519PublicKey = Zkh6vtSNBvKYUjCPsMyAFJmxzueglCDoawVPCezKy4F
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAloXLBfZQEVW9mJ7uwOoa+DfV4ek/SG+JQuexJMugei/iNy0NjY66
OVIkzFmED32c3D7S1+Q+5Mc3eR02k1o7XERpZeZhCtJOBlS4xMzCKH62E4USvH5L

View File

@ -0,0 +1 @@
Zkh6vtSNBvKYUjCPsMyAFJmxzueglCDoawVPCezKy4F

View File

@ -0,0 +1 @@
2YSzoLSQN3k4HC8uozPb/nMmbrTa9eKOD2Ka9Iq8iXM

View File

@ -0,0 +1 @@
aQDHnUzOhf8zhMOB/ufTaP4rQLrizfN135PVgfTLkaC

View File

@ -0,0 +1 @@
3QIlv3vsykhMlsrsHUbU/vneVbYiE6G1U7HPzK2AbRI

View File

@ -0,0 +1 @@
1o7+d8jjitc1vJB1sYFY8qvbcePssD6c+sgfxqq+BXD

View File

@ -0,0 +1 @@
6M/fxVpfUCpbWvOXR9eHjt3o7sgjAEoIT/hXcDN970E

View File

@ -0,0 +1 @@
nL4hL0aJvufqdSvTafAnc/g0wjznIwuHlEq/h/OxEsF

View File

@ -0,0 +1 @@
SVuxrF4CQGRl3evQurw0wh44g72/0qwRACF+/n2i2rE

View File

@ -0,0 +1 @@
OxXCkjs3OzIsMXcSVcr7dJD55iRFRjUc0eERPdU1OjO

View File

@ -0,0 +1 @@
LegGLszL9hZXoanCQnv0VxuoLviT2K/yvQGYuCsloUH

View File

@ -0,0 +1 @@
WLUvBME38jEpXIEFniyVIjyvMw7JTNJBQb/NIXcxmzL

View File

@ -0,0 +1 @@
gzMYJY6/6sgG4ZgYWzeDs6svTvsDIeJEAGxPbrJUFVN

View File

@ -0,0 +1,8 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA+0TIo0dS9LtSdrmH0ClPHLO7dHtV9Dj7gaBAsbyuwxAI5cQgYKwr
4G6t7IcJW+Gu2bh+LKtPP91+zYXq4Qr1nAaKw4ajsify6kpxsCBzknmwi6ibIJMI
AK114dr/XSk/Pc6hOSA8kqDP4c0MZXwitRBiNjrWbTrQh6GJ3CXhmpZ2lJkoAyNP
hjdPerbTUrhQlNW8FanyQQzOgN5I7/PXsZShmb3iNKz1Ban5yWKFCVpn8fjWQs5o
Un2AKowH4Y+/g8faGemL8uy/k5xrHSrn05L92TPDUpAXrcZXzo6ao1OBiwJJVl7s
AVduOY18FU82GUw7edR0e/b2UC6hUONflwIDAQAB
-----END RSA PUBLIC KEY-----

View File

@ -0,0 +1 @@
fRPhdsYqwPuYgL2p/CmAUCVykU9GbiRfHQ8SULPQNGE

View File

@ -0,0 +1 @@
b3uia4Sns0ljQrccLE0QxzeAB4APTiJEB98neQQosdF

View File

@ -0,0 +1 @@
81FOjlXXS22WWZzLnL4sDCuXmvMoYkbhy0wlBlr60zM

View File

@ -0,0 +1,30 @@
{ lib, stdenv, fetchFromGitHub, curl
}:
stdenv.mkDerivation rec {
name = "pkgrename";
version = "1.03";
src = fetchFromGitHub {
owner = "hippie68";
repo = "pkgrename";
rev = "c3e5c47ed9367273bd09577af46d3d9bf87b2a50";
sha256 = "0cphxdpj04h1i0qf5mji3xqdsbyilvd5b4gwp4vx914r6k5f0xf3";
};
buildInputs = [ curl.dev ];
buildPhase = ''
cd pkgrename.c
gcc pkgrename.c src/*.c -o pkgrename -lcurl -s -O1 $(curl-config --cflags --libs)
'';
installPhase = ''
install -D pkgrename $out/bin/pkgrename
'';
meta = {
description = "Tool to rename ps4 .pkg files";
homepage = "https://github.com/hippie68/pkgrename";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ makefu ];
};
}