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

Merge master into staging-next

parents aa2334f4 35f64dd4

ci/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza 
/nixos/modules/virtualisation/qemu-vm.nix           @raitobezarius



# ACME

/nixos/modules/security/acme                @arianvp @flokli @aanderse @emilazy # no merge permission: @m1cr0man

/nixos/modules/security/acme                @NixOS/acme



# Systemd

/nixos/modules/system/boot/systemd.nix      @NixOS/systemd

nixos/modules/installer/netboot/netboot.nix

+1 −6
Original line number Diff line number Diff line
@@ -9,12 +9,7 @@ with lib; 
  options = {



    netboot.squashfsCompression = mkOption {

      default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% "

                + lib.optionalString isx86 "-Xbcj x86"

                # Untested but should also reduce size for these platforms

                + lib.optionalString isAarch "-Xbcj arm"

                + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"

                + lib.optionalString (isSparc) "-Xbcj sparc";

      default = "zstd -Xcompression-level 19";

      description = ''

        Compression settings to use for the squashfs nix store.

      '';

nixos/modules/services/mail/stalwart-mail.nix

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ in { 
      ) {

        webadmin = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip";

      };

      webadmin.path = "/var/cache/stalwart-mail";

    };



    # This service stores a potentially large amount of data.
@@ -117,6 +118,7 @@ in { 
          StandardOutput = "journal";

          StandardError = "journal";



          CacheDirectory = "stalwart-mail";

          StateDirectory = "stalwart-mail";



          # Bind standard privileged ports

pkgs/applications/editors/vscode/vscode.nix

+8 −8
Original line number Diff line number Diff line
@@ -30,21 +30,21 @@ let 
  archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";



  sha256 = {

    x86_64-linux = "11d9qqfb5kh5zsc7xd6h5xsywacir5z08l2snj0cz2cb0nji9xhj";

    x86_64-darwin = "0rbwvvakh1b5iqca49hcmqlfq4g0j067rrphrh0yx7wdyr6kmwg2";

    aarch64-linux = "0vrvcy1p5lrdy2lww42w32vr79075vpkwj4q8wfqzd7x72vmhfci";

    aarch64-darwin = "03wccm854v9va50x91kp00a16r483zpndayhlwy1fm4n0wdy6iw8";

    armv7l-linux = "0b9r78mz5djvv6n82isn2jqb4bwa41hqyxxc9arhrpvpj5w65rla";

    x86_64-linux = "0w452wnzyb4wmr2qqq55dhfb1jd0zqmwf65fbmxdz7jn1jimjjrn";

    x86_64-darwin = "1b333snvrw8khryhi5scfhhkg43m3b6ds3nvs24nbvx8k7h69hmm";

    aarch64-linux = "12p5cdva14s9sfgyrzg3nylpmgdnmfavwx3xxxmblzq1gcal2g6i";

    aarch64-darwin = "1l59fcdvynkl5kyz9bn31mld6pi89nynk1zw645rczjm940pac7p";

    armv7l-linux = "07ylija6chg6jc2zcavdr9yw1laniigw57f2gilyjynv1cgjm76r";

  }.${system} or throwSystem;

in

  callPackage ./generic.nix rec {

    # Please backport all compatible updates to the stable release.

    # This is important for the extension ecosystem.

    version = "1.94.1";

    version = "1.94.2";

    pname = "vscode" + lib.optionalString isInsiders "-insiders";



    # This is used for VS Code - Remote SSH test

    rev = "e10f2369d0d9614a452462f2e01cdc4aa9486296";

    rev = "384ff7382de624fb94dbaf6da11977bba1ecd427";



    executableName = "code" + lib.optionalString isInsiders "-insiders";

    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in 
      src = fetchurl {

        name = "vscode-server-${rev}.tar.gz";

        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";

        sha256 = "094klvp32475f6rsapxkhgsm8cmjmpq4qp3lx2b1vgf3xzl7j9nw";

        sha256 = "1mj9fg76b9x9r6ql21hbckpni179vfa9j8fiah9rd6ih7sb72048";

      };

    };

pkgs/applications/video/jellyfin-media-player/default.nix

+1 −6
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ mkDerivation rec { 
  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

    mkdir -p $out/bin $out/Applications

    mv "$out/Jellyfin Media Player.app" $out/Applications



    # move web-client resources

    mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/"

    rmdir $out/Resources



    ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer

  '';
@@ -89,7 +84,7 @@ mkDerivation rec { 
    homepage = "https://github.com/jellyfin/jellyfin-media-player";

    description = "Jellyfin Desktop Client based on Plex Media Player";

    license = with licenses; [ gpl2Only mit ];

    platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];

    platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];

    maintainers = with maintainers; [ jojosch kranzes ];

    mainProgram = "jellyfinmediaplayer";

  };