BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #202619 from NickCao/stratis

Browse source 
stratisd: 3.3.0 -> 3.4.0

Closes #203194
This commit is contained in:
Mario Rodas 2022-11-27 08:58:59 -05:00 committed by GitHub
commit 98d30160b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/stratis/encryption.nix
View file

@ -26,8 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
# test rebinding encrypted pool # test rebinding encrypted pool
machine.succeed("stratis pool rebind keyring testpool testkey2") machine.succeed("stratis pool rebind keyring testpool testkey2")
# test restarting encrypted pool # test restarting encrypted pool
uuid = machine.succeed("stratis pool list | grep -oE '[0-9a-fA-F-]{36}'").rstrip('\n')
machine.succeed("stratis pool stop testpool") machine.succeed("stratis pool stop testpool")
machine.succeed(f"stratis pool start {uuid} --unlock-method keyring") machine.succeed("stratis pool start --name testpool --unlock-method keyring")
''; '';
}) })

6
pkgs/tools/filesystems/stratis-cli/default.nix
View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "stratis-cli"; pname = "stratis-cli";
version = "3.3.0"; version = "3.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "v${version}";
hash = "sha256-tS9kjXE7wn5j13PO8c3C98MpFbgmR4le/PNKoXKPKQg="; hash = "sha256-kB8saMgNIoDCXhxCPG1Mwj7dxrev82leoewajA5g9IM=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

7
pkgs/tools/filesystems/stratisd/default.nix
View file

@ -24,18 +24,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stratisd"; pname = "stratisd";
version = "3.3.0"; version = "3.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6CCSs359gPwUMQ2SFpxaWHXCjqqgIbvCaPL2zLuYRKg="; hash = "sha256-SHrD9zzGLGSlsf4UOqp4Xday6IDnryVDHIVRiPbE5CM=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-9nE/SFGv1tYyGDdemCahxHlRnLms3eK0r4XQMhQBjSQ="; hash = "sha256-lkuFWVmO+qw2ZXbCwdhU5OpRZy589QKnudgNVTgsJhI=";
}; };
postPatch = '' postPatch = ''
@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
EXECUTABLES_PATHS = lib.makeBinPath ([ EXECUTABLES_PATHS = lib.makeBinPath ([
xfsprogs xfsprogs
thin-provisioning-tools thin-provisioning-tools
udev
] ++ lib.optionals clevisSupport [ ] ++ lib.optionals clevisSupport [
clevis clevis
jose jose