diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-05 12:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 12:01:22 +0000 |
| commit | 4d8ab2a7038169050381133439b450bec1858577 (patch) | |
| tree | d1e5abf73b0a9601cfd73a8789a16cef90a69909 /pkgs/top-level | |
| parent | 7c3da72c879046f0e0c14e04607b37c1274d5046 (diff) | |
| parent | 2aa67111a851c1ff1f9cfb070ab1d4568e7764a5 (diff) | |
| download | nixlib-4d8ab2a7038169050381133439b450bec1858577.tar nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.gz nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.bz2 nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.lz nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.xz nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.zst nixlib-4d8ab2a7038169050381133439b450bec1858577.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0124b0089c3..f674250aec37 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -624,6 +624,7 @@ mapAliases ({ nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 + nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained" ; # Added 2023-11-20 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = nixVersions.unstable; # Added 2022-01-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5336abd3678..4f58c012fe09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14250,8 +14250,6 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - typst = callPackage ../tools/typesetting/typst { }; - typstfmt = callPackage ../tools/typesetting/typstfmt { }; typst-live = callPackage ../tools/typesetting/typst-live { }; @@ -34114,8 +34112,7 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openmm = callPackage ../development/libraries/science/chemistry/openmm { - stdenv = gcc11Stdenv; - gfortran = gfortran11; + swig = swig4; }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -40768,8 +40765,6 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script { }; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; - nix-top = callPackage ../tools/package-management/nix-top { }; nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebf97327f53f..e965fe2441f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4951,6 +4951,8 @@ self: super: with self; { habanero = callPackage ../development/python-modules/habanero { }; + habluetooth = callPackage ../development/python-modules/habluetooth { }; + habitipy = callPackage ../development/python-modules/habitipy { }; hachoir = callPackage ../development/python-modules/hachoir { }; |