Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkgs/by-name/ve/verifast/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
freetype,
fontconfig,
libxml2,
gnome2,
}:

let
Expand All @@ -29,7 +28,6 @@ let
freetype
fontconfig
libxml2
gnome2.gtksourceview
]
+ ":${lib.getLib stdenv.cc.cc}/lib64:$out/libexec";

Expand Down
7 changes: 1 addition & 6 deletions pkgs/desktops/gnome-2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
lib.makeScope pkgs.newScope (
self: with self; {

#### PLATFORM

libIDL = callPackage ./platform/libIDL {
gettext = if stdenv.hostPlatform.isDarwin then pkgs.gettext else null;
};
Expand All @@ -31,10 +29,6 @@ lib.makeScope pkgs.newScope (

gtkglext = callPackage ./platform/gtkglext { };

#### DESKTOP

gtksourceview = callPackage ./desktop/gtksourceview { };

}
)
// lib.optionalAttrs config.allowAliases {
Expand All @@ -56,6 +50,7 @@ lib.makeScope pkgs.newScope (
gtk = throw "gnome2.gtk has been removed, please use top-level gtk2";
gtkmm = throw "gnome2.gtkmm has been removed, please use top-level gtkmm2";
gtkdoc = throw "gnome2.gtkdoc has been removed, please use top-level gtk-doc";
gtksourceview = throw "gnome2.gtksourceview has been removed, please use top-level gtksourceview";
startup_notification = throw "gnome2.startup_notification has been removed, please use top-level libstartup_notification";
startupnotification = throw "gnome2.startupnotification has been removed, please use top-level libstartup_notification";
gnomedocutils = throw "gnome2.gnomedocutils has been removed, please use top-level gnome-doc-utils";
Expand Down
83 changes: 0 additions & 83 deletions pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/development/ocaml-modules/lablgtk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
pkg-config,
gtk2,
libgnomecanvas,
gtksourceview,
camlp-streams,
}:

Expand Down Expand Up @@ -67,7 +66,6 @@ stdenv.mkDerivation {
buildInputs = [
gtk2
libgnomecanvas
gtksourceview

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is wrong: it breaks the package…

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SuperSandro2000 what was your intention here? Should I remove the ocamlPackages.lablgtk package and all its transitive dependents as well?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #522488 for a first step.

]
++ param.buildInputs or [ ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/ocaml-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ let
lablgl = callPackage ../development/ocaml-modules/lablgl { };

lablgtk = callPackage ../development/ocaml-modules/lablgtk {
inherit (pkgs.gnome2) libgnomecanvas gtksourceview;
inherit (pkgs.gnome2) libgnomecanvas;
};

lablgtk-extras =
Expand Down
Loading