NixOS · Jun 4, 2019 · Jun 5, 2019 · Jun 5, 2019 · Jun 5, 2019 · Jun 5, 2019
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
@@ -16,6 +16,7 @@ lpty,,,,
 lrexlib-gnu,,,,
 lrexlib-posix,,,,
 ltermbox,,,,
+cjson,lua-cjson,,,
 lua-cmsgpack,,,,
 lua_cliargs,,,,
 lua-iconv,,,,

diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,15 +1,15 @@
 { lib, fetchzip }:
 
 let
-  version = "1.4.1";
+  version = "2.0.0";
 in fetchzip rec {
   name = "ibm-plex-${version}";
   url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
   postFetch = ''
     mkdir -p $out/share/fonts
     unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
   '';
-  sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq";
+  sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g";
 
   meta = with lib; {
     description = "IBM Plex Typeface";

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
@@ -352,6 +352,25 @@ ltermbox = buildLuarocksPackage {
     };
   };
 };
+cjson = buildLuarocksPackage {
+  pname = "lua-cjson";
+  version = "2.1.0.6-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock;
+    sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = {
+    homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
+    description = "A fast JSON encoding/parsing module";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
 lua-cmsgpack = buildLuarocksPackage {
   pname = "lua-cmsgpack";
   version = "0.4.0-0";

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
@@ -1,26 +1,28 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "pmd-${version}";
-  version = "6.14.0";
+  pname = "pmd";
+  version = "6.15.0";
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj";
+    sha256 = "0im64lg18bv764i14g3p42dzd7kqq9j5an8dkz1vanypb1jf5j3s";
   };
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out
-    cp -R * $out
+    cp -R {bin,lib} $out
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
     description = "An extensible cross-language static code analyzer";
-    homepage = https://pmd.github.io/;
+    homepage = "https://pmd.github.io/";
+    changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html";
     platforms = platforms.unix;
-    license = with licenses; [ bsdOriginal asl20 ];
+    license = with licenses; [ bsdOriginal asl20 lgpl3Plus ];
   };
 }
-
diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix
@@ -0,0 +1,31 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+, fetchpatch
+}:
+
+buildGoPackage rec {
+  pname = "dapper";
+  version = "0.4.1";
+
+  goPackagePath = "github.com/rancher/dapper";
+
+  src = fetchFromGitHub {
+    owner = "rancher";
+    repo = "dapper";
+    rev = "v${version}";
+    sha256 = "03rmkmlvhmfwcln5v1rqww1kirxm0d1p58h6pj8f5fnhk9spb162";
+  };
+   patchPhase = ''
+     substituteInPlace main.go --replace 0.0.0 ${version}
+   '';
+
+  meta = with lib; {
+    description = "Docker Build Wrapper";
+    homepage = "https://github.com/rancher/dapper";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kuznero ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -24171,4 +24171,6 @@ in
 
   bemenu = callPackage ../applications/misc/bemenu { };
 
+  dapper = callPackage ../development/tools/dapper { };
+
 }
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
@@ -684,37 +684,6 @@ with self; {
     };
   };
 
-  cjson = buildLuaPackage rec {
-    name = "cjson-${version}";
-    version = "2.1.0";
-
-    src = fetchurl {
-      url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz";
-      sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i";
-    };
-
-    preBuild = ''
-      sed -i "s|/usr/local|$out|" Makefile
-    '';
-
-    makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
-
-    postInstall = ''
-      rm -rf $out/share/lua/${lua.luaversion}/cjson/tests
-    '';
-
-    installTargets = "install install-extra";
-
-    disabled = isLuaJIT;
-
-    meta = with stdenv.lib; {
-      description = "Lua C extension module for JSON support";
-      homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php";
-      license = licenses.mit;
-      maintainers = with maintainers; [ vyp ];
-    };
-  };
-
   mpack = buildLuaPackage rec {
     name = "mpack-${version}";
     version = "1.0.7";
Original file line number	Diff line number	Diff line change
		@@ -24171,4 +24171,6 @@ in

		bemenu = callPackage ../applications/misc/bemenu { };

		dapper = callPackage ../development/tools/dapper { };

		}