Merge branch 'master' into staging-next

.github/labeler.yml

@@ -143,6 +143,9 @@
   - nixos/modules/programs/neovim.nix
   - pkgs/applications/editors/neovim/**/*
 
+"6.topic: vscode":
+  - pkgs/applications/editors/vscode/**/*
+
 "6.topic: xfce":
   - nixos/doc/manual/configuration/xfce.xml
   - nixos/modules/services/x11/desktop-managers/xfce.nix

doc/languages-frameworks/python.section.md

@@ -1780,6 +1780,10 @@ The following rules are desired to be respected:
   that characters should be converted to lowercase and `.` and `_` should be
   replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz).
   If necessary, `pname` has to be given a different value within `fetchPypi`.
+* Packages from sources such as GitHub and GitLab that do not exist on PyPI
+  should not use a name that is already used on PyPI. When possible, they should
+  use the package repository name prefixed with the owner (e.g. organization) name
+  and using a `-` as delimiter.
 * Attribute names in `python-packages.nix` should be sorted alphanumerically to
   avoid merge conflicts and ease locating attributes.
 

nixos/tests/kernel-generic.nix

@@ -30,6 +30,7 @@ let
       linux_5_4_hardened
       linux_5_10_hardened
       linux_5_15_hardened
+      linux_5_19_hardened
 
       linux_testing;
   };

pkgs/applications/blockchains/monero-cli/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.1.0";
+  version = "0.18.1.1";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    sha256 = "sha256-xniGiGqZpL1b6alnCxa2MNzuDQxPgMdNjqifOC8h0qM=";
+    sha256 = "sha256-R3ajdsHVgvkUEwaShwMvhIrcbM4YjsXgBk2QGBhxGRQ=";
     fetchSubmodules = true;
   };
 

pkgs/applications/blockchains/monero-gui/default.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.1.0";
+  version = "0.18.1.1";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    sha256 = "sha256-XL7DV4YD/U6RiqgdYJf6zFfvJWlOx//4YVmnc51riiE=";
+    sha256 = "sha256-mxbr02Ba/BeUiAZujnBdXgJSaq6a/U4GM7rR7sZzTWc=";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/snapmaker-luban/default.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snapmaker-luban";
-  version = "4.3.2";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
-    sha256 = "sha256-t8TgtzK3jK8bfXBMbOSeBjLlrmPh61E6Itlo7MfY4Pg=";
+    sha256 = "sha256-cXFnFWa6IDGuC6M46Ybnr9/LM8hG0KTUlkzcyuje5SI=";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "5.59.0"; # Please backport all updates to the stable channel.
+  version = "5.60.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "sha256-6im8OH1J+YlWCZ5eeJJbXokQPs6QbIzYIonGy9vbWvE=";
+    sha256 = "sha256-fKbBrAohb/X7pehWfP3FVwfq0Grand2HlfOa6RE2Z6w=";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/instant-messengers/teams/default.nix

@@ -23,7 +23,14 @@
 
 let
   pname = "teams";
-  version = "1.5.00.10453";
+  versions = {
+    linux = "1.5.00.23861";
+    darwin = "1.5.00.22362";
+  };
+  hashes = {
+    linux = "sha256-h0YnCeJX//l4TegJVZtavV3HrxjYUF2Fa5KmaYmZW8E=";
+    darwin = "sha256-fbw6T+k6R5FyQ7XOKzyNYBvXlxH2xpJsBnsR1L+3Jmw=";
+  };
   meta = with lib; {
     description = "Microsoft Teams";
     homepage = "https://teams.microsoft.com";
@@ -35,11 +42,12 @@ let
   };
 
   linux = stdenv.mkDerivation rec {
-    inherit pname version meta;
+    inherit pname meta;
+    version = versions.linux;
 
     src = fetchurl {
-      url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
+      url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb";
-      hash = "sha256-fLVw2axSMetuaoRzjg+x4DRYY8WP5TQbL7LbfF6LFfA=";
+      hash = hashes.linux;
     };
 
     nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ];
