commit c71cae8bbdbddae0958a383c0fb1f46df41eb0aa · pyrox.dev/nixpkgs

+60 -34

nixos/modules/services/hardware/triggerhappy.nix

···

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

     

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       let

     

       3
       8
        
       

     

       4
       9
        
         cfg = config.services.triggerhappy;

     
···

       6
       11
        
         socket = "/run/thd.socket";

     

       7
       12
        
       

     

       8
       13
        
         configFile = pkgs.writeText "triggerhappy.conf" ''

     

       9
       9
       -
           ${lib.concatMapStringsSep "\n"

     

       10
       10
       -
             ({ keys, event, cmd, ... }:

     

       11
       11
       -
               ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}''

     

       12
       12
       -
             )

     

       13
       13
       -
             cfg.bindings}

     

       14
       14
       +
           ${lib.concatMapStringsSep "\n" (

     

       15
       15
       +
             {

     

       16
       16
       +
               keys,

     

       17
       17
       +
               event,

     

       18
       18
       +
               cmd,

     

       19
       19
       +
               ...

     

       20
       20
       +
             }:

     

       21
       21
       +
             ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${

     

       22
       22
       +
               toString

     

       23
       23
       +
                 {

     

       24
       24
       +
                   press = 1;

     

       25
       25
       +
                   hold = 2;

     

       26
       26
       +
                   release = 0;

     

       27
       27
       +
                 }

     

       28
       28
       +
                 .${event}

     

       29
       29
       +
             } ${cmd}''

     

       30
       30
       +
           ) cfg.bindings}

     

       14
       31
        
           ${cfg.extraConfig}

     

       15
       32
        
         '';

     

       16
       33
        
       

     

       17
       17
       -
         bindingCfg = { ... }: {

     

       18
       18
       -
           options = {

     

       34
       34
       +
         bindingCfg =

     

       35
       35
       +
           { ... }:

     

       36
       36
       +
           {

     

       37
       37
       +
             options = {

     

       19
       38
        
       

     

       20
       20
       -
             keys = lib.mkOption {

     

       21
       21
       -
               type = lib.types.listOf lib.types.str;

     

       22
       22
       -
               description = "List of keys to match.  Key names as defined in linux/input-event-codes.h";

     

       23
       23
       -
             };

     

       39
       39
       +
               keys = lib.mkOption {

     

       40
       40
       +
                 type = lib.types.listOf lib.types.str;

     

       41
       41
       +
                 description = "List of keys to match.  Key names as defined in linux/input-event-codes.h";

     

       42
       42
       +
               };

     

       24
       43
        
       

     

       25
       25
       -
             event = lib.mkOption {

     

       26
       26
       -
               type = lib.types.enum ["press" "hold" "release"];

     

       27
       27
       -
               default = "press";

     

       28
       28
       -
               description = "Event to match.";

     

       29
       29
       -
             };

     

       44
       44
       +
               event = lib.mkOption {

     

       45
       45
       +
                 type = lib.types.enum [

     

       46
       46
       +
                   "press"

     

       47
       47
       +
                   "hold"

     

       48
       48
       +
                   "release"

     

       49
       49
       +
                 ];

     

       50
       50
       +
                 default = "press";

     

       51
       51
       +
                 description = "Event to match.";

     

       52
       52
       +
               };

     

       30
       53
        
       

     

       31
       31
       -
             cmd = lib.mkOption {

     

       32
       32
       -
               type = lib.types.str;

     

       33
       33
       -
               description = "What to run.";

     

       34
       34
       -
             };

     

       54
       54
       +
               cmd = lib.mkOption {

     

       55
       55
       +
                 type = lib.types.str;

     

       56
       56
       +
                 description = "What to run.";

     

       57
       57
       +
               };

     

       35
       58
        
       

     

       59
       59
       +
             };

     

       36
       60
        
           };

     

       37
       37
       -
         };

     

       38
       61
        
       

     

       39
       62
        
       in

     

       40
       63
        
       

     
···

       65
       88
        
       

     

       66
       89
        
             bindings = lib.mkOption {

     

       67
       90
        
               type = lib.types.listOf (lib.types.submodule bindingCfg);

     

       68
       68
       -
               default = [];

     

       91
       91
       +
               default = [ ];

     

       69
       92
        
               example = lib.literalExpression ''

     

       70
       70
       -
                 [ { keys = ["PLAYPAUSE"];  cmd = "''${pkgs.mpc-cli}/bin/mpc -q toggle"; } ]

     

       93
       93
       +
                 [ { keys = ["PLAYPAUSE"];  cmd = "''${lib.getExe pkgs.mpc} -q toggle"; } ]

     

       71
       94
        
               '';

     

       72
       95
        
               description = ''

     

       73
       96
        
                 Key bindings for {command}`triggerhappy`.

     
···

       86
       109
        
       

     

       87
       110
        
         };

     

       88
       111
        
       

     

       89
       89
       -
       

     

       90
       112
        
         ###### implementation

     

       91
       113
        
       

     

       92
       114
        
         config = lib.mkIf cfg.enable {

     
···

       101
       123
        
             wantedBy = [ "multi-user.target" ];

     

       102
       124
        
             description = "Global hotkey daemon";

     

       103
       125
        
             serviceConfig = {

     

       104
       104
       -
               ExecStart = "${pkgs.triggerhappy}/bin/thd ${lib.optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";

     

       126
       126
       +
               ExecStart = "${pkgs.triggerhappy}/bin/thd ${

     

       127
       127
       +
                 lib.optionalString (cfg.user != "root") "--user ${cfg.user}"

     

       128
       128
       +
               } --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";

     

       105
       129
        
             };

     

       106
       130
        
           };

     

       107
       131
        
       

     

       108
       108
       -
           services.udev.packages = lib.singleton (pkgs.writeTextFile {

     

       109
       109
       -
             name = "triggerhappy-udev-rules";

     

       110
       110
       -
             destination = "/etc/udev/rules.d/61-triggerhappy.rules";

     

       111
       111
       -
             text = ''

     

       112
       112
       -
               ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \

     

       113
       113
       -
                 RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev"

     

       114
       114
       -
             '';

     

       115
       115
       -
           });

     

       132
       132
       +
           services.udev.packages = lib.singleton (

     

       133
       133
       +
             pkgs.writeTextFile {

     

       134
       134
       +
               name = "triggerhappy-udev-rules";

     

       135
       135
       +
               destination = "/etc/udev/rules.d/61-triggerhappy.rules";

     

       136
       136
       +
               text = ''

     

       137
       137
       +
                 ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \

     

       138
       138
       +
                   RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev"

     

       139
       139
       +
               '';

     

       140
       140
       +
             }

     

       141
       141
       +
           );

     

       116
       142
        
       

     

       117
       143
        
         };

     

       118
       144

