From ee8ae2da4c3fe46c5aa40a80185861db9d45ba5c Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 13 Nov 2022 22:11:19 +0100 Subject: [PATCH 01/14] nixos/doc: fix installing from other distro The nixos-generate-config command mentioned in the manual fails with error: nixos-generate-config: no need to specify `/` with `--root`, it is the default This was introduced in 611b8c4472db0bde066b97960ccfe4671ffb89fb (#161034). Now, the command should be called without any arguments. --- .../installation/installing-from-other-distro.section.xml | 2 +- .../manual/installation/installing-from-other-distro.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml index 024a24379dd6..35309a7aa326 100644 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -211,7 +211,7 @@ $ sudo groupdel nixbld Generate your NixOS configuration: -$ sudo `which nixos-generate-config` --root / +$ sudo `which nixos-generate-config` Note that this will place the generated configuration files in diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index fa8806f791d5..b9ccf1415179 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -148,7 +148,7 @@ The first steps to all these are the same: Generate your NixOS configuration: ```ShellSession - $ sudo `which nixos-generate-config` --root / + $ sudo `which nixos-generate-config` ``` Note that this will place the generated configuration files in From b6624e467c10767aeeca15642062734dddc58c9e Mon Sep 17 00:00:00 2001 From: toastal Date: Wed, 16 Nov 2022 11:23:19 +0700 Subject: [PATCH 02/14] =?UTF-8?q?senpai:=20unstable-2022-11-04=20=E2=86=92?= =?UTF-8?q?=20unstable-2022-11-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Print date as dd/mm or mm/dd depending on the user locale • Enable receiving away updates for private buffers --- pkgs/applications/networking/irc/senpai/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 7fd54b70e9cd..0721d720cc7c 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2022-11-04"; + version = "unstable-2022-11-15"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "3be87831281af1c91a6e406986f317936a0b98bc"; - sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8="; + rev = "cb0ba0669522ecf8ab0b0c3ccd0f14827eb65832"; + sha256 = "sha256-Ny7TAKdh7RFGlrMRVIyCFFLqOanNWK+qGBbh+dVngMs="; }; - vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU="; + vendorSha256 = "sha256-dCADJ+k2vWLpgN251/gEyAg6WhPGK2DEWRaAHSHp1aM="; subPackages = [ "cmd/senpai" From 4236d385f985aa859695f700487b63ecfac5b80e Mon Sep 17 00:00:00 2001 From: toastal Date: Wed, 2 Nov 2022 21:58:45 +0700 Subject: [PATCH 03/14] =?UTF-8?q?zfsUnstable:=202.1.7-2022-10-27=20?= =?UTF-8?q?=E2=86=92=202.1.7-2022-11-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several commits have been added, including the META for official 6.0.0 support --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5309c6abe241..a7a6a9b7954e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -235,10 +235,10 @@ in { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.7-staging-2022-10-27"; - rev = "04f1983aab16d378be376768275856bc38be48bd"; + version = "2.1.7-staging-2022-11-08"; + rev = "0f4ee295ba94803e5833f57481cfdbee5d1160d4"; - sha256 = "sha256-6s9Qcw6Qqq7+JU9UPa8DDu2yzhD1OV3piLlYsgEoIhg="; + sha256 = "sha256-AixYjnr8MgST/VxEPY4NdcAvpoKiJ3zrvOai5bJjC/U="; isUnstable = true; }; From b9a8eae2a4068c05c253508e2063fd0d3d193311 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 20 Nov 2022 09:55:54 +0100 Subject: [PATCH 04/14] teamviewer: remove qtwebkit due to https://github.com/NixOS/nixpkgs/pull/201028 and the deprecation of qtwebkit teamviewer refuses to evaluate. qtwebkit isn't needed for teamviewer and is therefore removed. Signed-off-by: Florian Brandes --- pkgs/applications/networking/remote/teamviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 44ce12aeeb48..f67c096b7063 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus -, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc +, qtbase, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc , libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils , wrapQtAppsHook }: @@ -21,7 +21,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ]; + buildInputs = [ dbus getconf qtbase qtwebengine qtx11extras libX11 ]; propagatedBuildInputs = [ qtquickcontrols ]; installPhase = '' From 9fc764a0bb370f58964d0735cd527fb5c2a60225 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 19:38:44 +0000 Subject: [PATCH 05/14] toot: 0.28.0 -> 0.29.0 --- pkgs/applications/misc/toot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 933464b62631..22df6613008f 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; - rev = version; - sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz"; + rev = "refs/tags/${version}"; + sha256 = "sha256-SrPjotEkP8Z2uYB/4eAJAk3Zmzmr0xET69PmkxQCwFQ="; }; checkInputs = with python3Packages; [ pytest ]; From 6d709beac3c9b58d1e0236e847d1122618ca5773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Mon, 21 Nov 2022 20:50:49 +0100 Subject: [PATCH 06/14] blackbox-terminal: 0.12.1 -> 0.12.2 --- .../terminal-emulators/blackbox-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 9d2d1751ad79..65b0274ca20d 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -26,14 +26,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - sha256 = "sha256-BJtRzjNmJzabI30mySTjWXfN81xj+AWpKhIberXf6Io="; + sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU="; }; postPatch = '' From e21db6e7202fbfcbe16f14145de1ed7fca3b9fc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 03:10:10 +0000 Subject: [PATCH 07/14] git-cliff: 0.9.2 -> 0.10.0 --- .../version-management/git-and-tools/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index 8e765824b223..efc12299f941 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-6OxYIr2ElyB4QHiPV/KAELmKC+qFGpgerhlDPjLvsio="; + sha256 = "sha256-f7nM4airKOTXiYEMksTCm18BN036NQLLwNcKIlhuHWs="; }; - cargoSha256 = "sha256-+C7MXmn3FrhD9UVdRmRZbH/rzleATBT0bdlQUSOae5Y="; + cargoSha256 = "sha256-wjqQAVQ1SCjD24aCwZorUhnfOKM+j9TkB84tLxeaNgo="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 7aac181e81b904943709a609e2d6725c2b1367ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 21:35:16 +0000 Subject: [PATCH 08/14] cargo-lambda: 0.11.3 -> 0.12.0 --- pkgs/development/tools/rust/cargo-lambda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index e4ae0ad4ca77..0bcb6899a997 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEJOoV91DIQL7KPbLQrgCKdCF7ZMSZMHVLq6l1sg4F0="; + sha256 = "sha256-SgA2eKXZIPWbyJkopk8E9rTgkUWl6LWP2dw2fn3H8qc="; }; - cargoSha256 = "sha256-qW4a4VPpPSdt0Z4nRA4/fHpW0cfDxOPQyEAdJidt+0o="; + cargoSha256 = "sha256-rTVc8zzbzLzP0LV8h7IWE1S+ZqDVfnO18iT0CrOrI9A="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 847e77dd2bbb539454d97fbd4d267bb6f48293ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 02:30:02 +0000 Subject: [PATCH 09/14] ferretdb: 0.6.1 -> 0.6.2 --- pkgs/servers/nosql/ferretdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 4054d1c94793..f8281eefb00b 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,20 +5,20 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-oSNE7JJwni+X5AiAmHLuxVI9gMh3AT84xejWgmJSlzk="; + sha256 = "sha256-wjqTYrAVrUl+i+2glSUW1xS/qjvTqRXYu4s3F5Wi0Sc="; }; postPatch = '' echo ${version} > internal/util/version/gen/version.txt ''; - vendorSha256 = "sha256-H/EXUPNMTD6mgcUFupxL5wTLHvAlH5L6bv2GmvsbKms="; + vendorSha256 = "sha256-wjlGAhut9/jZ2GmKg7XmenphkgxWn0VbuvYEtORpbtw="; CGO_ENABLED = 0; From 8e3c88f66e670528efd699a859ce4579f0f6a691 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 19:50:03 +0000 Subject: [PATCH 10/14] pocketbase: 0.7.10 -> 0.8.0 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 1568c08da1f4..a96431cc3126 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.7.10"; + version = "0.8.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KQMCWriPJ3fUXjG+uAqOMbR8dZDrlxQ3iDqyYHhC6hI="; + sha256 = "sha256-z7Vs+Z34r5g62X9DnEVkqTrr+V2bWwkfMXitNz+pVN8="; }; - vendorSha256 = "sha256-i3CRba2HA7dOEh4PU1rNZUl05pZqIm946lIjP7ZcFEc="; + vendorSha256 = "sha256-Ya+D15eAJ7qgEQoM2LcN2VEmmyp4cuS6/wCOEGdrgA8="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 766cc473f7a92163617808190da869357f89f6ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 05:49:57 +0000 Subject: [PATCH 11/14] ikill: 1.5.0 -> 1.6.0 --- pkgs/tools/misc/ikill/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/tools/misc/ikill/default.nix index 176c2f378294..8ca69f8b4410 100644 --- a/pkgs/tools/misc/ikill/default.nix +++ b/pkgs/tools/misc/ikill/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ikill"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "pjmp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sxFuDHlrEO2/gA9I++yNAISvsF7wFjSMUI+diVM/+EI="; + sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs="; }; - cargoSha256 = "sha256-dJa+bXJTA2Jju1p29Fyj87N0Pr/l6XRr3QqemhD2BAA="; + cargoSha256 = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA="; meta = with lib; { description = "Interactively kill running processes"; From 287131c409bcb8fb53c401ed028815c3e20b6b39 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 21 Nov 2022 16:33:46 -0500 Subject: [PATCH 12/14] ocamlPackages.phylogenetics: run full test suite As of upstream commit https://github.com/biocaml/phylogenetics/commit/a107e96fa64fecb75a9e855293b2822196540b31 , the full tests using `bppsuite`, although barely longer than the short tests, were not being run. --- pkgs/development/ocaml-modules/phylogenetics/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1cf9651e6ecc..f3df658b6d59 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -40,6 +40,11 @@ buildDunePackage rec { printbox-text ]; + checkPhase = '' + runHook preCheck + dune build @app/fulltest + runHook postCheck + ''; doCheck = true; meta = with lib; { From c6980427cececbfec6754e3edb618573f9b70da2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Nov 2022 04:25:03 -0500 Subject: [PATCH 13/14] zotero: 6.0.16 -> 6.0.18 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9c233f469247..c638a4b2713b 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.16"; + version = "6.0.18"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8="; + sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0="; }; nativeBuildInputs = [ wrapGAppsHook ]; From a5f162fb93f5e0bdf7737eebc96e298da4574357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 10:32:51 +0000 Subject: [PATCH 14/14] python310Packages.bellows: 0.34.3 -> 0.34.4 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index de4205654255..dde3a12480ca 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.3"; + version = "0.34.4"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-7jaXNz7i+kF64T+5/QWKGpxHCkg/M9U2hbWrVB2tjH8="; + sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; }; propagatedBuildInputs = [