diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-24 06:01:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-24 06:01:14 +0000 |
commit | a451dcf5144929bf63638d75a3f1b584b1c4ad32 (patch) | |
tree | 30ebc4be9895e64a14b4d002fd503c903d94b15c /pkgs/top-level | |
parent | d1ec06a49e5b6958c751a7797eac9fe8f0d41982 (diff) | |
parent | 90f562fc12204b0e96b83a18426c405d8d2880c3 (diff) | |
download | nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.tar nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.tar.gz nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.tar.bz2 nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.tar.lz nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.tar.xz nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.tar.zst nixpkgs-a451dcf5144929bf63638d75a3f1b584b1c4ad32.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5046fee60c..0143b591e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20507,6 +20507,7 @@ with pkgs; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { }; + abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix { }; abseil-cpp = abseil-cpp_202301; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -27006,6 +27007,8 @@ with pkgs; influxdb = callPackage ../servers/nosql/influxdb { }; influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; + influxdb2-token-manipulator = callPackage ../servers/nosql/influxdb2/token-manipulator.nix { }; + influxdb2-provision = callPackage ../servers/nosql/influxdb2/provision.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. @@ -39155,6 +39158,8 @@ with pkgs; bwa = callPackage ../applications/science/biology/bwa { }; + bwa-mem2 = callPackage ../applications/science/biology/bwa-mem2 { }; + ### SCIENCE/MACHINE LEARNING nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { }; |