Merge branch 'staging-next' into staging

2021-04-25 08:22:13 +02:00
parent 3349d99e26 a956f62ea4
commit c1f851b2ee
144 changed files with 1324 additions and 720 deletions
@@ -133,6 +133,7 @@
  ./programs/file-roller.nix
  ./programs/firejail.nix
  ./programs/fish.nix
+  ./programs/flexoptix-app.nix
  ./programs/freetds.nix
  ./programs/fuse.nix
  ./programs/geary.nix