From d765d89cabc6cab03b1e2b882dd99b5cbb67d9ce Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 4 Feb 2021 11:35:55 -0500 Subject: nix, use pkgs.lib instead of stdenv.lib - see https://github.com/NixOS/nixpkgs/issues/108938 --- org/spine_build_scaffold.org | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'org/spine_build_scaffold.org') diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org index ea6634e..3b56420 100644 --- a/org/spine_build_scaffold.org +++ b/org/spine_build_scaffold.org @@ -1980,9 +1980,7 @@ pkgs.mkShell { #+BEGIN_SRC nix :NO-tangle ../shell.nix :tangle-mode (identity #o755) :shebang "#!/usr/bin/env -S nix-shell" #!/usr/bin/env -S nix-shell -{ pkgs ? import {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import {} }: with import ./nix/mkDub.nix { inherit pkgs; }; mkDubDerivation rec { name = "spine-${version}"; @@ -1992,7 +1990,7 @@ mkDubDerivation rec { import ./nix/pkglst/shell-pkgs.nix { inherit pkgs; } )]; - meta = with stdenv.lib; { + meta = with pkgs.lib; { homepage = http://sisudoc.org; description = "a sisu like document parser"; license = licenses.agpl3Plus; @@ -2041,7 +2039,7 @@ mkDubDerivation rec { install -m755 -D spine $out/bin/spine echo "built $out/bin/spine" ''; - meta = with stdenv.lib; { + meta = with pkgs.lib; { homepage = http://sisudoc.org; description = "a sisu like document parser"; license = licenses.agpl3Plus; @@ -2071,9 +2069,7 @@ mkDubDerivation rec { nix build -f spine.nix #+BEGIN_SRC nix :tangle ../default.nix :tangle-mode (identity #o755) :shebang "#!/usr/bin/env -S nix-build" -{ pkgs ? import {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import {} }: with import ./nix/mkDub.nix { inherit pkgs; }; mkDubDerivation rec { name = "spine-${version}"; @@ -2094,9 +2090,7 @@ mkDubDerivation rec { ** project.nix :project: #+BEGIN_SRC nix :tangle ../project.nix :tangle-mode (identity #o755) :shebang "#!/usr/bin/env -S nix-build" -{ pkgs ? import {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import {} }: with import ./nix/mkDub.nix { inherit pkgs; }; mkDubDerivation rec { name = "spine-${version}"; @@ -2165,7 +2159,7 @@ installPhase = '' #+NAME: nix_project_meta #+BEGIN_SRC nix -meta = with stdenv.lib; { +meta = with pkgs.lib; { homepage = http://sisudoc.org; description = "a sisu like document parser"; license = licenses.agpl3Plus; -- cgit v1.2.3