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

Commits on Jun 29, 2019

  1. systemd: point to commit id instead of branch name 

    branch names are mutable, and with
NixOS/systemd#29 being merged in, the nixos-v242
branch advanced from 5c20aab77900f478fd380ab189787d80e4a35963 to
40eb070cb309ec09def0ecdeaf7514c702200835, causing systemd's
fetchFromGitHub to fail with a sha256sum mismatch (when not relying on
the cache).

Fix this, by pointing systemd.src to the commit id before the branch
advancement. This won't cause a rebuild, as the sha256 stayed the same.

Fast-forwarding systemd to 40eb070cb309ec09def0ecdeaf7514c702200835 will
be done in #63784 , which also uses
the commit id, and not a branch name for rev.
    @flokli
    flokli committed Jun 29, 2019
    Copy the full SHA
    06b7c4a View commit details

Commits on Jun 30, 2019

  1. Merge pull request #63929 from flokli/nixos-v242-rev-commit-id 

    systemd: point to commit id instead of branch name
    @andir
    andir authored Jun 30, 2019
    Copy the full SHA
    bb3b6e2 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/os-specific/linux/systemd/default.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
rev = "nixos-v${version}";
rev = "5c20aab77900f478fd380ab189787d80e4a35963";
sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8";
};