From 0ce6603bd86a83bc7800f40e2a887728aea33de5 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Tue, 9 Feb 2016 22:13:33 +0100
Subject: [PATCH 1/4] pflask

---
 pkgs/os-specific/linux/pflask/default.nix | 37 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pflask/default.nix

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
new file mode 100644
index 00000000000..e3ba10cbacd
--- /dev/null
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchurl, python
+}:
+
+stdenv.mkDerivation rec {
+  name = "pflask-${version}";
+  version = "git-2015-10-06";
+  rev = "1f575a73d796fbb92e8f2012ded7e97247f1c6c3";
+
+  src = fetchurl {
+    url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
+    sha256 = "3518aa1e8fa35e059bd63956daed9d8c4115475b66b674d02ebc80484248ddbc";
+  };
+
+  buildInputs = [ python ];
+
+  configurePhase = ''
+    ln -s ${fetchurl {
+      url = "http://ftp.waf.io/pub/release/waf-1.8.6";
+      sha256 = "81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5";
+    }} waf
+    python waf configure --prefix=$out
+  '';
+  buildPhase = ''
+    python waf build
+  '';
+  installPhase = ''
+    python waf install
+  '';
+
+  meta = {
+    description = "Lightweight process containers for Linux";
+    homepage    = "https://ghedo.github.io/pflask/";
+    license     = lib.licenses.bsd2;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e92629064..33caf0a6b56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12980,6 +12980,8 @@ let
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
+  pflask = callPackage ../os-specific/linux/pflask {};
+
   photoqt = qt5.callPackage ../applications/graphics/photoqt { };
 
   phototonic = qt5.callPackage ../applications/graphics/phototonic { };

From c7ef45e15355a49bc8a4cb6052beb9fcae23eeaa Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Tue, 9 Feb 2016 22:54:03 +0100
Subject: [PATCH 2/4] pflask: git-2015-10-06 -> git-2015-12-17

---
 pkgs/os-specific/linux/pflask/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index e3ba10cbacd..931b074534e 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "pflask-${version}";
-  version = "git-2015-10-06";
-  rev = "1f575a73d796fbb92e8f2012ded7e97247f1c6c3";
+  version = "git-2015-12-17";
+  rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
 
   src = fetchurl {
     url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
-    sha256 = "3518aa1e8fa35e059bd63956daed9d8c4115475b66b674d02ebc80484248ddbc";
+    sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440";
   };
 
   buildInputs = [ python ];

From 310a20eda83261f72f670770f232b3bb0ed3cdf5 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 20:34:05 +0100
Subject: [PATCH 3/4] waf

---
 .../tools/build-managers/waf/default.nix      | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/waf/default.nix

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
new file mode 100644
index 00000000000..6956c97db50
--- /dev/null
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "waf-${version}";
+  version = "1.8.19";
+
+  src = fetchurl {
+    url = "https://waf.io/waf-${version}.tar.bz2";
+    sha256 = "e5df90556d1f70aca82bb5c5f46aa68d2377bae16b0db044eaa0559df8668c6f";
+  };
+
+  buildInputs = [ python2 ];
+
+  configurePhase = ''
+    python waf-light configure
+  '';
+  buildPhase = ''
+    python waf-light build
+  '';
+  installPhase = ''
+    install waf $out
+  '';
+
+  meta = {
+    description = "Meta build system";
+    homepage    = "https://waf.io/";
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33caf0a6b56..18f717f2e02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3639,6 +3639,8 @@ let
 
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
+  waf = callPackage ../development/tools/build-managers/waf { };
+
   wakelan = callPackage ../tools/networking/wakelan { };
 
   wavemon = callPackage ../tools/networking/wavemon { };

From 60969ab93712f1edf1ccc2e55b17aa9e2944564c Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 20:34:28 +0100
Subject: [PATCH 4/4] pflask: use waf package

---
 pkgs/os-specific/linux/pflask/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 931b074534e..b4f93e9de3f 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchurl, python
-}:
+{ lib, stdenv, fetchurl, python, waf }:
 
 stdenv.mkDerivation rec {
   name = "pflask-${version}";
@@ -14,10 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   configurePhase = ''
-    ln -s ${fetchurl {
-      url = "http://ftp.waf.io/pub/release/waf-1.8.6";
-      sha256 = "81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5";
-    }} waf
+    ln -s ${waf} waf
     python waf configure --prefix=$out
   '';
   buildPhase = ''