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

Commits on Dec 22, 2019

  1. systemd: add flokli to maintainers

    @flokli @lheckemann
    flokli authored and lheckemann committed Dec 22, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b3d99bf View commit details

  2. systemd: v243.3 -> v243.4

    @flokli @lheckemann
    flokli authored and lheckemann committed Dec 22, 2019
    Copy the full SHA
    fef59ca View commit details

Commits on Jan 2, 2020

  1. Merge pull request #76134 from mayflower/systemd-v243.4 

    Systemd v243.4
    @flokli
    flokli authored Jan 2, 2020
    Copy the full SHA
    b33e1a6 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/os-specific/linux/systemd/default.nix
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,10 +36,10 @@ in stdenv.mkDerivation {
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
# Also fresh patches should be cherry-picked from that tree to our current one.
src = fetchFromGitHub {
owner = "NixOS";
owner = "nixos";
repo = "systemd";
rev = "491a247eff9b7ce1e5877f5f3431517c95f3222f";
sha256 = "1xqiahapg480m165glrwqbfmc1fxw5sacdlm933cwyi1q8x4537g";
rev = "d8853d39a28b9884e0acd3ae5732a1e7caaf08af";
sha256 = "1wqm51i2czbbb3nara11mnxzqng4na1l8fvz7qnbxcrjsqm7hz18";
};

outputs = [ "out" "lib" "man" "dev" ];
@@ -263,6 +263,6 @@ in stdenv.mkDerivation {
license = licenses.lgpl21Plus;
platforms = platforms.linux;
priority = 10;
maintainers = with maintainers; [ eelco andir mic92 ];
maintainers = with maintainers; [ andir eelco flokli mic92 ];
};
}