From e97b95856ff3232d02cd30a30cb288ce2b639f9b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 29 Sep 2017 10:04:56 +0200
Subject: [PATCH] ma udpt,esptool: now in upstream
---
5pkgs/esptool/default.nix | 31 -------------------------------
5pkgs/udpt/default.nix | 29 -----------------------------
2 files changed, 60 deletions(-)
delete mode 100644 5pkgs/esptool/default.nix
delete mode 100644 5pkgs/udpt/default.nix
diff --git a/5pkgs/esptool/default.nix b/5pkgs/esptool/default.nix
deleted file mode 100644
index 4e0d29e..0000000
--- a/5pkgs/esptool/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python2Packages;
-let
- pyaes = buildPythonPackage rec {
- name = "pyaes-${version}";
- version = "1.6.0";
- src = fetchFromGitHub {
- owner = "ricmoo";
- repo = "pyaes";
- rev = "v${version}";
- sha256 = "04934a9zgwc8g3qhfrkcfv0bs557paigllnkrnfhp9m1azr3bfqb";
- };
- doCheck = false;
- };
-in
- buildPythonPackage rec {
- name = "${pname}-${version}";
- pname = "esptool";
- version = "2.1";
- propagatedBuildInputs = [
- pyserial
- flake8
- ecdsa
- pyaes
- ];
- src = fetchPypi {
- inherit pname version;
- sha256 = "08g393fiqhanixzjbs54pqr6xk1a4dsfaddw7gdwfvp3kvwdn2fp";
- };
- doCheck = false;
- }
diff --git a/5pkgs/udpt/default.nix b/5pkgs/udpt/default.nix
deleted file mode 100644
index 99bcac1..0000000
--- a/5pkgs/udpt/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, boost, sqlite, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- proj = "udpt";
- name = "udpt-${rev}";
- rev = "0790558";
-
- enableParallelBuilding = true;
-
- src = fetchFromGitHub {
- owner = "naim94a";
- repo = "udpt";
- inherit rev;
- sha256 = "0rgkjwvnqwbnqy7pm3dk176d3plb5lypaf12533yr0yfzcp6gnzk";
- };
- buildInputs = [ boost sqlite ];
- installPhase = ''
- mkdir -p $out/bin $out/etc/
- cp udpt $out/bin
- cp udpt.conf $out/etc/
- '';
- meta = {
- description = "udp tracker";
- homepage = https://github.com/naim94a/udpt;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ makefu ];
- };
-}