@@ -130,11 +138,12 @@ let
   appName = "Teams.app";
 
   darwin = stdenv.mkDerivation {
-    inherit pname version meta;
+    inherit pname meta;
+    version = versions.darwin;
 
     src = fetchurl {
-      url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg";
+      url = "https://statics.teams.cdn.office.net/production-osx/${versions.darwin}/Teams_osx.pkg";
-      hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810=";
+      hash = hashes.darwin;
     };
 
     nativeBuildInputs = [ xar cpio makeWrapper ];

pkgs/applications/virtualization/docker/default.nix

@@ -21,33 +21,38 @@ rec {
     }:
   let
     docker-runc = runc.overrideAttrs (oldAttrs: {
-      name = "docker-runc-${version}";
+      pname = "docker-runc";
       inherit version;
+
       src = fetchFromGitHub {
         owner = "opencontainers";
         repo = "runc";
         rev = runcRev;
         sha256 = runcSha256;
       };
+
       # docker/runc already include these patches / are not applicable
       patches = [];
     });
 
     docker-containerd = containerd.overrideAttrs (oldAttrs: {
-      name = "docker-containerd-${version}";
+      pname = "docker-containerd";
       inherit version;
+
       src = fetchFromGitHub {
         owner = "containerd";
         repo = "containerd";
         rev = containerdRev;
         sha256 = containerdSha256;
       };
+
       buildInputs = oldAttrs.buildInputs ++ [ libseccomp ];
     });
 
-    docker-tini = tini.overrideAttrs  (oldAttrs: {
+    docker-tini = tini.overrideAttrs (oldAttrs: {
-      name = "docker-init-${version}";
+      pname = "docker-init";
       inherit version;
+
       src = fetchFromGitHub {
         owner = "krallin";
         repo = "tini";
@@ -63,10 +68,9 @@ rec {
       NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
     });
 
-    moby = buildGoPackage ((optionalAttrs (stdenv.isLinux)) rec {
+    moby = buildGoPackage (optionalAttrs stdenv.isLinux rec {
-      name = "moby-${version}";
+      pname = "moby";
       inherit version;
-      inherit docker-runc docker-containerd docker-proxy docker-tini;
 
       src = moby-src;
 
@@ -75,7 +79,7 @@ rec {
       nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
       buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ];
 
-      extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
+      extraPath = optionals stdenv.isLinux (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
 
       extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
 
@@ -128,25 +132,17 @@ rec {
           --prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath"
       '';
 
-      DOCKER_BUILDTAGS = []
+      DOCKER_BUILDTAGS = [ "journald" "seccomp" ];
-        ++ optional (systemd != null) [ "journald" ]
-        ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
-        ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
-        ++ optional (libseccomp != null) "seccomp";
     });
 
     plugins = optionals buildxSupport [ docker-buildx ]
       ++ optionals composeSupport [ docker-compose ];
     pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; };
   in
-    buildGoPackage ((optionalAttrs (!clientOnly) {
+    buildGoPackage (optionalAttrs (!clientOnly) {
-
+   } // rec {
-    inherit docker-runc docker-containerd docker-proxy docker-tini moby;
-
-   }) // rec {
-    inherit version rev;
-
     pname = "docker";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "docker";
@@ -233,7 +229,6 @@ rec {
       description = "An open source project to pack, ship and run any application as a lightweight container";
       license = licenses.asl20;
       maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ];
-      platforms = with platforms; linux ++ darwin;
     };
 
     # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)

pkgs/development/compilers/mlkit/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mlkit";
-  version = "4.7.1";
+  version = "4.7.2";
 
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
     rev = "v${version}";
-    sha256 = "sha256-7fxyXibq17ikrqhqMj4pnLerBOvkY/7ses4Kjw2GdOY=";
+    sha256 = "sha256-KENOWWyDduIoK7sym9vHKAojRZAR5lYVOtz8I4Z65R0=";
   };
 
   nativeBuildInputs = [ autoreconfHook mlton ];

pkgs/development/coq-modules/equations/default.nix

@@ -63,5 +63,5 @@ with lib; (mkCoqDerivation {
     maintainers = with maintainers; [ jwiegley ];
   };
 }).overrideAttrs (o: {
-  preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1") ".coq"}";
+  preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}";
 })

pkgs/development/embedded/fpga/openfpgaloader/default.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openfpgaloader";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "trabucayre";
     repo = "openFPGALoader";
     rev = "v${version}";
-    sha256 = "sha256-GPPycZTijEMXWgxxtPEhiDJk7FelQcwIGFbbrOHna+w=";
+    sha256 = "sha256-CnJBmbvJ4FfKqdyoD8K94Eeoqly2Q6UV5wQ6EWv2isI=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

pkgs/development/interpreters/rakudo/zef.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zef";
-  version = "0.13.8";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "ugexe";
     repo = "zef";
     rev = "v${version}";
-    sha256 = "sha256-lWlom1LZuYzsV6BzOl232usvJJFlTz1DQOWkuNUTvX4=";
+    sha256 = "sha256-+U9K6PRcWbs5JzlJudcpCCk3zHkqE8L1Sq/wkf68jyY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/java-modules/maven-fod.nix

@@ -53,4 +53,4 @@ stdenv.mkDerivation (rec {
 
     runHook postBuild
   '';
-} // args)
+} // builtins.removeAttrs args [ "mvnFetchExtraArgs" ])

pkgs/development/libraries/libamqpcpp/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
-  version = "4.3.17";
+  version = "4.3.18";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "sha256-DQzetwBpgXE1oG295DCc1m12LSbzRTD3khNbEe0O4Rg=";
+    sha256 = "sha256-cjxzBw2tjZROx5xzdhzZjGNJQe3tC9fHOhF/+uSM+CY=";
   };
 
   buildInputs = [ openssl ];

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "adlfs";
-  version = "2022.7.0";
+  version = "2022.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fsspec";
     repo = pname;
     rev = version;
-    hash = "sha256-79HPJip+nocYo/r8LCb9vdYKVuEh0BBrz/eTJF0eGTA=";
+    hash = "sha256-7gL0B4rOMsMYYqElY9hSZeAICWA+mO5N+Xe357DWgu8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-cdn";
-  version = "3.7.4";
+  version = "3.7.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7ZDhsu5XDE7hDVaG4RdEWcKfVrC2tPwLPdGB+uDXRpA=";
+    hash = "sha256-XeS/ufl+cRW3aqm/1dJ0Crq/pT3Mp0eh02vTm2rCWuI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-iot";
-  version = "8.43.0";
+  version = "8.44.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KYmxcm5523MeHhMD5tdlowezhgXSolywHUBOlVkjsp0=";
+    hash = "sha256-hozd22BeDcFSLQS20+zWZancIgdFevuBbXkt7pe3HfY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/deep-translator/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "deep-translator";
-  version = "1.8.3";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-9YTDvrm5Q8k5G7qDF05651IxMV1BeTcgIAMSxU/bwM0=";
+    sha256 = "sha256-wPpVVopbvuw7wreZ4f0HLz9/NJgyYYIFttw4rhJC1xo=";
   };
 
   propagatedBuildInputs = [

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "mwdblib";
-  version = "4.3.0";
+  version = "4.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "CERT-Polska";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ovF5DljtJynIXxmq9kkqjwzAjP/Yc60CTVPXQg4Rnq8=";
+    hash = "sha256-HQzfa5UmPo+Ccs2eRDwQA9EMzDg7+Nd4jIjBt+7qwzE=";
   };
 
   propagatedBuildInputs = [

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

@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "ormar";
-  version = "0.11.2";
+  version = "0.11.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "collerek";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-L0Tc/MmXDeNbUaHgWaxaY8lu+wUhq1ereqpya150SBg=";
+    hash = "sha256-4tGwhgHLZmvsbaDjmmQ3tXBwUBIxb5EpQrT8VIu/XwY=";
   };
 
   nativeBuildInputs = [
@@ -70,13 +70,51 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'SQLAlchemy = ">=1.3.18,<1.4.39"' 'SQLAlchemy = ">=1.3.18"' \
+      --replace 'SQLAlchemy = ">=1.3.18,<1.4.42"' 'SQLAlchemy = ">=1.3.18"' \
-      --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.6.1"' 'databases = ">=0.5.5"'
+      --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.6.2"' 'databases = ">=0.5.5"'
   '';
 
   disabledTests = [
     # TypeError: Object of type bytes is not JSON serializable
     "test_bulk_operations_with_json"
+    # Tests require a database
+    "test_model_multiple_instances_of_same_table_in_schema"
+    "test_load_all_multiple_instances_of_same_table_in_schema"
+    "test_filter_groups_with_instances_of_same_table_in_schema"
+    "test_model_multiple_instances_of_same_table_in_schema"
+    "test_right_tables_join"
+    "test_multiple_reverse_related_objects"
+    "test_related_with_defaults"
+    "test_model_creation"
+    "test_default_orders_is_applied_on_related_two_fields"
+    "test_default_orders_is_applied_from_relation"
+    "test_sum_method"
+    "test_count_method "
+    "test_queryset_methods"
+    "test_queryset_update"
+    "test_selecting_subset"
+    "test_selecting_subset_of_through_model"
+    "test_simple_queryset_values"
+    "test_queryset_values_nested_relation"
+    "test_queryset_simple_values_list"
+    "test_queryset_nested_relation_values_list"
+    "test_queryset_nested_relation_subset_of_fields_values_list"
+    "test_m2m_values"
+    "test_nested_m2m"
+    "test_nested_flatten_and_exception"
+    "test_queryset_values_multiple_select_related"
+    "test_querysetproxy_values"
+    "test_querysetproxy_values_list"
+    "test_reverse_many_to_many_cascade"
+    "test_not_saved_raises_error"
+    "test_not_existing_raises_error"
+    "test_assigning_related_objects"
+    "test_quering_of_the_m2m_models"
+    "test_removal_of_the_relations"
+    "test_selecting_related"
+    "test_adding_unsaved_related"
+    "test_removing_unsaved_related"
+    "test_quering_of_related_model_works_but_no_result"
   ];
 
   pythonImportsCheck = [

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "22.8.1";
+  version = "22.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    hash = "sha256-oWk6t7PocF7go7EE7nQjHA78G0Q1tAOXBff2zKXDvgU=";
+    hash = "sha256-7VVFWG/KRWD8Ez3yeCJJHRBwvgpSMDXI9IS8ZMr2u5M=";
   };
 
   nativeBuildInputs = [

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyfritzhome";
-  version = "0.6.5";
+  version = "0.6.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "hthiery";
     repo = "python-fritzhome";
     rev = version;
-    hash = "sha256-0wfC4lQeTghN2uDUO8Rn2+G8BYOh2UfCZBDJmTw6Lb0=";
+    hash = "sha256-cRG+Dm3KG6no3/OQCZkvISW1yE5azdDVTa5oTV1sRpk=";
   };
 
   propagatedBuildInputs = [

pkgs/development/quickemu/default.nix

@@ -4,6 +4,7 @@
 , makeWrapper
 , qemu
 , gnugrep
+, gnused
 , lsb-release
 , jq
 , procps
@@ -11,13 +12,16 @@
 , cdrtools
 , usbutils
 , util-linux
+, socat
 , spice-gtk
 , swtpm
+, unzip
 , wget
 , xdg-user-dirs
 , xrandr
 , zsync
 , OVMF
+, OVMFFull
 , quickemu
 , testers
 }:
@@ -25,6 +29,7 @@ let
   runtimePaths = [
     qemu
     gnugrep
+    gnused
     jq
     lsb-release
     procps
@@ -32,6 +37,8 @@ let
     cdrtools
     usbutils
     util-linux
+    unzip
+    socat
     spice-gtk
     swtpm
     wget
@@ -43,31 +50,33 @@ in
 
 stdenv.mkDerivation rec {
   pname = "quickemu";
-  version = "4.0";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickemu";
     rev = version;
-    sha256 = "sha256-CiCQg1UsSAwlEnZEmzU2ynn2RZ+wXPv9FV1b9GVkc00=";
+    hash = "sha256-+ksv1DBNby3bJx2ylnDkqlQfsFIDRS/hZvsJn2+bcz8=";
   };
 
-  patches = [
+  postPatch = ''
-    ./input_overrides.patch
+    sed -i \
-  ];
+      -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \
+      -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.fd}/FV/OVMF_CODE.fd","${OVMF.fd}/FV/OVMF_VARS.fd" |' \
+      -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \
+      -e 's/Icon=.*qemu.svg/Icon=qemu/' \
+      quickemu
+  '';
 
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 -t "$out/bin" quickemu quickget macrecovery
+    install -Dm755 -t "$out/bin" macrecovery quickemu quickget windowskey
 
-    for f in quickget macrecovery quickemu; do
+    for f in macrecovery quickget quickemu windowskey; do
-      wrapProgram $out/bin/$f \
+      wrapProgram $out/bin/$f --prefix PATH : "${lib.makeBinPath runtimePaths}"
-        --prefix PATH : "${lib.makeBinPath runtimePaths}" \
-        --set ENV_EFI_CODE "${OVMF.fd}/FV/OVMF_CODE.fd" \
-        --set ENV_EFI_VARS "${OVMF.fd}/FV/OVMF_VARS.fd"
     done
 
     runHook postInstall

pkgs/development/quickemu/input_overrides.patch

@@ -1,37 +0,0 @@
-diff --git a/quickemu b/quickemu
-index 24e1007..39cd5e4 100755
---- a/quickemu
-+++ b/quickemu
-@@ -196,7 +196,7 @@ function efi_vars() {
- 
-   if [ ! -e "${VARS_OUT}" ]; then
-     if [ -e "${VARS_IN}" ]; then
--      cp "${VARS_IN}" "${VARS_OUT}"
-+      cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}"
-     else
-       echo "ERROR! ${VARS_IN} was not found. Please install edk2."
-       exit 1
-@@ -383,7 +383,10 @@ function vm_boot() {
-     # https://bugzilla.redhat.com/show_bug.cgi?id=1929357#c5
-     case ${secureboot} in
-       on)
--         if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
-+        if [[ ${ENV_EFI_CODE_SECURE} && ${ENV_EFI_CODE_SECURE-x} ]] && [[ ${ENV_EFI_VARS_SECURE} && ${ENV_EFI_VARS_SECURE-x} ]]; then
-+           EFI_CODE="${ENV_EFI_CODE_SECURE}"
-+           efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}"
-+        elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
-           EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.secboot.fd"
-           efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}"
-         elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd" ]; then
-@@ -408,7 +411,10 @@ function vm_boot() {
-         fi
-         ;;
-       *)
--        if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ]; then
-+        if [[ ${ENV_EFI_CODE} && ${ENV_EFI_CODE-x} ]] && [[ ${ENV_EFI_VARS} && ${ENV_EFI_VARS-x} ]]; then
-+          EFI_CODE="${ENV_EFI_CODE}"
-+          efi_vars "${ENV_EFI_VARS}" "${EFI_VARS}"
-+        elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ]; then
-           EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.fd"
-           efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}"
-         elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.fd" ]; then

