git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #167108 from aaronjheng/oath-toolkit
0b64a2dArtturi
nixos/modules/security/pam.nix+3−3
compare with master
unifiedsplit
@@ -492,7 +492,7 @@ let
492 auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}
492 auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}
493 '') +
493 '') +
494 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''
494 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''
495− auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}
495+ auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}
496 '') +
496 '') +
497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''
497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''
498 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}
498 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}
@@ -1131,7 +1131,7 @@ in
1131 ++ optional config.services.sssd.enable pkgs.sssd
1131 ++ optional config.services.sssd.enable pkgs.sssd
1132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
1132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
1133 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
1133 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
1134− ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
1134+ ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ]
1135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]
1135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]
1136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
1136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
1137
1137
@@ -1221,7 +1221,7 @@ in
1221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,
1221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,
1222 '' +
1222 '' +
1223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''
1223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''
1224− "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,
1224+ "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,
1225 '' +
1225 '' +
1226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''
1226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''
1227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,
1227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,
nixos/tests/pam/pam-oath-login.nix+1−1
@@ -7,7 +7,7 @@ let
7 # how many passwords have been made. In this env, we'll always be on
7 # how many passwords have been made. In this env, we'll always be on
8 # the 0th counter, so the password is static.
8 # the 0th counter, so the password is static.
9 #
9 #
10− # Generated in nix-shell -p oathToolkit
10+ # Generated in nix-shell -p oath-toolkit
11 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3
11 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3
12 # and picking a the first 4:
12 # and picking a the first 4:
13 oathSnakeOilPassword1 = "143349";
13 oathSnakeOilPassword1 = "143349";
pkgs/servers/web-apps/sogo/default.nix+2−2
@@ -1,6 +1,6 @@
1{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
1{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
2, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
2, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
3−, oathToolkit }:
3+, oath-toolkit }:
4gnustep.stdenv.mkDerivation rec {
4gnustep.stdenv.mkDerivation rec {
5 pname = "SOGo";
5 pname = "SOGo";
6 version = "5.5.0";
6 version = "5.5.0";
@@ -13,7 +13,7 @@ gnustep.stdenv.mkDerivation rec {
13 };
13 };
14
14
15 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
15 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
16− buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];
16+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ];
17
17
18 patches = [
18 patches = [
19 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches
19 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches
pkgs/tools/filesystems/ceph/default.nix+2−2
@@ -9,7 +9,7 @@
9, gtest
9, gtest
10, cunit, snappy
10, cunit, snappy
11, makeWrapper
11, makeWrapper
12−, leveldb, oathToolkit
12+, leveldb, oath-toolkit
13, libnl, libcap_ng
13, libnl, libcap_ng
14, rdkafka
14, rdkafka
15, nixosTests
15, nixosTests
@@ -161,7 +161,7 @@ in rec {
161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [
161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [
162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
163 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
163 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
164− snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
164+ snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka
165 cryptsetup sqlite lua icu bzip2
165 cryptsetup sqlite lua icu bzip2
166 ] ++ lib.optionals stdenv.isLinux [
166 ] ++ lib.optionals stdenv.isLinux [
167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs
167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs
pkgs/tools/security/oath-toolkit/update.sh+1−1
@@ -5,7 +5,7 @@ set -euo pipefail
5
5
6nixfile='default.nix'
6nixfile='default.nix'
7release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'
7release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'
8−attr='oathToolkit'
8+attr='oath-toolkit'
9command='oathtool --version'
9command='oathtool --version'
10
10
11color() {
11color() {
pkgs/tools/security/pass/extensions/otp.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, oathToolkit }:
1+{ lib, stdenv, fetchFromGitHub, oath-toolkit }:
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 pname = "pass-otp";
4 pname = "pass-otp";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
11 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";
11 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";
12 };
12 };
13
13
14− buildInputs = [ oathToolkit ];
14+ buildInputs = [ oath-toolkit ];
15
15
16 dontBuild = true;
16 dontBuild = true;
17
17
18 patchPhase = ''
18 patchPhase = ''
19− sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
19+ sed -i -e 's|OATH=\$(which oathtool)|OATH=${oath-toolkit}/bin/oathtool|' otp.bash
20 '';
20 '';
21
21
22 installFlags = [ "PREFIX=$(out)"
22 installFlags = [ "PREFIX=$(out)"
pkgs/tools/security/plasma-pass/default.nix+2−2
@@ -1,7 +1,7 @@
1{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
1{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
2, ki18n
2, ki18n
3, kitemmodels
3, kitemmodels
4−, oathToolkit
4+, oath-toolkit
5, qgpgme
5, qgpgme
6, plasma-framework
6, plasma-framework
7, qt5 }:
7, qt5 }:
@@ -21,7 +21,7 @@ mkDerivation rec {
21 buildInputs = [
21 buildInputs = [
22 ki18n
22 ki18n
23 kitemmodels
23 kitemmodels
24− oathToolkit
24+ oath-toolkit
25 qgpgme
25 qgpgme
26 plasma-framework
26 plasma-framework
27 qt5.qtbase
27 qt5.qtbase
pkgs/top-level/aliases.nix+1
@@ -882,6 +882,7 @@ mapAliases ({
882
882
883 ### O ###
883 ### O ###
884
884
885+ oathToolkit = oath-toolkit; # Added 2022-04-04
885 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09
886 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09
886 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16
887 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16
887 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16
888 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16
pkgs/top-level/all-packages.nix+1−1
@@ -8827,7 +8827,7 @@ with pkgs;
8827
8827
8828 oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
8828 oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
8829
8829
8830− oathToolkit = callPackage ../tools/security/oath-toolkit { };
8830+ oath-toolkit = callPackage ../tools/security/oath-toolkit { };
8831
8831
8832 oatpp = callPackage ../development/libraries/oatpp { };
8832 oatpp = callPackage ../development/libraries/oatpp { };
8833
8833