ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-02 17:09:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #212512 from NickCao/stratis

Browse Source 
stratisd: 3.4.4 -> 3.5.0
This commit is contained in:
Nick Cao 2023-01-26 13:49:08 +08:00 committed by GitHub
commit 39b5d060cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/stratis/simple.nix
View File

@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
nodes.machine = { pkgs, ... }: {
services.stratis.enable = true;
virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ];
virtualisation.emptyDiskImages = [ 2048 1024 1024 1024 ];
};
testScript = ''

4
pkgs/tools/filesystems/stratis-cli/default.nix
View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "stratis-cli";
version = "3.4.1";
version = "3.5.0";
src = fetchFromGitHub {
owner = "stratis-storage";
repo = pname;
rev = "v${version}";
hash = "sha256-S0daUi0rhelip2pwcAP3WGey8BbeMa/7AgSrFfuB+cM=";
hash = "sha256-IfvI8DVjm68SewHtQbhGGU1oku4eZnF7cRyeVPB/Ctk=";
};
propagatedBuildInputs = with python3Packages; [

11
pkgs/tools/filesystems/stratisd/default.nix
View File

@ -5,6 +5,7 @@
, pkg-config
, asciidoc
, ncurses
, glibc
, dbus
, cryptsetup
, util-linux
@ -24,18 +25,18 @@
stdenv.mkDerivation rec {
pname = "stratisd";
version = "3.4.4";
version = "3.5.0";
src = fetchFromGitHub {
owner = "stratis-storage";
repo = pname;
rev = "v${version}";
hash = "sha256-6VrbouYNB2iOndnDBfww8gT4eFgfP+HWcfep+N1nErI=";
hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
hash = "sha256-C3nkHQt+w0OYbExDfEpFE0Et6ILJqMNRPXCEWiURf3A=";
hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q=";
};
postPatch = ''
@ -61,6 +62,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
glibc
glibc.static
dbus
cryptsetup
util-linux
@ -81,7 +84,7 @@ stdenv.mkDerivation rec {
]);
makeFlags = [ "PREFIX=${placeholder "out"}" "INSTALL=install" ];
buildFlags = [ "build" "build-min" "docs/stratisd.8" ];
buildFlags = [ "build-all" ];
doCheck = true;
checkTarget = "test";