Merge branch 'master' of https://cgit.lassul.us/stockholm

7 files changed, 95 insertions, 87 deletions

diff --git a/makefu/5pkgs/cc-tool/default.nix b/makefu/5pkgs/cc-tool/default.nix
new file mode 100644
index 000000000..71d5f8a7d
--- /dev/null
+++ b/makefu/5pkgs/cc-tool/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, pkgs, autoreconfHook ,libtool, fetchFromGitHub, boost, libusb1,
+pkgconfig,file }:
+stdenv.mkDerivation rec {
+  pname = "cc-tool";
+  version = "407fd7e";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "dashesy";
+    repo = "cc-tool";
+    rev = version;
+    sha256 = "1q7zqib4rn5l8clk2hj7078rfyrjdwxzpyg4r10is31lq22zhxqj";
+  };
+
+  buildInputs = [ boost libtool libusb1 pkgconfig autoreconfHook ];
+
+  preConfigure = ''
+    substituteInPlace configure \
+        --replace /usr/bin/file ${file}/bin/file
+
+  '';
+
+  postInstall = ''
+    install -m755 -D ./udev/90-cc-debugger.rules $out/etc/udev/rules.d/90-cc-debugger.rules
+  '';
+
+  meta = {
+    homepage = https://github.com/AKuHAK/hdl-dump ;
+    description = "copy isos to psx hdd";
+    license = lib.licenses.gpl2;
+  };
+}
diff --git a/makefu/5pkgs/custom/hydra-check/default.nix b/makefu/5pkgs/custom/hydra-check/default.nix
new file mode 100644
index 000000000..cfaaaab73
--- /dev/null
+++ b/makefu/5pkgs/custom/hydra-check/default.nix
@@ -0,0 +1,19 @@
+{ docopt, requests, beautifulsoup4, fetchFromGitHub, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "hydra-check";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = "hydra-check";
+    rev = version;
+    sha256 = "1q4n5l238lnzcms3z1ax4860inaliawqlxv7nf1wb4knl4wr26fk";
+  };
+  propagatedBuildInputs = [
+    docopt
+    requests
+    beautifulsoup4
+  ];
+  doCheck = false; # no tests
+}
diff --git a/makefu/5pkgs/custom/liveproxy/default.nix b/makefu/5pkgs/custom/liveproxy/default.nix
new file mode 100644
index 000000000..ba5ddee66
--- /dev/null
+++ b/makefu/5pkgs/custom/liveproxy/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, streamlink
+}:
+
+buildPythonPackage rec {
+  pname = "liveproxy";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "70ba2f7b57cdf19c6d971a434ed47cccb5fdfe4621baa76a3f6221e75b7f2729";
+  };
+
+  # # Package conditions to handle
+  # # might have to sed setup.py and egg.info in patchPhase
+  # # sed -i "s/<package>.../<package>/"
+  # streamlink (>=1.1.1)
+  propagatedBuildInputs = [
+    streamlink
+  ];
+
+  meta = with lib; {
+    description = "LiveProxy is a local Proxyserver between Streamlink and an URL";
+    homepage = https://github.com/back-to/liveproxy;
+    license = lib.licenses.bsd2;
+    # maintainers = [ maintainers. ];
+  };
+}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index bbd99ffe7..1b07fd5f8 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -40,6 +40,8 @@ in {
     qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
     inherit (callPackage ./devpi {}) devpi-web ;
     nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
+    liveproxy = super.pkgs.python3Packages.callPackage ./custom/liveproxy {};
+    hydra-check = super.pkgs.python3Packages.callPackage ./custom/hydra-check {};
 }
 
 // (mapAttrs (_: flip callPackage {})
