From b31a37799eff274215d4cd9d435a9c16d496a88c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 30 Jan 2018 08:11:00 +0100
Subject: ma pkgs.pfsshell: init

---
 makefu/5pkgs/pfsshell/default.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 makefu/5pkgs/pfsshell/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/pfsshell/default.nix b/makefu/5pkgs/pfsshell/default.nix
new file mode 100644
index 000000000..fc6b37069
--- /dev/null
+++ b/makefu/5pkgs/pfsshell/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, upx, wine }:
+stdenv.mkDerivation rec {
+  pname = "pfsshell";
+  version = "64f8c2";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "pfsshell";
+    rev = version;
+    sha256 = "01lbqf8s91p8id58xa16fp555i03vfycqvhv7qzpnrjy6yvp9dm8";
+  };
+
+  buildInputs = [ ];
+
+  makeFlags = [ ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pfsshell $out/bin
+  '';
+
+  meta = {
+    homepage = https://github.com/uyjulian/pfsshell ;
+    description = "browse and transfer files to/from PFS filesystems";
+  };
+}
-- 
cgit v1.2.3


From 72f440fdb567b8000ec72aefa6d3e74734c11c9e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 6 Feb 2018 11:56:36 +0100
Subject: ma omo.r: init google-muell

---
 makefu/5pkgs/ampel/default.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 makefu/5pkgs/ampel/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/ampel/default.nix b/makefu/5pkgs/ampel/default.nix
new file mode 100644
index 000000000..86518b9b8
--- /dev/null
+++ b/makefu/5pkgs/ampel/default.nix
@@ -0,0 +1,27 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.python3Packages;buildPythonPackage rec {
+  name = "ampel-${version}";
+  version = "0.2";
+
+  propagatedBuildInputs = [
+    docopt
+    paho-mqtt
+    requests
+    pytz
+    influxdb
+    httplib2
+    google_api_python_client
+  ];
+
+  src = pkgs.fetchgit {
+      url = "http://cgit.euer.krebsco.de/ampel";
+      rev = "d8a0250";
+      sha256 = "0n36lc17ca5db6pl6dswdqd5w9f881rfqck9yc4w33a5qpsxj85f";
+  };
+  meta = {
+    homepage = http://cgit.euer.krebsco.de/ampel;
+    description = "change colors of rgb cubes";
+    license = lib.licenses.asl20;
+  };
+}
-- 
cgit v1.2.3


From b0edf1be81e463174d9b3a1bd2ff2aff7ef8734e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Feb 2018 19:05:50 +0100
Subject: ma programs-db: rip

---
 makefu/5pkgs/default.nix             |  2 +-
 makefu/5pkgs/programs-db/default.nix | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 makefu/5pkgs/programs-db/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 80a0d33cd..b1d6df67e 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -3,7 +3,7 @@ self: super: let
 
   # This callPackage will try to detect obsolete overrides.
   callPackage = path: args: let
-    override = super.callPackage path args;
+    override =  super.callPackage path args;
     upstream = optionalAttrs (override ? "name")
       (super.${(parseDrvName override.name).name} or {});
   in if upstream ? "name" &&
diff --git a/makefu/5pkgs/programs-db/default.nix b/makefu/5pkgs/programs-db/default.nix
deleted file mode 100644
index f40b1b96e..000000000
--- a/makefu/5pkgs/programs-db/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv }:
-
-stdenv.mkDerivation rec {
-  name = "programs-db";
-  src = builtins.fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz ;
-
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = ''
-    cp programs.sqlite $out
-  '';
-
-}
-- 
cgit v1.2.3


From 02a53c3b9e530d5c30d1dc68b1620ee7240b3874 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Feb 2018 23:22:34 +0100
Subject: ma pkgs.opl-utils: remove license for now

---
 makefu/5pkgs/opl-utils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/opl-utils/default.nix b/makefu/5pkgs/opl-utils/default.nix
