commit c5e33f723a87064fdc63e7001c4e27978bf7b7c9 · pyrox.dev/nixpkgs

+15 -13

pkgs/applications/misc/slstatus/default.nix pkgs/by-name/sl/slstatus/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         fetchgit,

     

       4
       4
       +
         fetchzip,

     

       5
       5
        
         pkg-config,

     

       6
       6
        
         writeText,

     

       7
       7
        
         libX11,

     

       8
       8
        
         libXau,

     

       9
       9
        
         libXdmcp,

     

       10
       10
       -
         conf ? null,

     

       11
       11
       -
         patches ? [ ],

     

       10
       10
       +
         config,

     

       11
       11
       +
         conf ? config.slstatus.conf or null,

     

       12
       12
       +
         patches ? config.slstatus.patches or [ ],

     

       13
       13
       +
         extraLibs ? config.slstatus.extraLibs or [ ],

     

       12
       14
        
         # update script dependencies

     

       13
       15
        
         gitUpdater,

     

       14
       16
        
       }:

     

       15
       17
        
       

     

       16
       16
       -
       stdenv.mkDerivation rec {

     

       18
       18
       +
       stdenv.mkDerivation (finalAttrs: {

     

       17
       19
        
         pname = "slstatus";

     

       18
       20
        
         version = "1.1";

     

       19
       21
        
       

     

       20
       20
       -
         src = fetchgit {

     

       21
       21
       -
           url = "https://git.suckless.org/slstatus";

     

       22
       22
       -
           rev = version;

     

       22
       22
       +
         src = fetchzip {

     

       23
       23
       +
           url = "https://dl.suckless.org/tools/slstatus-${finalAttrs.version}.tar.gz";

     

       23
       24
        
           hash = "sha256-MRDovZpQsvnLEvsbJNBzprkzQQ4nIs1T9BLT+tSGta8=";

     

       24
       25
        
         };

     

       25
       26
        
       

     
···

       40
       41
        
           libX11

     

       41
       42
        
           libXau

     

       42
       43
        
           libXdmcp

     

       43
       43
       -
         ];

     

       44
       44
       +
         ]

     

       45
       45
       +
         ++ extraLibs;

     

       44
       46
        
       

     

       45
       47
        
         installFlags = [ "PREFIX=$(out)" ];

     

       46
       48
        
       

     

       47
       49
        
         passthru.updateScript = gitUpdater { };

     

       48
       50
        
       

     

       49
       49
       -
         meta = with lib; {

     

       51
       51
       +
         meta = {

     

       50
       52
        
           homepage = "https://tools.suckless.org/slstatus/";

     

       51
       53
        
           description = "Status monitor for window managers that use WM_NAME like dwm";

     

       52
       52
       -
           license = licenses.isc;

     

       53
       53
       -
           maintainers = with maintainers; [

     

       54
       54
       +
           license = lib.licenses.isc;

     

       55
       55
       +
           maintainers = with lib.maintainers; [

     

       54
       56
        
             oxzi

     

       55
       57
        
             qusic

     

       56
       58
        
           ];

     

       57
       57
       -
           platforms = platforms.linux;

     

       59
       59
       +
           platforms = lib.platforms.linux;

     

       58
       60
        
           mainProgram = "slstatus";

     

       59
       61
        
         };

     

       60
       60
       -
       }

     

       62
       62
       +
       })

+15 -11

pkgs/misc/screensavers/slock/default.nix pkgs/by-name/sl/slock/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       4
       4
       +
         fetchzip,

     

       5
       5
        
         writeText,

     

       6
       6
        
         xorgproto,

     

       7
       7
        
         libX11,

     

       8
       8
        
         libXext,

     

       9
       9
        
         libXrandr,

     

       10
       10
        
         libxcrypt,

     

       11
       11
       -
         # default header can be obtained from

     

       12
       12
       -
         # https://git.suckless.org/slock/tree/config.def.h

     

       13
       13
       -
         conf ? null,

     

       11
       11
       +
         config,

     

       12
       12
       +
         conf ? config.slock.conf or null,

     

       13
       13
       +
         patches ? config.slock.patches or [ ],

     

       14
       14
       +
         extraLibs ? config.slock.extraLibs or [ ],

     

       14
       15
        
         # update script dependencies

     

       15
       16
        
         gitUpdater,

     

       16
       17
        
       }:

     
