From 280aa48893458f0ae980c87fed5e733373ccec9d Mon Sep 17 00:00:00 2001 From: Linnnus Date: Sun, 1 Oct 2023 18:56:59 +0200 Subject: Export pkgs and overlays --- overlays/compat.nix | 13 +++++++++++++ overlays/default.nix | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 overlays/compat.nix create mode 100644 overlays/default.nix (limited to 'overlays') diff --git a/overlays/compat.nix b/overlays/compat.nix new file mode 100644 index 0000000..8874b52 --- /dev/null +++ b/overlays/compat.nix @@ -0,0 +1,13 @@ +# Returns a list of overlays such that this file can be used for the value of +# nixpkgs-overlays in NIX_PATH. +# +# See: hosts/common.nix +# See: https://nixos.org/manual/nixpkgs/stable/#sec-overlays-lookup + +let + overlays = import ./default.nix; +in +[ + overlays.additions + overlays.modifications +] diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..81a163a --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,22 @@ +# This module lists the different overlays. These are exported in `flake.nix`. + +{ + # This overlay adds all of our custom packages. + additions = final: _prev: import ../pkgs final; + + # This overlay does typical overlay stuff such as adding patches, bumping versions, etc. + modifications = final: prev: { + # Use patched version from Karl. + smu = prev.smu.overrideAttrs (old: { + version = "2022-08-01"; + src = final.fetchFromGitHub { + owner = "karlb"; + repo = "smu"; + rev = "bd03c5944b7146d07a88b58a2dd0d264836e3322"; + hash = "sha256-Jx7lJ9UTHAOCgPxF2p7ZoZBZ476bLXN5dI0vspusmGo="; + }; + env.NIX_CFLAGS_COMPILE = (old.env.NIX_CFLAGS_COMPILE or "") + + (final.lib.strings.optionalString (final.stdenv.cc.isGNU or false) " -Wno-maybe-uninitialized"); + }); + }; +} -- cgit v1.2.3