remove references to stdenv and replace with lib
This commit is contained in:
parent
ba1078adfc
commit
0dd9ecdafe
6 changed files with 16 additions and 13 deletions
|
@ -17,7 +17,6 @@ with pkgs; [
|
||||||
direnv
|
direnv
|
||||||
element-desktop
|
element-desktop
|
||||||
evince
|
evince
|
||||||
gnome3.evolution
|
|
||||||
ffmpeg
|
ffmpeg
|
||||||
file
|
file
|
||||||
firefox
|
firefox
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
{ stdenv
|
{ lib
|
||||||
, git
|
, git
|
||||||
, openssh
|
, openssh
|
||||||
, bash
|
, bash
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
with lib;
|
||||||
|
mkDerivation rec {
|
||||||
name = "dadada-deploy";
|
name = "dadada-deploy";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
|
|
||||||
|
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||||
install $script $out/bin/
|
install $script $out/bin/
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
meta = with stdenv.lib; {
|
meta = {
|
||||||
description = "deploy scripts";
|
description = "deploy scripts";
|
||||||
license = licenses.publicDomain;
|
license = licenses.publicDomain;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv, pandoc, fetchFromGitHub }:
|
{ lib, pandoc, fetchFromGitHub }:
|
||||||
stdenv.mkDerivation rec {
|
with lib;
|
||||||
|
mkDerivation rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dadada";
|
owner = "dadada";
|
||||||
repo = "dadada.li";
|
repo = "dadada.li";
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ stdenv }:
|
{ lib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
with lib;
|
||||||
|
mkDerivation rec {
|
||||||
name = "dadadaKeys";
|
name = "dadadaKeys";
|
||||||
version = "1";
|
version = "1";
|
||||||
|
|
||||||
|
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
cp * $out
|
cp * $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = {
|
||||||
description = "Public keys for my infrastructure";
|
description = "Public keys for my infrastructure";
|
||||||
license = licenses.publicDomain;
|
license = licenses.publicDomain;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv }:
|
{ lib }:
|
||||||
|
|
||||||
(import
|
(import
|
||||||
(builtins.fetchGit {
|
(builtins.fetchGit {
|
||||||
|
@ -6,4 +6,4 @@
|
||||||
ref = "main";
|
ref = "main";
|
||||||
rev = "3393073cd3511d43f622972b891a20ba069fa052";
|
rev = "3393073cd3511d43f622972b891a20ba069fa052";
|
||||||
})
|
})
|
||||||
{ inherit stdenv; })
|
{ inherit lib; })
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv, fetchzip, unzip }:
|
{ lib, fetchzip, unzip }:
|
||||||
stdenv.mkDerivation rec {
|
with lib;
|
||||||
|
mkDerivation rec {
|
||||||
src = ./tubslatex_1.3.2.tds.zip;
|
src = ./tubslatex_1.3.2.tds.zip;
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue