summary refs log tree commit diff
path: root/pkgs/data/misc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-18 00:05:56 +0000
committerGitHub <noreply@github.com>2021-07-18 00:05:56 +0000
commiteb0f97ec8f3619757dc73ab87502280a6aea71fd (patch)
treebc5ff7caae6e4838e656e8e4d3f857849990bb2d /pkgs/data/misc
parent627eee1f66f115ac1be9ac1afe2963d39d02b840 (diff)
parent688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff)
downloadnixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar
nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.gz
nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.bz2
nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.lz
nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.xz
nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.zst
nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r--pkgs/data/misc/scowl/default.nix1
-rw-r--r--pkgs/data/misc/xorg-rgb/default.nix1
2 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index a4d91eeb037..15c2699d8bb 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    inherit version;
     description = "Spell checker oriented word lists";
     license = lib.licenses.mit;
     maintainers = [lib.maintainers.raskin];
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
index 24689d571da..056c56b4118 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [pkg-config];
   buildInputs = [xorgproto];
   meta = {
-    inherit version;
     description = "X11 colorname to RGB mapping database";
     license = lib.licenses.mit;
     maintainers = [lib.maintainers.raskin];