From dfaf1d954139111eb56d3ee5010dc74abe43bfa3 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 22 Mar 2022 08:56:16 +0100 Subject: [PATCH 1/5] nixos/tests/quorum: fix by syncing from master, format with alejandra --- nixos/tests/quorum.nix | 72 ++++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index 498b55ace7af..bf0e17f41e98 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -1,15 +1,38 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({pkgs, ...}: let + keystore = { + address = "9377bc3936de934c497e22917b81aa8774ac3bb0"; + crypto = { + cipher = "aes-128-ctr"; + ciphertext = "ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c"; + cipherparams = { + iv = "2a09f7a72fd6dff7c43150ff437e6ac2"; + }; + kdf = "scrypt"; + kdfparams = { + dklen = 32; + n = 262144; + p = 1; + r = 8; + salt = "d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027"; + }; + mac = "a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3"; + }; + id = "89e847a3-1527-42f6-a321-77de0a14ce02"; + version = 3; + }; + keystore-file = pkgs.writeText "keystore-file" (builtins.toJSON keystore); +in { name = "quorum"; meta = with pkgs.lib.maintainers; { - maintainers = [ mmahut ]; + maintainers = [mmahut]; }; nodes = { - machine = { ... }: { + machine = {...}: { services.quorum = { enable = true; permissioned = false; - staticNodes = [ "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" ]; + staticNodes = ["enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0"]; genesis = { alloc = { "189d23d201b03ae1cf9113672df29a5d672aefa3" = { @@ -33,8 +56,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { byzantiumBlock = 1; chainId = 10; eip150Block = 1; - eip150Hash = - "0x0000000000000000000000000000000000000000000000000000000000000000"; + eip150Hash = "0x0000000000000000000000000000000000000000000000000000000000000000"; eip155Block = 1; eip158Block = 1; isQuorum = true; @@ -43,37 +65,33 @@ import ./make-test-python.nix ({ pkgs, ... }: { policy = 0; }; }; - difficulty = "0x1"; - extraData = - "0x0000000000000000000000000000000000000000000000000000000000000000f8aff869944c1ccd426833b9782729a212c857f2f03b7b4c0d94189d23d201b03ae1cf9113672df29a5d672aefa39444b07d2c28b8ed8f02b45bd84ac7d9051b3349e694c1056df7c02b6f1a353052eaf0533cc7cb743b52947ae555d0f6faad7930434abdaac2274fd86ab516b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"; - gasLimit = "0xe0000000"; - gasUsed = "0x0"; - mixHash = - "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"; - nonce = "0x0"; - number = "0x0"; - parentHash = - "0x0000000000000000000000000000000000000000000000000000000000000000"; - timestamp = "0x5cffc201"; + difficulty = "0x1"; + extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f8aff869944c1ccd426833b9782729a212c857f2f03b7b4c0d94189d23d201b03ae1cf9113672df29a5d672aefa39444b07d2c28b8ed8f02b45bd84ac7d9051b3349e694c1056df7c02b6f1a353052eaf0533cc7cb743b52947ae555d0f6faad7930434abdaac2274fd86ab516b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"; + gasLimit = "0xe0000000"; + gasUsed = "0x0"; + mixHash = "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"; + nonce = "0x0"; + number = "0x0"; + parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; + timestamp = "0x5cffc201"; + }; }; - }; }; }; testScript = '' start_all() - machine.wait_until_succeeds("mkdir -p /var/lib/quorum/keystore") - machine.wait_until_succeeds( - 'echo \{\\"address\\":\\"9377bc3936de934c497e22917b81aa8774ac3bb0\\",\\"crypto\\":\{\\"cipher\\":\\"aes-128-ctr\\",\\"ciphertext\\":\\"ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c\\",\\"cipherparams\\":\{\\"iv\\":\\"2a09f7a72fd6dff7c43150ff437e6ac2\\"\},\\"kdf\\":\\"scrypt\\",\\"kdfparams\\":\{\\"dklen\\":32,\\"n\\":262144,\\"p\\":1,\\"r\\":8,\\"salt\\":\\"d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027\\"\},\\"mac\\":\\"a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3\\"\},\\"id\\":\\"89e847a3-1527-42f6-a321-77de0a14ce02\\",\\"version\\":3\}\\" > /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--9377bc3936de934c497e22917b81aa8774ac3bb0' + machine.succeed("mkdir -p /var/lib/quorum/keystore") + machine.succeed( + 'cp ${keystore-file} /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--${keystore.address}' ) - machine.wait_until_succeeds( + machine.succeed( "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey" ) - machine.wait_until_succeeds("systemctl restart quorum") + machine.succeed("rm -f /var/lib/quorum/static-nodes.json") + machine.succeed("systemctl restart quorum") machine.wait_for_unit("quorum.service") machine.sleep(15) - machine.wait_until_succeeds( - 'geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep 0x9377bc3936de934c497e22917b81aa8774ac3bb0' - ) + machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep ${keystore.address}') ''; }) From 7c759f6223c2d7464ed5c2c935c103a40edd1e5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 07:38:20 +0000 Subject: [PATCH 2/5] matrix-synapse: 1.55.0 -> 1.55.2 (cherry picked from commit 2ec30e4b14e7a32147c62eeb2bf410ab3acb6446) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index cd762c7dc8be..ffe76b25b191 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.55.0"; + version = "1.55.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IfLyp6IexNTMrq795qUMAPQ62mrMPwFyLE1yL8cu0T0="; + sha256 = "sha256-MCdwatNo4cDAaq9a3UFwSLJzT1ZxhoYqPOu/a957D2Y="; }; buildInputs = [ openssl ]; From 62807b427622493e30bfb3cbd4414eadef0e008e Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 19 Mar 2022 02:59:54 +0200 Subject: [PATCH 3/5] tailscale: 1.22.1 -> 1.22.2 (cherry picked from commit 290c5083e0f77f41d20264e217047d6f51d16795) --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 8decb2f4d296..7c7bb84e15b7 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-VUML5GwHrRYPd9lnOZuMA3T1SfdC0rVLP5m1yf+SA0A="; + sha256 = "sha256-W4BcUDMxUZKFXueSI/Xlml17Jabi/hnnOyXgitao76A="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From 53ae7061faca888451aca153e1aed8eabda1d800 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 31 Mar 2022 19:35:57 +0200 Subject: [PATCH 4/5] keycloak: 16.1.0 -> 17.0.1 (cherry picked from commit dd2cab2b5006db3e10563d6041274c50d578936f) --- nixos/tests/keycloak.nix | 4 ++-- pkgs/servers/keycloak/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 6367ed808e06..a4cec8945df6 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -127,7 +127,7 @@ let # post url. keycloak.succeed( "curl -sSf -c cookie '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/auth?client_id=${client.name}&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&scope=openid+email&response_type=code&response_mode=query&nonce=qw4o89g3qqm' >login_form", - "tidy -q -m login_form || true", + "tidy -asxml -q -m login_form || true", "xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:div/_:form[@id='kc-form-login']\" -v @action login_form >form_post_url", ) @@ -135,7 +135,7 @@ let # the HTML, then extract the authorization code. keycloak.succeed( "curl -sSf -L -b cookie -d 'username=${user.username}' -d 'password=${password}' -d 'credentialId=' \"$(auth_code_html", - "tidy -q -m auth_code_html || true", + "tidy -asxml -q -m auth_code_html || true", "xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:input[@id='code']\" -v @value auth_code_html >auth_code", ) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 19268de42ff1..dc0910585f32 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "16.1.0"; + version = "17.0.1"; src = fetchzip { - url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-QVFu3f+mwafoNUttLEVMdoZHMJjjH/TpZAGV7ZvIvh0="; + url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-legacy-${version}.zip"; + sha256 = "sha256-oqANNk7T6+CAS818v3I1QNsuxetL/JFZMqxouRn+kdE="; }; nativeBuildInputs = [ makeWrapper ]; From 29abf698b384258b540e39a86b53ea980495ac4c Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Wed, 30 Mar 2022 21:08:19 -0600 Subject: [PATCH 5/5] signal-desktop: 5.36.0 -> 5.37.0 (cherry picked from commit 2303dc0128e759948bc9255584634a37560d0c0f) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 018f83907dc5..782ede263e0c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.36.0"; # Please backport all updates to the stable channel. + version = "5.37.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-x1PUEDq/0B1T14mBs2FuKtcGpJHWOIvHAs8hptpzhZk="; + sha256 = "sha256-hnRS/7CZPk1bbBjpHLAywKVu2u7jgg3p5/pxEdkzMJ8="; }; nativeBuildInputs = [