Merge branch 'staging-next-21.05' into release-21.05

https://hydra.nixos.org/eval/1694658
2021-08-10 14:02:40 +02:00
parent 786e450930 bf36f6b818
commit 923725473a
4 changed files with 63 additions and 34 deletions
@@ -17448,7 +17448,10 @@ in
    suffix = "min";
  };

-  poppler_utils = poppler.override { suffix = "utils"; utils = true; };
+  poppler_utils = poppler.override {
+    suffix = "utils";
+    utils = true;
+  };

  popt = callPackage ../development/libraries/popt { };