diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-02 12:05:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 12:05:47 +0000 |
| commit | 12423e2e92378862924e1f4ea3f51364852338b8 (patch) | |
| tree | ce08ccaf5d775f9f06846d541955169959b8e84c /pkgs/top-level | |
| parent | cd1f27794e50f00122b16e78653368f776e8772e (diff) | |
| parent | c02944e17d0d8ea91c9dc8878dc93697f7098838 (diff) | |
| download | nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.gz nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.bz2 nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.lz nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.xz nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.zst nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89f67e3abb..9cae4a790a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3673,6 +3673,8 @@ with pkgs; precice = callPackage ../development/libraries/precice { }; + precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { }; + pueue = callPackage ../applications/misc/pueue { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -16567,6 +16569,8 @@ with pkgs; fcl = callPackage ../development/libraries/fcl { }; + febio = callPackage ../development/libraries/febio { }; + ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baa3553cac9..8be1c2205df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5733,6 +5733,8 @@ in { opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; + opensfm = callPackage ../development/python-modules/opensfm { }; + openshift = callPackage ../development/python-modules/openshift { }; opensimplex = callPackage ../development/python-modules/opensimplex { }; |