derped/nixos
1
0
Fork 0
Code Releases Activity

Move gitpkgs into pkg overrides.

Browse source
This commit is contained in:
Kevin Baensch 2021-10-28 09:46:12 +02:00
parent 528fec2f0d
commit 5f4edfeb2a
Signed by: derped
GPG key ID: C0F1D326C7626543
5 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/nixpkgs.nix
View file

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

1
pkgsets/emacs.nix
View file

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

4
pkgsets/mail_utils.nix
View file

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

19
pkgsets/python3.nix
View file

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

2
services/desktop.nix
View file

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