Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'lass/20.09' into 20.09

Browse Source
This commit is contained in:
makefu 2020-11-16 23:17:48 +01:00
commit 5a7e35d2c3
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
krebs/3modules/external/default.nix vendored
View File

@ -319,17 +319,17 @@ in {
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAn1L8LaoLuvHnN39Vz/8Mu/G20+z2DdWeG8XCX53seG2R+Nv4K/Fb MIICCgKCAgEAyEeesa4mDNAT2QT/PxfmildhqawinWTcUiF3V2wsfy3eXJCFySKM
PikALazrN5TIxjRSRL4HEOsYAHWrHyMyRiK0RTuVZxYX4ArilpWz6+5dyt9CkPDg pRKrLnOpkd2RoLWA88o0/hAfTdel/fXRjAx8TtKlh1n+UoRhYOGqLJKUZDVGImjJ
mpUqhkpHuWO7zXnCcMVkn2ESzJaDIClLaaZP9klrGoaOJLGSJhfF/y4z8p6C/HlR xTPGCC+g4b2cNCYU3RVdttSu8+zlfO6ktkySULKbVkJN3ocQmSCmWs2tP6hYvk2i
AjxI4z+90ReRWHWj+adSd3FZnN9yfeVQwUyqohGM0tIHvLCiDVewigLOI3IWjPom 5OB3Uxw+OwhtVO76dlby6Idmc8o++ZVm3snbYsgiR7RQf9vHZHR8lKr5fZ/ycq2Q
MyUFV/UPVn0/A81C2eADgKbwn6EiJnxDtlPZWBrEJ9vd8lNWBCyGTxTcD0DuDVCe T+agY/cFLJ+jhfUi8LFtKKcqGLyKKrDywADQWTcIG+cjV33k6ftW678jvsEft6e6
yP5+r3uV2OYgQPYFrmWwCZJDu7qBdR4MpPP974iPFZ7WCHrvqQQNPYNZ78zBVA4x 2RgspZX5XciTbMPIPGMcH5NZPXi6youcUcqcqDtok7Y1Jj3N5dSmJno5ojyKolZp
YPNpXxp7i3Q10Vnp5fDQlxy+tfE9deeS3vk15Ydyc6gC2D9YClch720cAtPemgs3 PRt4bPx9WuerjzwL5gG9E6n6l24neX6Mq7RDyJfBYtpUvZblezXWUuoReGNczAvj
F1O9Uc1PfJkUS5T0t9dpxH/0k6GZ9RQyJGCW7nupWTXmnDW7+TTjszLX3KYmG7XO zZrAKXKnuCEgQ/du7pT8V6qHG5NjovIMm0VDxOJV5jBL4NUox3PGbW5g0vS/nxHc
pQiic0oMvSCHwEPygnHTLWSt7rroje84htbatzplpQo8GS2tffieOEsgOaHp8TNr xKWPq+4zoyA6MsL9sGCqIlSWEqNnSERX19GbJZNYjm1J+aGZ/fZ+MaDJGuCzlxn4
QkRQnNbkAermVod6yK7wtutOk55f7WtYSCw+Kdo/pdQQQpcayKpTBikUQgdGwtTV yjLBuuXSkIrPxxtIV+Yh8Wy5qDNRN7XS1wNxUcmjQn0+7Ou/4W+cTWJ/+yZyC1DK
z9V1ZlEoLaaRxqisT4DB8279Bzy3QRV+eSHMMqw3+ePjxn7NbJxFn3sCAwEAAQ== uYEZh8YBMJo0E4bR4s04SFA6uLIvLigPELxzb0jwZSKXRnQhay6zzZ0CAwEAAQ==
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
''; '';
}; };

2
krebs/5pkgs/simple/htgen-imgur/default.nix
View File

@ -2,7 +2,7 @@ with import <stockholm/lib>;
{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, utillinux, stdenv }: { attr, coreutils, exiv2, findutils, gnugrep, jq, nix, utillinux, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "htgen-imgur"; pname = "htgen-imgur";
version = "1.1.0"; version = "1.0.0";
src = ./src; src = ./src;

20
krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
View File

@ -27,15 +27,13 @@ basic_response() {(
} }
') ')
if test "$HTGEN_VERBOSE" = true; then printf "HTTP/1.1 $status_code $status_reason\r\n"
printf "HTTP/1.1 $status_code $status_reason\r\n" printf 'Connection: close\r\n'
printf 'Connection: close\r\n' printf 'Content-Length: %d\r\n' $(expr ${#response_body} + 1)
printf 'Content-Length: %d\r\n' $(expr ${#response_body} + 1) printf 'Content-Type: application/json; charset=UTF-8\r\n'
printf 'Content-Type: application/json; charset=UTF-8\r\n' printf 'Server: %s\r\n' "$Server"
printf 'Server: %s\r\n' "$Server" printf '\r\n'
printf '\r\n' printf '%s\n' "$response_body"
printf '%s\n' "$response_body"
fi
)} )}
@ -80,9 +78,7 @@ case "$Method $path" in
trap "rm $content >&2" EXIT trap "rm $content >&2" EXIT
case ${req_expect-} in 100-continue) case ${req_expect-} in 100-continue)
if test "$HTGEN_VERBOSE" = true; then printf 'HTTP/1.1 100 Continue\r\n\r\n'
printf 'HTTP/1.1 100 Continue\r\n\r\n'
fi
esac esac
head -c $req_content_length > $content head -c $req_content_length > $content

6
krebs/nixpkgs.json
View File

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "896270d629efd47d14972e96f4fbb79fc9f45c80", "rev": "f41c0fc7d8e49d94220f74495d4d702922df2a67",
"date": "2020-11-10T22:42:32+01:00", "date": "2020-11-15T21:38:00-06:00",
"sha256": "0xmjjayg19wm6cn88sh724mrsdj6mgrql6r3zc0g4x9bx4y342p7", "sha256": "01wim7ayn69y056q28ifw2f0mdypidpc0z15dda54aj5yy5vai09",
"fetchSubmodules": false "fetchSubmodules": false
} }