commit d51d15e1cfca597870f5bd059c23447044438467 · pyrox.dev/nixpkgs

+4 -4

maintainers/scripts/nixpkgs-lint.nix

···

       1
       1
       -
       { stdenv, makeWrapper, perl, perlPackages }:

     

       1
       1
       +
       { stdenv, lib, makeWrapper, perl, perlPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "nixpkgs-lint-1";

     
···

       15
       15
        
             wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB

     

       16
       16
        
           '';

     

       17
       17
        
       

     

       18
       18
       -
         meta = {

     

       19
       19
       -
           maintainers = [ stdenv.lib.maintainers.eelco ];

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           maintainers = [ maintainers.eelco ];

     

       20
       20
        
           description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";

     

       21
       21
       -
           platforms = stdenv.lib.platforms.unix;

     

       21
       21
       +
           platforms = platforms.unix;

     

       22
       22
        
         };

     

       23
       23
        
       }

+4 -6

nixos/modules/config/gnu.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         options = {

     

       7
       7
       -
           gnu = mkOption {

     

       8
       8
       -
             type = types.bool;

     

       5
       5
       +
           gnu = lib.mkOption {

     

       6
       6
       +
             type = lib.types.bool;

     

       9
       7
        
             default = false;

     

       10
       8
        
             description = ''

     

       11
       9
        
               When enabled, GNU software is chosen by default whenever a there is

     
···

       15
       13
        
           };

     

       16
       14
        
         };

     

       17
       15
        
       

     

       18
       18
       -
         config = mkIf config.gnu {

     

       16
       16
       +
         config = lib.mkIf config.gnu {

     

       19
       17
        
       

     

       20
       18
        
           environment.systemPackages = with pkgs;

     

       21
       19
        
             # TODO: Adjust `requiredPackages' from `system-path.nix'.

     
···

       26
       24
        
               nano zile

     

       27
       25
        
               texinfo # for the stand-alone Info reader

     

       28
       26
        
             ]

     

       29
       29
       -
             ++ stdenv.lib.optional (!stdenv.isAarch32) grub2;

     

       27
       27
       +
             ++ lib.optional (!stdenv.isAarch32) grub2;

     

       30
       28
        
       

     

       31
       29
        
       

     

       32
       30
        
           # GNU GRUB, where available.

+3 -3

nixos/modules/installer/tools/nixos-option/default.nix

···

       4
       4
        
         src = ./.;

     

       5
       5
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       6
       6
        
         buildInputs = [ boost nix ];

     

       7
       7
       -
         meta = {

     

       8
       8
       -
           license = stdenv.lib.licenses.lgpl2Plus;

     

       9
       9
       -
           maintainers = with lib.maintainers; [ chkno ];

     

       7
       7
       +
         meta = with lib; {

     

       8
       8
       +
           license = licenses.lgpl2Plus;

     

       9
       9
       +
           maintainers = with maintainers; [ chkno ];

     

       10
       10
        
         };

     

       11
       11
        
       }

+6 -8

nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix

···

       19
       19
        
       

     

       20
       20
        
       */

     

       21
       21
        
       

     

       22
       22
       -
       with lib;

     

       23
       23
       -
       

     

       24
       22
        
       let

     

       25
       23
        
       

     

       26
       24
        
         addNetDev = nd: ''

     

       27
       25
        
           brsaneconfig4 -a \

     

       28
       26
        
           name="${nd.name}" \

     

       29
       27
        
           model="${nd.model}" \

     

       30
       30
       -
           ${if (hasAttr "nodename" nd && nd.nodename != null) then

     

       28
       28
       +
           ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then

     

       31
       29
        
             ''nodename="${nd.nodename}"'' else

     

       32
       30
        
             ''ip="${nd.ip}"''}'';

     

       33
       33
       -
         addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);

     

       31
       31
       +
         addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs);

     

       34
       32
        
       in

     

       35
       33
        
       

     

       36
       34
        
       stdenv.mkDerivation {

     
···

       61
       59
        
         dontStrip = true;

     

       62
       60
        
         dontPatchELF = true;

     

       63
       61
        
       

     

       64
       64
       -
         meta = {

     

       62
       62
       +
         meta = with lib; {

     

       65
       63
        
           description = "Brother brscan4 sane backend driver etc files";

     

       66
       64
        
           homepage = "http://www.brother.com";

     

       67
       67
       -
           platforms = stdenv.lib.platforms.linux;

     

       68
       68
       -
           license = stdenv.lib.licenses.unfree;

     

       69
       69
       -
           maintainers = with stdenv.lib.maintainers; [ jraygauthier ];

     

       65
       65
       +
           platforms = platforms.linux;

     

       66
       66
       +
           license = licenses.unfree;

     

       67
       67
       +
           maintainers = with maintainers; [ jraygauthier ];

     

       70
       68
        
         };

     

       71
       69
        
       }

+1 -1

nixos/modules/virtualisation/google-compute-image.nix

···

       43
       43
        
           system.build.googleComputeImage = import ../../lib/make-disk-image.nix {

     

       44
       44
        
             name = "google-compute-image";

     

       45
       45
        
             postVM = ''

     

       46
       46
       -
               PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]}

     

       46
       46
       +
               PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}

     

       47
       47
        
               pushd $out

     

       48
       48
        
               mv $diskImage disk.raw

     

       49
       49
        
               tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw

+1 -1

nixos/tests/searx.nix

···

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         name = "searx";

     

       5
       5
       -
         meta = with pkgs.stdenv.lib.maintainers; {

     

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

     

       6
       6
        
           maintainers = [ rnhmjoj ];

     

       7
       7
        
         };

     

       8
       8