From 2d0824fb99e5b58cad8c47068be449bfecf9b5ae Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 4 Aug 2016 23:56:39 +0200
Subject: k 5 builders: add writePython{2,3}

---
 krebs/5pkgs/builders.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
index 4c087bc4..84154381 100644
--- a/krebs/5pkgs/builders.nix
+++ b/krebs/5pkgs/builders.nix
@@ -253,5 +253,27 @@ rec {
       ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
     '');
 
+  writePython2 = name: src: pkgs.runCommand name {} /* sh */ ''
+    name=${assert types.filename.check name; name}
+    src=${shell.escape src}
+
+    # syntax check
+    printf '%s' "$src" > src.py
+    ${pkgs.python2}/bin/python -m py_compile src.py
+
+    cp src.py "$out"
+  '';
+
+  writePython3 = name: src: pkgs.runCommand name {} /* sh */ ''
+    name=${assert types.filename.check name; name}
+    src=${shell.escape src}
+
+    # syntax check
+    printf '%s' "$src" > src.py
+    ${pkgs.python3}/bin/python -m py_compile src.py
+
+    cp src.py "$out"
+  '';
+
   writeSed = makeScriptWriter "${pkgs.gnused}/bin/sed -f";
 }
-- 
cgit v1.2.3


From cbf66556afed7220bc95d1716f06cede5a7a8b09 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 6 Aug 2016 19:54:29 +0200
Subject: k 5 apt-cacher-ng: update 0.9.3 -> 0.9.3.2

---
 krebs/5pkgs/apt-cacher-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix
index abf8d677..53736dcf 100644
--- a/krebs/5pkgs/apt-cacher-ng/default.nix
+++ b/krebs/5pkgs/apt-cacher-ng/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "apt-cacher-ng-${version}";
-  version = "0.9.3";
+  version = "0.9.3.2";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
-    sha256 = "1bd7l1wg0q1p9pg0v6lqflf2znydx8mrh2jxbvv6xsrp1473nfwg";
+    sha256 = "1bvng9mwrggvc93q2alj0x72i56wifnjs2dsycr17mapsv0f2gnc";
   };
 
   NIX_LDFLAGS = "-lpthread";
-- 
cgit v1.2.3


From 3a760096f6b3b49d4bf32465c860ccfd23d174fa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Aug 2016 09:34:57 +0200
Subject: tarantool: init at 1.7.1-164-g0fd0239

---
 krebs/5pkgs/tarantool/default.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 krebs/5pkgs/tarantool/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/tarantool/default.nix b/krebs/5pkgs/tarantool/default.nix
new file mode 100644
index 00000000..9e22fd4f
--- /dev/null
+++ b/krebs/5pkgs/tarantool/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, cmake, ncurses, openssl, readline, ... }:
+
+stdenv.mkDerivation rec {
+  name = "tarantool-1.7.1-164-g0fd0239";
+  src = fetchgit {
+    url = https://github.com/tarantool/tarantool;
+    rev = builtins.elemAt (builtins.match ".*-g([0-9a-f]+)" name) 0;
+    sha256 = "1jnaiizbl9j4a8vsihqx75iqa9bkh1kpwsyrgmim8ikiyzfw54dz";
+    fetchSubmodules = true;
+  };
+  buildInputs = [
+    cmake
+    ncurses
+    openssl
+    readline
+  ];
+  preConfigure = ''
+    echo ${(builtins.parseDrvName name).version} > VERSION
+    sed -i 's/NAMES termcap/NAMES ncurses/' cmake/FindTermcap.cmake
+  '';
+}
-- 
cgit v1.2.3


From 1d9f7b4f2d1a444bb7b19f18efa3bee63c8d3770 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 10 Aug 2016 16:42:50 +0200
Subject: k 5: add games-user-env

---
 krebs/5pkgs/games-user-env/default.nix | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 krebs/5pkgs/games-user-env/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/games-user-env/default.nix b/krebs/5pkgs/games-user-env/default.nix
new file mode 100644
index 00000000..abe770ed
--- /dev/null
+++ b/krebs/5pkgs/games-user-env/default.nix
@@ -0,0 +1,34 @@
+{ lib, pkgs, ... }: let
+
+#TODO: make sure env exists prior to running
+env_nix = pkgs.writeText "env.nix" ''
+  { pkgs ? import <nixpkgs> {} }:
+
+  (pkgs.buildFHSUserEnv {
+    name = "simple-x11-env";
+    targetPkgs = pkgs: with pkgs; [
+      coreutils
+    ];
+    multiPkgs = pkgs: with pkgs; [
+      alsaLib
+      zlib
+      xorg.libXxf86vm
+      curl
+      openal
+      openssl_1_0_2
+      xorg.libXext
+      xorg.libX11
+      xorg.libXrandr
+      xorg.libXcursor
+      xorg.libXinerama
+      xorg.libXi
+      mesa_glu
+    ];
+    runScript = "bash";
+  }).env
+'';
+
+
+in pkgs.writeDashBin "games-user-env" ''
+  nix-shell ${env_nix}
+''
-- 
cgit v1.2.3