git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #167108 from aaronjheng/oath-toolkit

oath-toolkit: Rename from oathToolkit to oath-toolkit

commit0b64a2d69ae54a6003e5af68ce02704834c2d5cd authorArtturi <Artturin@artturin.com> dateThu 5 May 2022, 03:58 (5 years ago) parentdc99b0df0c470f
9 files changed+16−15
compare with master
unifiedsplit
nixos/modules/security/pam.nix+3−3 nixos/tests/pam/pam-oath-login.nix+1−1 pkgs/servers/web-apps/sogo/default.nix+2−2 pkgs/tools/filesystems/ceph/default.nix+2−2 pkgs/tools/security/oath-toolkit/update.sh+1−1 pkgs/tools/security/pass/extensions/otp.nix+3−3 pkgs/tools/security/plasma-pass/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−1
nixos/modules/security/pam.nix+3−3
@@ -492,7 +492,7 @@ let
492492 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}"}
493493 '') +
494494 (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}
496496 '') +
497497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''
498498 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
11311131 ++ optional config.services.sssd.enable pkgs.sssd
11321132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
11331133 ++ 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 ]
11351135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]
11361136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
11371137
@@ -1221,7 +1221,7 @@ in
12211221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,
12221222 '' +
12231223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''
1224− "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,
1224+ "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,
12251225 '' +
12261226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''
12271227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,
nixos/tests/pam/pam-oath-login.nix+1−1
@@ -7,7 +7,7 @@ let
77 # how many passwords have been made. In this env, we'll always be on
88 # the 0th counter, so the password is static.
99 #
10− # Generated in nix-shell -p oathToolkit
10+ # Generated in nix-shell -p oath-toolkit
1111 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3
1212 # and picking a the first 4:
1313 oathSnakeOilPassword1 = "143349";
pkgs/servers/web-apps/sogo/default.nix+2−2
@@ -1,6 +1,6 @@
11{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
22, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
3−, oathToolkit }:
3+, oath-toolkit }:
44gnustep.stdenv.mkDerivation rec {
55 pname = "SOGo";
66 version = "5.5.0";
@@ -13,7 +13,7 @@ gnustep.stdenv.mkDerivation rec {
1313 };
1414
1515 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 ];
1717
1818 patches = [
1919 # 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 @@
99, gtest
1010, cunit, snappy
1111, makeWrapper
12−, leveldb, oathToolkit
12+, leveldb, oath-toolkit
1313, libnl, libcap_ng
1414, rdkafka
1515, nixosTests
@@ -161,7 +161,7 @@ in rec {
161161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [
162162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
163163 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
165165 cryptsetup sqlite lua icu bzip2
166166 ] ++ lib.optionals stdenv.isLinux [
167167 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
55
66nixfile='default.nix'
77release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'
8−attr='oathToolkit'
8+attr='oath-toolkit'
99command='oathtool --version'
1010
1111color() {
pkgs/tools/security/pass/extensions/otp.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, oathToolkit }:
1+{ lib, stdenv, fetchFromGitHub, oath-toolkit }:
22
33stdenv.mkDerivation rec {
44 pname = "pass-otp";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
1111 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";
1212 };
1313
14− buildInputs = [ oathToolkit ];
14+ buildInputs = [ oath-toolkit ];
1515
1616 dontBuild = true;
1717
1818 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
2020 '';
2121
2222 installFlags = [ "PREFIX=$(out)"
pkgs/tools/security/plasma-pass/default.nix+2−2
@@ -1,7 +1,7 @@
11{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
22, ki18n
33, kitemmodels
4−, oathToolkit
4+, oath-toolkit
55, qgpgme
66, plasma-framework
77, qt5 }:
@@ -21,7 +21,7 @@ mkDerivation rec {
2121 buildInputs = [
2222 ki18n
2323 kitemmodels
24− oathToolkit
24+ oath-toolkit
2525 qgpgme
2626 plasma-framework
2727 qt5.qtbase
pkgs/top-level/aliases.nix+1
@@ -882,6 +882,7 @@ mapAliases ({
882882
883883 ### O ###
884884
885+ oathToolkit = oath-toolkit; # Added 2022-04-04
885886 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09
886887 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16
887888 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;
88278827
88288828 oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
88298829
8830− oathToolkit = callPackage ../tools/security/oath-toolkit { };
8830+ oath-toolkit = callPackage ../tools/security/oath-toolkit { };
88318831
88328832 oatpp = callPackage ../development/libraries/oatpp { };
88338833