about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-03-09 00:02:05 +0000
committerGitHub <noreply@github.com>2022-03-09 00:02:05 +0000
commit201cc2f89bb63336194bcfe2fa9ed6adf76895b7 (patch)
tree207c4f4acdff3b65b779d0b6953468b655b782ba /pkgs/top-level
parentec6dcf1c99c39560da0ae96a89fabb096d112c3a (diff)
parenta9f1d19b4287f006b81279077192a7359ac1e591 (diff)
downloadnixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.tar
nixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.tar.gz
nixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.tar.bz2
nixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.tar.lz
nixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.tar.xz
nixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.tar.zst
nixlib-201cc2f89bb63336194bcfe2fa9ed6adf76895b7.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0bb73422a4f..ceff1324c10a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1069,6 +1069,8 @@ with pkgs;
 
   gobgp = callPackage ../tools/networking/gobgp { };
 
+  goflow = callPackage ../tools/networking/goflow { };
+
   gofu = callPackage ../applications/misc/gofu { };
 
   godns = callPackage ../tools/networking/godns { };
@@ -1293,6 +1295,8 @@ with pkgs;
 
   aldo = callPackage ../applications/radio/aldo { };
 
+  alglib = callPackage ../development/libraries/alglib { };
+
   almanah = callPackage ../applications/misc/almanah { };
 
   alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
@@ -25464,6 +25468,8 @@ with pkgs;
 
   haruna = libsForQt5.callPackage ../applications/video/haruna { };
 
+  hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };
+
   helix = callPackage ../applications/editors/helix { };
 
   icesl = callPackage ../applications/misc/icesl { };