Adapt to package format changes.

This commit is contained in:
Kevin Baensch 2019-11-20 09:47:44 +01:00
parent 886a3b0dc8
commit 32726109c8
3 changed files with 4 additions and 4 deletions

View file

@ -6,6 +6,6 @@
cmake cmake
gcc gcc
global global
irony-server # irony-server
]; ];
} }

View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
config.machine.pkgsets.haskell.pkgwrap = [ (pkgs.haskellPackages.ghcWithPackages (pkgs: config.machine.pkgsets.haskell.pkgs)) ]; config.machine.pkgsets.haskell.pkgwrap = (pkgs.haskellPackages.ghcWithPackages (pkgs: config.machine.pkgsets.haskell.pkgs));
config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [ config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [
hindent hindent
mtl mtl

View file

@ -3,8 +3,8 @@
let let
gitpkgs = import /nixpkgs {}; gitpkgs = import /nixpkgs {};
in { in {
config.machine.pkgsets.python3.pkgwrap = [ (gitpkgs.python3Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs)) ]; config.machine.pkgsets.python3.pkgwrap = (gitpkgs.python3Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs));
config.machine.pkgsets.python3.pkgs = with gitpkgs.python3Packages; [ config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
GitPython GitPython
bpython bpython
# cairosvg cairocffi # cairosvg cairocffi