pkgs/development/tools/analysis/rr/unstable.nix

@@ -1,22 +0,0 @@
-# This is a temporary copy of the default.nix in this folder, with the version
-# updated to the current tip of rr's master branch. This exists because rr has
-# not had a release in a long time. Upstream has stated that it should be fine
-# to use master. This file, and its attribute in all-packages, can be removed
-# once rr makes a release.
-
-{ callPackage, fetchFromGitHub }:
-
-let
-  rr = callPackage ./. {};
-in
-
-  rr.overrideAttrs (old: {
-    version = "unstable-2022-05-12";
-
-    src = fetchFromGitHub {
-      owner = "mozilla";
-      repo = "rr";
-      rev = "c96cb688106634ad09af6214aa91252c3a4f74b1";
-      sha256 = "sha256-K4cEQnvBXr/j9qXCgIHLqMrRzm96ushTO5STivRj+Mk=";
-    };
-  })

pkgs/development/tools/build-managers/gradle/default.nix

@@ -3,10 +3,38 @@
 rec {
   gen =
 
-    { version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }:
+    { version, nativeVersion, sha256,
 
-    { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava
+      # The default JDK/JRE that will be used for derived Gradle packages.
-    , javaToolchains ? [ ], ncurses5, ncurses6 }:
+      # A current LTS version of a JDK is a good choice.
+      defaultJava ? jdk8,
+
+      # The platforms supported by this Gradle package.
+      # Gradle Native-Platform ships some binaries that
+      # are compatible only with specific platforms.
+      # As of 2022-04 this affects platform compatibility
+      # of multiple Gradle releases, so this is used as default.
+      # See https://github.com/gradle/native-platform#supported-platforms
+      platforms ? [
+        "aarch64-darwin"
+        "aarch64-linux"
+        "i686-windows"
+        "x86_64-cygwin"
+        "x86_64-darwin"
+        "x86_64-linux"
+        "x86_64-windows"
+      ]
+    }:
+
+    { lib, stdenv, fetchurl, makeWrapper, unzip, ncurses5, ncurses6,
+
+      # The JDK/JRE used for running Gradle.
+      java ? defaultJava,
+
+      # Additional JDK/JREs to be registered as toolchains.
+      # See https://docs.gradle.org/current/userguide/toolchains.html
+      javaToolchains ? [ ]
+    }:
 
     stdenv.mkDerivation rec {
       pname = "gradle";
@@ -23,20 +51,18 @@ rec {
       nativeBuildInputs = [ makeWrapper unzip ];
       buildInputs = [ java ];
 
-      # NOTE: For more information on toolchains,
-      # see https://docs.gradle.org/current/userguide/toolchains.html
       installPhase = with builtins;
         let
           toolchain = rec {
-            var = x: "JAVA_TOOLCHAIN_NIX_${toString x}";
+            prefix = x: "JAVA_TOOLCHAIN_NIX_${toString x}";
-            vars = (lib.imap0 (i: x: ("${var i} ${x}")) javaToolchains);
+            varDefs  = (lib.imap0 (i: x: "${prefix i} ${x}") javaToolchains);
-            varNames = lib.imap0 (i: x: var i) javaToolchains;
+            varNames = lib.imap0 (i: x: prefix i) javaToolchains;
             property = " -Porg.gradle.java.installations.fromEnv='${
                  concatStringsSep "," varNames
                }'";
           };
-          vars = concatStringsSep "\n" (map (x: "  --set ${x} \\")
+          varDefs = concatStringsSep "\n" (map (x: "  --set ${x} \\")
-            ([ "JAVA_HOME ${java}" ] ++ toolchain.vars));
+            ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs));
         in ''
           mkdir -pv $out/lib/gradle/
           cp -rv lib/ $out/lib/gradle/
@@ -44,7 +70,7 @@ rec {
           gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
           test -f $gradle_launcher_jar
           makeWrapper ${java}/bin/java $out/bin/gradle \
-            ${vars}
+            ${varDefs}
             --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}"
         '';
 
@@ -74,6 +100,7 @@ rec {
       '';
 
       meta = with lib; {
+        inherit platforms;
         description = "Enterprise-grade build system";
         longDescription = ''
           Gradle is a build system which offers you ease, power and freedom.
@@ -91,12 +118,12 @@ rec {
           binaryNativeCode
         ];
         license = licenses.asl20;
-        platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix;
         maintainers = with maintainers; [ lorenzleutgeb liff ];
       };
     };
 
-  # NOTE: Default JDKs are LTS versions and according to
+  # NOTE: Default JDKs that are hardcoded below must be LTS versions
+  # and respect the compatibility matrix at
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_7 = gen {
@@ -104,9 +131,6 @@ rec {
     nativeVersion = "0.22-milestone-23";
     sha256 = "1hjifd98dif0qy6vkqp56v9z7id5cf2bfkdd71ld8nsqqlig51yb";
     defaultJava = jdk17;
-    # Gradle 7 ships some binaries that are only available for some platforms
-    # See https://github.com/gradle/native-platform#supported-platforms
-    supportedPlatforms =  [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows"  ];
   };
 
   gradle_6 = gen {
@@ -114,12 +138,10 @@ rec {
     nativeVersion = "0.22-milestone-20";
     sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb";
     defaultJava = jdk11;
-    # Gradle 6 ships some binaries that are only available for some platforms
-    # See https://github.com/gradle/native-platform#supported-platforms
-    supportedPlatforms =  [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows"  ];
   };
 
   # NOTE: No GitHub Release for the following versions. `update.sh` will not work.
+
   gradle_5 = gen {
     version = "5.6.4";
     nativeVersion = "0.18";

pkgs/development/tools/changie/default.nix

@@ -13,12 +13,16 @@ buildGoModule rec {
 
   vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg=";
 
+  patches = [ ./skip-flaky-test.patch ];
+
+  ldflags = [ "-s" "-w" "-X=main.version=${version}" ];
+
   meta = with lib; {
     homepage = "https://changie.dev";
+    changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md";
     description = "Automated changelog tool for preparing releases with lots of customization options";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with maintainers; [ figsoda matthiasbeyer ];
   };
 }
-

pkgs/development/tools/changie/skip-flaky-test.patch

@@ -0,0 +1,10 @@
+--- a/core/change_test.go
++++ b/core/change_test.go
+@@ -353,6 +353,7 @@ var _ = Describe("Change ask prompts", func() {
+ 	})
+ 
+ 	It("gets error for invalid body", func() {
++		Skip("")
+ 		var min int64 = 5
+ 		submitFailed := false
+ 		config := Config{

pkgs/development/tools/continuous-integration/drone/default.nix

@@ -1,23 +1,26 @@
-{ lib, fetchFromGitHub, buildGoModule
+{ lib
-, enableUnfree ? true }:
+, fetchFromGitHub
+, buildGoModule
+, enableUnfree ? true
+}:
 
 buildGoModule rec {
   pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
-  version = "2.12.1";
+  version = "2.13.0";
-
-  vendorSha256 = "sha256-hKJFYjIJVuGBiSIeTitI7kZdGjSRUTCPMhH72O0wm3I=";
-
-  doCheck = false;
 
   src = fetchFromGitHub {
     owner = "harness";
     repo = "drone";
     rev = "v${version}";
-    sha256 = "sha256-ZngZzpFjQLkiBDNrmgPXPCfDoeZbX/ynBXkuNrrGz3E=";
+    sha256 = "sha256-2NezH7+hsOz+r+gong2CxXVjtxRyIKkA0G6OGoJcGFk=";
   };
 
+  vendorSha256 = "sha256-6/wbxQ+Cv0lOlBqi8NUQQ8Z21w27betfeX/NiNDpOjA=";
+
   tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ];
 
+  doCheck = false;
+
   meta = with lib; {
     maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ];
     license = with licenses; if enableUnfree then unfreeRedistributable else asl20;

pkgs/development/tools/konf/default.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "konf";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "SimonTheLeg";
     repo = "konf-go";
     rev = "v${version}";
-    hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k=";
+    hash = "sha256-n8WJyihpbtci8Q6zUapwrpTrVZVAS53OpnwAsv6w1FY=";
   };
 
   vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8=";

pkgs/development/tools/kubernetes-controller-tools/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "controller-tools";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fMLydjdL9GCSX2rf7ORW1RhZJpjA0hyeK40AwKTkrxg=";
+    sha256 = "sha256-244o+QZ0BGVe8t8AWf1wU6VHgYyzkATpr5ZTbZezk10=";
   };
 
-  vendorSha256 = "sha256-6luowQB/j8ipHSuWMHia8SdacienDzpV8g2JH3k0W80=";
+  vendorSha256 = "sha256-sVdSKu6TDGIDV2o+kuCvGCItbFe9MwlM2Qjiz8n2rZU=";
 
   doCheck = false;
 

pkgs/development/tools/lightningcss/default.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lightningcss";
-  version = "1.15.1";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "parcel-bundler";
     repo = "lightningcss";
     rev = "v${version}";
-    sha256 = "sha256-VRRSi4VF58E+d8cpX/shb4lBVBeTXHAaHJriTYYte/8=";
+    sha256 = "sha256-ze8+/34KeSQi2ftcpJYjF/EEFKYxkYijkpf+5eTo0Nk=";
   };
 
-  cargoSha256 = "sha256-duGCc+tWJ2J4wJL2ErZ3bGslxBERH0Xrb2taVaEOdas=";
+  cargoSha256 = "sha256-4lJi1jCJoJdOz+NrlXS4O59rSq9Mz4e4O3zFNE/v+dE=";
 
   buildFeatures = [ "cli" ];
 

pkgs/development/tools/misc/circleci-cli/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.21194";
+  version = "0.1.21289";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YBo0Td4UEr27AU1yqwXNKWjfWYMuKdgmRNmNUfgL3F0=";
+    sha256 = "sha256-ETxN/oUs0WMziBqUP9Zr9Vvo+sA1jSMxYJVKOC/Jby0=";
   };
 
   vendorSha256 = "sha256-vydx3ZaVSpIn5nncuQhRVQqZ7920n1NAoZIHFvzrQgo=";

pkgs/development/tools/mod/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mod";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "marwan-at-work";
     repo = "mod";
     rev = "v${version}";
-    sha256 = "sha256-ZmBh59za1OaFObmNzLtuLKkbR0mBeh6OeD+EHton0nE=";
+    sha256 = "sha256-7J9BEJ43mNbz6vjeN7Ygn/z+DOp8aGGZI9FhRALFOUk=";
   };
 
-  vendorSha256 = "sha256-+87QR3l9XBJVsx4+8ixaidTHaKyLAxMA9CguOlTVoHM=";
+  vendorSha256 = "sha256-NvTbQcYGMyQ/bfNTJ3eC28n9TIU4HkcD3ij2o9EBX3Y=";
 
   doCheck = false;
 

pkgs/games/sgt-puzzles/default.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sgt-puzzles";
-  version = "20220802.8399cff";
+  version = "20220913.27dd36e";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-f68Nj8P8oIJj1LWyq8Iamv32ex+boPH/lsV5t+YhM9o=";
+    hash = "sha256-fj1XWuXcW01uuC5dK2wDIrweyruSRdfEZBfmEj99zZE=";
   };
 
   sgt-puzzles-menu = fetchurl {

pkgs/games/supertux/default.nix

@@ -58,9 +58,10 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Classic 2D jump'n run sidescroller game";
-    homepage = "http://supertux.github.io/";
+    homepage = "https://supertux.github.io/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; linux;
+    mainProgram = "supertux2";
   };
 }

pkgs/os-specific/linux/kernel/hardened/config.nix

@@ -72,8 +72,12 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4");
   GCC_PLUGIN_STRUCTLEAK = whenAtLeast "4.11" yes; # A port of the PaX structleak plugin
   GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = whenAtLeast "4.14" yes; # Also cover structs passed by address
   GCC_PLUGIN_STACKLEAK = whenAtLeast "4.20" yes; # A port of the PaX stackleak plugin
-  GCC_PLUGIN_RANDSTRUCT = whenAtLeast "4.13" yes; # A port of the PaX randstruct plugin
+  GCC_PLUGIN_RANDSTRUCT = whenBetween "4.13" "5.19" yes; # A port of the PaX randstruct plugin
-  GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenAtLeast "4.13" yes;
+  GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenBetween "4.13" "5.19" yes;
+
+  # Same as GCC_PLUGIN_RANDSTRUCT*, but has been renamed to `RANDSTRUCT*` in 5.19.
+  RANDSTRUCT = whenAtLeast "5.19" yes;
+  RANDSTRUCT_PERFORMANCE = whenAtLeast "5.19" yes;
 
   # Disable various dangerous settings
   ACPI_CUSTOM_METHOD = no; # Allows writing directly to physical memory

pkgs/os-specific/linux/kernel/hardened/patches.json

@@ -41,10 +41,10 @@
     },
     "5.19": {
         "patch": {
-            "extra": "-hardened1",
+            "extra": "-hardened2",
-            "name": "linux-hardened-5.19.8-hardened1.patch",
+            "name": "linux-hardened-5.19.8-hardened2.patch",
-            "sha256": "1j7wg4hq06drxr42jl89za1f7x52d4ck5i38p4njz4j415ihsiys",
+            "sha256": "1dfgnx2yr5d5kh2d8r7ywqkyjq1rfni2b5sdpqly0w986rlkw48k",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.8-hardened1/linux-hardened-5.19.8-hardened1.patch"
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.8-hardened2/linux-hardened-5.19.8-hardened2.patch"
         },
         "sha256": "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1",
         "version": "5.19.8"

pkgs/os-specific/linux/kernel/hardened/update.py

@@ -138,7 +138,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
     if not sig_ok:
         return None
 
-    kernel_ver = release_info.release.tag_name.replace("-hardened1", "")
+    kernel_ver = re.sub(r"(.*)(-hardened[\d]+)$", r'\1', release_info.release.tag_name)
     major = kernel_ver.split('.')[0]
     sha256_kernel, _ = nix_prefetch_url(f"mirror://kernel/linux/kernel/v{major}.x/linux-{kernel_ver}.tar.xz")
 

pkgs/os-specific/linux/kernel/linux-libre.nix

@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "18911";
+    rev = "18916";
-    sha256 = "1f5b936a7ayva2kyly3n71sg6cqdvcavcxbj3cy3imaj9247bx72";
+    sha256 = "0axjbr1zbj7izkvvz2nv4ij1xjjnbxpch43cpl169cr8rqdl6n6i";
   }
 , ...
 }:

