From b6ef9916e411bd4c19cec842656c8a80a0a69b5b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 24 Oct 2021 18:22:59 -0400 Subject: [PATCH 1/2] sherpa: 2.2.10 -> 2.2.11 --- pkgs/applications/science/physics/sherpa/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 1c1bc22b0ffc..dd726c96606e 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,20 +1,19 @@ -{ lib, stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: +{ lib, stdenv, fetchurl, autoconf, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.10"; + version = "2.2.11"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; + sha256 = "sha256-DrA/h/f/MjGylKxAtVMq6OLvEdb6yB7pRt8UJXNmwi0="; }; postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; - - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = [ autoconf gfortran ]; buildInputs = [ sqlite lhapdf rivet ]; From 22a500a3f87bbce73bd8d777ef920b43a636f018 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Jun 2020 10:55:14 +0800 Subject: [PATCH 2/2] pam_mount: do not re-prompt for password nixos-rebuild test causes pam_mount to prompt for a password when running with an encrypted home: building '/nix/store/p6bflh7n5zy2dql8l45mix9qnzq65hbk-nixos-system-mildred-18.09.git.98592c5da79M.drv'... activating the configuration... setting up /etc... reenter password for pam_mount: (mount.c:68): Messages from underlying mount program: (mount.c:72): crypt_activate_by_passphrase: File exists (pam_mount.c:522): mount of /dev/mapper/vg0-lv_home_peter failed kbuildsycoca5 running... This change makes pam_mount not prompt. It still tries to remount (and fails in the process) but that message can be ignored. Fixes: #44586 --- nixos/modules/security/pam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 4c18fa8cc67f..d6a6f7ce0827 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -428,7 +428,7 @@ let ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} ${optionalString cfg.pamMount - "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} + "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"} ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} @@ -489,7 +489,7 @@ let ${optionalString config.security.pam.enableEcryptfs "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} ${optionalString cfg.pamMount - "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} + "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"} ${optionalString use_ldap "session optional ${pam_ldap}/lib/security/pam_ldap.so"} ${optionalString config.services.sssd.enable