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

Merge master into staging-next

parents b64b1a6e 53ba29fe
Loading
Loading
Loading
Loading
+2 −14
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ rec {
    => [ "13" "14" "23" "24" ]
    ```

    The following function call is equivalent to the one deprecated above:
    If you have an attrset already, consider mapCartesianProduct:

    ```nix
    mapCartesianProduct (x: "${toString x.a}${toString x.b}") { a = [1 2]; b = [3 4]; }
@@ -1822,19 +1822,7 @@ rec {
    ```
    :::
  */
  crossLists = warn ''
    lib.crossLists is deprecated, use lib.mapCartesianProduct instead.

    For example, the following function call:

    nix-repl> lib.crossLists (x: y: x+y) [[1 2] [3 4]]
    [ 4 5 5 6 ]

    Can now be replaced by the following one:

    nix-repl> lib.mapCartesianProduct ({x,y}: x+y) { x = [1 2]; y = [3 4]; }
    [ 4 5 5 6 ]
  '' (f: foldl (fs: args: concatMap (f: map f args) fs) [ f ]);
  crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [ f ];

  /**
    Remove duplicate elements from the `list`. O(n^2) complexity.
+7 −12
Original line number Diff line number Diff line
@@ -654,12 +654,6 @@
    githubId = 96147421;
    name = "0xperp";
  };
  Adjective-Object = {
    email = "mhuan13@gmail.com";
    github = "Adjective-Object";
    githubId = 1174858;
    name = "Maxwell Huang-Hobbs";
  };
  adnelson = {
    email = "ithinkican@gmail.com";
    github = "adnelson";
@@ -832,12 +826,6 @@
    githubId = 209175;
    name = "Alesya Huzik";
  };
  aidalgol = {
    email = "aidalgol+nixpkgs@fastmail.net";
    github = "aidalgol";
    githubId = 2313201;
    name = "Aidan Gauland";
  };
  aij = {
    email = "aij+git@mrph.org";
    github = "aij";
@@ -4194,6 +4182,13 @@
    githubId = 91694;
    name = "Javier Candeira";
  };
  caniko = {
    email = "gpg@rotas.mozmail.com";
    github = "caniko";
    githubId = 29519599;
    name = "Can H. Tartanoglu";
    keys = [ { fingerprint = "DF95 1EC0 9B8F 8094 C616  5589 1D63 6EDE 97DC 0280"; } ];
  };
  canndrew = {
    email = "shum@canndrew.org";
    github = "canndrew";
+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ In addition to numerous new and updated packages, this release has the following

- [openvscode-server](https://github.com/gitpod-io/openvscode-server), run VS Code on a remote machine with access through a modern web browser from any device, anywhere. Available as [services.openvscode-server](#opt-services.openvscode-server.enable).

- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](#opt-services.peroxide.enable).
- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](options.html#opt-services.peroxide.enable).

- [photoprism](https://photoprism.app/), a AI-powered photos app for the decentralized web. Available as [services.photoprism](options.html#opt-services.photoprism.enable).

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@

- [Prometheus Storagebox Exporter](https://github.com/fleaz/prometheus-storagebox-exporter), a Prometheus exporter for Hetzner storage boxes.

- [pmount](https://salsa.debian.org/debian/pmount), a tool that allows normal users to mount removable devices without requiring root privileges Available at [programs.pmount](#opt-programs.pmount.enable).

- [lemurs](https://github.com/coastalwhite/lemurs), a customizable TUI display/login manager. Available at [services.displayManager.lemurs](#opt-services.displayManager.lemurs.enable).

- [paisa](https://github.com/ananthakumaran/paisa), a personal finance tracker and dashboard. Available as [services.paisa](#opt-services.paisa.enable).
+1 −1
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@
  ./programs/partition-manager.nix
  ./programs/pay-respects.nix
  ./programs/plotinus.nix
  ./programs/pmount.nix
  ./programs/pqos-wrapper.nix
  ./programs/projecteur.nix
  ./programs/proxychains.nix
@@ -1294,7 +1295,6 @@
  ./services/networking/pangolin.nix
  ./services/networking/pdns-recursor.nix
  ./services/networking/pdnsd.nix
  ./services/networking/peroxide.nix
  ./services/networking/picosnitch.nix
  ./services/networking/pihole-ftl.nix
  ./services/networking/pixiecore.nix
Loading