diff options
Diffstat (limited to 'krebs/5pkgs/simple')
| -rw-r--r-- | krebs/5pkgs/simple/generate-secrets/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/git-assembler.nix | 24 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/htgen/default.nix | 7 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/krebs-pages/fixtures/index.html | 21 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html | 133 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/passwdqc-utils/default.nix | 11 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/stable-generate/default.nix | 64 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/stable-interrogate/default.nix | 30 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/ukrepl.nix | 11 |
9 files changed, 96 insertions, 206 deletions
diff --git a/krebs/5pkgs/simple/generate-secrets/default.nix b/krebs/5pkgs/simple/generate-secrets/default.nix index f9a7450f7..a3c9f67c5 100644 --- a/krebs/5pkgs/simple/generate-secrets/default.nix +++ b/krebs/5pkgs/simple/generate-secrets/default.nix @@ -23,7 +23,6 @@ pkgs.writers.writeDashBin "generate-secrets" '' cat <<EOF $HOSTNAME = { - cores = 1; owner = config.krebs.users.krebs; nets = { retiolum = { diff --git a/krebs/5pkgs/simple/git-assembler.nix b/krebs/5pkgs/simple/git-assembler.nix new file mode 100644 index 000000000..095dddf0f --- /dev/null +++ b/krebs/5pkgs/simple/git-assembler.nix @@ -0,0 +1,24 @@ +{ pkgs, stdenv }: + +stdenv.mkDerivation rec { + pname = "git-assembler"; + version = "1.3"; + + src = pkgs.fetchFromGitLab { + owner = "wavexx"; + repo = "git-assembler"; + rev = "v${version}"; + hash = "sha256-A+ygt6Fxiu6EkVoQU5L1rhxu2e1HU0nbqJFzLzXzHBo="; + }; + + buildInputs = [ + pkgs.python3 + ]; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out/bin + cp git-assembler $out/bin + ''; +} diff --git a/krebs/5pkgs/simple/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix index 14b6f4c58..1ee13783b 100644 --- a/krebs/5pkgs/simple/htgen/default.nix +++ b/krebs/5pkgs/simple/htgen/default.nix @@ -1,13 +1,12 @@ { fetchgit, lib, pkgs, stdenv }: stdenv.mkDerivation rec { pname = "htgen"; - version = "1.3.1"; + version = "1.4.0"; - #src = <htgen>; src = fetchgit { - url = "http://cgit.krebsco.de/htgen"; + url = "https://cgit.krebsco.de/htgen"; rev = "refs/tags/${version}"; - sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r"; + sha256 = "1k6xdr4g1p2wjiyizwh33ihw3azbar7kmhyxywcq0whpip9inpmj"; }; installPhase = '' diff --git a/krebs/5pkgs/simple/krebs-pages/fixtures/index.html b/krebs/5pkgs/simple/krebs-pages/fixtures/index.html index e6b7034b3..68b2cbad6 100644 --- a/krebs/5pkgs/simple/krebs-pages/fixtures/index.html +++ b/krebs/5pkgs/simple/krebs-pages/fixtures/index.html @@ -24,19 +24,10 @@ } </script> <body> - <p> - <a href="http://krebscode.github.io/minikrebs/linuxtag"> - Linuxtag Heckenkrebs Presentation - </a> - </p> - <p> - <a href="http://krebscode.github.io/writeups"> - CTF Writeups - </a> - </p> - <p> - <a href="thesauron.html"> - Thesauron - </a> - </p> + <p><a href='https://cgit.krebsco.de/krops/about/'>krops</a></p> + <p><a href='https://github.com/krebs/cholerab/blob/master/thesauron.adoc'>Thesauron</a></p> + <p><a href='https://nixos.wiki/'>Project: The new NixOS wiki</a></p> + <p><a target="_blank" href="https://www.amazon.de/?&_encoding=UTF8&tag=krebscode06-21&linkCode=ur2&linkId=d4430b368b8aceeca92101cd4a4cdd1d&camp=1638&creative=6742">Go through this amazon affiliate link and generate krebsgold</a><img src="//ir-de.amazon-adsystem.com/e/ir?t=krebscode06-21&l=ur2&o=3" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" /></p> + <p> <a href="https://s.click.aliexpress.com/e/_A5luNt" target="_parent">Go through this aliexpress affiliate link and generate krebsgold</a></p> + </body> diff --git a/krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html b/krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html deleted file mode 100644 index bcf1c5d48..000000000 --- a/krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html +++ /dev/null @@ -1,133 +0,0 @@ -<p>Cholerab n. -[de] -- Kunstwort aus Kollaboration und Cholera. Beschreibt den Zustand, dass - Zusammenarbeit niemals gut, einfach und ohne Schmerzen funktioniert. -- Teamwork-Plattform für Krebscode.</p> - -<p>eigentlich adv. -[de] -- Hinweis darauf, dass der Inhalt eines Satzes eine Soll-Realität beschreibt, - die nicht der Fall ist. -Antonym: tatsaechlich</p> - -<p>ghost n. -[de] -- Host im Darknet welcher evtl. irgendwie noch da ist (als dd image auf anderen - Festplatten) aber wohl nie wieder kommen wird. -Siehe: Wiederbelebung</p> - -<p>KD;RP abbr. (pronounciation: kah-derp) -[en] -- Short for Krebs Darknet / Retiolum Prefix.</p> - -<p>krebs -[de] -- krebs ist ein soziales Experiment, eine Organisation, das zweit aelteste - Softwareprojekt im Shack und viel verteilte infrastruktur.</p> - -<p>kremium -[en] -- coinage derived from the words premium and krebs -see: broken -usage: Reaktor ircbot has unfixed broken behavior since ever->“Kremium Software”</p> - -<p>KRI abbr. (pronounciation: [en] cry) -[en] -- Short for Krebs Request for Implementation. - Derived from Scheme Requests for Implementation (SRFI).</p> - -<p>litterate programming n. -[en] -- any code that has not been proved mathematically.</p> - -<p>Nahziel n. -[de] -- Ziel mit höchst möglicher Priorität.</p> - -<p>Nahzielerfahrung n. -[de] -- das Erlebnis der (endgültigen) Nichterreichung eines Nahziels (obwohl - nur noch wenig ((quasi-) infinitesimal viel) nötig gewesen wäre).</p> - -<p>parentheses of fear -[en] -- unnecessary parentheses, usually used when order of precedence is unknown. - - Examples: 1 + (2 * 3)</p> - -<p>Protip n. -[en] -- (Probably vague) description how a task can be solved. - - Antonym: Spoiler - - Example: - - To defeat the Cyberdaemon, shoot at it until it dies. - - RTFM</p> - -<p>Punching Lemma n. -[de] -- Sozialer Druck zur Aufrechterhaltung der Ordnung in dem sozialen Geflaecht - von Krebs</p> - -<p>ref, n. -[en] -- A reference like an URI, ISBN, name of a person, etc.</p> - -<p>reftrace, n. -[en] -- A stacktrace-like representation of refs that lead to some (any kind of) - conclusion. Usually generated by a human. The conclusion can be either on - the top or on the bottom of the stack. If the order is ambiguous, then it - should be communicated explicitly. - - Example: (conclusion first) - - http://en.wikipedia.org/wiki/Stack_trace - - google “stacktrace” (first entry / 2014–12–05T12:13:58Z) - - think about some example [this could be omitted, as it’s obvious…]</p> - -<p>Retiolum n. -[en] -- The official darknet of Krebs which utilizes the Retiolum Prefix to - address individual nodes.</p> - -<p>Retiolum Prefix n. -[en] -- The universally accepted IPv6-prefix, 42::/16. Anyone can has a - /128-subnet and, if require, anything larger.</p> - -<p>Retiolum Realtime Map n. -[en] -- The network map of the public visible part of Retiolum.</p> - -<p>RRM [abbr.][en] -- Short for Retiolum Retiolum Map.</p> - -<p>Sanatorium n. -[en] -- The Krebs Control and Command Center. -- An Retiolum-based IRC-channel where all Reaktor-enabled nodes gather - and lurk for relevant input.</p> - -<p>Spoiler n. -[en] -- A subset of walkthrough, i.e. any individual steps may be omitted. - - Antonym: Protip</p> - -<p>tatsaechlich, adv. -[de] -- Hinweis darauf, dass der Inhalt eines Satzes exakt der Realität entspricht. -Antonym: eigentlich</p> - -<p>Verkrebsung n. -[de] -- Synonym fuer die Installation von Krebs (oder eine einzelnen Krebs - Komponente) auf einem beliebigem System.</p> - -<p>Walkthrough n. -[en] -- Description of the individual steps to complete a task. - - Examples: - - program code - - small-step semantics</p> - -<p>Wiederbelebung n. -[de] -- Ein ghost wird im Darknet wieder erreichbar -Siehe: ghost</p> diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix index 4cc8d5b21..1def3167c 100644 --- a/krebs/5pkgs/simple/passwdqc-utils/default.nix +++ b/krebs/5pkgs/simple/passwdqc-utils/default.nix @@ -1,16 +1,17 @@ { fetchurl, lib, stdenv -, pam +, libxcrypt +, linux-pam , wordset-file ? null, # set your own wordset-file }: stdenv.mkDerivation rec { - name = "passwdqc-utils-${version}"; - version = "1.3.0"; - buildInputs = [ pam ]; + pname = "passwdqc-utils"; + version = "2.0.2"; + buildInputs = [ libxcrypt linux-pam ]; src = fetchurl { url = "http://www.openwall.com/passwdqc/passwdqc-${version}.tar.gz"; - sha256 = "0l3zbrp4pvah0dz33m48aqlz9nx663cc1fqhnlwr0p853b10la93"; + hash = "sha256-/x9QV2TAIPakSEseDMT9vy4/cbUikm2QtHCRBMoGBKs="; }; buildTargets = "utils"; diff --git a/krebs/5pkgs/simple/stable-generate/default.nix b/krebs/5pkgs/simple/stable-generate/default.nix index fac261613..dc9c826f9 100644 --- a/krebs/5pkgs/simple/stable-generate/default.nix +++ b/krebs/5pkgs/simple/stable-generate/default.nix @@ -1,64 +1,32 @@ { pkgs, lib, ... }: -pkgs.writers.writeDashBin "stable-generate" '' +pkgs.writers.writeBashBin "stable-generate" '' set -efu export PATH=${lib.makeBinPath [ + pkgs.coreutils pkgs.curl pkgs.jq ]} STABLE_URL=''${STABLE_URL:-http://stable-confusion.r} - PAYLOAD=$(jq -cn --arg query "$*" '{fn_index: 51, data: [ - $query, - "", - "None", - "None", - 20, # sampling steps - "Euler a", # sampling method - false, # restore faces - false, - 1, - 1, - 7, - -1, - -1, - 0, - 0, - 0, - false, - 512, #probably resolution - 512, #probably resolution - false, - 0.7, - 0, - 0, - "None", - "", - false, - false, - false, - "", - "Seed", - "", - "Nothing", - "", - true, - false, - false, - null, - "", - ""], session_hash: "hello_this_is_dog"}') + PAYLOAD=$(jq -cn --arg prompt "$*" '{ + prompt: $prompt + }') - data=$(curl -Ssf "$STABLE_URL/run/predict/" \ + filename=$(mktemp) + curl -Ssf "$STABLE_URL/sdapi/v1/txt2img" \ -X POST \ --Header 'Content-Type: application/json' \ - --data "$PAYLOAD" - ) - export data + --data "$PAYLOAD" | + jq -r '.images[0]' | + base64 --decode > "$filename" - filename=$(jq -rn 'env.data | fromjson.data[0][0].name') - - echo "$STABLE_URL/file=$filename" + if test -t 1; then + echo "$filename" + else + cat "$filename" + rm "$filename" + fi '' diff --git a/krebs/5pkgs/simple/stable-interrogate/default.nix b/krebs/5pkgs/simple/stable-interrogate/default.nix new file mode 100644 index 000000000..7cc7509eb --- /dev/null +++ b/krebs/5pkgs/simple/stable-interrogate/default.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, ... }: + +pkgs.writers.writeBashBin "stable-interrogate" '' + set -xefu + set -o pipefail + + export PATH=${lib.makeBinPath [ + pkgs.coreutils + pkgs.curl + pkgs.jq + ]} + + STABLE_URL=''${STABLE_URL:-http://stable-confusion.r} + + (if test -e "$1"; then + cat "$1" + elif [[ "$1" =~ ^https?: ]]; then + curl -fSs "$1" + else + echo 'input not recognized' >&2 + exit 1 + fi) | base64 | + jq -Rsrc '{ + image: ., + model: "deepdanbooru", # clip is broken right now :( + }' | + curl -Ssf "$STABLE_URL/sdapi/v1/interrogate" \ + -X POST -H 'Content-Type: application/json' -d @- | + jq -r '.caption' +'' diff --git a/krebs/5pkgs/simple/ukrepl.nix b/krebs/5pkgs/simple/ukrepl.nix new file mode 100644 index 000000000..bdea4181f --- /dev/null +++ b/krebs/5pkgs/simple/ukrepl.nix @@ -0,0 +1,11 @@ +{ lib, pkgs,stdenv }: +let + src = pkgs.fetchFromGitHub { + owner = "makefu"; + repo = "ukrepl"; + rev = "0baa5cc4d5c3c17af704b69a800dd1f520ded8e3"; + hash = "sha256:1lnhkf02f18fvf3l2fcszvs4x115lql17akabd5ph9ff9z33k8rv"; + }; +in + pkgs.writers.writePython3Bin "ukrepl" {} (builtins.readFile (src + "/ukrepl")) + |