diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 06:02:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 06:02:58 +0000 |
| commit | 6ab169b9caa28c451badebd20235fade4f50ef1e (patch) | |
| tree | 7c44a8b59e222be78f702f62891519e8bf2281d5 /pkgs/development/tools/ocaml | |
| parent | 08a8809bfe1688df8419f41fd31c2f794c4debdf (diff) | |
| parent | f2eada4ab85be29a3a32282704b436e0fd26334a (diff) | |
| download | nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.tar nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.tar.gz nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.tar.bz2 nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.tar.lz nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.tar.xz nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.tar.zst nixpkgs-6ab169b9caa28c451badebd20235fade4f50ef1e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/obuild/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlbuild/default.nix | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index e31334000da..a380dbff81f 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchzip, ocaml }: -let version = "0.1.10"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "obuild"; - inherit version; + version = "0.1.10"; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index c74794b35c9..926838ede54 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: -let - version = "0.14.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocamlbuild-${version}"; - inherit version; + version = "0.14.0"; src = fetchFromGitHub { owner = "ocaml"; |