Skip to content

Commit cc2a545

Browse files
jonasnickreal-or-random
authored andcommitted
ci: Refactor Nix shell files
1 parent 2480e55 commit cc2a545

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

ci/mkshell.nix

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{ pkgs }:
2+
3+
with pkgs;
4+
5+
mkShell {
6+
buildInputs = [
7+
bash file pkgconfig autoconf automake libtool gmp valgrind clang gcc
8+
];
9+
shellHook = ''
10+
echo Running nix-shell with nixpkgs version: $(nix eval --raw nixpkgs.lib.version)
11+
'';
12+
}

ci/shell-i686.nix

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
with (import <nixpkgs> {}).pkgsi686Linux;
2-
mkShell {
3-
buildInputs = [
4-
bash file pkgconfig autoconf automake libtool gmp valgrind clang gcc
5-
];
6-
shellHook = ''
7-
echo Running nix-shell with nixpkgs version: $(nix eval --raw nixpkgs.lib.version)
8-
'';
9-
}
1+
let
2+
pkgs = (import <nixpkgs> {}).pkgsi686Linux;
3+
in
4+
import ./mkshell.nix { inherit pkgs; }

ci/shell.nix

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
with (import <nixpkgs> {});
2-
mkShell {
3-
buildInputs = [
4-
bash file pkgconfig autoconf automake libtool gmp valgrind clang gcc
5-
];
6-
shellHook = ''
7-
echo Running nix-shell with nixpkgs version: $(nix eval --raw nixpkgs.lib.version)
8-
'';
9-
}
1+
let
2+
pkgs = (import <nixpkgs> {});
3+
in
4+
import ./mkshell.nix { inherit pkgs; }

0 commit comments

Comments
 (0)