Merge master into staging-next

nixos/doc/manual/from_md/installation/building-nixos.chapter.xml

@@ -33,9 +33,14 @@
  </para>
  <section xml:id="sec-building-image-instructions">
  <title>Practical Instructions</title>
+ <para>
+ To build an ISO image for the channel
+ <literal>nixos-unstable</literal>:
+ </para>
  <programlisting>
 $ git clone https://github.com/NixOS/nixpkgs.git
 $ cd nixpkgs/nixos
+$ git switch nixos-unstable
 $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
 </programlisting>
  <para>

nixos/doc/manual/installation/building-nixos.chapter.md

@@ -18,9 +18,12 @@ enforced values with `mkForce`.
 
 ## Practical Instructions {#sec-building-image-instructions}
 
+To build an ISO image for the channel `nixos-unstable`:
+
 ```ShellSession
 $ git clone https://github.com/NixOS/nixpkgs.git
 $ cd nixpkgs/nixos
+$ git switch nixos-unstable
 $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
 ```
 

nixos/modules/services/web-servers/nginx/vhost-options.nix

@@ -60,7 +60,7 @@ with lib;
  Note: This option overrides <literal>enableIPv6</literal>
  '';
  default = [];
- example = [ "127.0.0.1" "::1" ];
+ example = [ "127.0.0.1" "[::1]" ];
  };
 
  enableACME = mkOption {

nixos/modules/tasks/filesystems.nix

@@ -280,7 +280,8 @@ in
  environment.etc.fstab.text =
  let
  fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ];
- skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
+ isBindMount = fs: builtins.elem "bind" fs.options;
+ skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
  # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
  escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
  swapOptions = sw: concatStringsSep "," (

pkgs/applications/blockchains/chia/default.nix

@@ -87,6 +87,7 @@ let chia = python3Packages.buildPythonApplication rec {
  meta = with lib; {
  homepage = "https://www.chia.net/";
  description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure.";
+ knownVulnerabilities = [ "CVE-2022-36447" ];
  license = with licenses; [ asl20 ];
  maintainers = teams.chia.members;
  platforms = platforms.all;

pkgs/applications/misc/mediainfo-gui/default.nix

@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
- version = "22.03";
+ version = "22.06";
  pname = "mediainfo-gui";
  src = fetchurl {
  url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
+ sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
  };
 
  nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/applications/misc/mediainfo/default.nix

@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
- version = "22.03";
+ version = "22.06";
  pname = "mediainfo";
  src = fetchurl {
  url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
+ sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
  };
 
  nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -1011,10 +1011,10 @@
  "owner": "scaleway",
  "provider-source-address": "registry.terraform.io/scaleway/scaleway",
  "repo": "terraform-provider-scaleway",
- "rev": "v2.2.3",
- "sha256": "sha256-XiGc6MU0TrpaZL0SRKez2IUFM7MZIu8tGMFIUQJzbv4=",
+ "rev": "v2.2.4",
+ "sha256": "sha256-tFU1OzixWipQvMHdwViOk8svlhqhPjOTPPkCpWam4DQ=",
  "vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=",
- "version": "2.2.3"
+ "version": "2.2.4"
  },
  "secret": {
  "owner": "numtide",
@@ -1092,10 +1092,10 @@
  "owner": "spotinst",
  "provider-source-address": "registry.terraform.io/spotinst/spotinst",
  "repo": "terraform-provider-spotinst",
- "rev": "v1.79.0",
- "sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=",
- "vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=",
- "version": "1.79.0"
+ "rev": "v1.80.0",
+ "sha256": "sha256-3Wq3jKpSVm3sIUoumd7v26JsSWMdmzdhtUKq/ztrt9M=",
+ "vendorSha256": "sha256-NeXkvdO6ODAhNdVfP4laTht6oIrx2QYbhTILFXwPCbU=",
+ "version": "1.80.0"
  },
  "stackpath": {
  "owner": "stackpath",
@@ -1128,10 +1128,10 @@
  "owner": "tencentcloudstack",
  "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
  "repo": "terraform-provider-tencentcloud",
- "rev": "v1.76.2",
- "sha256": "sha256-dtymdUggjQk3v8FWWBktMe2kPoeEn3FBsXSZ12JneRw=",
+ "rev": "v1.76.3",
+ "sha256": "sha256-Tc6GfFWksxrr61rNFVZrHMHTeo4JsU8Gc1S7roMnj4Y=",
  "vendorSha256": null,
- "version": "1.76.2"
+ "version": "1.76.3"
  },
  "tfe": {
  "owner": "hashicorp",

pkgs/applications/version-management/gitlab/gitaly/default.nix

@@ -33,7 +33,7 @@ buildGoModule {
  inherit rubyEnv;
  };
 
- ldflags = "-X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}";
+ ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
 
  tags = [ "static,system_libgit2" ];
  nativeBuildInputs = [ pkg-config ];

pkgs/data/misc/papirus-folders/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, getent }:
 
 stdenv.mkDerivation rec {
  pname = "papirus-folders";
@@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
  sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY=";
  };
 
+ buildInputs = [
+ getent
+ ];
+
  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
+ patchPhase = ''
+ substituteInPlace ./papirus-folders --replace "getent" "${getent}/bin/getent"
+ '';
+
  meta = with lib; {
  description = "A tool to change papirus icon theme color";
  longDescription = ''

pkgs/desktops/gnome/core/sushi/default.nix

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
  libepoxy
  gst_all_1.gstreamer
  gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good
+ (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
  gst_all_1.gst-plugins-bad
  gst_all_1.gst-plugins-ugly
  ];

pkgs/development/embedded/svdtools/default.nix

@@ -0,0 +1,24 @@
+{ lib
+, rustPlatform
+, fetchCrate
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "svdtools";
+ version = "0.2.5";
+
+ src = fetchCrate {
+ inherit version pname;
+ sha256 = "sha256-tN1GC4tQXyaA8bgq7wB/NZEdO14p/0f8BXtgTk6aOzg=";
+ };
+
+ cargoSha256 = "sha256-puaveP9a11rlGgsguCfueYXfYSd7Xew8ZRGeDP8WrSI=";
+
+ meta = with lib; {
+ description = "Tools to handle vendor-supplied, often buggy SVD files";
+ homepage = "https://github.com/stm32-rs/svdtools";
+ changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ newam ];
+ };
+}

pkgs/development/interpreters/micropython/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
  pname = "micropython";
- version = "1.18";
+ version = "1.19";
 
  src = fetchFromGitHub {
- owner  = "micropython";
- repo  = "micropython";
- rev  = "v${version}";
- sha256 = "sha256-roskIDyY3ehasOm8Yn4braLNZtaeuItb9ZOUgF4CXww=";
+ owner = "micropython";
+ repo = "micropython";
+ rev = "v${version}";
+ sha256 = "sha256-M3cKNuRKOcB1lF9M1rDOpp3sPdx/I60ooLtOYmBWe7c=";
  fetchSubmodules = true;
  };
 

pkgs/development/libraries/gegl/default.nix

@@ -36,14 +36,14 @@
 
 stdenv.mkDerivation rec {
  pname = "gegl";
- version = "0.4.36";
+ version = "0.4.38";
 
  outputs = [ "out" "dev" "devdoc" ];
  outputBin = "dev";
 
  src = fetchurl {
  url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY=";
+ sha256 = "sha256-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A=";
  };
 
  nativeBuildInputs = [

pkgs/development/libraries/libmediainfo/default.nix

@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
 
 stdenv.mkDerivation rec {
- version = "22.03";
+ version = "22.06";
  pname = "libmediainfo";
  src = fetchurl {
  url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk=";
+ sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY=";
  };
 
  nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/development/ocaml-modules/omd/default.nix

@@ -1,32 +1,21 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, buildDunePackage, fetchurl }:
 
-stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-omd";
- version = "1.3.1";
+buildDunePackage rec {
+ pname = "omd";
+ version = "1.3.2";
+
+ minimalOCamlVersion = "4.03";
 
  src = fetchurl {
- url = "https://github.com/Chris00/omd/releases/download/${version}/omd-${version}.tar.gz";
- sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa";
+ url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz";
+ sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts=";
  };
 
- nativeBuildInputs = [ ocaml findlib ocamlbuild ];
-
- strictDeps = true;
-
- createFindlibDestdir = true;
-
- configurePhase = ''
- runHook preConfigure
- ocaml setup.ml -configure --prefix $out
- runHook postConfigure
- '';
-
  meta = {
  description = "Extensible Markdown library and tool in OCaml";
  homepage = "https://github.com/ocaml/omd";
  license = lib.licenses.isc;
  maintainers = [ lib.maintainers.vbgl ];
  mainProgram = "omd";
- inherit (ocaml.meta) platforms;
  };
 }

pkgs/development/python-modules/pywayland/default.nix

@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
  pname = "pywayland";
- version = "0.4.13";
+ version = "0.4.14";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "sha256-x075CncvfjzbIsGMj2EwFpigpwlysqBZpoK08DW9iBo=";
+ hash = "sha256-CXJidzwFvS1ewqYyfpJhwQtqh4TtUfhO9O0iYJpOCy0=";
  };
 
  nativeBuildInputs = [ pkg-config ];

pkgs/development/python-modules/scrapy/default.nix

@@ -30,15 +30,15 @@
 
 buildPythonPackage rec {
  pname = "scrapy";
- version = "2.6.1";
+ version = "2.6.2";
  format = "setuptools";
 
  disabled = pythonOlder "3.6";
 
  src = fetchPypi {
  inherit version;
  pname = "Scrapy";
- sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827";
+ sha256 = "55e21181165f25337105fff1efc8393296375cea7de699a7e703bbd265595f26";
  };
 
  nativeBuildInputs = [
@@ -111,6 +111,7 @@ buildPythonPackage rec {
  ] ++ lib.optionals stdenv.isDarwin [
  "test_xmliter_encoding"
  "test_download"
+ "test_reactor_default_twisted_reactor_select"
  ];
 
  postInstall = ''

pkgs/development/tools/hclfmt/default.nix

@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "hclfmt";
+ version = "2.13.0";
+
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "hcl";
+ rev = "v${version}";
+ hash = "sha256-ENvXFOdsv3PL4jH7OfI3ZIY6ekj7ywgNOYl1uRQjypM=";
+ };
+
+ vendorSha256 = "sha256-9IGHILgByNFviQcHJCFoEX9cZif1uuHCu4xvmGZYoXk=";
+
+ # The code repository includes other tools which are not useful. Only build
+ # hclfmt.
+ subPackages = [ "cmd/hclfmt" ];
+
+ meta = with lib; {
+ description = "a code formatter for the Hashicorp Configuration Language (HCL) format";
+ homepage = "https://github.com/hashicorp/hcl/tree/main/cmd/hclfmt";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ zimbatm ];
+ };
+}