From 6dcbf260ccefe07fb4559faf8a3bcfd8154252a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Tue, 24 May 2022 12:24:55 -0300 Subject: [PATCH 1/4] swaynotificationcenter: 0.5 -> 0.6.1 --- pkgs/applications/misc/swaynotificationcenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index c05778d6aaea..5139fec338c3 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "SwayNotificationCenter"; - version = "0.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-Jjbr6GJ0MHlO+T/simPNYQnB5b7Cr85j4GRjRGa5B6s="; + hash = "sha256-+vMlhBCLxvqfPRO2U9015srhY/2sd1DoV27kzNDjsqs="; }; nativeBuildInputs = [ gobject-introspection meson ninja pkg-config scdoc vala wrapGAppsHook ]; From 868e5192385b8aab48a1e1c842e4317f912bc0ad Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 May 2022 19:24:49 +0200 Subject: [PATCH 2/4] php: Upgrade from PHP 8.0 to 8.1 as default PHP --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 ++++++- nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 4abcf0165a4b..79268b398e60 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -10,7 +10,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: - + During cross-compilation, tests are now executed if the test @@ -31,6 +31,11 @@ stdenv.buildPlatform.canExecute stdenv.hostPlatform. + + + PHP now defaults to PHP 8.1, updated from 8.0. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6dec063f4032..7d2eacce57fe 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -17,6 +17,8 @@ In addition to numerous new and upgraded packages, this release has the followin built for `stdenv.hostPlatform` (i.e. produced by `stdenv.cc`) by evaluating `stdenv.buildPlatform.canExecute stdenv.hostPlatform`. +- PHP now defaults to PHP 8.1, updated from 8.0. + ## New Services {#sec-release-22.11-new-services} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52667051b855..ac0f65c04d87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14355,7 +14355,7 @@ with pkgs; # PHP interpreters, packages and extensions. # # Set default PHP interpreter, extensions and packages - php = php80; + php = php81; phpExtensions = php.extensions; phpPackages = php.packages; From cbf736eb3906fd1d4c3efba40d3846140a616b9b Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 25 May 2022 09:12:42 +0800 Subject: [PATCH 3/4] CODEOWNERS: remove expipiplus1 from haskell Hopefully temporarily, just too many notifications at the moment --- .github/CODEOWNERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 00c8dabe918f..557542772cf7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -98,13 +98,13 @@ /pkgs/development/interpreters/python/hooks @FRidh @jonringer # Haskell -/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1 -/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1 -/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @expipiplus1 -/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @expipiplus1 -/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1 -/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 -/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 +/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn +/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn +/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn +/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn +/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn +/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn +/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn # Perl /pkgs/development/interpreters/perl @stigtsp @zakame From 68dfbe0683f3738f06062be4dcef7736d081670d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 24 May 2022 09:51:23 +1000 Subject: [PATCH 4/4] shfmt: 3.5.0 -> 3.5.1 https://github.com/mvdan/sh/releases/tag/v3.5.1 --- pkgs/tools/text/shfmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index e23e79473b1e..054e345be8db 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-ZhuOOZ+Lttan7R5YgpiM5okGNkSH0NRUj4hHd1ELbLI="; + sha256 = "sha256-/fNKgUh0AnyW1MOuTwk/deT5MnQMy8zMUA1KEdaM8SY="; }; vendorSha256 = "sha256-3eao9bORPTsyCFpafp89mcL2Y7HNBlDfUsTull7qnYs=";