pkgs/os-specific/linux/kernel/manual-config.nix

@@ -131,11 +131,14 @@ let
         # the buildFlags, but that would require also patching the kernel's
         # toplevel Makefile to add a variable export. This would be likely to
         # cause future patch conflicts.
-        if [ -f scripts/gcc-plugins/gen-random-seed.sh ]; then
+        for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do
-          substituteInPlace scripts/gcc-plugins/gen-random-seed.sh \
+          if [ -f "$file" ]; then
-            --replace NIXOS_RANDSTRUCT_SEED \
+            substituteInPlace "$file" \
-            $(echo ${randstructSeed}${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
+              --replace NIXOS_RANDSTRUCT_SEED \
-        fi
+              $(echo ${randstructSeed}${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
+            break
+          fi
+        done
 
         patchShebangs scripts
 

pkgs/servers/dns/doh-proxy-rust/default.nix

@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "doh-proxy-rust";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchCrate {
     inherit version;
     crateName = "doh-proxy";
-    sha256 = "sha256-/637lR6OycVOOUVe29uFR1LtYIoFJ6gslDV9uAGkU1A=";
+    sha256 = "sha256-IuLNgyPiAPYu440jMtpXxEuQDIn9TUMjnD7y8WB+Ujs=";
   };
 
-  cargoSha256 = "sha256-tadTyWSuknAjosv7AvZF0/8FlHL/zcFT5LDW1KcMeHI=";
+  cargoSha256 = "sha256-qrLhRNaGG7n9UPtkqNkJvnf+w9P0iLQ7MkIxnWYqYLM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
 

pkgs/servers/snappymail/default.nix

@@ -2,11 +2,11 @@
 , dataPath ? "/var/lib/snappymail" }:
 stdenv.mkDerivation rec {
   pname = "snappymail";
-  version = "2.17.3";
+  version = "2.18.1";
 
   src = fetchurl {
     url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
-    sha256 = "sha256-Ajbii8Amd5ziNNbYccL1nM0Yqbo3xF1XOByAebpEMuk=";
+    sha256 = "sha256-0NsDm1dDMg0HbAmuGIrNRkwtjvaZ9QYh7GUXkOJNoKw=";
   };
 
   sourceRoot = "snappymail";

pkgs/servers/web-apps/wiki-js/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wiki-js";
-  version = "2.5.288";
+  version = "2.5.289";
 
   src = fetchurl {
     url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
-    sha256 = "sha256-3Bfkmv/DP7L37puhHarfe6ntwJ1d/2v0UMAabcv0Gco=";
+    sha256 = "sha256-hHUVHsRRlwFxHriaf7uHsaxRvQmeOKFHvz/taooK4YM=";
   };
 
   sourceRoot = ".";

pkgs/shells/carapace/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "carapace";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "rsteube";
     repo = "${pname}-bin";
     rev = "v${version}";
-    sha256 = "sha256-3ZWYEfssGq6fBoHrDsp6yvkB9TLF+heELEIbZ1TN2lI=";
+    sha256 = "sha256-zfW2YbMybE2ZOYVNdmxAE0HwDTDeaVa0SrSUahyuTTk=";
   };
 
-  vendorSha256 = "sha256-OrbVqCgsVX5b5knN6IdlJBWeGfg2fh09a2xe5+2EGEs=";
+  vendorSha256 = "sha256-MIgV8of3d9STMYtK+9gGkKBZ5Y4l5NhofK5F1Yfi/kE=";
 
   subPackages = [ "./cmd/carapace" ];
 

pkgs/tools/admin/procs/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-O5q+T6GO03Wf26CLyEgS45h7O38HsVZ+EJi8TgFcNaI=";
+    sha256 = "sha256-/xq1aLdr672v4iAXXLcu47QcsdbLErn3VN/w3sYo9y0=";
   };
 
-  cargoSha256 = "sha256-JZsDKeiF/Mg4P6dLaN+8+TLHnCsB97d9TDn4cSdzZZE=";
+  cargoSha256 = "sha256-BykfUGKBiqr3DoYcqKpY3R84LAuJ19D94xnZcQGKwuI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/audio/mpd-discord-rpc/default.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mpd-discord-rpc";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-/QWIoP6KcrI8cYTh3x2lQz7nPSvzb1zRWg8TFoYY9vE=";
+    sha256 = "sha256-Iw4n3xcc+589/42SfnAklEWTkgwZKAk84dS8fXXLcvs=";
   };
 
-  cargoSha256 = "sha256-46PS1+ud7GYuMOJMp93Hf7+nlngvgL67zedaF44TcYY=";
+  cargoSha256 = "sha256-Ss6UUznt9g3XWdeCuMG0y9NxWpGOmHbKsQqOMGOK2jo=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/tools/cd-dvd/ventoy-bin/default.nix

@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ventoy-bin";
-  version = "1.0.79";
+  version = "1.0.80";
 
   src = fetchurl {
     url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz";
-    hash = "sha256-azkoDquN/i01QHsd1wJG79kdhHhBvXzPXIRnjKHAHNE=";
+    hash = "sha256-FmMpMUy8VqwbOiRWZdoY76ToSoWWbBGM5h/9VS8rYRY=";
   };
 
   patches = [

pkgs/tools/misc/cf-terraforming/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "cf-terraforming";
-  version = "0.8.5";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cf-terraforming";
     rev = "v${version}";
-    sha256 = "1h0apmcddz1c32rlnjs81fjwpxpkz9n2zalwmk05frrgd8zdbixs";
+    sha256 = "sha256-mKpNKD5+vJ2rf/TjyZ09Hn/F+xTSFL6wsmOx554oA2c=";
   };
 
-  vendorSha256 = "sha256-a/gUxW4/Kv1BuhXpwibb6u7gO8lBo250ark1kwMLToo=";
+  vendorSha256 = "sha256-g8Om1LZEDSpe4L94AjHAuawx9jtWm//rO27jXhvhrQY=";
   ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ];
 
   # The test suite insists on downloading a binary release of Terraform from