index f4430f333..5799b8e0f 100644
--- a/makefu/5pkgs/opl-utils/default.nix
+++ b/makefu/5pkgs/opl-utils/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://github.com/ifcaro/Open-PS2-Loader;
     description = "open-ps2-loader utils (opl2iso,iso2opl,genvmc)";
-    license = lib.licenses.afl3;
+    ## not yet in stable
+    # license = lib.licenses.afl3;
   };
 }
-- 
cgit v1.2.3


From aa919a77976a8b93430c99e1d63fae5eb3198254 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Feb 2018 00:08:43 +0100
Subject: ma pkgs: cleanup awesomecfg, custom, shackie

---
 makefu/5pkgs/awesomecfg/default.nix | 25 +++++++++++++++++++++----
 makefu/5pkgs/awesomecfg/full.cfg    | 14 +++++++-------
 makefu/5pkgs/awesomecfg/result      |  1 +
 makefu/5pkgs/custom/default.nix     |  3 ---
 makefu/5pkgs/shackie/default.nix    | 33 ---------------------------------
 5 files changed, 29 insertions(+), 47 deletions(-)
 create mode 120000 makefu/5pkgs/awesomecfg/result
 delete mode 100644 makefu/5pkgs/custom/default.nix
 delete mode 100644 makefu/5pkgs/shackie/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index 3c9340692..7e9724ec8 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,7 +1,24 @@
-_:
+{ pkgs
+, lib
+, alsaUtils
+, xlockmore
+, xbacklight
+, modkey?"Mod4"
+, ... }:
 
 {
-  # replace: @amixer@ @xlock@ @xbacklight@
-  full = ./full.cfg;
-  kiosk = ./kiosk.lua;
+  # replace: @alsaUtils@ @xlockmore@ @xbacklight@ @modkey@
+  full = lib.makeOverridable pkgs.substituteAll {
+    name = "awesome_full_config";
+    inherit alsaUtils xlockmore xbacklight modkey;
+    isExecutable = false;
+    src = ./full.cfg;
+  };
+
+  kiosk = lib.makeOverridable pkgs.substituteAll {
+    name = "awesome_kiosk_config";
+    inherit alsaUtils xlockmore xbacklight modkey;
+    isExecutable = false;
+    src = ./kiosk.lua;
+  };
 }
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 993942771..3488d0102 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -365,22 +365,22 @@ globalkeys = awful.util.table.join(
               {description = "restore minimized", group = "client"}),
 
     awful.key({ }, "XF86MonBrightnessUp", function ()
-        awful.util.spawn("@xbacklight@ -inc 5", false) end),
+        awful.util.spawn("@xbacklight@/bin/xbacklight -inc 5", false) end),
     awful.key({ }, "XF86MonBrightnessDown", function ()
-        awful.util.spawn("@xbacklight@ -dec 5", false) end),
+        awful.util.spawn("@xbacklight@/bin/xbacklight -dec 5", false) end),
 
     awful.key({ }, "XF86AudioRaiseVolume", function ()
-        awful.util.spawn("@amixer@ set Master 5%+", false) end),
+        awful.util.spawn("@alsaUtils@/bin/amixer set Master 5%+", false) end),
     awful.key({ }, "XF86AudioLowerVolume", function ()
-        awful.util.spawn("@amixer@ set Master 5%-", false) end),
+        awful.util.spawn("@alsaUtils@/bin/amixer set Master 5%-", false) end),
     awful.key({ }, "XF86AudioMute", function ()
-        awful.util.spawn("@amixer@ -q -D default sset Master toggle", false) end),
+        awful.util.spawn("@alsaUtils@/bin/amixer -q -D default sset Master toggle", false) end),
 
     -- Prompt
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
               {description = "run prompt", group = "launcher"}),
