File tree 3 files changed +20
-9
lines changed
3 files changed +20
-9
lines changed Original file line number Diff line number Diff line change 1
- Unreleased
2
- -----------
1
+ 0.9.0 2022-08-14
2
+ ---------------
3
3
4
4
- h2: Fix tests on 32-bit platforms
5
5
([ #152 ] ( https://github.com/anmonteiro/ocaml-h2/pull/152 ) )
Original file line number Diff line number Diff line change 11
11
let
12
12
pkgs = nixpkgs . legacyPackages . "${ system } " . extend ( self : super : {
13
13
h2spec = super . callPackage ./nix/h2spec.nix { } ;
14
+ ocamlPackages = super . ocaml-ng . ocamlPackages_5_00 ;
14
15
} ) ;
15
16
in
16
17
rec {
17
- packages = ( pkgs . callPackage ./nix { nix-filter = nix-filter . lib ; } ) ;
18
+ packages = pkgs . callPackage ./nix { nix-filter = nix-filter . lib ; } ;
18
19
defaultPackage = packages . h2 ;
19
- devShell = pkgs . callPackage ./shell.nix { } ;
20
+ devShells = rec {
21
+ default = pkgs . callPackage ./shell.nix { inherit packages ; } ;
22
+ release = default . override { release-mode = true ; } ;
23
+ } ;
20
24
} ) ;
21
25
}
Original file line number Diff line number Diff line change 1
- { pkgs , stdenv , lib , release-mode ? false } :
1
+ { packages
2
+ , mkShell
3
+ , stdenv
4
+ , lib
5
+ , cacert
6
+ , curl
7
+ , ocamlPackages
8
+ , git
9
+ , h2spec
10
+ , release-mode ? false
11
+ } :
2
12
3
13
let
4
- h2Pkgs = pkgs . recurseIntoAttrs ( import ./nix { inherit pkgs ; doCheck = false ; } ) ;
5
- h2Drvs = lib . filterAttrs ( _ : value : lib . isDerivation value ) h2Pkgs ;
14
+ h2Drvs = lib . filterAttrs ( _ : value : lib . isDerivation value ) packages ;
6
15
7
16
in
8
17
9
- with pkgs ;
10
18
11
19
( mkShell {
12
20
inputsFrom = lib . attrValues h2Drvs ;
@@ -16,7 +24,6 @@ with pkgs;
16
24
curl
17
25
ocamlPackages . dune-release
18
26
git
19
- opam
20
27
] else [ ] )
21
28
++ ( with ocamlPackages ; [ merlin ocamlformat utop h2spec ] ) ;
22
29
} ) . overrideAttrs ( o : {
You can’t perform that action at this time.
0 commit comments