pkgs/tools/misc/esphome/dashboard.nix

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "esphome-dashboard";
-  version = "20220508.0";
+  version = "20220920.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-nBVVNe6Qwo72ws6G8WAO99f2ftbxoixOB0eiLuILyeg=";
+    sha256 = "sha256-qmutcnsz3utVUmVZZEYYiemOGdQ4Ima2ueD4LyYaOdU=";
   };
 
   # no tests

pkgs/tools/misc/esphome/default.nix

@@ -15,14 +15,14 @@ let
 in
 with python.pkgs; buildPythonApplication rec {
   pname = "esphome";
-  version = "2022.8.3";
+  version = "2022.9.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ep3o8VfY5jAsdheLpZF0TdWA/F9YO/owWEuPR7+0LeA=";
+    hash = "sha256-j6qzCzPiChvO1WR+ZaVILgONcdOzwlE4TBDnI9R6FjM=";
   };
 
   postPatch = ''

pkgs/tools/misc/interactsh/default.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "interactsh";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pqmW2lzZ0jVvS77vPisSc8dtmDvFajuLeiUeGpUXDB8=";
+    sha256 = "sha256-egM3ZlY/xjUu/Bxg58d7YET2PT3prf6ooZY+s/9faWQ=";
   };
 
-  vendorSha256 = "sha256-nS3j6334hHiXZMpHmVKTHlkDYGThE1q5b8LS4n26tB4=";
+  vendorSha256 = "sha256-Y6ErkDHnXJtdzEykD5EZYHRfHDPicE0sAzT2UXUNTGY=";
 
   modRoot = ".";
   subPackages = [

pkgs/tools/misc/krapslog/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "krapslog";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "acj";
     repo = "krapslog-rs";
     rev = version;
-    sha256 = "sha256-ETP0BvtfMHznEbM0Vu/gMoRvXn4y2XcXw6CoU60A+Cg=";
+    sha256 = "sha256-MzO6fcBlrGeZoflyFXPVIdQ+y/GkQz3yEeEbXLoDZQY=";
   };
 