-    awful.key({ modkey,"Control"  }, "BackSpace",  function ()  awful.util.spawn("@xlock@ -mode blank")   end),
-    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("@xlock@ -mode blank")   end),
+    awful.key({ modkey,"Control"  }, "BackSpace",  function ()  awful.util.spawn("@xlockmore@/bin/xlock -mode blank")   end),
+    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("@xlockmore@/bin/xlock -mode blank")   end),
 
 		awful.key({ modkey }, "x",
 									function ()
diff --git a/makefu/5pkgs/awesomecfg/result b/makefu/5pkgs/awesomecfg/result
new file mode 120000
index 000000000..b6e72501a
--- /dev/null
+++ b/makefu/5pkgs/awesomecfg/result
@@ -0,0 +1 @@
+/nix/store/w7c49s795z5g4j9fwq05a0bck0pbkz3h-awesome_full_config
\ No newline at end of file
diff --git a/makefu/5pkgs/custom/default.nix b/makefu/5pkgs/custom/default.nix
deleted file mode 100644
index 626938cdc..000000000
--- a/makefu/5pkgs/custom/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{}:
-{
-}
diff --git a/makefu/5pkgs/shackie/default.nix b/makefu/5pkgs/shackie/default.nix
deleted file mode 100644
index b6cf8afe6..000000000
--- a/makefu/5pkgs/shackie/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python3Packages;
-let
-  asyncio-irc = buildPythonPackage rec {
-      name = "asyncio-irc-${version}";
-      version = "2016-09-02";
-      src = fetchFromGitHub {
-        owner = "watchtower";
-        repo = "asyncirc";
-        rev = "5384d19";
-        sha256 = "0xgzdvp0ig0im7r3vbqd3a9rzac0lkk2mvf7y4fw56p8k61df8nv";
-      };
-      propagatedBuildInputs = [ blinker ];
-  };
-in
-buildPythonPackage rec {
-    name = "shackie-${version}";
-    version = "2017-04-24";
-    propagatedBuildInputs = [
-      asyncio-irc
-      beautifulsoup4
-      lxml
-      pytz
-      redis
-      requests
-    ];
-    src = fetchFromGitHub {
-      owner = "shackspace";
-      repo = "shackie";
-      rev = "e717ec7";
-      sha256 = "1ffbjm3x2xcyxl42hfsjs5xg1pm0xsprdi5if9zxa5ycqydmiw3l";
-    };
-}
-- 
cgit v1.2.3


From 3fcd396a6b3d1504a349481e82f669798d72c6af Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Feb 2018 01:09:24 +0100
Subject: ma pkgs.farpd: rip

---
 makefu/5pkgs/farpd/default.nix | 63 ------------------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 makefu/5pkgs/farpd/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/farpd/default.nix b/makefu/5pkgs/farpd/default.nix
deleted file mode 100644
index 8dfcee90c..000000000
--- a/makefu/5pkgs/farpd/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
-  libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
-  ... }:
-stdenv.mkDerivation rec {
-  name = "farpd-${version}";
-
-
-  version  = "0.2";
-  src = fetchurl {
-    url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2.orig.tar.gz ;
-    sha256 = "1m3pynvynr4vgkwh7z5i0yqlang2y0ph32cys3vbi2hx2apk9abd";
-  };
-
-  buildInputs = with pkgs;[
-    automake
-    gnugrep
-    libpcap
-    libdnet
-    pcre
-    libevent.out # requires .so and .h
-    readline
-    autoconf
-    libtool
-    zlib
-    coreutils
-    python
-    pythonPackages.pysqlite
-  ];
-  patches = [
-    ( fetchurl {
-      url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2-11.diff.gz;
-      sha256 = "2c246b37de8aab9c73f955fb77101adefd90637d03f582b9f8ffae2903af2f94";
-    })
-  ];
-  # removes user install script from Makefile before automake
-  #patches = [ ./autoconf.patch ];
-  preConfigure = ''
-    autoreconf -fi
-
-    substituteInPlace configure \
-      --replace "dumbnet" "dnet" \
-      --replace "libpcap.a" "libpcap.so" \
-      --replace "libevent.a" "libevent.so" \
-      --replace "net/bpf.h" "pcap/bpf.h"
-  '';
-
-  makeFlags = [ "LIBS=-lz" ];
-  configureFlags = [
-    "--with-libpcap=${libpcap}"
-    "--with-libevent=${libevent}"
-    "--with-libdnet=${libdnet}"
-  ];
-  postInstall = ''
-    mv $out/sbin/arpd $out/sbin/farpd
-    mv $out/share/man/man8/arpd.8 $out/share/man/man8/farpd.8
-  '';
-
-  meta = {
-    homepage = https://launchpad.net/ubuntu/+source/farpd/ ;
-    description = "fake arp";
-    license = lib.licenses.gpl2;
-  };
-}
-- 
cgit v1.2.3


