diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /overlays | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/patches/default.nix | 2 | ||||
| -rw-r--r-- | overlays/patches/linux/patches.nix | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/overlays/patches/default.nix b/overlays/patches/default.nix index cad19a157cae..4f648dad6c42 100644 --- a/overlays/patches/default.nix +++ b/overlays/patches/default.nix @@ -16,8 +16,6 @@ self: super: { gnupg = self.callPackage ./gnupg { inherit (super) gnupg; }; - kernelPatches = self.callPackage ./linux/patches.nix { inherit (super) kernelPatches; }; - public-inbox = self.callPackage ./public-inbox { inherit (super) public-inbox; }; diff --git a/overlays/patches/linux/patches.nix b/overlays/patches/linux/patches.nix deleted file mode 100644 index 5b39073228a5..000000000000 --- a/overlays/patches/linux/patches.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kernelPatches, fetchpatch, ... } @ args: - -(kernelPatches.override (builtins.removeAttrs args [ "kernelPatches" ])) // { - eve-backlight = { - name = "eve-backlight"; - patch = fetchpatch { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=f58a435311672305d8747f40e35235f7ed64ae69"; - sha256 = "sha256-MKvQgvxC2CwOFzJSfC4SlAvaLkndZX8+LnF4jneJ4AI="; - }; - }; -} |