commit 22c17bd5f3ec1f2c49f9afee4c7f9d99fcd45827 · pyrox.dev/nixpkgs

+1

nixos/modules/module-list.nix

···

       1266
       1266
        
         ./tasks/network-interfaces-scripted.nix

     

       1267
       1267
        
         ./tasks/scsi-link-power-management.nix

     

       1268
       1268
        
         ./tasks/snapraid.nix

     

       1269
       1269
       +
         ./tasks/stratis.nix

     

       1269
       1270
        
         ./tasks/swraid.nix

     

       1270
       1271
        
         ./tasks/trackpoint.nix

     

       1271
       1272
        
         ./tasks/powertop.nix

+18

nixos/modules/tasks/stratis.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.stratis;

     

       5
       5
       +
       in

     

       6
       6
       +
       {

     

       7
       7
       +
         options.services.stratis = {

     

       8
       8
       +
           enable = lib.mkEnableOption (lib.mdDoc "Stratis Storage - Easy to use local storage management for Linux");

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         config = lib.mkIf cfg.enable {

     

       12
       12
       +
           environment.systemPackages = [ pkgs.stratis-cli ];

     

       13
       13
       +
           systemd.packages = [ pkgs.stratisd ];

     

       14
       14
       +
           services.dbus.packages = [ pkgs.stratisd ];

     

       15
       15
       +
           services.udev.packages = [ pkgs.stratisd ];

     

       16
       16
       +
           systemd.services.stratisd.wantedBy = [ "sysinit.target" ];

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+1

nixos/tests/all-tests.nix

···

       533
       533
        
         sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};

     

       534
       534
        
         starship = handleTest ./starship.nix {};

     

       535
       535
        
         step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {};

     

       536
       536
       +
         stratis = handleTest ./stratis {};

     

       536
       537
        
         strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};

     

       537
       538
        
         stunnel = handleTest ./stunnel.nix {};

     

       538
       539
        
         sudo = handleTest ./sudo.nix {};

+7

nixos/tests/stratis/default.nix

···

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , pkgs ? import ../../.. { inherit system; }

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
         simple = import ./simple.nix { inherit system pkgs; };

     

       7
       7
       +
       }

+39

nixos/tests/stratis/simple.nix

···

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, ... }:

     

       2
       2
       +
         {

     

       3
       3
       +
           name = "stratis";

     

       4
       4
       +
       

     

       5
       5
       +
           meta = with pkgs.lib.maintainers; {

     

       6
       6
       +
             maintainers = [ nickcao ];

     

       7
       7
       +
           };

     

       8
       8
       +
       

     

       9
       9
       +
           nodes.machine = { pkgs, ... }: {

     

       10
       10
       +
             services.stratis.enable = true;

     

       11
       11
       +
             virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ];

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       14
       14
       +
           testScript = ''

     

       15
       15
       +
             machine.wait_for_unit("stratisd")

     

       16
       16
       +
             # test pool creation

     

       17
       17
       +
             machine.succeed("stratis pool create     testpool /dev/vdb")

     

       18
       18
       +
             machine.succeed("stratis pool add-data   testpool /dev/vdc")

     

       19
       19
       +
             machine.succeed("stratis pool init-cache testpool /dev/vdd")

     

       20
       20
       +
             machine.succeed("stratis pool add-cache  testpool /dev/vde")

     

       21
       21
       +
             # test filesystem creation and rename

     

       22
       22
       +
             machine.succeed("stratis filesystem create testpool testfs0")

     

       23
       23
       +
             machine.succeed("stratis filesystem rename testpool testfs0 testfs1")

     

       24
       24
       +
             # test snapshot

     

       25
       25
       +
             machine.succeed("mkdir -p /mnt/testfs1 /mnt/testfs2")

     

       26
       26
       +
             machine.wait_for_file("/dev/stratis/testpool/testfs1")

     

       27
       27
       +
             machine.succeed("mount /dev/stratis/testpool/testfs1 /mnt/testfs1")

     

       28
       28
       +
             machine.succeed("echo test0 > /mnt/testfs1/test0")

     

       29
       29
       +
             machine.succeed("echo test1 > /mnt/testfs1/test1")

     

       30
       30
       +
             machine.succeed("stratis filesystem snapshot testpool testfs1 testfs2")

     

       31
       31
       +
             machine.succeed("echo test2 > /mnt/testfs1/test1")

     

       32
       32
       +
             machine.wait_for_file("/dev/stratis/testpool/testfs2")

     

       33
       33
       +
             machine.succeed("mount /dev/stratis/testpool/testfs2 /mnt/testfs2")

     

       34
       34
       +
             assert "test0" in machine.succeed("cat /mnt/testfs1/test0")

     

       35
       35
       +
             assert "test0" in machine.succeed("cat /mnt/testfs2/test0")

     

       36
       36
       +
             assert "test2" in machine.succeed("cat /mnt/testfs1/test1")

     

       37
       37
       +
             assert "test1" in machine.succeed("cat /mnt/testfs2/test1")

     

       38
       38
       +
           '';

     

       39
       39
       +
         })

