remove references to stdenv and replace with lib

This commit is contained in:
Tim Schubert 2021-06-02 20:20:32 +02:00
parent ba1078adfc
commit 0dd9ecdafe
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
6 changed files with 16 additions and 13 deletions

View file

@ -17,7 +17,6 @@ with pkgs; [
direnv
element-desktop
evince
gnome3.evolution
ffmpeg
file
firefox

View file

@ -1,9 +1,10 @@
{ stdenv
{ lib
, git
, openssh
, bash
}:
stdenv.mkDerivation rec {
with lib;
mkDerivation rec {
name = "dadada-deploy";
version = "0.1";
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
install $script $out/bin/
done
'';
meta = with stdenv.lib; {
meta = {
description = "deploy scripts";
license = licenses.publicDomain;
platforms = platforms.linux;

View file

@ -1,5 +1,6 @@
{ stdenv, pandoc, fetchFromGitHub }:
stdenv.mkDerivation rec {
{ lib, pandoc, fetchFromGitHub }:
with lib;
mkDerivation rec {
src = fetchFromGitHub {
owner = "dadada";
repo = "dadada.li";

View file

@ -1,6 +1,7 @@
{ stdenv }:
{ lib }:
stdenv.mkDerivation rec {
with lib;
mkDerivation rec {
name = "dadadaKeys";
version = "1";
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
cp * $out
'';
meta = with stdenv.lib; {
meta = {
description = "Public keys for my infrastructure";
license = licenses.publicDomain;
platforms = platforms.all;

View file

@ -1,4 +1,4 @@
{ stdenv }:
{ lib }:
(import
(builtins.fetchGit {
@ -6,4 +6,4 @@
ref = "main";
rev = "3393073cd3511d43f622972b891a20ba069fa052";
})
{ inherit stdenv; })
{ inherit lib; })

View file

@ -1,5 +1,6 @@
{ stdenv, fetchzip, unzip }:
stdenv.mkDerivation rec {
{ lib, fetchzip, unzip }:
with lib;
mkDerivation rec {
src = ./tubslatex_1.3.2.tds.zip;
sourceRoot = ".";
nativeBuildInputs = [ unzip ];