diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 568 |
1 files changed, 362 insertions, 206 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01728916fce39..53bb63fdbccd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -221,39 +221,54 @@ in fetchzip = callPackage ../build-support/fetchzip { }; - fetchFromGitHub = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name sha256; + fetchFromGitHub = { + owner, repo, rev, name ? "${repo}-${rev}-src", + ... # For hash agility + }@args: fetchzip ({ + inherit name; url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; meta.homepage = "https://github.com/${owner}/${repo}/"; - } // { inherit rev; }; + } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; - fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name sha256; + fetchFromBitbucket = { + owner, repo, rev, name ? "${repo}-${rev}-src", + ... # For hash agility + }@args: fetchzip ({ + inherit name; url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; meta.homepage = "https://bitbucket.org/${owner}/${repo}/"; extraPostFetch = ''rm -f "$out"/.hg_archival.txt''; # impure file; see #12002 - }; + } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; # cgit example, snapshot support is optional in cgit - fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name sha256; + fetchFromSavannah = { + repo, rev, name ? "${repo}-${rev}-src", + ... # For hash agility + }@args: fetchzip ({ + inherit name; url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/"; - }; + } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; }; # gitlab example - fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name sha256; + fetchFromGitLab = { + owner, repo, rev, name ? "${repo}-${rev}-src", + ... # For hash agility + }@args: fetchzip ({ + inherit name; url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}"; meta.homepage = "https://gitlab.com/${owner}/${repo}/"; - }; + } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; # gitweb example, snapshot support is optional in gitweb - fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name sha256; + fetchFromRepoOrCz = { + repo, rev, name ? "${repo}-${rev}-src", + ... # For hash agility + }@args: fetchzip ({ + inherit name; url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz"; meta.homepage = "http://repo.or.cz/${repo}.git/"; - }; + } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; }; fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; @@ -419,7 +434,7 @@ in withGui = false; }; - apitrace = qt5.callPackage ../applications/graphics/apitrace {}; + apitrace = qt55.callPackage ../applications/graphics/apitrace {}; argyllcms = callPackage ../tools/graphics/argyllcms {}; @@ -539,6 +554,8 @@ in backup = callPackage ../tools/backup/backup { }; + base16 = callPackage ../misc/base16 { }; + basex = callPackage ../tools/text/xml/basex { }; babeld = callPackage ../tools/networking/babeld { }; @@ -679,13 +696,13 @@ in clib = callPackage ../tools/package-management/clib { }; - consul = goPackages.consul.bin // { outputs = [ "bin" ]; }; + consul = go16Packages.consul.bin // { outputs = [ "bin" ]; }; consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; }; + consul-alerts = go16Packages.consul-alerts.bin // { outputs = [ "bin" ]; }; - consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; }; + consul-template = go16Packages.consul-template.bin // { outputs = [ "bin" ]; }; corosync = callPackage ../servers/corosync { }; @@ -744,9 +761,7 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - duperemove = callPackage ../tools/filesystems/duperemove { - linuxHeaders = linuxHeaders_3_18; - }; + duperemove = callPackage ../tools/filesystems/duperemove { }; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; @@ -772,6 +787,8 @@ in fop = callPackage ../tools/typesetting/fop { }; + fpp = callPackage ../tools/misc/fpp { }; + fsmark = callPackage ../tools/misc/fsmark { }; fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; @@ -782,6 +799,8 @@ in gist = callPackage ../tools/text/gist { }; + glide = go16Packages.glide.bin // { outputs = [ "bin" ]; }; + gmic = callPackage ../tools/graphics/gmic { }; gti = callPackage ../tools/misc/gti { }; @@ -877,6 +896,8 @@ in enableExtraPlugins = true; }); + asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; + autossh = callPackage ../tools/networking/autossh { }; asynk = callPackage ../tools/networking/asynk { }; @@ -1031,6 +1052,7 @@ in collectd = callPackage ../tools/system/collectd { rabbitmq-c = rabbitmq-c_0_4; libmysql = mysql.lib; + libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; colormake = callPackage ../development/tools/build-managers/colormake { }; @@ -1047,7 +1069,8 @@ in "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { }; - usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; anthy = callPackage ../tools/inputmethods/anthy { }; @@ -1139,7 +1162,7 @@ in convmv = callPackage ../tools/misc/convmv { }; - cool-retro-term = qt5.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = qt55.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; @@ -1493,6 +1516,8 @@ in fio = callPackage ../tools/system/fio { }; + flamerobin = callPackage ../applications/misc/flamerobin { }; + flashtool = callPackage_i686 ../development/mobile/flashtool { platformTools = androidenv.platformTools; }; @@ -1574,7 +1599,7 @@ in fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; - fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; + fuse-zip = callPackage ../tools/filesystems/fuse-zip { }; exfat = callPackage ../tools/filesystems/exfat { }; @@ -1590,6 +1615,8 @@ in galen = callPackage ../development/tools/galen {}; + gandi-cli = callPackage ../tools/networking/gandi-cli { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; @@ -1866,6 +1893,8 @@ in pixz = callPackage ../tools/compression/pixz { }; + pxattr = callPackage ../tools/archivers/pxattr { }; + pxz = callPackage ../tools/compression/pxz { }; hans = callPackage ../tools/networking/hans { }; @@ -1943,6 +1972,8 @@ in i2pd = callPackage ../tools/networking/i2pd {}; + i-score = qt5.callPackage ../applications/audio/i-score { }; + iasl = callPackage ../development/compilers/iasl { }; iannix = qt5.callPackage ../applications/audio/iannix { }; @@ -2112,6 +2143,8 @@ in less = callPackage ../tools/misc/less { }; + lesspipe = callPackage ../tools/misc/lesspipe { }; + liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; lnav = callPackage ../tools/misc/lnav { }; @@ -2190,6 +2223,8 @@ in else nodejs-4_x; + nodePackages_6_x = callPackage ./node-packages.nix { self = nodePackages_6_x; nodejs = nodejs-6_x; }; + nodePackages_5_x = callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }; nodePackages_4_x = callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }; @@ -2247,6 +2282,8 @@ in libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libmpack = callPackage ../development/libraries/libmpack { }; + libiberty = callPackage ../development/libraries/libiberty { }; libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; }; @@ -2473,6 +2510,8 @@ in ndjbdns = callPackage ../tools/networking/ndjbdns { }; + nerdfonts = callPackage ../data/fonts/nerdfonts { }; + nestopia = callPackage ../misc/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -2536,6 +2575,8 @@ in noip = callPackage ../tools/networking/noip { }; + milu = callPackage ../applications/misc/milu { }; + mpack = callPackage ../tools/networking/mpack { }; pa_applet = callPackage ../tools/audio/pa-applet { }; @@ -2908,8 +2949,6 @@ in polkit_gnome = callPackage ../tools/security/polkit-gnome { }; - popcorntime = callPackage ../applications/video/popcorntime { nwjs = nwjs_0_12; }; - ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; @@ -2978,6 +3017,10 @@ in remarshal = (callPackage ../development/tools/remarshal { }).bin // { outputs = [ "bin" ]; }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { }; + + rtmidi = callPackage ../development/libraries/audio/rtmidi { }; + openmpi = callPackage ../development/libraries/openmpi { }; openmodelica = callPackage ../applications/science/misc/openmodelica { }; @@ -3213,7 +3256,7 @@ in siege = callPackage ../tools/networking/siege {}; - sigil = qt5.callPackage ../applications/editors/sigil { }; + sigil = qt55.callPackage ../applications/editors/sigil { }; # aka., gpg-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -3604,6 +3647,8 @@ in vtun = callPackage ../tools/networking/vtun { }; + wakatime = callPackage ../tools/misc/wakatime { }; + weather = callPackage ../applications/misc/weather { }; wego = goPackages.wego.bin // { outputs = [ "bin" ]; }; @@ -3632,6 +3677,8 @@ in testdisk = callPackage ../tools/misc/testdisk { }; + textql = goPackages.textql.bin // { outputs = [ "bin" ]; }; + html2text = callPackage ../tools/text/html2text { }; html-tidy = callPackage ../tools/text/html-tidy { }; @@ -3972,6 +4019,8 @@ in tcsh = callPackage ../shells/tcsh { }; + rssh = callPackage ../shells/rssh { }; + rush = callPackage ../shells/rush { }; xonsh = callPackage ../shells/xonsh { }; @@ -3980,6 +4029,8 @@ in nix-zsh-completions = callPackage ../shells/nix-zsh-completions { }; + zsh-prezto = callPackage ../shells/zsh-prezto { }; + grml-zsh-config = callPackage ../shells/grml-zsh-config { }; @@ -4235,6 +4286,21 @@ in isl = isl_0_14; })); + gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + + isl = isl_0_14; + })); + gfortran = if !stdenv.isDarwin then gfortran5 else callPackage ../development/compilers/gcc/gfortran-darwin.nix { inherit (darwin) Libsystem; @@ -4264,6 +4330,14 @@ in profiledCompiler = false; }); + gfortran6 = wrapCC (gcc6.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj49; gcj49 = wrapCC (gcc49.cc.override { name = "gcj"; @@ -4356,11 +4430,22 @@ in haskellPackages = haskell.packages.ghc7103.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; - inherit (self.haskellPackages) ghc cabal-install stack; + + inherit (self.haskellPackages) ghc; + + cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install; + + stack = haskell.lib.overrideCabal haskellPackages.stack (drv: { + enableSharedExecutables = false; + isLibrary = false; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + }); haxe = callPackage ../development/compilers/haxe { inherit (ocamlPackages) camlp4; }; + hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; hhvm = callPackage ../development/compilers/hhvm { }; @@ -5152,6 +5237,8 @@ in scala_2_11 = callPackage ../development/compilers/scala { }; scala = scala_2_11; + scalafmt = callPackage ../development/tools/scalafmt { }; + sdcc = callPackage ../development/compilers/sdcc { boost = boost159; }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; @@ -5193,6 +5280,8 @@ in ocaml = ocaml_4_02; }; + bupc = callPackage ../development/compilers/bupc { }; + urweb = callPackage ../development/compilers/urweb { }; vala = callPackage ../development/compilers/vala/default.nix { }; @@ -5492,9 +5581,6 @@ in self = python27; inherit (darwin) CF configd; }; - python32 = callPackage ../development/interpreters/python/3.2 { - self = python32; - }; python33 = callPackage ../development/interpreters/python/3.3 { self = python33; }; @@ -5525,7 +5611,7 @@ in pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/docs {}); - pypi2nix = python27Packages.pypi2nix; + pypi2nix = callPackage ../development/tools/pypi2nix { python = python27; }; svg2tikz = python27Packages.svg2tikz; @@ -5561,7 +5647,7 @@ in ruby_2_0_0 ruby_2_1_7 ruby_2_2_3 - ruby_2_3_0; + ruby_2_3_1; # Ruby aliases ruby = ruby_2_3; @@ -5569,7 +5655,7 @@ in ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_7; ruby_2_2 = ruby_2_2_3; - ruby_2_3 = ruby_2_3_0; + ruby_2_3 = ruby_2_3_1; scsh = callPackage ../development/interpreters/scsh { }; @@ -5658,6 +5744,8 @@ in guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; pharo-vms = callPackage_i686 ../development/pharo/vm { }; @@ -5891,6 +5979,11 @@ in libcxxabi = llvmPackages.libcxxabi; libsigrok = callPackage ../development/tools/libsigrok { }; + # old version: + libsigrok-0-3-0 = libsigrok.override { + version = "0.3.0"; + sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + }; libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; @@ -6046,7 +6139,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_37; + llvmPackages = llvmPackages_38; }; indent = callPackage ../development/tools/misc/indent { }; @@ -6065,6 +6158,8 @@ in jam = callPackage ../development/tools/build-managers/jam { }; + jamomacore = callPackage ../development/libraries/audio/jamomacore { }; + jikespg = callPackage ../development/tools/parsing/jikespg { }; jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; @@ -6177,6 +6272,8 @@ in }); pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); + postiats-utilities = callPackage ../development/tools/postiats-utilities {}; + prelink = callPackage ../development/tools/misc/prelink { }; premake3 = callPackage ../development/tools/misc/premake/3.nix { }; @@ -6185,8 +6282,14 @@ in premake = premake4; + qtcreator = qt5.callPackage ../development/qtcreator { + withDocumentation = true; + }; + racerRust = callPackage ../development/tools/rust/racer { }; + racerdRust = callPackage ../development/tools/rust/racerd { }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; @@ -6211,6 +6314,10 @@ in hammer = callPackage ../development/tools/parsing/hammer { }; + redis-dump = callPackage ../development/tools/redis-dump { + ruby = ruby_2_0; + }; + re2c = callPackage ../development/tools/parsing/re2c { }; remake = callPackage ../development/tools/build-managers/remake { }; @@ -6221,9 +6328,7 @@ in rolespec = callPackage ../development/tools/misc/rolespec { }; - rr = callPackage ../development/tools/analysis/rr { - stdenv = stdenv_32bit; - }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; @@ -6384,6 +6489,8 @@ in afflib = callPackage ../development/libraries/afflib { }; + alure = callPackage ../development/libraries/alure { }; + agg = callPackage ../development/libraries/agg { }; allegro = callPackage ../development/libraries/allegro {}; @@ -6591,6 +6698,8 @@ in cppunit = callPackage ../development/libraries/cppunit { }; + cpputest = callPackage ../development/libraries/cpputest { }; + cracklib = callPackage ../development/libraries/cracklib { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -6831,7 +6940,10 @@ in gettext = callPackage ../development/libraries/gettext { }; - gd = callPackage ../development/libraries/gd { }; + gd = callPackage ../development/libraries/gd { + libtiff = null; + libXpm = null; + }; gdal = callPackage ../development/libraries/gdal { }; @@ -7399,8 +7511,6 @@ in libcm = callPackage ../development/libraries/libcm { }; - libcommuni = qt5.callPackage ../development/libraries/libcommuni { }; - libconfuse = callPackage ../development/libraries/libconfuse { }; inherit (gnome3) libcroco; @@ -7940,7 +8050,7 @@ in libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; libsndfile = callPackage ../development/libraries/libsndfile { - inherit (darwin.apple_sdk.frameworks) Carbon; + inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; libsodium = callPackage ../development/libraries/libsodium { }; @@ -7969,6 +8079,8 @@ in libtasn1 = callPackage ../development/libraries/libtasn1 { }; + libtcod = callPackage ../development/libraries/libtcod { }; + libtheora = callPackage ../development/libraries/libtheora { }; libtiff = callPackage ../development/libraries/libtiff { }; @@ -8060,7 +8172,9 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; - libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { + libva = libva-full; # also wants libva-{x11} + }; libvirt = callPackage ../development/libraries/libvirt { }; @@ -8464,9 +8578,9 @@ in phonon = callPackage ../development/libraries/phonon {}; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {}; + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; - phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {}; physfs = callPackage ../development/libraries/physfs { }; @@ -8581,15 +8695,20 @@ in developerBuild = true; }); - qt54 = - let imported = import ../development/libraries/qt-5/5.4 { inherit pkgs; }; - in recurseIntoAttrs (imported.override (super: qt5LibsFun)); - qt55 = let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; }; + # Libraries that cannot be built with newer versions of Qt 5 + qt55Only = self: with self; { + # Requires Qt Quick (deprecated in Qt 5.5, removed from Qt 5.6) + qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + }; + in recurseIntoAttrs (imported.override (super: self: qt5LibsFun self // qt55Only self)); + + qt56 = + let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; }; in recurseIntoAttrs (imported.override (super: qt5LibsFun)); - qt5 = self.qt54; + qt5 = self.qt56; qt5LibsFun = self: with self; { @@ -8597,6 +8716,8 @@ in grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; + libcommuni = callPackage ../development/libraries/libcommuni { }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; @@ -8605,12 +8726,6 @@ in openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { }; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; - - phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -8621,20 +8736,12 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; - qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; - - qtcreator = callPackage ../development/qtcreator { - withDocumentation = true; - }; - quazip = callPackage ../development/libraries/quazip { qt = qtbase; }; qwt = callPackage ../development/libraries/qwt/6.nix { }; - signon = callPackage ../development/libraries/signon { }; - telepathy = callPackage ../development/libraries/telepathy/qt { }; vlc = lowPrio (callPackage ../applications/video/vlc { @@ -8956,6 +9063,8 @@ in tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; + tivodecode = callPackage ../applications/video/tivodecode { }; + tk = tk-8_6; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; @@ -8971,6 +9080,8 @@ in tremor = callPackage ../development/libraries/tremor { }; + udns = callPackage ../development/libraries/udns { }; + uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; unibilium = callPackage ../development/libraries/unibilium { }; @@ -9164,6 +9275,8 @@ in xalanc = callPackage ../development/libraries/xalanc {}; + xgboost = callPackage ../development/libraries/xgboost { }; + # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ @@ -9435,11 +9548,6 @@ in self = python27Packages; })); - python32Packages = callPackage ./python-packages.nix { - python = python32; - self = python32Packages; - }; - python33Packages = callPackage ./python-packages.nix { python = python33; self = python33Packages; @@ -9772,10 +9880,8 @@ in # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; }; - - nginxUnstable = callPackage ../servers/http/nginx/unstable.nix { - modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; - }; + # nginxUnstable currently points to stable because that's newest: + nginxUnstable = nginx; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; @@ -10394,11 +10500,6 @@ in }; iptables = callPackage ../os-specific/linux/iptables { }; - # The freshest version — possibly crashing connmand? - # https://github.com/NixOS/nixpkgs/commit/fe00c8a83f696e3430ee4aa3fc850f171da52450 - iptables_16 = callPackage ../os-specific/linux/iptables/1.6.nix { - flex = flex_2_5_35; - }; ipset = callPackage ../os-specific/linux/ipset { }; @@ -10407,6 +10508,9 @@ in iw = callPackage ../os-specific/linux/iw { }; jfbview = callPackage ../os-specific/linux/jfbview { }; + jfbpdf = callPackage ../os-specific/linux/jfbview { + imageSupport = false; + }; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; @@ -10440,18 +10544,20 @@ in # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = self.linuxHeaders_3_18; + linuxHeaders = self.linuxHeaders_4_4; linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { cross = assert crossSystem != null; crossSystem; }); - linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/3.18.nix { + linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/4.4.nix { cross = assert crossSystem != null; crossSystem; }); 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: linuxHeadersCrossChooser = ver : if ver == "2.4" then self.linuxHeaders24Cross else if ver == "2.6" then self.linuxHeaders26Cross @@ -10543,7 +10649,16 @@ in }; linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10577,38 +10692,7 @@ in linux_chromiumos_latest = self.linux_chromiumos_3_18; - /* grsec configuration - - We build several flavors of 'default' grsec kernels. These are - built by default with Hydra. If the user selects a matching - 'default' flavor, then the pre-canned package set can be - chosen. Typically, users will make very basic choices like - 'security' + 'server' or 'performance' + 'desktop' with - virtualisation support. These will then be picked. - - Note: Xen guest kernels are included for e.g. NixOps deployments - to EC2, where Xen is the Hypervisor. - */ - - # Base kernels to apply the grsecurity patch onto - - grsecurity_base_linux_3_14 = callPackage ../os-specific/linux/kernel/linux-grsecurity-3.14.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 - ]; - }; - - grsecurity_base_linux_4_4 = callPackage ../os-specific/linux/kernel/linux-grsecurity-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 - ]; - }; + # grsecurity configuration grsecurity_base_linux_4_5 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.5.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -10631,14 +10715,6 @@ in # grsecurity kernels (see also linuxPackages_grsec_*) - linux_grsec_desktop_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.desktop; - linux_grsec_server_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server; - linux_grsec_server_xen_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; - - linux_grsec_desktop_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.desktop; - linux_grsec_server_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server; - linux_grsec_server_xen_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; - linux_grsec_desktop_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.desktop; linux_grsec_server_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server; linux_grsec_server_xen_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server_xen; @@ -10647,16 +10723,6 @@ in linux_grsec_server_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server; linux_grsec_server_xen_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server_xen; - # grsecurity: old names - - linux_grsec_testing_desktop = self.linux_grsec_desktop_latest; - linux_grsec_testing_server = self.linux_grsec_server_latest; - linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest; - - linux_grsec_stable_desktop = self.linux_grsec_desktop_3_14; - linux_grsec_stable_server = self.linux_grsec_server_3_14; - linux_grsec_stable_server_xen = self.linux_grsec_server_xen_3_14; - /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -10775,7 +10841,7 @@ in linux = self.linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_5; + linuxPackages_latest = self.linuxPackages_4_6; linux_latest = self.linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -10790,6 +10856,8 @@ in linuxPackages_4_3 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_3 linuxPackages_4_3); linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); linuxPackages_4_5 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_5 linuxPackages_4_5); + linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); + # Don't forget to update linuxPackages_latest! linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; @@ -10802,14 +10870,6 @@ in # grsecurity packages - linuxPackages_grsec_desktop_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.desktop; - linuxPackages_grsec_server_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server; - linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; - - linuxPackages_grsec_desktop_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop; - linuxPackages_grsec_server_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server; - linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; - linuxPackages_grsec_desktop_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.desktop; linuxPackages_grsec_server_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server; linuxPackages_grsec_server_xen_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server_xen; @@ -10818,7 +10878,34 @@ in linuxPackages_grsec_server_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server; linuxPackages_grsec_server_xen_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server_xen; - # grsecurity: old names + # grsecurity: legacy + + grsecurity_base_linux_3_14 = throw "grsecurity stable is no longer supported"; + grsecurity_base_linux_4_4 = throw "grsecurity stable is no longer supported"; + + linux_grsec_desktop_3_14 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_3_14 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_xen_3_14 = throw "grsecurity stable is no longer supported"; + + linux_grsec_desktop_4_4 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_4_4 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_xen_4_4 = throw "grsecurity stable is no longer supported"; + + linux_grsec_testing_desktop = self.linux_grsec_desktop_latest; + linux_grsec_testing_server = self.linux_grsec_server_latest; + linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest; + + linux_grsec_stable_desktop = self.linux_grsec_desktop_3_14; + linux_grsec_stable_server = self.linux_grsec_server_3_14; + linux_grsec_stable_server_xen = self.linux_grsec_server_xen_3_14; + + linuxPackages_grsec_desktop_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.desktop; + linuxPackages_grsec_server_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server; + linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; + + linuxPackages_grsec_desktop_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop; + linuxPackages_grsec_server_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server; + linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; linuxPackages_grsec_testing_desktop = self.linuxPackages_grsec_desktop_latest; linuxPackages_grsec_testing_server = self.linuxPackages_grsec_server_latest; @@ -10871,12 +10958,6 @@ in libcap = callPackage ../os-specific/linux/libcap { }; - libcap_progs = callPackage ../os-specific/linux/libcap/progs.nix { }; - - libcap_pam = callPackage ../os-specific/linux/libcap/pam.nix { }; - - libcap_manpages = callPackage ../os-specific/linux/libcap/man.nix { }; - libcap_ng = callPackage ../os-specific/linux/libcap-ng { swig = null; # Currently not using the python2/3 bindings python2 = null; # Currently not using the python2 bindings @@ -11079,7 +11160,6 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - linuxHeaders = linuxHeaders_3_18; utillinux = utillinuxMinimal; # break the cyclic dependency } // { @@ -11092,12 +11172,11 @@ in # 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: { - name = p.name + "-with-lvm2"; + systemd_with_lvm2 = pkgs.appendToName "with-lvm2" (pkgs.lib.overrideDerivation pkgs.systemd (p: { postInstall = p.postInstall + '' cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators ''; - }); + })); sysvinit = callPackage ../os-specific/linux/sysvinit { }; @@ -11560,11 +11639,13 @@ in xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; + xits-math = callPackage ../data/fonts/xits-math { }; + xkeyboard_config = xorg.xkeyboardconfig; xlsx2csv = pythonPackages.xlsx2csv; - zeal = qt5.callPackage ../data/documentation/zeal { }; + zeal = qt55.callPackage ../data/documentation/zeal { }; ### APPLICATIONS @@ -11784,7 +11865,7 @@ in bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bomi = qt5.callPackage ../applications/video/bomi { + bomi = qt55.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; }; @@ -12141,8 +12222,6 @@ in darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; - dash = callPackage ../applications/editors/emacs-modes/dash { }; - # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { }; @@ -12159,8 +12238,6 @@ in ess = callPackage ../applications/editors/emacs-modes/ess { }; - flycheck = callPackage ../applications/editors/emacs-modes/flycheck { }; - flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; gh = callPackage ../applications/editors/emacs-modes/gh { }; @@ -12169,8 +12246,6 @@ in gist = callPackage ../applications/editors/emacs-modes/gist { }; - gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; - haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; @@ -12199,8 +12274,6 @@ in loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; - magit = callPackage ../applications/editors/emacs-modes/magit { }; - markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; @@ -12282,7 +12355,7 @@ in inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; - inherit emacs texinfo makeWrapper; + inherit emacs texinfo makeWrapper runCommand; inherit (xorg) lndir; trivialBuild = callPackage ../build-support/emacs/trivial.nix { @@ -12353,6 +12426,8 @@ in fetchmail = callPackage ../applications/misc/fetchmail { }; + flacon = callPackage ../applications/audio/flacon { }; + fldigi = callPackage ../applications/audio/fldigi { }; fluidsynth = callPackage ../applications/audio/fluidsynth { @@ -12464,6 +12539,7 @@ in firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; }; firefox-bin = self.wrapFirefox firefox-bin-unwrapped { @@ -12473,6 +12549,34 @@ in desktopName = "Firefox"; }; + firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "beta"; + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; + }; + + firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped { + browserName = "firefox"; + name = "firefox-beta-bin-" + + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; + desktopName = "Firefox Beta"; + }; + + firefox-developer-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "developer"; + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; + }; + + firefox-developer-bin = self.wrapFirefox firefox-developer-bin-unwrapped { + browserName = "firefox"; + name = "firefox-developer-bin-" + + (builtins.parseDrvName firefox-developer-bin-unwrapped.name).version; + desktopName = "Firefox Developer Edition"; + }; + firestr = qt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -12758,9 +12862,7 @@ in fltk = fltk13; }; - hugin = callPackage ../applications/graphics/hugin { - boost = boost155; - }; + hugin = callPackage ../applications/graphics/hugin { }; hydrogen = callPackage ../applications/audio/hydrogen { }; @@ -12788,6 +12890,10 @@ in cairo = cairo.override { xcbSupport = true; }; }; + i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { }; + + i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -12831,6 +12937,7 @@ in libtiff = null; libxml2 = null; openjpeg = null; + libwebp = null; }; imagemagick = self.imagemagickBig.override { @@ -12929,7 +13036,7 @@ in kermit = callPackage ../tools/misc/kermit { }; - keyfinder = qt55.callPackage ../applications/audio/keyfinder { }; + keyfinder = qt5.callPackage ../applications/audio/keyfinder { }; keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { }; @@ -13051,6 +13158,8 @@ in inherit (gnome) libglade; }; + linuxband = callPackage ../applications/audio/linuxband { }; + ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger { boost = boost155; @@ -13085,7 +13194,7 @@ in webkit = webkitgtk2; }; - luminanceHDR = qt5.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = qt55.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -13300,7 +13409,7 @@ in else null; }; - musescore = qt5.callPackage ../applications/audio/musescore { }; + musescore = qt55.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { @@ -13342,7 +13451,7 @@ in smplayer = qt5.callPackage ../applications/video/smplayer { }; - smtube = qt5.callPackage ../applications/video/smtube {}; + smtube = qt55.callPackage ../applications/video/smtube {}; sup = callPackage ../applications/networking/mailreaders/sup { ruby = ruby_2_3.override { cursesSupport = true; }; @@ -13354,6 +13463,7 @@ in synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + inherit (gnome3) defaultIconTheme; }; librep = callPackage ../development/libraries/librep { }; @@ -13364,6 +13474,10 @@ in sxhkd = callPackage ../applications/window-managers/sxhkd { }; + mpop = callPackage ../applications/networking/mpop { + inherit (darwin.apple_sdk.frameworks) Security; + }; + msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -13433,6 +13547,7 @@ in }; obs-studio = qt5.callPackage ../applications/video/obs-studio { + alsaSupport = stdenv.isLinux; pulseaudioSupport = config.pulseaudio or true; }; @@ -13519,6 +13634,8 @@ in phototonic = qt5.callPackage ../applications/graphics/phototonic { }; + phwmon = callPackage ../applications/misc/phwmon { }; + pianobar = callPackage ../applications/audio/pianobar { }; pianobooster = callPackage ../applications/audio/pianobooster { }; @@ -13691,7 +13808,7 @@ in demo = false; }; - rapcad = qt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = qt55.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -13719,7 +13836,7 @@ in RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; - ricochet = qt5.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { }; rkt = callPackage ../applications/virtualization/rkt { }; @@ -13727,6 +13844,8 @@ in rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; + rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; + rstudio = callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { @@ -13743,24 +13862,31 @@ in rxvt = callPackage ../applications/misc/rxvt { }; - # = urxvt + # urxvt rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { perlSupport = true; gdkPixbufSupport = true; unicode3Support = true; }; - udevil = callPackage ../applications/misc/udevil {}; + rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + plugins = [ + urxvt_perl + urxvt_perls + urxvt_tabbedex + urxvt_font_size + urxvt_theme_switch + ]; + }; # urxvt plugins urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { }; urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; + urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; - rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { - plugins = [ urxvt_perl urxvt_perls urxvt_tabbedex urxvt_font_size ]; - }; + udevil = callPackage ../applications/misc/udevil {}; sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte_290; @@ -13818,6 +13944,8 @@ in slrn = callPackage ../applications/networking/newsreaders/slrn { }; + sniproxy = callPackage ../applications/networking/sniproxy { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; sorcer = callPackage ../applications/audio/sorcer { }; @@ -14126,6 +14254,7 @@ in transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_gtk = transmission.override { enableGTK3 = true; }; + transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; trayer = callPackage ../applications/window-managers/trayer { }; @@ -14187,7 +14316,7 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; ruby = ruby_2_2; }; vimHugeX = vim_configurable; @@ -14235,6 +14364,7 @@ in gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; }; + virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; vte = gnome3.vte; @@ -14746,6 +14876,8 @@ in blobby = callPackage ../games/blobby { }; + brogue = callPackage ../games/brogue { }; + bsdgames = callPackage ../games/bsdgames { }; btanks = callPackage ../games/btanks { }; @@ -14760,6 +14892,8 @@ in chocolateDoom = callPackage ../games/chocolate-doom { }; + ckan = callPackage ../games/ckan { }; + cockatrice = qt5.callPackage ../games/cockatrice { }; confd = goPackages.confd.bin // { outputs = [ "bin" ]; }; @@ -14969,6 +15103,8 @@ in openspades = callPackage ../games/openspades {}; + openspades-git = lowPrio (callPackage ../games/openspades/git.nix {}); + openttd = callPackage ../games/openttd { zlib = zlibStatic; }; @@ -15088,7 +15224,12 @@ in stepmania = callPackage ../games/stepmania { }; - stuntrally = callPackage ../games/stuntrally { }; + stuntrally = callPackage ../games/stuntrally { + bullet = bullet283; + mygui = mygui.override { + withOgre = true; + }; + }; superTux = callPackage ../games/super-tux { }; @@ -15263,7 +15404,14 @@ in gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); - gnome3 = self.gnome3_18; + gnome3 = self.gnome3_18 // { + shellExtensions = { + impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix {}; + system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor.nix {}; + volume-mixer = callPackage ../desktops/gnome-3/extensions/volume-mixer.nix {}; + workspace-grid = callPackage ../desktops/gnome-3/extensions/workspace-grid.nix {}; + }; + }; gnome = recurseIntoAttrs self.gnome2; @@ -15528,6 +15676,12 @@ in konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { }; + phonon = callPackage ../development/libraries/phonon { }; + + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; + + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { monolithic = true; daemon = false; @@ -15570,9 +15724,9 @@ in kde5 = let - frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; }; - plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; }; - applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; }; + frameworks = import ../desktops/kde-5/frameworks-5.22 { inherit pkgs; }; + plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; }; + applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; }; merged = self: { plasma = plasma self; frameworks = frameworks self; @@ -15582,23 +15736,7 @@ in // applications self // kde5PackagesFun self; in - recurseIntoAttrs (lib.makeScope qt55.newScope merged); - - kde5_latest = - let - frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; }; - plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; }; - applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; }; - merged = self: - { plasma = plasma self; - frameworks = frameworks self; - applications = applications self; } - // frameworks self - // plasma self - // applications self - // kde5PackagesFun self; - in - recurseIntoAttrs (lib.makeScope qt55.newScope merged); + recurseIntoAttrs (lib.makeScope qt5.newScope merged); theme-vertex = callPackage ../misc/themes/vertex { }; @@ -15838,6 +15976,8 @@ in coquelicot = callPackage ../development/coq-modules/coquelicot {}; + dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; + flocq = callPackage ../development/coq-modules/flocq {}; interval = callPackage ../development/coq-modules/interval {}; @@ -16119,6 +16259,8 @@ in beep = callPackage ../misc/beep { }; + blackbird = callPackage ../misc/themes/blackbird { }; + brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {}; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; @@ -16177,6 +16319,8 @@ in faust1 = callPackage ../applications/audio/faust/faust1.nix { }; + faust1git = callPackage ../applications/audio/faust/faust1git.nix { }; + faust2 = callPackage ../applications/audio/faust/faust2.nix { llvm = llvm_37; }; @@ -16195,6 +16339,10 @@ in faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; + faust2lv2gui = callPackage ../applications/audio/faust/faust2lv2gui.nix { }; + + faustCompressors = callPackage ../applications/audio/faustCompressors { }; + fceux = callPackage ../misc/emulators/fceux { }; foldingathome = callPackage ../misc/foldingathome { }; @@ -16226,6 +16374,8 @@ in gnuk-unstable = callPackage ../misc/gnuk/unstable.nix { }; gnuk-git = callPackage ../misc/gnuk/git.nix { }; + greybird = callPackage ../misc/themes/greybird { }; + gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; @@ -16261,6 +16411,8 @@ in inherit (pkgs.gnome) GConf; }; + moltengamepad = callPackage ../misc/drivers/moltengamepad { }; + mongoc = callPackage ../development/libraries/mongoc { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { @@ -16330,7 +16482,7 @@ in inherit (pythonPackages) pexpect paramiko; }; - redis-desktop-manager = qt5.callPackage ../applications/misc/redis-desktop-manager { }; + redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { }; robomongo = qt5.callPackage ../applications/misc/robomongo { }; @@ -16392,7 +16544,7 @@ in xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; - sails = callPackage ../misc/sails { }; + sailsd = callPackage ../misc/sailsd { }; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; @@ -16513,7 +16665,7 @@ in utf8proc = callPackage ../development/libraries/utf8proc { }; - vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; + vault = go16Packages.vault.bin // { outputs = [ "bin" ]; }; vbam = callPackage ../misc/emulators/vbam {}; @@ -16528,6 +16680,7 @@ in vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { inherit (darwin.apple_sdk.frameworks) Cocoa; + llvmPackages = llvmPackages_38; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { @@ -16557,8 +16710,8 @@ in pulseaudioSupport = config.pulseaudio or stdenv.isLinux; }; wineStable = wine.override { wineRelease = "stable"; }; - wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; }); - wineStaging = lowPrio (wine.override { wineRelease = "staging"; }); + wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); + wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; @@ -16653,6 +16806,9 @@ in misc = callPackage ../misc/misc.nix { }; bullet = callPackage ../development/libraries/bullet {}; + bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {}; + + spdlog = callPackage ../development/libraries/spdlog { }; dart = callPackage ../development/interpreters/dart { }; @@ -16666,7 +16822,7 @@ in discord = callPackage ../applications/networking/instant-messengers/discord { }; - golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = qt55.callPackage ../applications/misc/golden-cheetah {}; tomb = callPackage ../os-specific/linux/tomb {}; |