diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 348 |
1 files changed, 224 insertions, 124 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86b45daecb27..33273481cd47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18,8 +18,10 @@ with pkgs; # Override system. This is useful to build i686 packages on x86_64-linux. forceSystem = system: kernel: nixpkgsFun { - inherit system; - platform = platform // { kernelArch = kernel; }; + localSystem = { + inherit system; + platform = platform // { kernelArch = kernel; }; + }; }; # Used by wine, firefox with debugging version of Flash, ... @@ -97,6 +99,8 @@ with pkgs; dockerTools = callPackage ../build-support/docker { }; + docker_compose = pythonPackages.docker_compose; + dotnetenv = callPackage ../build-support/dotnetenv { dotnetfx = dotnetfx40; }; @@ -696,6 +700,9 @@ with pkgs; capstone = callPackage ../development/libraries/capstone { }; + cataract = callPackage ../applications/misc/cataract { }; + cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; + catch = callPackage ../development/libraries/catch { }; catdoc = callPackage ../tools/text/catdoc { }; @@ -740,6 +747,8 @@ with pkgs; consul-template = callPackage ../tools/system/consul-template { }; + copyright-update = callPackage ../tools/text/copyright-update { }; + corebird = callPackage ../applications/networking/corebird { }; corosync = callPackage ../servers/corosync { }; @@ -776,6 +785,8 @@ with pkgs; datefudge = callPackage ../tools/system/datefudge { }; + dateutils = callPackage ../tools/misc/dateutils { }; + ddate = callPackage ../tools/misc/ddate { }; dehydrated = callPackage ../tools/admin/dehydrated { }; @@ -805,6 +816,8 @@ with pkgs; discount = callPackage ../tools/text/discount { }; + diskscan = callPackage ../tools/misc/diskscan { }; + disorderfs = callPackage ../tools/filesystems/disorderfs { asciidoc = asciidoc-full; }; @@ -870,6 +883,8 @@ with pkgs; fzy = callPackage ../tools/misc/fzy { }; + gbsplay = callPackage ../applications/audio/gbsplay { }; + gdrivefs = python27Packages.gdrivefs; go-dependency-manager = callPackage ../development/tools/gdm { }; @@ -1081,6 +1096,8 @@ with pkgs; cdecl = callPackage ../development/tools/cdecl { }; + cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -1292,7 +1309,6 @@ with pkgs; cron = callPackage ../tools/system/cron { }; inherit (callPackages ../development/compilers/cudatoolkit { }) - cudatoolkit5 cudatoolkit6 cudatoolkit65 cudatoolkit7 @@ -2147,6 +2163,8 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; + hardinfo = callPackage ../tools/system/hardinfo { }; + hdapsd = callPackage ../os-specific/linux/hdapsd { }; hddtemp = callPackage ../tools/misc/hddtemp { }; @@ -2256,15 +2274,15 @@ with pkgs; }; - ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { - inherit (haskellPackages) ihaskell ghcWithPackages; + # ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { + # inherit (haskellPackages) ihaskell ghcWithPackages; - ipython = python3.buildEnv.override { - extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ]; - }; + # ipython = python3.buildEnv.override { + # extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ]; + # }; - packages = config.ihaskell.packages or (self: []); - }; + # packages = config.ihaskell.packages or (self: []); + # }; imapproxy = callPackage ../tools/networking/imapproxy { }; @@ -2415,8 +2433,12 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; + krename-qt5 = qt5.callPackage ../applications/misc/krename/kde5.nix { }; + kronometer = qt5.callPackage ../tools/misc/kronometer { }; + kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { }; + peruse = qt5.callPackage ../tools/misc/peruse { }; kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; @@ -2469,8 +2491,6 @@ with pkgs; makebootfat = callPackage ../tools/misc/makebootfat { }; - libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; - matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; @@ -2667,6 +2687,8 @@ with pkgs; libx86emu = callPackage ../development/libraries/libx86emu { }; + libzmf = callPackage ../development/libraries/libzmf {}; + librdmacm = callPackage ../development/libraries/librdmacm { }; libreswan = callPackage ../tools/networking/libreswan { }; @@ -2776,7 +2798,9 @@ with pkgs; memtest86 = callPackage ../tools/misc/memtest86 { }; - memtest86plus = callPackage ../tools/misc/memtest86+ { }; + memtest86plus = callPackage ../tools/misc/memtest86+ { + stdenv = overrideCC stdenv gcc5; + }; meo = callPackage ../tools/security/meo { boost = boost155; @@ -3309,6 +3333,8 @@ with pkgs; pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; + pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { }; + pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -3562,6 +3588,8 @@ with pkgs; redmine = callPackage ../applications/version-management/redmine { }; + redsocks = callPackage ../tools/networking/redsocks { }; + rt = callPackage ../servers/rt { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -3778,6 +3806,10 @@ with pkgs; silc_server = callPackage ../servers/silc-server { }; + sile = callPackage ../tools/typesetting/sile { + inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg; + }; + silver-searcher = callPackage ../tools/text/silver-searcher { }; ag = self.silver-searcher; @@ -3804,7 +3836,7 @@ with pkgs; slsnif = callPackage ../tools/misc/slsnif { }; smartmontools = callPackage ../tools/system/smartmontools { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; smbldaptools = callPackage ../tools/networking/smbldaptools { @@ -3833,6 +3865,8 @@ with pkgs; sonata = callPackage ../applications/audio/sonata { }; + souper = callPackage ../development/compilers/souper { }; + sparsehash = callPackage ../development/libraries/sparsehash { }; spiped = callPackage ../tools/networking/spiped { }; @@ -3871,9 +3905,7 @@ with pkgs; su-exec = callPackage ../tools/security/su-exec {}; - subsurface = qt55.callPackage ../applications/misc/subsurface { - libdivecomputer = libdivecomputer_ssrf; - }; + subsurface = qt5.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -4065,6 +4097,8 @@ with pkgs; tpm-luks = callPackage ../tools/security/tpm-luks { }; + trezord = callPackage ../servers/trezord { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -4411,7 +4445,7 @@ with pkgs; weighttp = callPackage ../tools/networking/weighttp { }; wget = callPackage ../tools/networking/wget { - inherit (perlPackages) LWP; + inherit (perlPackages) IOSocketSSL LWP; libpsl = null; }; @@ -4435,6 +4469,8 @@ with pkgs; wrk = callPackage ../tools/networking/wrk { }; + wuzz = callPackage ../tools/networking/wuzz { }; + wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; @@ -4528,6 +4564,8 @@ with pkgs; xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + yaft = callPackage ../applications/misc/yaft { }; + yarn = callPackage ../development/tools/yarn { }; yank = callPackage ../tools/misc/yank { }; @@ -5028,7 +5066,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc801.override { + haskellPackages = haskell.packages.ghc802.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; @@ -5155,6 +5193,7 @@ with pkgs; jdk = if stdenv.isDarwin then jdk7 else jdk8; jre = if stdenv.isDarwin then jre7 else jre8; + jre_headless = if stdenv.isDarwin then jre7 else jre8_headless; openshot-qt = callPackage ../applications/video/openshot-qt { }; @@ -5396,10 +5435,6 @@ with pkgs; sbcl = callPackage ../development/compilers/sbcl {}; # For Maxima sbcl_1_3_12 = callPackage ../development/compilers/sbcl/1.3.12.nix { }; - # For StumpWM - sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix { - clisp = clisp; - }; # For ACL2 sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix { clisp = clisp; @@ -5408,7 +5443,7 @@ with pkgs; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; - scala_2_12 = callPackage ../development/compilers/scala { }; + scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; scala = scala_2_12; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -5430,6 +5465,10 @@ with pkgs; squeak = callPackage ../development/compilers/squeak { }; + squirrel-sql = callPackage ../development/tools/database/squirrel-sql { + drivers = [ mysql_jdbc postgresql_jdbc ]; + }; + stalin = callPackage ../development/compilers/stalin { }; metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; @@ -5753,7 +5792,7 @@ with pkgs; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php70; + php = php71; phpPackages = php70Packages; @@ -5805,7 +5844,6 @@ with pkgs; # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; - python26Full = python26.override{includeModules=true;self=python26Full;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; python33Full = python33.override{x11Support=true;}; @@ -5818,10 +5856,6 @@ with pkgs; python2Packages = python27Packages; python3Packages = python35Packages; - python26 = callPackage ../development/interpreters/python/cpython/2.6 { - db = db4; - self = python26; - }; python27 = callPackage ../development/interpreters/python/cpython/2.7 { self = python27; inherit (darwin) CF configd; @@ -5848,6 +5882,7 @@ with pkgs; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; python = python27.override{x11Support=true;}; + db = db.override { dbmSupport = true; }; }; python2nix = callPackage ../tools/package-management/python2nix { }; @@ -5888,7 +5923,6 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; inherit (callPackage ../development/interpreters/ruby {}) - ruby_1_9_3 ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 @@ -5897,7 +5931,6 @@ with pkgs; # Ruby aliases ruby = ruby_2_3; - ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; @@ -5910,7 +5943,9 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; - spark = callPackage ../applications/networking/cluster/spark { }; + spark = spark_21; + spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; }; + spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; @@ -5919,6 +5954,8 @@ with pkgs; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; spidermonkey = spidermonkey_31; + ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; + supercollider = callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -6116,7 +6153,6 @@ with pkgs; }; buildbot-full = self.buildbot.override { plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; - enableLocalWorker = true; }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -6321,6 +6357,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; + ocaml = ocaml_4_02; }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -6728,6 +6765,8 @@ with pkgs; ruby = ruby_2_2; }; + bashdb = callPackage ../development/tools/misc/bashdb { }; + gdb = callPackage ../development/tools/misc/gdb { guile = null; hurd = gnu.hurdCross; @@ -6772,7 +6811,10 @@ with pkgs; yacc = bison; - ycmd = callPackage ../development/tools/misc/ycmd { }; + ycmd = callPackage ../development/tools/misc/ycmd { + inherit (darwin.apple_sdk.frameworks) Cocoa; + python = python2; + }; yodl = callPackage ../development/tools/misc/yodl { }; @@ -7733,9 +7775,9 @@ with pkgs; jsoncpp = callPackage ../development/libraries/jsoncpp { }; - jsoncpp_1_6_5 = callPackage ../development/libraries/jsoncpp/1.6.5 { }; - - jsonnet = callPackage ../development/compilers/jsonnet { }; + jsonnet = callPackage ../development/compilers/jsonnet { + emscripten = emscripten.override {python=python2;}; + }; libjson = callPackage ../development/libraries/libjson { }; @@ -7963,8 +8005,6 @@ with pkgs; libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; - libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { }; - libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; @@ -7991,7 +8031,8 @@ with pkgs; libdvdread = callPackage ../development/libraries/libdvdread { }; libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; - libdwarf = callPackage ../development/libraries/libdwarf { }; + inherit (callPackage ../development/libraries/libdwarf { }) + libdwarf dwarfdump; libeatmydata = callPackage ../development/libraries/libeatmydata { }; @@ -8039,6 +8080,8 @@ with pkgs; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = gnome3.libgnome_keyring; + libglvnd = callPackage ../development/libraries/libglvnd { }; + libgnurl = callPackage ../development/libraries/libgnurl { }; libgringotts = callPackage ../development/libraries/libgringotts { }; @@ -8278,6 +8321,8 @@ with pkgs; libidn = callPackage ../development/libraries/libidn { }; + libidn2 = callPackage ../development/libraries/libidn2 { }; + idnkit = callPackage ../development/libraries/idnkit { }; libiec61883 = callPackage ../development/libraries/libiec61883 { }; @@ -8781,8 +8826,6 @@ with pkgs; mhddfs = callPackage ../tools/filesystems/mhddfs { }; - ming = callPackage ../development/libraries/ming { }; - minizip = callPackage ../development/libraries/minizip { }; miro = callPackage ../applications/video/miro { @@ -8917,6 +8960,8 @@ with pkgs; ogrepaged = callPackage ../development/libraries/ogrepaged { }; + olm = callPackage ../development/libraries/olm { }; + oniguruma = callPackage ../development/libraries/oniguruma { }; openal = self.openalSoft; @@ -9055,6 +9100,8 @@ with pkgs; pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; + pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -9305,6 +9352,8 @@ with pkgs; rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + range-v3 = callPackage ../development/libraries/range-v3 {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; raul = callPackage ../development/libraries/audio/raul { }; @@ -9541,7 +9590,17 @@ with pkgs; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil = callPackage ../development/libraries/audio/suil { }; + suil-qt4 = callPackage ../development/libraries/audio/suil { + withQt4 = true; + withQt5 = false; + }; + + suil-qt5 = callPackage ../development/libraries/audio/suil { + withQt4 = false; + withQt5 = true; + }; + + suil = suil-qt4; sutils = callPackage ../tools/misc/sutils { }; @@ -10100,11 +10159,7 @@ with pkgs; ### DEVELOPMENT / PYTHON MODULES - # `nix-env -i python-nose` installs for 2.7, the default python. - # Therefore we do not recurse into attributes here, in contrast to - # python27Packages. `nix-env -iA python26Packages.nose` works - # regardless. - python26Packages = python26.pkgs; + # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -10206,7 +10261,10 @@ with pkgs; apcupsd = callPackage ../servers/apcupsd { }; - asterisk = callPackage ../servers/asterisk { }; + asterisk = asterisk-stable; + + inherit (callPackages ../servers/asterisk { }) + asterisk-stable asterisk-lts; sabnzbd = callPackage ../servers/sabnzbd { }; @@ -10244,7 +10302,7 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; - #dnschain = callPackage ../servers/dnschain { }; + dnschain = callPackage ../servers/dnschain { }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; @@ -10321,7 +10379,10 @@ with pkgs; jetty = callPackage ../servers/http/jetty { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { }; + knot-resolver = callPackage ../servers/dns/knot-resolver { + # TODO: vimNox after it gets fixed on Darwin or something lighter + hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/; + }; rdkafka = callPackage ../development/libraries/rdkafka { }; @@ -10461,8 +10522,6 @@ with pkgs; pies = callPackage ../servers/pies { }; - portmap = callPackage ../servers/portmap { }; - rpcbind = callPackage ../servers/rpcbind { }; mariadb = callPackage ../servers/sql/mariadb { @@ -10726,6 +10785,8 @@ with pkgs; shaarli = callPackage ../servers/web-apps/shaarli { }; + shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; + axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; @@ -10769,7 +10830,7 @@ with pkgs; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - fglrxCompat = config.xorg.fglrxCompat or false; # `config` because we have no `xorg.override` + abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override` } // { inherit xlibsWrapper; } ); xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; @@ -10838,6 +10899,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { }; + bluez4 = callPackage ../os-specific/linux/bluez { }; + # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); @@ -11055,6 +11118,8 @@ with pkgs; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; + intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { }; @@ -11133,8 +11198,6 @@ with pkgs; cross = assert targetPlatform != buildPlatform; targetPlatform; }; - linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; # We can choose: @@ -11194,17 +11257,6 @@ with pkgs; ]; }; - linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11236,7 +11288,6 @@ with pkgs; # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long - kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11249,7 +11300,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -11309,6 +11359,8 @@ with pkgs; dpdk = callPackage ../os-specific/linux/dpdk { }; + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + pktgen = callPackage ../os-specific/linux/pktgen { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -11333,12 +11385,13 @@ with pkgs; nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; - nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; - nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; - nvidia_x11_beta = nvidia_x11; # latest beta is lower version ATM - # callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; + + nvidia_x11_legacy173 = nvidiaPackages.legacy_173; + nvidia_x11_legacy304 = nvidiaPackages.legacy_304; + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11 = nvidiaPackages.stable; rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; @@ -11421,7 +11474,6 @@ with pkgs; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12); - linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); @@ -11538,9 +11590,7 @@ with pkgs; mingetty = callPackage ../os-specific/linux/mingetty { }; - miraclecast = callPackage ../os-specific/linux/miraclecast { - systemd = systemd.override { enableKDbus = true; }; - }; + miraclecast = callPackage ../os-specific/linux/miraclecast { }; mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { }; @@ -11568,6 +11618,7 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { inherit (gnome2) gtk gtkmm; }; + open-vm-tools-headless = open-vm-tools.override { withX = false; }; delve = callPackage ../development/tools/delve { }; @@ -12105,13 +12156,18 @@ with pkgs; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; - liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; - liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; - liberation_ttf = liberation_ttf_binary; + inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) + liberation_ttf_v1_from_source + liberation_ttf_v1_binary + liberation_ttf_v2_from_source + liberation_ttf_v2_binary; + liberation_ttf = liberation_ttf_v2_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; + liberastika = callPackage ../data/fonts/liberastika { }; + libertine = callPackage ../data/fonts/libertine { }; libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; @@ -12248,6 +12304,8 @@ with pkgs; hasklig = callPackage ../data/fonts/hasklig {}; + siji = callPackage ../data/fonts/siji { }; + sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; source-code-pro = callPackage ../data/fonts/source-code-pro {}; @@ -12408,6 +12466,8 @@ with pkgs; ao = callPackage ../applications/graphics/ao {}; + aqemu = qt5.callPackage ../applications/virtualization/aqemu { }; + ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; @@ -12609,9 +12669,7 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cb2bib = callPackage ../applications/office/cb2bib { - inherit (xorg) libX11; - }; + cb2bib = qt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -12828,6 +12886,10 @@ with pkgs; doodle = callPackage ../applications/search/doodle { }; + droopy = callPackage ../applications/networking/droopy { + inherit (python3Packages) wrapPython; + }; + drumgizmo = callPackage ../applications/audio/drumgizmo { }; dunst = callPackage ../applications/misc/dunst { }; @@ -12859,6 +12921,8 @@ with pkgs; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); + ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; + ed = callPackage ../applications/editors/ed { }; edbrowse = callPackage ../applications/editors/edbrowse { }; @@ -13074,7 +13138,7 @@ with pkgs; external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; - inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig; + inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m; }; }; @@ -13124,7 +13188,7 @@ with pkgs; keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { }; + keepassx-community = qt5.callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; @@ -13261,6 +13325,7 @@ with pkgs; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; + # The GTK UI is deprecated by upstream. You probably want the QT version. wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; @@ -13353,14 +13418,18 @@ with pkgs; xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; - freerdpStable = callPackage ../applications/networking/remote/freerdp { - ffmpeg = ffmpeg_1; + freerdp = callPackage ../applications/networking/remote/freerdp { + inherit libpulseaudio; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { - ffmpeg = ffmpeg_2; + + freerdpUnstable = freerdp; + + # This must go when weston v2 is released + freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix { cmake = cmake_2_8; + ffmpeg = ffmpeg_1; }; - freerdp = freerdpUnstable; # freerdpStable is marked broken, please switch back to it once fixed freicoin = callPackage ../applications/misc/freicoin { boost = boost155; @@ -13370,6 +13439,8 @@ with pkgs; game-music-emu = callPackage ../applications/audio/game-music-emu { }; + gcalcli = callPackage ../applications/misc/gcalcli { }; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; get_iplayer = callPackage ../applications/misc/get_iplayer {}; @@ -13483,11 +13554,6 @@ with pkgs; gmu = callPackage ../applications/audio/gmu { }; - gnash = callPackage ../applications/video/gnash { - inherit (gnome2) gtkglext; - xulrunner = firefox-unwrapped; - }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { inherit (gnome2) GConf; }; @@ -13957,7 +14023,6 @@ with pkgs; freefont_ttf xorg.fontmiscmisc ]; }; - mdds = mdds_0_12_1; clucene_core = clucene_core_2; lcms = lcms2; harfbuzz = harfbuzz.override { @@ -13995,7 +14060,7 @@ with pkgs; bison = bison2; }; - inherit (ocaml-ng.ocamlPackages_4_02) llpp; + inherit (ocaml-ng.ocamlPackages_4_04) llpp; lmms = callPackage ../applications/audio/lmms { }; @@ -14383,6 +14448,8 @@ with pkgs; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; + muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; # Open Stack @@ -14539,6 +14606,8 @@ with pkgs; pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; + pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; + pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; @@ -14647,7 +14716,7 @@ with pkgs; qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - qjackctl = callPackage ../applications/audio/qjackctl { }; + qjackctl = qt5.callPackage ../applications/audio/qjackctl { }; qmidinet = callPackage ../applications/audio/qmidinet { }; @@ -14959,7 +15028,7 @@ with pkgs; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = qt55.callPackage ../applications/networking/dropbox { }; + dropbox = qt5.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; @@ -15054,8 +15123,6 @@ with pkgs; stumpwm = callPackage ../applications/window-managers/stumpwm { version = "latest"; - sbcl = sbcl_1_2_5; - lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5); }; stumpwm-git = stumpwm.override { @@ -15265,6 +15332,8 @@ with pkgs; # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; + tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; + tudu = callPackage ../applications/office/tudu { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; @@ -15285,6 +15354,8 @@ with pkgs; unpaper = callPackage ../tools/graphics/unpaper { }; + urh = callPackage ../applications/misc/urh { }; + uucp = callPackage ../tools/misc/uucp { }; uvccapture = callPackage ../applications/video/uvccapture { }; @@ -15351,13 +15422,12 @@ with pkgs; neovim = callPackage ../applications/editors/neovim { }; - neovim-qt = callPackage ../applications/editors/neovim/qt.nix { - qt5 = qt55; - libmsgpack = libmsgpack_1_4; - }; + neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; + neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; + vis = callPackage ../applications/editors/vis { inherit (lua52Packages) lpeg; }; @@ -15366,6 +15436,8 @@ with pkgs; spice_gtk = spice_gtk; }; + virt-top = callPackage ../applications/virtualization/virt-top { }; + virtmanager = callPackage ../applications/virtualization/virt-manager { vte = gnome3.vte; dconf = gnome3.dconf; @@ -15420,6 +15492,9 @@ with pkgs; primusLib_i686 = if system == "x86_64-linux" then pkgsi686Linux.primusLib else null; + libglvnd_i686 = if system == "x86_64-linux" + then pkgsi686Linux.libglvnd + else null; }; vkeybd = callPackage ../applications/audio/vkeybd {}; @@ -15488,7 +15563,7 @@ with pkgs; }; weston = callPackage ../applications/window-managers/weston { - freerdp = freerdpUnstable; + freerdp = freerdp_legacy; }; windowlab = callPackage ../applications/window-managers/windowlab { }; @@ -15519,6 +15594,8 @@ with pkgs; wordnet = callPackage ../applications/misc/wordnet { }; + worker = callPackage ../applications/misc/worker { }; + workrave = callPackage ../applications/misc/workrave { inherit (gnome2) GConf gconfmm; inherit (python27Packages) cheetah; @@ -15546,12 +15623,15 @@ with pkgs; ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast ++ optional (cfg.enableMednafenPSX or false) mednafen-psx + ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn + ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePPSSPP or false) ppsspp ++ optional (cfg.enableQuickNES or false) quicknes + ++ optional (cfg.enableReicast or false) reicast ++ optional (cfg.enableScummVM or false) scummvm ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9xNext or false) snes9x-next @@ -15570,10 +15650,12 @@ with pkgs; plugins = let inherit (lib) optional optionals; in with kodiPlugins; ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.kodi.enableGenesis or false) genesis + ++ optionals (config.kodi.enableControllers or false) + (with controllers; + [ default dreamcast gba genesis mouse n64 nes ps snes ]) + ++ optional (config.kodi.enableExodus or false) exodus ++ optionals (config.kodi.enableHyperLauncher or false) (with hyper-launcher; [ plugin service pdfreader ]) - ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common] ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts @@ -15702,9 +15784,7 @@ with pkgs; inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; - apvlv = callPackage ../applications/misc/apvlv { - gtk2 = gtk2-x11; - }; + apvlv = callPackage ../applications/misc/apvlv { }; xpdf = callPackage ../applications/misc/xpdf { base14Fonts = "${ghostscript}/share/ghostscript/fonts"; @@ -16026,6 +16106,8 @@ with pkgs; gav = callPackage ../games/gav { }; + gcs = callPackage ../games/gcs { }; + gemrb = callPackage ../games/gemrb { }; ghostOne = callPackage ../servers/games/ghost-one { }; @@ -16110,7 +16192,7 @@ with pkgs; minecraft-server = callPackage ../games/minecraft-server { }; - multimc = callPackage ../games/multimc { }; + multimc = qt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { libpng = libpng12; @@ -16452,6 +16534,8 @@ with pkgs; zangband = callPackage ../games/zangband { }; + zdbsp = callPackage ../games/zdoom/zdbsp.nix { }; + zdoom = callPackage ../games/zdoom { }; zod = callPackage ../games/zod { }; @@ -16588,7 +16672,7 @@ with pkgs; kvirc = callPackage ../applications/networking/irc/kvirc { }; - krename = callPackage ../applications/misc/krename { + krename = callPackage ../applications/misc/krename/kde4.nix { taglib = taglib_1_9; }; @@ -16724,6 +16808,8 @@ with pkgs; inherit (python3Packages) python pygobject3 pyxdg; }; + redshift-plasma-applet = callPackage ../applications/misc/redshift-plasma-applet { }; + orion = callPackage ../misc/themes/orion {}; albatross = callPackage ../misc/themes/albatross { }; @@ -16789,6 +16875,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; + emboss = callPackage ../applications/science/biology/emboss { }; htslib = callPackage ../development/libraries/science/biology/htslib { }; @@ -16941,6 +17029,8 @@ with pkgs; ### SCIENCE/PROGRAMMING + dafny = dotnetPackages.Dafny; + plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC @@ -16955,6 +17045,8 @@ with pkgs; aspino = callPackage ../applications/science/logic/aspino {}; + boogie = dotnetPackages.Boogie; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { make = pkgs.gnumake3; inherit (ocamlPackages_3_12_1) ocaml findlib; @@ -17249,11 +17341,7 @@ with pkgs; yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = callPackage ../applications/science/math/speedcrunch { - qt = qt4; - cmake = cmakeCurses; - }; - + speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC @@ -17356,6 +17444,8 @@ with pkgs; areca = callPackage ../applications/backup/areca { }; + attract-mode = callPackage ../misc/emulators/attract-mode { }; + beep = callPackage ../misc/beep { }; blackbird = callPackage ../misc/themes/blackbird { }; @@ -17424,6 +17514,10 @@ with pkgs; electricsheep = callPackage ../misc/screensavers/electricsheep { }; + flam3 = callPackage ../tools/graphics/flam3 { }; + + glee = callPackage ../tools/graphics/glee { }; + fakenes = callPackage ../misc/emulators/fakenes { }; faust = self.faust2; @@ -17507,6 +17601,8 @@ with pkgs; hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; + illum = callPackage ../tools/system/illum { }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -17561,8 +17657,6 @@ with pkgs; nix-prefetch-zip nix-prefetch-scripts; - nix-update-source = callPackage ../tools/package-management/nix-update-source {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; nix-repl = callPackage ../tools/package-management/nix-repl { }; @@ -17745,7 +17839,7 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; + tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = null; }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; @@ -17814,6 +17908,8 @@ with pkgs; vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; + vokoscreen = qt5.callPackage ../applications/video/vokoscreen { }; + wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { }; @@ -17875,6 +17971,8 @@ with pkgs; wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; + wraith = callPackage ../applications/networking/irc/wraith { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; @@ -17979,6 +18077,8 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; + tomboy = callPackage ../applications/misc/tomboy {}; + imatix_gsl = callPackage ../development/tools/imatix_gsl {}; iterm2 = callPackage ../applications/misc/iterm2 {}; |