-  cargoSha256 = "sha256-ioD0V1S/kPF5etey04Xz1Iz/jDpyunx9PtpWKdwk21g=";
+  cargoSha256 = "sha256-r5UGCEMAEVIdVeBPsgBf/CMYtBPS03Joje4sNQ8XfFA=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 

pkgs/tools/misc/sfz/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sfz";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "weihanglo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-XY1xsQgXzmX8jmDDLIivXeW9MsNA/pVtYapcBkBhldE=";
+    hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI=";
   };
 
-  cargoSha256 = "sha256-w3HKnCAPSVgx4mqNB7Q0sMCDC4U+4fdIUUwJFz19XdI=";
+  cargoSha256 = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24=";
 
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
   doCheck = false;

pkgs/tools/networking/netbird/default.nix

@@ -14,16 +14,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-lW5Xaf1d0udm8yLzGhmCmd13SYHdbIBi/bjuiRAdjRg=";
+    sha256 = "sha256-x5TJChvpeiAPye9YkIMJYumvCUHULUVjC371ZoaHkUM=";
   };
 
-  vendorSha256 = "sha256-qBglJ9PYUApyOrZhZRvyK3WMcZQglDHmsy3Qv5K1PqA=";
+  vendorSha256 = "sha256-VyYw8Hp2qWoRBeOFsgtxmvFN2cYzuDeYmWAwC/+vjI0=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

