about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-04-15 14:41:54 +0000
committerAlyssa Ross <hi@alyssa.is>2020-04-15 14:41:54 +0000
commita378e77f94d2786ec32612bdeabd656a5f864138 (patch)
tree2f50d3954132e44761becfd8361cd9c51c31c05b
parent6966c70ed67bf3a13395d130cb09e39305b3c298 (diff)
downloadnixlib-a378e77f94d2786ec32612bdeabd656a5f864138.tar
nixlib-a378e77f94d2786ec32612bdeabd656a5f864138.tar.gz
nixlib-a378e77f94d2786ec32612bdeabd656a5f864138.tar.bz2
nixlib-a378e77f94d2786ec32612bdeabd656a5f864138.tar.lz
nixlib-a378e77f94d2786ec32612bdeabd656a5f864138.tar.xz
nixlib-a378e77f94d2786ec32612bdeabd656a5f864138.tar.zst
nixlib-a378e77f94d2786ec32612bdeabd656a5f864138.zip
patches/git-absorb: don't need user.{name,email}
-rw-r--r--nixpkgs-overlays/patches/default.nix6
-rw-r--r--nixpkgs-overlays/patches/git-absorb/default.nix11
2 files changed, 17 insertions, 0 deletions
diff --git a/nixpkgs-overlays/patches/default.nix b/nixpkgs-overlays/patches/default.nix
index 4a41f2b1726c..2fdd5356d285 100644
--- a/nixpkgs-overlays/patches/default.nix
+++ b/nixpkgs-overlays/patches/default.nix
@@ -5,6 +5,12 @@ self: super: {
     inherit (super) firefoxPackages;
   };
 
+  gitAndTools = super.gitAndTools // {
+    git-absorb = self.callPackage ./git-absorb {
+      inherit (super.gitAndTools) git-absorb;
+    };
+  };
+
   python3 = self.callPackage ./python { python = super.python3; };
 
   tmux = self.callPackage ./tmux { inherit (super) tmux; };
diff --git a/nixpkgs-overlays/patches/git-absorb/default.nix b/nixpkgs-overlays/patches/git-absorb/default.nix
new file mode 100644
index 000000000000..c0eb2488ab5b
--- /dev/null
+++ b/nixpkgs-overlays/patches/git-absorb/default.nix
@@ -0,0 +1,11 @@
+{ fetchpatch, git-absorb }:
+
+git-absorb.overrideRustAttrs ({ patches ? [], ... }: {
+  patches = patches ++ [
+    (fetchpatch {
+      url = "https://github.com/tummychow/git-absorb/commit/1beda1bb890fd01778d8c31d1c4d898a47654713.patch";
+      sha256 = "1js0hiyignyc2825p5jh9nns37xwhvsylbbmz4ggc4x2dvkzv6yf";
+    })
+  ];
+})
+