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

Merge staging-next into staging

parents 97b2abc6 055dd6c5

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -1835,6 +1835,12 @@ 
      fingerprint = "E9A3 7864 2165 28CE 507C  CA82 72EA BF75 C331 CD25";

    }];

  };

  benkuhn = {

    email = "ben@ben-kuhn.com";

    github = "ben-kuhn";

    githubId = 16821405;

    name = "Ben Kuhn";

  };

  benley = {

    email = "benley@gmail.com";

    github = "benley";
@@ -9352,6 +9358,12 @@ 
    githubId = 458783;

    name = "Martin Gammelsæter";

  };

  martinramm = {

    email = "martin-ramm@gmx.de";

    github = "MartinRamm";

    githubId = 31626748;

    name = "Martin Ramm";

  };

  marzipankaiser = {

    email = "nixos@gaisseml.de";

    github = "marzipankaiser";

nixos/modules/hardware/opengl.nix

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ in 
          You should only need to adjust this if you require a newer Mesa

          version for your hardware or because you need to patch a bug.

        '';

        apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";

        apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");

      };

      mesaPackage32 = mkOption {

        type = types.package;
@@ -110,7 +110,7 @@ in 
          Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit

          systems. Used when {option}`driSupport32Bit` is set.

        '';

        apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";

        apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");

      };



      extraPackages = mkOption {

nixos/modules/services/x11/gdk-pixbuf.nix

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ in 
  # loaders.cache based on that and set the environment variable

  # GDK_PIXBUF_MODULE_FILE to point to it.

  config = lib.mkIf (cfg.modulePackages != []) {

    environment.variables = {

    environment.sessionVariables = {

      GDK_PIXBUF_MODULE_FILE = "${loadersCache}";

    };

  };

pkgs/applications/graphics/drawing/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "drawing";

  version = "1.0.1";

  version = "1.0.2";



  format = "other";



  src = fetchFromGitHub {

    owner = "maoschanz";

    repo = pname;

    rev = version;

    sha256 = "sha256-9nosriI3Kdf1M5/TYFWn1jtQTqNKhBcFh7q3E4Uoq4s=";

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

    hash = "sha256-kNF9db8NoHWW1A0WEFQzxHqAQ4A7kxInMRZFJOXQX/k=";

  };



  nativeBuildInputs = [
@@ -64,6 +64,7 @@ python3.pkgs.buildPythonApplication rec { 
  meta = with lib; {

    description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop";

    homepage = "https://maoschanz.github.io/drawing/";

    changelog = "https://github.com/maoschanz/drawing/releases/tag/${version}";

    maintainers = with maintainers; [ mothsart ];

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/Cargo.lock b/Cargo.lock

index f01f824..e00d079 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -328,7 +328,7 @@ dependencies = [



 [[package]]

 name = "swayws"

-version = "1.1.1"

+version = "1.2.0"

 dependencies = [

  "clap",

  "env_logger",