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

Merge staging-next into staging

parents 1d5f427e f29cec44

nixos/modules/services/monitoring/prometheus/sachet.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ in 
      configuration = mkOption {

        type = types.nullOr types.attrs;

        default = null;

        example = literalExample ''

        example = literalExpression ''

          {

            providers = {

              twilio = {

pkgs/applications/audio/mmtc/default.nix

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


rustPlatform.buildRustPackage rec {

  pname = "mmtc";

  version = "0.2.14";

  version = "0.2.15";



  src = fetchFromGitHub {

    owner = "figsoda";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA=";

    sha256 = "sha256-GQ1SoZE74o8fsXHVdjdEMbdUeefyPb4FXxidcHCy180=";

  };



  cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0=";

  cargoSha256 = "sha256-2IcOwjYTRl2tCB/YAuDACpgaRKZ/21IKWpVs+koYH3k=";



  nativeBuildInputs = [ installShellFiles ];

pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix

+72 −42
Original line number Diff line number Diff line
@@ -643,10 +643,10 @@ 
      elpaBuild {

        pname = "code-cells";

        ename = "code-cells";

        version = "0.2";

        version = "0.3";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/code-cells-0.2.tar";

          sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk";

          url = "https://elpa.gnu.org/packages/code-cells-0.3.tar";

          sha256 = "0i5n9xqpf0www553in3xibc93vw9x6659zaqnvr5rkad95gz456x";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -673,10 +673,10 @@ 
      elpaBuild {

        pname = "comint-mime";

        ename = "comint-mime";

        version = "0.1";

        version = "0.2";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/comint-mime-0.1.tar";

          sha256 = "1ak0ylqdslsb6a64dkpvappdbqnl1i8lc17jla9pqqs7r16sh3n0";

          url = "https://elpa.gnu.org/packages/comint-mime-0.2.tar";

          sha256 = "06sxsrmxr2l63cslaqmsc03birkcsqbnwbjkhn0f8y3afb4pafkf";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -1086,10 +1086,10 @@ 
      elpaBuild {

        pname = "detached";

        ename = "detached";

        version = "0.8.1";

        version = "0.9.0";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/detached-0.8.1.tar";

          sha256 = "03riybjk2yls8wjkp1sqd30p0jpvrlz3qlj8r04cx7s1nn1kn9g3";

          url = "https://elpa.gnu.org/packages/detached-0.9.0.tar";

          sha256 = "1br1s2kwb5ji4ad5m89grpyvjffhc3xxydgja9q796cx6zwrnavp";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -1401,10 +1401,10 @@ 
      elpaBuild {

        pname = "ef-themes";

        ename = "ef-themes";

        version = "0.4.2";

        version = "0.5.0";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/ef-themes-0.4.2.tar";

          sha256 = "0ik9kzdv5r1q7hw81nh3raiychpmwi61034y12pqvbq24njp0y72";

          url = "https://elpa.gnu.org/packages/ef-themes-0.5.0.tar";

          sha256 = "1k73q48vg7vyjmnvizinwn9if481ajq63ps2iwb01f1brrhmbf5v";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -1563,10 +1563,10 @@ 
      elpaBuild {

        pname = "ement";

        ename = "ement";

        version = "0.1.2";

        version = "0.2";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/ement-0.1.2.tar";

          sha256 = "1n5k3rcgdq625b9fjhl53nl5zbis4dw0d00h4dk16m61nk98ra2l";

          url = "https://elpa.gnu.org/packages/ement-0.2.tar";

          sha256 = "1kxbkqiy5c9pxk4f5k3d3j2q3qn7cg8f21zpgds9s8fd6ax0arcf";

        };

        packageRequires = [

          emacs
@@ -1806,10 +1806,10 @@ 
      elpaBuild {

        pname = "flymake-proselint";

        ename = "flymake-proselint";

        version = "0.2.3";

        version = "0.3.0";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.3.tar";

          sha256 = "1384m52zkrlkkkyxg1zimp7dwrxhx8wbvw5ga5vg78yl6cqx9kbc";

          url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar";

          sha256 = "1x1hp06hggywmpbimyw4cg0cyg7g9v39r552ypivq9pvz94kmkp0";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -2255,10 +2255,10 @@ 
      elpaBuild {

        pname = "inspector";

        ename = "inspector";

        version = "0.7";

        version = "0.8";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/inspector-0.7.tar";

          sha256 = "0cwfbg7bx4ni0xadba9v5jbkivz2slqwxcy7q8s3zipb4m578xbk";

          url = "https://elpa.gnu.org/packages/inspector-0.8.tar";

          sha256 = "0yrkm5bh2kczl5f642wx1xlnzry1xrw0yxhpm0hqwjrmgmbdb9m6";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -2285,10 +2285,10 @@ 
      elpaBuild {

        pname = "isearch-mb";

        ename = "isearch-mb";

        version = "0.5";

        version = "0.6";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/isearch-mb-0.5.tar";

          sha256 = "0fah8dmh9jv05i93ccn9dvl7qmfy32vwxqdzkf1v8gr1plsyjyx7";

          url = "https://elpa.gnu.org/packages/isearch-mb-0.6.tar";

          sha256 = "1rbslnnwsikpnb07jhzyk0f83z8i581834hsq3i7gnz3a99wpkx7";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -2680,10 +2680,10 @@ 
      elpaBuild {

        pname = "logos";

        ename = "logos";

        version = "0.5.0";

        version = "0.5.1";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/logos-0.5.0.tar";

          sha256 = "026nzkgkfs96m9qxpng7h0kqvhxfah883pv4i08fz0950lrsxynd";

          url = "https://elpa.gnu.org/packages/logos-0.5.1.tar";

          sha256 = "0154fxl20crl0ay064cbhgsjnj70nq5jz778hzjjy3mnkwzsmbh3";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -3158,6 +3158,21 @@ 
          license = lib.licenses.free;

        };

      }) {};

    notmuch-indicator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:

      elpaBuild {

        pname = "notmuch-indicator";

        ename = "notmuch-indicator";

        version = "0.1.0";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.0.tar";

          sha256 = "11kbl8y95vwww1rsgdd1q5x8i690gi4cxql4n2sg7r5dysdrbyz1";

        };

        packageRequires = [ emacs ];

        meta = {

          homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";

          license = lib.licenses.free;

        };

      }) {};

    ntlm = callPackage ({ elpaBuild, fetchurl, lib }:

      elpaBuild {

        pname = "ntlm";
@@ -3293,6 +3308,21 @@ 
          license = lib.licenses.free;

        };

      }) {};

    org-contacts = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:

      elpaBuild {

        pname = "org-contacts";

        ename = "org-contacts";

        version = "1.1";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar";

          sha256 = "1kzdw9kbnpryxdb9ywh2va4nnjcxw6asszf5n7a95rw2gl6m3l10";

        };

        packageRequires = [ emacs org ];

        meta = {

          homepage = "https://elpa.gnu.org/packages/org-contacts.html";

          license = lib.licenses.free;

        };

      }) {};

    org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }:

      elpaBuild {

        pname = "org-edna";
@@ -3567,10 +3597,10 @@ 
      elpaBuild {

        pname = "persist";

        ename = "persist";

        version = "0.4";

        version = "0.5";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/persist-0.4.tar";

          sha256 = "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q";

          url = "https://elpa.gnu.org/packages/persist-0.5.tar";

          sha256 = "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0";

        };

        packageRequires = [];

        meta = {
@@ -4198,10 +4228,10 @@ 
      elpaBuild {

        pname = "setup";

        ename = "setup";

        version = "1.3.0";

        version = "1.3.2";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/setup-1.3.0.tar";

          sha256 = "0r13ry73jm31j8fq7v1sh0k113fr4blfkiz85696bdpah2pnca87";

          url = "https://elpa.gnu.org/packages/setup-1.3.2.tar";

          sha256 = "1sr514w4mn0fbdawjb5p0fd6i6q2zi9737rbwcgakb1l9cqvb5qy";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -4637,10 +4667,10 @@ 
      elpaBuild {

        pname = "taxy";

        ename = "taxy";

        version = "0.10";

        version = "0.10.1";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/taxy-0.10.tar";

          sha256 = "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3";

          url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar";

          sha256 = "05czw8fkifb25rwl99dmncr1g0rjfx1bqijl7igqs9j6h9ia2xvg";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -5107,10 +5137,10 @@ 
      elpaBuild {

        pname = "vertico";

        ename = "vertico";

        version = "0.26";

        version = "0.27";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/vertico-0.26.tar";

          sha256 = "070dkw7ii5lfg4m0bwl9blbyq3rgqs212my142ri69ig1fz9x5ad";

          url = "https://elpa.gnu.org/packages/vertico-0.27.tar";

          sha256 = "0yf02xwv0zx2pwb7c97k7qbbvmkripb1pb4mn16rvs07a9r217hz";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -5450,10 +5480,10 @@ 
      elpaBuild {

        pname = "xref";

        ename = "xref";

        version = "1.5.0";

        version = "1.5.1";

        src = fetchurl {

          url = "https://elpa.gnu.org/packages/xref-1.5.0.tar";

          sha256 = "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d";

          url = "https://elpa.gnu.org/packages/xref-1.5.1.tar";

          sha256 = "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna";

        };

        packageRequires = [ emacs ];

        meta = {

pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix

+31 −17
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ 
      elpaBuild {

        pname = "annotate";

        ename = "annotate";

        version = "1.7.1";

        version = "1.7.2";

        src = fetchurl {

          url = "https://elpa.nongnu.org/nongnu/annotate-1.7.1.tar";

          sha256 = "0jyzx5z10mv9b134jz4hkp1mbc9f1ki794cr5na9zwvpd9q3j9iy";

          url = "https://elpa.nongnu.org/nongnu/annotate-1.7.2.tar";

          sha256 = "0vdpv8k1cvkn3cvsnxqv299gvp470ga2pgmfvdqi7k1vzypgpp57";

        };

        packageRequires = [];

        meta = {
@@ -199,10 +199,10 @@ 
      elpaBuild {

        pname = "boxquote";

        ename = "boxquote";

        version = "2.2";

        version = "2.3";

        src = fetchurl {

          url = "https://elpa.nongnu.org/nongnu/boxquote-2.2.tar";

          sha256 = "0vcqm78b5fsizkn2xalnzmdci5m02yxxypcr9q2sai04j7lhmwd9";

          url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";

          sha256 = "1d072qls4ywl71wi29khlq4w6yw9idp55vf811nvbmiihn6lwmiv";

        };

        packageRequires = [ cl-lib ];

        meta = {
@@ -1577,7 +1577,6 @@ 
        };

      }) {};

    mentor = callPackage ({ async

                          , cl-lib ? null

                          , elpaBuild

                          , emacs

                          , fetchurl
@@ -1587,12 +1586,12 @@ 
      elpaBuild {

        pname = "mentor";

        ename = "mentor";

        version = "0.3.5";

        version = "0.4";

        src = fetchurl {

          url = "https://elpa.nongnu.org/nongnu/mentor-0.3.5.tar";

          sha256 = "01zrvfk2njzyzjzkvp5hv5cjl1k1qjrila1ab4bv26gf6bkq5xh3";

          url = "https://elpa.nongnu.org/nongnu/mentor-0.4.tar";

          sha256 = "1n51yabm4npx62fpfn8rhky09x4y779ismdxa026fycy7va7ynzz";

        };

        packageRequires = [ async cl-lib emacs seq xml-rpc ];

        packageRequires = [ async emacs seq xml-rpc ];

        meta = {

          homepage = "https://elpa.gnu.org/packages/mentor.html";

          license = lib.licenses.free;
@@ -2348,10 +2347,10 @@ 
      elpaBuild {

        pname = "subed";

        ename = "subed";

        version = "1.0.8";

        version = "1.0.10";

        src = fetchurl {

          url = "https://elpa.nongnu.org/nongnu/subed-1.0.8.tar";

          sha256 = "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1";

          url = "https://elpa.nongnu.org/nongnu/subed-1.0.10.tar";

          sha256 = "08vw9sv2g76yj8sfnx53dd28zkj4s0842i7qi92jam993v9s8h0z";

        };

        packageRequires = [ emacs ];

        meta = {
@@ -2500,6 +2499,21 @@ 
          license = lib.licenses.free;

        };

      }) {};

    treeview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:

      elpaBuild {

        pname = "treeview";

        ename = "treeview";

        version = "1.1.1";

        src = fetchurl {

          url = "https://elpa.nongnu.org/nongnu/treeview-1.1.1.tar";

          sha256 = "0ryycz2n1kam3ji0ibpy99ll5l6xnx1mx9i9bgfvma61f0ppcppd";

        };

        packageRequires = [ emacs ];

        meta = {

          homepage = "https://elpa.gnu.org/packages/treeview.html";

          license = lib.licenses.free;

        };

      }) {};

    tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:

      elpaBuild {

        pname = "tuareg";
@@ -2722,10 +2736,10 @@ 
      elpaBuild {

        pname = "xah-fly-keys";

        ename = "xah-fly-keys";

        version = "17.22.20220909110152";

        version = "18.1.20220921110635";

        src = fetchurl {

          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.22.20220909110152.tar";

          sha256 = "1d8xkwcyd6dcxp926mwb8kgcpdqrcpmdv62ybdhx7izx0abia95y";

          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-18.1.20220921110635.tar";

          sha256 = "0nnd7jq1k62cgjb5y45jg6b76gvzyqh11kha7has4zipd52psvnj";

        };

        packageRequires = [ emacs ];

        meta = {

pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json

+638 −568

File changed.

Preview size limit exceeded, changes collapsed.