Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9419ed60f49e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37e7f09f654d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 7, 2019

  1. shadow: 4.6 -> 4.7 

    https://github.com/shadow-maint/shadow/releases/tag/4.7
    @dtzWill
    dtzWill committed Oct 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea04f6a View commit details

  2. Merge pull request #68078 from dtzWill/update/shadow-4.7 

    shadow: 4.6 -> 4.7
    @dtzWill
    dtzWill authored Oct 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    37e7f09 View commit details
Showing with 2 additions and 9 deletions.
  1. +2 −9 pkgs/os-specific/linux/shadow/default.nix
11 changes: 2 additions & 9 deletions pkgs/os-specific/linux/shadow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@ in

stdenv.mkDerivation rec {
pname = "shadow";
version = "4.6";
version = "4.7";

src = fetchFromGitHub {
owner = "shadow-maint";
repo = "shadow";
rev = version;
sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82";
sha256 = "0a7g9k83igfid8pybqpk6fracmz2q021isn2by3994p4hhh3s327";
};

buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
# Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch
dots_in_usernames

# Check for correct DocBook version during configure
# https://github.com/shadow-maint/shadow/pull/162
(fetchpatch {
url = "https://github.com/shadow-maint/shadow/commit/47797ca6654f79e3de854a6c69db2bdb0516db08.patch";
sha256 = "1zn8f6fd26gj5sh60099xqc7mjwgbbkkic5xfigvxa4b90vm8fd7";
})
];

# The nix daemon often forbids even creating set[ug]id files.