From ca7f39f987b639be75523bb6cf5ec56882327c3c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 20:51:41 +0700 Subject: [PATCH] pkgs/data, pkgs/games: [sS]tdenv.*lib -> lib --- pkgs/data/icons/bibata-cursors/default.nix | 4 ++-- pkgs/data/icons/bibata-cursors/extra.nix | 4 ++-- pkgs/data/icons/bibata-cursors/translucent.nix | 4 ++-- pkgs/data/machine-learning/mnist/default.nix | 4 ++-- pkgs/data/misc/fedora-backgrounds/generic.nix | 7 ++++--- pkgs/games/dwarf-fortress/lazy-pack.nix | 2 +- pkgs/games/dwarf-fortress/legends-browser/default.nix | 4 ++-- pkgs/games/dwarf-fortress/twbt/default.nix | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 66ed71f1f9ec..04fb6281f253 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Material Based Cursor"; homepage = "https://github.com/KaizIqbal/Bibata_Cursor"; license = licenses.gpl3; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index 7977566cb613..f59b12ec76a9 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Cursors Based on Bibata"; homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor"; license = licenses.gpl3; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index afdd92600fa9..d1e2814a8aa3 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { cp -pr Bibata_* $out/share/icons/ ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Translucent Varient of the Material Based Cursor"; homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index 44a70ac5d1ee..f5b450b4f2ad 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: let srcs = { train-images = fetchurl { @@ -30,7 +30,7 @@ in ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}" ''; phases = [ "installPhase" ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A large database of handwritten digits"; longDescription = '' The MNIST database (Modified National Institute of Standards and diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix index e191dd027e8f..3e2e0928c3bc 100644 --- a/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC +{ lib +, stdenvNoCC , coreutils }: @@ -10,7 +11,7 @@ stdenvNoCC.mkDerivation { inherit patches src version; - pname = "fedora${stdenvNoCC.lib.versions.major version}-backgrounds"; + pname = "fedora${lib.versions.major version}-backgrounds"; dontBuild = true; @@ -32,7 +33,7 @@ stdenvNoCC.mkDerivation { "DESTDIR=$(out)" ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { homepage = "https://github.com/fedoradesign/backgrounds"; description = "A set of default and supplemental wallpapers for Fedora"; license = licenses.cc-by-sa-40; diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 03aa5d54304f..41620dd66f1c 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -38,7 +38,7 @@ buildEnv { ++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableLegendsBrowser legends-browser; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "An opinionated wrapper for Dwarf Fortress"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index b11060025151..6da6d97ff244 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: +{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: let name = "legends-browser-${version}"; @@ -26,7 +26,7 @@ buildEnv { inherit name; paths = [ script ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A multi-platform, open source, java-based legends viewer for dwarf fortress"; maintainers = with maintainers; [ Baughn ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index a0990e04f93a..48826ca91609 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -80,7 +80,7 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface."; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit;