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

Merge master into staging-next

parents 66b454af 42db630a

maintainers/maintainer-list.nix

+17 −0
Original line number Diff line number Diff line
@@ -5437,6 +5437,12 @@ 
    githubId = 4490283;

    name = "diadatp";

  };

  diamond-deluxe = {

    email = "carbon_lattice@proton.me";

    github = "diamond-deluxe";

    githubId = 112557036;

    name = "Diamond";

  };

  DianaOlympos = {

    github = "DianaOlympos";

    githubId = 15774340;
@@ -17670,6 +17676,12 @@ 
    githubId = 12017109;

    name = "Rabindra Dhakal";

  };

  qbisi = {

    name = "qbisicwate";

    email = "qbisicwate@gmail.com";

    github = "qbisi";

    githubId = 84267544;

  };

  qbit = {

    name = "Aaron Bieber";

    email = "aaron@bolddaemon.com";
@@ -18246,6 +18258,11 @@ 
    githubId = 3302;

    name = "Renzo Carbonara";

  };

  reputable2772 = {

    name = "Reputable2772";

    github = "Reputable2772";

    githubId = 153411261;

  };

  rettetdemdativ = {

    email = "michael@koeppl.dev";

    github = "rettetdemdativ";

nixos/doc/manual/configuration/customizing-packages.section.md

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ Unfortunately, Nixpkgs currently lacks a way to query available package configur 
::: {.note}

For example, many packages come with extensions one might add.

Examples include:

- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp)

- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests)

- [`passExtensions.pass-otp`](https://search.nixos.org/packages?query=passExtensions.pass-otp)

- [`python312Packages.requests`](https://search.nixos.org/packages?query=python312Packages.requests)



You can use them like this:

```nix

pkgs/applications/blockchains/lightning-loop/default.nix

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


buildGoModule rec {

  pname = "lightning-loop";

  version = "0.24.1-beta";

  version = "0.28.8-beta";



  src = fetchFromGitHub {

    owner = "lightninglabs";

    repo = "loop";

    rev = "v${version}";

    hash = "sha256-gPWiKSwXS1eSuHss+hkiqqxqonGYSGmSh3/jL+NlqEg=";

    hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";

  };



  vendorHash = "sha256-6bRg6is1g/eRCr82tHMXTWVFv2S0d2h/J3w1gpentjo=";

  vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0=";



  subPackages = [ "cmd/loop" "cmd/loopd" ];

pkgs/applications/editors/emacs/sources.nix

+3 −3
Original line number Diff line number Diff line
@@ -114,10 +114,10 @@ in 


  emacs30 = import ./make-emacs.nix (mkArgs {

    pname = "emacs";

    version = "30.0.91";

    version = "30.0.92";

    variant = "mainline";

    rev = "30.0.91";

    hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ=";

    rev = "30.0.92";

    hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o=";

  });



  emacs28-macport = import ./make-emacs.nix (mkArgs {

pkgs/applications/misc/corectrl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 


stdenv.mkDerivation rec{

  pname = "corectrl";

  version = "1.4.1";

  version = "1.4.2";



  src = fetchFromGitLab {

    owner = "corectrl";

    repo = "corectrl";

    rev = "v${version}";

    hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw=";

    hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4=";

  };

  patches = [

    ./polkit-dir.patch