Merge remote-tracking branch 'upstream/master' into staging

6 files changed, 90 insertions, 5 deletions

diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
new file mode 100644
index 00000000000..fb845d9c476
--- /dev/null
+++ b/pkgs/misc/gnuk/default.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0.4";
+
+  src = fetchgit {
+    url = "git://git.gniibe.org/gnuk/gnuk.git";
+    rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca";
+    sha256 = "176vx81m6wnfvamxpp7hfbs1pm692zr0my0z2gid65b6rgffdycd";
+  };
+})
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix
new file mode 100644
index 00000000000..52e970b5b82
--- /dev/null
+++ b/pkgs/misc/gnuk/generic.nix
@@ -0,0 +1,52 @@
+{ stdenv, gcc-arm-embedded, makeWrapper
+, python, pythonPackages
+
+# Extra options
+, device ? "fsij", vid ? "234b", pid ? "0000"
+
+# Version specific options
+, version, src
+, ...
+}:
+
+stdenv.mkDerivation {
+  name = "gnuk-${version}-${device}";
+
+  inherit src;
+
+  nativeBuildInputs = [ gcc-arm-embedded makeWrapper ];
+  buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]);
+
+  configurePhase = ''
+    cd src
+    patchShebangs configure
+    ./configure --vidpid=${vid}:${pid}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    find . -name gnuk.bin -exec cp {} $out \;
+
+    #sed -i 's,Exception as e,IOError as e,' ../tool/stlinkv2.py
+    sed -i ../tool/stlinkv2.py \
+      -e "1a import array" \
+      -e "s,\(data_received =\) (),\1 array.array('B'),g" \
+      -e "s,\(data_received\) = data_received + \(.*\),\1.extend(\2),g"
+    cp ../tool/stlinkv2.py $out/bin/stlinkv2
+    wrapProgram $out/bin/stlinkv2 --prefix PYTHONPATH : "$PYTHONPATH"
+
+    # Some useful helpers
+    echo "#! ${stdenv.shell} -e" | tee $out/bin/{unlock,flash}
+    echo "$out/bin/stlinkv2 -u \$@" >> $out/bin/unlock
+    echo "$out/bin/stlinkv2 -b \$@ $out/gnuk.bin" >> $out/bin/flash
+    chmod +x $out/bin/{unlock,flash}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.fsij.org/pages/gnuk;
+    description = "an implementation of USB cryptographic token for gpg";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/misc/gnuk/git.nix b/pkgs/misc/gnuk/git.nix
new file mode 100644
index 00000000000..8c03a1eee53
--- /dev/null
+++ b/pkgs/misc/gnuk/git.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "2015-04-22";
+
+  src = fetchgit {
+    url = "git://git.gniibe.org/gnuk/gnuk.git";
+    rev = "3d5a776ab15a4ae6e17d91341a58eda3db09f700";
+    sha256 = "1pkdca331wrf1lsnlxxwbbnfcr7vj9xsac92dhj06fhpq4mb8kgb";
+  };
+})
diff --git a/pkgs/misc/gnuk/unstable.nix b/pkgs/misc/gnuk/unstable.nix
new file mode 100644
index 00000000000..0bfcbc023bf
--- /dev/null
+++ b/pkgs/misc/gnuk/unstable.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.1.4";
+
+  src = fetchgit {
+    url = "git://git.gniibe.org/gnuk/gnuk.git";
+    rev = "e7e8b9f5ca414a5c901f61b0f043c8da42414103";
+    sha256 = "0zjpgvmnvgvfqp9cd9g8ns9z05alimwcdqx16l22604ywnhdy99l";
+  };
+})
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix
index 82fa7143122..a95f9ae8613 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/pkgs/misc/screensavers/xss-lock/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://bitbucket.org/raymonad/xss-lock.git;
-    rev = "d75612f1d1eea64b5c43806eea88059340a08ca9";
-    sha256 = "4d57bcfd45287b5b068f45eeceb9e43d975806a038a4c586b141da5d99b3e48b";
+    rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717";
+    sha256 = "0jdpd6x1kk30qynv2n4zbjmsicvwjwcldr2224da0srzl7sgyjsg";
   };
 
   buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 60d67b38a44..8155d4942fd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -527,11 +527,11 @@ rec {
   };
 
   wakatime = buildVimPlugin {
-    name = "wakatime-3.0.9";
+    name = "wakatime-4.0.0";
 
     src = fetchFromGitHub {
-      sha256 = "0qq2h5ysbixypz1ga5j3yrh8sd5h1npqkd59dpl5c1mvjlc30fpk";
-      rev = "f5848439ffdf63db3859f692df1d8fa64b1b3edf";
+      sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25";
+      rev = "a7d48d3507499b8667bfca0b12f8865c01b26678";
       repo = "vim-wakatime";
       owner = "wakatime";
     };