flake.lock: Update
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/6bba64781e4b7c1f91a733583defbd3e46b49408' (2023-10-10)
→ 'github:nix-community/home-manager/8765d4e38aa0be53cdeee26f7386173e6c65618d' (2023-11-03)
• Updated input 'nix-darwin':
'github:LnL7/nix-darwin/8b6ea26d5d2e8359d06278364f41fbc4b903b28a' (2023-10-03)
→ 'github:LnL7/nix-darwin/afe83cbc2e673b1f08d32dd0f70df599678ff1e7' (2023-10-27)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11)
→ 'github:NixOS/nixpkgs/fa804edfb7869c9fb230e174182a8a1a7e512c40' (2023-11-02)
• Updated input 'sops-nix':
'github:Mic92/sops-nix/6b32358c22d2718a5407d39a8236c7bd9608f447' (2023-10-09)
→ 'github:Mic92/sops-nix/275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f' (2023-11-03)
• Updated input 'sops-nix/nixpkgs':
'github:NixOS/nixpkgs/945559664c1dc5836173ee12896ba421d9b37181' (2023-10-07)
→ 'github:NixOS/nixpkgs/808c0d8c53c7ae50f82aca8e7df263225cf235bf' (2023-10-26)
• Updated input 'sops-nix/nixpkgs-stable':
'github:NixOS/nixpkgs/2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1' (2023-10-07)
→ 'github:NixOS/nixpkgs/d87c5d8c41c9b3b39592563242f3a448b5cc4bc9' (2023-10-29)
This commit is contained in:
@@ -109,6 +109,9 @@ in {
|
||||
sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
|
||||
};
|
||||
});
|
||||
glaxnimate = super.glaxnimate.override {
|
||||
python3 = self.python310;
|
||||
};
|
||||
})];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, config, pkgs, ... }: let
|
||||
py3 = pkgs.python3;
|
||||
# FreeCAD uses pyside2 (qt 5.15) which doesn't support > 3.10
|
||||
py3 = pkgs.python310;
|
||||
py3Pkgs = py3.pkgs;
|
||||
# For 3D CNC machining
|
||||
opencamlib = py3Pkgs.toPythonModule (pkgs.stdenv.mkDerivation rec {
|
||||
@@ -37,7 +38,7 @@
|
||||
};
|
||||
});
|
||||
|
||||
py3Cad = pkgs.python3.withPackages (p: (with p; [
|
||||
py3Cad = py3.withPackages (p: (with p; [
|
||||
numpy
|
||||
scipy
|
||||
seaborn
|
||||
@@ -53,6 +54,18 @@ in {
|
||||
freecad = super.freecad.override {
|
||||
stdenv = super.ccacheStdenv;
|
||||
python = py3Cad;
|
||||
boost = py3Pkgs.boost;
|
||||
inherit (py3Pkgs)
|
||||
gitpython
|
||||
matplotlib
|
||||
pivy
|
||||
ply
|
||||
pycollada
|
||||
pyside2
|
||||
pyside2-tools
|
||||
pyyaml
|
||||
scipy
|
||||
shiboken2;
|
||||
};
|
||||
})];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user