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

Merge staging-next into staging

parents 50f7da39 6b6c1bc5

nixos/modules/services/desktops/system76-scheduler.nix

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ in { 
    };

  };



  config = {

  config = mkIf cfg.enable {

    environment.systemPackages = [ cfg.package ];

    services.dbus.packages = [ cfg.package ];

pkgs/applications/blockchains/lnd/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ 


buildGoModule rec {

  pname = "lnd";

  version = "0.15.5-beta";

  version = "0.16.1-beta";



  src = fetchFromGitHub {

    owner = "lightningnetwork";

    repo = "lnd";

    rev = "v${version}";

    sha256 = "sha256-DZElTLZHpmW/jqZc6jh/Z0+7mtFgY/X/T+srS+cDHik=";

    sha256 = "sha256-m592dRYAKKkeQa4SOP+8pTHuY07hSMICdyAcAOKn3+w=";

  };



  vendorSha256 = "sha256-+jHoZymocBga5j9UI3wmI1TIBwiM9I6YEZO3IDGAllU=";

  vendorSha256 = "sha256-yY6H2K9B9ko5bVdmsGPDJkxPXpfAs0O2fuaZryrcuc0=";



  subPackages = [ "cmd/lncli" "cmd/lnd" ];

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix

+265 −265

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

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


  thunderbird-102 = (buildMozillaMach rec {

    pname = "thunderbird";

    version = "102.10.0";

    version = "102.10.1";

    application = "comm/mail";

    applicationName = "Mozilla Thunderbird";

    binaryName = pname;

    src = fetchurl {

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

      sha512 = "08d7908cbef48cffac2fbab857f8aceb9a7abd7c72d5e9c9dae8d3a3871846b6f0cf562c5b646ad27a0d79ac04b8605b123c5e1929f92afee4501344d1fbc5cf";

      sha512 = "dfe62f0d8b7750e54793e32e78fb0784c7c8e39b95dc4c03ac393e51195ec8883edc2536afc2cf2011005312a40805f7dc617c90bfb4a77d22393f1d9b719b23";

    };

    extraPatches = [

      # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

pkgs/data/misc/fedora-backgrounds/default.nix

+33 −0
Original line number Diff line number Diff line
@@ -31,4 +31,37 @@ in { 
    patches = [ ./f34-fix-xfce-path.patch ];

  };



  f35 = fedoraBackground rec {

    version = "35.0.1";

    src = fetchurl {

      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";

      hash = "sha256-7t78sQ0BIkzgJ+phO55Bomyz02d8Vx1LAtSkjX8ppgE=";

    };

    # Fix broken symlinks in the Xfce background directory.

    patches = [ ./f35-fix-xfce-path.patch ];

  };



  f36 = fedoraBackground rec {

    version = "36.1.2";

    src = fetchurl {

      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";

      hash = "sha256-DZr1YHltojl02X/3sErqB/29JBDy/7lDZKnHD+KouHc=";

    };

  };



  f37 = fedoraBackground rec {

    version = "37.0.5";

    src = fetchurl {

      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";

      hash = "sha256-bkjxJDDU0dZURKIK1sd+EOnPt9vvJ5HqHkc6OhPBBn0=";

    };

  };



  f38 = fedoraBackground rec {

    version = "38.1.1";

    src = fetchurl {

      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";

      hash = "sha256-YSNP7GhS5i5mJDsa4UwsXJm8Tv43r9JxrcYIbkXQKm4=";

    };

  };

}