derped/nixos
1
0
Fork 0
Code Releases Activity

Move fn functions to system specialArgs.

Browse source
This commit is contained in:
Kevin Baensch 2023-08-28 21:52:46 +02:00
parent b73ea3b5de
commit b2da82bff1
Signed by: derped
GPG key ID: C0F1D326C7626543
9 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkgsets/emacs.nix
View file

@ -1,9 +1,8 @@
{ config, lib, pkgs, ... }:
{ config, lib, fn, pkgs, ... }:
with lib;
let
fn = import (toString ../fn.nix) { inherit lib; };
modefiles = fn.lst { p = (toString ./emacs); b = true; };
in rec {
imports = [

6
pkgsets/haskell.nix
View file

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }:
{ config, lib, fn, pkgs, ... }:
let
fn = import ../fn.nix { inherit lib; };
in {
{
config.machine.pkgsets.haskell.pkgwrap = (pkgs.haskellPackages.ghcWithPackages (pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs)));
config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [
hindent

6
pkgsets/php.nix
View file

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }:
{ config, lib, fn, pkgs, ... }:
let
fn = import ../fn.nix { inherit lib; };
in {
{
config.machine.pkgsets.php.pkgwrap = (fn.pkgFilter config.machine.pkgsets.php.pkgs);
config.machine.pkgsets.php.pkgs = (with pkgs.php82Packages; [
composer

7
pkgsets/python3.nix
View file

@ -1,11 +1,8 @@
{ config, lib, pkgs, ... }:
{ config, lib, fn, pkgs, ... }:
with lib;
let
fn = import ../fn.nix { inherit lib; };
# ocv3 = pkgs.python38Packages.opencv3.override { enableGtk2 = true; enableFfmpeg = true; enableGStreamer = true; };
in {
{
config.machine.pkgsets.python3.pkgwrap = (pkgs.python310.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
config.machine.pkgsets.python3.pkgs = with pkgs.python310Packages; [
GitPython