Merge master into haskell-updates

2025-01-20 11:53:51 +00:00 · 2023-03-18 00:12:33 +00:00 · 2023-03-18 00:12:33 +00:00 · b47aebb347
commit b47aebb347
parent beafc73774 b7a3087658
229 changed files with 2685 additions and 1368 deletions
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@ -101,11 +101,11 @@ To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unst

 ```bash
 nix-shell '<nixpkgs>' -A some_package
-eval ${unpackPhase:-unpackPhase}
+eval "${unpackPhase:-unpackPhase}"
 cd $sourceRoot
-eval ${patchPhase:-patchPhase}
-eval ${configurePhase:-configurePhase}
-eval ${buildPhase:-buildPhase}
+eval "${patchPhase:-patchPhase}"
+eval "${configurePhase:-configurePhase}"
+eval "${buildPhase:-buildPhase}"
 ```

 To modify a [phase](#sec-stdenv-phases), first print it with
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -16720,6 +16720,12 @@
    githubId = 908716;
    name = "Zach Coyle";
  };
+  Zaechus = {
+    email = "zaechus@proton.me";
+    github = "Zaechus";
+    githubId = 19353212;
+    name = "Maxwell Anderson";
+  };
  zagy = {
    email = "cz@flyingcircus.io";
    github = "zagy";
--- a/nixos/modules/security/doas.nix
+++ b/nixos/modules/security/doas.nix
@ -75,7 +75,9 @@ in
        {file}`/etc/doas.conf` file. More specific rules should
        come after more general ones in order to yield the expected behavior.
        You can use `mkBefore` and/or `mkAfter` to ensure
-        this is the case when configuration options are merged.
+        this is the case when configuration options are merged. Be aware that
+        this option cannot be used to override the behaviour allowing
+        passwordless operation for root.
      '';
      example = literalExpression ''
        [
@ -224,7 +226,9 @@ in
      type = with types; lines;
      default = "";
      description = lib.mdDoc ''
-        Extra configuration text appended to {file}`doas.conf`.
+        Extra configuration text appended to {file}`doas.conf`. Be aware that
+        this option cannot be used to override the behaviour allowing
+        passwordless operation for root.
      '';
    };
  };
@ -266,14 +270,14 @@ in
            # completely replace the contents of this file, use
            # `environment.etc."doas.conf"`.

-            # "root" is allowed to do anything.
-            permit nopass keepenv root
-
            # extraRules
            ${concatStringsSep "\n" (lists.flatten (map mkRule cfg.extraRules))}

            # extraConfig
            ${cfg.extraConfig}
+
+            # "root" is allowed to do anything.
+            permit nopass keepenv root
          '';
          preferLocalBuild = true;
        }
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@ -5,7 +5,7 @@ with lib;
 let
  cfg = config.services.avahi;

-  yesNo = yes : if yes then "yes" else "no";
+  yesNo = yes: if yes then "yes" else "no";

  avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" ''
    [server]
@ -17,7 +17,8 @@ let
    browse-domains=${concatStringsSep ", " browseDomains}
    use-ipv4=${yesNo ipv4}
    use-ipv6=${yesNo ipv6}
-    ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"}
+    ${optionalString (allowInterfaces!=null) "allow-interfaces=${concatStringsSep "," allowInterfaces}"}
+    ${optionalString (denyInterfaces!=null) "deny-interfaces=${concatStringsSep "," denyInterfaces}"}
    ${optionalString (domainName!=null) "domain-name=${domainName}"}
    allow-point-to-point=${yesNo allowPointToPoint}
    ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"}
