diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
| commit | 024407bf9adeadc115eeeb3fdf8dba166ea17d7c (patch) | |
| tree | 0f28c316cea0b7aa95bb15a0df90077415721d71 /pkgs/top-level | |
| parent | bce12effa7f4279d057acf437e7fdcafefd16557 (diff) | |
| parent | 390ed4a626211fb7d19fb8da7661c8e3b42c4795 (diff) | |
| download | nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.gz nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.bz2 nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.lz nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.xz nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.zst nixlib-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d098130ef296..90e0c5ac601a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -173,7 +173,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dump1090 = callPackage ../applications/misc/dump1090 { }; + dump1090 = callPackage ../applications/radio/dump1090 { }; ebook2cw = callPackage ../applications/radio/ebook2cw { }; @@ -14625,7 +14625,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1adf66d5eb78..510fd62f2405 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1072,6 +1072,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }); + ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { }); + ocamlPackages_latest = ocamlPackages_4_07; ocamlPackages = ocamlPackages_4_06; |