From 1f1bc3f220098300ad92b1103b92d46896b4d7d4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Feb 2018 01:24:40 +0100
Subject: ma pkgs.dionaea: rip

---
 makefu/5pkgs/dionaea/default.nix | 50 ----------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 makefu/5pkgs/dionaea/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/dionaea/default.nix b/makefu/5pkgs/dionaea/default.nix
deleted file mode 100644
index fef197c20..000000000
--- a/makefu/5pkgs/dionaea/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
-  libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
-  libev,
-  ... }:
-let
-  liblcfg = stdenv.mkDerivation rec {
-    name = "liblcfg-${version}";
-    version = "750bc90";
-    src = fetchFromGitHub {
-      owner = "ThomasAdam";
-      repo = "liblcfg";
-      rev = version;
-      sha256 = "1k3r47p81paw5802jklx9xqbjrxr26pahipxn9nq3177qhxxibkr";
-    };
-    buildInputs = with pkgs;[ autoconf automake ];
-    preConfigure = ''autoreconf -fi'';
-    sourceRoot = "${name}-src/code";
-  };
-in stdenv.mkDerivation rec {
-  name = "liblcfg-${version}";
-
-  #version = "1.5c"; #original, does not compile due to libc errors
-  #src = fetchurl {
-  #  url = "http://www.honeyd.org/uploads/honeyd-${version}.tar.gz";
-  #  sha256 = "0vcih16fk5pir5ssfil8x79nvi62faw0xvk8s5klnysv111db1ii";
-  #};
-
-  #version = "64d087c"; # honeyd-1.6.7
-  #  sha256 = "0zhnn13r24y1q494xcfx64vyp84zqk8qmsl41fq2674230bn0p31";
-
-  version  = "6756787f94c4f1ac53d1e5545d052774a0446c04";
-  src = fetchFromGitHub {
-    owner = "rep";
-    repo = "dionaea";
-    rev = version;
-    sha256 = "04zjr9b7x0rqwzgb9gfxq6pclb817gz4qaghdl8xa79bqf9vv2p7";
-  };
-
-  buildInputs = with pkgs;[ libtool automake autoconf ];
-  configureFlags = [
-    "--with-liblcfg=${liblcfg}"
-    "--with-libpcap=${libpcap}"
-  ];
-
-  meta = {
-    homepage = http://www.honeyd.org/;
-    description = "virtual Honeypots";
-    license = lib.licenses.gpl2;
-  };
-}
-- 
cgit v1.2.3


From 56eb9839469db905468237f099be987463a59ab0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Feb 2018 01:28:18 +0100
Subject: ma pkgs.mcomix: disable tests

---
 makefu/5pkgs/mcomix/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/mcomix/default.nix b/makefu/5pkgs/mcomix/default.nix
