Merge master into haskell-updates

doc/packages/build-support.md

@@ -0,0 +1,102 @@
+# Build Support {#sec-build-support}
+
+## `pkgs.substitute` {#pkgs-substitute}
+
+`pkgs.substitute` is a wrapper around [the `substitute` Bash function](#fun-substitute) in the standard environment.
+It replaces strings in `src` as specified by the `substitutions` argument.
+
+
+:::{.example #ex-pkgs-substitute}
+# Usage of `pkgs.substitute`
+
+In a build script, the line:
+
+```bash
+substitute $infile $outfile --replace-fail @foo@ ${foopkg}/bin/foo
+```
+
+is equivalent to:
+
+```nix
+{ substitute, foopkg }:
+substitute {
+  src = ./sourcefile.txt;
+  substitutions = [
+    "--replace"
+    "@foo@"
+    "${foopkg}/bin/foo"
+  ];
+}
+```
+:::
+
+## `pkgs.substituteAll` {#pkgs-substituteall}
+
+`pkgs.substituteAll` substitutes all instances of `@varName@` (`@`s included) in file `src` with the value of the corresponding environment variable.
+As this uses the [`substituteAll`] (#fun-substitute) function, its limitations regarding variable names that will or will not be replaced also apply here.
+
+:::{.example #ex-pkgs-substituteAll}
+# Usage of `pkgs.substituteAll`
+
+If `say-goodbye.sh` contains the following:
+
+```bash
+#! @bash@/bin/bash
+
+echo @unchanged@
+@hello@/bin/hello --greeting @greeting@
+```
+
+the following derivation will make substitutions to `@bash@`, `@hello@`, and `@greeting@`:
+
+```nix
+{
+  substituteAll,
+  bash,
+  hello,
+}:
+substituteAll {
+  src = ./say-goodbye.sh;
+  env = {
+    inherit bash hello;
+    greeting = "goodbye";
+  };
+}
+```
+
+such that `$out` will result in something like the following:
+
+```
+#! /nix/store/s30jrpgav677fpc9yvkqsib70xfmx7xi-bash-5.2p26/bin/bash
+
+echo @unchanged@
+/nix/store/566f5isbvw014h7knmzmxa5l6hshx43k-hello-2.12.1/bin/hello --greeting goodbye
+```
+:::
+
+## `pkgs.substituteAllFiles` {#pkgs-substituteallfiles}
+
+`pkgs.substituteAllFiles` replaces `@varName@` with the value of the environment variable `varName`.
+It expects `src` to be a directory and requires a `files` argument that specifies which files will be subject to replacements; only these files will be placed in `$out`.
+
+As it also uses the `substituteAll` function, it is subject to the same limitations on environment variables as discussed in [pkgs.substituteAll](#pkgs-substituteall).
+
+:::{.example #ex-pkgs-substitute-all-files}
+# Usage of `pkgs.substituteAllFiles`
+
+If the current directory contains `{foo,bar,baz}.txt` and the following `default.nix`
+
+```nix
+{ substituteAllFiles }:
+substituteAllFiles {
+  src = ./.;
+  files = [
+    "foo.txt"
+    "bar.txt"
+  ];
+  hello = "there";
+}
+```
+
+in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and` `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`.
+:::

doc/packages/index.md

@@ -27,4 +27,5 @@ urxvt.section.md
 vcpkg.section.md
 weechat.section.md
 xorg.section.md
+build-support.md
 ```

maintainers/maintainer-list.nix

@@ -8713,6 +8713,12 @@
     githubId = 7481521;
     name = "Balázs Lengyel";
   };
+  ilaumjd = {
+    email = "ilaumjd@gmail.com";
+    github = "ilaumjd";
+    githubId = 16514431;
+    name = "Ilham AM";
+  };
   ilian = {
     email = "ilian@tuta.io";
     github = "ilian";
@@ -17232,6 +17238,12 @@
     githubId = 52847440;
     name = "Ryan Burns";
   };
+  rcmlz = {
+    email = "haguga-nixos@yahoo.com";
+    github = "rcmlz";
+    githubId = 19784049;
+    name = "rcmlz";
+  };
   rcoeurjoly = {
     email = "rolandcoeurjoly@gmail.com";
     github = "RCoeurjoly";
@@ -18595,6 +18607,12 @@
     githubId = 17243347;
     name = "Sebastian Sellmeier";
   };
+  sedlund = {
+    email = "scott+nixpkgs@teraton.com";
+    github = "sedlund";
+    githubId = 8109138;
+    name = "Scott Edlund";
+  };
   sefidel = {
     name = "sefidel";
     email = "contact@sefidel.net";

nixos/modules/services/networking/harmonia.nix

@@ -2,6 +2,12 @@
 let
   cfg = config.services.harmonia;
   format = pkgs.formats.toml { };
+
+  signKeyPaths = cfg.signKeyPaths ++ lib.optional (cfg.signKeyPath != null) cfg.signKeyPath;
+  credentials = lib.imap0 (i: signKeyPath: {
+    id = "sign-key-${builtins.toString i}";
+    path = signKeyPath;
+  }) signKeyPaths;
 in
 {
   options = {
@@ -11,7 +17,13 @@ in
       signKeyPath = lib.mkOption {
         type = lib.types.nullOr lib.types.path;
         default = null;
-        description = "Path to the signing key that will be used for signing the cache";
+        description = "DEPRECATED: Use `services.harmonia.signKeyPaths` instead. Path to the signing key to use for signing the cache";
+      };
+
+      signKeyPaths = lib.mkOption {
+        type = lib.types.listOf lib.types.path;
+        default = [ ];
+        description = "Paths to the signing keys to use for signing the cache";
       };
 
       package = lib.mkPackageOption pkgs "harmonia" { };
@@ -28,6 +40,8 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    warnings = lib.optional (cfg.signKeyPath != null)
+      "`services.harmonia.signKeyPath` is deprecated, use `services.harmonia.signKeyPaths` instead";
     nix.settings.extra-allowed-users = [ "harmonia" ];
     users.users.harmonia = {
       isSystemUser = true;
@@ -44,7 +58,9 @@ in
 
       environment = {
         CONFIG_FILE = format.generate "harmonia.toml" cfg.settings;
-        SIGN_KEY_PATH = lib.mkIf (cfg.signKeyPath != null) "%d/sign-key";
+        SIGN_KEY_PATHS = lib.strings.concatMapStringsSep " " (
+          credential: "%d/${credential.id}"
+        ) credentials;
         # Note: it's important to set this for nix-store, because it wants to use
         # $HOME in order to use a temporary cache dir. bizarre failures will occur
         # otherwise
@@ -60,7 +76,7 @@ in
         DeviceAllow = [ "" ];
         UMask = "0066";
         RuntimeDirectory = "harmonia";
-        LoadCredential = lib.mkIf (cfg.signKeyPath != null) [ "sign-key:${cfg.signKeyPath}" ];
+        LoadCredential = builtins.map (credential: "${credential.id}:${credential.path}") credentials;
         SystemCallFilter = [
           "@system-service"
           "~@privileged"

nixos/modules/system/boot/networkd.nix

@@ -20,6 +20,7 @@ let
           "IPv6PrivacyExtensions"
           "IPv4Forwarding"
           "IPv6Forwarding"
+          "UseDomains"
         ])
         (assertValueOneOf "SpeedMeter" boolValues)
         (assertInt "SpeedMeterIntervalSec")
@@ -28,6 +29,7 @@ let
         (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"]))
         (assertValueOneOf "IPv4Forwarding" boolValues)
         (assertValueOneOf "IPv6Forwarding" boolValues)
+        (assertValueOneOf "UseDomains" (boolValues ++ ["route"]))
       ];
 
       sectionDHCPv4 = checkUnitConfig "DHCPv4" [
@@ -652,6 +654,7 @@ let
           "Address"
           "Gateway"
           "DNS"
+          "UseDomains"
           "Domains"
           "DNSDefaultRoute"
           "NTP"
@@ -705,6 +708,7 @@ let
         (assertValueOneOf "DNSSEC" (boolValues ++ ["allow-downgrade"]))
         (assertValueOneOf "LLDP" (boolValues ++ ["routers-only"]))
         (assertValueOneOf "EmitLLDP" (boolValues ++ ["nearest-bridge" "non-tpmr-bridge" "customer-bridge"]))
+        (assertValueOneOf "UseDomains" (boolValues ++ ["route"]))
         (assertValueOneOf "DNSDefaultRoute" boolValues)
         (assertRemoved "IPForward" "IPv4Forwarding and IPv6Forwarding in systemd.network(5) and networkd.conf(5)")
         (assertValueOneOf "IPv4Forwarding" boolValues)

nixos/tests/harmonia.nix

@@ -7,7 +7,7 @@
     harmonia = {
       services.harmonia = {
         enable = true;
-        signKeyPath = pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg==";
+        signKeyPaths = [(pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg==")];
         settings.priority = 35;
       };
 

nixos/tests/lemmy.nix

@@ -51,8 +51,8 @@ in
 
     with subtest("the backend starts and responds"):
         server.wait_for_open_port(${toString backendPort})
-        # wait until succeeds, it just needs few seconds for migrations, but lets give it 10s max
-        server.wait_until_succeeds("curl --fail localhost:${toString backendPort}/api/v3/site", 10)
+        # wait until succeeds, it just needs few seconds for migrations, but lets give it 50s max
+        server.wait_until_succeeds("curl --fail localhost:${toString backendPort}/api/v3/site", 50)
 
     with subtest("the UI starts and responds"):
         server.wait_for_unit("lemmy-ui.service")
@@ -77,7 +77,7 @@ in
         server.execute("systemctl stop lemmy-ui.service")
 
         def assert_http_code(url, expected_http_code, extra_curl_args=""):
-            _, http_code = server.execute(f'curl --silent -o /dev/null {extra_curl_args} --fail --write-out "%{{http_code}}" {url}')
+            _, http_code = server.execute(f'curl --location --silent -o /dev/null {extra_curl_args} --fail --write-out "%{{http_code}}" {url}')
             assert http_code == str(expected_http_code), f"expected http code {expected_http_code}, got {http_code}"
 
         # Caddy responds with HTTP code 502 if it cannot handle the requested path

pkgs/applications/accessibility/squeekboard/default.nix

@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "squeekboard";
-  version = "1.38.0";
+  version = "1.41.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
     owner = "Phosh";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8=";
+    hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-tcn1tRuRlHVTYvc8T/ePfCEPNjih6B9lo/hdX+WwitQ=";
+    hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0=";
   };
 
   nativeBuildInputs = [

pkgs/applications/audio/ardour/7.nix

@@ -3,6 +3,7 @@
 , fetchgit
 , fetchzip
 , fetchpatch
+, fetchpatch2
 , alsa-lib
 , aubio
 , boost
@@ -86,6 +87,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/Ardour/ardour/commit/e995daa37529715214c6c4a2587e4134aaaba02f.patch";
       hash = "sha256-EpXOIIObOwwcNgNma0E3nvaBad3930sagDjBpa+78WI=";
     })
+
+    # Work around itstools bug #9648
+    (fetchpatch2 {
+      url = "https://github.com/Ardour/ardour/commit/338cd09a4aa1b36b8095dfc14ab534395f9a4a92.patch?full_index=1";
+      hash = "sha256-AvV4aLdkfrxPkE4NX2ETSagq4GjEC+sHCEqdcYvL+CY=";
+    })
   ];
 
   # Ardour's wscript requires git revision and date to be available.

pkgs/applications/audio/listenbrainz-mpd/default.nix

@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "listenbrainz-mpd";
-  version = "2.3.7";
+  version = "2.3.8";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "elomatreb";
     repo = "listenbrainz-mpd";
     rev = "v${version}";
-    hash = "sha256-xnVhPiHhI7VqkSBBlrKJBpdS6kd51DMlKWVnJIo/OQQ=";
+    hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU=";
   };
 
-  cargoHash = "sha256-Reglc7UtsFk+VIwg4Q9TIChVrWweuV6yPWxbtTDH6mU=";
+  cargoHash = "sha256-jnDS9tIJ387A2P9oUSYB3tXrXjwwVmQ26erIIlHBkao=";
 
   nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ];
 

pkgs/applications/audio/psst/default.nix

@@ -16,13 +16,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "psst";
-  version = "unstable-2024-07-29";
+  version = "unstable-2024-08-19";
 
   src = fetchFromGitHub {
     owner = "jpochyla";
     repo = pname;
-    rev = "d895cb94623d320f79b364a8f63ab518fddf697b";
-    hash = "sha256-LsveuaDmRvC9TUON847QdzqQDUW1zd37++MbtXrfJjk=";
+    rev = "11bef15e66a3c9b0b991207d09a67c071b3dda02";
+    hash = "sha256-lKxWIUDouUUul7CpuTy30z/cLJAjFE9e0J1zyZ/PnIo=";
   };
 
   cargoLock = {

pkgs/applications/audio/psst/make-build-reproducible.patch

@@ -54,7 +54,7 @@ index fcbd491..8f6e6f0 100644
 -pub const GIT_VERSION: &str = git_version!();
 -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
 -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
-+pub const GIT_VERSION: &str = "d895cb94623d320f79b364a8f63ab518fddf697b";
++pub const GIT_VERSION: &str = "11bef15e66a3c9b0b991207d09a67c071b3dda02";
 +pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
 +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";
  

pkgs/applications/audio/pt2-clone/default.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pt2-clone";
-  version = "1.69.2";
+  version = "1.70";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "pt2-clone";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Vy8b9rbYM/bK/mCUW4V4rPeAmoBN/wn7iVBANSboL2Q=";
+    sha256 = "sha256-oGdgvyVIqM4YVxyr5DFBJ+YLtH95vqbNv0arD9yskdo=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/applications/audio/vgmstream/default.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vgmstream";
-  version = "1917";
+  version = "1951";
 
   src = fetchFromGitHub {
     owner = "vgmstream";
     repo = "vgmstream";
     rev = "refs/tags/r${version}";
-    sha256 = "sha256-9HIa5/whdLouUWNFml7tPfXStIkO76dxUl5S4yiat64=";
+    sha256 = "sha256-Wa0FAUHdJtG+u9y3ZOt8dxRIo78lekFPghiu67KJZ9s=";
   };
 
   passthru.updateScript = nix-update-script {

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

@@ -23,10 +23,6 @@ lib.packagesFromDirectoryRecursive {
     inherit (pkgs) basedpyright git go gopls python3;
   };
 
-  matrix-client = callPackage ./manual-packages/matrix-client {
-    _map = self.map;
-  };
-
   structured-haskell-mode = self.shm;
 
   texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
@@ -48,5 +44,6 @@ lib.packagesFromDirectoryRecursive {
   ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15
   ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17
   haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17
+  matrix-client = throw "emacsPackages.matrix-client is deprecated in favor of emacsPackages.ement."; # Added 2024-08-17
   perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19
 }

pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix

@@ -23,6 +23,8 @@ melpaBuild {
     popon
   ];
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix

@@ -15,6 +15,8 @@ melpaBuild {
 
   files = ''("acm/*.el" "acm/icons")'';
 
+  ignoreCompilationError = false;
+
   meta = {
     description = "Asynchronous Completion Menu";
     homepage = "https://github.com/manateelazycat/lsp-bridge";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix

@@ -8,6 +8,8 @@ melpaBuild {
 
   files = ''("src/data/emacs-mode/*.el")'';
 
+  ignoreCompilationError = false;
+
   meta = {
     inherit (Agda.meta) homepage license;
     description = "Agda2-mode for Emacs extracted from Agda package";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix

@@ -25,6 +25,8 @@ melpaBuild {
     })
   ];
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = gitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix

@@ -13,6 +13,8 @@ melpaBuild {
     hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";
   };
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://www.emacswiki.org/emacs/control-lock.el";
     description = "Like caps-lock, but for your control key";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix

@@ -30,6 +30,8 @@ melpaBuild {
 
   propagatedUserEnvPkgs = [ nodejs ];
 
+  ignoreCompilationError = false;
+
   meta = {
     description = "Unofficial copilot plugin for Emacs";
     homepage = "https://github.com/copilot-emacs/copilot.el";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix

@@ -13,6 +13,8 @@ melpaBuild rec {
     hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc=";
   };
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/";
     description = "Major modes for Gentoo package files";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix

@@ -21,6 +21,8 @@ melpaBuild {
 
   files = ''(:defaults "msg")'';
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix

@@ -27,6 +27,8 @@ melpaBuild {
     make
   '';
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix

@@ -23,6 +23,8 @@ melpaBuild {
     markdown-mode
   ];
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix

@@ -17,6 +17,8 @@ melpaBuild {
     hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix

@@ -22,6 +22,8 @@ melpaBuild {
     helm
   ];
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://github.com/emacsmirror/helm-words";
     description = "Helm extension for looking up words in dictionaries and thesauri";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
 
   packageRequires = [ haskell-mode ];
 
+  ignoreCompilationError = false;
+
   meta = {
     inherit (hsc3.meta) homepage license;
     description = "Emacs mode for hsc3";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix

@@ -24,6 +24,8 @@ melpaBuild {
     prop-menu
   ];
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = gitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix

@@ -17,6 +17,8 @@ melpaBuild {
     hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix

@@ -27,6 +27,8 @@ melpaBuild rec {
     mv tmp.el jam-mode.el
   '';
 
+  ignoreCompilationError = false;
+
   meta = {
     description = "Emacs major mode for editing Jam files";
     license = lib.licenses.gpl2Plus;

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix

@@ -19,6 +19,8 @@ melpaBuild {
 
   files = ''("tools/emacs/ligo-mode.el")'';
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix

@@ -9,6 +9,8 @@ melpaBuild {
      "llvm/utils/emacs/README")
   '';
 
+  ignoreCompilationError = false;
+
   meta = {
     inherit (llvmPackages.llvm.meta) homepage license;
     description = "Major mode for the LLVM assembler language";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix

@@ -87,6 +87,8 @@ melpaBuild {
 
   __darwinAllowLocalNetworking = true;
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix

@@ -24,6 +24,8 @@ melpaBuild {
   # to compile lspce.el, it needs lspce-module.so
   files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")'';
 
+  ignoreCompilationError = false;
+
   passthru = {
     inherit lspce-module;
     updateScript = nix-update-script {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix

@@ -1,65 +0,0 @@
-{
-  lib,
-  melpaBuild,
-  fetchFromGitHub,
-  fetchpatch,
-  # Emacs packages
-  _map,
-  a,
-  anaphora,
-  cl-lib,
-  dash,
-  dash-functional,
-  esxml,
-  f,
-  frame-purpose,
-  ht,
-  ov,
-  rainbow-identifiers,
-  request,
-  s,
-  tracking,
-}:
-
-melpaBuild {
-  pname = "matrix-client";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "alphapapa";
-    repo = "matrix-client.el";
-    rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
-    hash = "sha256-GLM8oCbm6PdEZPsM0ogMtNJr8mWjCKoX6ed5AUrYjuk=";
-  };
-
-  patches = [
-    # Fix: avatar loading when imagemagick support is not available
-    (fetchpatch {
-      url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
-      hash = "sha256-dXUa/HKDe+UjaXYTvgwPdXDuDcHB2HLPGWHboE+Lex0=";
-    })
-  ];
-
-  packageRequires = [
-    _map
-    a
-    anaphora
-    cl-lib
-    dash
-    dash-functional
-    esxml
-    f
-    frame-purpose
-    ht
-    ov
-    rainbow-identifiers
-    request
-    s
-    tracking
-  ];
-
-  meta = {
-    description = "Chat client and API wrapper for Matrix.org";
-    license = lib.licenses.gpl3Plus;
-  };
-}

pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix

@@ -27,6 +27,8 @@ elpaBuild {
     popd
   '';
 
+  ignoreCompilationError = false;
+
   meta = mu.meta // {
     description = "Full-featured e-mail client";
   };

pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix

@@ -59,6 +59,8 @@ melpaBuild {
     install -D --target-directory=$out/bin source/notdeft-xapian
   '';
 
+  ignoreCompilationError = false;
+
   passthru = {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix

@@ -15,6 +15,8 @@ melpaBuild {
     popd
   '';
 
+  ignoreCompilationError = false;
+
   meta = {
     description = "Emacs ott mode (from ott sources)";
     inherit (ott.meta) homepage license;

pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix

@@ -26,6 +26,8 @@ melpaBuild {
     install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README
   '';
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://metacpan.org/dist/pod-mode";
     description = "Major mode for editing .pod-files";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix

@@ -3,13 +3,17 @@
   fetchFromGitHub,
   melpaBuild,
   js2-mode,
+  lsp-mode,
 }:
 
 melpaBuild {
   pname = "prisma-mode";
   version = "0-unstable-2021-12-07";
 
-  packageRequires = [ js2-mode ];
+  packageRequires = [
+    js2-mode
+    lsp-mode
+  ];
 
   src = fetchFromGitHub {
     owner = "pimeys";
@@ -18,6 +22,8 @@ melpaBuild {
     hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
   };
 
+  ignoreCompilationError = false;
+
   meta = {
     description = "Major mode for Prisma Schema Language";
     license = lib.licenses.gpl2Only;

pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix

@@ -19,6 +19,8 @@ melpaBuild {
       --replace-fail ";; prolog.el ---" ";;; prolog.el ---"
   '';
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/";
     description = "Prolog mode for Emacs";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix

@@ -19,6 +19,8 @@ melpaBuild {
     hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = gitUpdater { };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix

@@ -17,6 +17,8 @@ melpaBuild {
     hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix

@@ -13,6 +13,8 @@ melpaBuild {
     hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU=";
   };
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://www.emacswiki.org/emacs/sv-kalender.el";
     description = "Swedish calendar for Emacs";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix

@@ -10,6 +10,8 @@ melpaBuild {
 
   files = ''("emacs/*.el")'';
 
+  ignoreCompilationError = false;
+
   meta = {
     inherit (texpresso.meta) homepage license;
     description = "Emacs mode for TeXpresso";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix

@@ -44,6 +44,8 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: {
           fi
         '') plugins);
 
+  ignoreCompilationError = false;
+
   passthru = old.passthru or {} // {
     inherit plugins;
     withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; };

pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix

@@ -20,6 +20,8 @@ melpaBuild {
 
   dontConfigure = true;
 
+  ignoreCompilationError = false;
+
   meta = {
     description = "Major mode for editing Ur/Web";
     inherit (urweb.meta) license homepage;

pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix

@@ -15,6 +15,7 @@
   porthole,
   unstableGitUpdater,
   yasnippet,
+  el-patch,
 }:
 
 melpaBuild {
@@ -45,8 +46,11 @@ melpaBuild {
     nav-flash
     porthole
     yasnippet
+    el-patch
   ];
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix

@@ -13,6 +13,8 @@ melpaBuild {
     hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8=";
   };
 
+  ignoreCompilationError = false;
+
   meta = {
     homepage = "https://www.emacswiki.org/emacs/yes-no.el";
     description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix

@@ -16,6 +16,8 @@ melpaBuild {
     hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4=";
   };
 
+  ignoreCompilationError = false;
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {

pkgs/applications/editors/heh/default.nix

@@ -7,20 +7,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "heh";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "ndd7xv";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-P3EZSe5Zv7pJ2QwKvtBh5kz93y6DBWkj6s8v3+8Xp9Q=";
+    hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     AppKit
   ]);
 
-  cargoHash = "sha256-l3XR6srs6RmvcGjMFni6wYLLqXE8mMUq59WFLKGQl3U=";
+  cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw=";
 
   meta = with lib; {
     description = "Cross-platform terminal UI used for modifying file data in hex or ASCII";

pkgs/applications/editors/leo-editor/default.nix

@@ -14,7 +14,7 @@ mkDerivation rec {
   dontBuild = true;
 
   nativeBuildInputs = [ wrapQtAppsHook makeWrapper python3 ];
-  propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ];
+  propagatedBuildInputs = with python3.pkgs; [ pyqt6 docutils ];
 
   desktopItem = makeDesktopItem {
     name = "leo-editor";

pkgs/applications/editors/vim/plugins/generated.nix

@@ -5987,6 +5987,18 @@ final: prev:
     meta.homepage = "https://github.com/mkasa/lushtags/";
   };
 
+  luvit-meta = buildVimPlugin {
+    pname = "luvit-meta";
+    version = "2024-01-20";
+    src = fetchFromGitHub {
+      owner = "Bilal2453";
+      repo = "luvit-meta";
+      rev = "ce76f6f6cdc9201523a5875a4471dcfe0186eb60";
+      sha256 = "0a0n67day3zpfxck7yiqb496bz79gwhcvdn60b0f4bp8bysjj06c";
+    };
+    meta.homepage = "https://github.com/Bilal2453/luvit-meta/";
+  };
+
   magma-nvim-goose = buildVimPlugin {
     pname = "magma-nvim-goose";
     version = "2023-07-04";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -501,6 +501,7 @@ https://github.com/l3mon4d3/luasnip/,,
 https://github.com/alvarosevilla95/luatab.nvim/,,
 https://github.com/rktjmp/lush.nvim/,,
 https://github.com/mkasa/lushtags/,,
+https://github.com/Bilal2453/luvit-meta/,HEAD,
 https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD,
 https://github.com/winston0410/mark-radar.nvim/,HEAD,
 https://github.com/iamcco/markdown-preview.nvim/,,

pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch

@@ -1,76 +0,0 @@
-From 351be6b3f2ad10d86ec4ae711db5a1067acc592a Mon Sep 17 00:00:00 2001
-From: Zane van Iperen <zane@zanevaniperen.com>
-Date: Sun, 7 Nov 2021 15:17:07 +1000
-Subject: [PATCH] libpcsxcore: fix build with ffmpeg 4
-
----
- libpcsxcore/cdriso.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
-index f89678e..6314482 100644
---- a/libpcsxcore/cdriso.c
-+++ b/libpcsxcore/cdriso.c
-@@ -266,14 +266,14 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s
- 		}
- 
- 		if (!decoded_frame) {
--			if (!(decoded_frame = avcodec_alloc_frame())) {
-+			if (!(decoded_frame = av_frame_alloc())) {
- 				SysMessage(_(" -> Error allocating audio frame buffer. This track will not be available."));
- 				avformat_close_input(&inAudioFormat);
--				avcodec_free_frame(&decoded_frame);
-+				av_frame_free(&decoded_frame);
- 				return 1; // error decoding frame
- 			}
- 		} else {
--			avcodec_get_frame_defaults(decoded_frame);
-+			av_frame_unref(decoded_frame);
- 		}
- 		len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
- 		if (len > 0 && got_frame) {
-@@ -285,7 +285,7 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s
- 			fwrite(decoded_frame->data[0], 1, data_size, outfile);
- 		}
- 		av_free_packet(&avpkt);
--		//avcodec_free_frame(&decoded_frame);
-+		//av_frame_free(&decoded_frame);
- 	} while (moreFrames >= 0); // TODO: check for possible leaks
- 
- 	// file will be closed later on, now just flush it
-@@ -294,7 +294,7 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s
- 	avformat_close_input(&inAudioFormat);
- 	//avcodec_close(c);
- 	//av_free(c);
--	avcodec_free_frame(&decoded_frame);
-+	av_frame_free(&decoded_frame);
- 	return 0;
- }
- #endif
-@@ -340,12 +340,12 @@ static int decode_compressed_cdda_track(FILE* outfile, FILE* infile, enum AVCode
- 	while (avpkt.size > 0) {
- 		int got_frame = 0;
- 		if (!decoded_frame) {
--			if (!(decoded_frame = avcodec_alloc_frame())) {
-+			if (!(decoded_frame = av_frame_alloc())) {
- 				SysPrintf(" -> Error allocating audio frame buffer. Track will not be available.");
- 				return 1; // error decoding frame
- 			}
- 		} else {
--			avcodec_get_frame_defaults(decoded_frame);
-+			av_frame_unref(decoded_frame);
- 		}
- 
- 		len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
-@@ -383,7 +383,7 @@ static int decode_compressed_cdda_track(FILE* outfile, FILE* infile, enum AVCode
- 
- 	avcodec_close(c);
- 	av_free(c);
--	avcodec_free_frame(&decoded_frame);
-+	av_frame_free(&decoded_frame);
- 	return 0;
- }
- #endif
--- 
-2.31.1
-

pkgs/applications/emulators/pcsxr/default.nix

@@ -1,97 +0,0 @@
-{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg
-, wrapGAppsHook3, libcdio, nasm, ffmpeg_4, file
-, fetchpatch }:
-
-stdenv.mkDerivation rec {
-  pname = "pcsxr";
-  version = "1.9.94";
-
-  # codeplex does not support direct downloading
-  src = fetchurl {
-    url = "mirror://debian/pool/main/p/pcsxr/pcsxr_${version}.orig.tar.xz";
-    sha256 = "0q7nj0z687lmss7sgr93ij6my4dmhkm2nhjvlwx48dn2lxl6ndla";
-  };
-
-  patches = [
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/01_fix-i386-exec-stack.patch";
-      sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/02_disable-ppc-auto-dynarec.patch";
-      sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/03_fix-plugin-dir.patch";
-      sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/04_update-homedir-symlinks.patch";
-      sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/05_format-security.patch";
-      sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/06_warnings.patch";
-      sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/07_non-linux-ip-addr.patch";
-      sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77";
-    })
-    ( fetchpatch {
-      url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/08_reproducible.patch";
-      sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06";
-    })
-
-    ./uncompress2.patch
-    ./0001-libpcsxcore-fix-build-with-ffmpeg-4.patch
-  ];
-
-  nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ];
-  buildInputs = [
-    gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file
-    xorg.libXxf86vm
-  ];
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile';
-  #     LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  dynarecTarget =
-   if stdenv.isx86_64 then "x86_64"
-   else if stdenv.isi686 then "x86"
-   else "no"; #debian patch 2 says ppc doesn't work
-
-  configureFlags = [
-    "--enable-opengl"
-    "--enable-ccdda"
-    "--enable-libcdio"
-    "--enable-dynarec=${dynarecTarget}"
-  ];
-
-  postInstall = ''
-    mkdir -p "$out/share/doc/${pname}-${version}"
-    cp README \
-       AUTHORS \
-       doc/keys.txt \
-       doc/tweaks.txt \
-       ChangeLog.df \
-       ChangeLog \
-       "$out/share/doc/${pname}-${version}"
-  '';
-
-  meta = with lib; {
-    broken = stdenv.isDarwin;
-    description = "Playstation 1 emulator";
-    homepage = "https://github.com/iCatButler/pcsxr";
-    maintainers = with maintainers; [ rardiol ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
-    mainProgram = "pcsxr";
-  };
-}

pkgs/applications/emulators/pcsxr/uncompress2.patch

@@ -1,20 +0,0 @@
---- a/libpcsxcore/cdriso.c
-+++ b/libpcsxcore/cdriso.c
-@@ -1219,7 +1219,7 @@
- 	return ret;
- }
- 
--static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
-+static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size)
- {
- 	static z_stream z;
- 	int ret = 0;
-@@ -1298,7 +1298,7 @@
- 	if (is_compressed) {
- 		cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
- 		cdbuffer_size = cdbuffer_size_expect;
--		ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
-+		ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
- 		if (ret != 0) {
- 			SysPrintf("uncompress failed with %d for block %d, sector %d\n",
- 					ret, block, sector);

pkgs/applications/emulators/retroarch/default.nix

@@ -8,7 +8,7 @@
 , alsa-lib
 , dbus
 , fetchFromGitHub
-, ffmpeg_4
+, ffmpeg_7
 , flac
 , freetype
 , gamemode
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     lib.optional (runtimeLibs != [ ]) makeWrapper;
 
   buildInputs = [
-    ffmpeg_4
+    ffmpeg_7
     flac
     freetype
     libGL

pkgs/applications/misc/feedbackd/default.nix

@@ -17,6 +17,8 @@
 , json-glib
 , libgudev
 , dbus
+, gmobile
+, umockdev
 }:
 
 let
@@ -24,13 +26,13 @@ let
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "feedbackd-device-themes";
-    rev = "v0.1.0";
-    sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80=";
+    rev = "v0.4.0";
+    hash = "sha256-kY/+DyRxKEUzq7ctl6Va14AKUCpWU7NRQhJOwhtkJp8=";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "feedbackd";
-  version = "0.2.0";
+  version = "0.4.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -38,9 +40,8 @@ stdenv.mkDerivation rec {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "feedbackd";
-    rev = "v${version}";
-    hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s=";
-    fetchSubmodules = true;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ta14DYqkid8Cp8fx9ZMGOOJroCBszN9/VrTN6mrpTZg=";
   };
 
   depsBuildBuild = [
@@ -66,22 +67,26 @@ stdenv.mkDerivation rec {
     gsound
     json-glib
     libgudev
+    gmobile
   ];
 
   mesonFlags = [
     "-Dgtk_doc=true"
     "-Dman=true"
+    # Make compiling work when doCheck = false
+    "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
   ];
 
   nativeCheckInputs = [
     dbus
+    umockdev
   ];
 
   doCheck = true;
 
   postInstall = ''
     mkdir -p $out/lib/udev/rules.d
-    sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules
+    sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules
     cp ${themes}/data/* $out/share/feedbackd/themes/
   '';
 
@@ -103,4 +108,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ pacman99 ];
     platforms = platforms.linux;
   };
-}
+})

pkgs/applications/misc/hubstaff/default.nix

@@ -4,9 +4,9 @@
 , curl, writeShellScript, common-updater-scripts, xmlstarlet }:
 
 let
-  url = "https://app.hubstaff.com/download/7473-standard-linux-1-6-24-release";
-  version = "1.6.24-094b0af9";
-  sha256 = "sha256:1jwyl51lljxn6hnkp07bvgw60bqmq3gb0rdgvxmd7r8x3y3xshx1";
+  url = "https://app.hubstaff.com/download/8099-standard-linux-1-6-26-release";
+  version = "1.6.26-95441346";
+  sha256 = "sha256:0xxw2za1hmqff5y0vyrvccgldsgyb808dql548c2xqsc1qi9gbn9";
 
   rpath = lib.makeLibraryPath
     [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft

pkgs/applications/misc/organicmaps/default.nix

@@ -30,13 +30,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "organicmaps";
-  version = "2024.07.29-2";
+  version = "2024.08.16-5";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     rev = "${version}-android";
-    hash = "sha256-cAoG/4vuA664+JcLTUdlLMMRggAznqHh3NA0Pk8RcFc=";
+    hash = "sha256-qVLeZySVdncHEwA0aTiScGJ/RAIpvVVVse3O/sXLto0=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/parsec/bin.nix

@@ -16,7 +16,7 @@
 , libXfixes
 , libpulseaudio
 , libva
-, ffmpeg_4
+, ffmpeg_6
 , libpng
 , libjpeg8
 , curl
@@ -26,11 +26,11 @@
 
 stdenvNoCC.mkDerivation {
   pname = "parsec-bin";
-  version = "150_93b";
+  version = "150_95";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20240329180120/https://builds.parsec.app/package/parsec-linux.deb";
-    sha256 = "sha256-wfsauQMubnGKGfL9c0Zee5g3nn0eEnOFalQNL3d4weE=";
+    url = "https://web.archive.org/web/20240725203323/https://builds.parsec.app/package/parsec-linux.deb";
+    sha256 = "sha256-9F56u+jYj2CClhbnGlLi65FxS1Vq00coxwu7mjVTY1w=";
   };
 
   unpackPhase = ''
@@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation {
     alsa-lib
     libpulseaudio
     libva
-    ffmpeg_4
+    ffmpeg_6
     libpng
     libjpeg8
     curl

pkgs/applications/misc/phoc/default.nix

@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , stdenvNoCC
-, fetchurl
+, fetchFromGitLab
 , meson
 , ninja
 , pkg-config
@@ -22,16 +22,20 @@
 , directoryListingUpdater
 , nixosTests
 , testers
+, gmobile
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.38.0";
+  version = "0.41.0";
 
-  src = fetchurl {
-    # This tarball includes the meson wrapped subproject 'gmobile'.
-    url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-OcRUnw1Fck9bMSgfMMcWqqR6a6yzyKjY8P3nqcwVULc=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "Phosh";
+    repo = "phoc";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U=";
   };
 
   nativeBuildInputs = [
@@ -56,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     finalAttrs.wlroots
     xorg.xcbutilwm
+    gmobile
   ];
 
   mesonFlags = ["-Dembed-wlroots=disabled"];

pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch

@@ -1,80 +0,0 @@
-This patch is a rebase of https://bugzilla.mozilla.org/attachment.cgi?id=9377318
-on top of Firefox 122.0.
-
-Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1875201
-
-diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index c5dabce8b0..e325905282 100644
---- a/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-+++ b/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-@@ -5,6 +5,8 @@
- 
-   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-   ### DO NOT edit it by hand.                                       ###
-+if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
-+    LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ]
- 
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [
-     "!/ipc/ipdl/_ipdlheaders",
-     "!/third_party/libwebrtc/gen",
-     "/ipc/chromium/src",
--    "/media/libvpx/libvpx/",
-     "/third_party/libwebrtc/",
-     "/third_party/libwebrtc/third_party/abseil-cpp/",
-     "/tools/profiler/public"
-diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index 77a6b3870b..d515bc0595 100644
---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -5,6 +5,8 @@
- 
-   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-   ### DO NOT edit it by hand.                                       ###
-+if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
-+    LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ]
- 
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [
-     "!/ipc/ipdl/_ipdlheaders",
-     "!/third_party/libwebrtc/gen",
-     "/ipc/chromium/src",
--    "/media/libvpx/libvpx/",
-     "/media/libyuv/",
-     "/media/libyuv/libyuv/include/",
-     "/third_party/libwebrtc/",
-diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index 4bece72807..5cc8d30e1a 100644
---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -5,6 +5,8 @@
- 
-   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-   ### DO NOT edit it by hand.                                       ###
-+if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
-+    LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ]
- 
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [
-     "!/ipc/ipdl/_ipdlheaders",
-     "!/third_party/libwebrtc/gen",
-     "/ipc/chromium/src",
--    "/media/libvpx/libvpx/",
-     "/media/libyuv/",
-     "/media/libyuv/libyuv/include/",
-     "/third_party/libwebrtc/",
-diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
-index 7baea55b7e..86d4f0f288 100644
---- a/third_party/libwebrtc/moz.build
-+++ b/third_party/libwebrtc/moz.build
-@@ -436,7 +436,6 @@ DIRS += [
-     "/third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn",
-     "/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn",
-     "/third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn",
--    "/third_party/libwebrtc/third_party/libvpx/libvpx_gn",
-     "/third_party/libwebrtc/third_party/libyuv/libyuv_gn",
-     "/third_party/libwebrtc/third_party/pffft/pffft_gn",
-     "/third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn",

pkgs/applications/networking/browsers/firefox/common.nix

@@ -234,32 +234,36 @@ buildStdenv.mkDerivation {
     "profilingPhase"
   ];
 
-  patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [
-    # dbus cflags regression fix
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083
+  patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
+  ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
+  ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
+  ++ lib.optionals (lib.versionOlder version "131") [
     (fetchpatch {
-      url = "https://hg.mozilla.org/mozilla-central/raw-rev/f1f5f98290b3";
-      hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI=";
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
+      name = "cbindgen-0.27.0-compat.patch";
+      url = "https://hg.mozilla.org/integration/autoland/raw-rev/98cd34c7ff57";
+      hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug=";
     })
   ]
-  ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch
-  ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch
-  ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch
-  ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [
+  ++ lib.optionals (lib.versionOlder version "130" && lib.versionAtLeast version "128") [
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
     (fetchpatch {
-      # Do not crash on systems without an expected statically assumed page size.
-      # https://phabricator.services.mozilla.com/D194458
-      name = "mozbz1866025.patch";
-      url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951";
-      hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
+      name = "mozbz-1898476-1.patch";
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/f9323daf7abe";
+      hash = "sha256-fvIowXJLWnm16LeiSz6EasGypTi1ilG+s/T6+lNLbMQ=";
+    })
+    (fetchpatch {
+      name = "mozbz-1898476-2.patch";
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/a264ff9e9f6f";
+      hash = "sha256-9vkI/Ho4BXvLnoRGdfTzUODcIlA6K3RjbdhZjb/LEz0=";
+    })
+    (fetchpatch {
+      name = "mozbz-1898476-3.patch";
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/eb230ecdf8eb";
+      hash = "sha256-IaLltxf5W1WEzxvbi10wphqXVQPtBiLc2zlk38CIiz4=";
     })
   ]
-  ++ lib.optionals (lib.versionOlder version "122") [
-    ./bindgen-0.64-clang-18.patch
-  ]
-  ++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [
-    ./122.0-libvpx-mozbz1875201.patch
-  ]
+  ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch  ]
   ++ lib.optionals (lib.versionOlder version "123") [
     (fetchpatch {
       name = "clang-18.patch";
@@ -267,9 +271,6 @@ buildStdenv.mkDerivation {
       hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
     })
   ]
-  ++ lib.optionals (lib.versionOlder version "115.12") [
-    ./rust-1.78.patch
-  ]
   ++ extraPatches;
 
   postPatch = ''

pkgs/applications/networking/cluster/pluto/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.20";
+  version = "5.20.1";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-OoWeyt1lZ3ivo1uSOTwzGJranf6fGYJGjHXIDItg6yc=";
+    hash = "sha256-M0top2czb9iPbA0JxDZwRrNT5sEUi8E3uTB+eCN4RDY=";
   };
 
-  vendorHash = "sha256-AVFMUO/5OUqO4zPH53FHWldfRrmHK3Oj+De78m+yhpE=";
+  vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak=";
 
   ldflags = [
     "-w" "-s"

pkgs/applications/networking/cluster/terraform/default.nix

@@ -165,9 +165,9 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.9.4";
-    hash = "sha256-RCjeKdxrnCmOtUQfBC5/gM+FB6YHbc/V1cmVxNCVf20=";
-    vendorHash = "sha256-FnjCJilPuhYs/JTuEyb4Grn4t40Ox2uqwQf2h9B227Q=";
+    version = "1.9.5";
+    hash = "sha256-fWyqBDvuBrwqgwi1WU4RsdWssKmaClNyP5zyUf+JmTU=";
+    vendorHash = "sha256-CAZUs1hxjHXcAteuVJZmkqwnMYUoIau++IFdD1b7yYY=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
       inherit plugins;

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

@@ -8,20 +8,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "iamb";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "ulyssa";
     repo = "iamb";
     rev = "v${version}";
-    hash = "sha256-UYc7iphpzqZPwhOn/ia7XvnnlIUvM7nSFBz67ZkXmNs=";
+    hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg=";
   };
 
-  cargoHash = "sha256-982FdK6ej3Bbg4R9e43VSwlni837ZK4rkMkoeYMyW8E=";
+  cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.AppKit
+    darwin.apple_sdk.frameworks.Cocoa
   ];
 
   postInstall = ''

pkgs/applications/networking/irc/weechat/default.nix

@@ -36,14 +36,14 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "4.3.6";
+      version = "4.4.1";
       pname = "weechat";
 
       hardeningEnable = [ "pie" ];
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-        hash = "sha256-h4sGORUy3cQPS0lUYqIX68OZJeLq3+TfhOdqMxNkfJk=";
+        hash = "sha256-5d4L0UwqV6UFgTqDw9NyZI0tlXPccoNoV78ocXMmk2w=";
       };
 
       # Why is this needed? https://github.com/weechat/weechat/issues/2031

pkgs/applications/networking/mullvad/libwg.nix

@@ -12,7 +12,7 @@ buildGoModule {
 
   sourceRoot = "${mullvad.src.name}/wireguard/libwg";
 
-  vendorHash = "sha256-2hb6+OHifm/oAgXCiYf+nwtNDDZNWR6lAbLSGT3AG0I=";
+  vendorHash = "sha256-gaU3na3sjzM6lvmsGRkuGtV2AHvkl6IgzmyGx3R5ZpM=";
 
   # XXX: hack to make the ar archive go to the correct place
   # This is necessary because passing `-o ...` to `ldflags` does not work

pkgs/applications/networking/mullvad/mullvad.nix

@@ -17,23 +17,24 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "mullvad";
-  version = "2024.3";
+  version = "2024.4";
 
   src = fetchFromGitHub {
     owner = "mullvad";
     repo = "mullvadvpn-app";
     rev = version;
-    hash = "sha256-poQtE+XIlPcL9viAau+70xWx1fPrTXJXMcuPvXlqjZg=";
+    hash = "sha256-d7poR1NnvqaPutXLFizpQnyipl+38N1Qe2zVXeV7v1Q=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg=";
       "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
     };
   };
 
+  checkFlags = "--skip=version_check";
+
   nativeBuildInputs = [
     pkg-config
     protobuf

pkgs/applications/networking/sync/wdt/default.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "wdt";
-  version = "1.27.1612021-unstable-2024-06-26";
+  version = "1.27.1612021-unstable-2024-08-14";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wdt";
-    rev = "aab22d7284dbc470df36146a8885335760b47b0c";
-    sha256 = "sha256-nWdZfbwAIwyaOMsAE94MrkHHRmwrFyFZRmYno+2/5mQ=";
+    rev = "3601f6dd89eea161b059c141fc40418733e82f2f";
+    sha256 = "sha256-YaSKaotN7LzlSQAIGkpTcgpgVQBH6KmH4YiebaMdz/g=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/applications/office/planify/default.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.10.7";
+  version = "4.10.8";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-jGfLbKDhiBpLkO5de5aLBwLw6xBZ+IIsYPDX4/XGPqE=";
+    hash = "sha256-gbwpNlWtJocKQqTFLoroUbXn4FOOA7LO1H/IduEsyrg=";
   };
 
   nativeBuildInputs = [

pkgs/applications/radio/sdrangel/default.nix

@@ -52,13 +52,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdrangel";
-  version = "7.21.4";
+  version = "7.22.0";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GINgI4u87Ns4/5aUWpeJaokb+3Liwjjibr02NGcF10c=";
+    hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE=";
   };
 
   nativeBuildInputs = [

pkgs/applications/science/logic/symbiyosys/default.nix

@@ -1,62 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, bash, python3, yosys
-, yices, boolector, z3, aiger
-}:
-
-stdenv.mkDerivation {
-  pname = "symbiyosys";
-  version = "2021.11.30";
-
-  src = fetchFromGitHub {
-    owner = "YosysHQ";
-    repo  = "SymbiYosys";
-    rev   = "b409b1179e36d2a3fff66c85b7d4e271769a2d9e";
-    hash  = "sha256-S7of2upntiMkSdh4kf1RsrjriS31Eh8iEcVvG36isQg=";
-  };
-
-  buildInputs = [ ];
-  patchPhase = ''
-    patchShebangs .
-
-    # Fix up Yosys imports
-    substituteInPlace sbysrc/sby.py \
-      --replace "##yosys-sys-path##" \
-                "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
-
-    # Fix various executable references
-    substituteInPlace sbysrc/sby_core.py \
-      --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \
-      --replace ', "btormc"'             ', "${boolector}/bin/btormc"' \
-      --replace ', "aigbmc"'             ', "${aiger}/bin/aigbmc"'
-
-    substituteInPlace sbysrc/sby_core.py \
-      --replace '##yosys-program-prefix##' '"${yosys}/bin/"'
-
-    substituteInPlace sbysrc/sby.py \
-      --replace '/usr/bin/env python3' '${python3}/bin/python'
-  '';
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/yosys/python3
-
-    cp sbysrc/sby_*.py $out/share/yosys/python3/
-    cp sbysrc/sby.py $out/bin/sby
-
-    chmod +x $out/bin/sby
-  '';
-
-  doCheck = false; # not all provers are yet packaged...
-  nativeCheckInputs = [ python3 yosys boolector yices z3 aiger ];
-  checkPhase = "make test";
-
-  meta = {
-    description = "Tooling for Yosys-based verification flows";
-    homepage    = "https://symbiyosys.readthedocs.io/";
-    license     = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ thoughtpolice ];
-    mainProgram = "sby";
-    platforms   = lib.platforms.all;
-  };
-}

pkgs/applications/version-management/gh/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.54.0";
+  version = "2.55.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-wcEQcIDr+isuwDbwbgjGsioDjxAPfosu4vuJhro91DQ=";
+    hash = "sha256-Ty74t+FwyRHed4V/OoJkq/4It5KpLLa4Xxti+93rjCs=";
   };
 
-  vendorHash = "sha256-JZ30OXn5XdwLhz02fZgZltLw4FIM2wTlXzRgN8mhPjQ=";
+  vendorHash = "sha256-K4KKgfjbopYEMJZCDt2x9l6EO7MwVBZ2HrdzvF/oetw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/video/dvdstyler/default.nix

@@ -7,7 +7,7 @@
 , docbook-xsl-nons
 , dvdauthor
 , dvdplusrwtools
-, ffmpeg_4
+, ffmpeg_7
 , flex
 , fontconfig
 , gettext
@@ -32,18 +32,13 @@ let
   inherit (lib) optionals makeBinPath;
 in stdenv.mkDerivation rec {
   pname = "dvdstyler";
-  version = "3.2.1";
+  version = "3.3b4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2";
-    sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg=";
+    url = "mirror://sourceforge/project/dvdstyler/dvdstyler-devel/${version}/DVDStyler-${version}.tar.bz2";
+    hash = "sha256-JCaKcE7jkTxT57KKePs8gmgQedoOcP5NEQ2FwIDS2Ho=";
   };
 
-  patches = [
-    # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/
-    ./wxgtk32.patch
-  ];
-
   nativeBuildInputs = [
     bison
     docbook_xml_dtd_412
@@ -60,7 +55,7 @@ in stdenv.mkDerivation rec {
     cdrtools
     dvdauthor
     dvdplusrwtools
-    ffmpeg_4
+    ffmpeg_7
     fontconfig
     glib
     libexif

pkgs/applications/video/dvdstyler/wxgtk32.patch

@@ -1,12 +0,0 @@
---- a/wxVillaLib/PropDlg.cpp
-+++ b/wxVillaLib/PropDlg.cpp
-@@ -12,7 +12,9 @@
- #include "utils.h"
- #include <wx/fontdlg.h>
- #include <wx/colordlg.h>
-+#ifdef __WXMSW__
- #include <wx/generic/colrdlgg.h>
-+#endif
- #include <wx/filedlg.h>
- #include <wx/dirdlg.h>
- #include <wx/grid.h>

pkgs/applications/video/obs-studio/default.nix

@@ -63,13 +63,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "30.2.2";
+  version = "30.2.3";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = finalAttrs.version;
-    hash = "sha256-yMtLN/86+3wuNR+gGhsaxN4oGIC21bAcjbQfyTuXIYc=";
+    hash = "sha256-4bAzW62xX9apKOAJyn3iys1bFdHj4re2reMZtlGsn5s=";
     fetchSubmodules = true;
   };
 

pkgs/applications/virtualization/quickgui/default.nix

@@ -1,67 +1,56 @@
-{ stdenvNoCC
+{ fetchFromGitHub
+, makeDesktopItem
+, copyDesktopItems
 , lib
-, fetchurl
-, autoPatchelfHook
-, dpkg
-, wrapGAppsHook3
+, flutter
 , quickemu
 , zenity
 }:
-
-stdenvNoCC.mkDerivation rec {
+flutter.buildFlutterApplication rec {
   pname = "quickgui";
-  version = "1.2.8";
-
-  src = fetchurl {
-    url = "https://github.com/quickemu-project/quickgui/releases/download/v${version}/quickgui_${version}-1_lunar1.0_amd64.deb";
-    sha256 = "sha256-crnV7OWH5UbkMM/TxTIOlXmvqBgjFmQG7RxameMOjH0=";
+  version = "1.2.10";
+  src = fetchFromGitHub {
+    owner = "quickemu-project";
+    repo = "quickgui";
+    rev = version;
+    hash = "sha256-M2Qy66RqsjXg7ZpHwaXCN8qXRIsisnIyaENx3KqmUfQ=";
   };
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-    dpkg
-    wrapGAppsHook3
-  ];
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  buildInputs = [
-    quickemu
-    zenity
-  ];
+  gitHashes = {
+    window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
+  };
 
-  strictDeps = true;
+  extraWrapProgramArgs = "--prefix PATH : ${lib.makeBinPath [ quickemu zenity ]}";
 
-  unpackCmd = "dpkg-deb -x $curSrc source";
-
-  installPhase = ''
-    runHook preInstall
-
-    mv usr $out
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]}
-    )
-  '';
+  nativeBuildInputs = [ copyDesktopItems ];
 
   postFixup = ''
-    substituteInPlace $out/share/applications/quickgui.desktop \
-      --replace "/usr" $out
-
-    # quickgui PR 88
-    echo "Categories=System;" >> $out/share/applications/quickgui.desktop
+    for SIZE in 16 32 48 64 128 256 512; do
+      mkdir -p $out/share/icons/hicolor/$SIZEx$SIZE/apps/
+      cp -av assets/resources/quickgui_$SIZE.png $out/share/icons/hicolor/$SIZEx$SIZE/apps/quickgui.png
+    done
   '';
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "quickgui";
+      exec = "quickgui";
+      icon = "quickgui";
+      desktopName = "Quickgui";
+      comment = "An elegant virtual machine manager for the desktop";
+      categories = [ "Development" "System" ];
+    })
+  ];
+
   meta = with lib; {
-    description = "Flutter frontend for quickemu";
+    description = "Elegant virtual machine manager for the desktop";
     homepage = "https://github.com/quickemu-project/quickgui";
-    changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}";
+    changelog = "https://github.com/quickemu-project/quickgui/releases/";
     license = licenses.mit;
-    maintainers = with maintainers; [ heyimnova ];
+    maintainers = with maintainers; [ flexiondotorg heyimnova ];
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = [ sourceTypes.binaryNativeCode ];
     mainProgram = "quickgui";
   };
 }

pkgs/applications/virtualization/xen/4.16/0001-xen-fig-geneneration-4.16.patch

@@ -1,16 +0,0 @@
-Remove a pipe that was causing SIGPIPE
-issues on overloaded Hydra machines.
-
-diff --git a/docs/figs/Makefile b/docs/figs/Makefile
-index e128a4364f..943f745dda 100644
---- a/docs/figs/Makefile
-+++ b/docs/figs/Makefile
-@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
- all: $(TARGETS)
- 
- %.png:	%.fig
--	$(FIG2DEV) -L png $< >$@.tmp
-+	$(FIG2DEV) -L png $< $@.tmp
- 	mv -f $@.tmp $@
- 
- clean:

pkgs/applications/virtualization/xen/4.16/default.nix

@@ -7,19 +7,23 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
 
-  upstreamPatchList = lib.lists.flatten [
-    upstreamPatches.XSA_458
-    upstreamPatches.XSA_460
-    upstreamPatches.XSA_461
-  ];
+  upstreamPatchList = lib.lists.flatten (
+    with upstreamPatches;
+    [
+      XSA_458
+      XSA_460
+      XSA_461
+    ]
+  );
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
+  pname = "xen";
   branch = "4.16";
   version = "4.16.6";
   latest = false;
@@ -27,10 +31,7 @@ callPackage (import ../generic.nix {
     xen = {
       rev = "4b33780de790bd438dd7cbb6143b410d94f0f049";
       hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA=";
-      patches = [
-        ./0000-xen-ipxe-src-4.16.patch
-        ./0001-xen-fig-geneneration-4.16.patch
-      ] ++ upstreamPatchList;
+      patches = [ ] ++ upstreamPatchList;
     };
     qemu = {
       rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3";

pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch

@@ -1,27 +0,0 @@
-Hack to make etherboot use pre-fetched iPXE.
-
-diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
-index ed9e11305f..979a3acea8 100644
---- a/tools/firmware/etherboot/Makefile
-+++ b/tools/firmware/etherboot/Makefile
-@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
-
- D=ipxe
- T=ipxe.tar.gz
-+G=ipxe.git
-
- ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
- ROM = $D/src/bin/ipxe.bin
-@@ -41,9 +42,9 @@ $T:
- 	fi
- 	mv _$T $T
-
--$D/src/arch/i386/Makefile: $T Config
--	rm -rf $D
--	gzip -dc $T | tar xf -
-+$D/src/arch/i386/Makefile: $G Config
-+	mkdir $D
-+	cp -a $G/* $D
- 	for i in $$(cat patches/series) ; do                 \
- 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
- 	done

pkgs/applications/virtualization/xen/4.17/0001-xen-fig-geneneration-4.17.patch

@@ -1,16 +0,0 @@
-Remove a pipe that was causing SIGPIPE
-issues on overloaded Hydra machines.
-
-diff --git a/docs/figs/Makefile b/docs/figs/Makefile
-index e128a4364f..943f745dda 100644
---- a/docs/figs/Makefile
-+++ b/docs/figs/Makefile
-@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
- all: $(TARGETS)
- 
- %.png:	%.fig
--	$(FIG2DEV) -L png $< >$@.tmp
-+	$(FIG2DEV) -L png $< $@.tmp
- 	mv -f $@.tmp $@
- 
- clean:

pkgs/applications/virtualization/xen/4.17/default.nix

@@ -7,20 +7,24 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
 
-  upstreamPatchList = lib.lists.flatten [
-    upstreamPatches.QUBES_REPRODUCIBLE_BUILDS
-    upstreamPatches.XSA_458
-    upstreamPatches.XSA_460
-    upstreamPatches.XSA_461
-  ];
+  upstreamPatchList = lib.lists.flatten (
+    with upstreamPatches;
+    [
+      QUBES_REPRODUCIBLE_BUILDS
+      XSA_458
+      XSA_460
+      XSA_461
+    ]
+  );
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
+  pname = "xen";
   branch = "4.17";
   version = "4.17.4";
   latest = false;
@@ -28,10 +32,7 @@ callPackage (import ../generic.nix {
     xen = {
       rev = "d530627aaa9b6e03c7f911434bb342fca3d13300";
       hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo=";
-      patches = [
-        ./0000-xen-ipxe-src-4.17.patch
-        ./0001-xen-fig-geneneration-4.17.patch
-      ] ++ upstreamPatchList;
+      patches = [ ] ++ upstreamPatchList;
     };
     qemu = {
       rev = "ffb451126550b22b43b62fb8731a0d78e3376c03";

pkgs/applications/virtualization/xen/4.18/0000-xen-ipxe-src-4.18.patch

@@ -1,27 +0,0 @@
-Hack to make etherboot use pre-fetched iPXE.
-
-diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
-index ed9e11305f..979a3acea8 100644
---- a/tools/firmware/etherboot/Makefile
-+++ b/tools/firmware/etherboot/Makefile
-@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
-
- D=ipxe
- T=ipxe.tar.gz
-+G=ipxe.git
-
- ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
- ROM = $D/src/bin/ipxe.bin
-@@ -41,9 +42,9 @@ $T:
- 	fi
- 	mv _$T $T
-
--$D/src/arch/i386/Makefile: $T Config
--	rm -rf $D
--	gzip -dc $T | tar xf -
-+$D/src/arch/i386/Makefile: $G Config
-+	mkdir $D
-+	cp -a $G/* $D
- 	for i in $$(cat patches/series) ; do                 \
- 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
- 	done

pkgs/applications/virtualization/xen/4.18/0001-xen-fig-geneneration-4.18.patch

@@ -1,16 +0,0 @@
-Remove a pipe that was causing SIGPIPE
-issues on overloaded Hydra machines.
-
-diff --git a/docs/figs/Makefile b/docs/figs/Makefile
-index e128a4364f..943f745dda 100644
---- a/docs/figs/Makefile
-+++ b/docs/figs/Makefile
-@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
- all: $(TARGETS)
- 
- %.png:	%.fig
--	$(FIG2DEV) -L png $< >$@.tmp
-+	$(FIG2DEV) -L png $< $@.tmp
- 	mv -f $@.tmp $@
- 
- clean:

pkgs/applications/virtualization/xen/4.18/default.nix

@@ -7,20 +7,24 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
 
-  upstreamPatchList = lib.lists.flatten [
-    upstreamPatches.QUBES_REPRODUCIBLE_BUILDS
-    upstreamPatches.XSA_458
-    upstreamPatches.XSA_460
-    upstreamPatches.XSA_461
-  ];
+  upstreamPatchList = lib.lists.flatten (
+    with upstreamPatches;
+    [
+      QUBES_REPRODUCIBLE_BUILDS
+      XSA_458
+      XSA_460
+      XSA_461
+    ]
+  );
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
+  pname = "xen";
   branch = "4.18";
   version = "4.18.2";
   latest = false;
@@ -28,10 +32,7 @@ callPackage (import ../generic.nix {
     xen = {
       rev = "d152a0424677d8b78e00ed1270a583c5dafff16f";
       hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY=";
-      patches = [
-        ./0000-xen-ipxe-src-4.18.patch
-        ./0001-xen-fig-geneneration-4.18.patch
-      ] ++ upstreamPatchList;
+      patches = [ ] ++ upstreamPatchList;
     };
     qemu = {
       rev = "0df9387c8983e1b1e72d8c574356f572342c03e6";

pkgs/applications/virtualization/xen/4.19/0000-xen-ipxe-src-4.19.patch

@@ -1,27 +0,0 @@
-Hack to make etherboot use pre-fetched iPXE.
-
-diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
-index ed9e11305f..979a3acea8 100644
---- a/tools/firmware/etherboot/Makefile
-+++ b/tools/firmware/etherboot/Makefile
-@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
-
- D=ipxe
- T=ipxe.tar.gz
-+G=ipxe.git
-
- ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
- ROM = $D/src/bin/ipxe.bin
-@@ -41,9 +42,9 @@ $T:
- 	fi
- 	mv _$T $T
-
--$D/src/arch/i386/Makefile: $T Config
--	rm -rf $D
--	gzip -dc $T | tar xf -
-+$D/src/arch/i386/Makefile: $G Config
-+	mkdir $D
-+	cp -a $G/* $D
- 	for i in $$(cat patches/series) ; do                 \
- 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
- 	done

pkgs/applications/virtualization/xen/4.19/0001-xen-fig-geneneration-4.19.patch

@@ -1,16 +0,0 @@
-Remove a pipe that was causing SIGPIPE
-issues on overloaded Hydra machines.
-
-diff --git a/docs/figs/Makefile b/docs/figs/Makefile
-index e128a4364f..943f745dda 100644
---- a/docs/figs/Makefile
-+++ b/docs/figs/Makefile
-@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
- all: $(TARGETS)
- 
- %.png:	%.fig
--	$(FIG2DEV) -L png $< >$@.tmp
-+	$(FIG2DEV) -L png $< $@.tmp
- 	mv -f $@.tmp $@
- 
- clean: