Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53feebb37937
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60f50b69a650
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 30, 2019

  1. monotoneViz: refactor out of ocamlPackages

    @vbgl
    vbgl committed Oct 30, 2019
    Copy the full SHA
    7e51c79 View commit details

  2. haxe: refactor out of ocamlPackages

    @vbgl
    vbgl committed Oct 30, 2019
    Copy the full SHA
    60f50b6 View commit details
4 changes: 3 additions & 1 deletion pkgs/applications/version-management/monotone-viz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper
{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
@@ -7,6 +7,8 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
yacc libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas glib; in
let inherit (ocamlPackages) ocaml lablgtk camlp4; in
stdenv.mkDerivation rec {
version = "1.0.2";
pname = "monotone-viz";
4 changes: 3 additions & 1 deletion pkgs/development/compilers/haxe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
{ stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:

let inherit (ocamlPackages) ocaml camlp4; in

let
generic = { version, sha256, prePatch }:
8 changes: 6 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7986,7 +7986,9 @@ in
graphviz = graphviz-nox;
});

inherit (ocaml-ng.ocamlPackages_4_05.haxe) haxe_3_2 haxe_3_4;
inherit (callPackage ../development/compilers/haxe {
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
}) haxe_3_2 haxe_3_4;
haxe = haxe_3_4;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;
@@ -19758,7 +19760,9 @@ in
lua = lua5;
};

inherit (ocaml-ng.ocamlPackages_4_01_0) monotoneViz;
monotoneViz = callPackage ../applications/version-management/monotone-viz {
ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
};

moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };

7 changes: 0 additions & 7 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1107,8 +1107,6 @@ let

# Apps / from all-packages

haxe = callPackage ../development/compilers/haxe { };

ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { };

trv = callPackage ../development/tools/misc/trv { };
@@ -1117,11 +1115,6 @@ let

google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };


monotoneViz = callPackage ../applications/version-management/monotone-viz {
inherit (pkgs.gnome2) libgnomecanvas glib;
};

unison = callPackage ../applications/networking/sync/unison {
enableX11 = config.unison.enableX11 or true;
};