commit b6322e121583f8d31d6514e7dfd1195906b928e3 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/config/krb5.nix

···

       48
       48
        
       

     

       49
       49
        
         config = mkIf config.krb5.enable {

     

       50
       50
        
       

     

       51
       51
       -
           environment.systemPackages = [ pkgs.krb5 ];

     

       51
       51
       +
           environment.systemPackages = [ pkgs.krb5Full ];

     

       52
       52
        
       

     

       53
       53
        
           environment.etc."krb5.conf".text =

     

       54
       54
        
             ''

+37 -17

pkgs/development/libraries/kerberos/krb5.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds

     

       2
       2
       +
       , openssl, openldap, libedit

     

       3
       3
       +
       

     

       4
       4
       +
       # Extra Arguments

     

       5
       5
       +
       , type ? ""

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       let

     

       4
       4
       -
         pname = "krb5";

     

       9
       9
       +
         libOnly = type == "lib";

     

       10
       10
       +
       in

     

       11
       11
       +
       with stdenv.lib;

     

       12
       12
       +
       stdenv.mkDerivation rec {

     

       13
       13
       +
         name = "${type}krb5-${version}";

     

       5
       14
        
         version = "1.13.1";

     

       6
       6
       -
         name = "${pname}-${version}";

     

       7
       7
       -
         webpage = http://web.mit.edu/kerberos/;

     

       8
       8
       -
       in

     

       9
       9
       -
       

     

       10
       10
       -
       stdenv.mkDerivation (rec {

     

       11
       11
       -
         inherit name;

     

       12
       15
        
       

     

       13
       16
        
         src = fetchurl {

     

       14
       14
       -
           url = "${webpage}dist/krb5/1.13/${name}-signed.tar";

     

       17
       17
       +
           url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";

     

       15
       18
        
           sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";

     

       16
       19
        
         };

     

       17
       20
        
       

     

       18
       18
       -
         buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]

     

       21
       21
       +
         nativeBuildInputs = [ pkgconfig perl yacc ]

     

       19
       22
        
           # Provides the mig command used by the build scripts

     

       20
       20
       -
           ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;

     

       23
       23
       +
           ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;

     

       24
       24
       +
         buildInputs = [ openssl ]

     

       25
       25
       +
           ++ optionals (!libOnly) [ openldap libedit ];

     

       21
       26
        
       

     

       22
       27
        
         unpackPhase = ''

     

       23
       28
        
           tar -xf $src

     

       24
       24
       -
           tar -xzf ${name}.tar.gz

     

       25
       25
       -
           cd ${name}/src

     

       29
       29
       +
           tar -xzf krb5-${version}.tar.gz

     

       30
       30
       +
           cd krb5-${version}/src

     

       26
       31
        
         '';

     

       27
       32
        
       

     

       28
       28
       -
         configureFlags = [ "--with-tcl=no" ];

     

       33
       33
       +
         buildPhase = optionalString libOnly ''

     

       34
       34
       +
           (cd util; make -j $NIX_BUILD_CORES)

     

       35
       35
       +
           (cd include; make -j $NIX_BUILD_CORES)

     

       36
       36
       +
           (cd lib; make -j $NIX_BUILD_CORES)

     

       37
       37
       +
           (cd build-tools; make -j $NIX_BUILD_CORES)

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
         installPhase = optionalString libOnly ''

     

       41
       41
       +
           mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}

     

       42
       42
       +
           (cd util; make -j $NIX_BUILD_CORES install)

     

       43
       43
       +
           (cd include; make -j $NIX_BUILD_CORES install)

     

       44
       44
       +
           (cd lib; make -j $NIX_BUILD_CORES install)

     

       45
       45
       +
           (cd build-tools; make -j $NIX_BUILD_CORES install)

     

       46
       46
       +
           rm -rf $out/{sbin,share}

     

       47
       47
       +
           find $out/bin -type f | grep -v 'krb5-config' | xargs rm

     

       48
       48
       +
         '';

     

       29
       49
        
       

     

       30
       50
        
         enableParallelBuilding = true;

     

       31
       51
        
       

     

       32
       52
        
         meta = with stdenv.lib; {

     

       33
       53
        
           description = "MIT Kerberos 5";

     

       34
       34
       -
           homepage = webpage;

     

       35
       35
       -
           license = "MPL";

     

       54
       54
       +
           homepage = http://web.mit.edu/kerberos/;

     

       55
       55
       +
           license = licenses.mit;

     

       36
       56
        
           platforms = platforms.unix;

     

       37
       57
        
           maintainers = with maintainers; [ wkennington ];

     

       38
       58
        
         };

     

       39
       59
        
       

     

       40
       60
        
         passthru.implementation = "krb5";

     

       41
       41
       -
       })

     

       61
       61
       +
       }

+2 -5

pkgs/top-level/all-packages.nix

···

       6526
       6526
        
       

     

       6527
       6527
        
         kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };

     

       6528
       6528
        
       

     

       6529
       6529
       -
         krb5 = callPackage ../development/libraries/kerberos/krb5.nix {

     

       6530
       6530
       -
           openldap = openldap.override {

     

       6531
       6531
       -
             cyrus_sasl = cyrus_sasl.override { kerberos = null; };

     

       6532
       6532
       -
           };

     

       6529
       6529
       +
         krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {

     

       6533
       6530
        
           inherit (darwin) bootstrap_cmds;

     

       6534
       6531
        
         };

     

       6535
       6535
       -
         libkrb5 = krb5;

     

       6532
       6532
       +
         libkrb5 = krb5Full.override { type = "lib"; };

     

       6536
       6533
        
       

     

       6537
       6534
        
         LASzip = callPackage ../development/libraries/LASzip { };

     

       6538
       6535