File tree Expand file tree Collapse file tree 3 files changed +20
-9
lines changed
Expand file tree Collapse file tree 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+ ---------------
33
44- h2: Fix tests on 32-bit platforms
55 ([ #152 ] ( https://github.com/anmonteiro/ocaml-h2/pull/152 ) )
Original file line number Diff line number Diff line change 1111 let
1212 pkgs = nixpkgs . legacyPackages . "${ system } " . extend ( self : super : {
1313 h2spec = super . callPackage ./nix/h2spec.nix { } ;
14+ ocamlPackages = super . ocaml-ng . ocamlPackages_5_00 ;
1415 } ) ;
1516 in
1617 rec {
17- packages = ( pkgs . callPackage ./nix { nix-filter = nix-filter . lib ; } ) ;
18+ packages = pkgs . callPackage ./nix { nix-filter = nix-filter . lib ; } ;
1819 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+ } ;
2024 } ) ;
2125}
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+ } :
212
313let
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 ;
615
716in
817
9- with pkgs ;
1018
1119( mkShell {
1220 inputsFrom = lib . attrValues h2Drvs ;
@@ -16,7 +24,6 @@ with pkgs;
1624 curl
1725 ocamlPackages . dune-release
1826 git
19- opam
2027 ] else [ ] )
2128 ++ ( with ocamlPackages ; [ merlin ocamlformat utop h2spec ] ) ;
2229} ) . overrideAttrs ( o : {
You can’t perform that action at this time.
0 commit comments