Unverified Commit a570315b authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

mediagoblin: remove bower usage

parent 70925fbc

pkgs/by-name/me/mediagoblin/bower-packages.nix

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
{ fetchbower, buildEnv }:

buildEnv {

  name = "bower-env";

  ignoreCollisions = true;

  paths = [

    (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0")

    (fetchbower "video.js" "5.20.5" "~5.20.1" "1agvvid2valba7xxypknbb3k578jz8sa4rsmq5z2yc5010k3nkqp")

    (fetchbower "videojs-resolution-switcher" "0.4.2" "~0.4.2"

      "1bz2q1wwdglaxbb20fin9djgs1c71jywxhlrm16hm4bzg708ycaf"

    )

    (fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca")

  ];

}

pkgs/by-name/me/mediagoblin/package.nix

+24 −7
Original line number Diff line number Diff line 
{

  lib,

  buildBowerComponents,

  buildNpmPackage,

  fetchFromSourcehut,

  fetchpatch,

  gobject-introspection,

  gst_all_1,

  poppler-utils,
@@ -34,16 +35,32 @@ let 
    hash = "sha256-Y1VnXLHEl6TR8nt+vKSfoCwleQ+oA2WPMN9q4fW9R3s=";

  };



  extlib = buildBowerComponents {

  patches = [

    (fetchpatch {

      url = "https://git.sr.ht/~mediagoblin/mediagoblin/commit/95a591bb2ffdeed059b926059155fd0802e6b1e6.patch";

      excludes = [ "docs/source/siteadmin/relnotes.rst" ];

      hash = "sha256-Coff02bewl6E9bHeMy/6tA2dngKcw/c33xk9nmMl/Bk=";

    })

  ];



  extlib = buildNpmPackage {

    name = "mediagoblin-extlib";

    generated = ./bower-packages.nix;

    inherit src;

    inherit src patches;



    npmDepsHash = "sha256-wtk5MgsWEpuz3V/EcozEAMOa8UeCgdjhR5wxaiaMugY=";



    dontNpmBuild = true;



    installPhase = ''

      mkdir -p $out/node_modules/

      cp -r node_modules/{jquery,video.js,videojs-resolution-switcher,leaflet} $out/node_modules/

    '';

  };

in

python.pkgs.buildPythonApplication rec {

  format = "setuptools";

  pname = "mediagoblin";

  inherit version src;

  inherit version src patches;



  postPatch = ''

    # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L60-62
@@ -128,7 +145,7 @@ python.pkgs.buildPythonApplication rec { 
  '';



  postInstall = ''

    lndir -silent ${extlib}/bower_components/ $out/${python.sitePackages}/mediagoblin/static/extlib/

    lndir -silent ${extlib}/node_modules $out/${python.sitePackages}/mediagoblin/static/extlib/



    ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/jquery/dist/jquery.js $out/${python.sitePackages}/mediagoblin/static/js/extlib/jquery.js

    ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.css $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.css
@@ -151,7 +168,7 @@ python.pkgs.buildPythonApplication rec { 
  pythonImportsCheck = [ "mediagoblin" ];



  passthru = {

    inherit python;

    inherit extlib python;

  };



  meta = {