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

Merge master into staging-next

parents 2f665c34 d5c01181

nixos/modules/services/web-apps/tt-rss.nix

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ let 
    services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {

      ${poolName} = {

        inherit (cfg) user;

        phpPackage = pkgs.php80;

        phpPackage = pkgs.php81;

        settings = mapAttrs (name: mkDefault) {

          "listen.owner" = "nginx";

          "listen.group" = "nginx";

nixos/tests/headscale.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
    machine.wait_for_open_port(8080)

    # Test basic funcionality

    machine.succeed("headscale namespaces create test")

    machine.succeed("headscale preauthkeys -n test create")

    machine.succeed("headscale preauthkeys -u test create")

  '';

})

package-lock.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/package-lock.json b/package-lock.json

index 5a84fbe7..562051c7 100644

--- a/package-lock.json

+++ b/package-lock.json

@@ -12425,7 +12425,7 @@

     "node_modules/pkg-up/node_modules/path-exists": {

       "version": "3.0.0",

       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",

-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",

+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",

       "dev": true,

       "engines": {

         "node": ">=4"

pkgs/applications/audio/midas/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 


  installPhase = ''

    mkdir -p $out/bin

    cp ${pname} $out/bin

    cp ${type}-Edit $out/bin/${pname}

  '';

  preFixup = let

    # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation

pkgs/applications/audio/midas/m32edit.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec { 
  brand = "Midas";

  type = "M32";

  version = "4.1";

  url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";

  url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_${version}.tar.gz";

  sha256 = "0aqhdrxqa49liyvbbw5x32kwk0h1spzvmizmdxklrfs64vvr9bvh";

  homepage = "https://midasconsoles.com/midas/product?modelCode=P0B3I";

})