commit f3789ddd08eab4a174b649fa6e829014229d4b40 · pyrox.dev/nixpkgs

+27

pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch

···

       1
       1
       +
       diff --git a/commands.c b/commands.c

     

       2
       2
       +
       index a28e6da..0f76ac7 100644

     

       3
       3
       +
       --- a/commands.c

     

       4
       4
       +
       +++ b/commands.c

     

       5
       5
       +
       @@ -20,6 +20,7 @@

     

       6
       6
       +
        #include <stdlib.h>

     

       7
       7
       +
        #include <string.h>

     

       8
       8
       +
        #include <unistd.h>

     

       9
       9
       +
       +#include <limits.h>

     

       10
       10
       +
        #include <errno.h>

     

       11
       11
       +
        #include "commands.h"

     

       12
       12
       +
        #include "platform.h"

     

       13
       13
       +
       @@ -150,7 +151,13 @@ build_symlink_name(const char *path_to_bin, const struct cmd_info *cmd)

     

       14
       14
       +
        {

     

       15
       15
       +
        	static char link_name[FILENAME_MAX];

     

       16
       16
       +
        

     

       17
       17
       +
       -	snprintf(link_name, FILENAME_MAX, "%s/%s", path_to_bin, cmd->name);

     

       18
       18
       +
       +	int result = snprintf(link_name, PATH_MAX, "%s/%s", path_to_bin, cmd->name);

     

       19
       19
       +
       +

     

       20
       20
       +
       +	if (result >= PATH_MAX) {

     

       21
       21
       +
       +		link_name[PATH_MAX - 1] = '\0';

     

       22
       22
       +
       +		} else if (result < 0) {

     

       23
       23
       +
       +		link_name[0] = '\0';

     

       24
       24
       +
       +	}

     

       25
       25
       +
        

     

       26
       26
       +
        	return link_name;

     

       27
       27
       +
        }

+7 -5

pkgs/by-name/io/iotools/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       stdenv.mkDerivation {

     

       7
       7
       +
       stdenv.mkDerivation (finalAttrs: {

     

       8
       8
        
         pname = "iotools";

     

       9
       9
        
         version = "unstable-2017-12-11";

     

       10
       10
        
       

     
···

       15
       15
        
           hash = "sha256-tlGXJn3n27mQDupMIVYDd86YaWazVwel/qs0QqCy1W8=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       +
         patches = [ ./001-fix-werror-in-sprintf.patch ];

     

       19
       19
       +
       

     

       18
       20
        
         makeFlags = [

     

       19
       21
        
           "DEBUG=0"

     

       20
       22
        
           "STATIC=0"

     
···

       24
       26
        
           install -Dm755 iotools -t $out/bin

     

       25
       27
        
         '';

     

       26
       28
        
       

     

       27
       27
       -
         meta = with lib; {

     

       29
       29
       +
         meta = {

     

       28
       30
        
           description = "Set of simple command line tools which allow access to

     

       29
       31
        
             hardware device registers";

     

       30
       32
        
           longDescription = ''

     
···

       35
       37
        
             operations.

     

       36
       38
        
           '';

     

       37
       39
        
           homepage = "https://github.com/adurbin/iotools";

     

       38
       38
       -
           license = licenses.gpl2Only;

     

       39
       39
       -
           maintainers = with maintainers; [ felixsinger ];

     

       40
       40
       +
           license = lib.licenses.gpl2Only;

     

       41
       41
       +
           maintainers = with lib.maintainers; [ felixsinger ];

     

       40
       42
        
           platforms = [

     

       41
       43
        
             "x86_64-linux"

     

       42
       44
        
             "i686-linux"

     

       43
       45
        
           ];

     

       44
       46
        
           mainProgram = "iotools";

     

       45
       47
        
         };

     

       46
       46
       -
       }

     

       48
       48
       +
       })

+44

pkgs/by-name/ps/psb_status/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenvNoCC,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         bash,

     

       6
       6
       +
         iotools,

     

       7
       7
       +
         makeWrapper,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       11
       11
       +
         pname = "psb_status";

     

       12
       12
       +
         version = "0-unstable-2024-10-10";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "mkopec";

     

       16
       16
       +
           repo = "psb_status";

     

       17
       17
       +
           rev = "be896832c53d6b0b70cf8a87f7ee46ad33deefc2";

     

       18
       18
       +
           hash = "sha256-4anPyjO8y3FgnYWa4bGFxI8Glk9srw/XF552tnixc8I=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         dontBuild = true;

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [ makeWrapper ];

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           runHook preInstall

     

       27
       27
       +
       

     

       28
       28
       +
           mkdir -p $out/bin

     

       29
       29
       +
           install -m755 psb_status.sh $out/bin/psb_status

     

       30
       30
       +
           wrapProgram $out/bin/psb_status \

     

       31
       31
       +
             --prefix PATH : ${lib.makeBinPath [ iotools ]}

     

       32
       32
       +
       

     

       33
       33
       +
           runHook postInstall

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         meta = {

     

       37
       37
       +
           description = "Script to check Platform Secure Boot enablement on Zen based AMD CPUs";

     

       38
       38
       +
           homepage = "https://github.com/mkopec/psb_status";

     

       39
       39
       +
           license = lib.licenses.mit;

     

       40
       40
       +
           maintainers = with lib.maintainers; [ phodina ];

     

       41
       41
       +
           platforms = [ "x86_64-linux" ];

     

       42
       42
       +
           mainProgram = "psb_status";

     

       43
       43
       +
         };

     

       44
       44
       +
       })