Merge master into haskell-updates

maintainers/maintainer-list.nix

@@ -21822,6 +21822,12 @@
  githubId = 5837359;
  name = "Adrian Pistol";
  };
+ vigress8 = {
+ email = "[email protected]";
+ github = "vigress8";
+ githubId = 150687949;
+ name = "Vigress";
+ };
  vikanezrimaya = {
  email = "[email protected]";
  github = "vikanezrimaya";

nixos/modules/config/no-x-libs.nix

@@ -39,7 +39,7 @@ with lib;
  # dep of graphviz, libXpm is optional for Xpm support
  gd = super.gd.override { withXorg = false; };
  ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; };
- gjs = super.gjs.overrideAttrs { doCheck = false; installTests = false; }; # avoid test dependency on gtk3
+ gjs = (super.gjs.override { installTests = false; }).overrideAttrs { doCheck = false; }; # avoid test dependency on gtk3
  gobject-introspection = super.gobject-introspection.override { x11Support = false; };
  gpg-tui = super.gpg-tui.override { x11Support = false; };
  gpsd = super.gpsd.override { guiSupport = false; };

nixos/modules/programs/kubeswitch.nix

@@ -29,17 +29,13 @@ in
 
  config =
  let
- shell_files = pkgs.stdenv.mkDerivation rec {
- name = "kubeswitch-shell-files";
- phases = [ "installPhase" ];
- installPhase = ''
- mkdir -p $out/share
- for shell in bash zsh; do
- ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell
- ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell
- done
- '';
- };
+ shell_files = pkgs.runCommand "kubeswitch-shell-files" {} ''
+ mkdir -p $out/share
+ for shell in bash zsh; do
+ ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell
+ ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell
+ done
+ '';
  in
  lib.mkIf cfg.enable {
  environment.systemPackages = [ cfg.package ];

nixos/modules/services/misc/amazon-ssm-agent.nix

@@ -28,13 +28,7 @@ in {
 
  options.services.amazon-ssm-agent = {
  enable = mkEnableOption "Amazon SSM agent";
-
- package = mkOption {
- type = types.path;
- description = "The Amazon SSM agent package to use";
- default = pkgs.amazon-ssm-agent.override { overrideEtc = false; };
- defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }";
- };
+ package = mkPackageOption pkgs "amazon-ssm-agent" {};
  };
 
  config = mkIf cfg.enable {

nixos/modules/services/security/oauth2-proxy.nix

@@ -586,11 +586,11 @@ in
  wantedBy = [ "multi-user.target" ];
  wants = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ];
  after = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ];
-
+ restartTriggers = [ cfg.keyFile ];
  serviceConfig = {
  User = "oauth2-proxy";
  Restart = "always";
- ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}";
+ ExecStart = "${lib.getExe cfg.package} ${configString}";
  EnvironmentFile = lib.mkIf (cfg.keyFile != null) cfg.keyFile;
  };
  };

nixos/modules/services/web-apps/pretix.nix

@@ -310,7 +310,7 @@ in
  type = types.str;
  default = "redis+socket:https://${config.services.redis.servers.pretix.unixSocket}?virtual_host=1";
  defaultText = literalExpression ''
- optionalString config.services.pretix.celery.enable "redis+socket:https://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1"
+ redis+socket:https://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1
  '';
  description = ''
  URI to the celery backend used for the asynchronous job queue.
@@ -321,7 +321,7 @@ in
  type = types.str;
  default = "redis+socket:https://${config.services.redis.servers.pretix.unixSocket}?virtual_host=2";
  defaultText = literalExpression ''
- optionalString config.services.pretix.celery.enable "redis+socket:https://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2"
+ redis+socket:https://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2
  '';
  description = ''
  URI to the celery broker used for the asynchronous job queue.

nixos/tests/quickwit.nix

