commit f8096460bd15d4f13a01cfddf0a30798921fdb42 · pyrox.dev/nixpkgs

+12 -1

nixos/modules/services/web-apps/discourse.xml

···

       284
        
             Ruby dependencies are listed in its

     

       285
        
             <filename>plugin.rb</filename> file as function calls to

     

       286
        
             <literal>gem</literal>. To construct the corresponding

     

       287
       -
             <filename>Gemfile</filename>, run <command>bundle

     

       288
        
             init</command>, then add the <literal>gem</literal> lines to it

     

       289
        
             verbatim.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       290
        
           </para>

     

       291
        
       

     

       292
        
           <para>

···

       284
        
             Ruby dependencies are listed in its

     

       285
        
             <filename>plugin.rb</filename> file as function calls to

     

       286
        
             <literal>gem</literal>. To construct the corresponding

     

       287
       +
             <filename>Gemfile</filename> manually, run <command>bundle

     

       288
        
             init</command>, then add the <literal>gem</literal> lines to it

     

       289
        
             verbatim.

     

       290
       +
           </para>

     

       291
       +
       

     

       292
       +
           <para>

     

       293
       +
             Much of the packaging can be done automatically by the

     

       294
       +
             <filename>nixpkgs/pkgs/servers/web-apps/discourse/update.py</filename>

     

       295
       +
             script - just add the plugin to the <literal>plugins</literal>

     

       296
       +
             list in the <function>update_plugins</function> function and run

     

       297
       +
             the script:

     

       298
       +
             <programlisting language="bash">

     

       299
       +
       ./update.py update-plugins

     

       300
       +
       </programlisting>.

     

       301
        
           </para>

     

       302
        
       

     

       303
        
           <para>

+53 -2

pkgs/servers/web-apps/discourse/update.py

···

       12
        
       import stat

     

       13
        
       import json

     

       14
        
       import requests

     

       0
        
       
     

       15
        
       from distutils.version import LooseVersion

     

       16
        
       from pathlib import Path

     

       17
        
       from typing import Iterable

     
···

       77
        
       

     

       78
        
       def _nix_eval(expr: str):

     

       79
        
           nixpkgs_path = Path(__file__).parent / '../../../../'

     

       80
       -
           return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       81
        
       

     

       82
        
       

     

       83
        
       def _get_current_package_version(pkg: str):

     
···

       206
        
               repo_name = plugin.get('repo_name') or name

     

       207
        
       

     

       208
        
               repo = DiscourseRepo(owner=owner, repo=repo_name)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       209
        
               prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev')

     

       210
        
       

     

       211
        
               if prev_commit_sha == repo.latest_commit_sha:

     

       212
        
                   click.echo(f'Plugin {name} is already at the latest revision')

     

       213
        
                   continue

     

       214
        
       

     

       215
       -
               filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file']

     

       216
        
               prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash')

     

       217
        
               new_hash = subprocess.check_output([

     

       218
        
                   'nix-universal-prefetch', fetcher,

···

       12
        
       import stat

     

       13
        
       import json

     

       14
        
       import requests

     

       15
       +
       import textwrap

     

       16
        
       from distutils.version import LooseVersion

     

       17
        
       from pathlib import Path

     

       18
        
       from typing import Iterable

     
···

       78
        
       

     

       79
        
       def _nix_eval(expr: str):

     

       80
        
           nixpkgs_path = Path(__file__).parent / '../../../../'

     

       81
       +
           try:

     

       82
       +
               output = subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)

     

       83
       +
           except subprocess.CalledProcessError:

     

       84
       +
               return None

     

       85
       +
           return json.loads(output)

     

       86
        
       

     

       87
        
       

     

       88
        
       def _get_current_package_version(pkg: str):

     
···

       211
        
               repo_name = plugin.get('repo_name') or name

     

       212
        
       

     

       213
        
               repo = DiscourseRepo(owner=owner, repo=repo_name)

     

       214
       +
       

     

       215
       +
               filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')

     

       216
       +
               if filename is None:

     

       217
       +
                   filename = Path(__file__).parent / 'plugins' / name / 'default.nix'

     

       218
       +
                   filename.parent.mkdir()

     

       219
       +
       

     

       220
       +
                   has_ruby_deps = False

     

       221
       +
                   for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines():

     

       222
       +
                       if 'gem ' in line:

     

       223
       +
                           has_ruby_deps = True

     

       224
       +
                           break

     

       225
       +
       

     

       226
       +
                   with open(filename, 'w') as f:

     

       227
       +
                       f.write(textwrap.dedent(f"""

     

       228
       +
                                {{ lib, mkDiscoursePlugin, fetchFromGitHub }}:

     

       229
       +
       

     

       230
       +
                                mkDiscoursePlugin {{

     

       231
       +
                                  name = "{name}";"""[1:] + ("""

     

       232
       +
                                  bundlerEnvArgs.gemdir = ./.;""" if has_ruby_deps else "") + f"""

     

       233
       +
                                  src = {fetcher} {{

     

       234
       +
                                    owner = "{owner}";

     

       235
       +
                                    repo = "{repo_name}";

     

       236
       +
                                    rev = "replace-with-git-rev";

     

       237
       +
                                    sha256 = "replace-with-sha256";

     

       238
       +
                                  }};

     

       239
       +
                                  meta = with lib; {{

     

       240
       +
                                    homepage = "";

     

       241
       +
                                    maintainers = with maintainers; [ ];

     

       242
       +
                                    license = licenses.mit; # change to the correct license!

     

       243
       +
                                    description = "";

     

       244
       +
                                  }};

     

       245
       +
                                }}"""))

     

       246
       +
       

     

       247
       +
                   all_plugins_filename = Path(__file__).parent / 'plugins' / 'all-plugins.nix'

     

       248
       +
                   with open(all_plugins_filename, 'r+') as f:

     

       249
       +
                       content = f.read()

     

       250
       +
                       pos = -1

     

       251
       +
                       while content[pos] != '}':

     

       252
       +
                           pos -= 1

     

       253
       +
                       content = content[:pos] + f'  {name} = callPackage ./{name} {{}};' + os.linesep + content[pos:]

     

       254
       +
                       f.seek(0)

     

       255
       +
                       f.write(content)

     

       256
       +
                       f.truncate()

     

       257
       +
       

     

       258
       +
               else:

     

       259
       +
                   filename = filename['file']

     

       260
       +
       

     

       261
        
               prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev')

     

       262
        
       

     

       263
        
               if prev_commit_sha == repo.latest_commit_sha:

     

       264
        
                   click.echo(f'Plugin {name} is already at the latest revision')

     

       265
        
                   continue

     

       266
        
       

     

       0
        
       
     

       267
        
               prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash')

     

       268
        
               new_hash = subprocess.check_output([

     

       269
        
                   'nix-universal-prefetch', fetcher,