diff --git a/makefu/5pkgs/libcoap/default.nix b/makefu/5pkgs/libcoap/default.nix
deleted file mode 100644
index 7e8d03edd..000000000
--- a/makefu/5pkgs/libcoap/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig,
-gettext, asciidoc, doxygen, libxml2, libxslt, docbook_xsl, ... }:
-stdenv.mkDerivation rec {
-  name = "libcoap-${version}";
-  version = "4.1.2";
-
-  src = fetchFromGitHub {
-    owner = "obgm";
-    repo = "libcoap";
-    rev = "v${version}";
-    sha256 = "0f0qq15480ja1s03vn8lzw4b3mzdgy46hng4aigi6i6qbzf29kf5";
-  };
-
-  patchPhase = ''
-    sed -i 's/$(A2X)/& --no-xmllint/' examples/Makefile.am
-  '';
-  buildInputs = [ gettext asciidoc doxygen libxml2.bin libxslt docbook_xsl];
-  nativeBuildInputs = [ autoreconfHook  autoconf-archive pkgconfig ];
-
-  meta = {
-    description = "";
-    homepage = http://coap.technology;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ makefu ];
-  };
-}
diff --git a/makefu/5pkgs/pico2wave/default.nix b/makefu/5pkgs/pico2wave/default.nix
deleted file mode 100644
index b2d18fee1..000000000
--- a/makefu/5pkgs/pico2wave/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, lib, fetchurl
-, popt
-, libredirect
-, dpkg
-, makeWrapper
-, autoPatchelfHook
-, ...
-}:
-# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=svox-pico-bin
-let
-  pkgrel="8";
-  _arch = "amd64";
-in
-stdenv.mkDerivation rec {
-  name = "pico2wave"; # svox-pico-bin
-  version = "1.0+git20130326";
-  srcs = [
-    (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico0_${version}-${pkgrel}_${_arch}.deb"; sha256 = "0b8r7r8by5kamnm960bsicimnj1a40ghy3475nzy1jvwj5xgqhrj"; })
-    (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-dev_${version}-${pkgrel}_${_arch}.deb"; sha256 = "1knjiwi117h02nbf7k6ll080vl65gxwx3rpj0fq5xkvxbqpjjbvz"; })
-    (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-data_${version}-${pkgrel}_all.deb"; sha256 = "0k0x5jh5qzzasrg766pfmls3ksj18wwdbssysvpxkq98aqg4fgmx"; })
-    (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-utils_${version}-${pkgrel}_${_arch}.deb"; sha256 = "11yk25fh4n7qz4xjg0dri68ygc3aapj1bk9cvhcwkfvm46j5lrjv"; })
-  ] ;
-
-  nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ];
-
-  dontBuild = true;
-
-  buildInputs = [ popt ];
-
-  unpackPhase = lib.concatMapStringsSep ";" (src: "dpkg-deb -x ${src} .") srcs;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r usr/. $out/
-
-    mv $out/lib/*-linux-gnu/* $out/lib/
-    rmdir $out/lib/*-linux-gnu
-
-    wrapProgram "$out/bin/pico2wave" \
-      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-      --set NIX_REDIRECTS /usr/share/pico/lang=$out/share/pico/lang
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Text-to-speech engine";
-    homepage = https://android.googlesource.com/platform/external/svox;
-    platforms = platforms.linux;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ abbradar ];
-  };
-}
diff --git a/makefu/5pkgs/studio-link/default.nix b/makefu/5pkgs/studio-link/default.nix
index 8c796b43b..8786f3574 100644
--- a/makefu/5pkgs/studio-link/default.nix
+++ b/makefu/5pkgs/studio-link/default.nix
@@ -11,17 +11,22 @@
 stdenv.mkDerivation rec {
   name = "studio-link-${version}";
   version = "17.03.1-beta";
+
   src = fetchurl {
     url = "https://github.com/Studio-Link-v2/backend/releases/download/v${version}/studio-link-standalone-linux.zip";
     sha256 = "1y21nymin7iy64hcffc8g37fv305b1nvmh944hkf7ipb06kcx6r9";
   };
-  nativeBuildInputs = [ unzip autoPatchelfHook ];
-  buildInputs = [
-      alsaLib
 
-      openssl_1_0_2
-      zlib
-      libjack2
+  nativeBuildInputs = [
+    unzip
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    alsaLib
+    openssl_1_0_2
+    zlib
+    libjack2
   ];
 
   unpackPhase = ''
@@ -29,9 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp studio-link-standalone $out/bin/studio-link
-    chmod +x $out/bin/studio-link
+    install -m755 -D studio-link-standalone $out/bin/studio-link
   '';
 
   meta = with stdenv.lib; {