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: 853ecd257166
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bdfb1bd01b2d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 2, 2020

  1. Revert "sudo: fix for structured attrs" 

    This broke sudo.

This reverts commit 91a1f20.
    @FRidh
    FRidh committed Jan 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee3f276 View commit details

  2. sudo: 1.8.29 -> 1.8.30

    @FRidh
    FRidh committed Jan 2, 2020
    Copy the full SHA
    bdfb1bd View commit details
Showing with 5 additions and 15 deletions.
  1. +5 −15 pkgs/tools/security/sudo/default.nix
20 changes: 5 additions & 15 deletions pkgs/tools/security/sudo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,12 @@
}:

stdenv.mkDerivation rec {
name = "sudo-1.8.29";
pname = "sudo";
version = "1.8.30";

src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
sha256 = "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf";
url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz";
sha256 = "1rvrqlqrrjsd06dczgj9cwjdkpkqil5zzlwh87h06ms6qzfx6nm3";
};

prePatch = ''
@@ -41,22 +39,14 @@ stdenv.mkDerivation rec {
"--with-passprompt=[sudo] password for %p: " # intentional trailing space
];

installFlags = [
"sudoers_uid=$(shell id -u)"
"sudoers_gid=$(shell id -g)"
"sysconfdir=${placeholder ''out''}/etc"
"rundir=$(TMPDIR)/dummy"
"vardir=$(TMPDIR)/dummy"
"DESTDIR=/"
];

postConfigure =
''
cat >> pathnames.h <<'EOF'
#undef _PATH_MV
#define _PATH_MV "${coreutils}/bin/mv"
EOF
makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
'';

nativeBuildInputs = [ groff ];