Merge branch 'staging-next' into staging

Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
parent c34b032ccb e4f96ad7d9
commit 8f50f1ce10
62 changed files with 454 additions and 163 deletions
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
+{ stdenv, lib, nodejs, nodePackages, remarshal
 , ttfautohint-nox
  # Custom font set options.
  # See https://typeof.net/Iosevka/customizer
--- a/pkgs/data/icons/iso-flags/default.nix
+++ b/pkgs/data/icons/iso-flags/default.nix
@@ -1,9 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , perl
-, perlPackages
 , inkscape
-, pngcrush
 , librsvg
 , targets ? [ "all" ]
 }: