diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/org/config_nix.org b/org/config_nix.org index 9582909..60d92ee 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -1,6 +1,6 @@ -*- mode: org -*- #+TITLE: configuration nix -#+DESCRIPTION: makefile for spine +#+DESCRIPTION: spine-search nix configuration #+FILETAGS: :spine:build:tools: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] @@ -18,10 +18,6 @@ * nix :nix: ** flake.nix :flake: -# "github:nixos/nixpkgs"; "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11"; -# [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; -# [ dub dmd ]; [ dub ldc ]; [ dub gdc ]; - #+HEADER: :tangle ../flake.nix #+HEADER: :noweb yes #+BEGIN_SRC nix @@ -29,7 +25,7 @@ description = "a sisu like document parser search form"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.d-overlay = { + inputs.spine-d-overlay = { url = "<<sisudoc_dlang_nix_overlay_src>>"; inputs.nixpkgs.follows = "nixpkgs"; flake = true; @@ -38,7 +34,7 @@ self, nixpkgs, flake-utils, - d-overlay, + spine-d-overlay, ... }@inputs: let pname = "spine_search"; @@ -120,8 +116,8 @@ src = self; inherit shell; inherit devEnv; - buildInputs = [sqlite]; - nativeBuildInputs = [dub dmd gnumake]; + buildInputs = with pkgs-nix; [sqlite]; + nativeBuildInputs = with pkgs-nix; [dub dmd gnumake]; buildPhase = '' runHook preBuild buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all" @@ -143,8 +139,8 @@ src = self; inherit shell; inherit devEnv; - buildInputs = [sqlite]; - nativeBuildInputs = [dub ldc gnumake]; + buildInputs = with pkgs-nix; [sqlite]; + nativeBuildInputs = with pkgs-nix; [dub ldc gnumake]; buildPhase = '' runHook preBuild buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all" @@ -235,7 +231,7 @@ ''; in with pkgs-nix; { - dsh-d-overlay = d-overlay.devShells.${system}.default; + dsh-d-overlay = spine-d-overlay.devShells.${system}.default; dsh-overlay = mkShell { name = "spine base dev shell"; inherit shell; @@ -330,13 +326,13 @@ with pkgs-nix; # ❯❯❯ nix_related #nix direnv - nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git + nixVersions.latest #nixVersions.latest #nixVersions.git nix-prefetch-git validatePkgConfig nix-output-monitor nix-tree jq #gx - #alejandra + #nixfmt-rfc-style git # ❯❯❯ dev gnumake @@ -400,13 +396,13 @@ with pkgs; # ❯❯❯ nix_related #nix # if not on NixOS, this is needed direnv - nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git + nixVersions.latest #nixVersions.latest #nixVersions.git nix-prefetch-git validatePkgConfig nix-output-monitor nix-tree jq #gx - #alejandra + #nixfmt-rfc-style git # ❯❯❯ dev gnumake @@ -542,7 +538,7 @@ with ( pkgs.sqlite ( with pkgs-nix; [ - nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git + nixVersions.latest #nixVersions.latest #nixVersions.git ## package manager dub ## compiler @@ -613,7 +609,7 @@ github:NixOS/nixpkgs/nixpkgs-unstable #+NAME: nixpkgs_url #+HEADER: :noweb yes -#+BEGIN_SRC sh +#+BEGIN_SRC org <<nixpkgs_url_github>> #+END_SRC |