diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 598 |
1 files changed, 303 insertions, 295 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3957a6d95b..eed258716c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -279,14 +279,19 @@ let }; buildFHSUserEnv = args: userFHSEnv { - env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" ]); + env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" ]); runScript = args.runScript or "bash"; extraBindMounts = args.extraBindMounts or []; extraInstallCommands = args.extraInstallCommands or ""; + importMeta = args.meta or {}; }; buildMaven = callPackage ../build-support/build-maven.nix {}; + cmark = callPackage ../development/libraries/cmark { }; + + dockerTools = callPackage ../build-support/docker { }; + dotnetenv = callPackage ../build-support/dotnetenv { dotnetfx = dotnetfx40; }; @@ -470,9 +475,7 @@ let _9pfs = callPackage ../tools/filesystems/9pfs { }; - "3dfsb" = callPackage ../applications/misc/3dfsb { - glibc = glibc.override { debugSymbols = true; }; - }; + a2ps = callPackage ../tools/text/a2ps { }; abduco = callPackage ../tools/misc/abduco { }; @@ -516,7 +519,7 @@ let aide = callPackage ../tools/security/aide { }; - aircrackng = callPackage ../tools/networking/aircrack-ng { }; + aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; airfield = callPackage ../tools/networking/airfield { }; @@ -577,6 +580,8 @@ let awscli = pythonPackages.awscli; + azure-cli = callPackage ../tools/virtualization/azure-cli { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -627,6 +632,8 @@ let inherit (androidenv) androidsdk_4_4 androidndk; + androidsdk = androidenv.androidsdk_6_0; + arc-gtk-theme = callPackage ../misc/themes/arc { }; aria2 = callPackage ../tools/networking/aria2 { @@ -731,7 +738,7 @@ let bsod = callPackage ../misc/emulators/bsod { }; - btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -891,6 +898,8 @@ let pynotify = pythonPackages.notify; }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; + syslogng = callPackage ../tools/system/syslog-ng { }; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; @@ -1289,6 +1298,8 @@ let dhcpcd = callPackage ../tools/networking/dhcpcd { }; + dhcping = callPackage ../tools/networking/dhcping { }; + di = callPackage ../tools/system/di { }; diffoscope = callPackage ../tools/misc/diffoscope { @@ -1554,8 +1565,6 @@ let ftop = callPackage ../os-specific/linux/ftop { }; - fuppes = callPackage ../tools/networking/fuppes { }; - fsfs = callPackage ../tools/filesystems/fsfs { }; fuseiso = callPackage ../tools/filesystems/fuseiso { }; @@ -1741,7 +1750,6 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; - automake = automake112x; # fails with 13 and 14 }; trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { }; @@ -1781,6 +1789,8 @@ let gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; + gtklick = callPackage ../applications/audio/gtklick {}; + gtdialog = callPackage ../development/libraries/gtdialog {}; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; @@ -1801,7 +1811,7 @@ let gupnp_igd = callPackage ../development/libraries/gupnp-igd {}; - gupnptools = callPackage ../tools/networking/gupnp-tools {}; + gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; gvpe = callPackage ../tools/networking/gvpe { }; @@ -1969,6 +1979,7 @@ let isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { }; isync = callPackage ../tools/networking/isync { }; + isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { }; jaaa = callPackage ../applications/audio/jaaa { }; @@ -1992,6 +2003,8 @@ let jp2a = callPackage ../applications/misc/jp2a { }; + jpegoptim = callPackage ../applications/graphics/jpegoptim { }; + jq = callPackage ../development/tools/jq {}; jscoverage = callPackage ../development/tools/misc/jscoverage { }; @@ -2020,6 +2033,8 @@ let kismet = callPackage ../applications/networking/sniffers/kismet { }; + klick = callPackage ../applications/audio/klick { }; + knockknock = callPackage ../tools/security/knockknock { }; kpcli = callPackage ../tools/security/kpcli { }; @@ -2056,6 +2071,8 @@ let makebootfat = callPackage ../tools/misc/makebootfat { }; + matrix-synapse = callPackage ../servers/matrix-synapse { }; + memtester = callPackage ../tools/system/memtester { }; minidlna = callPackage ../tools/networking/minidlna { }; @@ -2226,8 +2243,6 @@ let man_db = callPackage ../tools/misc/man-db { }; - mates = callPackage ../tools/misc/mates { }; - mawk = callPackage ../tools/text/mawk { }; mbox = callPackage ../tools/security/mbox { }; @@ -2345,10 +2360,6 @@ let munge = callPackage ../tools/security/munge { }; - muscleframework = callPackage ../tools/security/muscleframework { }; - - muscletool = callPackage ../tools/security/muscletool { }; - mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; nabi = callPackage ../tools/inputmethods/nabi { }; @@ -2456,8 +2467,6 @@ let graphicalSupport = true; }; - notbit = callPackage ../applications/networking/notbit { }; - notify-osd = callPackage ../applications/misc/notify-osd { }; nox = callPackage ../tools/package-management/nox { @@ -2473,8 +2482,6 @@ let # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntop = callPackage ../tools/networking/ntop { }; - ntopng = callPackage ../tools/networking/ntopng { }; ntp = callPackage ../tools/networking/ntp { @@ -2550,8 +2557,6 @@ let opensc = callPackage ../tools/security/opensc { }; - opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { }; - openssh = callPackage ../tools/networking/openssh { hpnSupport = false; @@ -2625,11 +2630,11 @@ let panomatic = callPackage ../tools/graphics/panomatic { }; + pamtester = callPackage ../tools/security/pamtester { }; + paper-gtk-theme = callPackage ../misc/themes/gtk3/paper-gtk-theme { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { - automake = automake112x; # fails with 14 - }; + par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; @@ -2704,6 +2709,8 @@ let bully = callPackage ../tools/networking/bully { }; + pcapc = callPackage ../tools/networking/pcapc { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; peco = callPackage ../tools/text/peco { }; @@ -2736,6 +2743,10 @@ let libcap = if stdenv.isDarwin then null else libcap; }; + pinentry_mac = callPackage ../tools/security/pinentry-mac { }; + + pingtcp = callPackage ../tools/networking/pingtcp { }; + pius = callPackage ../tools/security/pius { }; pk2cmd = callPackage ../tools/misc/pk2cmd { }; @@ -2744,6 +2755,9 @@ let plan9port = callPackage ../tools/system/plan9port { }; + platformioPackages = callPackage ../development/arduino/platformio { }; + platformio = platformioPackages.platformio-chrootenv.override {}; + plex = callPackage ../servers/plex { }; ploticus = callPackage ../tools/graphics/ploticus { @@ -2884,6 +2898,8 @@ let redmine = callPackage ../applications/version-management/redmine { }; + rt = callPackage ../servers/rt { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; @@ -3020,6 +3036,8 @@ let seccure = callPackage ../tools/security/seccure { }; + setroot = callPackage ../tools/X11/setroot { }; + setserial = callPackage ../tools/system/setserial { }; seqdiag = pythonPackages.seqdiag; @@ -3030,7 +3048,9 @@ let sharutils = callPackage ../tools/archivers/sharutils { }; - shotwell = callPackage ../applications/graphics/shotwell { }; + shotwell = callPackage ../applications/graphics/shotwell { + vala = vala_0_28; + }; shout = callPackage ../applications/networking/irc/shout { }; @@ -3188,7 +3208,7 @@ let sysbench = callPackage ../development/tools/misc/sysbench {}; - system_config_printer = callPackage ../tools/misc/system-config-printer { + system-config-printer = callPackage ../tools/misc/system-config-printer { libxml2 = libxml2Python; }; @@ -3249,6 +3269,8 @@ let tlsdate = callPackage ../tools/networking/tlsdate { }; + tldr = callPackage ../tools/misc/tldr { }; + tmate = callPackage ../tools/misc/tmate { }; tmpwatch = callPackage ../tools/misc/tmpwatch { }; @@ -3323,6 +3345,8 @@ let txt2tags = callPackage ../tools/text/txt2tags { }; + txtw = callPackage ../tools/misc/txtw { }; + u9fs = callPackage ../servers/u9fs { }; ucl = callPackage ../development/libraries/ucl { }; @@ -3365,7 +3389,7 @@ let vidalia = callPackage ../tools/security/vidalia { }; - vbetool = builderDefsPackage (callPackage ../tools/system/vbetool) { }; + vbetool = callPackage ../tools/system/vbetool { }; vde2 = callPackage ../tools/networking/vde2 { }; @@ -3464,9 +3488,6 @@ let tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; - # The newer package is low-priority because it segfaults at startup. - tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix { }); - tm = callPackage ../tools/system/tm { }; tradcpp = callPackage ../development/tools/tradcpp { }; @@ -3511,6 +3532,8 @@ let xbrightness = callPackage ../tools/X11/xbrightness { }; + xfstests = callPackage ../tools/misc/xfstests { }; + xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; xsettingsd = callPackage ../tools/X11/xsettingsd { }; @@ -3519,6 +3542,8 @@ let xcruiser = callPackage ../applications/misc/xcruiser { }; + xxkb = callPackage ../applications/misc/xxkb { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -3637,6 +3662,7 @@ let xtitle = callPackage ../tools/misc/xtitle { }; xdelta = callPackage ../tools/compression/xdelta { }; + xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { }; xdummy = callPackage ../tools/misc/xdummy { }; @@ -3655,8 +3681,6 @@ let w3m = w3m-batch; }; - xmltv = callPackage ../tools/misc/xmltv { }; - xmpppy = pythonPackages.xmpppy; xorriso = callPackage ../tools/cd-dvd/xorriso { }; @@ -3744,6 +3768,8 @@ let python = python27Full; }; + fish-foreign-env = callPackage ../shells/fish-foreign-env { }; + mksh = callPackage ../shells/mksh { }; pash = callPackage ../shells/pash { }; @@ -3776,6 +3802,8 @@ let aliceml = callPackage ../development/compilers/aliceml { }; + arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; + aspectj = callPackage ../development/compilers/aspectj { }; ats = callPackage ../development/compilers/ats { }; @@ -4171,12 +4199,12 @@ let icedtea7_web = callPackage ../development/compilers/icedtea-web { jdk = jdk7; - xulrunner = firefox; + xulrunner = firefox-unwrapped; }; icedtea8_web = callPackage ../development/compilers/icedtea-web { jdk = jdk8; - xulrunner = firefox; + xulrunner = firefox-unwrapped; }; icedtea_web = icedtea8_web; @@ -4201,9 +4229,13 @@ let bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; }; - openjdk8 = callPackage ../development/compilers/openjdk/8.nix { - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; - }; + openjdk8 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk-darwin/8.nix { } + else + callPackage ../development/compilers/openjdk/8.nix { + bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; + }; openjdk = if stdenv.isDarwin then openjdk7 else openjdk8; @@ -4858,8 +4890,7 @@ let rustPlatform = rustStable; rustStable = recurseIntoAttrs (makeRustPlatform cargo rustStable); - rustUnstable = recurseIntoAttrs (makeRustPlatform - (cargo.override { rustPlatform = rustUnstableCargoPlatform; }) rustUnstable); + rustUnstable = recurseIntoAttrs (makeRustPlatform cargoUnstable rustUnstable); # rust platform to build cargo itself (with cargoSnapshot) rustCargoPlatform = makeRustPlatform (cargoSnapshot rustc) rustCargoPlatform; @@ -4931,6 +4962,12 @@ let tbb = callPackage ../development/libraries/tbb { }; + terra = callPackage ../development/compilers/terra { + llvm = llvmPackages_35.llvm.override { enableSharedLibraries = false; }; + clang = clang_35; + lua = lua5_1; + }; + teyjus = callPackage ../development/compilers/teyjus { omake = omake_rc1; }; @@ -4999,6 +5036,8 @@ let yasm = callPackage ../development/compilers/yasm { }; + yosys = callPackage ../development/compilers/yosys { }; + ### DEVELOPMENT / INTERPRETERS @@ -5055,9 +5094,11 @@ let rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; + rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { }; fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { }; erlangPackages = callPackage ../development/erlang-modules { }; + hex2nix = erlangPackages.callPackage ../development/tools/erlang/hex2nix { }; elixir = callPackage ../development/interpreters/elixir { }; @@ -5285,11 +5326,9 @@ let ruby = ruby_2_1_3; }; bundler = callPackage ../development/interpreters/ruby/bundler.nix { }; - bundler_HEAD = import ../development/interpreters/ruby/bundler-head.nix { - inherit buildRubyGem coreutils fetchgit; - }; - defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { }; - buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { }; + bundler_HEAD = bundler; + defaultGemConfig = callPackage ../development/interpreters/ruby/gemconfig/default.nix { }; + buildRubyGem = callPackage ../development/interpreters/ruby/build-ruby-gem { }; bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; inherit (callPackage ../development/interpreters/ruby {}) @@ -5305,10 +5344,7 @@ let ruby_2_1 = ruby_2_1_7; ruby_2_2 = ruby_2_2_3; - rubygemsFun = ruby: builderDefsPackage (callPackage ../development/interpreters/ruby/rubygems.nix) { - inherit ruby; - }; - rubygems = hiPrio (rubygemsFun ruby); + rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {}); rq = callPackage ../applications/networking/cluster/rq { }; @@ -5399,7 +5435,10 @@ let guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; - pharo-vm = callPackage_i686 ../development/pharo/vm { }; + pharo-vms = callPackage_i686 ../development/pharo/vm { }; + pharo-vm = pharo-vms.pharo-no-spur; + pharo-vm5 = pharo-vms.pharo-spur; + pharo-launcher = callPackage ../development/pharo/launcher { }; srecord = callPackage ../development/tools/misc/srecord { }; @@ -5516,6 +5555,10 @@ let rustPlatform = rustCargoPlatform; }; + cargoUnstable = callPackage ../development/tools/build-managers/cargo/head.nix { + rustPlatform = rustUnstableCargoPlatform; + }; + cargoSnapshot = rustc: callPackage ../development/tools/build-managers/cargo/snapshot.nix { inherit rustc; @@ -5571,6 +5614,8 @@ let complexity = callPackage ../development/tools/misc/complexity { }; + cookiecutter = pythonPackages.cookiecutter; + ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; @@ -5755,6 +5800,8 @@ let hyenae = callPackage ../tools/networking/hyenae { }; + icestorm = callPackage ../development/tools/icestorm { }; + icmake = callPackage ../development/tools/build-managers/icmake { }; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { @@ -5773,6 +5820,8 @@ let intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {}; + iozone = callPackage ../development/tools/misc/iozone { }; + ired = callPackage ../development/tools/analysis/radare/ired.nix { }; itstool = callPackage ../development/tools/misc/itstool { }; @@ -6091,6 +6140,9 @@ let aprutil = callPackage ../development/libraries/apr-util { bdbSupport = true; + db = if stdenv.isFreeBSD then db47 else db; + # XXX: only the db_185 interface was available through + # apr with db58 on freebsd (nov 2015), for unknown reasons }; assimp = callPackage ../development/libraries/assimp { }; @@ -6105,8 +6157,6 @@ let aterm25 = callPackage ../development/libraries/aterm/2.5.nix { }; - aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { }); - attica = callPackage ../development/libraries/attica { }; attr = callPackage ../development/libraries/attr { }; @@ -6153,8 +6203,6 @@ let fetchurl = fetchurlBoot; }; - caelum = callPackage ../development/libraries/caelum { }; - capnproto = callPackage ../development/libraries/capnproto { }; ccnx = callPackage ../development/libraries/ccnx { }; @@ -6269,7 +6317,9 @@ let cwiid = callPackage ../development/libraries/cwiid { }; - cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; + cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { + kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; + }; # Make bdb5 the default as it is the last release under the custom # bsd-like license @@ -6341,6 +6391,8 @@ let faad2 = callPackage ../development/libraries/faad2 { }; + farbfeld = callPackage ../development/libraries/farbfeld { }; + farsight2 = callPackage ../development/libraries/farsight2 { }; farstream = callPackage ../development/libraries/farstream { @@ -6358,9 +6410,6 @@ let ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -6456,7 +6505,9 @@ let gdbm = callPackage ../development/libraries/gdbm { }; - gecode = callPackage ../development/libraries/gecode { }; + gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; + gecode_4 = callPackage ../development/libraries/gecode { }; + gecode = gecode_4; gegl = callPackage ../development/libraries/gegl { }; @@ -6597,6 +6648,14 @@ let gstPluginsGood = pkgs.gst_plugins_good; gstPluginsUgly = pkgs.gst_plugins_ugly; gstFfmpeg = pkgs.gst_ffmpeg; + + # aliases with the dashed naming, same as in gst_all_1 + gst-plugins-base = pkgs.gst_plugins_base; + gst-plugins-bad = pkgs.gst_plugins_bad; + gst-plugins-good = pkgs.gst_plugins_good; + gst-plugins-ugly = pkgs.gst_plugins_ugly; + gst-ffmpeg = pkgs.gst_ffmpeg; + gst-python = pkgs.gst_python; }; gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { @@ -7018,6 +7077,8 @@ let libcm = callPackage ../development/libraries/libcm { }; + libcommuni = callPackage ../development/libraries/libcommuni { }; + inherit (gnome3) libcroco; libcangjie = callPackage ../development/libraries/libcangjie { }; @@ -7055,8 +7116,6 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; }; - libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; - libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -7104,7 +7163,9 @@ let libedit = callPackage ../development/libraries/libedit { }; - libelf = callPackage ../development/libraries/libelf { }; + libelf = if stdenv.isFreeBSD + then callPackage ../development/libraries/libelf-freebsd { } + else callPackage ../development/libraries/libelf { }; libetpan = callPackage ../development/libraries/libetpan { }; @@ -7406,8 +7467,6 @@ let libmspack = callPackage ../development/libraries/libmspack { }; - libmusclecard = callPackage ../development/libraries/libmusclecard { }; - libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { }; libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { }; @@ -7789,6 +7848,7 @@ let mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; + llvmPackages = llvmPackages_36; # various problems with 3.7; see #11367, #11467 }; in mo.drivers ); @@ -7799,23 +7859,6 @@ let meterbridge = callPackage ../applications/audio/meterbridge { }; - metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { - sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; - toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; - cLibrary = callPackage ../development/libraries/c-library { aterm = aterm28; }; - errorSupport = callPackage ../development/libraries/error-support { aterm = aterm28; }; - ptSupport = callPackage ../development/libraries/pt-support { aterm = aterm28; }; - ptableSupport = callPackage ../development/libraries/ptable-support { aterm = aterm28; }; - configSupport = callPackage ../development/libraries/config-support { aterm = aterm28; }; - asfSupport = callPackage ../development/libraries/asf-support { aterm = aterm28; }; - tideSupport = callPackage ../development/libraries/tide-support { aterm = aterm28; }; - rstoreSupport = callPackage ../development/libraries/rstore-support { aterm = aterm28; }; - sdfSupport = callPackage ../development/libraries/sdf-support { aterm = aterm28; }; - sglr = callPackage ../development/libraries/sglr { aterm = aterm28; }; - ascSupport = callPackage ../development/libraries/asc-support { aterm = aterm28; }; - pgen = callPackage ../development/libraries/pgen { aterm = aterm28; }; - }); - mhddfs = callPackage ../tools/filesystems/mhddfs { }; ming = callPackage ../development/libraries/ming { }; @@ -7880,8 +7923,6 @@ let mygui = callPackage ../development/libraries/mygui {}; - myguiSvn = callPackage ../development/libraries/mygui/svn.nix {}; - mysocketw = callPackage ../development/libraries/mysocketw { }; mythes = callPackage ../development/libraries/mythes { }; @@ -7966,10 +8007,6 @@ let opencv = callPackage ../development/libraries/opencv { }; - opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { - libpng = libpng12; - }; - opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; # this ctl version is needed by openexr_viewers @@ -7979,8 +8016,6 @@ let openldap = callPackage ../development/libraries/openldap { }; - libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { }; - opencolorio = callPackage ../development/libraries/opencolorio { }; ois = callPackage ../development/libraries/ois {}; @@ -7999,6 +8034,8 @@ let ffmpeg = ffmpeg_0; }; + openslp = callPackage ../development/libraries/openslp {}; + # 2.3 breaks some backward-compability libressl = libressl_2_2; libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { @@ -8084,8 +8121,6 @@ let polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { }; - policykit = callPackage ../development/libraries/policykit { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_min = poppler.override { # TODO: maybe reduce even more @@ -8151,6 +8186,9 @@ let mesa = mesa_noglu; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; + + # XXX: mariadb doesn't built on fbsd as of nov 2015 + mysql = if (!stdenv.isFreeBSD) then mysql else null; }; qt48Full = appendToName "full" (qt48.override { @@ -8519,7 +8557,11 @@ let python = python2; }; - thrift = callPackage ../development/libraries/thrift { }; + tet = callPackage ../development/tools/misc/tet { }; + + thrift = callPackage ../development/libraries/thrift { + inherit (pythonPackages) twisted; + }; tidyp = callPackage ../development/libraries/tidyp { }; @@ -9002,8 +9044,6 @@ let self = pypyPackages; }); - foursuite = pythonPackages.foursuite; - bsddb3 = pythonPackages.bsddb3; ecdsa = pythonPackages.ecdsa; @@ -9072,6 +9112,8 @@ let }; openblas = openblasCompat; withRecommendedPackages = false; + inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; + inherit (darwin) cf-private libobjc; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -9188,11 +9230,13 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; + dspam = callPackage ../servers/mail/dspam { + inherit (perlPackages) NetSMTP; + }; + etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; }; - ejabberd = callPackage ../servers/xmpp/ejabberd { - erlang = erlangR16; - }; + ejabberd = callPackage ../servers/xmpp/ejabberd { }; prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; @@ -9338,6 +9382,12 @@ let postfix30 = callPackage ../servers/mail/postfix/3.0.nix { }; postfix = postfix30; + postsrsd = callPackage ../servers/mail/postsrsd { }; + + rmilter = callPackage ../servers/mail/rmilter { }; + + rspamd = callPackage ../servers/mail/rspamd { }; + pshs = callPackage ../servers/http/pshs { }; libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; @@ -9441,7 +9491,8 @@ let postgresql91 postgresql92 postgresql93 - postgresql94; + postgresql94 + postgresql95; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -9474,8 +9525,6 @@ let inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; }; - radius = callPackage ../servers/radius { }; - redis = callPackage ../servers/nosql/redis { }; redstore = callPackage ../servers/http/redstore { }; @@ -9548,7 +9597,10 @@ let ruby = ruby_2_1; }; - shishi = callPackage ../servers/shishi { }; + shishi = callPackage ../servers/shishi { + pam = if stdenv.isLinux then pam else null; + # see also openssl, which has/had this same trick + }; sipcmd = callPackage ../applications/networking/sipcmd { }; @@ -9620,10 +9672,6 @@ let libdrm = if stdenv.isLinux then libdrm else null; } // { inherit xlibsWrapper; } ); - xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; - - xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { }; - xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; yaws = callPackage ../servers/http/yaws { erlang = erlangR17; }; @@ -9914,6 +9962,8 @@ let ipset = callPackage ../os-specific/linux/ipset { }; + irqbalance = callPackage ../os-specific/linux/irqbalance { }; + iw = callPackage ../os-specific/linux/iw { }; jfbview = callPackage ../os-specific/linux/jfbview { }; @@ -10037,6 +10087,15 @@ let ]; }; + linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.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_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -10133,8 +10192,6 @@ let openafsClient = callPackage ../servers/openafs-client { }; - wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; klibc = callPackage ../os-specific/linux/klibc { }; @@ -10199,7 +10256,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_3; + linuxPackages_latest = pkgs.linuxPackages_4_4; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -10212,6 +10269,7 @@ let linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2); linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3); + linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; @@ -10480,10 +10538,6 @@ let udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.* }; - systemtap = callPackage ../development/tools/profiling/systemtap { - inherit (gnome) libglademm; - }; - # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get # LVM2 working in systemd. systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: { @@ -11072,9 +11126,7 @@ let audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { - ffmpeg = ffmpeg_2_2; - }; + audacity = callPackage ../applications/audio/audacity { }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -11128,10 +11180,6 @@ let bandwidth = callPackage ../tools/misc/bandwidth { }; - bar = callPackage ../applications/window-managers/bar { }; - - bar-xft = callPackage ../applications/window-managers/bar/xft.nix { }; - baresip = callPackage ../applications/networking/instant-messengers/baresip { ffmpeg = ffmpeg_1; }; @@ -11144,7 +11192,6 @@ let jack = jack1; }; - cbatticon = callPackage ../applications/misc/cbatticon { }; bazaar = callPackage ../applications/version-management/bazaar { }; @@ -11179,6 +11226,11 @@ let bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; + bomi = qt5.callPackage ../applications/video/bomi { + youtube-dl = pythonPackages.youtube-dl; + pulseSupport = config.pulseaudio or true; + }; + brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; bristol = callPackage ../applications/audio/bristol { }; @@ -11216,15 +11268,18 @@ let cava = callPackage ../applications/audio/cava { }; - cbc = callPackage ../applications/science/math/cbc { }; + cbatticon = callPackage ../applications/misc/cbatticon { }; - cc1394 = callPackage ../applications/video/cc1394 { }; + cbc = callPackage ../applications/science/math/cbc { }; cddiscid = callPackage ../applications/audio/cd-discid { }; cdparanoia = cdparanoiaIII; - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; + cdparanoiaIII = callPackage ../applications/audio/cdparanoia { + inherit (darwin) IOKit; + inherit (darwin.apple_sdk.frameworks) Carbon; + }; cdrtools = callPackage ../applications/misc/cdrtools { }; @@ -11275,11 +11330,6 @@ let cmatrix = callPackage ../applications/misc/cmatrix { }; - bomi = qt5.callPackage ../applications/video/bomi { - youtube-dl = pythonPackages.youtube-dl; - pulseSupport = config.pulseaudio or true; - }; - cmus = callPackage ../applications/audio/cmus { libjack = libjack2; libcdio = libcdio082; @@ -11287,6 +11337,8 @@ let pulseaudioSupport = config.pulseaudio or false; }; + communi = callPackage ../applications/networking/irc/communi { }; + CompBus = callPackage ../applications/audio/CompBus { }; compiz = callPackage ../applications/window-managers/compiz { @@ -11316,13 +11368,8 @@ let comical = callPackage ../applications/graphics/comical { }; - conkeror = callPackage ../applications/networking/browsers/conkeror { }; - - conkerorWrapper = wrapFirefox { - browser = conkeror; - browserName = "conkeror"; - desktopName = "Conkeror"; - }; + conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; + conkeror = wrapFirefox conkeror-unwrapped { }; csdp = callPackage ../applications/science/math/csdp { liblapack = liblapackWithoutAtlas; @@ -11430,11 +11477,8 @@ let dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; - - dwbWrapper = wrapFirefox - { browser = dwb; browserName = "dwb"; desktopName = "dwb"; - }; + dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; + dwb = wrapFirefox dwb-unwrapped { desktopName = "dwb"; }; dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; @@ -11481,18 +11525,14 @@ let withGTK3 = false; })); - emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix { - stdenv = pkgs.clangStdenv; - }); - emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { - stdenv = pkgs.clangStdenv; - }); - emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix { - stdenv = pkgs.clangStdenv; + emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { + inherit (darwin.apple_sdk.frameworks) + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + ImageCaptureCore GSS ImageIO; }); emacs24Macport = self.emacs24Macport_24_5; - emacs25pre = callPackage ../applications/editors/emacs-25 { + emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -11503,7 +11543,7 @@ let gpm = null; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin) libobjc; - }; + }); emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -11602,6 +11642,8 @@ let notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; + ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; @@ -11658,8 +11700,6 @@ let xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; cask = callPackage ../applications/editors/emacs-modes/cask { }; - - slime = callPackage ../applications/editors/emacs-modes/slime { }; }; emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); @@ -11686,7 +11726,7 @@ let }; }; - emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); + emacs24PackagesNg = emacsPackagesNgGen emacs24; emacs24WithPackages = emacs24PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; @@ -11830,10 +11870,10 @@ let inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; - }) firefox firefox-esr; + }) firefox-unwrapped firefox-esr-unwrapped; - firefox-wrapper = wrapFirefox { browser = pkgs.firefox; }; - firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; }; + firefox = wrapFirefox firefox-unwrapped { }; + firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; @@ -12019,16 +12059,11 @@ let java = if stdenv.isLinux then jre else jdk; }; - qrdecode = callPackage ../tools/graphics/qrdecode { - libpng = libpng12; - opencv = opencv_2_1; - }; - qrencode = callPackage ../tools/graphics/qrencode { }; gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { inherit (gnome) GConf; - browser = firefox; + browser = firefox-unwrapped; }; geeqie = callPackage ../applications/graphics/geeqie { }; @@ -12071,7 +12106,9 @@ let gv = callPackage ../applications/misc/gv { }; - guvcview = callPackage ../os-specific/linux/guvcview { }; + guvcview = callPackage ../os-specific/linux/guvcview { + pulseaudioSupport = config.pulseaudio or true; + }; gxmessage = callPackage ../applications/misc/gxmessage { }; @@ -12122,6 +12159,8 @@ let i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; + i3cat = goPackages.i3cat.bin // { outputs = [ "bin" ]; }; + i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; }; }; @@ -12188,6 +12227,8 @@ let lcms = lcms2; }; + inspectrum = callPackage ../applications/misc/inspectrum { }; + ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5; }; @@ -12256,7 +12297,7 @@ let kermit = callPackage ../tools/misc/kermit { }; - keyfinder = qt5.callPackage ../applications/audio/keyfinder { }; + keyfinder = qt55.callPackage ../applications/audio/keyfinder { }; keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { }; @@ -12320,6 +12361,10 @@ let inherit (gnome) libglade; }; + lemonbar = callPackage ../applications/window-managers/lemonbar { }; + + lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; + leo-editor = callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; @@ -12449,12 +12494,10 @@ let mid2key = callPackage ../applications/audio/mid2key { }; - midori = callPackage ../applications/networking/browsers/midori { + midori-unwrapped = callPackage ../applications/networking/browsers/midori { webkitgtk = webkitgtk24x; }; - - midoriWrapper = wrapFirefox - { browser = midori; browserName = "midori"; desktopName = "Midori"; }; + midori = wrapFirefox midori-unwrapped { }; mikmod = callPackage ../applications/audio/mikmod { }; @@ -12524,6 +12567,8 @@ let mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; + mozjpeg = callPackage ../applications/graphics/mozjpeg { }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -12609,6 +12654,8 @@ let oroborus = callPackage ../applications/window-managers/oroborus {}; + ostinato = callPackage ../applications/networking/ostinato { }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { ruby = ruby_2_1; }; @@ -12674,10 +12721,6 @@ let mythtv = callPackage ../applications/video/mythtv { }; - tvtime = callPackage ../applications/video/tvtime { - kernel = linux; - }; - nano = callPackage ../applications/editors/nano { }; nanoblogger = callPackage ../applications/misc/nanoblogger { }; @@ -12698,9 +12741,6 @@ let motif = lesstif; }; - netsurfBrowser = netsurf.browser; - netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf {}); - notmuch = callPackage ../applications/networking/mailreaders/notmuch { # No need to build Emacs - notmuch.el works just fine without # byte-compilation. Use emacs24Packages.notmuch if you want to @@ -12901,6 +12941,8 @@ let puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; + pythonmagick = callPackage ../applications/graphics/PythonMagick { }; qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { @@ -12994,9 +13036,7 @@ let rkt = callPackage ../applications/virtualization/rkt { }; - rofi = callPackage ../applications/misc/rofi { - automake = automake114x; - }; + rofi = callPackage ../applications/misc/rofi { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -13199,6 +13239,8 @@ let apiKey = config.libspotify.apiKey or null; }; + ltunify = callPackage ../tools/misc/ltunify { }; + src = callPackage ../applications/version-management/src/default.nix { git = gitMinimal; }; @@ -13238,7 +13280,7 @@ let subunit = callPackage ../development/libraries/subunit { }; - surf = callPackage ../applications/misc/surf { + surf = callPackage ../applications/networking/browsers/surf { webkit = webkitgtk2; }; @@ -13434,8 +13476,6 @@ let vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; - veracity = callPackage ../applications/version-management/veracity {}; - viewMtn = builderDefsPackage (callPackage ../applications/version-management/viewmtn/0.10.nix) { flup = pythonPackages.flup; @@ -13588,6 +13628,8 @@ let freerdp = freerdpUnstable; }; + windowlab = callPackage ../applications/window-managers/windowlab { }; + windowmaker = callPackage ../applications/window-managers/windowmaker { }; alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; @@ -13618,43 +13660,7 @@ let inherit (python27Packages) cheetah; }; - wrapFirefox = - { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" - , icon ? browserName }: - let - cfg = stdenv.lib.attrByPath [ browserName ] {} config; - enableAdobeFlash = cfg.enableAdobeFlash or false; - enableGnash = cfg.enableGnash or false; - jre = cfg.jre or false; - icedtea = cfg.icedtea or false; - in - callPackage ../applications/networking/browsers/firefox/wrapper.nix { - inherit browser browserName desktopName nameSuffix icon; - libtrick = true; - plugins = - assert !(enableGnash && enableAdobeFlash); - assert !(jre && icedtea); - ([ ] - ++ lib.optional enableGnash gnash - ++ lib.optional enableAdobeFlash flashplayer - ++ lib.optional (cfg.enableDjvu or false) (djview4) - ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) - ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer - ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea icedtea_web - ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin - ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell - ++ lib.optional (cfg.enableTrezor or false) trezor-bridge - ++ lib.optional (cfg.enableBluejeans or false) bluejeans - ); - libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) - ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash - ++ lib.optional (config.pulseaudio or false) libpulseaudio; - gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; - gtk_modules = [ libcanberra ]; - }; + wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; retroArchCores = let @@ -13691,13 +13697,14 @@ let wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix { inherit kodi; - plugins = let inherit (lib) optional; in with kodiPlugins; + plugins = let inherit (lib) optional optionals; in with kodiPlugins; ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher ++ optional (config.kodi.enableGenesis or false) genesis ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts + ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common] ); }; @@ -13758,8 +13765,6 @@ let xchainkeys = callPackage ../tools/X11/xchainkeys { }; - xchat = callPackage ../applications/networking/irc/xchat { }; - xchm = callPackage ../applications/misc/xchm { }; inherit (xorg) xcompmgr; @@ -13898,6 +13903,8 @@ let inherit (gnome) scrollkeeper libglade; }; + xzgv = callPackage ../applications/graphics/xzgv { }; + yate = callPackage ../applications/misc/yate { }; inherit (gnome3) yelp; @@ -13950,7 +13957,9 @@ let pygtk = pyGtkGlade; }; - zotero = callPackage ../applications/office/zotero {}; + zotero = callPackage ../applications/office/zotero { + firefox = firefox-unwrapped; + }; zscroll = callPackage ../applications/misc/zscroll {}; @@ -14011,6 +14020,8 @@ let chessdb = callPackage ../games/chessdb { }; + chessx = qt5.callPackage ../games/chessx { }; + chocolateDoom = callPackage ../games/chocolate-doom { }; cockatrice = qt5.callPackage ../games/cockatrice { }; @@ -14081,7 +14092,9 @@ let fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = qt5.callPackage ../games/flightgear { }; + flightgear = qt5.callPackage ../games/flightgear { + fltk13 = fltk13.override { cfg.xftSupport = true; }; + }; freecell-solver = callPackage ../games/freecell-solver { }; @@ -14242,16 +14255,19 @@ let qqwing = callPackage ../games/qqwing { }; - quake3demo = callPackage ../games/quake3/wrapper { - name = "quake3-demo-${quake3game.name}"; + quake3wrapper = callPackage ../games/quake3/wrapper { }; + + quake3demo = quake3wrapper { + name = "quake3-demo-${lib.getVersion quake3demodata}"; description = "Demo of Quake 3 Arena, a classic first-person shooter"; - game = quake3game; - paks = [quake3demodata]; + paks = [ quake3pointrelease quake3demodata ]; }; - quake3demodata = callPackage ../games/quake3/demo { }; + quake3demodata = callPackage ../games/quake3/content/demo.nix { }; + + quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; - quake3game = callPackage ../games/quake3/game { }; + ioquake3 = callPackage ../games/quake3/ioquake { }; quantumminigolf = callPackage ../games/quantumminigolf {}; @@ -14261,10 +14277,6 @@ let openglSupport = mesaSupported; }; - rigsofrods = callPackage ../games/rigsofrods { - mygui = myguiSvn; - }; - rili = callPackage ../games/rili { }; rogue = callPackage ../games/rogue { }; @@ -14293,7 +14305,9 @@ let snake4 = callPackage ../games/snake4 { }; - soi = callPackage ../games/soi {}; + soi = callPackage ../games/soi { + lua = lua5_1; + }; # You still can override by passing more arguments. spaceOrbit = callPackage ../games/orbit { }; @@ -14307,6 +14321,8 @@ let stardust = callPackage ../games/stardust {}; + stockfish = callPackage ../games/stockfish { }; + steamPackages = callPackage ../games/steam { }; steam = steamPackages.steam-chrootenv.override { # DEPRECATED @@ -14474,25 +14490,6 @@ let ### DESKTOP ENVIRONMENTS - cinnamon = recurseIntoAttrs rec { - callPackage = newScope pkgs.cinnamon; - inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity; - - muffin = callPackage ../desktops/cinnamon/muffin.nix { } ; - - cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ }; - - cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ }; - - cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ; - - cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; - - cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; - - cjs = callPackage ../desktops/cinnamon/cjs.nix { }; - }; - clearlooks-phenix = callPackage ../misc/themes/gtk3/clearlooks-phenix { }; enlightenment = callPackage ../desktops/enlightenment { }; @@ -14513,7 +14510,7 @@ let gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); - gnome3 = gnome3_16; + gnome3 = gnome3_18; gnome = recurseIntoAttrs gnome2; @@ -14686,7 +14683,8 @@ let tag = "-client-without-kde"; }); - rekonq = callPackage ../applications/networking/browsers/rekonq { }; + rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { }; + rekonq = wrapFirefox rekonq-unwrapped { }; kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; @@ -14808,7 +14806,7 @@ let kde5 = let - frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; + frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; }; plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; @@ -14817,16 +14815,7 @@ let in recurseIntoAttrs (lib.makeScope qt55.newScope merged); - kde5_latest = - let - frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; - plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; - apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; - named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; - merged = self: - named self // frameworks self // plasma self // apps self // kde5PackagesFun self; - in - recurseIntoAttrs (lib.makeScope qt55.newScope merged); + kde5_latest = kde5; theme-vertex = callPackage ../misc/themes/vertex { }; @@ -14995,6 +14984,8 @@ let coqeal = callPackage ../development/coq-modules/coqeal {}; + coquelicot = callPackage ../development/coq-modules/coquelicot {}; + domains = callPackage ../development/coq-modules/domains {}; fiat = callPackage ../development/coq-modules/fiat {}; @@ -15029,8 +15020,12 @@ let coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + coquelicot = callPackage ../development/coq-modules/coquelicot {}; + flocq = callPackage ../development/coq-modules/flocq {}; + interval = callPackage ../development/coq-modules/interval {}; + mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; @@ -15307,13 +15302,15 @@ let cups_filters = callPackage ../misc/cups/filters.nix { }; + cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; + crashplan = callPackage ../applications/backup/crashplan { }; gutenprint = callPackage ../misc/drivers/gutenprint { }; gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; - cupsBjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; darcnes = callPackage ../misc/emulators/darcnes { }; @@ -15373,6 +15370,8 @@ let gajim = callPackage ../applications/networking/instant-messengers/gajim { }; + gale = callPackage ../applications/networking/instant-messengers/gale { }; + gammu = callPackage ../applications/misc/gammu { }; gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; @@ -15488,10 +15487,6 @@ let DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; - latex2html = callPackage ../tools/typesetting/tex/latex2html/default.nix { - tex = tetex; - }; - lkproof = callPackage ../tools/typesetting/tex/lkproof { }; mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { @@ -15530,6 +15525,8 @@ let PPSSPP = callPackage ../misc/emulators/ppsspp { SDL = SDL2; }; + pt = callPackage ../applications/misc/pt { }; + uae = callPackage ../misc/emulators/uae { }; fsuae = callPackage ../misc/emulators/fs-uae { }; @@ -15568,19 +15565,19 @@ let }; }; - saneBackends = callPackage ../applications/graphics/sane/backends { + sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null; }; - saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix { + sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null; }; mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; - saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; + sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; sct = callPackage ../tools/X11/sct {}; @@ -15687,35 +15684,25 @@ let vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; - vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }); - vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { + vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { webkit = webkitgtk2; }; + vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - vimprobable2Wrapper = wrapFirefox - { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2"; - }; - - rekonqWrapper = wrapFirefox { - browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq"; - }; + inherit (kde4) rekonq; - vimb = callPackage ../applications/networking/browsers/vimb { + vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; }; - - vimbWrapper = wrapFirefox { - browser = vimb; - browserName = "vimb"; - desktopName = "Vimb"; - }; + vimb = wrapFirefox vimb-unwrapped { }; vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; - VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; - wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { }; @@ -15725,6 +15712,7 @@ let wine = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; wineBuild = config.wine.build or "wine32"; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; }; wineStable = wine.override { wineRelease = "stable"; }; wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; }); @@ -15750,7 +15738,6 @@ let xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; - saneBackends = saneBackends; }; xwiimote = callPackage ../misc/drivers/xwiimote { @@ -15769,6 +15756,8 @@ let yara = callPackage ../tools/security/yara { }; + zap = callPackage ../tools/networking/zap { }; + zdfmediathk = callPackage ../applications/video/zdfmediathk { }; zopfli = callPackage ../tools/compression/zopfli { }; @@ -15836,17 +15825,25 @@ aliases = with self; rec { adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 + bar = lemonbar; # added 2015-01-16 + bar-xft = lemonbar-xft; # added 2015-01-16 bridge_utils = bridge-utils; # added 2015-02-20 buildbotSlave = buildbot-slave; # added 2014-12-09 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 clangAnalyzer = clang-analyzer; # added 2015-02-20 + conkerorWrapper = conkeror; # added 2015-01 cool-old-term = cool-retro-term; # added 2015-01-31 + cupsBjnp = cups-bjnp; # added 2016-01-02 cv = progress; # added 2015-09-06 - enblendenfuse = enblend-enfuse; # 2015-09-30 + dwbWrapper = dwb; # added 2015-01 + enblendenfuse = enblend-enfuse; # 2015-09-30 exfat-utils = exfat; # 2015-09-11 - firefoxWrapper = firefox-wrapper; + firefoxWrapper = firefox; # 2015-09 + firefox-wrapper = firefox; # 2016-01 + firefox-esr-wrapper = firefox-esr; # 2016-01 fuse_exfat = exfat; # 2015-09-11 grantlee5 = qt5.grantlee; # added 2015-12-19 + gupnptools = gupnp-tools; # added 2015-12-19 htmlTidy = html-tidy; # added 2014-12-06 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; @@ -15855,6 +15852,7 @@ aliases = with self; rec { libtidy = html-tidy; # added 2014-12-21 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 + midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # added 2015-12-19 @@ -15869,22 +15867,32 @@ aliases = with self; rec { quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30 qwt6 = qt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 + rekonqWrapper = rekonq; # added 2015-01 rssglx = rss-glx; #added 2015-03-25 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 signon = qt5.signon; # added 2015-12-19 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = qt5.telepathy; # added 2015-12-19 x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 + vimbWrapper = vimb; # added 2015-01 + vimprobable2Wrapper = vimprobable2; # added 2015-01 pidginlatexSF = pidginlatex; # added 2014-11-02 tftp_hpa = tftp-hpa; # added 2015-04-03 manpages = man-pages; # added 2015-12-06 mssys = ms-sys; # added 2015-12-13 virtviewer = virt-viewer; # added 2015-12-24 + saneBackends = sane-backends; # added 2016-01-02 + saneBackendsGit = sane-backends-git; # added 2016-01-02 + saneFrontends = sane-frontends; # added 2016-01-02 + btrfsProgs = btrfs-progs; # added 2016-01-03 + aircrackng = aircrack-ng; # added 2016-01-14 + quake3game = ioquake3; # added 2016-01-14 }; tweakAlias = _n: alias: with lib; |