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

Merge master into staging-next

parents 9dd80cf7 d14c42b9

nixos/modules/services/networking/firewall.nix

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ in 
        example = literalExpression "pkgs.iptables-legacy";

        description =

          lib.mdDoc ''

            The iptables package to use for running the firewall service."

            The iptables package to use for running the firewall service.

          '';

      };

pkgs/applications/gis/grass/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    pkg-config bison flex makeWrapper wrapGAppsHook

    gdal geos libmysqlclient netcdf pdal

  ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_1 ]);

  ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);



  buildInputs = [

    cairo zlib proj libtiff libpng fftw sqlite

pkgs/applications/misc/dbeaver/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
, libXtst

, zlib

, maven

, webkitgtk

, webkitgtk_4_1

, glib-networking

, javaPackages

}:
@@ -52,7 +52,7 @@ 
    libXtst

    zlib

  ] ++ lib.optionals stdenv.isLinux [

    webkitgtk

    webkitgtk_4_1

    glib-networking

  ];
@@ -108,7 +108,7 @@ 


      makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \

        --prefix PATH : ${jdk}/bin \

        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \

        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \

        --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \

        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

pkgs/applications/misc/tippecanoe/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "tippecanoe";

  version = "2.11.0";

  version = "2.13.0";



  src = fetchFromGitHub {

    owner = "felt";

    repo = "tippecanoe";

    rev = finalAttrs.version;

    hash = "sha256-WFvpq0g+P9gs0VudKB5mVTo/cvWMsaxf13ZORUTf/7c=";

    hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls=";

  };



  buildInputs = [ sqlite zlib ];

pkgs/applications/networking/browsers/microsoft-edge/default.nix

+6 −6
Original line number Diff line number Diff line 
{

  beta = import ./browser.nix {

    channel = "beta";

    version = "106.0.1370.17";

    version = "108.0.1462.20";

    revision = "1";

    sha256 = "sha256:0g9w3a7znc3iq0y27drjv5l45zk8lm0c1djd1r30iijln8a1diak";

    sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm";

  };

  dev = import ./browser.nix {

    channel = "dev";

    version = "107.0.1375.0";

    version = "109.0.1495.2";

    revision = "1";

    sha256 = "sha256:1a014jyrk5f11dr2s2mf1m8kfq39rbc5rh0bkmclbwsl83rdfdi4";

    sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw";

  };

  stable = import ./browser.nix {

    channel = "stable";

    version = "105.0.1343.42";

    version = "107.0.1418.52";

    revision = "1";

    sha256 = "sha256:18jnq1q65989xl98j2n3wlim0j00krkjxxnkfx2h7kymqjgysm6d";

    sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day";

  };

}