diff options
author | tv <tv@krebsco.de> | 2021-12-22 23:33:05 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2021-12-22 23:33:05 +0100 |
commit | 448cd3b9af9e39980676f8ade7e5fb80dbb58b9f (patch) | |
tree | ad3b7ccfb7107b0053ad2a80cbc2dd97a018e7a6 /krebs/5pkgs | |
parent | 2656cbf2a91f1f350e29e2ee2faa0bbe90f9b717 (diff) | |
parent | 576c05cf3a0ceddefa29c2d0073108177c3cfa52 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r-- | krebs/5pkgs/haskell/brockman/default.nix | 4 | ||||
-rw-r--r-- | krebs/5pkgs/simple/buildbot-classic/default.nix | 34 | ||||
-rw-r--r-- | krebs/5pkgs/simple/buildbot-classic/sqlparse.nix | 34 | ||||
-rw-r--r-- | krebs/5pkgs/simple/generate-krebs-intermediate-ca/default.nix | 30 | ||||
-rw-r--r-- | krebs/5pkgs/simple/rss-bridge/default.nix | 6 |
5 files changed, 35 insertions, 73 deletions
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix index de41d1886..01b7a0570 100644 --- a/krebs/5pkgs/haskell/brockman/default.nix +++ b/krebs/5pkgs/haskell/brockman/default.nix @@ -7,12 +7,12 @@ }: mkDerivation rec { pname = "brockman"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "kmein"; repo = "brockman"; rev = version; - sha256 = "0hppgban8hfyhn4c8qgm8j7ml6jaa35pjgrv3k3q27ln71wnr8rz"; + sha256 = "sha256-EKXKhGdIJRbRklD5zxJNGhOxqPzog4f9NMXo/c8iBGc="; }; isLibrary = false; isExecutable = true; diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix deleted file mode 100644 index 5e075f1a1..000000000 --- a/krebs/5pkgs/simple/buildbot-classic/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, fetchFromGitHub, python2Packages, git, ... }: let - - # we need the old sqlparse since the new one is python2 incompatible - sqlparse = python2Packages.callPackage ./sqlparse.nix {}; - -in python2Packages.buildPythonApplication rec { - name = "buildbot-classic-${version}"; - version = "0.8.18"; - namePrefix = ""; - patches = []; - - src = fetchFromGitHub { - owner = "krebs"; - repo = "buildbot-classic"; - rev = version; - sha256 = "0b4y3n9zd2gdy8xwk1vpvs4n9fbg72vi8mx4ydgijwngcmdqkjmq"; - }; - postUnpack = "sourceRoot=\${sourceRoot}/master"; - - propagatedBuildInputs = [ - python2Packages.jinja2 - python2Packages.twisted - python2Packages.dateutil - (python2Packages.sqlalchemy_migrate.override { sqlparse = sqlparse; }) - python2Packages.pysqlite - pkgs.coreutils - ]; - doCheck = false; - postInstall = '' - mkdir -p "$out/share/man/man1" - cp docs/buildbot.1 "$out/share/man/man1" - ''; -} - diff --git a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix deleted file mode 100644 index 2cbb51845..000000000 --- a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, isPy3k -}: - -buildPythonPackage rec { - pname = "sqlparse"; - version = "0.3.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548"; - }; - - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; - - # Package supports 3.x, but tests are clearly 2.x only. - doCheck = !isPy3k; - - meta = with lib; { - description = "Non-validating SQL parser for Python"; - longDescription = '' - Provides support for parsing, splitting and formatting SQL statements. - ''; - homepage = "https://github.com/andialbrecht/sqlparse"; - license = licenses.bsd3; - }; - -} diff --git a/krebs/5pkgs/simple/generate-krebs-intermediate-ca/default.nix b/krebs/5pkgs/simple/generate-krebs-intermediate-ca/default.nix new file mode 100644 index 000000000..5055a78aa --- /dev/null +++ b/krebs/5pkgs/simple/generate-krebs-intermediate-ca/default.nix @@ -0,0 +1,30 @@ +{ pkgs }: +pkgs.writers.writeDashBin "generate-intermediate-ca" '' + TMPDIR=$(mktemp -d) + trap "rm -rf $TMPDIR;" INT TERM EXIT + mkdir -p "$TMPDIR/krebs" + brain show ca/ca.key > "$TMPDIR/krebs/ca.key" + brain show ca/ca.crt > "$TMPDIR/krebs/ca.crt" + export STEPPATH="$TMPDIR/step" + cat << EOF > "$TMPDIR/intermediate.tpl" + { + "subject": {{ toJson .Subject }}, + "keyUsage": ["certSign", "crlSign"], + "basicConstraints": { + "isCA": true, + "maxPathLen": 0 + }, + "nameConstraints": { + "critical": true, + "permittedDNSDomains": ["r" ,"w"] + } + } + EOF + + ${pkgs.step-cli}/bin/step certificate create "Krebs ACME CA" intermediate_ca.crt intermediate_ca.key \ + --template "$TMPDIR/intermediate.tpl" \ + --not-after 8760h \ + --ca "$TMPDIR/krebs/ca.crt" \ + --ca-key "$TMPDIR/krebs/ca.key" \ + --no-password --insecure +'' diff --git a/krebs/5pkgs/simple/rss-bridge/default.nix b/krebs/5pkgs/simple/rss-bridge/default.nix index e0a927a1a..2ad322d48 100644 --- a/krebs/5pkgs/simple/rss-bridge/default.nix +++ b/krebs/5pkgs/simple/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "unstable-2021-04-20"; + version = "unstable-2021-12-02"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; - rev = "716f5ddc0e20c10cb77ded46380cc376913a92fd"; - sha256 = "17aqmj7rz0ysk8nj4kbjvnsjdm47d0xsypfygzzk2vagxfz5w3p8"; + rev = "f469489b569d22fb5edbd13c6e5f5abf2a4ee186"; + sha256 = "sha256-LyxcycXbOFZR0mMDMUqAOjWrHIE2ftxkAYUGBbcQF5k=="; }; patchPhase = '' |