Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7a3083fef83b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad36169300e7
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 30, 2019

  1. phpPackages.phpcbf: 3.4.2 -> 3.5.0 

    (cherry picked from commit 096f03e)
    @Ma27 @etu
    Ma27 authored and etu committed Sep 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b1967e3 View commit details

  2. Merge pull request #70048 from etu/1909-phpcbf 

    [19.09] phpPackages.phpcbf: 3.4.2 -> 3.5.0
    @Ma27
    Ma27 authored Sep 30, 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
    105189c View commit details

  3. nixos/systemd: pick more upstream tmpfiles confs 

    In #68792 it was discovered that /dev/fuse doesn't have
wordl-read-writeable permissions anymore. The cause of this is that the
tmpfiles examples in systemd were reorganized and split into more files.
We thus lost some of the configuration we were depending on.

In this commit some of the new tmpfiles configuration that are
applicable to us are added which also makes wtmp/lastlog in the pam
module not necessary anymore.

Rationale for the new tmpfile configs:

  - `journal-nowcow.conf`: Contains chattr +C for journald logs which
  makes sense on copy-on-write filesystems like Btrfs. Other filesystems
  shouldn't do anything funny when that flag is set.

  - `static-nodes-permissions.conf`: Contains some permission overrides
  for some device nodes like audio, loop, tun, fuse and kvm.

  - `systemd-nspawn.conf`: Makes sure `/var/lib/machines` exists and old
  snapshots are properly removed.

  - `systemd-tmp.conf`: Removes systemd services related private tmp
  folders and temporary coredump files.

  - `var.conf`: Creates some useful directories in `/var` which we would
  create anyway at some point. Also includes
  `/var/log/{wtmp,btmp,lastlog}`.

Fixes #68792.

(cherry picked from commit 0dc4fe0)
    @fpletz @lheckemann
    fpletz authored and lheckemann committed Sep 30, 2019
    Copy the full SHA
    ad36169 View commit details
Showing with 7 additions and 9 deletions.
  1. +0 −7 nixos/modules/security/pam.nix
  2. +5 −0 nixos/modules/system/boot/systemd.nix
  3. +2 −2 pkgs/top-level/php-packages.nix
7 changes: 0 additions & 7 deletions nixos/modules/security/pam.nix
View file
Original file line number Diff line number Diff line change
@@ -742,13 +742,6 @@ in
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;

systemd.tmpfiles.rules = optionals
(any (s: s.updateWtmp) (attrValues config.security.pam.services))
[
"f /var/log/wtmp"
"f /var/log/lastlog"
];

security.pam.services =
{ other.text =
''
5 changes: 5 additions & 0 deletions nixos/modules/system/boot/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -858,7 +858,12 @@ in
"sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
"sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";

"tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";
"tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";
"tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
"tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf";
"tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf";
"tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";
"tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";

"tmpfiles.d/nixos.conf".text = ''
4 changes: 2 additions & 2 deletions pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -338,12 +338,12 @@ let
};

phpcbf = mkDerivation rec {
version = "3.4.2";
version = "3.5.0";
pname = "phpcbf";

src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
sha256 = "08s47r8i5dyjivk1q3nhrz40n6fx3zghrn5irsxfnx5nj9pb7ffp";
sha256 = "15n3r3sc62ar1kq38idw22y7gasvy747bix99zs0l0paapcbxz6n";
};

phases = [ "installPhase" ];