@ -39,6 +40,10 @@ let
  '';
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule [ "services" "avahi" "interfaces" ] [ "services" "avahi" "allowInterfaces" ])
+  ];
+
  options.services.avahi = {
    enable = mkOption {
      type = types.bool;
@ -91,7 +96,7 @@ in
      description = lib.mdDoc "Whether to use IPv6.";
    };

-    interfaces = mkOption {
+    allowInterfaces = mkOption {
      type = types.nullOr (types.listOf types.str);
      default = null;
      description = lib.mdDoc ''
@ -101,6 +106,17 @@ in
      '';
    };

+    denyInterfaces = mkOption {
+      type = types.nullOr (types.listOf types.str);
+      default = null;
+      description = lib.mdDoc ''
+        List of network interfaces that should be ignored by the
+        {command}`avahi-daemon`. Other unspecified interfaces will be used,
+        unless {option}`allowInterfaces` is set. This option takes precedence
+        over {option}`allowInterfaces`.
+      '';
+    };
+
    openFirewall = mkOption {
      type = types.bool;
      default = true;
@ -134,7 +150,7 @@ in

    extraServiceFiles = mkOption {
      type = with types; attrsOf (either str path);
-      default = {};
+      default = { };
      example = literalExpression ''
        {
          ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service";
@ -236,7 +252,7 @@ in
      isSystemUser = true;
    };

-    users.groups.avahi = {};
+    users.groups.avahi = { };

    system.nssModules = optional cfg.nssmdns pkgs.nssmdns;
    system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [
@ -246,10 +262,12 @@ in

    environment.systemPackages = [ pkgs.avahi ];

-    environment.etc = (mapAttrs' (n: v: nameValuePair
-      "avahi/services/${n}.service"
-      { ${if types.path.check v then "source" else "text"} = v; }
-    ) cfg.extraServiceFiles);
+    environment.etc = (mapAttrs'
+      (n: v: nameValuePair
+        "avahi/services/${n}.service"
+        { ${if types.path.check v then "source" else "text"} = v; }
+      )
+      cfg.extraServiceFiles);

    systemd.sockets.avahi-daemon = {
      description = "Avahi mDNS/DNS-SD Stack Activation Socket";
--- a/nixos/modules/services/networking/jicofo.nix
+++ b/nixos/modules/services/networking/jicofo.nix
@ -4,6 +4,15 @@ with lib;

 let
  cfg = config.services.jicofo;
+
+  # HOCON is a JSON superset that some jitsi-meet components use for configuration
+  toHOCON = x: if isAttrs x && x ? __hocon_envvar then ("\${" + x.__hocon_envvar + "}")
+    else if isAttrs x && x ? __hocon_unquoted_string then x.__hocon_unquoted_string
+    else if isAttrs x then "{${ concatStringsSep "," (mapAttrsToList (k: v: ''"${k}":${toHOCON v}'') x) }}"
+    else if isList x then "[${ concatMapStringsSep "," toHOCON x }]"
+    else builtins.toJSON x;
+
+  configFile = pkgs.writeText "jicofo.conf" (toHOCON cfg.config);
 in
 {
  options.services.jicofo = with types; {
@ -68,22 +77,34 @@ in
    };

    config = mkOption {
-      type = attrsOf str;
+      type = (pkgs.formats.json {}).type;
      default = { };
      example = literalExpression ''
        {
-          "org.jitsi.jicofo.auth.URL" = "XMPP:jitsi-meet.example.com";
+          jicofo.bridge.max-bridge-participants = 42;
        }
      '';
      description = lib.mdDoc ''
-        Contents of the {file}`sip-communicator.properties` configuration file for jicofo.
+        Contents of the {file}`jicofo.conf` configuration file.
      '';
    };
  };

  config = mkIf cfg.enable {
-    services.jicofo.config = mapAttrs (_: v: mkDefault v) {
-      "org.jitsi.jicofo.BRIDGE_MUC" = cfg.bridgeMuc;
+    services.jicofo.config = {
+      jicofo = {
+        bridge.brewery-jid = cfg.bridgeMuc;
+        xmpp = rec {
+          client = {
+            hostname = cfg.xmppHost;
+            username = cfg.userName;
+            domain = cfg.userDomain;
+            password = { __hocon_envvar = "JICOFO_AUTH_PASS"; };
+            xmpp-domain = if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain;
+          };
+          service = client;
+        };
+      };
    };

    users.groups.jitsi-meet = {};
@ -93,6 +114,7 @@ in
        "-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION" = "/etc/jitsi";
        "-Dnet.java.sip.communicator.SC_HOME_DIR_NAME" = "jicofo";
        "-Djava.util.logging.config.file" = "/etc/jitsi/jicofo/logging.properties";
+        "-Dconfig.file" = configFile;
      };
    in
    {
@ -101,18 +123,13 @@ in
      after = [ "network.target" ];

      restartTriggers = [
-        config.environment.etc."jitsi/jicofo/sip-communicator.properties".source
+        configFile
      ];
      environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps);

      script = ''
-        ${pkgs.jicofo}/bin/jicofo \
-          --host=${cfg.xmppHost} \
-          --domain=${if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain} \
-          --secret=$(cat ${cfg.componentPasswordFile}) \
-          --user_name=${cfg.userName} \
-          --user_domain=${cfg.userDomain} \
-          --user_password=$(cat ${cfg.userPasswordFile})
+        export JICOFO_AUTH_PASS="$(<${cfg.userPasswordFile})"
+        exec "${pkgs.jicofo}/bin/jicofo"
      '';

      serviceConfig = {
@ -140,10 +157,7 @@ in
      };
    };

-    environment.etc."jitsi/jicofo/sip-communicator.properties".source =
-      pkgs.writeText "sip-communicator.properties" (
-        generators.toKeyValue {} cfg.config
-      );
+    environment.etc."jitsi/jicofo/sip-communicator.properties".text = "";
    environment.etc."jitsi/jicofo/logging.properties".source =
      mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal";
  };
--- a/nixos/modules/services/web-apps/jitsi-meet.nix
+++ b/nixos/modules/services/web-apps/jitsi-meet.nix
@ -411,11 +411,14 @@ in
      componentPasswordFile = "/var/lib/jitsi-meet/jicofo-component-secret";
      bridgeMuc = "jvbbrewery@internal.${cfg.hostName}";
      config = mkMerge [{
-        "org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED" = "true";
+        jicofo.xmpp.service.disable-certificate-verification = true;
+        jicofo.xmpp.client.disable-certificate-verification = true;
      #} (lib.mkIf cfg.jibri.enable {
       } (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) {
-        "org.jitsi.jicofo.jibri.BREWERY" = "JibriBrewery@internal.${cfg.hostName}";
-        "org.jitsi.jicofo.jibri.PENDING_TIMEOUT" = "90";
+         jicofo.jibri = {
+           brewery-jid = "JibriBrewery@internal.${cfg.hostName}";
+           pending-timeout = "90";
+         };
      })];
    };

--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@ -95,18 +95,6 @@ in
      description = lib.mdDoc "Phonon audio backend to install.";
    };

-    supportDDC = mkOption {
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc ''
-        Support setting monitor brightness via DDC.
-
-        This is not needed for controlling brightness of the internal monitor
-        of a laptop and as it is considered experimental by upstream, it is
-        disabled by default.
-      '';
-    };
-
    useQtScaling = mkOption {
      type = types.bool;
      default = false;
@ -173,6 +161,7 @@ in

  imports = [
    (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")
+    (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "supportDDC" ] "DDC/CI is no longer supported upstream.")
    (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
  ];

@ -201,12 +190,6 @@ in
        };
      };

-      # DDC support
-      boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev";
-      services.udev.extraRules = lib.optionalString cfg.supportDDC ''
-        KERNEL=="i2c-[0-9]*", TAG+="uaccess"
-      '';
-
      environment.systemPackages =
        with libsForQt5;
        with plasma5; with kdeGear; with kdeFrameworks;
--- a/pkgs/applications/audio/open-stage-control/default.nix
+++ b/pkgs/applications/audio/open-stage-control/default.nix
@ -2,13 +2,13 @@

 buildNpmPackage rec {
  pname = "open-stage-control";
-  version = "1.22.0";
+  version = "1.23.0";

  src = fetchFromGitHub {
    owner = "jean-emmanuel";
    repo = "open-stage-control";
    rev = "v${version}";
-    hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM=";
+    hash = "sha256-P3aTGt/T59JE2oy8uRhD8h2NXX/ZXno6qY0frpcir7A=";
  };

  # Remove some Electron stuff from package.json
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.187.0";
+  version = "1.187.1";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    hash = "sha256-Ri/VTJF59GCJdhbMWRAYaQifj7FjVYSACywpq8gHKXg=";
+    hash = "sha256-OdeiJ+g2woNjjQI5z3TDSi9Tt8kOheUrd/Gak+fmXX0=";
  };

  postPatch = ''
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@ -16,13 +16,13 @@
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2023.03.10",
-    "hash": "sha256-NdLg/cQNy5SaC/zPb3bLplUe6FiO7ePi1++WDIvQziI="
+    "rev": "2023.03.14",
+    "hash": "sha256-mrjMG0t10lOd9hOEGBt9iGlpGdHcgbEVRcezyuUOqPQ="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
-    "rev": "2023.03.10",
-    "hash": "sha256-KfzTO0GMFkWRFxbRSdKAh4sr7cx7A2snj/UO1nsvacI="
+    "rev": "2023.03.14",
+    "hash": "sha256-75ndPG3nSM7Y/jEZFPmKfQMnFrARe1DNva1HoDHxqAE="
  },
  "EControl": {
    "owner": "Alexey-T",
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@ -5,13 +5,13 @@

 mkDerivation rec {
  pname = "sigil";
-  version = "1.9.20";
+  version = "1.9.30";

  src = fetchFromGitHub {
    repo = "Sigil";
    owner = "Sigil-Ebook";
    rev = version;
-    sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA=";
+    sha256 = "sha256-07JK3xHpNDs6CU8je8PNyTugNBi2mQ7G109R3JX4eyg=";
  };

  pythonPath = with python3Packages; [ lxml ];
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@ -19,13 +19,13 @@ in

 stdenv.mkDerivation rec {
  pname = "tiled";
-  version = "1.9.2";
+  version = "1.10.0";

  src = fetchFromGitHub {
-    owner = "bjorn";
+    owner = "mapeditor";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ=";
+    sha256 = "sha256-y79trmkRrkOOP6p9VMjo/11IE22J3YJtnerBsVP9134=";
  };

  nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ];
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -171,6 +171,18 @@ final: prev:
    meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/";
  };

+  LazyVim = buildVimPluginFrom2Nix {
+    pname = "LazyVim";
+    version = "2023-03-17";
+    src = fetchFromGitHub {
+      owner = "LazyVim";
+      repo = "LazyVim";
+      rev = "c10e550639caef68146d122d9bc4a66f2f38650a";
+      sha256 = "04d062kxa0pz57liymim3i17hz51w0690c2y4q22h3kfarcmj0ws";
+    };
+    meta.homepage = "https://github.com/LazyVim/LazyVim/";
+  };
+
  LeaderF = buildVimPluginFrom2Nix {
    pname = "LeaderF";
    version = "2023-03-02";
@ -1169,6 +1181,18 @@ final: prev:
    meta.homepage = "https://github.com/bbchung/clighter8/";
  };

+  clipboard-image-nvim = buildVimPluginFrom2Nix {
+    pname = "clipboard-image.nvim";
+    version = "2022-11-10";
+    src = fetchFromGitHub {
+      owner = "ekickx";
+      repo = "clipboard-image.nvim";
+      rev = "d1550dc26729b7954f95269952e90471b838fa25";
+      sha256 = "0lq13rscsnjglnbynisz4fmsh4xzn12lisgjk9cm61sjg9pw6yl9";
+    };
+    meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/";
+  };
+
  cmd-parser-nvim = buildVimPluginFrom2Nix {
    pname = "cmd-parser.nvim";
    version = "2022-02-23";
@ -6897,6 +6921,18 @@ final: prev:
    meta.homepage = "https://github.com/steelsojka/pears.nvim/";
  };

+  persistence-nvim = buildVimPluginFrom2Nix {
+    pname = "persistence.nvim";
+    version = "2023-02-28";
+    src = fetchFromGitHub {
+      owner = "folke";
+      repo = "persistence.nvim";
+      rev = "adcf6913693a0434665d162ee45a186230496f8a";
+      sha256 = "1fx713swa6138mpmqgpc6lf7nvm4j7nm6fr8zwpgqn6dv71jdhxd";
+    };
+    meta.homepage = "https://github.com/folke/persistence.nvim/";
+  };
+
  peskcolor-vim = buildVimPluginFrom2Nix {
    pname = "peskcolor.vim";
    version = "2016-06-11";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -13,6 +13,7 @@ https://github.com/ionide/Ionide-vim/,HEAD,
 https://github.com/martinda/Jenkinsfile-vim-syntax/,,
 https://github.com/autozimu/LanguageClient-neovim/,,
 https://github.com/vigoux/LanguageTool.nvim/,,
+https://github.com/LazyVim/LazyVim/,,
 https://github.com/Yggdroot/LeaderF/,,
 https://github.com/Valloric/MatchTagAlways/,,
 https://github.com/numToStr/Navigator.nvim/,,
@ -98,6 +99,7 @@ https://github.com/xavierd/clang_complete/,,
 https://github.com/p00f/clangd_extensions.nvim/,HEAD,
 https://github.com/rhysd/clever-f.vim/,,
 https://github.com/bbchung/clighter8/,,
+https://github.com/ekickx/clipboard-image.nvim/,,
 https://github.com/winston0410/cmd-parser.nvim/,,
 https://github.com/hrsh7th/cmp-buffer/,,
 https://github.com/hrsh7th/cmp-calc/,,
@ -580,6 +582,7 @@ https://github.com/drewtempelmeyer/palenight.vim/,,
 https://github.com/NLKNguyen/papercolor-theme/,,
 https://github.com/tmsvg/pear-tree/,,
 https://github.com/steelsojka/pears.nvim/,,
+https://github.com/folke/persistence.nvim/,,
 https://github.com/andsild/peskcolor.vim/,,
 https://github.com/pest-parser/pest.vim/,HEAD,
 https://github.com/lifepillar/pgsql.vim/,,
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@ -29,13 +29,13 @@

 buildDotnetModule rec {
  pname = "ryujinx";
-  version = "1.1.651"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.665"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

  src = fetchFromGitHub {
    owner = "Ryujinx";
    repo = "Ryujinx";
-    rev = "f0562b9c75308c8cfcaa2458dfd37ac42751a374";
-    sha256 = "1bkfncms8lagxhpnafyahrghzvpklsgxddqq7w1wzjzyxp6pxc51";
+    rev = "da073fce6127243fcd93b736cde951c4e835e508";
+    sha256 = "0zbww3mhmmakfaqh8q1bzn7liz4i85kmkz967jqbnlq90w0a7i3f";
  };

  dotnet-sdk = dotnetCorePackages.sdk_7_0;
--- a/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/pkgs/applications/emulators/ryujinx/deps.nix
@ -18,7 +18,6 @@
  (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; })
  (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
  (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
-  (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; })
  (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
  (fetchNuGet { pname = "DynamicData"; version = "7.12.11"; sha256 = "159037gd4rn8z5wdkbnb296rw5csay8rjigi1h4n35mjfg4nhm8f"; })
  (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
@ -64,7 +63,6 @@
  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; })
  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; })
  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
  (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; })
@ -171,7 +169,6 @@
  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; })
  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
  (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; })
  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
@ -185,7 +182,7 @@
  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; })
  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
+  (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; })
  (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
@ -197,7 +194,6 @@
  (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; })
  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; })
  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; })
  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
