mediagoblin: remove bower usage

+24 -20
-13
pkgs/by-name/me/mediagoblin/bower-packages.nix
··· 1 - { fetchbower, buildEnv }: 2 - buildEnv { 3 - name = "bower-env"; 4 - ignoreCollisions = true; 5 - paths = [ 6 - (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0") 7 - (fetchbower "video.js" "5.20.5" "~5.20.1" "1agvvid2valba7xxypknbb3k578jz8sa4rsmq5z2yc5010k3nkqp") 8 - (fetchbower "videojs-resolution-switcher" "0.4.2" "~0.4.2" 9 - "1bz2q1wwdglaxbb20fin9djgs1c71jywxhlrm16hm4bzg708ycaf" 10 - ) 11 - (fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca") 12 - ]; 13 - }
+24 -7
pkgs/by-name/me/mediagoblin/package.nix
··· 1 1 { 2 2 lib, 3 - buildBowerComponents, 3 + buildNpmPackage, 4 4 fetchFromSourcehut, 5 + fetchpatch, 5 6 gobject-introspection, 6 7 gst_all_1, 7 8 poppler-utils, ··· 34 35 hash = "sha256-Y1VnXLHEl6TR8nt+vKSfoCwleQ+oA2WPMN9q4fW9R3s="; 35 36 }; 36 37 37 - extlib = buildBowerComponents { 38 + patches = [ 39 + (fetchpatch { 40 + url = "https://git.sr.ht/~mediagoblin/mediagoblin/commit/95a591bb2ffdeed059b926059155fd0802e6b1e6.patch"; 41 + excludes = [ "docs/source/siteadmin/relnotes.rst" ]; 42 + hash = "sha256-Coff02bewl6E9bHeMy/6tA2dngKcw/c33xk9nmMl/Bk="; 43 + }) 44 + ]; 45 + 46 + extlib = buildNpmPackage { 38 47 name = "mediagoblin-extlib"; 39 - generated = ./bower-packages.nix; 40 - inherit src; 48 + inherit src patches; 49 + 50 + npmDepsHash = "sha256-wtk5MgsWEpuz3V/EcozEAMOa8UeCgdjhR5wxaiaMugY="; 51 + 52 + dontNpmBuild = true; 53 + 54 + installPhase = '' 55 + mkdir -p $out/node_modules/ 56 + cp -r node_modules/{jquery,video.js,videojs-resolution-switcher,leaflet} $out/node_modules/ 57 + ''; 41 58 }; 42 59 in 43 60 python.pkgs.buildPythonApplication rec { 44 61 format = "setuptools"; 45 62 pname = "mediagoblin"; 46 - inherit version src; 63 + inherit version src patches; 47 64 48 65 postPatch = '' 49 66 # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L60-62 ··· 128 145 ''; 129 146 130 147 postInstall = '' 131 - lndir -silent ${extlib}/bower_components/ $out/${python.sitePackages}/mediagoblin/static/extlib/ 148 + lndir -silent ${extlib}/node_modules $out/${python.sitePackages}/mediagoblin/static/extlib/ 132 149 133 150 ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/jquery/dist/jquery.js $out/${python.sitePackages}/mediagoblin/static/js/extlib/jquery.js 134 151 ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.css $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.css ··· 151 168 pythonImportsCheck = [ "mediagoblin" ]; 152 169 153 170 passthru = { 154 - inherit python; 171 + inherit extlib python; 155 172 }; 156 173 157 174 meta = {