From a299f111a4fa214b2bdd9f36841b6a1dc5e364d8 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 23 Jun 2022 16:03:58 -0700 Subject: [PATCH] move patch list out of flake.nix --- flake.nix | 20 +------------------- nixpatches/list.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 nixpatches/list.nix diff --git a/flake.nix b/flake.nix index fc29a6ed..e0a236c7 100644 --- a/flake.nix +++ b/flake.nix @@ -26,25 +26,7 @@ patchedPkgs = nixpkgs.legacyPackages.${system}.applyPatches { name = "nixpkgs-patched-uninsane"; src = nixpkgs; - patches = [ - # phosh: allow fractional scaling - (nixpkgs.legacyPackages.${system}.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/175872.diff"; - sha256 = "sha256-mEmqhe8DqlyCxkFWQKQZu+2duz69nOkTANh9TcjEOdY="; - }) - # for raspberry pi: allow building u-boot for rpi 4{,00} - # TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018 - ./nixpatches/02-rpi4-uboot.patch - # alternative to https://github.com/NixOS/nixpkgs/pull/173200 - ./nixpatches/04-dart-2.7.0.patch - # whalebird: suuport aarch64 - (nixpkgs.legacyPackages.${system}.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/176476.diff"; - sha256 = "sha256-126DljM06hqPZ3fjLZ3LBZR64nFbeTfzSazEu72d4y8="; - }) - # TODO: upstream - ./nixpatches/07-duplicity-rich-url.patch - ]; + patches = import ./nixpatches/list.nix nixpkgs.legacyPackages.${system}.fetchpatch; }; nixosSystem = import (patchedPkgs + "/nixos/lib/eval-config.nix"); in (nixosSystem { diff --git a/nixpatches/list.nix b/nixpatches/list.nix new file mode 100644 index 00000000..9f628a23 --- /dev/null +++ b/nixpatches/list.nix @@ -0,0 +1,19 @@ +fetchpatch: [ + # phosh: allow fractional scaling + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/175872.diff"; + sha256 = "sha256-mEmqhe8DqlyCxkFWQKQZu+2duz69nOkTANh9TcjEOdY="; + }) + # for raspberry pi: allow building u-boot for rpi 4{,00} + # TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018 + ./02-rpi4-uboot.patch + # alternative to https://github.com/NixOS/nixpkgs/pull/173200 + ./04-dart-2.7.0.patch + # whalebird: suuport aarch64 + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/176476.diff"; + sha256 = "sha256-126DljM06hqPZ3fjLZ3LBZR64nFbeTfzSazEu72d4y8="; + }) + # TODO: upstream + ./07-duplicity-rich-url.patch +]