summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock17
-rw-r--r--flake.nix29
2 files changed, 45 insertions, 1 deletions
diff --git a/flake.lock b/flake.lock
index 2f69647..a786f11 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,6 +32,22 @@
"type": "github"
}
},
+ "cicconf": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1710915318,
+ "narHash": "sha256-US6+3bkNOMNEAfbN9O3RedL5TiXAr7B6zWUvf2wN8NI=",
+ "owner": "wulffern",
+ "repo": "cicconf",
+ "rev": "ea4a01024206fde3a8bb2cdcc37e4823f0f5621c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "wulffern",
+ "repo": "cicconf",
+ "type": "github"
+ }
+ },
"cicsim": {
"flake": false,
"locked": {
@@ -189,6 +205,7 @@
},
"root": {
"inputs": {
+ "cicconf": "cicconf",
"cicsim": "cicsim",
"netgen": "netgen",
"nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index a7b03be..8f87343 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,9 +16,13 @@
url = "github:wulffern/cicsim";
flake = false;
};
+ cicconf = {
+ url = "github:wulffern/cicconf";
+ flake = false;
+ };
};
- outputs = { self, nixpkgs, open_pdks, netgen, cicsim }:
+ outputs = { self, nixpkgs, open_pdks, netgen, cicsim, cicconf }:
let
pkgs = import nixpkgs {
system = "x86_64-linux";
@@ -64,6 +68,27 @@
# tikzplotlib # broken with matplotlib 3.8
];
};
+ packages.x86_64-linux.cicconf =
+ let pkgs = import nixpkgs {
+ system = "x86_64-linux";
+ };
+ in pkgs.python3.pkgs.buildPythonPackage {
+ name = "cicconf";
+ format = "setuptools";
+ src = cicconf;
+
+ propagatedBuildInputs = with pkgs.python311Packages; [
+ pyyaml
+ numpy
+ matplotlib
+ gitpython
+ click
+ ];
+ buildInputs = with pkgs.python311Packages; [
+ pip
+ ];
+ };
+
devShells.x86_64-linux.default = self.devShells.x86_64-linux.osic;
@@ -71,6 +96,7 @@
finalPython = pkgs.python3.override {
packageOverrides = python-self: python-super: {
cicsim = self.packages.x86_64-linux.cicsim;
+ cicconf = self.packages.x86_64-linux.cicconf;
};
};
in pkgs.mkShell {
@@ -85,6 +111,7 @@
pkgs.xschem
(finalPython.withPackages (ps: [
ps.cicsim
+ ps.cicconf
]))
pkgs.pandoc
];