9 files changed, 105 insertions, 56 deletions
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index dee0f92822a..a7dfac1eb0d 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.78";
+  version = "0.7.79";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0458rxla3nhw9rbb2psak8qvxwr0drfhdl82k6wvb3a38xb0qij3";
+    sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
new file mode 100644
index 00000000000..6eb55348e60
--- /dev/null
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
+, extraModulePaths ? [] }:
+
+stdenv.mkDerivation rec {
+  name = "clfswm";
+
+  src = fetchgit {
+    url = "https://gitlab.common-lisp.net/clfswm/clfswm.git";
+    rev = "refs/heads/master";
+    sha256 = "1hkm6bn5xww932w34l13bg87m5hsnwnd0i1lka6sw0cq8whndya0";
+  };
+
+  buildInputs = [
+    texinfo4 makeWrapper autoconf
+    sbcl
+    lispPackages.clx
+    lispPackages.cl-ppcre
+    xdpyinfo
+  ];
+
+  patches = [ ./require-clx.patch ];
+
+  # Stripping destroys the generated SBCL image
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    make DESTDIR=$out install
+
+    # Paths in the compressed image $out/bin/clfswm are not
+    # recognized by Nix. Add explicit reference here.
+    mkdir $out/nix-support
+    echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A(nother) Common Lisp FullScreen Window Manager";
+    homepage    = https://common-lisp.net/project/clfswm/;
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/clfswm/require-clx.patch b/pkgs/applications/window-managers/clfswm/require-clx.patch
new file mode 100644
index 00000000000..ae2234461d2
--- /dev/null
+++ b/pkgs/applications/window-managers/clfswm/require-clx.patch
@@ -0,0 +1,13 @@
+diff --git a/load.lisp b/load.lisp
+index c8c4cf0..8c9ca2e 100644
+--- a/load.lisp
++++ b/load.lisp
+@@ -111,6 +111,8 @@ from $XDG_CONFIG_HOME/clfswm/clfswmrc")
+ ;;;------------------
+ (load-info "Requiring CLX")
+ 
++(require 'clx)
++
+ ;;; Loading clisp dynamic module. This part needs clisp >= 2.50
+ ;;#+(AND CLISP (not CLX))
+ ;;(when (fboundp 'require)
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 7e5887e9b9d..d9619fd2712 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.78";
+  version = "0.7.79";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0ai4al5h3qbfq5f1b24ixk5v1fpln2kw1zmdj4hxjz40rj18qzka";
+    sha256 = "0lanhx1zg7s36wgi9ndv4zz7dbhkqz4dc99mva6x9rcj2p5p8c6d";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 11b77ae0815..127eeaeaca9 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }:
 
-let version = "0.4.31"; in
+let version = "0.4.32"; in
 
 stdenv.mkDerivation {
   name = "libzen-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z";
+    sha256 = "0rhbiaywij6jj8d7vkc4v7y21ic1kv9fbn9lk82mm12yjwzlhhyd";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   sourceRoot = "./ZenLib/Project/GNU/Library/";
 
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   meta = {
     description = "Shared library for libmediainfo and mediainfo";
diff --git a/pkgs/development/tools/exercism/default.nix b/pkgs/development/tools/exercism/default.nix
deleted file mode 100644
index 9c1b3027252..00000000000
--- a/pkgs/development/tools/exercism/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "exercism-${version}";
-
-  version = "1.9.2";
-
-  src =
-    if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-mac-64bit.tgz";
-        sha256 = "01ddwblq1kqxhjv8mp8r1zy6p78p6pysf1mbsyjxw1y8skfdapnp";
-      }
-    else if stdenv.system == "i686-darwin" then
-      fetchurl {
-        url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-mac-32bit.tgz";
-        sha256 = "0nkpnvbyi3c3dkw3149jiwil06x997wml844i9m0d6q1wblk0qdd";
-      }
-    else if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-linux-32bit.tgz";
-        sha256 = "0szrn28sb0w88j0kbras10wm76rsndg9j4328p01f60rabq9q3z6";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-linux-64bit.tgz";
-        sha256 = "17iah373ssd9313irmw27jq1a2gpxf8w3chjmgcgiarqfpyny5bz";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  buildPhase = "";
-
-  setSourceRoot = "sourceRoot=./";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -a exercism $out/bin
-  '';
-
-  meta = {
-    description = "A Go based command line tool for exercism.io";
-    homepage    = http://exercism.io;
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.wjlroe ];
-  };
-}
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix
new file mode 100644
index 00000000000..33a6a7ebcef
--- /dev/null
+++ b/pkgs/development/tools/parse-cli-bin/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "3.0.1";
+
+in stdenv.mkDerivation rec {
+
+  name = "parse-cli-bin-${version}";
+
+  src = fetchurl {
+    url    = "https://github.com/ParsePlatform/parse-cli/releases/download/release_${version}/parse_linux";
+    sha256 = "d68eccc1d9408b60901b149d2b4710f3cfd0eabe5772d2e222c06870fdeca3c7";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Parse Command Line Interface";
+    homepage    = "https://parse.com";
+    platforms   = platforms.linux;
+  };
+
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp "$src" "$out/bin/parse"
+    chmod +x "$out/bin/parse"
+  '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ad13b48748..4245034ec77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1399,8 +1399,6 @@ let
 
   execline = callPackage ../tools/misc/execline { };
 
-  exercism = callPackage ../development/tools/exercism { };
-
   exif = callPackage ../tools/graphics/exif { };
 
   exiftags = callPackage ../tools/graphics/exiftags { };
@@ -5730,6 +5728,8 @@ let
 
   oprofile = callPackage ../development/tools/profiling/oprofile { };
 
+  parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
+
   patchelf = callPackage ../development/tools/misc/patchelf { };
 
   peg = callPackage ../development/tools/parsing/peg { };
@@ -11095,6 +11095,8 @@ let
     enableNetworkManager = config.networking.networkmanager.enable or false;
   };
 
+  clfswm = callPackage ../applications/window-managers/clfswm { };
+
   clipgrab = callPackage ../applications/video/clipgrab { };
 
   clipit = callPackage ../applications/misc/clipit { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d5053af2ced..a69d361db61 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -549,6 +549,15 @@ let
     sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4";
   };
 
+  exercism = buildFromGitHub {
+    rev = "v2.2.1";
+    name = "exercism";
+    owner = "exercism";
+    repo = "cli";
+    sha256 = "13kwcxd7m3xv42j50nlm9dd08865dxji41glfvnb4wwq9yicyn4g";
+    buildInputs = [ net cli-go osext ];
+  };
+
   exponential-backoff = buildFromGitHub {
     rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09";
     owner = "odeke-em";