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

Merge master into staging-next

parents 6b41a98c 6c681f12

pkgs/applications/networking/browsers/mullvad-browser/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -78,15 +78,19 @@ let 
      ++ lib.optionals mediaSupport [ ffmpeg ]

  );



  version = "12.5.5";

  version = "12.5.6";



  sources = {

    x86_64-linux = fetchurl {

      urls = [

        "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"

        "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"

        "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"

        "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"

        "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"

        "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"

      ];

      hash = "sha256-ISmhKitFReHSADGygzpoKwlBOJH2HfPDEtMjTB6fMhs=";

      hash = "sha256-e7gRkRMipnEG1hMlhs25LUJ5KDGt8qP3wpbSG2K2aK8=";

    };

  };

pkgs/applications/networking/browsers/tor-browser/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null) 
  fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];



  # Upstream source

  version = "12.5.5";

  version = "12.5.6";



  lang = "ALL";
@@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null) 
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

      ];

      hash = "sha256-FS1ywm/UJDZiSYPf0WHikoX/o6WGIP+lQQGFeD0g2dc=";

      hash = "sha256-lZlGhyGDT9Vxox3ghfFSIZd3sazNyL23k0UtipaIGR8=";

    };



    i686-linux = fetchurl {
@@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null) 
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

      ];

      hash = "sha256-6ozGIQPC8QnZxS1oJ0ZEdZDMY2JkwRHs+7ZHUkqrL6U=";

      hash = "sha256-3Z3S6P3wkZeC/lhgO7XDdDDQ6cpyOX+e3SBuh47aMl8=";

    };

  };

pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix

+3 −2
Original line number Diff line number Diff line
@@ -156,9 +156,10 @@ stdenv.mkDerivation rec { 
      --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

    )



    # Fix the desktop link

    # Fix the desktop link and fix showing application icon in tray

    substituteInPlace $out/share/applications/${pname}.desktop \

      --replace "/opt/${dir}/${pname}" $out/bin/${pname}

      --replace "/opt/${dir}/${pname}" $out/bin/${pname} \

      --replace "bin/signal-desktop" "bin/signal-desktop --use-tray-icon"



    autoPatchelf --no-recurse -- "$out/lib/${dir}/"

    patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"

pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch

+9 −7
Original line number Diff line number Diff line 
From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001

From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001

From: Yaya <mak@nyantec.com>

Date: Tue, 23 May 2023 13:49:18 +0000

Subject: [PATCH] Remove unsupported database names



The only supported ones are main, ci, main_clusterwide.

---

 config/database.yml.postgresql | 35 ----------------------------------

 1 file changed, 35 deletions(-)

 config/database.yml.postgresql | 37 ----------------------------------

 1 file changed, 37 deletions(-)



diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql

index b210b9c412bc..900612080416 100644

index da9f458ff..2d6d44e37 100644

--- a/config/database.yml.postgresql

+++ b/config/database.yml.postgresql

@@ -26,13 +26,6 @@ production:
@@ -54,8 +54,8 @@ index b210b9c412bc..900612080416 100644 
 

 # Warning: The database defined as "test" will be erased and

 # re-generated from your development database when you run "rake".

@@ -117,17 +96,3 @@ test: &test

     prepared_statements: false

@@ -119,19 +98,3 @@ test: &test

     reaping_frequency: nil

     variables:

       statement_timeout: 15s

-  geo:
@@ -65,6 +65,7 @@ index b210b9c412bc..900612080416 100644 
-    username: postgres

-    password:

-    host: localhost

-    reaping_frequency: nil

-  embedding:

-    adapter: postgresql

-    encoding: unicode
@@ -72,6 +73,7 @@ index b210b9c412bc..900612080416 100644 
-    username: postgres

-    password:

-    host: localhost

-    reaping_frequency: nil

-- 

2.38.4

2.40.1

pkgs/applications/version-management/gitlab/data.json

+9 −9
Original line number Diff line number Diff line 
{

  "version": "16.3.4",

  "repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=",

  "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088",

  "version": "16.4.1",

  "repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=",

  "yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v16.3.4-ee",

  "rev": "v16.4.1-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "16.3.4",

    "GITLAB_PAGES_VERSION": "16.3.4",

    "GITLAB_SHELL_VERSION": "14.26.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10",

    "GITLAB_WORKHORSE_VERSION": "16.3.4"

    "GITALY_SERVER_VERSION": "16.4.1",

    "GITLAB_PAGES_VERSION": "16.4.1",

    "GITLAB_SHELL_VERSION": "14.28.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9",

    "GITLAB_WORKHORSE_VERSION": "16.4.1"

  }

}