···

       19
       20
        
         pname = "slock";

     

       20
       21
        
         version = "1.5";

     

       21
       22
        
       

     

       22
       22
       -
         src = fetchurl {

     

       23
       23
       +
         src = fetchzip {

     

       23
       24
        
           url = "https://dl.suckless.org/tools/slock-${finalAttrs.version}.tar.gz";

     

       24
       24
       -
           hash = "sha256-ruHj+/aid/tiWjg4BzuXm2SD57rKTOgvVt4f8ZLbDk0=";

     

       25
       25
       +
           hash = "sha256-nAAbyH4jixmwes9esrWRnHFw3mythKfqWu2+DRdlmx0=";

     

       25
       26
        
         };

     

       26
       27
        
       

     

       27
       28
        
         buildInputs = [

     
···

       30
       31
        
           libXext

     

       31
       32
        
           libXrandr

     

       32
       33
        
           libxcrypt

     

       33
       33
       -
         ];

     

       34
       34
       +
         ]

     

       35
       35
       +
         ++ extraLibs;

     

       34
       36
        
       

     

       35
       37
        
         installFlags = [ "PREFIX=$(out)" ];

     

       36
       38
        
       

     
···

       40
       42
        
           cp ${writeText "config.def.h" conf} config.def.h

     

       41
       43
        
         '';

     

       42
       44
        
       

     

       45
       45
       +
         inherit patches;

     

       46
       46
       +
       

     

       43
       47
        
         makeFlags = [ "CC:=$(CC)" ];

     

       44
       48
        
       

     

       45
       49
        
         passthru.updateScript = gitUpdater {

     

       46
       50
        
           url = "git://git.suckless.org/slock";

     

       47
       51
        
         };

     

       48
       52
        
       

     

       49
       49
       -
         meta = with lib; {

     

       53
       53
       +
         meta = {

     

       50
       54
        
           homepage = "https://tools.suckless.org/slock";

     

       51
       55
        
           description = "Simple X display locker";

     

       52
       56
        
           mainProgram = "slock";

     

       53
       57
        
           longDescription = ''

     

       54
       58
        
             Simple X display locker. This is the simplest X screen locker.

     

       55
       59
        
           '';

     

       56
       56
       -
           license = licenses.mit;

     

       57
       57
       -
           maintainers = with maintainers; [

     

       60
       60
       +
           license = lib.licenses.mit;

     

       61
       61
       +
           maintainers = with lib.maintainers; [

     

       58
       62
        
             qusic

     

       59
       63
        
           ];

     

       60
       60
       -
           platforms = platforms.linux;

     

       64
       64
       +
           platforms = lib.platforms.linux;

     

       61
       65
        
         };

     

       62
       66
        
       })

-8

pkgs/top-level/all-packages.nix

···

       4249
       4249
        
           ocamlPackages = ocaml-ng.ocamlPackages_4_12;

     

       4250
       4250
        
         };

     

       4251
       4251
        
       

     

       4252
       4252
       -
         slstatus = callPackage ../applications/misc/slstatus {

     

       4253
       4253
       -
           conf = config.slstatus.conf or null;

     

       4254
       4254
       -
         };

     

       4255
       4255
       -
       

     

       4256
       4252
        
         smpq = callPackage ../by-name/sm/smpq/package.nix {

     

       4257
       4253
        
           stormlib = stormlib.overrideAttrs (old: {

     

       4258
       4254
        
             version = "9.22";

     
···

       15892
       15888
        
         mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };

     

       15893
       15889
        
       

     

       15894
       15890
        
         sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };

     

       15895
       15895
       -
       

     

       15896
       15896
       -
         slock = callPackage ../misc/screensavers/slock {

     

       15897
       15897
       -
           conf = config.slock.conf or null;

     

       15898
       15898
       -
         };

     

       15899
       15891
        
       

     

       15900
       15892
        
         snscrape = with python3Packages; toPythonApplication snscrape;

     

       15901
       15893