@@ -1,5 +1,54 @@
 import ./make-test-python.nix ({ lib, pkgs, ... }:
 
+let
+ # Define an example Quickwit index schema,
+ # and some `exampleDocs` below, to test if ingesting
+ # and querying works as expected.
+ index_yaml = ''
+ version: 0.7
+ index_id: example_server_logs
+ doc_mapping:
+ mode: dynamic
+ field_mappings:
+ - name: datetime
+ type: datetime
+ fast: true
+ input_formats:
+ - iso8601
+ output_format: iso8601
+ fast_precision: seconds
+ fast: true
+ - name: git
+ type: text
+ tokenizer: raw
+ - name: hostname
+ type: text
+ tokenizer: raw
+ - name: level
+ type: text
+ tokenizer: raw
+ - name: message
+ type: text
+ - name: location
+ type: text
+ - name: source
+ type: text
+ timestamp_field: datetime
+
+ search_settings:
+ default_search_fields: [message]
+
+ indexing_settings:
+ commit_timeout_secs: 10
+ '';
+
+ exampleDocs = ''
+ {"datetime":"2024-05-03T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Processing request done","location":"path/to/server.c:6442:32","source":""}
+ {"datetime":"2024-05-04T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""}
+ {"datetime":"2024-05-05T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""}
+ {"datetime":"2024-05-06T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-2","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""}
+ '';
+in
 {
  name = "quickwit";
  meta.maintainers = [ pkgs.lib.maintainers.happysalada ];
@@ -24,6 +73,29 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
  "journalctl -o cat -u quickwit.service | grep 'transitioned to ready state'"
  )
 
+ with subtest("verify UI installed"):
+ machine.succeed("curl -sSf https://127.0.0.1:7280/ui/")
+
+ with subtest("injest and query data"):
+ import json
+
+ # Test CLI ingestion
+ print(machine.succeed('${pkgs.quickwit}/bin/quickwit index create --index-config ${pkgs.writeText "index.yaml" index_yaml}'))
+ # Important to use `--wait`, otherwise the queries below race with index processing.
+ print(machine.succeed('${pkgs.quickwit}/bin/quickwit index ingest --index example_server_logs --input-path ${pkgs.writeText "exampleDocs.json" exampleDocs} --wait'))
+
+ # Test CLI query
+ cli_query_output = machine.succeed('${pkgs.quickwit}/bin/quickwit index search --index example_server_logs --query "exception"')
+ print(cli_query_output)
+
+ # Assert query result is as expected.
+ num_hits = len(json.loads(cli_query_output)["hits"])
+ assert num_hits == 3, f"cli_query_output contains unexpected number of results: {num_hits}"
+
+ # Test API query
+ api_query_output = machine.succeed('curl --fail https://127.0.0.1:7280/api/v1/example_server_logs/search?query=exception')
+ print(api_query_output)
+
  quickwit.log(quickwit.succeed(
  "systemd-analyze security quickwit.service | grep -v '✓'"
  ))

pkgs/README.md

@@ -32,6 +32,7 @@ Before adding a new package, please consider the following questions:
 * Does the project have a clear license statement? Remember that software is unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream.
 * How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small.
 * Are you willing to maintain the package? You should care enough about the package to be willing to keep it up and running for at least one complete Nixpkgs' release life-cycle.
+ * In case you are not able to maintain the package you wrote, you can seek someone to fill that role, effectively adopting the package.
 
 If any of these questions' answer is no, then you should probably not add the package.
 

pkgs/applications/audio/midi-visualizer/default.nix → pkgs/applications/audio/midivisualizer/default.nix

@@ -20,14 +20,14 @@
 , Kernel
 }:
 
-stdenv.mkDerivation rec {
- pname = "MIDIVisualizer";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "midivisualizer";
  version = "7.0";
 
  src = fetchFromGitHub {
  owner = "kosua20";
- repo = pname;
- rev = "v${version}";
+ repo = "MIDIVisualizer";
+ rev = "v${finalAttrs.version}";
  sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE=";
  };
 
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
  platforms = platforms.unix;
  maintainers = [ maintainers.ericdallo ];
  };
-}
+})

pkgs/applications/blockchains/bitcoin/default.nix

@@ -33,14 +33,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = if withGui then "bitcoin" else "bitcoind";
- version = "27.0";
+ version = "27.1";
 
  src = fetchurl {
  urls = [
  "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
  ];
  # hash retrieved from signed SHA256SUMS
- sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b";
+ sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da";
  };
 
  nativeBuildInputs =