--- a/pkgs/applications/graphics/autotrace/autofig.nix
+++ b/pkgs/applications/graphics/autotrace/autofig.nix
@ -1,11 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  pname = "autofig";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz";
-    sha256 = "11cs9hdbgcl3aamcs3149i8kvyyldmnjf6yq81kbcf8fdmfk2zdq";
-  };
-}
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@ -1,125 +1,58 @@
-{ lib, stdenv, fetchurl, callPackage, libpng12, imagemagick
-, autoreconfHook, glib, pstoedit, pkg-config, gettext, gd, darwin
-, runtimeShell }:
-
-# TODO: Figure out why the resultant binary is somehow linked against
-# libpng16.so.16 rather than libpng12.
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, gettext
+, intltool
+, pkg-config
+, glib
+, imagemagick
+, libpng
+, pstoedit
+, darwin
+}:

 stdenv.mkDerivation rec {
  pname = "autotrace";
-  version = "0.31.1";
+  version = "0.31.9";

-  src = fetchurl {
-    url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz";
-    sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js";
+  src = fetchFromGitHub {
+    owner = "autotrace";
+    repo = "autotrace";
+    rev = version;
+    hash = "sha256-8qqB6oKmbz95dNLtdLvb69cEj/P7TzdoKEyJ8+4ITzs=";
  };

-  # The below commented out part is for an identically-named project
-  # on GitHub which appears to derive somehow from the Sourceforge
-  # version, but I have no idea what the lineage is of this project.
-  # It will build, but it segfaults when I attempt to run -centerline.
-  # Someone may need this for some reason, so I've left it here.
-  #
-  #src = fetchFromGitHub {
-  #  owner = "autotrace";
-  #  repo = "autotrace";
-  #  rev = "b3ac8818d86943102cb4f13734e0b527c42dc45a";
-  #  sha256 = "0z5h2mvxwckk2msi361zk1nc9fdcvxyimyc2hlyqd6h8k3p7zdi4";
-  #};
-  #postConfigure = ''
-  #  sed -i -e "s/at_string/gchar */g" *.c
-  #  sed -i -e "s/at_address/gpointer/g" *.c
-  #  sed -i -e "s/at_bitmap_type/struct _at_bitmap/g" *.c
-  #  sed -i -e "s/AT_BITMAP_BITS(bitmap)/AT_BITMAP_BITS(\&bitmap)/g" input-magick.c
-  #'';
+  patches = [
+    (fetchpatch {
+      name = "imagemagick7-support.patch";
+      url = "https://github.com/autotrace/autotrace/pull/105.patch";
+      hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0=";
+    })
+  ];

-  autofig = callPackage ./autofig.nix {};
-  nativeBuildInputs = [ autoreconfHook glib autofig pkg-config gettext ];
-  buildInputs = [ libpng12 imagemagick pstoedit ]
-    ++ lib.optionals stdenv.isDarwin
-       (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]);
+  nativeBuildInputs = [
+    autoreconfHook
+    gettext
+    intltool
+    pkg-config
+  ];

-  postUnpack = ''
-    pushd $sourceRoot
-    autofig autotrace-config.af
-    popd
-  '';
-
-  # This complains about various m4 files, but it appears to not be an
-  # actual error.
-  preConfigure = ''
-    glib-gettextize --copy --force
-    # pstoedit-config no longer exists, it was replaced with pkg-config
-    mkdir wrappers
-    cat >wrappers/pstoedit-config <<'EOF'
-    #!${runtimeShell}
-    # replace --version with --modversion for pkg-config
-    args=''${@/--version/--modversion}
-    exec pkg-config pstoedit "''${args[@]}"
-    EOF
-    chmod +x wrappers/pstoedit-config
-    export PATH="$PATH:$PWD/wrappers"
-  '';
+  buildInputs = [
+    glib
+    imagemagick
+    libpng
+    pstoedit
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Foundation
+  ];

  meta = with lib; {
-    homepage = "https://autotrace.sourceforge.net/";
+    homepage = "https://github.com/autotrace/autotrace";
    description = "Utility for converting bitmap into vector graphics";
    platforms = platforms.unix;
    maintainers = with maintainers; [ hodapp ];
    license = licenses.gpl2;
-    knownVulnerabilities = [
-      "CVE-2013-1953"
-      "CVE-2016-7392"
-      "CVE-2017-9151"
-      "CVE-2017-9152"
-      "CVE-2017-9153"
-      "CVE-2017-9154"
-      "CVE-2017-9155"
-      "CVE-2017-9156"
-      "CVE-2017-9157"
-      "CVE-2017-9158"
-      "CVE-2017-9159"
-      "CVE-2017-9160"
-      "CVE-2017-9161"
-      "CVE-2017-9162"
-      "CVE-2017-9163"
-      "CVE-2017-9164"
-      "CVE-2017-9165"
-      "CVE-2017-9166"
-      "CVE-2017-9167"
-      "CVE-2017-9168"
-      "CVE-2017-9169"
-      "CVE-2017-9170"
-      "CVE-2017-9171"
-      "CVE-2017-9172"
-      "CVE-2017-9173"
-      "CVE-2017-9174"
-      "CVE-2017-9175"
-      "CVE-2017-9176"
-      "CVE-2017-9177"
-      "CVE-2017-9178"
-      "CVE-2017-9179"
-      "CVE-2017-9180"
-      "CVE-2017-9181"
-      "CVE-2017-9182"
-      "CVE-2017-9183"
-      "CVE-2017-9184"
-      "CVE-2017-9185"
-      "CVE-2017-9186"
-      "CVE-2017-9187"
-      "CVE-2017-9188"
-      "CVE-2017-9189"
-      "CVE-2017-9190"
-      "CVE-2017-9191"
-      "CVE-2017-9192"
-      "CVE-2017-9193"
-      "CVE-2017-9194"
-      "CVE-2017-9195"
-      "CVE-2017-9196"
-      "CVE-2017-9197"
-      "CVE-2017-9198"
-      "CVE-2017-9199"
-      "CVE-2017-9200"
-    ];
  };
 }
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@ -53,14 +53,14 @@

 let
  python = python2.withPackages (pp: [ pp.pygtk ]);
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation (finalAttrs: {
  pname = "gimp";
  version = "2.10.34";

  outputs = [ "out" "dev" ];

  src = fetchurl {
-    url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2";
    sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM=";
  };

@ -154,10 +154,12 @@ in stdenv.mkDerivation rec {

  doCheck = true;

-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";
+  env = {
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";

-  # Check if librsvg was built with --disable-pixbuf-loader.
-  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
+    # Check if librsvg was built with --disable-pixbuf-loader.
+    PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
+  };

  preConfigure = ''
    # The check runs before glib-networking is registered
@ -165,21 +167,23 @@ in stdenv.mkDerivation rec {
  '';

  postFixup = ''
-    wrapProgram $out/bin/gimp-${lib.versions.majorMinor version} \
+    wrapProgram $out/bin/gimp-${lib.versions.majorMinor finalAttrs.version} \
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
  '';

-  passthru = rec {
+  passthru = {
    # The declarations for `gimp-with-plugins` wrapper,
    # used for determining plug-in installation paths
-    majorVersion = "${lib.versions.major version}.0";
-    targetLibDir = "lib/gimp/${majorVersion}";
-    targetDataDir = "share/gimp/${majorVersion}";
-    targetPluginDir = "${targetLibDir}/plug-ins";
-    targetScriptDir = "${targetDataDir}/scripts";
+    majorVersion = "${lib.versions.major finalAttrs.version}.0";
+    targetLibDir = "lib/gimp/${finalAttrs.passthru.majorVersion}";
+    targetDataDir = "share/gimp/${finalAttrs.passthru.majorVersion}";
+    targetPluginDir = "${finalAttrs.passthru.targetLibDir}/plug-ins";
+    targetScriptDir = "${finalAttrs.passthru.targetDataDir}/scripts";

    # probably its a good idea to use the same gtk in plugins ?
    gtk = gtk2;
+
+    python2Support = withPython;
  };

  meta = with lib; {
@ -190,4 +194,4 @@ in stdenv.mkDerivation rec {
    platforms = platforms.unix;
    mainProgram = "gimp";
  };
-}
+})
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@ -31,26 +31,27 @@ let
        install -Dt "$pluginDir" "$@"
      }
    '';
-
-    # Override installation paths.
-    PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}";
-    PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}";
  }
  // attrs
  // {
-      name = "${gimp.pname}-plugin-${name}";
-      buildInputs = [
-        gimp
-        gimp.gtk
-        glib
-      ] ++ (attrs.buildInputs or []);
+    name = "${gimp.pname}-plugin-${name}";
+    buildInputs = [
+      gimp
+      gimp.gtk
+      glib
+    ] ++ (attrs.buildInputs or []);

-      nativeBuildInputs = [
-        pkg-config
-        intltool
-      ] ++ (attrs.nativeBuildInputs or []);
-    }
-  );
+    nativeBuildInputs = [
+      pkg-config
+      intltool
+    ] ++ (attrs.nativeBuildInputs or []);
+
+    # Override installation paths.
+    env = {
+      PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}";
+      PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}";
+    } // attrs.env or { };
+  });

  scriptDerivation = {src, ...}@attrs : pluginDerivation ({
    prePhases = "extraLib";
@ -116,8 +117,13 @@ in
      url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2";
      sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
    };
-    NIX_LDFLAGS = "-lm";
+
    hardeningDisable = [ "format" ];
+
+    env = {
+      NIX_LDFLAGS = "-lm";
+    };
+
    meta = with lib; {
      description = "The GIMP Animation Package";
      homepage = "https://www.gimp.org";
@ -208,6 +214,10 @@ in
      rev = "v${version}";
      sha256 = "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j";
    };
+
+    meta = {
+      broken = !gimp.python2Support;
+    };
  };

  texturize = pluginDerivation {
@ -233,15 +243,19 @@ in
    pname = "wavelet-sharpen";
    version = "0.1.2";

-    # Workaround build failure on -fno-common toolchains like upstream
-    # gcc-10. Otherwise build fails as:
-    #   ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
-    env.NIX_CFLAGS_COMPILE = "-fcommon";
-    NIX_LDFLAGS = "-lm";
    src = fetchurl {
      url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";
      sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
    };
+
+    env = {
+      # Workaround build failure on -fno-common toolchains like upstream
+      # gcc-10. Otherwise build fails as:
+      #   ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
+      NIX_CFLAGS_COMPILE = "-fcommon";
+      NIX_LDFLAGS = "-lm";
+    };
+
    installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix?
  };

--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@ -1,8 +1,9 @@
-{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}:
+{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}:

 let
+inherit (gimpPlugins) gimp;
 allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
-selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins);
+selectedPlugins = lib.filter (pkg: pkg != gimp) (if plugins == null then allPlugins else plugins);
 extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
 versionBranch = lib.versions.majorMinor gimp.version;

--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@ -12,14 +12,14 @@

 python3Packages.buildPythonPackage rec {
  pname = "hydrus";
-  version = "519";
+  version = "520";
  format = "other";

  src = fetchFromGitHub {
    owner = "hydrusnetwork";
    repo = "hydrus";
    rev = "refs/tags/v${version}";
-    hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU=";
+    hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/graphics/komikku/default.nix
+++ b/pkgs/applications/graphics/komikku/default.nix
@ -0,0 +1,94 @@
+{ lib
+, fetchFromGitLab
+, desktop-file-utils
+, gettext
+, glib
+, gobject-introspection
+, gtk4
+, libadwaita
+, libnotify
+, webkitgtk_5_0
+, meson
+, ninja
+, pkg-config
+, python3
+, wrapGAppsHook4
+, nix-update-script
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "komikku";
+  version = "1.15.0";
+
+  format = "other";
+
+  src = fetchFromGitLab {
+    owner = "valos";
+    repo = "Komikku";
+    rev = "v${version}";
+    hash = "sha256-dmi8a9Gf4ixq5oW6ewDGZYRmxY2qmUrD42DfjskRpHk=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    gettext
+    glib # for glib-compile-resources
+    desktop-file-utils
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    libnotify
+    webkitgtk_5_0
+    gobject-introspection
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pygobject3
+    beautifulsoup4
+    brotli
+    cloudscraper
+    dateparser
+    emoji
+    keyring
+    lxml
+    python-magic
+    natsort
+    piexif
+    pillow
+    pure-protobuf
+    rarfile
+    unidecode
+  ];
+
+  # Tests require network
+  doCheck = false;
+
+  # Prevent double wrapping.
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+    )
+  '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "komikku";
+    };
+  };
+
+  meta = with lib; {
+    description = "Manga reader for GNOME";
+    homepage = "https://valos.gitlab.io/Komikku/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chuangzhu ];
+  };
+}
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@ -15,8 +15,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
    hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
  };