+34

pkgs/development/python-modules/dbus-python-client-gen/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , into-dbus-python

     

       5
       5
       +
       , dbus-python

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "dbus-python-client-gen";

     

       11
       11
       +
         version = "0.8";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "stratis-storage";

     

       15
       15
       +
           repo = pname;

     

       16
       16
       +
           rev = "v${version}";

     

       17
       17
       +
           hash = "sha256-nSzxT65WHBVct5pGHmIAHJXftd0tKZeK/argN+V9xcs=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           into-dbus-python

     

       22
       22
       +
           dbus-python

     

       23
       23
       +
         ];

     

       24
       24
       +
         checkInputs = [

     

       25
       25
       +
           pytestCheckHook

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         meta = with lib; {

     

       29
       29
       +
           description = "A Python library for generating dbus-python client code";

     

       30
       30
       +
           homepage = "https://github.com/stratis-storage/dbus-python-client-gen";

     

       31
       31
       +
           license = licenses.mpl20;

     

       32
       32
       +
           maintainers = with maintainers; [ nickcao ];

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+34

pkgs/development/python-modules/dbus-signature-pyparsing/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pyparsing

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , hypothesis

     

       7
       7
       +
       , hs-dbus-signature

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "dbus-signature-pyparsing";

     

       12
       12
       +
         version = "0.04";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "stratis-storage";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = "v${version}";

     

       18
       18
       +
           hash = "sha256-IXyepfq7pLTRkTolKWsKGrYDoxukVC9JTrxS9xV7s2I=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         propagatedBuildInputs = [ pyparsing ];

     

       22
       22
       +
         checkInputs = [

     

       23
       23
       +
           pytestCheckHook

     

       24
       24
       +
           hypothesis

     

       25
       25
       +
           hs-dbus-signature

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         meta = with lib; {

     

       29
       29
       +
           description = "A Parser for a D-Bus Signature";

     

       30
       30
       +
           homepage = "https://github.com/stratis-storage/dbus-signature-pyparsing";

     

       31
       31
       +
           license = licenses.asl20;

     

       32
       32
       +
           maintainers = with maintainers; [ nickcao ];

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+28

pkgs/development/python-modules/hs-dbus-signature/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , hypothesis

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "hs-dbus-signature";

     

       10
       10
       +
         version = "0.7";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           hash = "sha256-NNnTcSX+K8zU+sj1QBd13h7aEXN9VqltJMNWCuhgZ6I=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         checkInputs = [

     

       18
       18
       +
           pytestCheckHook

     

       19
       19
       +
           hypothesis

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "A Hypothesis Strategy for Generating Arbitrary DBus Signatures";

     

       24
       24
       +
           homepage = "https://github.com/stratis-storage/hs-dbus-signature";

     

       25
       25
       +
           license = licenses.mpl20;

     

       26
       26
       +
           maintainers = with maintainers; [ nickcao ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+38

pkgs/development/python-modules/into-dbus-python/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , dbus-signature-pyparsing

     

       5
       5
       +
       , dbus-python

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       , hypothesis

     

       8
       8
       +
       , hs-dbus-signature

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "into-dbus-python";

     

       13
       13
       +
         version = "0.08";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "stratis-storage";

     

       17
       17
       +
           repo = pname;

     

       18
       18
       +
           rev = "v${version}";

     

       19
       19
       +
           hash = "sha256-Z8e6oAvRMIisMjG4HcS5jSH1znGVc7pGpMITo5fXYVs=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           dbus-signature-pyparsing

     

       24
       24
       +
           dbus-python

     

       25
       25
       +
         ];

     

       26
       26
       +
         checkInputs = [

     

       27
       27
       +
           pytestCheckHook

     

       28
       28
       +
           hypothesis

     

       29
       29
       +
           hs-dbus-signature

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           description = "A transformer to dbus-python types";

     

       34
       34
       +
           homepage = "https://github.com/stratis-storage/into-dbus-python";

     

       35
       35
       +
           license = licenses.asl20;

     

       36
       36
       +
           maintainers = with maintainers; [ nickcao ];

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+36

pkgs/tools/filesystems/stratis-cli/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3Packages

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , nixosTests

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       python3Packages.buildPythonApplication rec {

     

       8
       8
       +
         pname = "stratis-cli";

     

       9
       9
       +
         version = "3.2.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "stratis-storage";

     

       13
       13
       +
           repo = pname;

     

       14
       14
       +
           rev = "v${version}";

     

       15
       15
       +
           hash = "sha256-JQXTzvm4l/pl2T4djZ3HEdDQJdFE+I9doe8Iv5q34kw=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = with python3Packages; [

     

       19
       19
       +
           psutil

     

       20
       20
       +
           python-dateutil

     

       21
       21
       +
           wcwidth

     

       22
       22
       +
           justbytes

     

       23
       23
       +
           dbus-client-gen

     

       24
       24
       +
           dbus-python-client-gen

     

       25
       25
       +
           packaging

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         passthru.tests = nixosTests.stratis;

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           description = "CLI for the Stratis project";

     

       32
       32
       +
           homepage = "https://stratis-storage.github.io";

     

       33
       33
       +
           license = licenses.asl20;

     

       34
       34
       +
           maintainers = with maintainers; [ nickcao ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+3

pkgs/tools/filesystems/stratisd/default.nix

···

       18
       18
        
       , tpm2-tools

     

       19
       19
        
       , coreutils

     

       20
       20
        
       , clevisSupport ? false

     

       21
       21
       +
       , nixosTests

     

       21
       22
        
       }:

     

       22
       23
        
       

     

       23
       24
        
       stdenv.mkDerivation rec {

     
···

       94
       95
        
           rm -r "$out/lib/dracut"

     

       95
       96
        
           rm -r "$out/lib/systemd/system-generators"

     

       96
       97
        
         '';

     

       98
       98
       +
       

     

       99
       99
       +
         passthru.tests = nixosTests.stratis;

     

       97
       100
        
       

     

       98
       101
        
         meta = with lib; {

     

       99
       102
        
           description = "Easy to use local storage management for Linux";

+2

pkgs/top-level/all-packages.nix

···

       5940
       5940
        
       

     

       5941
       5941
        
         stratisd = callPackage ../tools/filesystems/stratisd { };

     

       5942
       5942
        
       

     

       5943
       5943
       +
         stratis-cli = callPackage ../tools/filesystems/stratis-cli { };

     

       5944
       5944
       +
       

     

       5943
       5945
        
         strawberry = libsForQt5.callPackage ../applications/audio/strawberry { };

     

       5944
       5946
        
       

     

       5945
       5947
        
         schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {

+8

pkgs/top-level/python-packages.nix

···

       2302
       2302
        
           inherit (pkgs) dbus;

     

       2303
       2303
        
         };

     

       2304
       2304
        
       

     

       2305
       2305
       +
         dbus-python-client-gen = callPackage ../development/python-modules/dbus-python-client-gen { };

     

       2306
       2306
       +
       

     

       2307
       2307
       +
         dbus-signature-pyparsing = callPackage ../development/python-modules/dbus-signature-pyparsing { };

     

       2308
       2308
       +
       

     

       2305
       2309
        
         dbutils = callPackage ../development/python-modules/dbutils { };

     

       2306
       2310
        
       

     

       2307
       2311
        
         db-dtypes = callPackage ../development/python-modules/db-dtypes { };

     
···

       4235
       4239
        
       

     

       4236
       4240
        
         hpccm = callPackage ../development/python-modules/hpccm { };

     

       4237
       4241
        
       

     

       4242
       4242
       +
         hs-dbus-signature = callPackage ../development/python-modules/hs-dbus-signature { };

     

       4243
       4243
       +
       

     

       4238
       4244
        
         hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };

     

       4239
       4245
        
       

     

       4240
       4246
        
         hsluv = callPackage ../development/python-modules/hsluv { };

     
···

       4522
       4528
        
         interruptingcow = callPackage ../development/python-modules/interruptingcow { };

     

       4523
       4529
        
       

     

       4524
       4530
        
         intervaltree = callPackage ../development/python-modules/intervaltree { };

     

       4531
       4531
       +
       

     

       4532
       4532
       +
         into-dbus-python = callPackage ../development/python-modules/into-dbus-python { };

     

       4525
       4533
        
       

     

       4526
       4534
        
         intreehooks = callPackage ../development/python-modules/intreehooks { };

     

       4527
       4535