From a6252ee320ef031e103fb94002b10f9d4f2171d0 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 10 Oct 2024 00:21:43 +0800 Subject: [PATCH] packages.spectroscopy: init --- flake.lock | 17 +++++++++++++++++ flake.nix | 3 ++- modules/packages/desktop/default.nix | 2 ++ packages/default.nix | 1 + packages/spectroscopy.nix | 12 ++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/spectroscopy.nix diff --git a/flake.lock b/flake.lock index 4f59b40c..ce04b4ee 100644 --- a/flake.lock +++ b/flake.lock @@ -1470,6 +1470,7 @@ "slate": "slate", "sockpp": "sockpp", "sops-nix": "sops-nix", + "spectroscopy": "spectroscopy", "sqlite-orm": "sqlite-orm", "tgbot-cpp": "tgbot-cpp", "v-sim": "v-sim", @@ -1582,6 +1583,22 @@ "type": "github" } }, + "spectroscopy": { + "flake": false, + "locked": { + "lastModified": 1709899498, + "narHash": "sha256-xZ3AzNqrL73SPyUtVKGE+GDppou/GoatBrRCYVfiv0s=", + "owner": "skelton-group", + "repo": "Phonopy-Spectroscopy", + "rev": "316fbf4f45e2f8d134acf67374de905c705d7db7", + "type": "github" + }, + "original": { + "owner": "skelton-group", + "repo": "Phonopy-Spectroscopy", + "type": "github" + } + }, "sqlite-orm": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index af58c5ee..f3d82030 100644 --- a/flake.nix +++ b/flake.nix @@ -71,9 +71,10 @@ hextra = { url = "github:imfing/hextra"; flake = false; }; nu-scripts = { url = "github:nushell/nu_scripts"; flake = false; }; py4vasp = { url = "github:vasp-dev/py4vasp"; flake = false; }; - pocketfft = { url = "github:/mreineck/pocketfft"; flake = false; }; + pocketfft = { url = "github:mreineck/pocketfft"; flake = false; }; blog = { url = "git+https://git.chn.moe/chn/blog.git"; flake = false; }; nixos-wallpaper = { url = "git+https://git.chn.moe/chn/nixos-wallpaper.git"; flake = false; }; + spectroscopy = { url = "github:skelton-group/Phonopy-Spectroscopy"; flake = false; }; }; outputs = inputs: let localLib = import ./flake/lib.nix inputs.nixpkgs.lib; in diff --git a/modules/packages/desktop/default.nix b/modules/packages/desktop/default.nix index bfa6ca4e..d2a8ff65 100644 --- a/modules/packages/desktop/default.nix +++ b/modules/packages/desktop/default.nix @@ -87,6 +87,8 @@ inputs: [ phonopy scipy scikit-learn jupyterlab autograd # localPackages.pix2tex # TODO: broken on python 3.12 tensorflow keras + # for phonopy + inputs.pkgs.localPackages.spectroscopy ])]; }; user.sharedModules = diff --git a/packages/default.nix b/packages/default.nix index 29ddc4f1..a6480c08 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -102,6 +102,7 @@ inputs: rec git-lfs-transfer = inputs.pkgs.callPackage ./git-lfs-transfer.nix { src = inputs.topInputs.git-lfs-transfer; }; py4vasp = inputs.pkgs.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; }; pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; }; + spectroscopy = inputs.pkgs.callPackage ./spectroscopy.nix { src = inputs.topInputs.spectroscopy; }; fromYaml = content: builtins.fromJSON (builtins.readFile (inputs.pkgs.runCommand "toJSON" {} diff --git a/packages/spectroscopy.nix b/packages/spectroscopy.nix new file mode 100644 index 00000000..0ff43cb9 --- /dev/null +++ b/packages/spectroscopy.nix @@ -0,0 +1,12 @@ +{ src, python3, stdenv }: stdenv.mkDerivation +{ + name = "spectroscopy"; + phases = [ "installPhase" "fixupPhase" ]; + buildInputs = [ python3 ]; + installPhase = + '' + mkdir -p $out/${python3.sitePackages} + cp -r ${src}/lib/spectroscopy $out/${python3.sitePackages} + cp -r ${src}/scripts $out/bin + ''; +}