diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd293e4adc00..e2da9fe27dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2978,6 +2978,8 @@ let ired = callPackage ../development/tools/analysis/radare/ired.nix { }; + itstool = callPackage ../development/tools/misc/itstool { }; + jam = callPackage ../development/tools/build-managers/jam { }; jikespg = callPackage ../development/tools/parsing/jikespg { }; @@ -3064,6 +3066,8 @@ let swig = callPackage ../development/tools/misc/swig { }; + swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; + swigWithJava = swig; swftools = callPackage ../tools/video/swftools { }; @@ -3621,27 +3625,13 @@ let }); - gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in { - - glib = callPackage ../development/libraries/glib/2.20.x.nix { }; - - atk = callPackage ../development/libraries/atk/1.24.x.nix { }; - - cairo = callPackage ../development/libraries/cairo { }; - - pango = callPackage ../development/libraries/pango/1.24.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { }; - - }); - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; - atk = callPackage ../development/libraries/atk/1.32.x.nix { }; + atk = callPackage ../development/libraries/atk/2.2.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; @@ -3678,6 +3668,8 @@ let gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { }; + gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + # Let hydra build gtk-3.x but do not show this to users yet recurseForRelease = true; }; @@ -4316,6 +4308,8 @@ let nettle = callPackage ../development/libraries/nettle { }; + newt = callPackage ../development/libraries/newt { }; + nspr = callPackage ../development/libraries/nspr { }; nss = callPackage ../development/libraries/nss { }; @@ -4685,10 +4679,6 @@ let wxGTK = wxGTK28; - wxGTK26 = callPackage ../development/libraries/wxGTK-2.6 { - inherit (gtkLibs216) gtk; - }; - wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { inherit (gtkLibs) gtk; }; @@ -5821,6 +5811,8 @@ let stdenv = overrideGCC stdenv gcc34; }; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + # State Nix snix = callPackage ../tools/package-management/snix { @@ -6021,6 +6013,8 @@ let rfkill = callPackage ../os-specific/linux/rfkill { }; + ralink_fw = callPackage ../os-specific/linux/firmware/ralink { }; + rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; @@ -6213,6 +6207,8 @@ let cacert = callPackage ../data/misc/cacert { }; + cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + corefonts = callPackage ../data/fonts/corefonts { }; wrapFonts = paths : ((import ../data/fonts/fontWrap) { @@ -6272,6 +6268,8 @@ let miscfiles = callPackage ../data/misc/miscfiles { }; + mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; oldstandard = callPackage ../data/fonts/oldstandard { }; @@ -7621,9 +7619,7 @@ let inherit gsl aalib zlib libpng intltool gettext perl; }; - xara = callPackage ../applications/graphics/xara { - wxGTK = wxGTK26; - }; + xara = callPackage ../applications/graphics/xara { }; xawtv = callPackage ../applications/video/xawtv { }; @@ -8052,6 +8048,8 @@ let kde47 = kdePackagesFor pkgs.kde47 "4.7"; + kde48 = kdePackagesFor pkgs.kde48 "4.8"; + kdePackagesFor = self: version: let callPackageOrig = callPackage; in let @@ -8070,6 +8068,8 @@ let bangarang = callPackage ../applications/video/bangarang { }; + basket = callPackage ../applications/office/basket { }; + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; digikam = callPackage ../applications/graphics/digikam { |