commit 69bc2ad72fb743b7581a01c59e73a839a6d83c87 · pyrox.dev/nixpkgs

+2 -4

nixos/modules/services/matrix/appservice-irc.nix

···

       12
       12
        
       

     

       13
       13
        
         configFile = pkgs.runCommand "matrix-appservice-irc.yml" {

     

       14
       14
        
           # Because this program will be run at build time, we need `nativeBuildInputs`

     

       15
       15
       -
           nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ];

     

       15
       15
       +
           nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) pkgs.remarshal ];

     

       16
       16
        
           preferLocalBuild = true;

     

       17
       17
        
       

     

       18
       18
        
           config = builtins.toJSON cfg.settings;

     

       19
       19
        
           passAsFile = [ "config" ];

     

       20
       20
        
         } ''

     

       21
       21
        
           # The schema is given as yaml, we need to convert it to json

     

       22
       22
       -
           python -c 'import json; import yaml; import sys; json.dump(yaml.safe_load(sys.stdin), sys.stdout)' \

     

       23
       23
       -
             < ${pkg}/lib/node_modules/matrix-appservice-irc/config.schema.yml \

     

       24
       24
       -
             > config.schema.json

     

       22
       22
       +
           remarshal --if yaml --of json -i ${pkg}/config.schema.yml -o config.schema.json

     

       25
       23
        
           python -m jsonschema config.schema.json -i $configPath

     

       26
       24
        
           cp "$configPath" "$out"

     

       27
       25
        
         '';

+58 -11

pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , buildNpmPackage

     

       2
       2
       +
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , python3

     

       4
       4
       +
       , fetchYarnDeps

     

       5
       5
       +
       , prefetch-yarn-deps

     

       6
       6
       +
       , nodejs

     

       7
       7
       +
       , nodejs-slim

     

       5
       8
        
       , matrix-sdk-crypto-nodejs

     

       6
       9
        
       , nixosTests

     

       7
       10
        
       , nix-update-script

     

       8
       11
        
       }:

     

       9
       12
        
       

     

       10
       10
       -
       buildNpmPackage rec {

     

       13
       13
       +
       let

     

       11
       14
        
         pname = "matrix-appservice-irc";

     

       12
       12
       -
         version = "0.38.0";

     

       15
       15
       +
         version = "1.0.1";

     

       13
       16
        
       

     

       14
       17
        
         src = fetchFromGitHub {

     

       15
       18
        
           owner = "matrix-org";

     

       16
       16
       -
           repo = "matrix-appservice-irc";

     

       19
       19
       +
           repo = pname;

     

       17
       20
        
           rev = "refs/tags/${version}";

     

       18
       18
       -
           hash = "sha256-rV4B9OQl1Ht26X4e7sqCe1PR5RpzIcjj4OvWG6udJWo=";

     

       21
       21
       +
           hash = "sha256-wUbWvCa9xvot73nXZjF3/RawM98ffBCW5YR2+ZKzmEo=";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         yarnOfflineCache = fetchYarnDeps {

     

       25
       25
       +
           name = "${pname}-${version}-offline-cache";

     

       26
       26
       +
           yarnLock = "${src}/yarn.lock";

     

       27
       27
       +
           hash = "sha256-P9u5sK9rIHWRE8kFMj05fVjv26jwsawvHBZgSn7j5BE=";

     

       19
       28
        
         };

     

       20
       29
        
       

     

       21
       21
       -
         npmDepsHash = "sha256-iZuPr3a1BPtRfkEoxOs4oRL/nCfy3PLx5T9dX49/B0s=";

     

       30
       30
       +
       in

     

       31
       31
       +
       stdenv.mkDerivation {

     

       32
       32
       +
         inherit pname version src yarnOfflineCache;

     

       22
       33
        
       

     

       23
       34
        
         nativeBuildInputs = [

     

       24
       24
       -
           python3

     

       35
       35
       +
           prefetch-yarn-deps

     

       36
       36
       +
           nodejs-slim

     

       37
       37
       +
           nodejs.pkgs.yarn

     

       38
       38
       +
           nodejs.pkgs.node-gyp-build

     

       25
       39
        
         ];

     

       26
       40
        
       

     

       27
       27
       -
         postInstall = ''

     

       28
       28
       -
           rm -rv $out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/matrix-sdk-crypto-nodejs

     

       29
       29
       -
           ln -sv ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/

     

       41
       41
       +
         configurePhase = ''

     

       42
       42
       +
           runHook preConfigure

     

       43
       43
       +
       

     

       44
       44
       +
           export HOME=$(mktemp -d)

     

       45
       45
       +
           yarn config --offline set yarn-offline-mirror "$yarnOfflineCache"

     

       46
       46
       +
           fixup-yarn-lock yarn.lock

     

       47
       47
       +
           yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts

     

       48
       48
       +
           patchShebangs node_modules/ bin/

     

       49
       49
       +
       

     

       50
       50
       +
           runHook postConfigure

     

       51
       51
       +
         '';

     

       52
       52
       +
       

     

       53
       53
       +
         buildPhase = ''

     

       54
       54
       +
           runHook preBuild

     

       55
       55
       +
       

     

       56
       56
       +
           yarn --offline build

     

       57
       57
       +
       

     

       58
       58
       +
           runHook postBuild

     

       59
       59
       +
         '';

     

       60
       60
       +
       

     

       61
       61
       +
         installPhase = ''

     

       62
       62
       +
           runHook preInstall

     

       63
       63
       +
       

     

       64
       64
       +
           mkdir $out

     

       65
       65
       +
           cp app.js config.schema.yml $out

     

       66
       66
       +
           cp -r bin lib public $out

     

       67
       67
       +
       

     

       68
       68
       +
           # prune dependencies to production only

     

       69
       69
       +
           yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts --production

     

       70
       70
       +
           cp -r node_modules $out

     

       71
       71
       +
       

     

       72
       72
       +
           # replace matrix-sdk-crypto-nodejs with nixos package

     

       73
       73
       +
           rm -rv $out/node_modules/@matrix-org/matrix-sdk-crypto-nodejs

     

       74
       74
       +
           ln -sv ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/node_modules/@matrix-org/

     

       75
       75
       +
       

     

       76
       76
       +
           runHook postInstall

     

       30
       77
        
         '';

     

       31
       78
        
       

     

       32
       79
        
         passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;