all-packages: cleanup from last commit
This commit is contained in:
parent
7ab8c886a4
commit
a7d5c50034
|
@ -23,7 +23,7 @@
|
||||||
, alsaLib
|
, alsaLib
|
||||||
, libidn
|
, libidn
|
||||||
, zlib
|
, zlib
|
||||||
, version ? null
|
, version ? "13.9.0"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, unzip, version }:
|
{ stdenv, fetchurl, unzip, version ? "1.24.3" }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{ stdenv, fetchurl, lib, file
|
{ stdenv, fetchurl, lib, file
|
||||||
, pkgconfig, autoconf
|
, pkgconfig, autoconf
|
||||||
, glib, dbus-glib, gtkVersion
|
, glib, dbus-glib, gtkVersion ? "3"
|
||||||
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
|
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
|
||||||
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
|
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
|
||||||
, python2Packages, gobjectIntrospection, vala
|
, python2Packages, gobjectIntrospection, vala
|
||||||
|
|
|
@ -336,7 +336,7 @@ mapAliases (rec {
|
||||||
gst-ffmpeg = pkgs.gst-ffmpeg;
|
gst-ffmpeg = pkgs.gst-ffmpeg;
|
||||||
};
|
};
|
||||||
} // (with ocaml-ng; { # added 2016-09-14
|
} // (with ocaml-ng; { # added 2016-09-14
|
||||||
p ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
|
ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
|
||||||
ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
|
ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
|
||||||
ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
|
ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
|
||||||
ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
|
ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
|
||||||
|
|
|
@ -9255,15 +9255,15 @@ with pkgs;
|
||||||
|
|
||||||
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
|
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
|
||||||
|
|
||||||
gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { };
|
gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
|
||||||
|
gtk = gtk3;
|
||||||
|
};
|
||||||
|
|
||||||
gtk-mac-integration-gtk2 = gtk-macintegration.override {
|
gtk-mac-integration-gtk2 = gtk-mac-integration.override {
|
||||||
gtk = gtk2;
|
gtk = gtk2;
|
||||||
};
|
};
|
||||||
|
|
||||||
gtk-mac-integration-gtk3 = gtk-mac-integration.override {
|
gtk-mac-integration-gtk3 = gtk-mac-integration;
|
||||||
gtk = gtk3;
|
|
||||||
};
|
|
||||||
|
|
||||||
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
|
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
|
||||||
|
|
||||||
|
@ -15925,7 +15925,7 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
|
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
|
||||||
graphicsmagick_q16 = graphicsmagic.override { quantumdepth = 16; };
|
graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
|
||||||
|
|
||||||
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
|
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue