From f9b83ece2bc18d3e297159a76e7d0c8011bd55bc Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 26 Aug 2022 14:44:31 +0200 Subject: [PATCH 01/30] linuxPackages.apfs: unstable-2022-07-24 -> unstable-2022-08-15 This fixes a compatibility issue with Linux 5.19: https://github.com/linux-apfs/linux-apfs-rw/issues/29. --- pkgs/os-specific/linux/apfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index bcc53e82b9aa..6b7f596683e4 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-07-24-${kernel.version}"; + version = "unstable-2022-08-15-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "925d86b7be3ccf21b17734cfececf40e43c4598e"; - sha256 = "sha256-N5lGJu4c03cVDk3WTcegzZHBDmguPEX8dCedJS2TMSI="; + rev = "e4bf2d51d3fe8485ad2b28a89c157ada32ee3d77"; + sha256 = "sha256-zvl1H9AIExgt6t2A2w7zDwXmRsmLY8y3P6EfbBuFdh8="; }; hardeningDisable = [ "pic" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19"; + broken = kernel.kernelOlder "4.9"; maintainers = with maintainers; [ Luflosi ]; }; } From 5ac6f87f64aae63b5074f31346b72bc6880c537c Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 27 Aug 2022 06:34:01 +0200 Subject: [PATCH 02/30] hydrus: 496 -> 497 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 79b505479c8c..6b991e8dd398 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "496"; + version = "497"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Ng3ogPxyzn4cKVE/0iz56VWGyABkM2ZF7ktajaJ9Mn8="; + sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM="; }; nativeBuildInputs = [ From 22354b30a39175cb3152700d58235acf46d31b1f Mon Sep 17 00:00:00 2001 From: pkharvey Date: Mon, 29 Aug 2022 23:29:04 +0100 Subject: [PATCH 03/30] chirp: 20211016 -> 20220823 --- pkgs/applications/radio/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index b10d817d9e49..95d33d6f1eec 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20211016"; + version = "20220823"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw"; + sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM="; }; propagatedBuildInputs = with python2.pkgs; [ From 1aa2c58f44c0cc1c352e805fd0695cc9b591f112 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 2 Sep 2022 00:49:39 +0000 Subject: [PATCH 04/30] vscode: 1.70.2 -> 1.71.0 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1a09d6475004..9f3ebcd916f7 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -15,17 +15,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "08p4l47zr4dm7mw65wwdsf6q1wkzkzg3l2y5zrs3ng3nafql96zs"; - x86_64-darwin = "1pf8xpg2sb0iwfaixvzhmglqrrky2625b66fjwlc5zkj0dlff106"; - aarch64-linux = "1c35s7zykcrqf3va1cv7hqf1dp3cl70kdvqv3vgflqldc1wcza9h"; - aarch64-darwin = "1jpsf54x7yy53d6766gpw90ngdi6kicpqm1qbzbmmsasndl7rklp"; - armv7l-linux = "10vj751bjdkzsdcrdpq6xb430pdhdbz8ysk835ir64i3mv6ygi7k"; + x86_64-linux = "0cnrbjqcnkv7ybj9j7l0lcnfnxq18mddhdkj9797928q643bmj6z"; + x86_64-darwin = "1d9gb3i2k0c9cn38igg1nm91bfqdi4xg29zlprqsqh98ijwqy25y"; + aarch64-linux = "1jm8ll8f4m99ly53rv7000ng9a0l8jn4xpc6kfhmqdnf0jqfncsh"; + aarch64-darwin = "1awmaxkr5nl513c50g6k4r2j3w8p2by1j9i3kw7vkmwn91bk24i4"; + armv7l-linux = "1d2hl9jy1kfkzn4j7qkp3k8j1qc3r9rpqhvkfrr2axcqrahcrfsd"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.70.2"; + version = "1.71.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 488412a1db0c3046b6699168cdb2a581c88181b8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 18:06:03 +0000 Subject: [PATCH 05/30] nixos/test-driver: add wait_for_unit() timeout arg For example, the wait_for_unit() call in the Moodle test times out for myself and others[1], so it would be good to be able to increase it to something less likely to be hit by a test that would otherwise pass. [1]: https://github.com/NixOS/nixpkgs/pull/177052#issue-1266336706 --- nixos/lib/test-driver/test_driver/machine.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 3ff3cf5645f8..117d9d59e025 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -426,7 +426,9 @@ class Machine: self.monitor.send(message) return self.wait_for_monitor_prompt() - def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None: + def wait_for_unit( + self, unit: str, user: Optional[str] = None, timeout: int = 900 + ) -> None: """Wait for a systemd unit to get into "active" state. Throws exceptions on "failed" and "inactive" states as well as after timing out. @@ -456,7 +458,7 @@ class Machine: unit, f" with user {user}" if user is not None else "" ) ): - retry(check_active) + retry(check_active, timeout) def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) From 1e8f59b2ee457e0b4f2edf62cf89054f501a0706 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 18:09:00 +0000 Subject: [PATCH 06/30] nixosTests.moodle: increase timeout With the default timeout, this test would time out too early for me and others[1]. [1]: https://github.com/NixOS/nixpkgs/pull/177052#issue-1266336706 --- nixos/tests/moodle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix index 4570e8963882..8fd011e0cb21 100644 --- a/nixos/tests/moodle.nix +++ b/nixos/tests/moodle.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { testScript = '' start_all() - machine.wait_for_unit("phpfpm-moodle.service") + machine.wait_for_unit("phpfpm-moodle.service", timeout=1800) machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'") ''; }) From 5dfa9b0ee9fa5bc1fdc7dfef3f760f27104c6462 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Sep 2022 23:45:57 +0200 Subject: [PATCH 07/30] firefox-esr{,-unwrapped,-wayland}: 91 -> 102 The 91 release tree has a planned end of life in 2022/09 and the 102 tree is its successor. Includes some reordering that makes more sense to me. --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff267fbc334..2a81c02c0171 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27609,14 +27609,15 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; + firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; - firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; - firefox-esr = firefox-esr-91; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-91; - firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; + firefox-esr = firefox-esr-102; + firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; + firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; + firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; From c1861b665856697fb01a6d7a273d2b85f6a92f01 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 3 Sep 2022 15:10:04 +1200 Subject: [PATCH 08/30] emacs: Switch to lucid as the default toolkit Because of long standing bugs and stability issues & an uncollaborative upstream there has been talk on the emacs-devel mailing list to switch the default toolkit to Lucid (https://lists.gnu.org/archive/html/emacs-devel/2022-08/msg00752.html). The GTK build also has issues with Xinput2, something that both we and upstream want to enable by default in Emacs 29. This situation has prompted me to use both Lucid an no-toolkit (pure X11) Emacs as a daily driver in recent weeks to evaluate what the advantages/drawbacks are and I have concluded that, at least for me, switching the toolkit to Lucid is strictly an upgrade. It has resulted in better stability (there are far fewer tiny UX issues that are hard to understand/identify) & a snappier UI. On top of that the closure size is reduced by ~10%. In the pure X11 build I noticed some unsharpness around fonts so this is not a good default choice. As with everything there is a cost, and that is uglier (I think most would agree but of course this is subjective) menu bars for those that use them and no GTK scroll bars. For anyone who still wants to use GTK they could of course still choose to do so via the new `emacs-gtk` attribute but I think this is a bad default. A note to Wayland users: This does not affect Wayland compatibility in any way since that will already need a PGTK build variant in the future. --- .../doc/manual/from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 3 +++ pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) 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 e3c76918911a..0c23082ab0e3 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 @@ -384,6 +384,14 @@ cosigned binary anymore. + + + Emacs now uses the Lucid toolkit by default instead of GTK + because of stability and compatibility issues. Users who still + wish to remain using GTK can do so by using + emacs-gtk. + + riak package removed along with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index afeaa7aaac73..c4dc8f0c4522 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -134,6 +134,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `pkgs.cosign` does not provide the `cosigned` binary anymore. +- Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues. + Users who still wish to remain using GTK can do so by using `emacs-gtk`. + - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 4243ad47a243..69061f044f34 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -18,7 +18,7 @@ , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin , withGTK2 ? false, gtk2-x11 ? null -, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null +, withGTK3 ? false, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withMotif ? false, motif ? null , withSQLite3 ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff267fbc334..6df4a8fd9862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27084,6 +27084,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; emacs = emacs28; + emacs-gtk = emacs28-gtk; emacs-nox = emacs28-nox; emacs28 = callPackage ../applications/editors/emacs/28.nix { @@ -27098,6 +27099,10 @@ with pkgs; inherit (darwin) sigtool; }; + emacs28-gtk = emacs28.override { + withGTK3 = true; + }; + emacs28-nox = lowPrio (emacs28.override { withX = false; withNS = false; From 1a03c4a771e8d09b25996f56b9ceafb2aaa8ee4a Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 3 Sep 2022 01:39:19 -0400 Subject: [PATCH 09/30] discord-canary: 0.0.137 -> 0.0.138 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1c9090ea9620..91e38aae5c7a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.19"; ptb = "0.0.29"; - canary = "0.0.137"; + canary = "0.0.138"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-dreKO2yBDP547VYuJziBhC2sLdpbM2fcK5bxeds0zUQ="; + sha256 = "sha256-NojoHrrgdvLiMgWYPClXzWjWXuvHz7urhyHzMnZwvBY="; }; }; aarch64-darwin = { From 54f2adaaff7563102967aee2672ceaee100b18af Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 3 Sep 2022 09:55:49 +0200 Subject: [PATCH 10/30] arti: 0.6.0 -> 1.0.0 https://gitlab.torproject.org/tpo/core/arti/-/tags/arti-v1.0.0 --- pkgs/tools/security/arti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 990534b13dfa..85ea5daf1f65 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g="; + sha256 = "sha256-BHYzthKjD1JFYcZDCjI5/w82q2rsgGhrEorPF5RExhQ="; }; - cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4="; + cargoSha256 = "sha256-BBQfefi1ZT9qIUx7xK/fH4WNgxvowl/Yvu7LgLXd4bM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From c0b6b28786550c9daf9b9de67cbadfbca3a679e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 08:39:00 +0000 Subject: [PATCH 11/30] dynamic-colors: 0.2.2.2 -> 0.2.5 --- pkgs/tools/misc/dynamic-colors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index c0ff0fec328a..9e8619459852 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dynamic-colors"; - version = "0.2.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "dynamic-colors"; rev = "v${version}"; - sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5"; + sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE="; }; PREFIX = placeholder "out"; From 322d1d524c3c40186e7d7c1b2a7334c2a50eb2e3 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sat, 3 Sep 2022 11:28:51 +0200 Subject: [PATCH 12/30] maintainers: update mpscholten --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3efd6efcefaa..2b962a264099 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8975,7 +8975,7 @@ name = "Millian Poquet"; }; mpscholten = { - email = "marc@mpscholten.de"; + email = "marc@digitallyinduced.com"; github = "mpscholten"; githubId = 2072185; name = "Marc Scholten"; From 2bd3c47d5ad5aa971f7edb1d4e4dc84c21922cbd Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 3 Sep 2022 11:50:28 +0200 Subject: [PATCH 13/30] gopass: 1.14.4 -> 1.14.5 https://github.com/gopasspw/gopass/releases/tag/v1.14.5 --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 5286d0f4a275..27f2589fecd3 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.4"; + version = "1.14.5"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UQvwkprHGez5qRpk6KodtgX99013rcezbgpaCateI4k="; + sha256 = "sha256-MFnenWoInS2vWySa0IxKAFLYF9VHmPaL0eGM27b1wpI="; }; - vendorSha256 = "sha256-169KBsJhytzfOgIOHb54gEsLAmhVv+O64hP/DU6cT6A="; + vendorSha256 = "sha256-clJAt/SZCLlLnYf2tmR9nmsbZ0SzMj7x+1Ft9dfEdJ4="; subPackages = [ "." ]; From f5a5ffd59fdfc0ea1c39ce257a57359ded06338f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 10:05:19 +0000 Subject: [PATCH 14/30] mavproxy: 1.8.52 -> 1.8.55 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index f02e45280a81..558cb6cbfa6a 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.52"; + version = "1.8.55"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H30QZbUj6SXuwhhQUvHoPDM1D4ynm/vt1Mi4rkCB1oo="; + sha256 = "sha256-RS3/U52n1Gs3cJtlZeE5z5q1EmC8NrPFt0mHhvIWVTA="; }; postPatch = '' From 4818b033e8285beb7f4b865cf6235e4337370720 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 10:58:53 +0000 Subject: [PATCH 15/30] frr: 8.3 -> 8.3.1 --- pkgs/servers/frr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d47ec1ab1f62..c23e956972c2 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "frr"; - version = "8.3"; + version = "8.3.1"; src = fetchFromGitHub { owner = "FRRouting"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-PW6ULiSGNznKS6zw4aa27QSSgbew7TTLCqwNm9bH2LY="; + hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0="; }; nativeBuildInputs = [ From e77f54ea0b69c457f1ac4ca994db4bb4d9e0d9c1 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 3 Sep 2022 13:41:56 +0200 Subject: [PATCH 16/30] vimPlugins.moonscript-vim: init at 2016-11-22 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 97ed48f92c13..5f4eaedc8aab 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4437,6 +4437,18 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; + moonscript-vim = buildVimPluginFrom2Nix { + pname = "moonscript-vim"; + version = "2016-11-22"; + src = fetchFromGitHub { + owner = "leafo"; + repo = "moonscript-vim"; + rev = "715c96c7c3b02adc507f84bf5754985460afc426"; + sha256 = "1m4yz2xnazqagmkcli2xvwidsgssy9p650ykgdybk7wwlrq2vvqi"; + }; + meta.homepage = "https://github.com/leafo/moonscript-vim/"; + }; + mru = buildVimPluginFrom2Nix { pname = "mru"; version = "2022-08-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5a090d838992..2f6ba2b088fa 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -372,6 +372,7 @@ https://github.com/jghauser/mkdir.nvim/,main, https://github.com/SidOfc/mkdx/,, https://github.com/tomasr/molokai/,, https://github.com/shaunsingh/moonlight.nvim/,,pure-lua +https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/yegappan/mru/,, https://github.com/ncm2/ncm2/,, https://github.com/ncm2/ncm2-bufword/,, From 3add3167592fe37464a91995386d88bec1d31093 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Sep 2022 14:01:07 +0200 Subject: [PATCH 17/30] nixos/tests/cagebreak: Enable just polkit instead of udisks2 The udisks2 service was enabled to fix the test in (c5ebec7ee42). However, cagebreak doesn't require udisks2, just polkit (which the udisks2 module enables and which is why the cagebreak test broke after the udisks2 module was disabled by default). I've documented why polkit is required in this PR: https://github.com/NixOS/nixpkgs/pull/156858 In this case the "dependency" chain is basically cagebreak -> wlroots -> libseat -> logind (with polkit support) -> polkit. --- nixos/tests/cagebreak.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index 799535eecef6..1fef7cb57cfc 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -33,7 +33,7 @@ in hardware.opengl.enable = true; programs.xwayland.enable = true; - services.udisks2.enable = true; + security.polkit.enable = true; environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ]; # Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch: From 82d8999e044ed542bc3d9bd90f4cd5bcd5ee1dfd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Sep 2022 14:21:47 +0200 Subject: [PATCH 18/30] ungoogled-chromium: 105.0.5195.54 -> 105.0.5195.102 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c9c2d6a20dab..74b2568c1c24 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "105.0.5195.54", - "sha256": "0hj40scp54hp5xw036vb9v0h951hik4dq8skr52hffw24jqa9d5k", - "sha256bin64": null, + "version": "105.0.5195.102", + "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", + "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", "deps": { "gn": { "version": "2022-07-11", @@ -56,8 +56,8 @@ "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" }, "ungoogled-patches": { - "rev": "105.0.5195.54-1", - "sha256": "021y7cm1fdwkakhqrvz3jw5hx30740qn827wcvih0jdc3msfgd97" + "rev": "105.0.5195.102-1", + "sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc" } } } From 592d13693e845d52daeeb6cab8d46e192d9a9c3b Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 3 Sep 2022 14:52:59 +0200 Subject: [PATCH 19/30] nixos/teamspeak3: restart on failure Prevents transient failures such as > failed to register local accounting service --- nixos/modules/services/networking/teamspeak3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 3be9fb31ec79..f09ef1a959ed 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -152,6 +152,7 @@ in WorkingDirectory = cfg.dataDir; User = user; Group = group; + Restart = "on-failure"; }; }; }; From 79967ca1b0265687d1ab0a979e69ae548ff0d05d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 13:09:14 +0000 Subject: [PATCH 20/30] kops: 1.24.1 -> 1.24.2 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 8b54719d5cad..d988e061f3a2 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_24 = mkKops rec { - version = "1.24.1"; - sha256 = "sha256-rePNCk76/j6ssvi+gSvxn4GqoW/QovTFCJ0rj2Dd+0A="; + version = "1.24.2"; + sha256 = "sha256-QEoaSkJ3fzUr2Fr3M2EOd/3iwq1ZX2YHEez2i0kjRmY="; rev = "v${version}"; }; From 918d9061fdcdf19a8ea7bf7cd5726c7e023f36b9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 3 Sep 2022 11:19:44 +0300 Subject: [PATCH 21/30] video-trimmer: Handle post-merge reviews - Don't use appstream-glib and remove patch for `metainfo.xml.in.in` as it's not really required. - Use an upstreamed patch that makes gtk3, python3 & glib not required, along with patching shebang of `post-install.py`. - Remove `updateScript` as it's not suitable for non-gnome applications. - Move gobject-introspection to `nativeBuildInputs`. --- .../video/video-trimmer/default.nix | 36 ++++++------------- .../remove-screenshot-metainfo.diff | 17 --------- 2 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index 25cb52220266..dbeb85821deb 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -1,18 +1,15 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , rustPlatform , gnome , pkg-config , meson , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , blueprint-compiler , ninja -, python3 -, gtk3-x11 -, glib , gobject-introspection , gtk4 , libadwaita @@ -37,31 +34,25 @@ stdenv.mkDerivation rec { }; patches = [ - # The metainfo.xml file has a URL to a screenshot of the application, - # unaccessible in the build's sandbox. We don't need the screenshot, so - # it's best to remove it. - ./remove-screenshot-metainfo.diff + # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 + (fetchpatch { + url = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/commit/2faf4bb13d44463ea940c39ece9187f76627dbe9.diff"; + sha256 = "sha256-BPjwfFCDIqnS1rAlIinQ982VKdAYLyzDAPLCmPDvdp4="; + }) ]; - postPatch = '' - patchShebangs \ - build-aux/meson/postinstall.py \ - build-aux/cargo.sh \ - build-aux/dist-vendor.sh - ''; - nativeBuildInputs = [ pkg-config meson wrapGAppsHook4 - appstream-glib + gobject-introspection desktop-file-utils blueprint-compiler ninja - # For post-install.py - python3 - gtk3-x11 # For gtk-update-icon-cache - glib # For glib-compile-schemas + # Present here in addition to buildInputs, because meson runs + # `gtk4-update-icon-cache` during installPhase, thanks to: + # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 + gtk4 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo @@ -69,7 +60,6 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - gobject-introspection gtk4 libadwaita gst_all_1.gstreamer @@ -79,10 +69,6 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = gnome.updateScript { - packageName = pname; - }; - meta = with lib; { homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer"; description = "Trim videos quickly"; diff --git a/pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff b/pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff deleted file mode 100644 index 2d8741998d14..000000000000 --- a/pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in -index 9bd25b6..c627369 100644 ---- i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in -+++ w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in -@@ -19,12 +19,6 @@ - Video Trimmer cuts out a fragment of a video given the start and end timestamps. The video is never re-encoded, so the process is very fast and does not reduce the video quality. -

- -- -- -- https://gitlab.gnome.org/YaLTeR/video-trimmer/uploads/e840fa093439348448007197d07c8033/image.png -- Main Window -- -- - - - From eecd59dd5635d7f9ecb975476c6606cb87d932fe Mon Sep 17 00:00:00 2001 From: cafkafk Date: Sat, 3 Sep 2022 15:43:34 +0200 Subject: [PATCH 22/30] Added cafkafk to maintainer-list.nix --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3efd6efcefaa..34e27d00d136 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15146,4 +15146,14 @@ fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; }]; }; + cafkafk = { + email = "cafkafk@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys [{ + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + }]; + }; } From c729132d01ec0b0516293363af3c6c5e3bb11e10 Mon Sep 17 00:00:00 2001 From: cafkafk Date: Sat, 3 Sep 2022 15:46:48 +0200 Subject: [PATCH 23/30] Fixed wgptk + v6.0 -> 6.5 - Added cafkafk as maintaienr - Moved gobject-introspection to nativeBuildInputs - Bumped version og wpgtk - Fixed spelling mistake in maintainer-list.nix --- maintainers/maintainer-list.nix | 2 +- pkgs/tools/X11/wpgtk/default.nix | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34e27d00d136..4746dd86baad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15152,7 +15152,7 @@ name = "Christina Sørensen"; github = "cafkafk"; githubId = 89321978; - keys [{ + keys = [{ fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; }]; }; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 48b3bbffd324..1bdc5b0f49ba 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,19 +3,22 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.5.0"; + version = "6.5.5"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "0gv607jrdfbmadjyy3pbrj5ksh1dmaw5hz7l8my2z7sh0ifds0n2"; + sha256 = "sha256-g3flxQNiNta+uL4t21Lhpij8b5yB78SJLGaFpTcm9fE="; }; + nativeBuildInputs = [ + gobject-introspection + ]; + buildInputs = [ wrapGAppsHook gtk3 - gobject-introspection gnome.adwaita-icon-theme libxslt ]; @@ -46,6 +49,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/deviantfero/wpgtk"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.melkor333 ]; + maintainers = [ maintainers.melkor333 maintainers.cafkafk ]; }; } From 8be4e9e2ece290f3f2046fc554ed00e5a42df766 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Tue, 16 Aug 2022 20:33:08 +0200 Subject: [PATCH 24/30] nixos/service/languagetool: init --- .../from_md/release-notes/rl-2211.section.xml | 7 ++ .../manual/release-notes/rl-2211.section.md | 3 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/languagetool.nix | 78 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/languagetool.nix | 19 +++++ 6 files changed, 109 insertions(+) create mode 100644 nixos/modules/services/misc/languagetool.nix create mode 100644 nixos/tests/languagetool.nix 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 0c23082ab0e3..d434b76da214 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 @@ -206,6 +206,13 @@ services.kanata. + + + languagetool, + a multilingual grammar, style, and spell checker. Available as + services.languagetool. + + Outline, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index c4dc8f0c4522..a90e0f896eca 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -76,6 +76,9 @@ In addition to numerous new and upgraded packages, this release has the followin - [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. Available as [services.kanata](options.html#opt-services.kanata.enable). +- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. + Available as [services.languagetool](options.html#opt-services.languagetool.enable). + - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). - [netbird](https://netbird.io), a zero configuration VPN. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cb3599589cfe..132bbdcd933b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -589,6 +589,7 @@ ./services/misc/jackett.nix ./services/misc/jellyfin.nix ./services/misc/klipper.nix + ./services/misc/languagetool.nix ./services/misc/logkeys.nix ./services/misc/leaps.nix ./services/misc/lidarr.nix diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix new file mode 100644 index 000000000000..20dc9b6b447d --- /dev/null +++ b/nixos/modules/services/misc/languagetool.nix @@ -0,0 +1,78 @@ +{ config, lib, options, pkgs, ... }: + +with lib; + +let + cfg = config.services.languagetool; + settingsFormat = pkgs.formats.javaProperties {}; +in { + options.services.languagetool = { + enable = mkEnableOption (mdDoc "the LanguageTool server"); + + port = mkOption { + type = types.port; + default = 8081; + example = 8081; + description = mdDoc '' + Port on which LanguageTool listens. + ''; + }; + + public = mkEnableOption (mdDoc "access from anywhere (rather than just localhost)"); + + allowOrigin = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://my-website.org"; + description = mdDoc '' + Set the Access-Control-Allow-Origin header in the HTTP response, + used for direct (non-proxy) JavaScript-based access from browsers. + `null` to allow access from all sites. + ''; + }; + + settings = lib.mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.cacheSize = mkOption { + type = types.ints.unsigned; + default = 1000; + apply = toString; + description = mdDoc "Number of sentences cached."; + }; + }; + default = {}; + description = mdDoc '' + Configuration file options for LanguageTool, see + 'languagetool-http-server --help' + for supported settings. + ''; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.languagetool = { + description = "LanguageTool HTTP server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + User = "languagetool"; + Group = "languagetool"; + CapabilityBoundingSet = [ "" ]; + RestrictNamespaces = [ "" ]; + SystemCallFilter = [ "@system-service" "~ @privileged" ]; + ProtectHome = "yes"; + ExecStart = '' + ${pkgs.languagetool}/bin/languagetool-http-server \ + --port ${toString cfg.port} \ + ${optionalString cfg.public "--public"} \ + ${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \ + "--configuration" ${settingsFormat.generate "languagetool.conf" cfg.settings} + ''; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e3c699dfd0c9..0fa9d63df022 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -276,6 +276,7 @@ in { krb5 = discoverTests (import ./krb5 {}); ksm = handleTest ./ksm.nix {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; + languagetool = handleTest ./languagetool.nix {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; lemmy = handleTest ./lemmy.nix {}; diff --git a/nixos/tests/languagetool.nix b/nixos/tests/languagetool.nix new file mode 100644 index 000000000000..e4ab2a47064e --- /dev/null +++ b/nixos/tests/languagetool.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let port = 8082; +in { + name = "languagetool"; + meta = with lib.maintainers; { maintainers = [ fbeffa ]; }; + + nodes.machine = { ... }: + { + services.languagetool.enable = true; + services.languagetool.port = port; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("languagetool.service") + machine.wait_for_open_port(${toString port}) + machine.wait_until_succeeds('curl -d "language=en-US" -d "text=a simple test" http://localhost:${toString port}/v2/check') + ''; +}) From eeb45c266ee4e1b72a67385bb401a056080c1c18 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 20 Aug 2022 16:55:39 +0200 Subject: [PATCH 25/30] languagetool: add test --- pkgs/tools/text/languagetool/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index da48d81dfb23..537a9dc84029 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: +{ lib, stdenv, fetchzip, jre, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "LanguageTool"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.languagetool = nixosTests.languagetool; + meta = with lib; { homepage = "https://languagetool.org"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; From 04ba53a3e868b48ad84e49466732e8ae2315f903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 22:18:18 +0000 Subject: [PATCH 26/30] osinfo-db: 20220727 -> 20220830 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ba912854f7c7..0f11459a1702 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20220727"; + version = "20220830"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-IpHlI07Ymagww28rQFb/XnYjX0uge1k0IfSGUpBjTV4="; + sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs="; }; nativeBuildInputs = [ From 12a9446c6e859e61ac9ebeb196e66c57798c5bf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 22:20:57 +0000 Subject: [PATCH 27/30] suitesparse: 5.11.0 -> 5.13.0 --- .../libraries/science/math/suitesparse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index dcf8a1da2586..51b55592d42e 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.11.0"; + version = "5.13.0"; outputs = [ "out" "dev" "doc" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "sha256-AM16ngJ/CoSV6BOb80Pi9EqWoRILryOO4Rk+S5DffLU="; + sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: - # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.11.0/SuiteSparse_config/SuiteSparse_config.mk#L368 + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" "LAPACK=-llapack" ] From 5291c503cde036bdf75a92afd5780212580a06cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 14:12:44 +0000 Subject: [PATCH 28/30] python310Packages.awscrt: 0.14.3 -> 0.14.5 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 080889680443..4d6875ad5782 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.14.3"; + version = "0.14.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-nLlldO4otyWKn91L6vCiBh9csplFrN8tiK1tfeik6Y4="; + hash = "sha256-5dmPTN86DtEtGTgvX1T8QfvPdqZNdyBQP3lt4e4tH3o="; }; buildInputs = lib.optionals stdenv.isDarwin [ From b40c54fa36718043d5c67cef63ca79d22180a7ab Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 3 Sep 2022 18:06:24 +0300 Subject: [PATCH 29/30] gammy: remove --- pkgs/tools/misc/gammy/default.nix | 29 ----------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/tools/misc/gammy/default.nix diff --git a/pkgs/tools/misc/gammy/default.nix b/pkgs/tools/misc/gammy/default.nix deleted file mode 100644 index e06d20eb2ff7..000000000000 --- a/pkgs/tools/misc/gammy/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qmake, libXxf86vm, wrapQtAppsHook }: - -let - pname = "gammy"; - version = "0.9.64"; -in - -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "Fushko"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-NPvkT7jSbDjcZDHpMIOik9fNsz7OJXQ3g9OFxkpA3pk="; - }; - - nativeBuildInputs = [ qmake wrapQtAppsHook ]; - - buildInputs = [ libXxf86vm ]; - - meta = with lib; { - description = "GUI tool for manual- of auto-adjusting of brightness/temperature"; - homepage = "https://github.com/Fushko/gammy"; - license = licenses.gpl3; - maintainers = with maintainers; [ atemu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 47c6302adac5..c0b803f3ebb5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -463,6 +463,7 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03 gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97cd1a5a9f85..e25d24a11e5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2491,8 +2491,6 @@ with pkgs; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; }; - gams = callPackage ../tools/misc/gams (config.gams or {}); gem = callPackage ../applications/audio/pd-plugins/gem { }; From 5c3f9c0213f194a6d3b26c5dbfa46a45e7998e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Sep 2022 17:49:42 +0200 Subject: [PATCH 30/30] mavproxy: add missing opencv dependency --- pkgs/applications/science/robotics/mavproxy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 558cb6cbfa6a..2d1bf3aa251e 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial -, setuptools, wxPython_4_0, billiard, gnureadline }: +, setuptools, wxPython_4_0, billiard, gnureadline, opencv4 }: buildPythonApplication rec { pname = "MAVProxy"; @@ -22,6 +22,7 @@ buildPythonApplication rec { pyserial setuptools wxPython_4_0 + opencv4 ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; # No tests