From 2d25196a960b6a4e33d8b9f365db26192034fc45 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Feb 2020 13:51:03 +0100 Subject: ma pkgs.pico2wave: use upstream --- makefu/5pkgs/pico2wave/default.nix | 51 -------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 makefu/5pkgs/pico2wave/default.nix (limited to 'makefu/5pkgs') 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 ]; - }; -} -- cgit v1.2.3 From ff29e9067a7f014c690fd2878f3e26425554a8cb Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:34:29 +0100 Subject: ma pkgs.hydra-check: init --- makefu/5pkgs/hydra-check/default.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 makefu/5pkgs/hydra-check/default.nix (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/hydra-check/default.nix b/makefu/5pkgs/hydra-check/default.nix new file mode 100644 index 000000000..b9930b4f4 --- /dev/null +++ b/makefu/5pkgs/hydra-check/default.nix @@ -0,0 +1,21 @@ +{ python3Packages, fetchFromGitHub }: + +with python3Packages; +buildPythonPackage rec { + name = "hydra-check"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "makefu"; + repo = "hydra-check"; + rev = version; + sha256 = "0359s9rvl2q23a3yddhbn6w2sd5r1f1jl6whyik7qql7blpcvyi7"; + }; + propagatedBuildInputs = [ + docopt + requests + beautifulsoup4 + ]; + + checkInputs = [ black jq ]; +} -- cgit v1.2.3 From bf5a5fb3e0f70aeda37900e1c5ce478a2b07a764 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:37:24 +0100 Subject: ma pkgs.studio-link: use install, cleanup --- makefu/5pkgs/studio-link/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'makefu/5pkgs') 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; { -- cgit v1.2.3 From a2d343e8070097de9c62f86dfd8cca883f55cd53 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:39:32 +0100 Subject: ma pkgs.hydra-check: move to custom --- makefu/5pkgs/custom/hydra-check/default.nix | 19 +++++++++++++++++++ makefu/5pkgs/hydra-check/default.nix | 21 --------------------- 2 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 makefu/5pkgs/custom/hydra-check/default.nix delete mode 100644 makefu/5pkgs/hydra-check/default.nix (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/custom/hydra-check/default.nix b/makefu/5pkgs/custom/hydra-check/default.nix new file mode 100644 index 000000000..512ceec9f --- /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.0.0"; + + src = fetchFromGitHub { + owner = "makefu"; + repo = "hydra-check"; + rev = version; + sha256 = "0359s9rvl2q23a3yddhbn6w2sd5r1f1jl6whyik7qql7blpcvyi7"; + }; + propagatedBuildInputs = [ + docopt + requests + beautifulsoup4 + ]; + doCheck = false; # no tests +} diff --git a/makefu/5pkgs/hydra-check/default.nix b/makefu/5pkgs/hydra-check/default.nix deleted file mode 100644 index b9930b4f4..000000000 --- a/makefu/5pkgs/hydra-check/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ python3Packages, fetchFromGitHub }: - -with python3Packages; -buildPythonPackage rec { - name = "hydra-check"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "makefu"; - repo = "hydra-check"; - rev = version; - sha256 = "0359s9rvl2q23a3yddhbn6w2sd5r1f1jl6whyik7qql7blpcvyi7"; - }; - propagatedBuildInputs = [ - docopt - requests - beautifulsoup4 - ]; - - checkInputs = [ black jq ]; -} -- cgit v1.2.3 From a72d8c58747de4b554b6f9643ba7e6db9249cf8a Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:40:11 +0100 Subject: ma pkgs: add cc-tool,liveproxy --- makefu/5pkgs/cc-tool/default.nix | 32 +++++++++++++++++++++++++++++++ makefu/5pkgs/custom/liveproxy/default.nix | 30 +++++++++++++++++++++++++++++ makefu/5pkgs/default.nix | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 makefu/5pkgs/cc-tool/default.nix create mode 100644 makefu/5pkgs/custom/liveproxy/default.nix (limited to 'makefu/5pkgs') 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/liveproxy/default.nix b/makefu/5pkgs/custom/liveproxy/default.nix new file mode 100644 index 000000000..195879c89 --- /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/...//" + # 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 = licenses.BSD 2-Clause "Simplified" License; + # 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 {}) -- cgit v1.2.3 From cbd9b1923236566893f12a9ce96bec7c9f59fcda Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 19 Mar 2020 13:15:04 +0100 Subject: ma pkgs.hydra-check: 1.0.0 -> 1.1.0 --- makefu/5pkgs/custom/hydra-check/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/custom/hydra-check/default.nix b/makefu/5pkgs/custom/hydra-check/default.nix index 512ceec9f..cfaaaab73 100644 --- a/makefu/5pkgs/custom/hydra-check/default.nix +++ b/makefu/5pkgs/custom/hydra-check/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { name = "hydra-check"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { - owner = "makefu"; + owner = "nix-community"; repo = "hydra-check"; rev = version; - sha256 = "0359s9rvl2q23a3yddhbn6w2sd5r1f1jl6whyik7qql7blpcvyi7"; + sha256 = "1q4n5l238lnzcms3z1ax4860inaliawqlxv7nf1wb4knl4wr26fk"; }; propagatedBuildInputs = [ docopt -- cgit v1.2.3 From f54afe0cc6357ede5f9a3ae0cd1acc58d0b66aaf Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 19 Mar 2020 15:18:20 +0100 Subject: ma pkgs.liveproxy: fix licensing --- makefu/5pkgs/custom/liveproxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/custom/liveproxy/default.nix b/makefu/5pkgs/custom/liveproxy/default.nix index 195879c89..ba5ddee66 100644 --- a/makefu/5pkgs/custom/liveproxy/default.nix +++ b/makefu/5pkgs/custom/liveproxy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "LiveProxy is a local Proxyserver between Streamlink and an URL"; homepage = https://github.com/back-to/liveproxy; - license = licenses.BSD 2-Clause "Simplified" License; + license = lib.licenses.bsd2; # maintainers = [ maintainers. ]; }; } -- cgit v1.2.3 From 8e3cd9fcffc473706a3ebafa5cb80f7a75c29aa5 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 19 Mar 2020 16:04:03 +0100 Subject: ma pkgs.libcoap: rip --- makefu/5pkgs/libcoap/default.nix | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 makefu/5pkgs/libcoap/default.nix (limited to 'makefu/5pkgs') 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 ]; - }; -} -- cgit v1.2.3