diff --git a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix index 1c287147ae91..896e5af0657f 100644 --- a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix +++ b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix @@ -208,7 +208,7 @@ in LoadCredential = config.systemd.services.radicle-node.serviceConfig.LoadCredential or [ ]; BindReadOnlyPaths = config.systemd.services.radicle-node.serviceConfig.BindReadOnlyPaths ++ [ - "/run/credentials/radicle-ci-broker.service/xyz.radicle.node.secret:/var/lib/radicle/keys/radicle" + "/run/credentials/radicle-ci-broker.service/dev.radicle.node.secret:/var/lib/radicle/keys/radicle" ]; ReadWritePaths = [ RAD_HOME ]; diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 6a1956ed526e..3456faeabd0e 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -17,8 +17,8 @@ let }; credentials = { - privateKey = "xyz.radicle.node.secret"; - privateKeyPassphrase = "xyz.radicle.node.passphrase"; + privateKey = "dev.radicle.node.secret"; + privateKeyPassphrase = "dev.radicle.node.passphrase"; }; # Convenient wrapper to run `rad` in the namespaces of `radicle-node.service` diff --git a/nixos/tests/radicle-ci-broker.nix b/nixos/tests/radicle-ci-broker.nix index c65ddf8af69f..775d10c085ed 100644 --- a/nixos/tests/radicle-ci-broker.nix +++ b/nixos/tests/radicle-ci-broker.nix @@ -20,7 +20,7 @@ in nodes.seed = { virtualisation.credentials = { - "xyz.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}"; + "dev.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}"; }; services.radicle = { diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix index 17a26c85820b..dc8e1d042176 100644 --- a/nixos/tests/radicle.nix +++ b/nixos/tests/radicle.nix @@ -72,7 +72,7 @@ in imports = [ commonHostConfig ]; virtualisation.credentials = { - "xyz.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}"; + "dev.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}"; }; services.radicle = { diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix index e3a861ec3a8d..2146646e0735 100644 --- a/pkgs/by-name/ra/radicle-desktop/package.nix +++ b/pkgs/by-name/ra/radicle-desktop/package.nix @@ -21,6 +21,7 @@ wrapGAppsHook4, rustfmt, clippy, + writableTmpDirAsHomeHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -97,12 +98,12 @@ rustPlatform.buildRustPackage (finalAttrs: { radicle-node rustfmt clippy + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export RAD_HOME="$PWD/_rad-home" export RAD_PASSPHRASE="" rad auth --alias test bins="tests/tmp/bin/heartwood/$HW_RELEASE" diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 0a149e8c4023..133ea27c788e 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -15,9 +15,9 @@ xdg-utils, versionCheckHook, - version ? "1.8.0", - srcHash ? "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=", - cargoHash ? "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=", + version ? "1.9.0", + srcHash ? "sha256-ECged52tJaBSW2ua3MPDEBdGKPJ50Q347evd5wdbbU0=", + cargoHash ? "sha256-Vb86Zx851Mrn9yaNuIQHEuVr7PrD7plPZhPGFJOLKRg=", updateScript ? ./update.sh, }: diff --git a/pkgs/by-name/ra/radicle-node/unstable.nix b/pkgs/by-name/ra/radicle-node/unstable.nix index 6834585b47a6..941b98452eb4 100644 --- a/pkgs/by-name/ra/radicle-node/unstable.nix +++ b/pkgs/by-name/ra/radicle-node/unstable.nix @@ -1,8 +1,8 @@ { radicle-node }: radicle-node.override { - version = "1.9.0-rc.3"; - srcHash = "sha256-NUxrNv0NbqZqE0zx8L+PS32jFeb/upoGtZorEcL4O1c="; - cargoHash = "sha256-WUOfZ41ImJQhX5Jqj6z8v28oapG/sP4zBe8inkfDlbA="; + version = "1.9.0"; + srcHash = "sha256-ECged52tJaBSW2ua3MPDEBdGKPJ50Q347evd5wdbbU0="; + cargoHash = "sha256-Vb86Zx851Mrn9yaNuIQHEuVr7PrD7plPZhPGFJOLKRg="; updateScript = ./update-unstable.sh; }