Browse Source

Move gitpkgs into pkg overrides.

master
Kevin Baensch 3 months ago
parent
commit
5f4edfeb2a
Signed by: derped GPG Key ID: C0F1D326C7626543
  1. 1
      pkgs/nixpkgs.nix
  2. 1
      pkgsets/emacs.nix
  3. 4
      pkgsets/mail_utils.nix
  4. 19
      pkgsets/python3.nix
  5. 2
      services/desktop.nix

1
pkgs/nixpkgs.nix

@ -12,6 +12,7 @@ in {
theme_sddm_midnight = callPackage ./sddm_midnight { };
xdiskusage = callPackage ./xdiskusage { };
django3 = pkgs.python3Packages.callPackage ./django3 { };
gitpkgs = import /nixpkgs {};
};
};
}

1
pkgsets/emacs.nix

@ -3,7 +3,6 @@
with lib;
let
gitpkgs = import /nixpkgs {};
fn = import (toString ../fn.nix) { inherit lib; };
modefiles = fn.lst { p = (toString ./emacs); b = true; };
in rec {

4
pkgsets/mail_utils.nix

@ -1,8 +1,6 @@
{ config, pkgs, ... }:
let
gitpkgs = import /nixpkgs {};
in {
{
config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
fetchmail
isync

19
pkgsets/python3.nix

@ -4,10 +4,10 @@ with lib;
let
fn = import ../fn.nix { inherit lib; };
gitpkgs = import /nixpkgs {};
# ocv3 = pkgs.python38Packages.opencv3.override { enableGtk2 = true; enableFfmpeg = true; enableGStreamer = true; };
in {
config.machine.pkgsets.python3.pkgwrap = (pkgs.python38Full.withPackages (ps: with ps; (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
config.machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [
config.machine.pkgsets.python3.pkgwrap = (pkgs.gitpkgs.python38.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
config.machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [
GitPython
bpython
configparser
@ -15,16 +15,21 @@ in {
epc
flake8
genanki
matplotlib ipywidgets
python-docx
mypy
numpy
opencv3
mysqlclient
pandas
# ocv3 scipy scikitimage (imutils.override { opencv3 = ocv3; })
paho-mqtt
pep8
pillow
pip
plotly
pyflakes
pygame pygame_sdl2
pypdf2
# pygame pygame_sdl2
pylama
pylint toml
pyopengl
@ -34,10 +39,12 @@ in {
schedule
scipy
selenium
setuptools
telegram
tkinter
toolz
tifffile
virtualenv
xdot
# xdot
];
}

2
services/desktop.nix

@ -52,5 +52,5 @@ in mkIf (elem "desktop" cfg.services) {
horizontalScrolling = true;
};
};
machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [ py3status pytz tzlocal ];
machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ py3status pytz tzlocal ];
}
Loading…
Cancel
Save