Skip to content

Commit f33f917

Browse files
committed
Make shell.nix and shell-osx.nis DRYer
Unite common mkDerivation expression from shell.nix and shell-osx.nix
1 parent 0257e6b commit f33f917

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

_nix/env.nix

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{ nixpkgs, extra ? []}:
2+
nixpkgs.stdenv.mkDerivation rec {
3+
name = "pfhub";
4+
env = nixpkgs.buildEnv { name=name; paths=buildInputs; };
5+
buildInputs = ( import ./build.nix { inherit nixpkgs; }) ++ extra;
6+
}

shell-osx.nix

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
let
22
nixpkgs = import ./_nix/nixpkgs_version.nix;
33
in
4-
nixpkgs.stdenv.mkDerivation rec {
5-
name = "pfhub";
6-
env = nixpkgs.buildEnv { name=name; paths=buildInputs; };
7-
buildInputs = [
8-
( import ./_nix/build.nix { inherit nixpkgs; })
9-
];
10-
}
4+
import ./_nix/env.nix { inherit nixpkgs; }

shell.nix

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
let
22
nixpkgs = import ./_nix/nixpkgs_version.nix;
3+
extra = [
4+
nixpkgs.python36Packages.jupyter
5+
nixpkgs.python36Packages.bokeh
6+
];
37
in
4-
nixpkgs.stdenv.mkDerivation rec {
5-
name = "pfhub";
6-
env = nixpkgs.buildEnv { name=name; paths=buildInputs; };
7-
buildInputs = [
8-
( import ./_nix/build.nix { inherit nixpkgs; })
9-
nixpkgs.python36Packages.jupyter
10-
nixpkgs.python36Packages.bokeh
11-
];
12-
}
8+
import ./_nix/env.nix { inherit nixpkgs; inherit extra; }

0 commit comments

Comments
 (0)