diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 348 |
1 files changed, 192 insertions, 156 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c163b563a0fa..4aaf08971ddb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -579,6 +579,8 @@ let cowsay = callPackage ../tools/misc/cowsay { }; + cuetools = callPackage ../tools/cd-dvd/cuetools { }; + unifdef = callPackage ../development/tools/misc/unifdef { }; "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { }; @@ -587,6 +589,10 @@ let clamav = callPackage ../tools/security/clamav { }; + cloc = callPackage ../tools/misc/cloc { + inherit (perlPackages) perl AlgorithmDiff RegexpCommon; + }; + cloog = callPackage ../development/libraries/cloog { }; cloogppl = callPackage ../development/libraries/cloog-ppl { }; @@ -648,6 +654,8 @@ let ddrescue = callPackage ../tools/system/ddrescue { }; + deluge = pythonPackages.deluge; + desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; despotify = callPackage ../development/libraries/despotify { }; @@ -764,6 +772,8 @@ let libbsd = callPackage ../development/libraries/libbsd { }; + lprof = callPackage ../tools/graphics/lprof { }; + flvtool2 = callPackage ../tools/video/flvtool2 { }; fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); @@ -805,6 +815,8 @@ let uni2ascii = callPackage ../tools/text/uni2ascii { }; + g500-control = callPackage ../tools/misc/g500-control { }; + gawk = callPackage ../tools/text/gawk { }; gdmap = callPackage ../tools/system/gdmap { }; @@ -843,6 +855,8 @@ let libiconv = if gnu then null else libiconv; }; + gnulib = callPackage ../development/tools/gnulib { }; + gnupatch = callPackage ../tools/text/gnupatch { }; gnupg1orig = callPackage ../tools/security/gnupg1 { @@ -871,6 +885,8 @@ let gnuvd = callPackage ../tools/misc/gnuvd { }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; + gource = callPackage ../applications/version-management/gource {}; gptfdisk = callPackage ../tools/system/gptfdisk { }; @@ -1044,6 +1060,8 @@ let most = callPackage ../tools/misc/most { }; + multitail = callPackage ../tools/misc/multitail { }; + netperf = callPackage ../applications/networking/netperf { }; ninka = callPackage ../development/tools/misc/ninka { }; @@ -1261,6 +1279,8 @@ let nzbget = callPackage ../tools/networking/nzbget { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { }; + obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; obexd = callPackage ../tools/bluetooth/obexd { }; @@ -1279,7 +1299,9 @@ let opendkim = callPackage ../development/libraries/opendkim { }; - openjade = callPackage ../tools/text/sgml/openjade { }; + openjade = callPackage ../tools/text/sgml/openjade { + perl = perl510; + }; openobex = callPackage ../tools/bluetooth/openobex { }; @@ -1307,6 +1329,8 @@ let ossec = callPackage ../tools/security/ossec {}; + otpw = callPackage ../os-specific/linux/otpw { }; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; @@ -1454,6 +1478,8 @@ let recutils = callPackage ../tools/misc/recutils { }; + recoll = callPackage ../applications/search/recoll { }; + refind = callPackage ../tools/misc/refind { }; reiser4progs = callPackage ../tools/filesystems/reiser4progs { }; @@ -1468,6 +1494,8 @@ let remmina = callPackage ../applications/networking/remote/remmina {}; + renameutils = callPackage ../tools/misc/renameutils { }; + replace = callPackage ../tools/text/replace { }; reptyr = callPackage ../os-specific/linux/reptyr {}; @@ -1569,6 +1597,8 @@ let fusesmb = callPackage ../tools/filesystems/fusesmb { }; + sl = callPackage ../tools/misc/sl { }; + socat = callPackage ../tools/networking/socat { }; sourceHighlight = callPackage ../tools/text/source-highlight { }; @@ -1623,6 +1653,11 @@ let tcpdump = callPackage ../tools/networking/tcpdump { }; + teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { }; + + # Work In Progress: it doesn't start unless running a daemon as root + teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); + telnet = callPackage ../tools/networking/telnet { }; texmacs = callPackage ../applications/editors/texmacs { @@ -1766,6 +1801,8 @@ let uptimed = callPackage ../tools/system/uptimed { }; + varnish = callPackage ../servers/varnish { }; + vlan = callPackage ../tools/networking/vlan { }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -1787,6 +1824,8 @@ let libxml2 geoip; }; + weighttp = callPackage ../tools/networking/weighttp { }; + wget = callPackage ../tools/networking/wget { inherit (perlPackages) LWP; }; @@ -1927,6 +1966,8 @@ let bigloo = callPackage ../development/compilers/bigloo { }; + chicken = callPackage ../development/compilers/chicken { }; + ccl = builderDefsPackage ../development/compilers/ccl {}; clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { @@ -2172,7 +2213,7 @@ let stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); profiledCompiler = false; enableMultilib = true; - })) else throw "Multilib gcc not supported on this system"; + })) else throw "Multilib gcc not supported on ‘${system}’"; gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; @@ -2863,8 +2904,7 @@ let pure = callPackage ../development/interpreters/pure {}; - python3 = python32; - python32 = callPackage ../development/interpreters/python/3.2 { }; + python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); python33 = callPackage ../development/interpreters/python/3.3 { }; python = python27; @@ -4711,6 +4751,8 @@ let opensc = opensc_0_11_7; }; + opencolorio = callPackage ../development/libraries/opencolorio { }; + ois = callPackage ../development/libraries/ois {}; opal = callPackage ../development/libraries/opal {}; @@ -5239,6 +5281,8 @@ let jvm = gcj; xerces = xercesJava; }; + xmlsec = callPackage ../development/libraries/xmlsec { }; + zziplib = callPackage ../development/libraries/zziplib { }; @@ -5253,6 +5297,7 @@ let perlPackages = recurseIntoAttrs (import ./perl-packages.nix { inherit pkgs; + __overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); perl510Packages = import ./perl-packages.nix { @@ -5260,6 +5305,7 @@ let perl = perl510; buildPerlPackage = import ../development/perl-modules/generic perl510; }; + __overrides = (config.perl510PackageOverrides or (p: {})) pkgs; }; perlXMLParser = perlPackages.XMLParser; @@ -5289,9 +5335,10 @@ let python = python27; }); - plone42Packages = recurseIntoAttrs (import ../development/web/plone { - inherit pkgs buildPythonPackage; + plone43Packages = recurseIntoAttrs (import ../development/web/plone { + inherit pkgs; python = python27; + pythonPackages = python27Packages; }); foursuite = callPackage ../development/python-modules/4suite { }; @@ -5474,9 +5521,7 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; - mongodb = callPackage ../servers/nosql/mongodb { - useV8 = (config.mongodb.useV8 or false); - }; + mongodb = callPackage ../servers/nosql/mongodb { }; mysql4 = import ../servers/sql/mysql { inherit fetchurl stdenv ncurses zlib perl; @@ -5515,7 +5560,7 @@ let OVMF = callPackage ../applications/virtualization/OVMF { }; - postgresql = postgresql83; + postgresql = postgresql92; postgresql83 = callPackage ../servers/sql/postgresql/8.3.x.nix { }; @@ -5766,7 +5811,10 @@ let iproute = callPackage ../os-specific/linux/iproute { }; - iputils = callPackage ../os-specific/linux/iputils { }; + iputils = callPackage ../os-specific/linux/iputils { + sp = spCompat; + inherit (perlPackages) SGMLSpm; + }; iptables = callPackage ../os-specific/linux/iptables { }; @@ -5838,53 +5886,10 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; - linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) { - inherit fetchurl perl mktemp module_init_tools; - stdenv = overrideInStdenv stdenv [ gcc34 gnumake381 ]; - kernelPatches = - [ kernelPatches.cifs_timeout_2_6_15 - ]; - }; - - linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout_2_6_29 - # kernelPatches.no_xsave # doesn't apply anymore - kernelPatches.dell_rfkill - ]; - }; - - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_35 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs2_2_6_35 - kernelPatches.cifs_timeout_2_6_35 - ] ++ lib.optional (platform.kernelArch == "arm") - kernelPatches.sheevaplug_modules_2_6_35; - }; - - linux_2_6_35_oldI686 = linux_2_6_35.override { - extraConfig = '' - HIGHMEM64G? n - XEN? n - ''; - extraMeta = { - platforms = ["i686-linux"]; - maintainers = [lib.maintainers.raskin]; - }; - }; - linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 + [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_0 ]; }; @@ -5892,8 +5897,7 @@ let linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 + [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 kernelPatches.cifs_timeout_2_6_38 ]; @@ -5908,8 +5912,7 @@ let linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 + [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_4 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu @@ -5965,123 +5968,120 @@ let for a specific kernel. This function can then be called for whatever kernel you're using. */ - linuxPackagesFor = kernel: - let - callPackage = newScope self; + linuxPackagesFor = kernel: self: let callPackage = newScope self; in { + inherit kernel; - self = { - kernel = kernel.dev or kernel; + kernelDev = kernel.dev or kernel; - acpi_call = callPackage ../os-specific/linux/acpi-call {}; + acpi_call = callPackage ../os-specific/linux/acpi-call {}; - bbswitch = callPackage ../os-specific/linux/bbswitch {}; + bbswitch = callPackage ../os-specific/linux/bbswitch {}; - ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; + ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - aufs = - if self.kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs/2.nix { } - else if self.kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs/3.nix { } - else null; + aufs = + if self.kernel.features ? aufs2 then + callPackage ../os-specific/linux/aufs/2.nix { } + else if self.kernel.features ? aufs3 then + callPackage ../os-specific/linux/aufs/3.nix { } + else null; - aufs_util = - if self.kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs-util/2.nix { } - else if self.kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs-util/3.nix { } - else null; + aufs_util = + if self.kernel.features ? aufs2 then + callPackage ../os-specific/linux/aufs-util/2.nix { } + else if self.kernel.features ? aufs3 then + callPackage ../os-specific/linux/aufs-util/3.nix { } + else null; - blcr = callPackage ../os-specific/linux/blcr { }; + blcr = callPackage ../os-specific/linux/blcr { }; - cryptodev = callPackage ../os-specific/linux/cryptodev { }; + cryptodev = callPackage ../os-specific/linux/cryptodev { }; - e1000e = callPackage ../os-specific/linux/e1000e {}; + e1000e = callPackage ../os-specific/linux/e1000e {}; - exmap = callPackage ../os-specific/linux/exmap { }; + exmap = callPackage ../os-specific/linux/exmap { }; - frandom = callPackage ../os-specific/linux/frandom { }; + frandom = callPackage ../os-specific/linux/frandom { }; - iscsitarget = callPackage ../os-specific/linux/iscsitarget { }; + iscsitarget = callPackage ../os-specific/linux/iscsitarget { }; - iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; + iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; - iwlwifi4965ucode = - if builtins.compareVersions self.kernel.version "2.6.27" == 0 - || builtins.compareVersions self.kernel.version "2.6.27" == 1 - then iwlwifi4965ucodeV2 - else iwlwifi4965ucodeV1; + iwlwifi4965ucode = + if builtins.compareVersions self.kernel.version "2.6.27" == 0 + || builtins.compareVersions self.kernel.version "2.6.27" == 1 + then iwlwifi4965ucodeV2 + else iwlwifi4965ucodeV1; - atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; + atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; - broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; - nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; + nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; + nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; + nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; - openafsClient = callPackage ../servers/openafs-client { }; + openafsClient = callPackage ../servers/openafs-client { }; - openiscsi = callPackage ../os-specific/linux/open-iscsi { }; + openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; + wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - kqemu = callPackage ../os-specific/linux/kqemu { }; + kqemu = callPackage ../os-specific/linux/kqemu { }; - klibc = callPackage ../os-specific/linux/klibc { - linuxHeaders = glibc.kernelHeaders; - }; + klibc = callPackage ../os-specific/linux/klibc { + linuxHeaders = glibc.kernelHeaders; + }; - splashutils = let hasFbConDecor = if self.kernel ? features - then self.kernel.features ? fbConDecor - else self.kernel.config.isEnabled "FB_CON_DECOR"; - in if hasFbConDecor then pkgs.splashutils else null; + splashutils = let hasFbConDecor = if self.kernel ? features + then self.kernel.features ? fbConDecor + else self.kernel.config.isEnabled "FB_CON_DECOR"; + in if hasFbConDecor then pkgs.splashutils else null; - /* compiles but has to be integrated into the kernel somehow - Let's have it uncommented and finish it.. - */ - ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; + /* compiles but has to be integrated into the kernel somehow + Let's have it uncommented and finish it.. + */ + ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - spl = callPackage ../os-specific/linux/spl/default.nix { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; - sysprof = callPackage ../development/tools/profiling/sysprof { - inherit (gnome) libglade; - }; + sysprof = callPackage ../development/tools/profiling/sysprof { + inherit (gnome) libglade; + }; - systemtap = callPackage ../development/tools/profiling/systemtap { - linux = self.kernel; - inherit (gnome) libglademm; - }; + systemtap = callPackage ../development/tools/profiling/systemtap { + linux = self.kernelDev; + inherit (gnome) libglademm; + }; - tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; - v86d = callPackage ../os-specific/linux/v86d { }; + v86d = callPackage ../os-specific/linux/v86d { }; - virtualbox = callPackage ../applications/virtualization/virtualbox { - stdenv = stdenv_32bit; - inherit (gnome) libIDL; - }; + virtualbox = callPackage ../applications/virtualization/virtualbox { + stdenv = stdenv_32bit; + inherit (gnome) libIDL; + }; - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - zfs = callPackage ../os-specific/linux/zfs/default.nix { }; - }; - in (self // { kernel = self.kernel.out; }); + zfs = callPackage ../os-specific/linux/zfs/default.nix { }; + }; # Build the kernel modules for the some of the kernels. - linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32); - linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35); - linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0); - linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2); - linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen); - linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4); - linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi); - linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7); - linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8); + linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); + linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); + linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); + linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); + linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); + linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7); + linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); + # Update this when adding a new version! + linuxPackages_latest = pkgs.linuxPackages_3_8; # The current default kernel / kernel modules. linux = linuxPackages.kernel; @@ -6377,7 +6377,7 @@ let }; pthreads = callPackage ../os-specific/windows/pthread-w32 { - mingw_headers = mingw_headers2; + mingw_headers = mingw_headers3; }; wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { }; @@ -6452,6 +6452,8 @@ let docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; + docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; + docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { }; docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { }; @@ -6577,6 +6579,8 @@ let aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; + aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; + abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; }; @@ -6653,7 +6657,7 @@ let }; blender = callPackage ../applications/misc/blender { - python = python33; # 2.65a doesn't accept lower + python = python3; }; bristol = callPackage ../applications/audio/bristol { }; @@ -6761,6 +6765,10 @@ let inherit (gnome) GConf libglade; }; + darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix { + inherit (gnome) GConf libglade; + }; + "dd-agent" = callPackage ../tools/networking/dd-agent { }; dia = callPackage ../applications/graphics/dia { @@ -6785,6 +6793,8 @@ let inherit (xlibs) libX11; }; + dunst = callPackage ../applications/misc/dunst { }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -7191,6 +7201,8 @@ let gqview = callPackage ../applications/graphics/gqview { }; + gmpc = callPackage ../applications/audio/gmpc { }; + gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { inherit (gnome) GConf; }; @@ -7504,6 +7516,8 @@ let ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + normalize = callPackage ../applications/audio/normalize { }; + mplayer = callPackage ../applications/video/mplayer { pulseSupport = config.pulseaudio or false; }; @@ -7583,10 +7597,16 @@ let ogmtools = callPackage ../applications/video/ogmtools { }; + omxplayer = callPackage ../applications/video/omxplayer { + stdenv = overrideGCC stdenv gcc47; + }; + oneteam = callPackage ../applications/networking/instant-messengers/oneteam {}; openbox = callPackage ../applications/window-managers/openbox { }; + openimageio = callPackage ../applications/graphics/openimageio { }; + openjump = callPackage ../applications/misc/openjump { }; openscad = callPackage ../applications/graphics/openscad {}; @@ -7693,7 +7713,9 @@ let ratpoison = callPackage ../applications/window-managers/ratpoison { }; - rawtherapee = callPackage ../applications/graphics/rawtherapee { }; + rawtherapee = callPackage ../applications/graphics/rawtherapee { + fftw = fftw.override {float = true;}; + }; rcs = callPackage ../applications/version-management/rcs { }; @@ -7706,7 +7728,7 @@ let }; rsync = callPackage ../applications/networking/sync/rsync { - enableACLs = !(stdenv.isDarwin || stdenv.isSunOS); + enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); }; @@ -7747,6 +7769,12 @@ let dropbox = callPackage ../applications/networking/dropbox { }; + dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; + + lightdm = callPackage ../applications/display-managers/lightdm { }; + + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; + slim = callPackage ../applications/display-managers/slim { }; sndBase = builderDefsPackage (import ../applications/audio/snd) { @@ -7761,6 +7789,8 @@ let guile = guile_1_8; }; + shntool = callPackage ../applications/audio/shntool { }; + sonic_visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; @@ -7879,6 +7909,9 @@ let wrapPython = pythonPackages.wrapPython; }; + # This builds the gtk client + transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; @@ -7982,8 +8015,11 @@ let glSupport = true; }; }; - - wings = callPackage ../applications/graphics/wings { }; + + wings = callPackage ../applications/graphics/wings { + erlang = erlangR14B04; + esdl = esdl.override { erlang = erlangR14B04; }; + }; wmname = callPackage ../applications/misc/wmname { }; @@ -8104,9 +8140,7 @@ let libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { - inherit (pythonPackages) notify; - }; + xpra = callPackage ../tools/X11/xpra { }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome) libglade; @@ -8337,7 +8371,7 @@ let # You still can override by passing more arguments. spaceOrbit = callPackage ../games/orbit { }; - spring = callPackage ../games/spring { boost = boost149;}; + spring = callPackage ../games/spring { }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -8780,7 +8814,9 @@ let gtkwave = callPackage ../applications/science/electronics/gtkwave { }; - kicad = callPackage ../applications/science/electronics/kicad { }; + kicad = callPackage ../applications/science/electronics/kicad { + wxGTK = wxGTK29; + }; ngspice = callPackage ../applications/science/electronics/ngspice { }; @@ -8921,6 +8957,8 @@ let mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { }; + nix = nixStable; nixStable = callPackage ../tools/package-management/nix { @@ -8928,14 +8966,10 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = nixStable; - - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ nut = callPackage ../applications/misc/nut { }; @@ -9040,7 +9074,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht ]; + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -9112,6 +9146,8 @@ let inherit (gnome2) zenity; }; + wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; + x2x = callPackage ../tools/X11/x2x { }; xosd = callPackage ../misc/xosd { }; |