+72 -55

nixos/tests/mpd.nix

···

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

     

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

     

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

     

       2
       3
        
         let

     

       3
       4
        
           track = pkgs.fetchurl {

     

       4
       5
        
             # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in

     

       5
       5
       -
             # License: http://creativecommons.org/licenses/by-sa/4.0/

     

       6
       6
        
       

     

       7
       7
        
             name = "Blue_Wave_Theory-Skyhawk_Beach.mp3";

     

       8
       8
        
             url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3";

     

       9
       9
       -
             sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp";

     

       9
       9
       +
             hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc=";

     

       10
       10
       +
             meta.license = lib.licenses.cc-by-sa-40;

     

       10
       11
        
           };

     

       11
       12
        
       

     

       12
       13
        
           defaultCfg = rec {

     
···

       16
       17
        
             musicDirectory = "${dataDir}/music";

     

       17
       18
        
           };

     

       18
       19
        
       

     

       19
       19
       -
           defaultMpdCfg = with defaultCfg; {

     

       20
       20
       -
             inherit dataDir musicDirectory user group;

     

       20
       20
       +
           defaultMpdCfg = {

     

       21
       21
       +
             inherit (defaultCfg)

     

       22
       22
       +
               dataDir

     

       23
       23
       +
               musicDirectory

     

       24
       24
       +
               user

     

       25
       25
       +
               group

     

       26
       26
       +
               ;

     

       21
       27
        
             enable = true;

     

       22
       28
        
           };

     

       23
       29
        
       

     

       24
       24
       -
           musicService = { user, group, musicDirectory }: {

     

       25
       25
       -
             description = "Sets up the music file(s) for MPD to use.";

     

       26
       26
       -
             requires = [ "mpd.service" ];

     

       27
       27
       -
             after = [ "mpd.service" ];

     

       28
       28
       -
             wantedBy = [ "default.target" ];

     

       29
       29
       -
             script = ''

     

       30
       30
       -
               cp ${track} ${musicDirectory}

     

       31
       31
       -
             '';

     

       32
       32
       -
             serviceConfig = {

     

       33
       33
       -
               User = user;

     

       34
       34
       -
               Group = group;

     

       30
       30
       +
           musicService =

     

       31
       31
       +
             {

     

       32
       32
       +
               user,

     

       33
       33
       +
               group,

     

       34
       34
       +
               musicDirectory,

     

       35
       35
       +
             }:

     

       36
       36
       +
             {

     

       37
       37
       +
               description = "Sets up the music file(s) for MPD to use.";

     

       38
       38
       +
               requires = [ "mpd.service" ];

     

       39
       39
       +
               after = [ "mpd.service" ];

     

       40
       40
       +
               wantedBy = [ "default.target" ];

     

       41
       41
       +
               script = ''

     

       42
       42
       +
                 cp ${track} ${musicDirectory}

     

       43
       43
       +
               '';

     

       44
       44
       +
               serviceConfig = {

     

       45
       45
       +
                 User = user;

     

       46
       46
       +
                 Group = group;

     

       47
       47
       +
               };

     

       35
       48
        
             };

     

       36
       36
       -
           };

     

       37
       49
        
       

     

       38
       38
       -
           mkServer = { mpd, musicService, }:

     

       39
       39
       -
             { boot.kernelModules = [ "snd-dummy" ];

     

       50
       50
       +
           mkServer =

     

       51
       51
       +
             { mpd, musicService }:

     

       52
       52
       +
             {

     

       53
       53
       +
               boot.kernelModules = [ "snd-dummy" ];

     

       40
       54
        
               services.mpd = mpd;

     

       41
       55
        
               systemd.services.musicService = musicService;

     

       42
       56
        
             };

     

       43
       43
       -
         in {

     

       57
       57
       +
         in

     

       58
       58
       +
         {

     

       44
       59
        
           name = "mpd";

     

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

     

       46
       46
       -
             maintainers = [ emmanuelrosa ];

     

       60
       60
       +
           meta = {

     

       61
       61
       +
             maintainers = with lib.maintainers; [ emmanuelrosa ];

     

       47
       62
        
           };

     

       48
       63
        
       

     

       49
       49
       -
         nodes =

     

       50
       50
       -
           { client =

     

       51
       51
       -
             { ... }: { };

     

       64
       64
       +
           nodes = {

     

       65
       65
       +
             client = { ... }: { };

     

       52
       66
        
       

     

       53
       67
        
             serverALSA =

     

       54
       54
       -
               { ... }: lib.mkMerge [

     

       68
       68
       +
               { ... }:

     

       69
       69
       +
               lib.mkMerge [

     

       55
       70
        
                 (mkServer {

     

       56
       71
        
                   mpd = defaultMpdCfg // {

     

       57
       72
        
                     network.listenAddress = "any";

     
···

       63
       78
        
                       }

     

       64
       79
        
                     '';

     

       65
       80
        
                   };

     

       66
       66
       -
                   musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };

     

       81
       81
       +
                   musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };

     

       67
       82
        
                 })

     

       68
       83
        
                 { networking.firewall.allowedTCPPorts = [ 6600 ]; }

     

       69
       84
        
               ];

     

       70
       85
        
       

     

       71
       86
        
             serverPulseAudio =

     

       72
       72
       -
               { ... }: lib.mkMerge [

     

       87
       87
       +
               { ... }:

     

       88
       88
       +
               lib.mkMerge [

     

       73
       89
        
                 (mkServer {

     

       74
       90
        
                   mpd = defaultMpdCfg // {

     

       75
       91
        
                     extraConfig = ''

     
···

       80
       96
        
                     '';

     

       81
       97
        
                   };

     

       82
       98
        
       

     

       83
       83
       -
                   musicService = with defaultCfg; musicService { inherit user group musicDirectory; };

     

       99
       99
       +
                   musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };

     

       84
       100
        
                 })

     

       85
       101
        
                 {

     

       86
       102
        
                   hardware.pulseaudio = {

     
···

       94
       110
        
               ];

     

       95
       111
        
           };

     

       96
       112
        
       

     

       97
       97
       -
         testScript = ''

     

       98
       98
       -
           mpc = "${pkgs.mpc-cli}/bin/mpc --wait"

     

       113
       113
       +
           testScript = ''

     

       114
       114
       +
             mpc = "${lib.getExe pkgs.mpc} --wait"

     

       99
       115
        
       

     

       100
       100
       -
           # Connects to the given server and attempts to play a tune.

     

       101
       101
       -
           def play_some_music(server):

     

       102
       102
       -
               server.wait_for_unit("mpd.service")

     

       103
       103
       -
               server.succeed(f"{mpc} update")

     

       104
       104
       -
               _, tracks = server.execute(f"{mpc} ls")

     

       116
       116
       +
             # Connects to the given server and attempts to play a tune.

     

       117
       117
       +
             def play_some_music(server):

     

       118
       118
       +
                 server.wait_for_unit("mpd.service")

     

       119
       119
       +
                 server.succeed(f"{mpc} update")

     

       120
       120
       +
                 _, tracks = server.execute(f"{mpc} ls")

     

       105
       121
        
       

     

       106
       106
       -
               for track in tracks.splitlines():

     

       107
       107
       -
                   server.succeed(f"{mpc} add {track}")

     

       122
       122
       +
                 for track in tracks.splitlines():

     

       123
       123
       +
                     server.succeed(f"{mpc} add {track}")

     

       108
       124
        
       

     

       109
       109
       -
               _, added_tracks = server.execute(f"{mpc} playlist")

     

       125
       125
       +
                 _, added_tracks = server.execute(f"{mpc} playlist")

     

       110
       126
        
       

     

       111
       111
       -
               # Check we succeeded adding audio tracks to the playlist

     

       112
       112
       -
               assert len(added_tracks.splitlines()) > 0

     

       127
       127
       +
                 # Check we succeeded adding audio tracks to the playlist

     

       128
       128
       +
                 assert len(added_tracks.splitlines()) > 0

     

       113
       129
        
       

     

       114
       114
       -
               server.succeed(f"{mpc} play")

     

       130
       130
       +
                 server.succeed(f"{mpc} play")

     

       115
       131
        
       

     

       116
       116
       -
               _, output = server.execute(f"{mpc} status")

     

       117
       117
       -
               # Assure audio track is playing

     

       118
       118
       -
               assert "playing" in output

     

       132
       132
       +
                 _, output = server.execute(f"{mpc} status")

     

       133
       133
       +
                 # Assure audio track is playing

     

       134
       134
       +
                 assert "playing" in output

     

       119
       135
        
       

     

       120
       120
       -
               server.succeed(f"{mpc} stop")

     

       136
       136
       +
                 server.succeed(f"{mpc} stop")

     

       121
       137
        
       

     

       122
       138
        
       

     

       123
       123
       -
           play_some_music(serverALSA)

     

       124
       124
       -
           play_some_music(serverPulseAudio)

     

       139
       139
       +
             play_some_music(serverALSA)

     

       140
       140
       +
             play_some_music(serverPulseAudio)

     

       125
       141
        
       

     

       126
       126
       -
           client.wait_for_unit("multi-user.target")

     

       127
       127
       -
           client.succeed(f"{mpc} -h serverALSA status")

     

       142
       142
       +
             client.wait_for_unit("multi-user.target")

     

       143
       143
       +
             client.succeed(f"{mpc} -h serverALSA status")

     

       128
       144
        
       

     

       129
       129
       -
           # The PulseAudio-based server is configured not to accept external client connections

     

       130
       130
       -
           # to perform the following test:

     

       131
       131
       -
           client.fail(f"{mpc} -h serverPulseAudio status")

     

       132
       132
       -
         '';

     

       133
       133
       -
       })

     

       145
       145
       +
             # The PulseAudio-based server is configured not to accept external client connections

     

       146
       146
       +
             # to perform the following test:

     

       147
       147
       +
             client.fail(f"{mpc} -h serverPulseAudio status")

     

       148
       148
       +
           '';

     

       149
       149
       +
         }

     

       150
       150
       +
       )

