From 5048e8ce3c5c7a54684ca806ea027dc552fea1eb Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 29 May 2020 14:56:10 -0700 Subject: [PATCH 1/1] Use polite-merge for merging --- modules/auto-upgrade.nix | 4 +++- overlays/polite-merge.nix | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 overlays/polite-merge.nix diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix index 66d857f..e52720d 100644 --- a/modules/auto-upgrade.nix +++ b/modules/auto-upgrade.nix @@ -28,7 +28,8 @@ let # Update channels ( cd /etc/nixos - ${pkgs.keyedgit cfg.keys}/bin/git pull --ff-only --verify-signatures + ${pkgs.git}/bin/git fetch + PATH="${pkgs.keyedgit cfg.keys}/bin:$PATH" ${pkgs.polite-merge}/bin/polite-merge --ff-only --verify-signatures ${pkgs.pinch}/bin/pinch update channels ) @@ -136,6 +137,7 @@ in { nixpkgs.overlays = [ (import ../overlays/keyedgit.nix) (import ../overlays/pinch.nix) + (import ../overlays/polite-merge.nix) (self: super: { auto-upgrade = super.writeShellScriptBin "auto-upgrade" '' /run/wrappers/bin/sudo ${auto-upgrade-script} diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix new file mode 100644 index 0000000..49d8d3b --- /dev/null +++ b/overlays/polite-merge.nix @@ -0,0 +1,20 @@ +self: super: { + polite-merge = if builtins.hasAttr "polite-merge" super then + super.polite-merge + else + self.callPackage ({ fetchgit, git, stdenv, }: + stdenv.mkDerivation rec { + pname = "polite-merge"; + version = "1.0"; + src = fetchgit { + url = "https://scottworley.com/polite-merge.git"; + rev = version; + sha256 = "1q3iya5ifpcnmmvxhaphlvvq674yzwkgi3cyr6i3yflqks7zf81p"; + }; + postUnpack = "patchShebangs ."; + checkInputs = [ git ]; + doCheck = true; + preInstall = "export prefix"; + }) { }; +} + -- 2.44.1