From b54497332b822109033aa6441bf15e4f199cfc57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Sat, 1 Jun 2019 22:13:58 +0200
Subject: [PATCH] catullus: add libcoap

---
 packages/libcoap.nix               | 29 ++++++++++++++++++++++++++++
 systems/catullus/configuration.nix | 31 +++++++++++++-----------------
 systems/catullus/containers.nix    |  4 ++--
 3 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 packages/libcoap.nix

diff --git a/packages/libcoap.nix b/packages/libcoap.nix
new file mode 100644
index 0000000..b8b8622
--- /dev/null
+++ b/packages/libcoap.nix
@@ -0,0 +1,29 @@
+{ fetchFromGitHub, automake, autoconf, which, libtool, stdenv }:
+stdenv.mkDerivation {
+  name = "libcoap";
+  src = fetchFromGitHub {
+    repo = "libcoap";
+    owner = "obgm";
+    rev = "25863042ae1e95138776f65c772f9fa6ce60495c";
+    fetchSubmodules = true;
+    sha256 = "1nic584jwkndg0w831h0fnxk0zx0apf2lw5md079m3di7zcxs6bw";
+  };
+  buildInputs = [
+    automake
+    autoconf
+    which
+    libtool
+  ];
+  preConfigure = ''./autogen.sh'';
+  configureFlags = [
+    "--disable-documentation"
+    "--disable-shared"
+  ];
+  meta = with stdenv.lib; {
+    homepage = https://github.com/obgm/libcoap;
+    description = "A CoAP (RFC 7252) implementation in C";
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.kmein ];
+  };
+}
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index eebcddf..429c3c2 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -8,30 +8,18 @@ let
 in {
   imports = [
     ./hardware-configuration.nix
-    <system/containers.nix>
+    ./containers.nix
     <configs/save-space.nix>
     <configs/nixpkgs-unstable.nix>
     <modules/retiolum.nix>
     <modules/telegram-bot.nix>
     <configs/distrobump.nix>
-    {
-      sound.enable = true;
-
-      sound.extraConfig = ''
-        defaults.ctl.card 1
-        defaults.pcm.card 1
-      '';
-
-      hardware.pulseaudio = {
-        enable = true;
-        systemWide = true;
-        package = pkgs.pulseaudioFull;
-      };
-
-      users.users.root.extraGroups = [ "audio" ];
-    }
   ];
 
+  nixpkgs.config.packageOverrides = pkgs: {
+    libcoap = pkgs.callPackage <packages/libcoap.nix> {};
+  };
+
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
 
@@ -48,7 +36,14 @@ in {
   environment.variables.HTOPRC = toString <dot/htoprc>;
 
   programs.tmux.enable = true;
-  environment.systemPackages = with pkgs; [ git vim htop wget ];
+
+  environment.systemPackages = with pkgs; [
+    git
+    vim
+    htop
+    wget
+    libcoap
+  ];
 
   users.mutableUsers = false;
 
diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix
index f7f42f3..ddb9cf0 100644
--- a/systems/catullus/containers.nix
+++ b/systems/catullus/containers.nix
@@ -3,8 +3,8 @@ let
   telebots-package = pkgs.fetchFromGitHub {
     owner = "kmein";
     repo = "telebots";
-    rev = "aaf9d3efe1b97234ad2c941c622ce9ee3b28a6a6";
-    sha256 = "0fvhgzy42khxv8j4v2flgphcr0fg6yrp9857c7zn1mic6cwwnyw5";
+    rev = "b4276155114ee96cd3f320e361e52952ea700db6";
+    sha256 = "08rp1pcisk4zzhxdlgrlhxa0sbza5qhxa70rjycg4r7fmixkkbz2";
   };
   proverb-bot-package = pkgs.fetchFromGitHub {
     owner = "kmein";