-82

pkgs/applications/audio/clerk/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , makeWrapper

     

       5
       5
       -
       , rofi

     

       6
       6
       -
       , tmux

     

       7
       7
       -
       , fzf

     

       8
       8
       -
       , mpc-cli

     

       9
       9
       -
       , perl

     

       10
       10
       -
       , util-linux

     

       11
       11
       -
       , libnotify

     

       12
       12
       -
       , perlPackages

     

       13
       13
       -
       }:

     

       14
       14
       -
       

     

       15
       15
       -
       stdenv.mkDerivation {

     

       16
       16
       -
         pname = "clerk";

     

       17
       17
       -
         version = "unstable-2023-10-07";

     

       18
       18
       -
       

     

       19
       19
       -
         src = fetchFromGitHub {

     

       20
       20
       -
           owner = "carnager";

     

       21
       21
       -
           repo = "clerk";

     

       22
       22
       -
           rev = "907138d8fc2b1709fb49d062d0b663a48eb210bd";

     

       23
       23
       -
           hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk=";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         postPatch = ''

     

       27
       27
       -
           substituteInPlace clerk_rating_client.service \

     

       28
       28
       -
             --replace "/usr" "$out"

     

       29
       29
       -
         '';

     

       30
       30
       -
       

     

       31
       31
       -
         nativeBuildInputs = [ makeWrapper ];

     

       32
       32
       -
       

     

       33
       33
       -
         buildInputs = with perlPackages; [

     

       34
       34
       -
           perl

     

       35
       35
       -
           DataMessagePack

     

       36
       36
       -
           DataSectionSimple

     

       37
       37
       -
           ConfigSimple

     

       38
       38
       -
           TryTiny

     

       39
       39
       -
           IPCRun

     

       40
       40
       -
           HTTPDate

     

       41
       41
       -
           FileSlurper

     

       42
       42
       -
           ArrayUtils

     

       43
       43
       -
           NetMPD

     

       44
       44
       -
         ];

     

       45
       45
       -
       

     

       46
       46
       -
         dontBuild = true;

     

       47
       47
       -
       

     

       48
       48
       -
         strictDeps = true;

     

       49
       49
       -
       

     

       50
       50
       -
         installPhase = ''

     

       51
       51
       -
           runHook preInstall

     

       52
       52
       -
       

     

       53
       53
       -
           install -D clerk.pl $out/bin/clerk

     

       54
       54
       -
           install -D clerk_rating_client $out/bin/clerk_rating_client

     

       55
       55
       -
           install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service

     

       56
       56
       -
           runHook postInstall

     

       57
       57
       -
         '';

     

       58
       58
       -
       

     

       59
       59
       -
         postFixup = let

     

       60
       60
       -
           binPath = lib.makeBinPath [

     

       61
       61
       -
             libnotify

     

       62
       62
       -
             mpc-cli

     

       63
       63
       -
             rofi

     

       64
       64
       -
             tmux

     

       65
       65
       -
             fzf

     

       66
       66
       -
             util-linux

     

       67
       67
       -
           ];

     

       68
       68
       -
         in

     

       69
       69
       -
         ''

     

       70
       70
       -
           wrapProgram $out/bin/clerk --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}"

     

       71
       71
       -
           wrapProgram $out/bin/clerk_rating_client --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}"

     

       72
       72
       -
         '';

     

       73
       73
       -
       

     

       74
       74
       -
         meta = with lib; {

     

       75
       75
       -
           description = "MPD client based on rofi/fzf";

     

       76
       76
       -
           homepage = "https://github.com/carnager/clerk";

     

       77
       77
       -
           license = licenses.mit;

     

       78
       78
       -
           maintainers = with maintainers; [ anderspapitto rewine ];

     

       79
       79
       -
           mainProgram = "clerk";

     

       80
       80
       -
           platforms = platforms.linux;

     

       81
       81
       -
         };

     

       82
       82
       -
       }

