summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-02-15 19:09:42 +0100
committermakefu <github@syntax-fehler.de>2021-02-15 19:09:42 +0100
commitda0ab68232757e19e1ec26e88331b88afea9e8fc (patch)
tree00ebd863f07b8e569a856107f08be8de9ff3a8bc /krebs
parentdc7dca887a082666b3e4c7592239131181bc42c1 (diff)
parent9365aff352d99b7506bafbef6682de7bfb00df27 (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/5pkgs/override/default.nix15
-rw-r--r--krebs/5pkgs/simple/gitignore.nix46
2 files changed, 61 insertions, 0 deletions
diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix
index 926e9dccd..e5867926e 100644
--- a/krebs/5pkgs/override/default.nix
+++ b/krebs/5pkgs/override/default.nix
@@ -10,6 +10,21 @@ self: super: {
};
});
+ exim = super.exim.overrideAttrs (old: rec {
+ version = warnOldVersion old.version "4.95+fixes";
+ src = self.fetchgit {
+ url = "git://git.exim.org/exim.git";
+ rev = "cdb37db5c0ff060de7edfc94e830cab6b7f7c084";
+ sha256 = "1xaxs1p8yy5f04an5g9mxhj5cvbnzj0xfb50aa1xxkhkqkspzlsg";
+ postFetch = /* sh */ ''
+ ${self.gnutar}/bin/tar xf ${old.src}
+ ${self.rsync}/bin/rsync -vac "$out"/src/ exim-4.94/src
+ rm -R "$out"
+ mv exim-4.94 "$out"
+ '';
+ };
+ });
+
flameshot = super.flameshot.overrideAttrs (old: rec {
patches = old.patches or [] ++ [
(self.writeText "flameshot-imgur.patch" /* diff */ ''
diff --git a/krebs/5pkgs/simple/gitignore.nix b/krebs/5pkgs/simple/gitignore.nix
new file mode 100644
index 000000000..b3c750a08
--- /dev/null
+++ b/krebs/5pkgs/simple/gitignore.nix
@@ -0,0 +1,46 @@
+{ pkgs }:
+
+/* gitignore - Filter for intentionally untracked lines or blocks of code
+
+This is a filter that allows specifying intentionally untracked lines and
+blocks of code that Git should ignore.
+
+Example:
+
+ int main(void) {
+ printf("I would never say derp.\n");
+ //#gitignore-begin
+ printf("DERP!\n");
+ //#gitignore-end
+ printf("DERP!\n"); //#gitignore
+ return 0;
+ }
+
+Installation:
+
+ Define a filter, e.g. in ~/.config/git/config[1]:
+
+ [filter "gitignore"]
+ clean = gitignore
+ smudge = cat
+
+ Assing that filter to some paths, e.g. in ~/.config/git/attributes[2]:
+
+ *.hs filter=gitignore
+ *.c filter=gitignore
+ ...
+
+ [1]: For more information about defining filters see git-config(1).
+ [2]: For more information about assigning filters see gitattributes(5).
+*/
+
+pkgs.execBin "gitignore" {
+ filename = "${pkgs.gnused}/bin/sed";
+ argv = [
+ "gitignore"
+ /* sed */ ''
+ /#gitignore-begin/,/#gitignore-end/d
+ /#gitignore/d
+ ''
+ ];
+}