Unverified Commit bbea3494 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 480db5cf 7dc1e423

nixos/tests/zammad.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import ./make-test-python.nix ( 
        let cfg = config.services.zammad; in

        {

          serviceConfig = {

            Type = "simple";

            Restart = "always";

            Type = "oneshot";

            Restart = "on-failure";



            User = "zammad";

            Group = "zammad";

pkgs/applications/audio/waylyrics/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "waylyrics";

  version = "0.3.15";

  version = "0.3.16";



  src = fetchFromGitHub {

    owner = "waylyrics";

    repo = "waylyrics";

    rev = "v${version}";

    hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U=";

    hash = "sha256-/hwx4fe1yjfsLYxsQkUMXrqWhAgp/VJ74N1eSiXuJ54=";

  };



  cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE=";

  cargoHash = "sha256-Os7djeTDChNWXWbmDuJWJnf7E+U/V14Jg4cLOMAKhu4=";



  nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];

  buildInputs = [ openssl dbus ];

pkgs/applications/editors/qemacs/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation rec {

  pname = "qemacs";

  version = "5.4.1c";

  version = "6.1.1b";



  src = fetchFromGitHub {

    owner = "qemacs";

    repo = "qemacs";

    rev = "216b3ff8b77ff138aec22045522d5601b7390e58";

    hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k=";

    rev = "06b3d373bbcc52b51ccb438bf3cab38a49492ff0";

    hash = "sha256-Z4BbA8W3bYdw+cHgI24r55OP1Olr3GwKLlfRxjy45i8=";

  };



  postPatch = ''

pkgs/applications/networking/misc/zammad/0001-nulldb.patch

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
diff --git a/config/application.rb b/config/application.rb

index d85a17491..90ea5e387 100644

--- a/config/application.rb

+++ b/config/application.rb

@@ -3,6 +3,7 @@

 require_relative 'boot'

 

 require 'rails/all'

+require 'nulldb'

 require_relative '../lib/zammad/safe_mode'

 

 # DO NOT REMOVE THIS LINE - see issue #2037

diff --git a/db/schema.rb b/db/schema.rb

new file mode 100644

index 000000000..e69de29bb

pkgs/applications/networking/misc/zammad/default.nix

+17 −9
Original line number Diff line number Diff line
@@ -23,21 +23,20 @@ 


let

  pname = "zammad";

  version = "6.2.0";

  version = "6.3.1";



  src = applyPatches {



    src = fetchFromGitHub (lib.importJSON ./source.json);



    patches = [

      ./0001-nulldb.patch

      ./fix-sendmail-location.diff

    ];



    postPatch = ''

      sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile

      sed -i -e "s|ruby 3.1.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock

      sed -i -e "s|3.1.[0-9]\+|${ruby.version}|" .ruby-version

      sed -i -e "s|ruby '3.2.[0-9]\+'|ruby '${ruby.version}'|" Gemfile

      sed -i -e "s|ruby 3.2.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock

      sed -i -e "s|3.2.[0-9]\+|${ruby.version}|" .ruby-version

      ${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json

    '';

  };
@@ -65,7 +64,6 @@ let 
    groups = [

      "assets"

      "unicorn" # server

      "nulldb"

      "test"

      "mysql"

      "puma"
@@ -100,9 +98,11 @@ let 


    offlineCache = fetchYarnDeps {

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

      hash = "sha256-u72ZTpcUvFa1gaWi4lzTQa+JsI85jU4n8r1JhqFnCj4=";

      hash = "sha256-3DuTirYd6lAQd5PRbdOa/6QaMknIqNMTVnxEESF0N/c=";

    };



    packageResolutions.minimatch = "9.0.3";



    yarnPreBuild = ''

      mkdir -p deps/Zammad

      cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad
@@ -126,6 +126,7 @@ stdenv.mkDerivation { 


  nativeBuildInputs = [

    redis

    postgresql

  ];



  RAILS_ENV = "production";
@@ -140,10 +141,17 @@ stdenv.mkDerivation { 
    REDIS_PID=$!

    popd



    rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile

    mkdir postgres-work

    initdb -D postgres-work --encoding=utf8

    pg_ctl start -D postgres-work -o "-k $PWD/postgres-work -h '''"

    createuser -h $PWD/postgres-work zammad -R -S

    createdb -h $PWD/postgres-work --encoding=utf8 --owner=zammad zammad



    rake DATABASE_URL="postgresql:///zammad?host=$PWD/postgres-work" assets:precompile



    kill $REDIS_PID

    rm -r redis-work

    pg_ctl stop -D postgres-work -m immediate

    rm -r redis-work postgres-work

  '';



  installPhase = ''