diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c03856807029..7092f0d7db05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7205,6 +7205,15 @@ let ]; }; + linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7344,8 +7353,8 @@ let linuxPackages = linuxPackages_3_12; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_14; - linuxPackages_latest = pkgs.linuxPackages_3_14; + linux_latest = pkgs.linux_3_15; + linuxPackages_latest = pkgs.linuxPackages_3_15; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -7357,6 +7366,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); + linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors @@ -7949,6 +7959,10 @@ let arora = callPackage ../applications/networking/browsers/arora { }; + atom = callPackage ../applications/editors/atom { + gconf = gnome.GConf; + }; + aseprite = callPackage ../applications/editors/aseprite { giflib = giflib_4_1; }; @@ -9097,11 +9111,19 @@ let inherit gettext highline iconv locale lockfile rmail_sup text trollop unicode xapian_ruby which; + # See https://github.com/NixOS/nixpkgs/issues/1804 and + # https://github.com/NixOS/nixpkgs/issues/2146 + bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler ( + oldAttrs: { + dontPatchShebangs = 1; + } + ); + chronic = chronic_0_9_1; gpgme = ruby_gpgme; mime_types = mime_types_1_25; ncursesw_sup = ruby_ncursesw_sup; - rake = rake_10_1_0; + rake = rubyLibs.rake_10_1_0; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; @@ -10190,6 +10212,8 @@ let trigger = callPackage ../games/trigger { }; + typespeed = callPackage ../games/typespeed { }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; @@ -10800,6 +10824,8 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + fceux = callPackage ../misc/emulators/fceux { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; @@ -10875,6 +10901,8 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nix-prefetch-tools = callPackage ../build-support/nix-prefetch-tools {}; + nix-repl = callPackage ../tools/package-management/nix-repl { }; nut = callPackage ../applications/misc/nut { }; @@ -10989,9 +11017,10 @@ let texFunctions = import ../tools/typesetting/tex/nix pkgs; texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { - inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby + inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo - libjpeg bison python fontconfig flex poppler graphite2 makeWrapper; + libjpeg bison python fontconfig flex poppler libpaper graphite2 + makeWrapper; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; |