diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-12-29 01:35:27 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-29 01:35:27 -0300 |
| commit | cb00684c270f823a890003ff4c03949cc3f30001 (patch) | |
| tree | d58010e3dbe7a67ddb8f341b881aee45ddb9742f | |
| parent | 1e5bf397bf5cf5f1519d54ca6d41dc152cd33630 (diff) | |
| parent | 2087e7e67b05a7065de53b47a50dfbdb1282e528 (diff) | |
Merge pull request #208164 from SuperSandro2000/psol
psol: combine into one file
| -rw-r--r-- | pkgs/development/libraries/psol/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/psol/generic.nix | 17 |
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; - }; -} |