Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

2 files changed, 31 insertions, 1 deletions

diff --git a/nixpkgs/pkgs/by-name/pd/pdfannots2json/package.nix b/nixpkgs/pkgs/by-name/pd/pdfannots2json/package.nix
index 01c30fe1fb52..9d32f9a7c92c 100644
--- a/nixpkgs/pkgs/by-name/pd/pdfannots2json/package.nix
+++ b/nixpkgs/pkgs/by-name/pd/pdfannots2json/package.nix
@@ -18,8 +18,9 @@ in
 
     meta = with lib; {
       homepage = "https://github.com/mgmeyers/pdfannots2json";
-      license = licenses.agpl3;
+      license = licenses.agpl3Only;
       description = "A tool to convert PDF annotations to JSON";
+      mainProgram = "pdfannots2json";
       maintainers = with maintainers; [ _0nyr ];
     };
   }
diff --git a/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix b/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix
new file mode 100644
index 000000000000..808de7bb755d
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/pd/pdpmake/package.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  pname = "pdpmake";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "rmyorston";
+    repo = "pdpmake";
+    rev = version;
+    hash = "sha256-N9MT+3nE8To0ktNTPT9tDHkKRrn4XsTYiTeYdBk9VtI=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
+  checkTarget = "test";
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://github.com/rmyorston/pdpmake";
+    description = "Public domain POSIX make";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ eownerdead ];
+    mainProgram = "pdpmake";
+    platforms = platforms.all;
+    badPlatforms = platforms.darwin; # Requires `uimensat`
+  };
+}