From 06b7c4abcc64eec34900a320d2f88e1371968b57 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 29 Jun 2019 20:51:00 +0200 Subject: [PATCH] systemd: point to commit id instead of branch name branch names are mutable, and with https://github.com/NixOS/systemd/pull/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 https://github.com/NixOS/nixpkgs/pull/63784 , which also uses the commit id, and not a branch name for rev. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1485d060281f..8e2864b4be16 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "nixos-v${version}"; + rev = "5c20aab77900f478fd380ab189787d80e4a35963"; sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8"; };