From bdce2137e713944e77b3e35f758c757a43a99d3e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Apr 2016 02:03:15 +0200
Subject: ma awesome: refactor into module

---
 makefu/5pkgs/awesomecfg/full.cfg | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index c1b58aa9..f42aea00 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -83,13 +83,11 @@ vicious.register(batwidget, vicious.widgets.bat, "$2%", 61, "BAT0")
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
 -- beautiful.init("/usr/share/awesome/themes/default/theme.lua")
--- ./qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/lib/beautiful.lua
---
--- Find the default theme
 
---
--- beautiful.init("/nix/store/qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/themes/default/theme.lua")
+-- @awesome@/share/awesome/lib/beautiful.lua
+-- beautiful.init("@awesome@/share/awesome/themes/default/theme.lua")
 
+-- Find the default theme
 function find_default_theme()
   -- find the default lua theme in the package path
   for path in package.path:gmatch('([^;]+);') do
@@ -115,7 +113,7 @@ browser = "firefox"
 -- If you do not like this or do not have such a key,
 -- I suggest you to remap Mod4 to another key using xmodmap or other tools.
 -- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
+modkey = "@modkey@"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
 local layouts =
-- 
cgit v1.2.3


From c606288fbd405cd76b20479957bdf84cc93d71e2 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Mon, 2 May 2016 16:00:39 +0200
Subject: ma 5 devpi: init

---
 makefu/5pkgs/default.nix       |  1 +
 makefu/5pkgs/devpi/default.nix | 70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 makefu/5pkgs/devpi/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8caab433..d09d4a6e 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -12,5 +12,6 @@ in
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
     mycube-flask = callPackage ./mycube-flask {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
+    inherit (callPackage ./devpi {}) devpi-web devpi-server;
   };
 }
diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix
new file mode 100644
index 00000000..0df8ecd2
--- /dev/null
+++ b/makefu/5pkgs/devpi/default.nix
@@ -0,0 +1,70 @@
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs.stdenv.lib;
+let
+  execnet14 = pkgs.python3Packages.buildPythonPackage rec {
+    name = "execnet-1.4.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/e/execnet/${name}.tar.gz";
+      sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ setuptools_scm apipkg ];
+    meta = {
+      description = "rapid multi-Python deployment";
+      license = licenses.gpl2;
+    };
+  };
+
+  devpi-web = pkgs.python3Packages.buildPythonPackage rec {
+    name = "devpi-web";
+    version = "3.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-web/devpi-web-${version}.tar.gz";
+      sha256 = "156abxyhj17a8cg38hpyr31qkjb61mb2kggsxij4p4xvy9jwkbwi";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ devpi-server pyramid_chameleon beautifulsoup4 Whoosh defusedxml ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "a web view for devpi-server";
+      license = licenses.mit;
+      maintainers = with maintainers; [ makefu ];
+    };
+  };
+  devpi-server = pkgs.python3Packages.buildPythonPackage rec {
+    name = "devpi-server";
+    version = "3.0.2";
+
+    # original postFixup adds "import sys; sys.argv[0] = 'devpi-server'" to
+    # `.devpi-server-wrapped` which
+    # results in "not existing devpi-server: 'devpi-server'"
+    postFixup = "";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-server/devpi-server-${version}.tar.gz";
+      sha256 = "14r1024i3x2pb72khyzvi56sh9smpdswmrbc88xvjxnalmzfn99d";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ devpi-common execnet14 itsdangerous pluggy waitress pyramid ];
+    buildInputs = with pkgs.python3Packages; [ pytest beautifulsoup4 webtest ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "Devpi Server";
+      license = licenses.mit;
+      maintainers = with maintainers; [ makefu ];
+    };
+  };
+
+in {
+  inherit devpi-server;
+  devpi-web =  pkgs.python3.buildEnv.override {
+      extraLibs = [ devpi-web devpi-server ];
+    };
+}
-- 
cgit v1.2.3