From 8f0f19c5539fde7c93761bb4939ab0a5349e8d2e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 24 Aug 2016 22:05:02 +0200
Subject: k 5 pwqgen: allow user-provided wordset

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

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 51987c35b..99f401ff5 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -18,6 +18,12 @@ in
     mycube-flask = callPackage ./mycube-flask {};
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
     ps3netsrv = callPackage ./ps3netsrv {};
+    pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils {
+      wordset-file = pkgs.fetchurl {
+        url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
+        sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
+      };
+    };
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
     skytraq-logger = callPackage ./skytraq-logger {};
     taskserver = callPackage ./taskserver {};
-- 
cgit v1.2.3


From 66ba3c3c37b6c08104e3c7f53a203853a481af26 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 3 Sep 2016 00:45:11 +0200
Subject: m 5 qcma:init

---
 makefu/5pkgs/default.nix      |  1 +
 makefu/5pkgs/qcma/default.nix | 64 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 makefu/5pkgs/qcma/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 99f401ff5..0d375a510 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -24,6 +24,7 @@ in
         sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
       };
     };
+    qcma = pkgs.qt5.callPackage ./qcma {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
     skytraq-logger = callPackage ./skytraq-logger {};
     taskserver = callPackage ./taskserver {};
diff --git a/makefu/5pkgs/qcma/default.nix b/makefu/5pkgs/qcma/default.nix
new file mode 100644
index 000000000..6eb1a971d
--- /dev/null
+++ b/makefu/5pkgs/qcma/default.nix
@@ -0,0 +1,64 @@
+{ lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
+gettext, automake, libxml2 , qmakeHook, makeQtWrapper,
+qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
+let
+  libvitamtp = stdenv.mkDerivation rec {
+    name = "libvitamtp-${version}";
+    version = "2.5.9";
+
+    src = fetchFromGitHub {
+      owner = "codestation";
+      repo = "vitamtp";
+      rev = "v"+version;
+      sha256 = "09c9f7gqpyicfpnhrfb4r67s2hci6hh31bzmqlpds4fywv5mzaf8";
+    };
+
+    buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig ];
+    preConfigure = "sh ./autogen.sh";
+
+    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;
+      maintainers = with stdenv.lib.maintainers; [ makefu ];
+    };
+  };
+in stdenv.mkDerivation rec {
+  name = "qcma-${version}";
+  version = "0.3.13";
+
+  src = fetchgit {
+    url = "git://github.com/codestation/qcma.git";
+    rev = "refs/tags/v"+version;
+    leaveDotGit = true;
+    sha256 = "164abjwlw2nw2i30wlwpsavz1zjkp6a14yprvinma5hflkw4yj6i";
+  };
+
+  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 = [ qmakeHook qttools pkgconfig makeQtWrapper ];
+
+  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;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+  };
+}
-- 
cgit v1.2.3


From 1daec454eb524925eebf407c54a0e9d925b2bb7a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 8 Sep 2016 08:27:01 +0200
Subject: m 5 default: use cups from nixpkgs-stable

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

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 0d375a510..6d020406d 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -2,9 +2,16 @@
 
 let
   inherit (pkgs) callPackage;
+  nixpkgs-1509 = import (pkgs.fetchFromGitHub {
+    owner = "NixOS"; repo = "nixpkgs-channels";
+    rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
+    sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
+  }) {};
+
 in
 {
   nixpkgs.config.packageOverrides = rec {
+    cups = nixpkgs-1509.cups;
     alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/6c000000.lock: No such file or directory (2)