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

Merge master into staging-next

parents ae20452a 665cbdb5

nixos/modules/hardware/video/nvidia.nix

+3 −1
Original line number Diff line number Diff line
@@ -461,7 +461,9 @@ in 
    # If requested enable modesetting via kernel parameter.

    boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"

      ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"

      ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1";

      ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"

      # proprietary driver is not compiled with support for X86_KERNEL_IBT

      ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off";



    services.udev.extraRules =

      ''

pkgs/applications/audio/cardinal/default.nix

+29 −7
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
  stdenv

, fetchFromGitHub

, fetchurl

, cmake

, dbus

, file

, freetype

, jansson

, lib
@@ -11,32 +14,44 @@ 
, libXext

, libXrandr

, libarchive

, libjack2

, liblo

, libsamplerate

, mesa

, libsndfile

, makeWrapper

, pkg-config

, python3

, speexdsp

, libglvnd

}:



stdenv.mkDerivation rec {

  pname = "cardinal";

  version = "22.11";

  version = "22.12";



  src = fetchurl {

    url =

      "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";

    sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0=";

    sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY=";

  };



  prePatch = ''

    patchShebangs ./dpf/utils/generate-ttl.sh

  '';



  dontUseCmakeConfigure = true;

  enableParallelBuilding = true;

  strictDeps = true;



  nativeBuildInputs = [ pkg-config ];

  nativeBuildInputs = [

    cmake

    file

    pkg-config

    makeWrapper

    python3

  ];

  buildInputs = [

    dbus

    freetype

    jansson

    libGL
@@ -44,18 +59,25 @@ stdenv.mkDerivation rec { 
    libXcursor

    libXext

    libXrandr

    libXrandr

    libarchive

    liblo

    libsamplerate

    mesa

    python3

    libsndfile

    speexdsp

    libglvnd

  ];



  hardeningDisable = [ "format" ];

  makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];



  postInstall = ''

    wrapProgram $out/bin/Cardinal \

    --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}



    # this doesn't work and is mainly just a test tool for the developers anyway.

    rm -f $out/bin/CardinalNative

  '';



  meta = {

    description = "Plugin wrapper around VCV Rack";

    homepage = "https://github.com/DISTRHO/cardinal";

pkgs/applications/misc/mysql-workbench/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ let 
  inherit (python3.pkgs) paramiko pycairo pyodbc;

in stdenv.mkDerivation rec {

  pname = "mysql-workbench";

  version = "8.0.30";

  version = "8.0.32";



  src = fetchurl {

    url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";

    sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185";

    sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI=";

  };



  patches = [
@@ -148,7 +148,7 @@ in stdenv.mkDerivation rec { 
    "-Wno-error=narrowing"

  ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [

    # Needed with GCC 12 but problematic with some old GCCs

    "-Wno-error=maybe-uninitalized"

    "-Wno-error=maybe-uninitialized"

  ]);



  cmakeFlags = [

pkgs/applications/networking/browsers/chromium/upstream-info.json

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

  "stable": {

    "version": "110.0.5481.100",

    "sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",

    "sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",

    "version": "110.0.5481.177",

    "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv",

    "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2",

    "deps": {

      "gn": {

        "version": "2022-12-12",
@@ -19,9 +19,9 @@ 
    }

  },

  "beta": {

    "version": "111.0.5563.19",

    "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",

    "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza",

    "version": "111.0.5563.41",

    "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay",

    "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w",

    "deps": {

      "gn": {

        "version": "2022-12-12",

pkgs/applications/networking/instant-messengers/discord/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
let

  versions = if stdenv.isLinux then {

    stable = "0.0.25";

    ptb = "0.0.38";

    ptb = "0.0.39";

    canary = "0.0.148";

  } else {

    stable = "0.0.264";
@@ -18,7 +18,7 @@ let 
      };

      ptb = fetchurl {

        url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

        sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s=";

        sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks=";

      };

      canary = fetchurl {

        url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";