commit f709cfe630da9398f213341242bff0449bc70eaf · pyrox.dev/nixpkgs

+26 -3

nixos/modules/services/system/swapspace.nix

···

       9
       9
        
         cfg = config.services.swapspace;

     

       10
       10
        
         inherit (lib)

     

       11
       11
        
           types

     

       12
       12
       +
           mkIf

     

       12
       13
        
           mkOption

     

       13
       14
        
           mkPackageOption

     

       14
       15
        
           mkEnableOption

     

       15
       16
        
           ;

     

       16
       16
       -
         configFile = pkgs.writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);

     

       17
       17
       +
         inherit (pkgs)

     

       18
       18
       +
           makeWrapper

     

       19
       19
       +
           runCommand

     

       20
       20
       +
           writeText

     

       21
       21
       +
           ;

     

       22
       22
       +
         configFile = writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);

     

       23
       23
       +
         userWrapper =

     

       24
       24
       +
           runCommand "swapspace"

     

       25
       25
       +
             {

     

       26
       26
       +
               buildInputs = [ makeWrapper ];

     

       27
       27
       +
             }

     

       28
       28
       +
             ''

     

       29
       29
       +
               mkdir -p "$out/bin"

     

       30
       30
       +
               makeWrapper '${lib.getExe cfg.package}' "$out/bin/swapspace" \

     

       31
       31
       +
                 --add-flags "-c '${configFile}'"

     

       32
       32
       +
             '';

     

       17
       33
        
       in

     

       18
       34
        
       {

     

       19
       35
        
         options.services.swapspace = {

     
···

       27
       43
        
               "-v"

     

       28
       44
        
             ];

     

       29
       45
        
             description = "Any extra arguments to pass to swapspace";

     

       46
       46
       +
           };

     

       47
       47
       +
           installWrapper = mkOption {

     

       48
       48
       +
             type = types.bool;

     

       49
       49
       +
             default = true;

     

       50
       50
       +
             description = ''

     

       51
       51
       +
               This will add swapspace wrapped with the generated config, to environment.systemPackages

     

       52
       52
       +
             '';

     

       30
       53
        
           };

     

       31
       54
        
           settings = mkOption {

     

       32
       55
        
             type = types.submodule {

     
···

       92
       115
        
           };

     

       93
       116
        
         };

     

       94
       117
        
       

     

       95
       95
       -
         config = lib.mkIf cfg.enable {

     

       96
       96
       -
           environment.systemPackages = [ cfg.package ];

     

       118
       118
       +
         config = mkIf cfg.enable {

     

       119
       119
       +
           environment.systemPackages = [ (if cfg.installWrapper then userWrapper else cfg.package) ];

     

       97
       120
        
           systemd.packages = [ cfg.package ];

     

       98
       121
        
           systemd.services.swapspace = {

     

       99
       122
        
             wantedBy = [ "multi-user.target" ];

+5 -2

nixos/tests/swapspace.nix

···

       1
       1
        
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       2
       2
       +
         { lib, ... }:

     

       3
       3
        
       

     

       4
       4
        
         {

     

       5
       5
        
           name = "swapspace";

     

       6
       6
        
       

     

       7
       7
       -
           meta = with pkgs.lib.maintainers; {

     

       7
       7
       +
           meta = with lib.maintainers; {

     

       8
       8
        
             maintainers = [

     

       9
       9
        
               Luflosi

     

       10
       10
        
               phanirithvij

     
···

       37
       37
        
             machine.wait_for_unit("multi-user.target")

     

       38
       38
        
             machine.wait_for_unit("swapspace.service")

     

       39
       39
        
             machine.wait_for_unit("root-swapfile.swap")

     

       40
       40
       +
       

     

       41
       41
       +
             # ensure swapspace wrapper command runs

     

       42
       42
       +
             machine.succeed("swapspace --inspect")

     

       40
       43
        
       

     

       41
       44
        
             swamp = False

     

       42
       45
        
             with subtest("swapspace works"):

+17 -14

pkgs/by-name/sw/swapspace/package.nix

···

       10
       10
        
         nixosTests,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
       -
       stdenv.mkDerivation rec {

     

       13
       13
       +
       stdenv.mkDerivation (finalAttrs: {

     

       14
       14
        
         pname = "swapspace";

     

       15
       15
        
         version = "1.18.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "Tookmund";

     

       19
       19
        
           repo = "Swapspace";

     

       20
       20
       -
           rev = "v${version}";

     

       20
       20
       +
           tag = "v${finalAttrs.version}";

     

       21
       21
        
           sha256 = "sha256-KrPdmF1H7WFI78ZJlLqDyfxbs7fymSUQpXL+7XjN9bI=";

     

       22
       22
        
         };

     

       23
       23
        
       

     
···

       45
       45
        
           install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"

     

       46
       46
        
         '';

     

       47
       47
        
       

     

       48
       48
       -
         # Nothing in swapspace --help or swapspace’s man page mentions

     

       49
       49
       -
         # anything about swapspace executing its arguments.

     

       50
       50
       -
         passthru.binlore.out = binlore.synthesize swapspace ''

     

       51
       51
       -
           execer cannot bin/swapspace

     

       52
       52
       -
         '';

     

       53
       53
       -
         passthru.tests = {

     

       54
       54
       -
           inherit (nixosTests) swapspace;

     

       48
       48
       +
         passthru = {

     

       49
       49
       +
           # Nothing in swapspace --help or swapspace’s man page mentions

     

       50
       50
       +
           # anything about swapspace executing its arguments.

     

       51
       51
       +
           binlore.out = binlore.synthesize swapspace ''

     

       52
       52
       +
             execer cannot bin/swapspace

     

       53
       53
       +
           '';

     

       54
       54
       +
           tests = {

     

       55
       55
       +
             inherit (nixosTests) swapspace;

     

       56
       56
       +
           };

     

       55
       57
        
         };

     

       56
       58
        
       

     

       57
       57
       -
         meta = with lib; {

     

       59
       59
       +
         meta = {

     

       58
       60
        
           description = "Dynamic swap manager for Linux";

     

       59
       61
        
           homepage = "https://github.com/Tookmund/Swapspace";

     

       60
       60
       -
           license = licenses.gpl2Only;

     

       61
       61
       -
           platforms = platforms.linux;

     

       62
       62
       -
           maintainers = with maintainers; [ Luflosi ];

     

       62
       62
       +
           changelog = "https://github.com/Tookmund/Swapspace/releases/tag/v${finalAttrs.version}";

     

       63
       63
        
           mainProgram = "swapspace";

     

       64
       64
       +
           license = lib.licenses.gpl2Only;

     

       65
       65
       +
           platforms = lib.platforms.linux;

     

       66
       66
       +
           maintainers = with lib.maintainers; [ Luflosi ];

     

       64
       67
        
         };

     

       65
       65
       -
       }

     

       68
       68
       +
       })