From 37b417d2ec92da9ce3701b63a0c8e9a82385a0a7 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 14 Apr 2025 13:33:35 +0200 Subject: pkgs/default.nix: No longer required `sysLib` as input --- flake.nix | 2 +- pkgs/default.nix | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 0fa1c1e0..220095aa 100644 --- a/flake.nix +++ b/flake.nix @@ -286,7 +286,7 @@ pkgsStable = nixpkgs-stable.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system}; myPkgs = import ./pkgs { - inherit sysLib pkgs nixLib; + inherit pkgs nixLib; }; nixpkgs_as_input = nixpkgs; diff --git a/pkgs/default.nix b/pkgs/default.nix index 41bb654f..dfef2b60 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,21 +1,10 @@ { pkgs, - sysLib, nixLib, }: let inherit (pkgs) lib; - maybeMergeMessage = "the ./pkgs/by-name set"; - mMM = maybeMergeMessage; - callPackage = - lib.callPackageWith - (nixLib.warnMerge - (nixLib.warnMerge - pkgs - myPkgs - mMM) - {inherit sysLib;} - mMM); + callPackage = lib.callPackageWith (nixLib.warnMerge pkgs myPkgs "the ./pkgs/by-name set"); myPkgs = nixLib.mkByName { baseDirectory = ./by-name; -- cgit 1.4.1