From 0de4f2c1f970d911cf413bab89ec91896b12c30b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 13 Nov 2020 22:58:26 -0500 Subject: ldc in need of newer dub --- nixDevEnv/shells/packages-ldc.nix | 18 ++++++++++++++++++ nixDevEnv/shells/shell-dmd-verNix.nix | 11 ++--------- nixDevEnv/shells/shell-dmd-verUser.nix | 7 +------ nixDevEnv/shells/shell-ldc-verNix.nix | 22 ++++------------------ nixDevEnv/shells/shell-ldc-verUser.nix | 22 ++++++---------------- 5 files changed, 31 insertions(+), 49 deletions(-) create mode 100644 nixDevEnv/shells/packages-ldc.nix (limited to 'nixDevEnv/shells') diff --git a/nixDevEnv/shells/packages-ldc.nix b/nixDevEnv/shells/packages-ldc.nix new file mode 100644 index 0000000..9874b74 --- /dev/null +++ b/nixDevEnv/shells/packages-ldc.nix @@ -0,0 +1,18 @@ +{ pkgs ? import {} }: +let + dub2nix-src = fetchTarball { + url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; + }; + dub2nix = (import dub2nix-src) { inherit pkgs; }; +in +with pkgs; [ + nix + dub + ninja + ldc + rdmd + sqlite + dub2nix + nix-prefetch-git + validatePkgConfig +] diff --git a/nixDevEnv/shells/shell-dmd-verNix.nix b/nixDevEnv/shells/shell-dmd-verNix.nix index a673c35..7f16efe 100644 --- a/nixDevEnv/shells/shell-dmd-verNix.nix +++ b/nixDevEnv/shells/shell-dmd-verNix.nix @@ -1,12 +1,5 @@ -{ pkgs ? import - { overlays = [ ]; } -}: -let - dub2nix-src = fetchTarball { - url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; - }; - dub2nix = (import dub2nix-src) { inherit pkgs; }; -in pkgs.mkShell { +{ pkgs ? import {} }: +pkgs.mkShell { buildInputs = with pkgs; [ nix dub diff --git a/nixDevEnv/shells/shell-dmd-verUser.nix b/nixDevEnv/shells/shell-dmd-verUser.nix index a673c35..334aece 100644 --- a/nixDevEnv/shells/shell-dmd-verUser.nix +++ b/nixDevEnv/shells/shell-dmd-verUser.nix @@ -1,12 +1,7 @@ { pkgs ? import { overlays = [ ]; } }: -let - dub2nix-src = fetchTarball { - url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; - }; - dub2nix = (import dub2nix-src) { inherit pkgs; }; -in pkgs.mkShell { +pkgs.mkShell { buildInputs = with pkgs; [ nix dub diff --git a/nixDevEnv/shells/shell-ldc-verNix.nix b/nixDevEnv/shells/shell-ldc-verNix.nix index 094bfa7..0a6aa9a 100644 --- a/nixDevEnv/shells/shell-ldc-verNix.nix +++ b/nixDevEnv/shells/shell-ldc-verNix.nix @@ -1,19 +1,5 @@ -{ pkgs ? import - { overlays = [ ]; } -}: -let - dub2nix-src = fetchTarball { - url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; - }; - dub2nix = (import dub2nix-src) { inherit pkgs; }; -in pkgs.mkShell { - buildInputs = with pkgs; [ - nix - dub - ldc - rdmd - sqlite - dub2nix - nix-prefetch-git - ]; +{ pkgs ? import {} }: +pkgs.mkShell { + buildInputs = with pkgs; + [ (import ./packages-ldc.nix { inherit pkgs; }) ]; } diff --git a/nixDevEnv/shells/shell-ldc-verUser.nix b/nixDevEnv/shells/shell-ldc-verUser.nix index 9d2c3e1..1c9c092 100644 --- a/nixDevEnv/shells/shell-ldc-verUser.nix +++ b/nixDevEnv/shells/shell-ldc-verUser.nix @@ -1,17 +1,7 @@ -{ pkgs ? import {}, }: -let - dub2nix-src = fetchTarball { - url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; - }; - dub2nix = (import dub2nix-src) { inherit pkgs; }; -in pkgs.mkShell { - buildInputs = with pkgs; [ - nix - dub - ldc - rdmd - sqlite - dub2nix - nix-prefetch-git - ]; +{ pkgs ? import { + overlays = [ (import ../overlays/ldcVersion.nix) ]; +} }: +pkgs.mkShell { + buildInputs = with pkgs; + [ (import ./packages-ldc.nix { inherit pkgs; }) ]; } -- cgit v1.2.3