-  # Disable version check
  postPatch = ''
+    # Drop broken version specifier
+    sed -i '/python_requires/d' setup.py
+    # Disable version check
    substituteInPlace raphodo/constants.py \
      --replace "disable_version_check = False" "disable_version_check = True"
  '';
--- a/pkgs/applications/graphics/rnote/default.nix
+++ b/pkgs/applications/graphics/rnote/default.nix
@ -1,9 +1,9 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , alsa-lib
 , appstream-glib
-, clang
 , cmake
 , desktop-file-utils
 , glib
@ -19,34 +19,43 @@
 , rustPlatform
 , shared-mime-info
 , wrapGAppsHook4
+, AudioUnit
 }:

 stdenv.mkDerivation rec {
  pname = "rnote";
-  version = "0.5.16";
+  version = "0.5.17";

  src = fetchFromGitHub {
    owner = "flxzt";
    repo = "rnote";
    rev = "v${version}";
-    hash = "sha256-blpANUfFam46Vyyc3vaB7vX07CRMtdMZR2n7FOLGgaU=";
+    hash = "sha256-/crqcp0oCq1f/5hnYfIcuSUzF5GmiAh2lLhQh+IzP4o=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-vVU/OVwtIPRw1Ohe5EIqovhyd4oYOR7CPISz8Zo74r0=";
+    hash = "sha256-sfsk67zTmVPPtohJcgQ/OoMPeoNTo/zGs3hdA1D9SwM=";
  };

+  patches = [
+    # https://github.com/flxzt/rnote/pull/569
+    (fetchpatch {
+      url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch";
+      hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg=";
+    })
+  ];
+
  nativeBuildInputs = [
    appstream-glib # For appstream-util
-    clang
    cmake
    desktop-file-utils # For update-desktop-database
    meson
    ninja
    pkg-config
    python3 # For the postinstall script
+    rustPlatform.bindgenHook
    rustPlatform.cargoSetupHook
    rustPlatform.rust.cargo
    rustPlatform.rust.rustc
@ -57,17 +66,18 @@ stdenv.mkDerivation rec {
  dontUseCmakeConfigure = true;

  buildInputs = [
-    alsa-lib
    glib
    gstreamer
    gtk4
    libadwaita
    libxml2
    poppler
+  ] ++ lib.optionals stdenv.isLinux [
+    alsa-lib
+  ] ++ lib.optionals stdenv.isDarwin [
+    AudioUnit
  ];

-  LIBCLANG_PATH = "${clang.cc.lib}/lib";
-
  postPatch = ''
    pushd build-aux
    chmod +x cargo_build.py meson_post_install.py
@ -80,8 +90,8 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/flxzt/rnote";
    changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}";
    description = "Simple drawing application to create handwritten notes";
-    license = licenses.gpl3Only;
+    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ dotlambda yrd ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coreaction";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-XQ/GcSjGSe+3d0dJxjmmcBFoDzrmM6zsHMfbDdzmpPs=";
+    sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corearchiver";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-EUcUivUuuUApIC9daS6BFA1YoE4yO3Kc8jG0VIks/Y0=";
+    sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corefm";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-uScM6cVRwYopZ6NY3PSAAyxNNyX3hVnFs6hkAyF29PA=";
+    sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coregarage";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Jq0lIXfw/1Ixd+QIY7D1ErBCOSKmwkWBupcDxUUEliM=";
+    sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corehunt";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-zhJadrdOXpl0bXxEPWjQ59Pzjg4MfIZXtYzCnJbh+pI=";
+    sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coreimage";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-uG9/8sQK0G3f7O59OHEHqNHP8cUC73hmjsfpOnj0kFM=";
+    sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coreinfo";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-KoX2U07giVF2xZR1diM6teiNfKYRiqjowTJgnsMlaN0=";
+    sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch
+++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch
@ -1,8 +0,0 @@
--- a/corekeyboard/CMakeLists.txt	2022-01-29 14:03:28.149607341 +0700
-+++ b/CMakeLists.txt	2022-01-29 14:04:00.178733700 +0700
-@@ -55,5 +55,4 @@
- 
- install( TARGETS corekeyboard DESTINATION bin )
- install( FILES org.cubocore.CoreKeyboard.desktop DESTINATION share/applications )
-install( FILES org.cubocore.CoreKeyboard-Tray.desktop DESTINATION /etc/xdg/autostart )
- install( FILES org.cubocore.CoreKeyboard.svg DESTINATION share/icons/hicolor/scalable/apps/ )
--- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
@ -2,20 +2,15 @@

 mkDerivation rec {
  pname = "corekeyboard";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-yJOcuE6HknDhXCr1qW/NJkerjvBABYntXos0owDDwcw=";
+    sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY=";
  };

-  patches = [
-    # Remove autostart
-    ./0001-fix-installPhase.patch
-  ];
-
  nativeBuildInputs = [
    cmake
    ninja
--- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corepad";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-19qR08QhWeeXnJAQHe1SJjT0xnQLlbkXlzmd9uiMp14=";
+    sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corepaint";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-uAFV3NKtgNri8GQLD+MRacl9WYMfkMVZcoVML+oSX78=";
+    sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corepdf";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-VwJ3H/jNP3u5C+LATPUSftiWm89upx77fN3NqzTnU7Y=";
+    sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corepins";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-CVToPF8/Tw+n31/A0bzyBbwF7xPBVirsqVOUsM8QtH0=";
+    sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corerenamer";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-WrMyz8Noq0EeBIxL4mSl6e+8wrivmwfoa1yKBrSgrRI=";
+    sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coreshot";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-wEpo/YINtKAYHqlGYytUPh9ndkvQBw3tRIlyjnKJaf8=";
+    sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corestats";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-154BZIKb6QDrTC4DXh4dbFtN/Lq0ok/qOrqTkXa+rAo=";
+    sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "corestuff";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-snzW6cqxIyiXJLOD5MoEqmzen1aZN4IALESaIWIOMro=";
+    sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek=";
  };

  patches = [
--- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
@ -12,13 +12,13 @@

 mkDerivation rec {
  pname = "coreterminal";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-0gxcbfDD43BnkxYWSdViK3hjzfgPGFruwzF4hCxFZ7c=";
+    sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coretime";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-MIcmgBfgyjEyJxXCq6IbQ/i6IdtL5cWVGpV2YZbzK58=";
+    sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
@ -30,13 +30,13 @@

 mkDerivation rec {
  pname = "coretoppings";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Yq57dY1zIuQN2Gj9haxJMomafL32B+/9v3lWlY9fvcc=";
+    sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8=";
  };

  patches = [
--- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "coreuniverse";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitLab {
    owner = "cubocore/coreapps";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-KNjXrsm4OfBxida8mcAlKgomcpg0xJg51ZxEdhaiL84=";
+    sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch
@ -1,29 +1,31 @@
-From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
-Date: Wed, 28 Jul 2021 02:26:39 +0300
+From a63a4b6de9ba730e10b54f4b5ce454edb10c7c39 Mon Sep 17 00:00:00 2001
+From: dyrnade <gurescicem@gmail.com>
+Date: Wed, 1 Feb 2023 22:28:02 +0100
 Subject: [PATCH] fix application dirs

 ---
- cprime/systemxdg.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ cprime/systemxdg.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)

 diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp
-index f9eee66..ea0553d 100644
+index 4c40d4c..5dbb6ff 100644
 --- a/cprime/systemxdg.cpp
 +++ b/cprime/systemxdg.cpp
-@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety
- SystemXdgMime::SystemXdgMime() {
+@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp
 
- 	appsDirs << QDir::home().filePath( ".local/share/applications/" );
+ SystemXdgMime::SystemXdgMime()
+ {
+-	appsDirs << QDir::home().filePath(".local/share/applications/");
 -	appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/";
 -	appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/";
-+	appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" );
+	appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
 +	appsDirs << "/run/current-system/sw/share/applications/";
 +	appsDirs << "/run/current-system/sw/share/applications/kde4/";
 +	appsDirs << "/run/current-system/sw/share/gnome/applications/";
- };
+ }
+ 
 
- DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) {
 -- 
-2.32.0
+2.39.0
+

--- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
@ -10,13 +10,13 @@

 mkDerivation rec {
  pname = "libcprime";
-  version = "4.3.0";
+  version = "4.4.1";

  src = fetchFromGitLab {
    owner = "cubocore";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-+z5dXKaV2anN6OLMycEz87kDqQScgHHEKwGhDAdHSd4=";
+    sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4=";
  };

  patches = [
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "libcsys";
-  version = "4.3.0";
+  version = "4.4.1";

  src = fetchFromGitLab {
    owner = "cubocore";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-/iRFppe08+rMQNFjWSyxo3Noy0iNaelg0JAczg/BYBs=";
+    sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@ -8,13 +8,13 @@

 mkDerivation rec {
  pname = "heimer";
-  version = "3.7.0";
+  version = "4.0.0";

  src = fetchFromGitHub {
    owner = "juzzlin";
    repo = pname;
    rev = version;
-    hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A=";
+    hash = "sha256-sp3iy28Bc+gOvivHA8OPG8vf7otjeaPk6Iy4BhT/SaU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@ -4,9 +4,9 @@
 , curl, writeShellScript, common-updater-scripts }:

 let
-  url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.7-5c6fee47/Hubstaff-1.6.7-5c6fee47.sh";
-  version = "1.6.7-5c6fee47";
-  sha256 = "0i0xlabdi4xhjkfwb6s4bwjnl4k3dj15k7aqjilmq5wb4rhhfpws";
+  url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.12-da9418f3/Hubstaff-1.6.12-da9418f3.sh";
+  version = "1.6.12-da9418f3";
+  sha256 = "1iz81g0r20215z65mj6bfls7h0dp1k5kk8q10fjbdfj82rpwbfws";

  rpath = lib.makeLibraryPath
    [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "masterpdfeditor";
-  version = "5.8.70";
+  version = "5.9.35";

  src = fetchurl {
    url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
-    sha256 = "sha256-mheHvHU7Z1jUxFWEEfXv2kVO51t/edTK3xV82iteUXM=";
+    sha256 = "sha256-c5DYS0PQemZ8Sql2KjnuMspCLDJzU95rsbuIdoxWDM0=";
  };

  nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@ -4,10 +4,10 @@

 stdenv.mkDerivation rec {
  pname = "nut";
-  version = "2.7.4";
+  version = "2.8.0";

  src = fetchurl {
-    url = "https://networkupstools.org/source/2.7/${pname}-${version}.tar.gz";
+    url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
    sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
  };

--- a/pkgs/applications/misc/otpclient/default.nix
+++ b/pkgs/applications/misc/otpclient/default.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "otpclient";
-  version = "3.1.4";
+  version = "3.1.5";

  src = fetchFromGitHub {
    owner = "paolostivanin";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA=";
+    sha256 = "sha256-/1nycFh/slcfztfaZA6p9rZTWS4/vkb/Sovc94zlfCI=";
  };

  buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ];
@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/paolostivanin/OTPClient";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ alexbakker ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/misc/usql/default.nix
+++ b/pkgs/applications/misc/usql/default.nix
@ -10,18 +10,18 @@

 buildGoModule rec {
  pname = "usql";
-  version = "0.13.10";
+  version = "0.13.12";

  src = fetchFromGitHub {
    owner = "xo";
    repo = "usql";
    rev = "v${version}";
-    hash = "sha256-epfEw62OXWiJqqvxJ8U9tRy0ZrQkSqa8GL4TluO9Df4=";
+    hash = "sha256-GJFPKQNrdyrFhXsPsVC629t/rHXZ16A19e8EaSdUOls=";
  };

  buildInputs = [ unixODBC icu ];

-  vendorHash = "sha256-mOe0rREiqOxwVwVo4S0889cbqVLknVRCW4bSiIh6IdQ=";
+  vendorHash = "sha256-X58rFQi4YA8nCP02zH1nRi0TFGkQJ7jyCK6p8bfe0fI=";
  proxyVendor = true;

  # Exclude broken impala & hive driver
--- a/pkgs/applications/misc/watchmate/default.nix
+++ b/pkgs/applications/misc/watchmate/default.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "watchmate";
-  version = "0.4.2";
+  version = "0.4.3";

  src = fetchFromGitHub {
    owner = "azymohliad";
    repo = "watchmate";
    rev = "v${version}";
-    hash = "sha256-UHlHfDFTQapQcETCvtch72DqelfBYMymMD/zODFtr1c=";
+    hash = "sha256-LwtlI6WCOO24w8seUzyhCp51pfEiCM+iL6lu/J6v4PQ=";
  };

-  cargoHash = "sha256-QYw/am5cMVbRdx/XQ+lZv2Jo9Aiwd2ypUlo854sm7i4=";
+  cargoHash = "sha256-MD0eWZDpCevBY1Y3Gzgk13qCFtL7QOPDATv8MA+Q5go=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lagrange";
-  version = "1.15.4";
+  version = "1.15.5";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-l69h0+yMX4vzQ1GYB1AqhZc1ztMKF/7PthxEDarizek=";
+    hash = "sha256-TP9Q80QKSkpOOQ7mllnaE1dOnNPU7k3Ij6M3+n8Jv2E=";
  };

  nativeBuildInputs = [ cmake pkg-config zip ];
--- a/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/pkgs/applications/networking/cluster/kubelogin/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kubelogin";
-  version = "0.0.27";
+  version = "0.0.28";

  src = fetchFromGitHub {
    owner = "Azure";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-yC0J6uXL0W00o0BGIrrZ9WjThSgIu5fEgQdyH2vZESs=";
+    sha256 = "sha256-uIWlOVZIqwOSvFWRIWKTFEp0aToIBo1htUXb3F+njyI=";
  };

-  vendorHash = "sha256-QGzaKtku7fm14ijmE68nqgqoX86IgmEsemlQltZECI0=";
+  vendorHash = "sha256-CVBpBb8yYkc6/yLPsCPbVhBHecqZ03WE0NcKiH8SGYs=";

  ldflags = [
    "-X main.version=${version}"
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kubeseal";
-  version = "0.19.5";
+  version = "0.20.1";

  src = fetchFromGitHub {
    owner = "bitnami-labs";
    repo = "sealed-secrets";
    rev = "v${version}";
-    sha256 = "sha256-giCFea4uZNztWxQhsYSdh2KtFE0uU0hf/lhGnY9OsIE=";
+    sha256 = "sha256-y69pxIKGRLL+XUI6iJm+CP5WgMw5BZwWKBiBWAUQsw8=";
  };

-  vendorHash = "sha256-i8MpQsqD1SBf+qPwYTFDTYDE4mvLdpKUoKML+u1027U=";
+  vendorHash = "sha256-376PGm8VQ9B7/YYYqJyRZoMwAmaHYqEerBW5PV9Z8nY=";

  subPackages = [ "cmd/kubeseal" ];

--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@ -53,7 +53,7 @@ buildGoModule rec {
    changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}";
    description = "A Docker-compatible CLI for containerd";
    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    maintainers = with maintainers; [ jk developer-guy ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -110,13 +110,13 @@
    "vendorHash": null
  },
  "aws": {
-    "hash": "sha256-dOcsD5yJrn+zpX5F0ImIqD9d+iC228Wem/668RtsQNY=",
+    "hash": "sha256-j+hKWMHnIE6nmRdGHaQxLybeljmheZ7t83NSXVWViZI=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v4.58.0",
+    "rev": "v4.59.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-nNQmiPBkIuQSBGDujMZI+dZMwv6xQcd8+nc1cMKrJws="
+    "vendorHash": "sha256-TGzTElOmYW6XO4EtMD9MWvdvd1opnFSAVcEA2eYCQdk="
  },
  "azuread": {
    "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=",
@ -128,11 +128,11 @@
    "vendorHash": null
  },
  "azurerm": {
-    "hash": "sha256-XcqBkb+de+ikNtrDe33OZHhhv6ed2pXhbXXb7L661RI=",
+    "hash": "sha256-Sv9e48+2rV3t9dmg6COWfrxnfMaxS9xJAPN1sEPen60=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
    "owner": "hashicorp",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.47.0",
+    "rev": "v3.48.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -155,11 +155,11 @@
    "vendorHash": null
  },
  "bigip": {
-    "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=",
+    "hash": "sha256-XnCwJxMuLysle4+UioJ/1e+FFZ39PkaEkdGGOePMo5s=",
    "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
    "owner": "F5Networks",
    "repo": "terraform-provider-bigip",
-    "rev": "v1.16.2",
+    "rev": "v1.17.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -182,14 +182,14 @@
    "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU="
  },
  "buildkite": {
-    "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=",
+    "hash": "sha256-H9kVHGnIzOHViTAuJnLJqcxDjSRXVqyKBAFfOd8fkHo=",
    "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
    "owner": "buildkite",
    "proxyVendor": true,
    "repo": "terraform-provider-buildkite",
-    "rev": "v0.11.0",
+    "rev": "v0.11.1",
    "spdx": "MIT",
-    "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE="
+    "vendorHash": "sha256-C7bm9wDNEO7fJuqssUxQ4t9poVkPkKd8MU7S9MJTOW4="
  },
  "checkly": {
    "hash": "sha256-LhqdFNTc0RdKmivHI6CnBPmtMW8Sml+5MT8ZjNA4rLY=",
@ -382,11 +382,11 @@
    "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
  },
  "fastly": {
-    "hash": "sha256-XvDsL2N/S7DE+9ks8Y6ZY3hcogzUsiF7VymNK7NnmaI=",
+    "hash": "sha256-60WydEYr/U1oDVq2YI5W86ivbLw/MRztOOQbTqbDQSg=",
    "homepage": "https://registry.terraform.io/providers/fastly/fastly",
    "owner": "fastly",
    "repo": "terraform-provider-fastly",
-    "rev": "v4.0.0",
+    "rev": "v4.1.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -765,13 +765,13 @@
    "vendorHash": null
  },
  "newrelic": {
-    "hash": "sha256-p+RsuBthW5ohY1PC7Z/PNyLjpif/blQuonCRm+R0uTc=",
+    "hash": "sha256-1COn48CDGvRnM4M7tWZd5XxEW0vdeFmpOMEhi3sI2to=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.16.1",
+    "rev": "v3.17.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-yF2yk85RLbvmULakODOV2V0Z9dzKfLClUSZTnECdO3o="
+    "vendorHash": "sha256-QL9uEO89PwU8UFbLWCytXpzgrVeXKmaPmFm844ABAvI="
  },
  "nomad": {
    "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",
@ -1027,13 +1027,13 @@
    "vendorHash": null
  },
  "snowflake": {
-    "hash": "sha256-MMWObJRS7FKvOfor2j0QywRMRbGsE5QcyDGbY2CXjo4=",
+    "hash": "sha256-kkkpXIpioLHBbJCv7t6b17e3Coj4GoYORZaVp14K4nw=",
    "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
    "owner": "Snowflake-Labs",
    "repo": "terraform-provider-snowflake",
-    "rev": "v0.58.0",
+    "rev": "v0.58.2",
    "spdx": "MIT",
-    "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg="
+    "vendorHash": "sha256-vxJGQkrbGITool/45JpBqdqrlSeP3xeWMkSLmFh4K+s="
  },
  "sops": {
    "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -168,9 +168,9 @@ rec {
  mkTerraform = attrs: pluggable (generic attrs);

  terraform_1 = mkTerraform {
-    version = "1.4.1";
-    hash = "sha256-Tj9j3WGfP851Q7RctW+8Xmz9NbQLE3/QKYHBGvLe1/s=";
-    vendorHash = "sha256-xAVgyn8MqwLvY85+neQ8jQYkl/j0RY4fG6qBbiMmIOc=";
+    version = "1.4.2";
+    hash = "sha256-0CxB9VOrRoudJVK96mpuQ6etsI+F2dMh4NQTKQXec9c=";
+    vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE=";
    patches = [ ./provider-path-0_15.patch ];
    passthru = {
      inherit plugins;
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec {
    beautifulsoup4
    click
    colorama
+    commonmark
    feedparser
    guessit
    html5lib
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/applications/networking/instant-messengers/element/pin.nix
@ -1,9 +1,9 @@
 {
-  "version" = "1.11.24";
+  "version" = "1.11.25";
  "hashes" = {
-    "desktopSrcHash" = "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I=";
-    "desktopYarnHash" = "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97";
-    "webSrcHash" = "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk=";
-    "webYarnHash" = "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y";
+    "desktopSrcHash" = "Fd9I/tYp0ArXo73zfA85JZxZ0MvmVFkgEUi56e19zNA=";
+    "desktopYarnHash" = "0zlh75f2k1yd9mc9zq2lrm53n91npl771ds79n3m04nbihn23xzy";
+    "webSrcHash" = "AYZJMGO53usAH2MiS5BeKt1en3XRncE/zUqkd3gWPx8=";
+    "webYarnHash" = "0kkyqgyc8k8rih024r72iagbj66f5x3h6b3c1cij474sk7ab2x1c";
  };
 }
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@ -3,10 +3,10 @@
 mkFranzDerivation rec {
  pname = "ferdium";
  name = "Ferdium";
-  version = "6.2.0";
+  version = "6.2.4";
  src = fetchurl {
    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
-    sha256 = "sha256-lb3dvEaKgOnT5+YAJcYmro71soqkT/jpTjE0YMVMRUA=";
+    sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
  };

  extraBuildInputs = [ xorg.libxshmfence ];
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@ -1,12 +1,12 @@
 { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
  signal-desktop = {
    dir = "Signal";
-    version = "6.9.0";
-    hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg=";
+    version = "6.10.1";
+    hash = "sha256-uWwRgP9iYirZU9x3QtS5lRGI7vLOOtX4B4fgVuYxkho=";
  };
  signal-desktop-beta = {
    dir = "Signal Beta";
-    version = "6.10.0-beta.1";
-    hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo=";
+    version = "6.11.0-beta.2";
+    hash = "sha256-tw8VsPC0shKIN13ICD0PVKhKxA7rdj16r2lP2UEJGsY=";
  };
 }
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@ -4,29 +4,30 @@
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
-, fixup_yarn_lock
 , yarn
 , nodejs
 , fetchYarnDeps
+, fixup_yarn_lock
 , electron
 , libpulseaudio
 , pipewire
+, alsa-utils
 }:

 stdenv.mkDerivation rec {
  pname = "teams-for-linux";
-  version = "1.0.45";
+  version = "1.0.53";

  src = fetchFromGitHub {
    owner = "IsmaelMartinez";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY=";
+    sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg=";
  };

  offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
-    sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE=";
+    yarnLock = "${src}/yarn.lock";
+    sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
  };

  nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
    runHook preBuild

    yarn --offline electron-builder \
-      --dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
+      --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
      -c.electronDist=${electron}/lib/electron \
      -c.electronVersion=${electron.version}

@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
    runHook preInstall

    mkdir -p $out/share/{applications,teams-for-linux}
-    cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
+    cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/

    pushd build/icons
    for image in *png; do
@ -67,8 +68,12 @@ stdenv.mkDerivation rec {
    done
    popd

+    # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
    makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
+      ${lib.optionalString stdenv.isLinux ''
+        --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
+      ''} \
      --add-flags "$out/share/teams-for-linux/app.asar" \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

@ -88,7 +93,8 @@ stdenv.mkDerivation rec {
    description = "Unofficial Microsoft Teams client for Linux";
    homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ muscaln ];
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
+    maintainers = with maintainers; [ muscaln lilyinstarlight ];
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
  };
 }
--- a/pkgs/applications/networking/instant-messengers/webcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix
@ -2,7 +2,7 @@
 , python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:

 buildNpmPackage rec {
-  name = "webcord";
+  pname = "webcord";
  version = "4.1.1";

  src = fetchFromGitHub {
@ -24,10 +24,6 @@ buildNpmPackage rec {
    libpulseaudio
  ];

-  binPath = lib.makeBinPath [
-    xdg-utils
-  ];
-
  # npm install will error when electron tries to download its binary
  # we don't need it anyways since we wrap the program with our nixpkgs electron
  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@ -49,9 +45,10 @@ buildNpmPackage rec {

    install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png

+    # Add xdg-utils to path via suffix, per PR #181171
    makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
      --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
-      --prefix PATH : "${binPath}" \
+      --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
      --add-flags $out/lib/node_modules/webcord/

--- a/pkgs/applications/networking/irc/irccloud/default.nix
+++ b/pkgs/applications/networking/irc/irccloud/default.nix
@ -2,12 +2,12 @@

 let
  pname = "irccloud";
-  version = "0.13.0";
+  version = "0.16.0";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
-    sha256 = "0ff69m5jav2c90918avsr5wvik2gds3klij3dzhkb352fgrd1s0l";
+    sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
  };

  appimageContents = appimageTools.extractType2 {
--- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix
@ -2,12 +2,12 @@

 let
  pname = "electron-mail";
-  version = "5.1.2";
+  version = "5.1.6";
  name = "ElectronMail-${version}";

  src = fetchurl {
    url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
-    sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE=";
+    sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo=";
  };

  appimageContents = appimageTools.extract { inherit name src; };
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
-
-stdenv.mkDerivation rec {
-  pname = "tixati";
-  version = "2.89";
-
-  src = fetchurl {
-    url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
-    sha256 = "sha256-fd7DMKoRxNmNjCxl2ViINjnCEXJrhJU4aaRT+NoB1vI=";
-  };
-
-  installPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-             --set-rpath ${lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \
-             tixati
-    install -D tixati         $out/bin/tixati
-    install -D tixati.desktop $out/share/applications/tixati.desktop
-    install -D tixati.png     $out/share/icons/tixati.png
-  '';
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "Torrent client";
-    homepage = "http://www.tixati.com";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
-  };
-}
--- a/pkgs/applications/office/kitsas/default.nix
+++ b/pkgs/applications/office/kitsas/default.nix
@ -2,17 +2,19 @@

 stdenv.mkDerivation rec {
  pname = "kitsas";
-  version = "3.2.1";
+  version = "4.0.3";

  src = fetchFromGitHub {
    owner = "artoh";
    repo = "kitupiikki";
    rev = "v${version}";
-    sha256 = "sha256-1gp6CMoDTAp6ORnuk5wos67zygmE9s2pXwvwcR+Hwgg=";
+    hash = "sha256-7s21++sA4enZFuDVUEAbn7InpyLx6BOwrFdsUzHWK0M=";
  };

-  # QList::swapItemsAt was introduced in Qt 5.13
-  patches = lib.optional (lib.versionOlder qtbase.version "5.13") ./qt-512.patch;
+  postPatch = ''
+    substituteInPlace kitsas/kitsas.pro \
+      --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5"
+  '';

  nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];

@ -26,10 +28,10 @@ stdenv.mkDerivation rec {

  qmakeFlags = [ "../kitsas/kitsas.pro" ];

-  installPhase = if stdenv.isDarwin then ''
+  installPhase = lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/Applications
    mv kitsas.app $out/Applications
-  '' else ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
    install -Dm755 kitsas -t $out/bin
    install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps
    install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps
--- a/pkgs/applications/office/kitsas/qt-512.patch
+++ b/pkgs/applications/office/kitsas/qt-512.patch
@ -1,24 +0,0 @@
-diff --git i/kitsas/apuri/siirtoapuri.cpp w/kitsas/apuri/siirtoapuri.cpp
-index 9a2c51f3..9565200f 100644
--- i/kitsas/apuri/siirtoapuri.cpp
-+++ w/kitsas/apuri/siirtoapuri.cpp
-@@ -25,6 +25,7 @@
- #include "db/tositetyyppimodel.h"
- #include "tiliote/tiliotekirjaaja.h"
- 
-+#include <QtAlgorithms>
- #include <QDebug>
- 
- SiirtoApuri::SiirtoApuri(QWidget *parent, Tosite *tosite) :
-@@ -361,8 +362,9 @@ void SiirtoApuri::laskunmaksu()
-         TositeVienti eka = lista.at(0).toMap();        
-         tosite()->asetaPvm(eka.pvm());
-         tosite()->asetaOtsikko( eka.selite() );
-        if( eka.kreditEuro() )
-            lista.swapItemsAt(0,1);
-+        if( eka.kreditEuro() ) {
-+            qSwap(lista.begin()[0], lista.begin()[1]);
-+        }
-         tosite()->viennit()->asetaViennit(lista);
-         reset();
- 
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "PortfolioPerformance";
-  version = "0.61.3";
+  version = "0.61.4";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA=";
+    hash = "sha256-VXna2ofhh8Hcyfp9+ekXHs68xcXF7HdcJNagJlzPV6c=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/timeular/default.nix
+++ b/pkgs/applications/office/timeular/default.nix
@ -5,12 +5,12 @@
 }:

 let
-  version = "4.8.0";
+  version = "5.7.8";
  pname = "timeular";

  src = fetchurl {
    url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
-    sha256 = "sha256:0y2asw3jf2n4c7y0yr669jfqw4frp5nzzv3lffimfdr78gihma66";
+    sha256 = "sha256-gIYo91ITpFtYdYGek4bXaOowMSILXZ4fJYNKeZDhk+Y=";
  };

  appimageContents = appimageTools.extractType2 {
--- a/pkgs/applications/science/biology/subread/default.nix
+++ b/pkgs/applications/science/biology/subread/default.nix
@ -6,11 +6,11 @@

 stdenv.mkDerivation rec {
  pname = "subread";
-  version = "2.0.3";
+  version = "2.0.4";

  src = fetchurl {
    url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
-    sha256 = "sha256-Vs7zovkU1DJxMGnVwoL0iDHDoezIlDKtVYDKoyKl9Ws=";
+    sha256 = "sha256-xUs37YOzQxjY8Rm1wC+50KZcgRGVvMnhdF322vdMots=";
  };

  buildInputs = [
--- a/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch
+++ b/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch
@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 276ae4e..5e56176 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1304,9 +1304,9 @@ if (LINALG STREQUAL "MKL")
-       endif ()
-     else ()
-       if (ADDRMODE EQUAL 64)
-        set (libpath "${MKLROOT}/lib/intel64")
-+        set (libpath "${MKLROOT}/lib")
-       elseif (ADDRMODE EQUAL 32)
-        set (libpath "${MKLROOT}/lib/ia32")
-+        set (libpath "${MKLROOT}/lib")
-       endif ()
-     endif ()
-     set (MKL_LIBRARY_PATH ${libpath} CACHE PATH "location of MKL libraries." FORCE)
-@@ -1380,7 +1380,7 @@ if (LINALG STREQUAL "MKL")
-     find_library (LIBMKL_BLACS NAMES "mkl_blacs_intelmpi_ilp64"
-                   PATHS ${MKL_LIBRARY_PATH} NO_DEFAULT_PATH)
-   elseif (MPI_IMPLEMENTATION STREQUAL "mpich")
-    find_library (LIBMKL_BLACS NAMES "mkl_blacs_ilp64"
-+    find_library (LIBMKL_BLACS NAMES "mkl_blacs_intelmpi_ilp64"
-                   PATHS ${MKL_LIBRARY_PATH} NO_DEFAULT_PATH)
-   endif ()
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@ -15,21 +15,19 @@ let

 in stdenv.mkDerivation {
  pname = "openmolcas";
-  version = "22.10";
+  version = "23.02";

  src = fetchFromGitLab {
    owner = "Molcas";
    repo = "OpenMolcas";
    # The tag keeps moving, fix a hash instead
-    rev = "aedb15be52d6dee285dd3e10e9d05f44e4ca969a"; # 2022-10-22
-    sha256 = "sha256-7d2wBIEg/r5bPZXlngTIZxYdMN0UIop7TA+WFZmzCo8=";
+    rev = "03265f62cd98b985712b063aea88313f984a8857"; # 2023-02-11
+    sha256 = "sha256-Kj2RDJq8PEvKclLrSYIOdl6g6lcRsTNZCjwxGOs3joY=";
  };

  patches = [
    # Required to handle openblas multiple outputs
    ./openblasPath.patch
-    # Required for MKL builds
-    ./MKL-MPICH.patch
  ];

  postPatch = ''
--- a/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/pkgs/applications/science/math/qalculate-qt/default.nix
@ -12,18 +12,25 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
-  buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ];
+  buildInputs = [ libqalculate qtbase qttools qtsvg ]
+    ++ lib.optionals stdenv.isLinux [ qtwayland ];

  postPatch = ''
    substituteInPlace qalculate-qt.pro\
      --replace "LRELEASE" "${qttools.dev}/bin/lrelease"
  '';

+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications
+    mv $out/bin/qalculate-qt.app $out/Applications
+    makeWrapper $out/{Applications/qalculate-qt.app/Contents/MacOS,bin}/qalculate-qt
+  '';
+
  meta = with lib; {
    description = "The ultimate desktop calculator";
    homepage = "http://qalculate.github.io";
    maintainers = with maintainers; [ _4825764518 ];
    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/science/networking/sumo/default.nix
+++ b/pkgs/applications/science/networking/sumo/default.nix
@ -5,13 +5,13 @@

 stdenv.mkDerivation rec {
  pname = "sumo";
-  version = "1.9.2";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "eclipse";
    repo = "sumo";
    rev = "v${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "0zpd331vy1kfi4hfiszv3m8wl4m0wdfr3zzza200kkaakw5hjxhs";
+    sha256 = "sha256-Mm8Kqb5W9h2jYvRGypI6v5IHDm4CnAeT+NcJybdU5K0=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/version-management/git-dive/default.nix
+++ b/pkgs/applications/version-management/git-dive/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "git-dive";
-  version = "0.1.3";
+  version = "0.1.4";

  src = fetchFromGitHub {
    owner = "gitext-rs";
    repo = "git-dive";
    rev = "v${version}";
-    hash = "sha256-zq594j/X74qzRSjbkd2lup/WqZXpTOecUYRVQGqpXug=";
+    hash = "sha256-nl6JEVOU5eDntPOItYCooBi3zx2ceyRLtelr97uYiOY=";
  };

-  cargoHash = "sha256-f3hiAVno5BuPgqP1y9XtVQ/TJcnqwUnEOqaU/tTljTQ=";
+  cargoHash = "sha256-johUvl2hPlgn+2wgFJUR6/pR7lx1NzE4ralcjhVqkik=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@ -2,6 +2,7 @@
 , lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , addOpenGLRunpath
 , docutils
 , meson
@ -93,6 +94,15 @@ in stdenv.mkDerivation (self: {
    sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";
  };

+  patches = [
+    (fetchpatch {
+      # fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392
+      # to be removed on next release
+      url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch";
+      sha256 = "sha256-GeAltLAwkOKk82YfXYSrkNEX08uPauh7+kVbBGPWeT8=";
+    })
+  ];
+
  postPatch = ''
    patchShebangs version.* ./TOOLS/
  '';
--- a/pkgs/applications/video/plex-mpv-shim/default.nix
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@ -3,13 +3,13 @@

 buildPythonApplication rec {
  pname = "plex-mpv-shim";
-  version = "1.10.3";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "iwalton3";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+}:
+stdenv.mkDerivation rec {
+  pname = "hyprland-protocols";
+  version = "unstable-2023-01-13";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = pname;
+    rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";
+    hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  meta = {
+    homepage = "https://github.com/hyprwm/hyprland-protocols";
+    description = "Wayland protocol extensions for Hyprland";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fufexan ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
@ -1,94 +1,115 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchFromGitLab
-, cmake
+, pkg-config
+, meson
+, ninja
+, cairo
+, git
+, hyprland-protocols
+, jq
 , libdrm
 , libinput
 , libxcb
 , libxkbcommon
 , mesa
-, pango
-, pkg-config
+, pciutils
+, systemd
+, udis86
 , wayland
 , wayland-protocols
 , wayland-scanner
 , wlroots
 , xcbutilwm
+, xwayland
+, debug ? false
+, enableXWayland ? true
+, hidpiXWayland ? false
+, legacyRenderer ? false
+, nvidiaPatches ? false
+, withSystemd ? true
 }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "hyprland";
-  version = "0.6.1beta";
+let
+  assertXWayland = lib.assertMsg (hidpiXWayland -> enableXWayland) ''
+    Hyprland: cannot have hidpiXWayland when enableXWayland is false.
+  '';
+in
+assert assertXWayland;
+stdenv.mkDerivation rec {
+  pname = "hyprland" + lib.optionalString debug "-debug";
+  version = "0.23.0beta";

  src = fetchFromGitHub {
    owner = "hyprwm";
-    repo = "Hyprland";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU=";
+    repo = "hyprland";
+    rev = "v${version}";
+    hash = "sha256-aPSmhgof4nIJquHmtxxirIMVv439wTYYCwf1ekS96gA=";
  };

+  patches = [
+    # make meson use the provided dependencies instead of the git submodules
+    "${src}/nix/meson-build.patch"
+  ];
+
+  postPatch = ''
+    # Fix hardcoded paths to /usr installation
+    sed -i "s#/usr#$out#" src/render/OpenGL.cpp
+    substituteInPlace meson.build \
+      --replace "@GIT_COMMIT_HASH@" '${version}' \
+      --replace "@GIT_DIRTY@" ""
+  '';
+
  nativeBuildInputs = [
-    cmake
+    jq
+    meson
+    ninja
    pkg-config
-    wayland-scanner
  ];

-  buildInputs = [
-    libdrm
-    libinput
-    libxcb
-    libxkbcommon
-    mesa
-    pango
-    wayland
-    wayland-protocols
-    xcbutilwm
-  ]
-  ++ [
-    # INFO: When updating src, remember to synchronize this wlroots with the
-    # exact commit used by upstream
-    (wlroots.overrideAttrs (_: {
-      version = "unstable-2022-06-07";
-      src = fetchFromGitLab {
-        domain = "gitlab.freedesktop.org";
-        owner = "wlroots";
-        repo = "wlroots";
-        rev = "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc";
-        hash = "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=";
-      };
-    }))
+  outputs = [
+    "out"
+    "man"
  ];

-  # build with system wlroots
-  postPatch = ''
-    sed -Ei 's|"\.\./wlroots/include/([a-zA-Z0-9./_-]+)"|<\1>|g' src/includes.hpp
-  '';
+  buildInputs =
+    [
+      cairo
+      git
+      hyprland-protocols
+      libdrm
+      libinput
+      libxkbcommon
+      mesa
+      udis86
+      wayland
+      wayland-protocols
+      wayland-scanner
+      pciutils
+      (wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; })
+    ]
+    ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
+    ++ lib.optionals withSystemd [ systemd ];

-  preConfigure = ''
-    make protocols
-  '';
+  mesonBuildType =
+    if debug
+    then "debug"
+    else "release";

-  postBuild = ''
-    pushd ../hyprctl
-    ${stdenv.cc.targetPrefix}c++ -std=c++20 -w ./main.cpp -o ./hyprctl
-    popd
-  '';
+  mesonFlags = builtins.concatLists [
+    (lib.optional (!enableXWayland) "-Dxwayland=disabled")
+    (lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true")
+    (lib.optional withSystemd "-Dsystemd=enabled")
+  ];

-  installPhase = ''
-    runHook preInstall

-    install -Dm755 ../hyprctl/hyprctl ./Hyprland -t $out/bin
-
-    runHook postInstall
-  '';
+  passthru.providedSessions = [ "hyprland" ];

  meta = with lib; {
-    inherit (finalAttrs.src.meta) homepage;
+    homepage = "https://github.com/vaxerski/Hyprland";
    description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ wozeparrot ];
-    inherit (wayland.meta) platforms;
+    maintainers = with maintainers; [ wozeparrot fufexan ];
    mainProgram = "Hyprland";
+    platforms = wlroots.meta.platforms;
  };
-})
+}
--- a/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix
@ -0,0 +1,15 @@
+{ udis86
+, fetchFromGitHub
+}:
+udis86.overrideAttrs (old: {
+  version = "unstable-2022-10-13";
+
+  src = fetchFromGitHub {
+    owner = "canihavesomecoffee";
+    repo = "udis86";
+    rev = "5336633af70f3917760a6d441ff02d93477b0c86";
+    hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g=";
+  };
+
+  patches = [ ];
+})
--- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
@ -0,0 +1,113 @@
+{ fetchFromGitLab
+, hyprland
+, wlroots
+, xwayland
+, fetchpatch
+, lib
+, libdisplay-info
+, libliftoff
+, hwdata
+, hidpiXWayland ? true
+, enableXWayland ? true
+, nvidiaPatches ? false
+}:
+let
+  libdisplay-info-new = libdisplay-info.overrideAttrs (old: {
+    version = "0.1.1+date=2023-03-02";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "emersion";
+      repo = old.pname;
+      rev = "147d6611a64a6ab04611b923e30efacaca6fc678";
+      sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4=";
+    };
+  });
+
+  libliftoff-new = libliftoff.overrideAttrs (old: {
+    version = "0.5.0-dev";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "emersion";
+      repo = old.pname;
+      rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
+      sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
+    };
+
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=sign-conversion"
+    ];
+  });
+in
+assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
+  wlroots-hyprland: cannot have hidpiXWayland when enableXWayland is false.
+'');
+(wlroots.overrideAttrs
+  (old: {
+    version = "0.17.0-dev";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "wlroots";
+      repo = "wlroots";
+      rev = "5ae17de23f5fd9bb252a698f3771c840280e2c05";
+      hash = "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=";
+    };
+
+    pname =
+      old.pname
+      + "-hyprland"
+      + (
+        if hidpiXWayland
+        then "-hidpi"
+        else ""
+      )
+      + (
+        if nvidiaPatches
+        then "-nvidia"
+        else ""
+      );
+
+    patches =
+      (old.patches or [ ])
+      ++ (lib.optionals (enableXWayland && hidpiXWayland) [
+        "${hyprland.src}/nix/wlroots-hidpi.patch"
+        (fetchpatch {
+          url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/18595000f3a21502fd60bf213122859cc348f9af.diff";
+          sha256 = "sha256-jvfkAMh3gzkfuoRhB4E9T5X1Hu62wgUjj4tZkJm0mrI=";
+          revert = true;
+        })
+      ])
+      ++ (lib.optionals nvidiaPatches [
+        (fetchpatch {
+          url = "https://aur.archlinux.org/cgit/aur.git/plain/nvidia.patch?h=hyprland-nvidia-git&id=757614af7729352fda534abe9eb1a88fe77dfe04";
+          sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
+        })
+      ]);
+
+    postPatch =
+      (old.postPatch or "")
+      + (
+        if nvidiaPatches
+        then ''
+          substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
+        ''
+        else ""
+      );
+
+    buildInputs =
+      old.buildInputs
+      ++ [
+        hwdata
+        libdisplay-info-new
+        libliftoff-new
+      ];
+  })).override {
+  xwayland = xwayland.overrideAttrs (old: {
+    patches =
+      (old.patches or [ ])
+      ++ (lib.optionals hidpiXWayland [
+        "${hyprland.src}/nix/xwayland-vsync.patch"
+        "${hyprland.src}/nix/xwayland-hidpi.patch"
+      ]);
+  });
+}
--- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
@ -0,0 +1,95 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, cmake
+, ninja
+, cairo
+, fribidi
+, libdatrie
+, libjpeg
+, libselinux
+, libsepol
+, libthai
+, pango
+, pcre
+, utillinux
+, wayland
+, wayland-protocols
+, wayland-scanner
+, wlroots
+, libXdmcp
+, debug ? false
+}:
+stdenv.mkDerivation {
+  pname = "hyprpicker" + lib.optionalString debug "-debug";
+  version = "unstable-2023-03-09";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "hyprpicker";
+    rev = "234c2da51a71941c0cd2ee380f42de365f90dd6f";
+    hash = "sha256-wb1oXsaM0AkThPJGjn0Ytxt8vbBQG+mg2AGY0uxhUJ0=";
+  };
+
+  cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    cairo
+    fribidi
+    libdatrie
+    libjpeg
+    libselinux
+    libsepol
+    libthai
+    pango
+    pcre
+    wayland
+    wayland-protocols
+    wayland-scanner
+    wlroots
+    libXdmcp
+    utillinux
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    make protocols
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    make release
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share/licenses}
+
+    install -Dm755 build/hyprpicker -t $out/bin
+    install -Dm644 LICENSE -t $out/share/licenses/hyprpicker
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A wlroots-compatible Wayland color picker that does not suck";
+    homepage = "https://github.com/hyprwm/hyprpicker";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fufexan ];
+    platforms = wayland.meta.platforms;
+  };
+}
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@ -0,0 +1,53 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, meson
+, ninja
+, pkg-config
+, hyprland-protocols
+, hyprland-share-picker
+, inih
+, libdrm
+, mesa
+, pipewire
+, systemd
+, wayland
+, wayland-protocols
+, wayland-scanner
+}:
+let
+  source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
+in
+stdenv.mkDerivation {
+  pname = "xdg-desktop-portal-hyprland";
+  inherit (source) src version meta;
+
+  strictDeps = true;
+  depsBuildBuild = [ pkg-config ];
+  nativeBuildInputs = [
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+  ];
+  buildInputs = [
+    hyprland-protocols
+    inih
+    libdrm
+    mesa
+    pipewire
+    systemd
+    wayland
+    wayland-protocols
+  ];
+
+  mesonFlags = [
+    "-Dsd-bus-provider=libsystemd"
+  ];
+
+  postInstall = ''
+    wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [hyprland-share-picker]}
+  '';
+}
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix
@ -0,0 +1,36 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, qtbase
+, makeShellWrapper
+, wrapQtAppsHook
+, hyprland
+, grim
+, slurp
+, wayland
+}:
+let
+  source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
+in
+stdenv.mkDerivation {
+  pname = "hyprland-share-picker";
+  inherit (source) version;
+
+  src = "${source.src}/hyprland-share-picker";
+
+  nativeBuildInputs = [ cmake wrapQtAppsHook makeShellWrapper ];
+  buildInputs = [ qtbase ];
+
+  dontWrapQtApps = true;
+
+  postInstall = ''
+    wrapProgramShell $out/bin/hyprland-share-picker \
+      "''${qtWrapperArgs[@]}" \
+      --prefix PATH ":" ${lib.makeBinPath [grim slurp hyprland]}
+  '';
+
+  meta = source.meta // {
+    description = "Helper program for xdg-desktp-portal-hyprland";
+  };
+}
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
@ -0,0 +1,22 @@
+{ lib
+, fetchFromGitHub
+, wayland
+}:
+{
+  version = "unstable-2023-03-16";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "xdg-desktop-portal-hyprland";
+    rev = "85f49f4d6c9c398428117e9bdb588f53f09e52e0";
+    hash = "sha256-qed+BV0NBt1egGCBEM7d5MiZJevQb8jd1WybfFM53Ak=";
+  };
+
+  meta = with lib; {
+    description = "xdg-desktop-portal backend for Hyprland";
+    homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fufexan ];
+    platforms = wayland.meta.platforms;
+  };
+}
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@ -34,6 +34,9 @@ let
    "dontUnpack"
    "LC_ALL"
    "meta"
+    "buildPhase"
+    "nativeBuildInputs"
+    "installPhase"
  ];
 in
 stdenv.mkDerivation ({
--- a/pkgs/data/fonts/mononoki/default.nix
+++ b/pkgs/data/fonts/mononoki/default.nix
@ -2,12 +2,12 @@

 stdenvNoCC.mkDerivation rec {
  pname = "mononoki";
-  version = "1.5";
+  version = "1.6";

  src = fetchzip {
    url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
    stripRoot = false;
-    hash = "sha256-H5Iu7nSrB5UGlCSjTM3SLu+IjaAffk9TCm5OoOleKvw=";
+    hash = "sha256-HQM9rzIJXLOScPEXZu0MzRlblLfbVVNJ+YvpONxXuwQ=";
  };

  installPhase = ''
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "v2ray-geoip";
-  version = "202303090050";
+  version = "202303160048";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "geoip";
-    rev = "e1cd759a93ff7e65cd8099ee628803a83ab8cae0";
-    sha256 = "sha256-m6TYu6cT57MDOXXfI76ufGDWJYmxjtVZg5vSToM8btE=";
+    rev = "ca1a04c113293b00434d9d60e24aee17e660f4a6";
+    sha256 = "sha256-YhFYrVN6ZQQeuM8ZCeFRmID/NTsI75oe4c51lOfb18s=";
  };

  installPhase = ''
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@ -9,28 +9,26 @@
 , mtdev
 , cairo
 , xorg
-, waylandSupport ? false
+, waylandSupport ? true
+, wayland
 }:

 stdenv.mkDerivation rec {
  pname = "qt5platform-plugins";
-  version = "5.6.3";
+  version = "5.6.5";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk=";
+    sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY=";
  };

-  ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119
-  postPatch = ''
-    rm -r xcb/libqt5xcbqpa-dev/
-    mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version}
-    cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/
-  '';
-
-  nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+    wrapQtAppsHook
+  ];

  buildInputs = [
    mtdev
@ -38,13 +36,20 @@ stdenv.mkDerivation rec {
    qtbase
    qtx11extras
    xorg.libSM
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
  ];

  qmakeFlags = [
    "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
+    "QT_XCB_PRIVATE_INCLUDE=${qtbase.src}/src/plugins/platforms/xcb"
  ]
  ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];

+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString waylandSupport "-I${wayland.dev}/include";
+
  meta = with lib; {
    description = "Qt platform plugins for DDE";
    homepage = "https://github.com/linuxdeepin/qt5platform-plugins";
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
@ -4,13 +4,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "deepin-desktop-base";
-  version = "2022.03.07";
+  version = "2022.11.15-deepin";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    sha256 = "sha256-joAduRI9jUtPA4lNsEhgOZlci8j/cvD8rJThqvj6a8A=";
+    sha256 = "sha256-GTgIHWz+x1Pl3F4zKA9V8o2oq6c53OK94q95WoMG+Qo=";
  };

  makeFlags = [ "DESTDIR=${placeholder "out"}" ];
@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
  meta = with lib; {
    description = "Base assets and definitions for Deepin Desktop Environment";
    homepage = "https://github.com/linuxdeepin/deepin-desktop-base";
-    license = licenses.gpl3Plus;
+    license = with licenses; [ gpl3Plus cc-by-40 ];
    platforms = platforms.linux;
    maintainers = teams.deepin.members;
  };
--- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
@ -9,14 +9,14 @@

 stdenv.mkDerivation rec {
  pname = "gnome-shell-extension-dash-to-dock";
-  version = "75";
+  version = "79";

  # Temporarily switched to commit hash because stable version is buggy.
  src = fetchFromGitHub {
    owner = "micheleg";
    repo = "dash-to-dock";
    rev = "extensions.gnome.org-v${version}";
-    sha256 = "sha256-vHXNhJgty7x4Ef6jxUI29KYpadC3jtUqE1Nt1dWYr24=";
+    sha256 = "sha256-vqQ9nAa/avae2+0xJ5gApbAU07pawi+R6IEQ9O6DTjs=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/ballerina/default.nix
+++ b/pkgs/development/compilers/ballerina/default.nix
@ -1,6 +1,6 @@
 { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
 let
-  version = "2201.2.2";
+  version = "2201.4.0";
  codeName = "swan-lake";
 in stdenv.mkDerivation {
  pname = "ballerina";
@ -8,7 +8,7 @@ in stdenv.mkDerivation {

  src = fetchzip {
    url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
-    sha256 = "sha256-xBr7lsZJKk4VXuUDt7IRQN/ZDH4WrxYjd1mBIoyb9qs=";
+    sha256 = "sha256-720QKGOerRzXsnbUghk+HGOMl4lQxHDYya3+FHtU/Ys=";
  };

  nativeBuildInputs = [ makeWrapper ];
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
    runHook postInstall
  '';
  preFixup = ''
-    wrapProgram $out/bin/bal --set JAVA_HOME ${openjdk}/lib/openjdk
+    wrapProgram $out/bin/bal --set JAVA_HOME ${openjdk}
  '';

  passthru.tests.smokeTest = let
--- a/pkgs/development/guile-modules/guile-ssh/default.nix
+++ b/pkgs/development/guile-modules/guile-ssh/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "guile-ssh";
-  version = "0.16.2";
+  version = "0.16.3";

  src = fetchFromGitHub {
    owner = "artyom-poptsov";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-BDnLm5Q+69v8JbrfAn0+XMuWzRvCeUB/prfrKnvw5eY=";
+    sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw=";
  };

  configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ];
--- a/Show More
+++ b/Show More