pkgs/tools/security/modsecurity-crs/default.nix

@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.2";
+  version = "3.3.4";
   pname = "modsecurity-crs";
 
   src = fetchFromGitHub {
     owner = "coreruleset";
     repo = "coreruleset";
     rev = "v${version}";
-    sha256 = "sha256-m/iVLhk2y5BpYu8EwC2adrrDnbaVCQ0SE25ltvMokCw=";
+    sha256 = "sha256-WDJW4K85YdHrw9cys3LrnZUoTxc0WhiuCW6CiC1cAbk=";
   };
 
   installPhase = ''

pkgs/tools/text/mdbook-open-on-gh/default.nix

@@ -0,0 +1,22 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "mdbook-open-on-gh";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "badboy";
+    repo = pname;
+    rev = "2.2.0";
+    sha256 = "sha256-x7ESuXoF5dYnJZpgDyYliVixCG4w/VX/Vhm3VqxsiEI=";
+  };
+
+  cargoSha256 = "sha256-FVcCzL0jJ827HHS/9G597QjNFY3HLNYHCPWcepEulD0=";
+
+  meta = with lib; {
+    description = "mdbook preprocessor to add a open-on-github link on every page";
+    homepage = "https://github.com/badboy/mdbook-open-on-gh";
+    license = [ licenses.mpl20 ];
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}

