diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
| commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
| tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/.git-blame-ignore-revs | |
| parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
| parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
| download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/.git-blame-ignore-revs')
| -rw-r--r-- | nixpkgs/.git-blame-ignore-revs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nixpkgs/.git-blame-ignore-revs b/nixpkgs/.git-blame-ignore-revs index 2436c29afc70..b7da3c84fc17 100644 --- a/nixpkgs/.git-blame-ignore-revs +++ b/nixpkgs/.git-blame-ignore-revs @@ -96,3 +96,9 @@ fb0e5be84331188a69b3edd31679ca6576edb75a # nixos/*: add trivial defaultText for options with simple defaults 25124556397ba17bfd70297000270de1e6523b0a + +# systemd: rewrite comments +92dfeb7b3dab820ae307c56c216d175c69ee93cd + +# systemd: break too long lines of Nix code +67643f8ec84bef1482204709073e417c9f07eb87 |