Skip to content

Commit

Permalink
Merge master into haskell-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Jun 10, 2024
2 parents b26f1fe + ed39190 commit 51bd20f
Show file tree
Hide file tree
Showing 7,572 changed files with 11,866 additions and 11,208 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17865,6 +17865,11 @@
githubId = 7439756;
name = "Rowan Goemans";
};
roydubnium = {
github = "RoyDubnium";
githubId = 72664566;
name = "Roy Davison";
};
royneary = {
email = "[email protected]";
github = "royneary";
Expand Down
2 changes: 1 addition & 1 deletion nixos/doc/manual/development/running-nixos-tests-interactively.section.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ As an alternative, you can proxy the guest shell to a local TCP server by first
starting a TCP server in a terminal using the command:

```ShellSession
$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr`
$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr
```

In the terminal where the test driver is running, connect to this server by
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/monitoring/zabbix-proxy.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ in

port = mkOption {
type = types.port;
default = if cfg.database.type == "mysql" then mysql.port else pgsql.services.port;
default = if cfg.database.type == "mysql" then mysql.port else pgsql.settings.port;
defaultText = literalExpression ''
if config.${opt.database.type} == "mysql"
then config.${options.services.mysql.port}
Expand Down
12 changes: 2 additions & 10 deletions nixos/modules/services/web-apps/node-red.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@ with lib;
let
cfg = config.services.node-red;
defaultUser = "node-red";
finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package;
node-red_withNpmAndGcc = pkgs.runCommand "node-red" {
nativeBuildInputs = [ pkgs.makeWrapper ];
}
''
mkdir -p $out/bin
makeWrapper ${pkgs.nodePackages.node-red}/bin/node-red $out/bin/node-red \
--set PATH '${lib.makeBinPath [ pkgs.nodePackages.npm pkgs.gcc ]}:$PATH' \
'';
in
{
options.services.node-red = {
Expand Down Expand Up @@ -127,11 +118,12 @@ in
environment = {
HOME = cfg.userDir;
};
path = lib.optionals cfg.withNpmAndGcc [ pkgs.nodePackages.npm pkgs.gcc ];
serviceConfig = mkMerge [
{
User = cfg.user;
Group = cfg.group;
ExecStart = "${finalPackage}/bin/node-red ${pkgs.lib.optionalString cfg.safe "--safe"} --settings ${cfg.configFile} --port ${toString cfg.port} --userDir ${cfg.userDir} ${concatStringsSep " " (mapAttrsToList (name: value: "-D ${name}=${value}") cfg.define)}";
ExecStart = "${cfg.package}/bin/node-red ${pkgs.lib.optionalString cfg.safe "--safe"} --settings ${cfg.configFile} --port ${toString cfg.port} --userDir ${cfg.userDir} ${concatStringsSep " " (mapAttrsToList (name: value: "-D ${name}=${value}") cfg.define)}";
PrivateTmp = true;
Restart = "always";
WorkingDirectory = cfg.userDir;
Expand Down
4 changes: 1 addition & 3 deletions nixos/tests/ladybird.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
];

services.xserver.enable = true;
environment.systemPackages = [
pkgs.ladybird
];
programs.ladybird.enable = true;
};

enableOCR = true;
Expand Down
10 changes: 8 additions & 2 deletions pkgs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ All versions of a package _must_ be included in `all-packages.nix` to make sure
* `meta.description` must:
* Be short, just one sentence.
* Be capitalized.
* Not start with the definite or an indefinite article.
* Not start with the package name.
* More generally, it should not refer to the package name.
* Not end with a period (or any punctuation for that matter).
Expand Down Expand Up @@ -459,7 +460,10 @@ Examples going from bad to best practices:

## Patches

Patches available online should be retrieved using `fetchpatch`.
Sometimes, changes are needed to the source to allow building a derivation in nixpkgs, or to get earlier access to an upstream fix or improvement.
When using the `patches` parameter to `mkDerivation`, make sure the patch name clearly describes the reason for the patch, or add a comment.

Patches already merged upstream or published elsewhere should be retrieved using `fetchpatch`.

```nix
{
Expand All @@ -473,7 +477,9 @@ Patches available online should be retrieved using `fetchpatch`.
}
```

Otherwise, you can add a `.patch` file to the `nixpkgs` repository. In the interest of keeping our maintenance burden to a minimum, only patches that are unique to `nixpkgs` should be added in this way.
Otherwise, you can add a `.patch` file to the `nixpkgs` repository.
In the interest of keeping our maintenance burden and the size of nixpkgs to a minimum, only do this for patches that are unique to `nixpkgs` or that have been proposed upstream but are not merged yet, cannot be easily fetched or have a high chance to disappear in the future due to unstable or unreliable URLs.
The latter avoids link rot when the upstream abandons, squashes or rebases their change, in which case the commit may get garbage-collected.

If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`. Check [the `fetchpatch` reference](https://nixos.org/manual/nixpkgs/unstable/#fetchpatch) for details.

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/accessibility/squeekboard/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
passthru.tests.phosh = nixosTests.phosh;

meta = with lib; {
description = "A virtual keyboard supporting Wayland";
description = "Virtual keyboard supporting Wayland";
homepage = "https://gitlab.gnome.org/World/Phosh/squeekboard";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ artturin ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/AMB-plugins/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
preInstall="mkdir -p $out/lib/ladspa";

meta = {
description = "A set of ambisonics ladspa plugins";
description = "Set of ambisonics ladspa plugins";
longDescription = ''
Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders.
'';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/FIL-plugins/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';

meta = {
description = "a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed";
description = "Four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed";
longDescription = ''
Each section has an active/bypass switch, frequency, bandwidth and gain controls.
There is also a global bypass switch and gain control.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/aether-lv2/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://dougal-s.github.io/Aether/";
description = "An algorithmic reverb LV2 based on Cloudseed";
description = "Algorithmic reverb LV2 based on Cloudseed";
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
license = licenses.mit;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/amarok/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {

meta = with lib; {
homepage = "https://amarok.kde.org";
description = "A powerful music player with an intuitive interface";
description = "Powerful music player with an intuitive interface";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peterhoeg ];
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/amberol/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://gitlab.gnome.org/World/amberol";
description = "A small and simple sound and music player";
description = "Small and simple sound and music player";
maintainers = with maintainers; [ linsui ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/ams-lv2/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "An LV2 port of the internal modules found in Alsa Modular Synth";
description = "LV2 port of the internal modules found in Alsa Modular Synth";
homepage = "https://github.com/blablack/ams-lv2";
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/artyFX/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://openavproductions.com/artyfx/";
description = "A LV2 plugin bundle of artistic realtime effects";
description = "LV2 plugin bundle of artistic realtime effects";
license = licenses.gpl2;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/asunder/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "A graphical Audio CD ripper and encoder for Linux";
description = "Graphical Audio CD ripper and encoder for Linux";
mainProgram = "asunder";
homepage = "https://littlesvr.ca/asunder/index.php";
license = licenses.gpl2;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/aucatctl/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
'';

meta = with lib; {
description = "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes";
description = "Utility that allows to send MIDI messages to control sndiod and/or aucat volumes";
homepage = "https://www.sndio.org";
license = licenses.isc;
maintainers = with maintainers; [ sna ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/audacious/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "A lightweight and versatile audio player";
description = "Lightweight and versatile audio player";
homepage = "https://audacious-media-player.org/";
maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ];
platforms = with platforms; linux;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/autotalent/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://tombaran.info/autotalent.html";
description = "A real-time pitch correction LADSPA plugin (no MIDI control)";
description = "Real-time pitch correction LADSPA plugin (no MIDI control)";
license = licenses.gpl2;
maintainers = [ maintainers.michalrus ];
platforms = platforms.linux;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bambootracker/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
};

meta = with lib; {
description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
description = "Tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
mainProgram = "BambooTracker";
homepage = "https://bambootracker.github.io/BambooTracker/";
license = licenses.gpl2Plus;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bchoppr/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://github.com/sjaehn/BChoppr";
description = "An audio stream chopping LV2 plugin";
description = "Audio stream chopping LV2 plugin";
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
license = licenses.gpl3Plus;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "A digital audio workstation";
description = "Digital audio workstation";
longDescription = ''
Bitwig Studio is a multi-platform music-creation system for
production, performance and DJing, with a focus on flexible
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "A digital audio workstation";
description = "Digital audio workstation";
longDescription = ''
Bitwig Studio is a multi-platform music-creation system for
production, performance and DJing, with a focus on flexible
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "A digital audio workstation";
description = "Digital audio workstation";
longDescription = ''
Bitwig Studio is a multi-platform music-creation system for
production, performance and DJing, with a focus on flexible
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bolliedelayxt.lv2/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];

meta = with lib; {
description = "A flexible LV2 delay plugin";
description = "Flexible LV2 delay plugin";
homepage = "https://github.com/MrBollie/bolliedelayxt.lv2";
license = licenses.gpl3Plus;
maintainers = [ maintainers.magnetophon ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/bristol/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
];

meta = with lib; {
description = "A range of synthesiser, electric piano and organ emulations";
description = "Range of synthesiser, electric piano and organ emulations";
homepage = "https://bristol.sourceforge.net";
license = licenses.gpl3;
platforms = [ "x86_64-linux" "i686-linux" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/brutefir/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://torger.se/anders/brutefir.html";
description = "A software convolution engine";
description = "Software convolution engine";
license = licenses.gpl2Only;
maintainers = with maintainers; [ auchter ];
platforms = [ "x86_64-linux" "i686-linux" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/buzztrax/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ stdenv.mkDerivation {
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

meta = with lib; {
description = "Buzztrax is a modular music composer for Linux.";
description = "Buzztrax is a modular music composer for Linux";
homepage = "https://www.buzztrax.org/";
license = licenses.lgpl21Plus;
maintainers = [ maintainers.bendlas ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/calf/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://calf-studio-gear.org";
description = "A set of high quality open source audio plugins for musicians";
description = "Set of high quality open source audio plugins for musicians";
license = licenses.lgpl2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/cantata/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ mkDerivation rec {
cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options);

meta = with lib; {
description = "A graphical client for MPD";
description = "Graphical client for MPD";
mainProgram = "cantata";
homepage = "https://github.com/cdrummond/cantata";
license = licenses.gpl3Only;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/caps/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
'';

meta = {
description = "A selection of LADSPA plugins implementing classic effects";
description = "Selection of LADSPA plugins implementing classic effects";
longDescription = ''
The C* Audio Plugin Suite is a selection of classic effects,
unique filters and signal generators.  The digital guitarist
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/carla/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {

meta = with lib; {
homepage = "https://kx.studio/Applications:Carla";
description = "An audio plugin host";
description = "Audio plugin host";
longDescription = ''
It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3
and AU plugin formats, plus GIG, SF2 and SFZ file support.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/castopod/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ stdenv.mkDerivation {
passthru.updateScript = ./update.sh;

meta = with lib; {
description = "An open-source hosting platform made for podcasters who want to engage and interact with their audience";
description = "Open-source hosting platform made for podcasters who want to engage and interact with their audience";
homepage = "https://castopod.org";
license = licenses.agpl3Only;
maintainers = with maintainers; [ alexoundos ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/caudec/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://caudec.cocatre.net/";
description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)";
description = "Multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)";
license = licenses.gpl3;
platforms = platforms.linux ++ platforms.darwin;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/cdparanoia/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://xiph.org/paranoia";
description = "A tool and library for reading digital audio from CDs";
description = "Tool and library for reading digital audio from CDs";
license = with licenses; [ gpl2Plus lgpl21Plus ];
platforms = platforms.unix;
mainProgram = "cdparanoia";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/cheesecutter/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "A tracker program for composing music for the SID chip";
description = "Tracker program for composing music for the SID chip";
homepage = "https://github.com/theyamo/CheeseCutter/";
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/cider/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
'';

meta = with lib; {
description = "A new look into listening and enjoying Apple Music in style and performance.";
description = "New look into listening and enjoying Apple Music in style and performance";
homepage = "https://github.com/ciderapp/Cider";
license = licenses.agpl3Only;
mainProgram = "cider";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/clementine/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ in mkDerivation {

meta = with lib; {
homepage = "https://www.clementine-player.org";
description = "A multiplatform music player";
description = "Multiplatform music player";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.ttuegel ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/clerk/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ stdenv.mkDerivation {
'';

meta = with lib; {
description = "An MPD client based on rofi/fzf";
description = "MPD client based on rofi/fzf";
homepage = "https://github.com/carnager/clerk";
license = licenses.mit;
maintainers = with maintainers; [ anderspapitto rewine ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/cozy/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec {
'';

meta = with lib; {
description = "A modern audio book player for Linux";
description = "Modern audio book player for Linux";
homepage = "https://cozy.geigi.de/";
maintainers = with maintainers; [ makefu aleksana ];
license = licenses.gpl3Plus;
Expand Down

0 comments on commit 51bd20f

Please sign in to comment.