From d27e67743931d352e5857b605d44657668fa9013 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Tue, 4 Jun 2024 21:14:49 +0200
Subject: all: jump to nixpkgs 24.05

this does a lot of things, most of which are maintenance:
 - sources update
 - adjust newly-renamed options
 - swap some packages that were removed / renamed
 - update nomsring to newer default ghc
 - remove the deprecated lib.mdDoc from modules/*.nix
 - disable the nixpkgs mollysocket module so my own keeps evaluating
 - bundle the package definition of hikari & wlroots 0.15, which nixpkgs
   has removed as unmaintained (in fairness, they are unmaintained)
---
 inputs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inputs.nix')

diff --git a/inputs.nix b/inputs.nix
index 0d2851c..8902303 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -7,7 +7,7 @@ let
   callFlake = name: inputs:
     let
       self = (import "${sources.${name}}/flake.nix").outputs
-        ({ inherit self; } // inputs);
+        ({ self = self // { outPath = sources.${name}.outPath; }; } // inputs);
     in
       self // { outPath = sources.${name}.outPath; };
 
@@ -41,7 +41,8 @@ let
     # this absurd third copy only exists because non-flake nixpkgs does not
     # as easily expose the evalConfig function ..
     nixpkgs-flake =
-      (import "${sources.nixpkgs}/flake.nix").outputs { self = nixpkgs-flake; };
+      (import "${sources.nixpkgs}/flake.nix").outputs { self = nixpkgs-flake; }
+      // { outPath = sources.nixpkgs.outPath; };
 
     home-manager = callFlake "home-manager" { inherit nixpkgs; };
 
-- 
cgit v1.2.3