-63

pkgs/applications/audio/mpc/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , fetchpatch

     

       5
       5
       -
       , installShellFiles

     

       6
       6
       -
       , libiconv

     

       7
       7
       -
       , libmpdclient

     

       8
       8
       -
       , meson

     

       9
       9
       -
       , ninja

     

       10
       10
       -
       , pkg-config

     

       11
       11
       -
       , sphinx

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       stdenv.mkDerivation rec {

     

       15
       15
       -
         pname = "mpc";

     

       16
       16
       -
         version = "0.34";

     

       17
       17
       -
       

     

       18
       18
       -
         src = fetchFromGitHub {

     

       19
       19
       -
           owner = "MusicPlayerDaemon";

     

       20
       20
       -
           repo = pname;

     

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

     

       22
       22
       -
           hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw=";

     

       23
       23
       -
         };

     

       24
       24
       -
       

     

       25
       25
       -
         patches = [

     

       26
       26
       -
           # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76)

     

       27
       27
       -
           (fetchpatch {

     

       28
       28
       -
             url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch";

     

       29
       29
       -
             sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw=";

     

       30
       30
       -
           })

     

       31
       31
       -
         ];

     

       32
       32
       -
       

     

       33
       33
       -
         buildInputs = [

     

       34
       34
       -
           libmpdclient

     

       35
       35
       -
         ]

     

       36
       36
       -
         ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

     

       37
       37
       -
       

     

       38
       38
       -
         nativeBuildInputs = [

     

       39
       39
       -
           installShellFiles

     

       40
       40
       -
           meson

     

       41
       41
       -
           ninja

     

       42
       42
       -
           pkg-config

     

       43
       43
       -
           sphinx

     

       44
       44
       -
         ];

     

       45
       45
       -
       

     

       46
       46
       -
         postInstall = ''

     

       47
       47
       -
           installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash

     

       48
       48
       -
         '';

     

       49
       49
       -
       

     

       50
       50
       -
         postFixup = ''

     

       51
       51
       -
           rm $out/share/doc/mpc/contrib/mpc-completion.bash

     

       52
       52
       -
         '';

     

       53
       53
       -
       

     

       54
       54
       -
         meta = with lib; {

     

       55
       55
       -
           homepage = "https://www.musicpd.org/clients/mpc/";

     

       56
       56
       -
           description = "Minimalist command line interface to MPD";

     

       57
       57
       -
           changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/v${version}/NEWS";

     

       58
       58
       -
           license = licenses.gpl2Plus;

     

       59
       59
       -
           maintainers = with maintainers; [ AndersonTorres ];

     

       60
       60
       -
           platforms = with platforms; unix;

     

       61
       61
       -
           mainProgram = "mpc";

     

       62
       62
       -
         };

     

       63
       63
       -
       }

