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

Commits on May 9, 2018

  1. systemd: suppress certain warnings to compile under gcc8

    @Synthetica9
    Synthetica9 committed May 9, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Synthetica9 Patrick Hilhorst
    GPG key ID: 589BB0A8DAFEF2B2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3a395cc View commit details

  2. Merge pull request #40246 from Synthetica9/gcc8-systemd-fix 

    systemd: suppress certain warnings to compile under gcc8
    @xeji
    xeji authored May 9, 2018

    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
    1ac6445 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/os-specific/linux/systemd/default.nix
7 changes: 7 additions & 0 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ let
pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

in stdenv.mkDerivation rec {
# To whoever updates this to 239: check the todo on line 173.
version = "238";
name = "systemd-${version}";

@@ -166,6 +167,12 @@ in stdenv.mkDerivation rec {
"-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""

"-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""


# Temporary flags to get this to compile under GCC8.
# TODO when updating (to systemd 239): remove this.
"-Wno-maybe-uninitialized"
"-Wno-error=format-truncation"
];

postInstall = ''