psol: combine into one file

2 files changed, 17 insertions, 20 deletions

diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix
index 270c24dc01f4e..6bbe426fb544c 100644
--- a/pkgs/development/libraries/psol/default.nix
+++ b/pkgs/development/libraries/psol/default.nix
@@ -1,5 +1,19 @@
-{ callPackage }:
-callPackage ./generic.nix {} {
+{ fetchzip, lib }:
+
+fetchzip rec {
+  pname = "psol";
   version = "1.13.35.2"; # Latest stable, 2018-02-05
-  sha256  = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr";
+
+  url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
+  sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr";
+
+  meta = with lib; {
+    description = "PageSpeed Optimization Libraries";
+    homepage = "https://developers.google.com/speed/pagespeed/psol";
+    license = licenses.asl20;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux.
+    # TODO: Build PSOL from source to support more platforms.
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix
deleted file mode 100644
index 8f312fe9dbc83..0000000000000
--- a/pkgs/development/libraries/psol/generic.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ fetchzip, lib }:
-{ version, sha256 }:
-{ inherit version; } // fetchzip {
-  inherit sha256;
-  name   = "psol-${version}";
-  url    = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
-
-  meta = {
-    description = "PageSpeed Optimization Libraries";
-    homepage    = "https://developers.google.com/speed/pagespeed/psol";
-    license     = lib.licenses.asl20;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux.
-    # TODO: Build PSOL from source to support more platforms.
-    platforms   = lib.platforms.linux;
-  };
-}