+1 -1

pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix

···

       89
       89
        
         memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ];

     

       90
       90
        
         messagereceiver = { };

     

       91
       91
        
         mocp.propagatedBuildInputs = [ pkgs.moc ];

     

       92
       92
       -
         mpd.propagatedBuildInputs = [ pkgs.mpc-cli ];

     

       92
       92
       +
         mpd.propagatedBuildInputs = [ pkgs.mpc ];

     

       93
       93
        
         network.propagatedBuildInputs = [ py.netifaces pkgs.iw ];

     

       94
       94
        
         network_traffic.propagatedBuildInputs = [ py.netifaces ];

     

       95
       95
        
         nic.propagatedBuildInputs = [ py.netifaces pkgs.iw ];

+103

pkgs/by-name/cl/clerk/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         fzf,

     

       5
       5
       +
         installShellFiles,

     

       6
       6
       +
         libnotify,

     

       7
       7
       +
         makeWrapper,

     

       8
       8
       +
         mpc,

     

       9
       9
       +
         perlPackages,

     

       10
       10
       +
         rofi,

     

       11
       11
       +
         stdenv,

     

       12
       12
       +
         tmux,

     

       13
       13
       +
         unstableGitUpdater,

     

       14
       14
       +
         util-linux,

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       stdenv.mkDerivation {

     

       18
       18
       +
         pname = "clerk";

     

       19
       19
       +
         version = "4.0.5-unstable-2023-10-07";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "carnager";

     

       23
       23
       +
           repo = "clerk";

     

       24
       24
       +
           rev = "907138d8fc2b1709fb49d062d0b663a48eb210bd";

     

       25
       25
       +
           hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk=";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           installShellFiles

     

       30
       30
       +
           makeWrapper

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = with perlPackages; [

     

       34
       34
       +
           perl

     

       35
       35
       +
           DataMessagePack

     

       36
       36
       +
           DataSectionSimple

     

       37
       37
       +
           ConfigSimple

     

       38
       38
       +
           TryTiny

     

       39
       39
       +
           IPCRun

     

       40
       40
       +
           HTTPDate

     

       41
       41
       +
           FileSlurper

     

       42
       42
       +
           ArrayUtils

     

       43
       43
       +
           NetMPD

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         dontBuild = true;

     

       47
       47
       +
       

     

       48
       48
       +
         strictDeps = true;

     

       49
       49
       +
       

     

       50
       50
       +
         postPatch = ''

     

       51
       51
       +
           substituteInPlace clerk_rating_client.service \

     

       52
       52
       +
             --replace "/usr" "$out"

     

       53
       53
       +
         '';

     

       54
       54
       +
       

     

       55
       55
       +
         installPhase = ''

     

       56
       56
       +
           runHook preInstall

     

       57
       57
       +
       

     

       58
       58
       +
           mv clerk.pl clerk

     

       59
       59
       +
           installBin clerk clerk_rating_client

     

       60
       60
       +
           install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service

     

       61
       61
       +
       

     

       62
       62
       +
           runHook postInstall

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       65
       65
       +
         postFixup =

     

       66
       66
       +
           let

     

       67
       67
       +
             binPath = lib.makeBinPath [

     

       68
       68
       +
               fzf

     

       69
       69
       +
               libnotify

     

       70
       70
       +
               mpc

     

       71
       71
       +
               rofi

     

       72
       72
       +
               tmux

     

       73
       73
       +
               util-linux

     

       74
       74
       +
             ];

     

       75
       75
       +
           in

     

       76
       76
       +
           ''

     

       77
       77
       +
             pushd $out/bin

     

       78
       78
       +
             for f in clerk clerk_rating_client; do

     

       79
       79
       +
               wrapProgram $f \

     

       80
       80
       +
                 --prefix PATH : "${binPath}" \

     

       81
       81
       +
                 --set PERL5LIB $PERL5LIB

     

       82
       82
       +
             done

     

       83
       83
       +
             popd

     

       84
       84
       +
           '';

     

       85
       85
       +
       

     

       86
       86
       +
         passthru.updateScript = unstableGitUpdater {

     

       87
       87
       +
           url = "https://github.com/carnager/clerk.git";

     

       88
       88
       +
           hardcodeZeroVersion = true;

     

       89
       89
       +
         };

     

       90
       90
       +
       

     

       91
       91
       +
         meta = {

     

       92
       92
       +
           homepage = "https://github.com/carnager/clerk";

     

       93
       93
       +
           description = "MPD client based on rofi/fzf";

     

       94
       94
       +
           license = lib.licenses.mit;

     

       95
       95
       +
           mainProgram = "clerk";

     

       96
       96
       +
           maintainers = with lib.maintainers; [

     

       97
       97
       +
             anderspapitto

     

       98
       98
       +
             rewine

     

       99
       99
       +
             AndersonTorres

     

       100
       100
       +
           ];

     

       101
       101
       +
           platforms = lib.platforms.linux;

     

       102
       102
       +
         };

     

       103
       103
       +
       }

+54

pkgs/by-name/mp/mpc/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         installShellFiles,

     

       5
       5
       +
         libiconv,

     

       6
       6
       +
         libmpdclient,

     

       7
       7
       +
         meson,

     

       8
       8
       +
         ninja,

     

       9
       9
       +
         pkg-config,

     

       10
       10
       +
         python3Packages,

     

       11
       11
       +
         stdenv,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       stdenv.mkDerivation (finalAttrs: {

     

       15
       15
       +
         pname = "mpc";

     

       16
       16
       +
         version = "0.35";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "MusicPlayerDaemon";

     

       20
       20
       +
           repo = "mpc";

     

       21
       21
       +
           rev = "v${finalAttrs.version}";

     

       22
       22
       +
           hash = "sha256-oVdnj3nsYvOHcIOgoamLamriuWu9lucWUQtxVmXZabs=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         buildInputs = [

     

       26
       26
       +
           libmpdclient

     

       27
       27
       +
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

     

       28
       28
       +
       

     

       29
       29
       +
         nativeBuildInputs = [

     

       30
       30
       +
           installShellFiles

     

       31
       31
       +
           meson

     

       32
       32
       +
           ninja

     

       33
       33
       +
           pkg-config

     

       34
       34
       +
           python3Packages.sphinx

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         postInstall = ''

     

       38
       38
       +
           installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         postFixup = ''

     

       42
       42
       +
           rm $out/share/doc/mpc/contrib/mpc-completion.bash

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       46
       46
       +
           homepage = "https://www.musicpd.org/clients/mpc/";

     

       47
       47
       +
           description = "Minimalist command line interface to MPD";

     

       48
       48
       +
           changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS";

     

       49
       49
       +
           license = lib.licenses.gpl2Plus;

     

       50
       50
       +
           mainProgram = "mpc";

     

       51
       51
       +
           maintainers = with lib.maintainers; [ AndersonTorres ];

     

       52
       52
       +
           platforms = lib.platforms.unix;

     

       53
       53
       +
         };

     

       54
       54
       +
       })

+2 -1

pkgs/top-level/aliases.nix

···

       778
       778
        
         mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01

     

       779
       779
        
         moz-phab = mozphab; # Added 2022-08-09

     

       780
       780
        
         mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14

     

       781
       781
       -
         mpc_cli = mpc-cli; # moved from top-level 2022-01-24

     

       781
       781
       +
         mpc-cli = mpc; # Added 2024-10-14

     

       782
       782
       +
         mpc_cli = mpc; # Added 2024-10-14

     

       782
       783
        
         mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17

     

       783
       784
        
         mpdevil = plattenalbum; # Added 2024-05-22

     

       784
       785
        
         mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10

-6

pkgs/top-level/all-packages.nix

···

       30932
       30932
        
           withConplay = false;

     

       30933
       30933
        
         };

     

       30934
       30934
        
       

     

       30935
       30935
       -
         mpc-cli = callPackage ../applications/audio/mpc {

     

       30936
       30936
       -
           inherit (python3Packages) sphinx;

     

       30937
       30937
       -
         };

     

       30938
       30938
       -
       

     

       30939
       30939
       -
         clerk = callPackage ../applications/audio/clerk { };

     

       30940
       30940
       -
       

     

       30941
       30935
        
         nbstripout = callPackage ../applications/version-management/nbstripout { };

     

       30942
       30936
        
       

     

       30943
       30937
        
         ncmpc = callPackage ../applications/audio/ncmpc { };