diff options
| -rwxr-xr-x | default.nix | 6 | ||||
| -rw-r--r-- | org/spine_build_scaffold.org | 18 | ||||
| -rwxr-xr-x | project.nix | 6 | ||||
| -rwxr-xr-x | spine.nix | 2 |
4 files changed, 11 insertions, 21 deletions
diff --git a/default.nix b/default.nix index ae125f7..0c100a2 100755 --- a/default.nix +++ b/default.nix @@ -1,7 +1,5 @@ #!/usr/bin/env -S nix-build -{ pkgs ? import <nixpkgs> {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import <nixpkgs> {} }: with import ./nix/mkDub.nix { inherit pkgs; }; mkDubDerivation rec { name = "spine-${version}"; @@ -15,7 +13,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; 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 <nixpkgs> {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import <nixpkgs> {} }: 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 <nixpkgs> {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import <nixpkgs> {} }: 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 <nixpkgs> {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import <nixpkgs> {} }: 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; diff --git a/project.nix b/project.nix index 700f412..4594999 100755 --- a/project.nix +++ b/project.nix @@ -1,7 +1,5 @@ #!/usr/bin/env -S nix-build -{ pkgs ? import <nixpkgs> {}, - stdenv ? pkgs.stdenv, -}: +{ pkgs ? import <nixpkgs> {} }: with import ./nix/mkDub.nix { inherit pkgs; }; mkDubDerivation rec { name = "spine-${version}"; @@ -32,7 +30,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; @@ -139,7 +139,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; |