From 7943ea371bc49a51f1d2835f016ca64fc07f590e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 8 Mar 2022 14:52:21 +0100 Subject: [PATCH 1/4] icingaweb2: 2.9.5 -> 2.9.6 (cherry picked from commit 3bea94f0f8dc380baa0c494bde4cd78e9ea99c7a) --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 7a0d75dab24d..4a6adb2b024a 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.5"; + version = "2.9.6"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256-yKnG+wxWVgLwG9hRRiLPmNzm9pBrf/mh5V/lLdj8Sv8="; + sha256 = "sha256:1kcn1kkhm8fkwhjqmpysd2hvnrvh6bka8r67yq8d58m117l9wnpq"; }; nativeBuildInputs = [ makeWrapper ]; From a0852c0af556190e60f8ed13d703b3500463cb1f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 20 Feb 2022 13:44:13 +0100 Subject: [PATCH 2/4] nixos/nix-daemon: Ensure continued availability of daemon socket As `nix-daemon.service` does not make use of `ExecStop`, we prefer to keep the socket up and available. This is important for machines that run Nix-based services, such as automated build, test, and deploy services, that expect the daemon socket to be available at all times. See committed inline comment for further explanation. (cherry picked from commit b550b4b6f8413c086a1ec4235e174cda82538e73) --- nixos/modules/services/misc/nix-daemon.nix | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 869feb05eb7b..16a8377f1eb1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -633,6 +633,40 @@ in }; restartTriggers = [ nixConf ]; + + # `stopIfChanged = false` changes to switch behavior + # from stop -> update units -> start + # to update units -> restart + # + # The `stopIfChanged` setting therefore controls a trade-off between a + # more predictable lifecycle, which runs the correct "version" of + # the `ExecStop` line, and on the other hand the availability of + # sockets during the switch, as the effectiveness of the stop operation + # depends on the socket being stopped as well. + # + # As `nix-daemon.service` does not make use of `ExecStop`, we prefer + # to keep the socket up and available. This is important for machines + # that run Nix-based services, such as automated build, test, and deploy + # services, that expect the daemon socket to be available at all times. + # + # Notably, the Nix client does not retry on failure to connect to the + # daemon socket, and the in-process RemoteStore instance will disable + # itself. This makes retries infeasible even for services that are + # aware of the issue. Failure to connect can affect not only new client + # processes, but also new RemoteStore instances in existing processes, + # as well as existing RemoteStore instances that have not saturated + # their connection pool. + # + # Also note that `stopIfChanged = true` does not kill existing + # connection handling daemons, as one might wish to happen before a + # breaking Nix upgrade (which is rare). The daemon forks that handle + # the individual connections split off into their own sessions, causing + # them not to be stopped by systemd. + # If a Nix upgrade does require all existing daemon processes to stop, + # nix-daemon must do so on its own accord, and only when the new version + # starts and detects that Nix's persistent state needs an upgrade. + stopIfChanged = false; + }; # Set up the environment variables for running Nix. From 428244bc34f2644eb66858efd8b570e75400daa1 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sat, 5 Mar 2022 08:46:01 -0700 Subject: [PATCH 3/4] element-{desktop,}: 1.10.4 -> 1.10.6 (cherry picked from commit 0d64fcc14ea0221872f34868a5da6ccf6d83f012) --- .../element/element-desktop-package.json | 4 ++-- .../networking/instant-messengers/element/pin.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index ac0869e5cdc3..6d3353c2515f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.4", + "version": "1.10.6", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,7 +61,7 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^15.3.5", + "electron": "^17", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 27dbb16f088f..d1fb0fe1c622 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.4", - "desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=", - "desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar", - "webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l" + "version": "1.10.6", + "desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=", + "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0", + "webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r" } From f53c984ce9b469a729fa08df1f5d3c5b4f8eb5e3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 12:22:44 +0000 Subject: [PATCH 4/4] waybar: 0.9.9 -> 0.9.10 (cherry picked from commit f64ee7de7a32a17a82a2b6b251370f05395e866d) --- pkgs/applications/misc/waybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 5e5e1bead5a1..ad43a1e897e8 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4="; + sha256 = "sha256-KiRtU32h3AvThDWnCw55LnqbWVAZLXY/7fU1HxLMjLo="; }; nativeBuildInputs = [