diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
commit | 6e9bb30566a617613e607a3641fe12d040de3afb (patch) | |
tree | 0241cf4a29146f6fec8e61b1b02a32a72a48f03f /pkgs/development/compilers | |
parent | c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67 (diff) | |
parent | f6482597318278cdc4d33b703effa4636d2875c6 (diff) | |
download | nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.tar nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.tar.gz nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.tar.bz2 nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.tar.lz nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.tar.xz nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.tar.zst nixpkgs-6e9bb30566a617613e607a3641fe12d040de3afb.zip |
Merge branch 'master' into staging-next
In particular, this fixes ISO evaluation.
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ocaml/4.11.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index db77d989c1d..2702a19d318 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+alpha1"; - sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg"; + patch_version = "0+alpha2"; + sha256 = "131ixp5kkgk9y42vrprhc2x0gpxhkapmdmb26pwkyl58vrbr8xqg"; } |