From 06eb3508790062c19126c73391e95eff78e0c96e Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Mon, 3 May 2021 14:21:16 +0200
Subject: [PATCH] no stdenv.lib

---
 ci.nix                                   | 2 +-
 pkgs/eplot/default.nix                   | 4 ++--
 pkgs/metapixel/default.nix               | 6 +++---
 pkgs/minecraft-server-fabric/default.nix | 4 ++--
 pkgs/wii-u-gc-adapter/default.nix        | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci.nix b/ci.nix
index 47d2236..0481182 100644
--- a/ci.nix
+++ b/ci.nix
@@ -9,7 +9,7 @@
 # then your CI will be able to build and cache only those packages for
 # which this is possible.
 
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixos-unstable> {} }:
 
 with builtins;
 
diff --git a/pkgs/eplot/default.nix b/pkgs/eplot/default.nix
index 3cfbe2a..aca02b7 100644
--- a/pkgs/eplot/default.nix
+++ b/pkgs/eplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gnuplot, ruby }:
+{ lib, stdenv, fetchFromGitHub, gnuplot, ruby }:
 
 stdenv.mkDerivation {
   name = "eplot-unstable-2018-09-03";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     sed -i -e "s|gnuplot -persist|${gnuplot}/bin/gnuplot -persist|" "$out/bin/eplot"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Create plots quickly with gnuplot";
     longDescription = ''
       eplot ("easy gnuplot") is a ruby script which allows to pipe data easily
diff --git a/pkgs/metapixel/default.nix b/pkgs/metapixel/default.nix
index 2b8db36..884d3db 100644
--- a/pkgs/metapixel/default.nix
+++ b/pkgs/metapixel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config}:
+{ lib, stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config}:
 
 stdenv.mkDerivation {
   pname = "metapixel";
@@ -24,10 +24,10 @@ stdenv.mkDerivation {
     cp metapixel-sizesort $out/bin/metapixel-sizesort
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/schani/metapixel";
     description = "Tool for generating photomosaics";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ dandellion ];
+    # maintainers = with maintainers; [ dandellion ];
   };
 }
diff --git a/pkgs/minecraft-server-fabric/default.nix b/pkgs/minecraft-server-fabric/default.nix
index d6deac3..04f4b3d 100644
--- a/pkgs/minecraft-server-fabric/default.nix
+++ b/pkgs/minecraft-server-fabric/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre_headless, minecraft-server }:
+{ lib, stdenv, fetchurl, jre_headless, minecraft-server }:
 
 stdenv.mkDerivation rec {
   pname = "minecraft-server-fabric";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   phases = "installPhase";
   
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "minecraft with the fabric modloader";
     license = licenses.unfree;
     platforms = platforms.all;
diff --git a/pkgs/wii-u-gc-adapter/default.nix b/pkgs/wii-u-gc-adapter/default.nix
index c3fe377..1cae38b 100644
--- a/pkgs/wii-u-gc-adapter/default.nix
+++ b/pkgs/wii-u-gc-adapter/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkg-config, libusb1, libudev}:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, libudev}:
 
 stdenv.mkDerivation {
   pname = "wii-u-gc-adapter";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 libudev ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     broken = true;
     homepage = "https://github.com/ToadKing/wii-u-gc-adapter";
     description = "Tool for using the Wii U GameCube Adapter on Linux";