diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 00:01:24 +0000 |
| commit | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (patch) | |
| tree | e6488db2914676e85250ee12633c8ddf45b7f67b /pkgs/data | |
| parent | c2d4ce2808616d558b6cef8a6d270c4930b06c18 (diff) | |
| parent | 688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff) | |
| download | nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.gz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.bz2 nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.lz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.xz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.zst nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/data/fonts/unscii/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/data/machine-learning/mnist/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/misc/scowl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/data/misc/xorg-rgb/default.nix | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 530cfca7424..70e43efdb72 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -154,7 +154,6 @@ in ''; meta = with lib; { - inherit version; description = "Color and Black-and-White emoji fonts"; homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 6fdeadf3776..5b4d2cb740f 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "extra" ]; meta = { - inherit version; description = "Bitmapped character-art-friendly Unicode fonts"; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index f5b450b4f2a..b4c4d43e99a 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -29,7 +29,7 @@ in ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}" ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}" ''; - phases = [ "installPhase" ]; + dontUnpack = true; meta = with lib; { description = "A large database of handwritten digits"; longDescription = '' 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]; |