From aad23cbae54f1780d2e06bcec2b01a764c965d6c Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Tue, 30 Nov 2021 15:59:43 -0800 Subject: [PATCH 01/19] plan9port: add DarwinTools to buildInputs on darwin (cherry picked from commit 0fd4de2ae21bc4a1a70e1d2349b64578794852fc) --- pkgs/tools/system/plan9port/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 88c786e30b6e..d6c8833618cd 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation { IOKit Metal QuartzCore + darwin.DarwinTools ]); builder = ./builder.sh; From b74ba65a70cea38978cb4efa8e6792a23e81856b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 1 Dec 2021 08:38:31 +0100 Subject: [PATCH 02/19] nixos/lxd-image-server: fix logrotate (cherry picked from commit 7a89ee617150801bed9699b3febf8ede88977552) --- nixos/modules/services/networking/lxd-image-server.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/lxd-image-server.nix b/nixos/modules/services/networking/lxd-image-server.nix index 5ec6cacffa49..b119ba8acf63 100644 --- a/nixos/modules/services/networking/lxd-image-server.nix +++ b/nixos/modules/services/networking/lxd-image-server.nix @@ -55,9 +55,8 @@ in path = "/var/log/lxd-image-server/lxd-image-server.log"; frequency = "daily"; keep = 21; - user = "lxd-image-server"; - group = cfg.group; extraConfig = '' + create 755 lxd-image-server ${cfg.group} missingok compress delaycompress From b89763f302325e78485978c45d1a6376209f7dd8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 23:19:58 +0200 Subject: [PATCH 03/19] nix-serve: fix NIX_SECRET_KEY_FILE (cherry picked from commit 2fb77151e8fb0c47509fc879e3df553fba7254b4) --- nixos/modules/services/networking/nix-serve.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 7fc145f2303d..390f0ddaee83 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -37,8 +37,6 @@ in nix-store --generate-binary-cache-key key-name secret-key-file public-key-file ``` - Make sure user `nix-serve` has read access to the private key file. - For more details see nix-store1. ''; }; @@ -61,16 +59,22 @@ in path = [ config.nix.package.out pkgs.bzip2.bin ]; environment.NIX_REMOTE = "daemon"; - environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; + + script = '' + ${lib.optionalString (cfg.secretKeyFile != null) '' + export NIX_SECRET_KEY_FILE="$CREDENTIALS_DIRECTORY/NIX_SECRET_KEY_FILE" + ''} + exec ${pkgs.nix-serve}/bin/nix-serve --listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams} + ''; serviceConfig = { Restart = "always"; RestartSec = "5s"; - ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + - "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; User = "nix-serve"; Group = "nix-serve"; DynamicUser = true; + LoadCredential = lib.optionalString (cfg.secretKeyFile != null) + "NIX_SECRET_KEY_FILE:${cfg.secretKeyFile}"; }; }; }; From 7e7260ef027221955db61dbaa65f395ceae664c3 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Fri, 3 Dec 2021 00:02:52 +0000 Subject: [PATCH 04/19] nixos/snapraid: relax permissions of snapraid-sync Remove PrivateDevices to silence warning about SnapRAID being unable to access disk UUIDs. Add CAP_FOWNER when touch is enabled so file time stamps can be set. (cherry picked from commit 6073b099d05458ba4dc3ade6cae7cb838ae5b2b9) --- nixos/modules/tasks/snapraid.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/snapraid.nix b/nixos/modules/tasks/snapraid.nix index 4529009930fc..ff956f306709 100644 --- a/nixos/modules/tasks/snapraid.nix +++ b/nixos/modules/tasks/snapraid.nix @@ -193,7 +193,6 @@ in LockPersonality = true; MemoryDenyWriteExecute = true; NoNewPrivileges = true; - PrivateDevices = true; PrivateTmp = true; ProtectClock = true; ProtectControlGroups = true; @@ -208,7 +207,8 @@ in SystemCallArchitectures = "native"; SystemCallFilter = "@system-service"; SystemCallErrorNumber = "EPERM"; - CapabilityBoundingSet = "CAP_DAC_OVERRIDE"; + CapabilityBoundingSet = "CAP_DAC_OVERRIDE" ++ + lib.optionalString cfg.touchBeforeSync " CAP_FOWNER"; ProtectSystem = "strict"; ProtectHome = "read-only"; From 4968b5ad7b3e47b917929426b53bf678b4c00875 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 19:37:44 +0100 Subject: [PATCH 05/19] =?UTF-8?q?fwupd:=201.7.1=20=E2=86=92=201.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fwupd/fwupd/releases/tag/1.7.2 (cherry picked from commit 1f2da44fcea0b54512de9f3d807c481dcbd4aaee) --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e6c43c0aa6e4..547e16fba49e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -112,7 +112,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.7.1"; + version = "1.7.2"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -121,7 +121,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rlbOtEt4byH1TRM6xwvF2cuM1L2gFnM5xmmiKNpn+jw="; + sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ="; }; patches = [ From 887feb52f7a9826da04b1d784675341ca8a5e72f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 23:37:09 +0100 Subject: [PATCH 06/19] fwupd: fix EFI capsule path This was omitted in 1.7.1 update (cherry picked from commit 47f11b5c01e4b9e3e4f2d8c6b20531d77b46b157) --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 3 +++ .../linux/firmware/fwupd/efi-app-path.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 547e16fba49e..71f6da0d13b1 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -142,6 +142,9 @@ let # Tests detect fwupd is installed when prefix is /usr. ./fix-install-detection.patch + + # EFI capsule is located in fwupd-efi now. + ./efi-app-path.patch ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch new file mode 100644 index 000000000000..c2502502a40c --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 4330512e..e53b70ab 100644 +--- a/meson.build ++++ b/meson.build +@@ -403,7 +403,7 @@ endif + if build_standalone and get_option('plugin_uefi_capsule') + efiboot = dependency('efiboot') + +- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') + conf.set_quoted('EFI_APP_LOCATION', efi_app_location) + + if host_cpu == 'x86' From fdbcb5192b4b8b1682f1470be1d0a84597f92012 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 3 Dec 2021 18:19:42 +0200 Subject: [PATCH 07/19] nixos/tests: fix nix-serve path nixos/tests: rename nix-ssh-serve to nix-serve-ssh nixos/tests/nix-serve-ssh: add --experimental-features nixos-serve: add nix-serve-ssh to passthru.tests (cherry picked from commit d87d5731d5bcd495d7a4087949b0fbec4841b972) --- nixos/tests/all-tests.nix | 4 ++-- nixos/tests/{nix-ssh-serve.nix => nix-serve-ssh.nix} | 0 pkgs/tools/package-management/nix-serve/default.nix | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) rename nixos/tests/{nix-ssh-serve.nix => nix-serve-ssh.nix} (100%) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ab107dfdcff7..9172a7996434 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -315,8 +315,8 @@ in nginx-sso = handleTest ./nginx-sso.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; nitter = handleTest ./nitter.nix {}; - nix-serve = handleTest ./nix-ssh-serve.nix {}; - nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; + nix-serve = handleTest ./nix-serve.nix {}; + nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; node-red = handleTest ./node-red.nix {}; diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-serve-ssh.nix similarity index 100% rename from nixos/tests/nix-ssh-serve.nix rename to nixos/tests/nix-serve-ssh.nix diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 93e240ad3463..d9faea9cea4d 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation { --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; - passthru.tests.nix-serve = nixosTests.nix-serve; + passthru.tests = { + nix-serve = nixosTests.nix-serve; + nix-serve-ssh = nixosTests.nix-serve-ssh; + }; meta = { homepage = "https://github.com/edolstra/nix-serve"; From 58c73dc0ae486fcda1277745f5f7314881502b18 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 3 Dec 2021 19:59:38 +0200 Subject: [PATCH 08/19] nixos/test-driver: add 10ms delay to send_key attempt to fix https://github.com/NixOS/nixpkgs/issues/147294 (cherry picked from commit 60422ba2ead07583dba311e9597f07789fe061d6) --- nixos/lib/test-driver/test-driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 643446f313e3..adacca47abe6 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -904,6 +904,7 @@ class Machine: def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) + time.sleep(0.01) def start(self) -> None: if self.booted: From 42188960de304cc161c79f438871433a7188c8fe Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Fri, 3 Dec 2021 13:01:59 -0300 Subject: [PATCH 09/19] gnomeExtensions.x11-gestures: can't find Touchegg (cherry picked from commit 05e82bfdc2ecf6d0b0a657a15a12d64138b65c17) --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index f20c63d08016..f8de7d7c77f7 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -2,6 +2,7 @@ , ddcutil , gjs , xprop +, touchegg }: let # Helper method to reduce redundancy @@ -47,4 +48,12 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ rhoriguchi ]; })) + + (patchExtension "x11gestures@joseexposito.github.io" (old: { + # Extension can't find Touchegg + # https://github.com/NixOS/nixpkgs/issues/137621 + postPatch = '' + substituteInPlace "src/touchegg/ToucheggConfig.js" --replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'" + ''; + })) ] From 1bb595d61d754165dc819fb7b6df36ec0a3b5ba6 Mon Sep 17 00:00:00 2001 From: Adson Silva Cicilioti Date: Fri, 3 Dec 2021 13:20:20 -0300 Subject: [PATCH 10/19] gnomeExtensions.x11-gestures: can't find Touchegg (cherry picked from commit d205f7e6af01f522d55acf133e362a8ad32b9682) --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index f8de7d7c77f7..357c3a73a513 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -53,7 +53,8 @@ super: lib.trivial.pipe super [ # Extension can't find Touchegg # https://github.com/NixOS/nixpkgs/issues/137621 postPatch = '' - substituteInPlace "src/touchegg/ToucheggConfig.js" --replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'" + substituteInPlace "src/touchegg/ToucheggConfig.js" \ + --replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'" ''; })) ] From 102d74f6793a134b098d3ff800a9ab79fa2c33d1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Dec 2021 14:57:53 +0100 Subject: [PATCH 11/19] nextcloud23: init at 23.0.0 Backport #148301 to release-21.11. We have multiple attributes for different majors, so this is technically a new package that can be backported. The defaults aren't changed, so `nextcloud22` is still the default for NixOS 21.11. Co-authored-by: Ilan Joselevich --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- nixos/modules/services/web-apps/nextcloud.xml | 4 ++-- nixos/tests/nextcloud/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 04ec7888950d..828475fa12d7 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -153,7 +153,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud21" "nextcloud22" ]; + relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ]; }; phpPackage = mkOption { type = types.package; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 9d9cb8dfb3f2..c10ba5383fc2 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -11,8 +11,8 @@ desktop client is packaged at pkgs.nextcloud-client. - The current default by NixOS is nextcloud22 which is also the latest - major version available. + The current default by NixOS is nextcloud22, the latest version available + is nextcloud23.
Basic usage diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index bd7a7aacdc91..5f6f4b3d68e5 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -18,4 +18,4 @@ foldl }; }) {} - [ 21 22 ] + [ 21 22 23 ] diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 348ffa0e37e0..5490b29090e0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -54,6 +54,11 @@ in { version = "22.2.3"; sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; }; + + nextcloud23 = generic { + version = "23.0.0"; + sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw="; + }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8c7a8a001b8..457f3f442ba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7868,7 +7868,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud20 nextcloud21 nextcloud22; + nextcloud20 nextcloud21 nextcloud22 nextcloud23; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From db4208b2c4a23456a464b6a43ef769a568268a9b Mon Sep 17 00:00:00 2001 From: voidless Date: Wed, 10 Nov 2021 00:08:24 +0100 Subject: [PATCH 12/19] geogebra6 6-0-644-0 -> 6-0-676-0 (cherry picked from commit a34736a38fb86a5b1ff1139c0885a629d232e419) --- .../science/math/geogebra/geogebra6.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 8163fe5478fa..76d178b7e490 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: +{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-644-0"; + version = "6-0-676-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; @@ -18,9 +18,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20211123222708/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922"; + sha256 = "0wn90n2nd476rkf83gk9vvcpbjflkrvyri50pnmv52j76n023hmm"; }; dontConfigure = true; @@ -38,7 +38,7 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -53,9 +53,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" - "https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20211124143625/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" ]; - sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262"; + sha256 = "1dwv2f94a1c2y10lmy0i66cafynalp7dkqgnpk4f0mk6pir2fdgj"; }; dontUnpack = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8c7a8a001b8..c82622a2e533 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31811,7 +31811,9 @@ with pkgs; gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; - geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; + geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { + electron = electron_12; + }; maxima = callPackage ../applications/science/math/maxima { ecl = null; From d28bbe114fd91c450f95bd960dae3f0343fbb95d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 20:29:18 +0200 Subject: [PATCH 13/19] geogebra6: switch to electron_14 arch uses electron_14 for their package electron_12 is eol (cherry picked from commit 3c35508df52b49b234d4e31c58d5573bba27cfb7) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c82622a2e533..54d5e4e23cc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31812,7 +31812,7 @@ with pkgs; geogebra = callPackage ../applications/science/math/geogebra { }; geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { - electron = electron_12; + electron = electron_14; }; maxima = callPackage ../applications/science/math/maxima { From 872183bd080b205804ecbbd7e197888f35a2f838 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 20:58:22 +0200 Subject: [PATCH 14/19] etcher: switch to electron_14 (cherry picked from commit 53ded9e4caff98ec61f95ed88ccf1d6ff4c3ed6d) --- pkgs/tools/misc/etcher/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 51123f55b60b..7f746b9a49bb 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -5,7 +5,7 @@ , util-linux , bash , makeWrapper -, electron_12 +, electron }: let @@ -23,8 +23,6 @@ let "i686-linux" = "i386"; }."${system}" or throwSystem; - electron = electron_12; - in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54d5e4e23cc0..364d47ef0943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4992,7 +4992,9 @@ with pkgs; escrotum = callPackage ../tools/graphics/escrotum { }; - etcher = callPackage ../tools/misc/etcher { }; + etcher = callPackage ../tools/misc/etcher { + electron = electron_14; + }; ethtool = callPackage ../tools/misc/ethtool { }; From 2e91fd086237b2a46e05e7720645d3073e9fd014 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:04:08 +0200 Subject: [PATCH 15/19] thedesk: switch to electron-14 (cherry picked from commit 58546a5f78f5a4dd90d08b4a3a09a70bec15158a) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 364d47ef0943..3854734c1081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9963,7 +9963,7 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; thedesk = callPackage ../applications/misc/thedesk { - electron = electron_12; + electron = electron_14; }; theharvester = callPackage ../tools/security/theharvester { }; From 8744b4fd5ee06fbe840d199fa51534c76bcd4c9a Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:07:53 +0200 Subject: [PATCH 16/19] whalebird: switch to electron_14 (cherry picked from commit 77fd7e9d37f27a50e396cc5051b3eeb395b604ce) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3854734c1081..276ee9209813 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29088,7 +29088,7 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; whalebird = callPackage ../applications/misc/whalebird { - electron = electron_12; + electron = electron_14; }; wio = callPackage ../applications/window-managers/wio { }; From dbe84e2bc4ee886cb77e9c4357d9d69c5f498d74 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:15:15 +0200 Subject: [PATCH 17/19] binance: switch to electron_13 electron-14 resulted in blank screen on start (cherry picked from commit df22f8eeae0ae77b41ad5e6f54c3b8a136f4eaf5) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 276ee9209813..d8a7af8be239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1476,7 +1476,7 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; binance = callPackage ../applications/misc/binance { - electron = electron_12; + electron = electron_13; }; bit = callPackage ../applications/version-management/git-and-tools/bit { }; From 523e00aed03e497658caff56973c245f635a5623 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:20:15 +0200 Subject: [PATCH 18/19] pocket-casts: switch to electron_14 (cherry picked from commit 50d7facb9b15f61f67455925211dcfda9587e145) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8a7af8be239..68ff3cf7b6da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3462,7 +3462,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_12; + electron = electron_14; }; poweralertd = callPackage ../tools/misc/poweralertd { }; From fb258cc84f24d48adb6dc3481dfd0a1fea9cb912 Mon Sep 17 00:00:00 2001 From: gardspirito Date: Sat, 13 Nov 2021 02:24:16 +0300 Subject: [PATCH 19/19] nixos/mx-puppet-discord: provide registration file & fix typo in settings example (cherry picked from commit a3358146dff95aacfaf727555843a08cbfe91cdc) --- nixos/modules/services/misc/mx-puppet-discord.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/mx-puppet-discord.nix b/nixos/modules/services/misc/mx-puppet-discord.nix index c34803f97223..fb7592458295 100644 --- a/nixos/modules/services/misc/mx-puppet-discord.nix +++ b/nixos/modules/services/misc/mx-puppet-discord.nix @@ -39,7 +39,7 @@ in { #defaults to sqlite but can be configured to use postgresql with #connstring - database.filename = "${dataDir}/mx-puppet-discord/database.db"; + database.filename = "${dataDir}/database.db"; logging = { console = "info"; lineDateFormat = "MMM-D HH:mm:ss.SSS"; @@ -110,7 +110,9 @@ in { UMask = 0027; ExecStart = '' - ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -c ${settingsFile} + ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord \ + -c ${settingsFile} \ + -f ${registrationFile} ''; }; };