From ab7f2e847eafa6380ded077993df7fcd41400680 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 19 Dec 2022 23:46:18 +0200 Subject: [PATCH] nix/flake: remove merged overrides --- flake.lock | 6 +++--- flake.nix | 23 +---------------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index aa5be2c5..fa485627 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670064435, - "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4fbe5610..f4af0f2e 100644 --- a/flake.nix +++ b/flake.nix @@ -31,28 +31,7 @@ "x86_64-linux" ]; - pkgsFor = genSystems (system: - import nixpkgs { - inherit system; - overlays = [ - (_: prev: { - libdrm = prev.libdrm.overrideAttrs (old: rec { - version = "2.4.114"; - src = prev.fetchurl { - url = "https://dri.freedesktop.org/${old.pname}/${old.pname}-${version}.tar.xz"; - sha256 = "sha256-MEnPhDpH0S5e7vvDvjSW14L6CfQjRr8Lfe/j0eWY0CY="; - }; - }); - wayland-protocols = prev.wayland-protocols.overrideAttrs (old: rec { - version = "1.29"; - src = prev.fetchurl { - url = "https://gitlab.freedesktop.org/wayland/${old.pname}/-/releases/${version}/downloads/${old.pname}-${version}.tar.xz"; - hash = "sha256-4l6at1rHNnBN3v6S6PmshzC+q29WTbYvetaVu6T/ntg="; - }; - }); - }) - ]; - }); + pkgsFor = nixpkgs.legacyPackages; mkDate = longDate: (lib.concatStringsSep "-" [ (builtins.substring 0 4 longDate)