index a12e2e821..7fb9cd375 100644
--- a/makefu/5pkgs/mcomix/default.nix
+++ b/makefu/5pkgs/mcomix/default.nix
@@ -11,6 +11,10 @@ python2Packages.buildPythonPackage rec {
   propagatedBuildInputs = with python2Packages;
     [ python2Packages.pygtk gtk3 python2Packages.pillow ];
 
+  # for module in sys.modules.itervalues():
+  #   RuntimeError: dictionary changed size during iteration
+  doCheck = false;
+
   meta = {
     homepage = https://github.com/pyload/pyload;
     description = "Free and Open Source download manager written in Python";
-- 
cgit v1.2.3


From a35ac200aeed79660674591406135737d3f56392 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Feb 2018 01:53:10 +0100
Subject: ma pkgs.qcma: fix broken build

---
 makefu/5pkgs/custom/qcma/default.nix | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/custom/qcma/default.nix b/makefu/5pkgs/custom/qcma/default.nix
index d67cda142..dfb57c880 100644
--- a/makefu/5pkgs/custom/qcma/default.nix
+++ b/makefu/5pkgs/custom/qcma/default.nix
@@ -1,6 +1,9 @@
 { lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
-gettext, automake, libxml2 , qmake,
-qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
+gettext, automake, libxml2 
+, autoreconfHook
+, qmake4Hook
+, qmake
+, qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
 let
   libvitamtp = stdenv.mkDerivation rec {
     name = "libvitamtp-${version}";
@@ -13,8 +16,8 @@ let
       sha256 = "09c9f7gqpyicfpnhrfb4r67s2hci6hh31bzmqlpds4fywv5mzaf8";
     };
 
-    buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig ];
-    preConfigure = "sh ./autogen.sh";
+    buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig
+    autoreconfHook ];
 
     meta = {
       description = "Content Manager Assistant for the PS Vita";
@@ -26,40 +29,29 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "qcma-${version}";
-  version = "0.3.13";
+  version = "8e6cafedc0f47733f33323f829624e3fc847a176";
 
-  src = fetchgit {
-    url = "git://github.com/codestation/qcma.git";
-    rev = "refs/tags/v"+version;
-    leaveDotGit = true;
-    sha256 = "164abjwlw2nw2i30wlwpsavz1zjkp6a14yprvinma5hflkw4yj6i";
+  src = fetchFromGitHub {
+    owner = "codestation";
+    repo = "qcma";
+    rev = version;
+    sha256 = "1l95kx3x4pf5iwmwigbch5c6n2h27lls5qiy4xh15v59p5442yw5";
   };
 
   preConfigure = ''
     lrelease common/resources/translations/*.ts
   '';
 
-  # TODO: manually adding qtbase and qtmultimedia to the library path is shit,
-  # this should be done somewhere before when building the project, idk.
-  installPhase = ''
-    make INSTALL_ROOT="$(out)" install
-    for i in qcma qcma_cli; do
-      wrapQtProgram $out/bin/$i --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-    qtbase qtmultimedia ]}
-    done
-  '';
-
   enableParallelBuilding = true;
 
   buildInputs = [ gdk_pixbuf ffmpeg libnotify libvitamtp git qtmultimedia qtbase ];
-  nativeBuildInputs = [ qmake qttools pkgconfig ];
+  nativeBuildInputs = [ qttools pkgconfig qmake ];
 
   meta = {
     description = "Content Manager Assistant for the PS Vita";
     homepage = https://github.com/codestation/qcma;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    broken = true;
     maintainers = with stdenv.lib.maintainers; [ makefu ];
   };
 }
-- 
cgit v1.2.3


From cf2d31899e7341939f59a16ff7c3386f70449fd3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Feb 2018 09:13:13 +0100
Subject: .gitignore: add result

---
 makefu/5pkgs/awesomecfg/result | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 makefu/5pkgs/awesomecfg/result

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/awesomecfg/result b/makefu/5pkgs/awesomecfg/result
deleted file mode 120000
index b6e72501a..000000000
--- a/makefu/5pkgs/awesomecfg/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/w7c49s795z5g4j9fwq05a0bck0pbkz3h-awesome_full_config
\ No newline at end of file
-- 
cgit v1.2.3