pkgs/tools/text/mmdoc/default.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mmdoc";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "ryantm";
     repo = "mmdoc";
     rev = version;
-    hash = "sha256-Lz2+vsXjz9BVOCI1vIrNTvZgh19OuvXEhnMw2QBZr1w=";
+    hash = "sha256-c2YwlvJQfVRjldzfOjTSztIUg64GWq+5ijkFxp4qA8I=";
   };
 
   nativeBuildInputs = [ ninja meson pkg-config xxd ];

pkgs/top-level/aliases.nix

@@ -1257,6 +1257,7 @@ mapAliases ({
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21
   rpiboot-unstable = rpiboot; # Added 2021-07-30
+  rr-unstable = rr; # Added 2022-09-17
   rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22
   rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25
   rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08

pkgs/top-level/all-packages.nix

@@ -8339,6 +8339,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  mdbook-open-on-gh = callPackage ../tools/text/mdbook-open-on-gh { };
+
   mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -17113,7 +17115,6 @@ with pkgs;
   rolespec = callPackage ../development/tools/misc/rolespec { };
 
   rr = callPackage ../development/tools/analysis/rr { };
-  rr-unstable = callPackage ../development/tools/analysis/rr/unstable.nix { }; # This is a temporary attribute, please see the corresponding file for details.
 
   rufo = callPackage ../development/tools/rufo { };
 

pkgs/top-level/linux-kernels.nix

@@ -244,6 +244,7 @@ in {
     linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
     linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
     linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
+    linux_5_19_hardened = hardenedKernelFor kernels.linux_5_19 { };
 
   }));
   /*  Linux kernel modules are inherently tied to a specific kernel.  So
@@ -569,6 +570,7 @@ in {
     linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
     linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
     linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
+    linux_5_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_19 { });
 
     linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
     linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);