Unverified Commit 7e097bd9 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents bff70f31 a5d79d36

nixos/modules/services/desktop-managers/pantheon.nix

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ in 
            elementary-files

            elementary-mail

            elementary-maps

            elementary-monitor

            elementary-music

            elementary-photos

            elementary-screenshot

pkgs/applications/misc/ArchiSteamFarm/default.nix

+7 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ buildDotnetModule rec { 


  doCheck = true;



  installPhase = ''

  preInstall = ''

    dotnetProjectFiles=(ArchiSteamFarm)



    # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.
@@ -71,14 +71,15 @@ buildDotnetModule rec { 
      --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}'

      --set "ASF_PATH" "~/.config/archisteamfarm"

    )

  '';



    dotnetInstallPhase



  postInstall = ''

    buildPlugin() {

      echo "Publishing plugin $1"

      dotnetProjectFiles=("$1")

      dotnetInstallPath="$out/lib/ArchiSteamFarm/plugins/$1"

      dotnetInstallPhase

      dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \

        --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \

        --no-restore --no-build --runtime $dotnetRuntimeIds \

        $dotnetFlags $dotnetInstallFlags

    }



  ''

pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
buildMozillaMach rec {

  pname = "firefox-beta";

  binaryName = "firefox-beta";

  version = "144.0b6";

  version = "144.0b9";

  applicationName = "Firefox Beta";

  src = fetchurl {

    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "b0e8398513db7de1f16412bedba519b3d307022c0eadc1c114f3ad247ac368c027bd968f98a38c41076c1e6e06c96ec3821230d470f4f804e51ff09ede84a618";

    sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7";

  };



  meta = {

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
buildMozillaMach rec {

  pname = "firefox-devedition";

  binaryName = "firefox-devedition";

  version = "144.0b6";

  version = "144.0b9";

  applicationName = "Firefox Developer Edition";

  requireSigning = false;

  branding = "browser/branding/aurora";

  src = fetchurl {

    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "08a42497eef413f097c4c8191ef2d0e4e7a6f39a63744d51352aaa4016ed8877da4eace81bfc85e97f8e4f17c7ea9225fe11c94e70d6e4c9f4ec69cd43aeecc4";

    sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247";

  };



  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

pkgs/by-name/pl/planify/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 


stdenv.mkDerivation rec {

  pname = "planify";

  version = "4.14.1";

  version = "4.15.1";



  src = fetchFromGitHub {

    owner = "alainm23";

    repo = "planify";

    rev = version;

    hash = "sha256-4N+2DWOriuxQJX5hfDmGy066ypSn1HkkildBIJjOXhc=";

    tag = "v${version}";

    hash = "sha256-b0I6UXdE0EqRP9FrqRyf1CscYSlYjFPcmIgkMjCLWMc=";

  };



  nativeBuildInputs = [