diff options
| -rw-r--r-- | Biz/Bild.nix (renamed from Biz/Bild/Rules.nix) | 12 | ||||
| -rw-r--r-- | Biz/Cloud.nix | 2 | ||||
| -rw-r--r-- | Biz/Dev.nix | 2 | ||||
| -rw-r--r-- | Biz/Pie.nix | 2 | ||||
| -rw-r--r-- | Biz/Que/Prod.nix | 2 | ||||
| -rw-r--r-- | Hero/Prod.nix | 2 | ||||
| -rw-r--r-- | shell.nix | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/Biz/Bild/Rules.nix b/Biz/Bild.nix index afea746..44c500a 100644 --- a/Biz/Bild/Rules.nix +++ b/Biz/Bild.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? import ./Nixpkgs.nix }: +{ nixpkgs ? import ./Bild/Nixpkgs.nix }: with nixpkgs; @@ -23,7 +23,7 @@ let subset = a: b: builtins.all (x: builtins.elem x b) a; - haskellDeps = hpkgs: import ./Deps/Haskell.nix hpkgs; + haskellDeps = hpkgs: import ./Bild/Deps/Haskell.nix hpkgs; mkGhcPackageSet = pkgs.haskell.packages.${ghcCompiler}.ghcWithHoogle; mkGhcjsPackageSet = pkgs.haskell.packages.${ghcjsCompiler}.ghcWithPackages; @@ -70,7 +70,7 @@ in rec { ghc = mkGhcPackageSet (hp: selectAttrs data.deps hp); in stdenv.mkDerivation { name = data.module; - src = ../../.; + src = ../.; nativeBuildInputs = [ ghc ] ++ selectAttrs data.sysdeps nixpkgs; strictDeps = true; buildPhase = '' @@ -93,7 +93,7 @@ in rec { ghcjs = mkGhcjsPackageSet (hp: selectAttrs data.deps hp); in stdenv.mkDerivation { name = data.module; - src = ../../.; + src = ../.; nativeBuildInputs = [ ghcjs ]; strictDeps = true; buildPhase = '' @@ -151,7 +151,7 @@ in rec { nixpkgs.wemux nixpkgs.gmnisrv nixpkgs.gmni - (pkgs.writeScriptBin "ftags" (builtins.readFile ../Ide/ftags.sh)) + (pkgs.writeScriptBin "ftags" (builtins.readFile ./Ide/ftags.sh)) ] ++ lib.optional nixpkgs.stdenv.isLinux [ # scheme deps (i think these are broken on macOS) nixpkgs.guile @@ -160,7 +160,7 @@ in rec { nixpkgs.ccze ]; - shellHook = ". ${./ShellHook.sh}"; + shellHook = ". ${./Bild/ShellHook.sh}"; }; os = cfg: (nixos (args: cfg)).toplevel; diff --git a/Biz/Cloud.nix b/Biz/Cloud.nix index 44fb5a8..6eece13 100644 --- a/Biz/Cloud.nix +++ b/Biz/Cloud.nix @@ -1,4 +1,4 @@ -{ bild ? import ./Bild/Rules.nix {} }: +{ bild ? import ./Bild.nix {} }: # Cloud infrastructure, always online. Mostly for messaging-related stuff. diff --git a/Biz/Dev.nix b/Biz/Dev.nix index ab78b44..cee87a3 100644 --- a/Biz/Dev.nix +++ b/Biz/Dev.nix @@ -1,4 +1,4 @@ -{ bild ? import ./Bild/Rules.nix {} }: +{ bild ? import ./Bild.nix {} }: # Dev machine for work and building stuff. diff --git a/Biz/Pie.nix b/Biz/Pie.nix index de7cf20..b519995 100644 --- a/Biz/Pie.nix +++ b/Biz/Pie.nix @@ -1,2 +1,2 @@ -{ bild ? import ./Bild/Rules.nix {} }: +{ bild ? import ./Bild.nix {} }: bild.ghc ./Pie.hs diff --git a/Biz/Que/Prod.nix b/Biz/Que/Prod.nix index 70272ae..79097d6 100644 --- a/Biz/Que/Prod.nix +++ b/Biz/Que/Prod.nix @@ -1,4 +1,4 @@ -{ bild ? import ../Bild/Rules.nix {} +{ bild ? import ../Bild.nix {} , nixpkgs ? import ../Bild/Nixpkgs.nix }: diff --git a/Hero/Prod.nix b/Hero/Prod.nix index 5b9dde4..3f2ced7 100644 --- a/Hero/Prod.nix +++ b/Hero/Prod.nix @@ -1,4 +1,4 @@ -{ bild ? import ../Biz/Bild/Rules.nix {} +{ bild ? import ../Biz/Bild.nix {} , nixpkgs ? import ../Biz/Bild/Nixpkgs.nix }: @@ -1,3 +1,3 @@ -(import ./Biz/Bild/Rules.nix { +(import ./Biz/Bild.nix { nixpkgs = import ./Biz/Bild/Nixpkgs.nix; }).env |