diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 527 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 53 | ||||
| -rw-r--r-- | pkgs/top-level/impure.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 98 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 257 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 216 | ||||
| -rw-r--r-- | pkgs/top-level/wine-packages.nix | 50 |
12 files changed, 675 insertions, 557 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 334905b79f2b..34906533a0aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -151,6 +151,7 @@ mapAliases (rec { openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 + pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidgin-latex; # added 2014-11-02 @@ -199,6 +200,7 @@ mapAliases (rec { sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 tahoelafs = tahoe-lafs; # added 2018-03-26 + telnet = inetutils; # added 2018-05-15 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e76826407f63..252dbe8b2fbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -61,6 +61,8 @@ with pkgs; by Hydra. ''; + tests = recurseIntoAttrs (callPackages ../test {}); + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; @@ -288,7 +290,7 @@ with pkgs; ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://gitlab.com/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.tar.gz"; + url = "https://gitlab.com/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; meta.homepage = "https://gitlab.com/${owner}/${repo}/"; } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; @@ -400,6 +402,8 @@ with pkgs; ### TOOLS + _1password = callPackage ../applications/misc/1password { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -609,6 +613,8 @@ with pkgs; bonfire = callPackage ../tools/misc/bonfire { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; @@ -623,6 +629,8 @@ with pkgs; ecdsautils = callPackage ../tools/security/ecdsautils { }; + sedutil = callPackage ../tools/security/sedutil { }; + elvish = callPackage ../shells/elvish { }; encryptr = callPackage ../tools/security/encryptr { @@ -655,8 +663,11 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + pacparser = callPackage ../tools/networking/pacparser { }; + pass = callPackage ../tools/security/pass { }; - pass-otp = callPackage ../tools/security/pass-otp { }; + + passExtensions = recurseIntoAttrs pass.extensions; gopass = callPackage ../tools/security/gopass { }; @@ -767,14 +778,14 @@ with pkgs; backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; - backup = callPackage ../tools/backup/backup { }; - bar = callPackage ../tools/system/bar {}; base16-builder = callPackage ../misc/base16-builder { }; basex = callPackage ../tools/text/xml/basex { }; + bashplotlib = callPackage ../tools/misc/bashplotlib { }; + babeld = callPackage ../tools/networking/babeld { }; badvpn = callPackage ../tools/networking/badvpn {}; @@ -785,6 +796,8 @@ with pkgs; bashmount = callPackage ../tools/filesystems/bashmount {}; + bat = callPackage ../tools/misc/bat { }; + bc = callPackage ../tools/misc/bc { }; bdf2psf = callPackage ../tools/misc/bdf2psf { }; @@ -828,6 +841,8 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; @@ -888,7 +903,9 @@ with pkgs; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; - btrbk = callPackage ../tools/backup/btrbk { }; + btrbk = callPackage ../tools/backup/btrbk { + asciidoc = asciidoc-full; + }; buildtorrent = callPackage ../tools/misc/buildtorrent { }; @@ -1049,6 +1066,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; + compsize = callPackage ../os-specific/linux/compsize { }; + coturn = callPackage ../servers/coturn { }; coursier = callPackage ../development/tools/coursier {}; @@ -1120,6 +1139,8 @@ with pkgs; dislocker = callPackage ../tools/filesystems/dislocker { }; + distrobuilder = callPackage ../tools/virtualization/distrobuilder { }; + ditaa = callPackage ../tools/graphics/ditaa { }; dino = callPackage ../applications/networking/instant-messengers/dino { }; @@ -1146,6 +1167,8 @@ with pkgs; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + dyncall = callPackage ../development/libraries/dyncall { }; + earlyoom = callPackage ../os-specific/linux/earlyoom { }; EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; @@ -1358,6 +1381,8 @@ with pkgs; ps_mem = callPackage ../tools/system/ps_mem { }; + psstop = callPackage ../tools/system/psstop { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; socklog = callPackage ../tools/system/socklog { }; @@ -1623,7 +1648,8 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - citrix_receiver = hiPrio citrix_receiver_13_9_0; + citrix_receiver = hiPrio citrix_receiver_13_9_1; + citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.1"; }; citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; }; citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; }; citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; @@ -2103,10 +2129,10 @@ with pkgs; eid-mw = callPackage ../tools/security/eid-mw { }; - eid-viewer = callPackage ../tools/security/eid-viewer { }; - mcrcon = callPackage ../tools/networking/mcrcon {}; + tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -2204,6 +2230,8 @@ with pkgs; exiftool = perlPackages.ImageExifTool; + ext4magic = callPackage ../tools/filesystems/ext4magic { }; + extundelete = callPackage ../tools/filesystems/extundelete { }; expect = callPackage ../tools/misc/expect { }; @@ -2286,6 +2314,10 @@ with pkgs; flashbench = callPackage ../os-specific/linux/flashbench { }; + flatpak = callPackage ../development/libraries/flatpak { }; + + flatpak-builder = callPackage ../development/tools/flatpak-builder { }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { }; @@ -2312,6 +2344,8 @@ with pkgs; flashrom = callPackage ../tools/misc/flashrom { }; + flent = python3Packages.callPackage ../applications/networking/flent { }; + flpsed = callPackage ../applications/editors/flpsed { }; fluentd = callPackage ../tools/misc/fluentd { }; @@ -2417,6 +2451,13 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; + fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + + inherit (fdbPackages) + foundationdb51 + foundationdb52 + foundationdb60; + foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; @@ -2551,6 +2592,10 @@ with pkgs; glxinfo = callPackage ../tools/graphics/glxinfo { }; + gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; + }; + gmvault = callPackage ../tools/networking/gmvault { }; gnash = callPackage ../misc/gnash { }; @@ -2612,7 +2657,6 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; godot = callPackage ../development/tools/godot {}; - godot_headers = callPackage ../development/libraries/godot_headers {}; goklp = callPackage ../tools/networking/goklp {}; @@ -2778,8 +2822,6 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; - gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -2908,6 +2950,8 @@ with pkgs; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; + highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { @@ -3030,6 +3074,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + input-utils = callPackage ../os-specific/linux/input-utils { }; + intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; @@ -3118,21 +3164,19 @@ with pkgs; jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jira-cli = callPackage ../development/tools/jira_cli { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; jmespath = callPackage ../development/tools/jmespath { }; - jmol = callPackage ../applications/science/chemistry/jmol { }; - jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; go-jira = callPackage ../applications/misc/go-jira { }; - john = callPackage ../tools/security/john { - gcc = gcc49; # doesn't build with gcc5 - }; + john = callPackage ../tools/security/john { }; journalbeat = callPackage ../tools/system/journalbeat { }; @@ -3323,8 +3367,6 @@ with pkgs; motion = callPackage ../applications/video/motion { }; - mkcast = callPackage ../applications/video/mkcast { }; - mtail = callPackage ../servers/monitoring/mtail { }; multitail = callPackage ../tools/misc/multitail { }; @@ -3459,6 +3501,11 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; + liblangtag = callPackage ../development/libraries/liblangtag { + inherit (gnome2) gtkdoc; + inherit (gnome3) gnome-common; + }; + liblouis = callPackage ../development/libraries/liblouis { }; liboauth = callPackage ../development/libraries/liboauth { }; @@ -3521,6 +3568,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + limesuite = callPackage ../applications/misc/limesuite { }; + limesurvey = callPackage ../servers/limesurvey { }; linuxquota = callPackage ../tools/misc/linuxquota { }; @@ -3752,8 +3801,6 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; - molden = callPackage ../applications/science/chemistry/molden { }; - molly-guard = callPackage ../os-specific/linux/molly-guard { }; moneyplex = callPackage ../applications/office/moneyplex { }; @@ -3828,6 +3875,8 @@ with pkgs; namazu = callPackage ../tools/text/namazu { }; + nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; + nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; @@ -4078,6 +4127,8 @@ with pkgs; opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + open-ecard = callPackage ../tools/security/open-ecard { }; + openjade = callPackage ../tools/text/sgml/openjade { }; openmvg = callPackage ../applications/science/misc/openmvg { }; @@ -4128,8 +4179,6 @@ with pkgs; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; - open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -4284,7 +4333,9 @@ with pkgs; fmodex = callPackage ../games/zandronum/fmod.nix { }; - pdfmod = callPackage ../applications/misc/pdfmod { }; + pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; }; + + pdf-quench = callPackage ../applications/misc/pdf-quench { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; @@ -4677,6 +4728,8 @@ with pkgs; rnv = callPackage ../tools/text/xml/rnv { }; + rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { }; + roundup = callPackage ../tools/misc/roundup { }; routino = callPackage ../tools/misc/routino { }; @@ -4865,7 +4918,7 @@ with pkgs; simpleproxy = callPackage ../tools/networking/simpleproxy { }; - simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; sipsak = callPackage ../tools/networking/sipsak { }; @@ -5115,14 +5168,14 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; - telnet = callPackage ../tools/networking/telnet { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport {}; telepresence = callPackage ../tools/networking/telepresence { }; + termplay = callPackage ../tools/misc/termplay { }; + tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin @@ -5171,6 +5224,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tio = callPackage ../tools/misc/tio { }; + tldr = callPackage ../tools/misc/tldr { }; tldr-hs = haskellPackages.tldr; @@ -5308,6 +5363,8 @@ with pkgs; uget = callPackage ../tools/networking/uget { }; + uget-integrator = callPackage ../tools/networking/uget-integrator { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; umlet = callPackage ../tools/misc/umlet { }; @@ -5432,7 +5489,10 @@ with pkgs; watchexec = callPackage ../tools/misc/watchexec { }; - watchman = callPackage ../development/tools/watchman { }; + watchman = callPackage ../development/tools/watchman { + inherit (darwin.apple_sdk.frameworks) CoreServices; + CoreFoundation = darwin.cf-private; + }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -5556,6 +5616,8 @@ with pkgs; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; + xscast = callPackage ../applications/video/xscast { }; + xsettingsd = callPackage ../tools/X11/xsettingsd { }; xsensors = callPackage ../os-specific/linux/xsensors { }; @@ -5607,6 +5669,8 @@ with pkgs; varnishPackages = varnish5Packages; varnish = varnishPackages.varnish; + hitch = callPackage ../servers/hitch { }; + venus = callPackage ../tools/misc/venus { python = python27; }; @@ -5680,28 +5744,14 @@ with pkgs; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; - xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { + xbursttools = callPackage ../tools/misc/xburst-tools { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - crossPrefix = "mipsel-unknown-linux-gnu"; gccCross = let pkgsCross = nixpkgsFun { # Ben Nanonote system - crossSystem = { - config = crossPrefix; - arch = "mips"; - float = "soft"; - libc = "uclibc"; - platform = { - name = "ben_nanonote"; - kernelMajor = "2.6"; - kernelArch = "mips"; - }; - gcc = { - arch = "mips32"; - }; - }; + crossSystem = lib.systems.examples.ben-nanonote; }; in pkgsCross.buildPackages.gccCrossStageStatic; @@ -5732,6 +5782,8 @@ with pkgs; xml2 = callPackage ../tools/text/xml/xml2 { }; + xmlformat = callPackage ../tools/text/xml/xmlformat { }; + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmloscopy = callPackage ../tools/text/xml/xmloscopy { }; @@ -5746,6 +5798,8 @@ with pkgs; xiccd = callPackage ../tools/misc/xiccd { }; + xidlehook = callPackage ../tools/X11/xidlehook {}; + xorriso = callPackage ../tools/cd-dvd/xorriso { }; xpf = callPackage ../tools/text/xml/xpf { @@ -6067,6 +6121,7 @@ with pkgs; }; gcc7Stdenv = overrideCC gccStdenv gcc7; + gcc8Stdenv = overrideCC gccStdenv gcc8; wrapCCMulti = cc: if system == "x86_64-linux" then let @@ -6224,6 +6279,17 @@ with pkgs; isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + libcCross = if targetPlatform != buildPlatform then libcCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { inherit noSysDirs; @@ -6706,7 +6772,9 @@ with pkgs; mlton = callPackage ../development/compilers/mlton { }; - mono = mono58; + mono = mono5; + mono5 = mono58; + mono4 = mono48; mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { inherit (darwin) libobjc; @@ -6806,7 +6874,7 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - cargo-vendor = callPackage ../build-support/rust/cargo-vendor {}; + cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -6830,6 +6898,9 @@ with pkgs; }); cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-release = callPackage ../tools/package-management/cargo-release { }; + + cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; @@ -7071,6 +7142,7 @@ with pkgs; love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; + love_11 = callPackage ../development/interpreters/love/11.1.nix { }; love = love_0_10; ### LUA MODULES @@ -7159,8 +7231,6 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; - inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -7338,7 +7408,10 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) + inherit (callPackage ../development/interpreters/ruby { + inherit (darwin) libiconv libobjc libunwind; + inherit (darwin.apple_sdk.frameworks) Foundation; + }) ruby_2_3 ruby_2_4 ruby_2_5; @@ -7475,13 +7548,11 @@ with pkgs; augeas = callPackage ../tools/system/augeas { }; - ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {}; - ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {}; - ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {}; - ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {}; - ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {}; - ansible = ansible_2_4; - ansible2 = ansible_2_4; + inherit (callPackages ../tools/admin/ansible {}) + ansible_2_4 + ansible_2_5 + ansible2 + ansible; ansible-lint = callPackage ../development/tools/ansible-lint {}; @@ -7500,11 +7571,12 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; - apacheKafka = apacheKafka_1_0; + apacheKafka = apacheKafka_1_1; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; + apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; kt = callPackage ../tools/misc/kt {}; @@ -8481,6 +8553,8 @@ with pkgs; backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bamf = callPackage ../development/libraries/bamf { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; @@ -8503,6 +8577,8 @@ with pkgs; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; + bicgl = callPackage ../development/libraries/science/biology/bicgl { }; + # TODO(@Ericson2314): Build bionic libc from source bionic = assert hostPlatform.useAndroidPrebuilt; androidenv.androidndkPkgs.libraries; @@ -8619,8 +8695,12 @@ with pkgs; coin3d = callPackage ../development/libraries/coin3d { }; + soxt = callPackage ../development/libraries/soxt { }; + CoinMP = callPackage ../development/libraries/CoinMP { }; + cointop = callPackage ../applications/misc/cointop { }; + commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; confuse = callPackage ../development/libraries/confuse { }; @@ -8818,6 +8898,10 @@ with pkgs; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; + # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; @@ -9047,7 +9131,7 @@ with pkgs; # hack fixes the hack, *sigh*. /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross else if name == "bionic" then targetPackages.bionic - else if name == "uclibc" then uclibcCross + else if name == "uclibc" then targetPackages.uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries @@ -9281,7 +9365,7 @@ with pkgs; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; granite = callPackage ../development/libraries/granite { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -9415,7 +9499,7 @@ with pkgs; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hyena = callPackage ../development/libraries/hyena { }; + hyena = callPackage ../development/libraries/hyena { mono = mono4; }; icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; @@ -10458,6 +10542,7 @@ with pkgs; libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; + libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { }; libvorbis = callPackage ../development/libraries/libvorbis { }; @@ -10734,7 +10819,7 @@ with pkgs; ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; }; - ncurses = ncurses6; + ncurses = if hostPlatform.useiOSPrebuilt then null else ncurses6; neardal = callPackage ../development/libraries/neardal { }; @@ -10884,9 +10969,10 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_2_5 - libressl_2_6; + libressl_2_6 + libressl_2_7; - libressl = libressl_2_5; + libressl = libressl_2_7; boringssl = callPackage ../development/libraries/boringssl { }; @@ -11014,8 +11100,6 @@ with pkgs; suffix = "min"; }; - poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { }; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; @@ -11188,6 +11272,8 @@ with pkgs; accounts-qt = callPackage ../development/libraries/accounts-qt { }; + alkimia = callPackage ../development/libraries/alkimia { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; @@ -11457,6 +11543,8 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; + simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + sfml = callPackage ../development/libraries/sfml { }; csfml = callPackage ../development/libraries/csfml { }; @@ -11483,6 +11571,30 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; + soapyairspy = callPackage ../applications/misc/soapyairspy { }; + + soapybladerf = callPackage ../applications/misc/soapybladerf { }; + + soapyhackrf = callPackage ../applications/misc/soapyhackrf { }; + + soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; }; + + soapyremote = callPackage ../applications/misc/soapyremote { }; + + soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { + inherit (python3Packages) python numpy; + extraPackages = [ + limesuite + soapyairspy + soapybladerf + soapyhackrf + soapyremote + soapyuhd + ]; + }; + + soapyuhd = callPackage ../applications/misc/soapyuhd { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; sofia_sip = callPackage ../development/libraries/sofia-sip { }; @@ -11543,6 +11655,8 @@ with pkgs; sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); + sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; @@ -11961,7 +12075,7 @@ with pkgs; libusb = libusb1; }; - yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { }; + yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -11991,6 +12105,8 @@ with pkgs; czmq = czmq3; }; + zmqpp = callPackage ../development/libraries/zmqpp { }; + zig = callPackage ../development/compilers/zig { llvmPackages = llvmPackages_6; }; @@ -12377,6 +12493,8 @@ with pkgs; exim = callPackage ../servers/mail/exim { }; + facette = callPackage ../servers/monitoring/facette { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -12388,8 +12506,6 @@ with pkgs; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; - fleet = callPackage ../servers/fleet { }; - foswiki = callPackage ../servers/foswiki { }; frab = callPackage ../servers/web-apps/frab { }; @@ -12443,6 +12559,8 @@ with pkgs; lwan = callPackage ../servers/http/lwan { }; + labelImg = callPackage ../applications/science/machine-learning/labelimg { }; + mailman = callPackage ../servers/mail/mailman { }; mattermost = callPackage ../servers/mattermost { }; @@ -12747,6 +12865,7 @@ with pkgs; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; + prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; @@ -12919,8 +13038,11 @@ with pkgs; axis2 = callPackage ../servers/http/tomcat/axis2 { }; - unifi = callPackage ../servers/unifi { }; - unifiLTS = callPackage ../servers/unifi { useLTS=true; }; + inherit (callPackages ../servers/unifi { }) + unifiLTS + unifiStable + unifiTesting; + unifi = unifiStable; virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; @@ -12953,7 +13075,7 @@ with pkgs; inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook - autoconf automake libtool mtdev pixman libGL + autoconf automake libtool mtdev pixman libGL libGLU cairo epoxy; inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (darwin) apple_sdk cf-private libobjc; @@ -12977,6 +13099,7 @@ with pkgs; zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; + zabbix34 = callPackage ../servers/monitoring/zabbix/3.4.nix { }; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -13351,11 +13474,6 @@ with pkgs; kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13370,11 +13488,6 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13383,11 +13496,6 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13398,11 +13506,6 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13414,11 +13517,6 @@ with pkgs; # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13426,10 +13524,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ - kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13437,11 +13531,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13523,6 +13612,8 @@ with pkgs; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + tbs = callPackage ../os-specific/linux/tbs { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; @@ -13712,6 +13803,8 @@ with pkgs; libraw1394 = callPackage ../development/libraries/libraw1394 { }; + librealsense = callPackage ../development/libraries/librealsense { }; + libsass = callPackage ../development/libraries/libsass { }; libsexy = callPackage ../development/libraries/libsexy { }; @@ -14003,9 +14096,7 @@ with pkgs; sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; - sysprof = callPackage ../development/tools/profiling/sysprof { - inherit (gnome2) libglade; - }; + sysprof = callPackage ../development/tools/profiling/sysprof { }; # Provided with sysfsutils. libsysfs = sysfsutils; @@ -14082,10 +14173,9 @@ with pkgs; uclibc = callPackage ../os-specific/linux/uclibc { }; - uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - gccCross = gccCrossStageStatic; - cross = assert targetPlatform != buildPlatform; targetPlatform; - }); + uclibcCross = callPackage ../os-specific/linux/uclibc { + stdenv = crossLibcStdenv; + }; udev = systemd; libudev = udev; @@ -14133,23 +14223,13 @@ with pkgs; jom = callPackage ../os-specific/windows/jom { }; - w32api = callPackage ../os-specific/windows/w32api { - gccCross = gccCrossStageStatic; - binutils = binutils; - }; + w32api = callPackage ../os-specific/windows/w32api { }; - w32api_headers = w32api.override { - onlyHeaders = true; - }; + w32api_headers = callPackage ../os-specific/windows/w32api/headers { }; - mingw_runtime = callPackage ../os-specific/windows/mingwrt { - gccCross = gccCrossMingw2; - binutils = binutils; - }; + mingw_runtime = callPackage ../os-specific/windows/mingwrt { }; - mingw_runtime_headers = mingw_runtime.override { - onlyHeaders = true; - }; + mingw_runtime_headers = callPackage ../os-specific/windows/mingwrt/headers.nix { }; mingw_headers1 = buildEnv { name = "mingw-headers-1"; @@ -14373,6 +14453,8 @@ with pkgs; ibm-plex = callPackage ../data/fonts/ibm-plex { }; + iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; + inconsolata = callPackage ../data/fonts/inconsolata {}; inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; @@ -14529,6 +14611,8 @@ with pkgs; powerline-go = callPackage ../tools/misc/powerline-go { }; + powerline-rs = callPackage ../tools/misc/powerline-rs { }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -14809,6 +14893,8 @@ with pkgs; autotrace = callPackage ../applications/graphics/autotrace {}; + avocode = callPackage ../applications/graphics/avocode {}; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -14838,9 +14924,12 @@ with pkgs; parity = self.altcoins.parity; parity-beta = self.altcoins.parity-beta; + parity-ui = self.altcoins.parity-ui; stellar-core = self.altcoins.stellar-core; + particl-core = self.altcoins.particl-core; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -14849,10 +14938,6 @@ with pkgs; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { - eigen = eigen2; - }; - avrdudess = callPackage ../applications/misc/avrdudess { }; avxsynth = callPackage ../applications/video/avxsynth { @@ -14988,6 +15073,8 @@ with pkgs; bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { }; + btops = callPackage ../applications/window-managers/btops { }; + bvi = callPackage ../applications/editors/bvi { }; bviplus = callPackage ../applications/editors/bviplus { }; @@ -15245,10 +15332,10 @@ with pkgs; # go 1.9 pin until https://github.com/moby/moby/pull/35739 inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_18_03 - docker_18_04; + docker_18_05; docker = docker_18_03; - docker-edge = docker_18_04; + docker-edge = docker_18_05; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -15550,6 +15637,8 @@ with pkgs; epdfview = callPackage ../applications/misc/epdfview { }; + epeg = callPackage ../applications/graphics/epeg/default.nix { }; + inherit (gnome3) epiphany; epic5 = callPackage ../applications/networking/irc/epic5 { }; @@ -15905,6 +15994,8 @@ with pkgs; gcalcli = callPackage ../applications/misc/gcalcli { }; + vcal = callPackage ../applications/misc/vcal { }; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; gcolor3 = callPackage ../applications/graphics/gcolor3 { }; @@ -15934,7 +16025,7 @@ with pkgs; gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -15959,6 +16050,10 @@ with pkgs; gmrun = callPackage ../applications/misc/gmrun {}; gnucash = callPackage ../applications/office/gnucash { + inherit (gnome3) dconf; + }; + + gnucash24 = callPackage ../applications/office/gnucash/2.4.nix { inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl; gconf = gnome2.GConf; guile = guile_1_8; @@ -16004,6 +16099,8 @@ with pkgs; moe = callPackage ../applications/editors/moe { }; + multibootusb = callPackage ../applications/misc/multibootusb {}; + praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { @@ -16033,8 +16130,6 @@ with pkgs; gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); - gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { }); - gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { @@ -16052,6 +16147,8 @@ with pkgs; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; + graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { }; + grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; gtkpod = callPackage ../applications/audio/gtkpod { }; @@ -16076,14 +16173,14 @@ with pkgs; gollum = callPackage ../applications/misc/gollum { }; + googleearth = callPackage ../applications/misc/googleearth { }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - googleearth = callPackage_i686 ../applications/misc/googleearth { }; - google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { inherit (gnome2) GConf; }; @@ -16469,9 +16566,7 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3 = callPackage ../applications/audio/kid3 { - qt = qt4; - }; + kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; kile = libsForQt5.callPackage ../applications/editors/kile { }; @@ -16488,6 +16583,11 @@ with pkgs; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + inherit (kdeApplications) kidentitymanagement; + inherit (kdeFrameworks) kdewebkit; + }; + kodestudio = callPackage ../applications/editors/kodestudio { }; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; @@ -16763,7 +16863,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) vmnet; }; - minitube = callPackage ../applications/video/minitube { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimms = callPackage ../applications/audio/mimms {}; @@ -16991,9 +17091,6 @@ with pkgs; p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; - panamax_api = callPackage ../applications/networking/cluster/panamax/api { }; - panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { }; - partio = callPackage ../development/libraries/partio {}; pcmanfm = callPackage ../applications/misc/pcmanfm { }; @@ -17006,6 +17103,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul {}; + plank = callPackage ../applications/misc/plank { }; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { @@ -17352,7 +17451,7 @@ with pkgs; gtksharp = gtk-sharp-2_0; }; - plover = callPackage ../applications/misc/plover { }; + plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -17413,8 +17512,6 @@ with pkgs; puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; - pymol = callPackage ../applications/science/chemistry/pymol { }; - pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -17472,6 +17569,10 @@ with pkgs; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + qtchan = callPackage ../applications/networking/browsers/qtchan { + qt = qt5; + }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; @@ -17598,6 +17699,8 @@ with pkgs; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; + ries = callPackage ../applications/science/math/ries { }; + ripser = callPackage ../applications/science/math/ripser { }; rkt = callPackage ../applications/virtualization/rkt { }; @@ -17874,7 +17977,6 @@ with pkgs; }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { @@ -17913,6 +18015,8 @@ with pkgs; inherit sbcl lispPackages; }; + sublime = callPackage ../applications/editors/sublime/2 { }; + sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); sublime3 = sublime3Packages.sublime3; @@ -18629,6 +18733,10 @@ with pkgs; xdaliclock = callPackage ../tools/misc/xdaliclock {}; + xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; + + xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; + xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; xdg_utils = callPackage ../tools/X11/xdg-utils { @@ -19260,6 +19368,8 @@ with pkgs; orthorobot = callPackage ../games/orthorobot { love = love_0_7; }; + pacvim = callPackage ../games/pacvim { }; + performous = callPackage ../games/performous { }; pingus = callPackage ../games/pingus {}; @@ -19460,6 +19570,8 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; + tuxpaint = callPackage ../games/tuxpaint { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC @@ -19535,7 +19647,7 @@ with pkgs; wesnoth = callPackage ../games/wesnoth { }; - wesnoth-dev = callPackage ../games/wesnoth/dev.nix { }; + wesnoth-dev = wesnoth; widelands = callPackage ../games/widelands { lua = lua5_2; @@ -19676,6 +19788,8 @@ with pkgs; redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg wrapPython; + inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; + geoclue = geoclue2; }; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; @@ -19704,6 +19818,10 @@ with pkgs; onestepback = callPackage ../misc/themes/onestepback { }; + theme-jade1 = callPackage ../misc/themes/jade1 { }; + + theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -19743,6 +19861,22 @@ with pkgs; ### SCIENCE + ### SCIENCE/CHEMISTY + + avogadro = callPackage ../applications/science/chemistry/avogadro { + eigen = eigen2; + }; + + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + + jmol = callPackage ../applications/science/chemistry/jmol { }; + + molden = callPackage ../applications/science/chemistry/molden { }; + + octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + + pymol = callPackage ../applications/science/chemistry/pymol { }; + ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { @@ -19767,6 +19901,10 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; diamond = callPackage ../applications/science/biology/diamond { }; @@ -19821,6 +19959,8 @@ with pkgs; inherit (perlPackages) GetoptTabular MNI-Perllib; }; + minimap2 = callPackage ../applications/science/biology/minimap2 { }; + ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { }; paml = callPackage ../applications/science/biology/paml { }; @@ -19870,12 +20010,14 @@ with pkgs; # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; - liblapack = liblapack_3_5_0WithoutAtlas; + liblapack = liblapackWithoutAtlas; withLapack = false; }; blas = callPackage ../development/libraries/science/math/blas { }; + brial = callPackage ../development/libraries/science/math/brial { }; + clblas = callPackage ../development/libraries/science/math/clblas { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; }; @@ -19893,10 +20035,7 @@ with pkgs; # without atlas. Etc. liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; - liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; liblapack = liblapackWithAtlas; - liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -20428,7 +20567,9 @@ with pkgs; pythia = callPackage ../development/libraries/physics/pythia { }; - rivet = callPackage ../development/libraries/physics/rivet { }; + rivet = callPackage ../development/libraries/physics/rivet { + imagemagick = graphicsmagick-imagemagick-compat; + }; thepeg = callPackage ../development/libraries/physics/thepeg { }; @@ -20641,7 +20782,7 @@ with pkgs; hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; + hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; hyperfine = callPackage ../tools/misc/hyperfine { }; @@ -21013,6 +21154,8 @@ with pkgs; tup = callPackage ../development/tools/build-managers/tup { }; + trufflehog = callPackage ../tools/security/trufflehog { }; + tvheadend = callPackage ../servers/tvheadend { }; ums = callPackage ../servers/ums { }; @@ -21078,53 +21221,7 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = rec { - minimal = callPackage ../misc/emulators/wine { - wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; - }; - - base = minimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; - gettextSupport = true; - fontconfigSupport = true; - alsaSupport = true; - openglSupport = true; - tlsSupport = true; - cupsSupport = true; - dbusSupport = true; - cairoSupport = true; - cursesSupport = true; - saneSupport = true; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - udevSupport = true; - xineramaSupport = true; - xmlSupport = true; - }; - - full = base.override { - gtkSupport = true; - gstreamerSupport = true; - colorManagementSupport = true; - mpg123Support = true; - openalSupport = true; - openclSupport = true; - odbcSupport = true; - netapiSupport = true; - vaSupport = true; - pcapSupport = true; - v4lSupport = true; - gsmSupport = true; - gphoto2Support = true; - ldapSupport = true; - }; - - stable = base.override { wineRelease = "stable"; }; - unstable = base.override { wineRelease = "unstable"; }; - staging = base.override { wineRelease = "staging"; }; - }; + winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { }); wine = winePackages.full; @@ -21162,6 +21259,8 @@ with pkgs; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xbps = callPackage ../tools/package-management/xbps { }; + xcftools = callPackage ../tools/graphics/xcftools { }; xhyve = callPackage ../applications/virtualization/xhyve { @@ -21340,28 +21439,6 @@ with pkgs; openfst = callPackage ../development/libraries/openfst {}; - # `recurseIntoAttrs` for sake of hydra, not nix-env - tests = recurseIntoAttrs { - cc-wrapper = callPackage ../test/cc-wrapper { }; - cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; }; - cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; - cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; - cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; - cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; - cc-wrapper-clang-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.stdenv; }; - cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; }; - cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; }; - cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; - cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; }; - cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; }; - stdenv-inputs = callPackage ../test/stdenv-inputs { }; - - cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; - cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; - - macOSSierraShared = callPackage ../test/macos-sierra-shared {}; - }; - duti = callPackage ../os-specific/darwin/duti {}; dnstracer = callPackage ../tools/networking/dnstracer { @@ -21384,6 +21461,10 @@ with pkgs; teseq = callPackage ../applications/misc/teseq { }; + ape = callPackage ../applications/misc/ape { }; + attemptoClex = callPackage ../applications/misc/ape/clex.nix { }; + apeClex = callPackage ../applications/misc/ape/apeclex.nix { }; + # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index acc087108c98..f81a921938cc 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -178,6 +178,8 @@ let }; }; + emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { }; + evil-jumper = melpaBuild rec { pname = "evil-jumper"; version = "20151017"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 48980e48f1d4..2e6bd5ebb853 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -10,7 +10,10 @@ let "ghc821Binary" "ghcCross" "ghcjs" - "ghcjsHEAD" + "ghcjs710" + "ghcjs80" + "ghcjs82" + "ghcjs84" "integer-simple" ]; @@ -64,12 +67,6 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc841 = callPackage ../development/compilers/ghc/8.4.1.nix rec { - bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; @@ -82,14 +79,28 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { + ghcjs = compiler.ghcjs82; + ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; }; - ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { bootPkgs = packages.ghc802; inherit (pkgs) cabal-install; }; + ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec { + bootPkgs = packages.ghc822; + inherit (bootPkgs) alex happy; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; + }; + ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { + bootPkgs = packages.ghc842; + inherit (bootPkgs) alex happy; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; + ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -135,11 +146,6 @@ in rec { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc841 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc841; - ghc = bh.compiler.ghc841; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc842 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc842; ghc = bh.compiler.ghc842; @@ -150,18 +156,31 @@ in rec { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = callPackage ../development/haskell-modules rec { + ghcjs = packages.ghcjs82; + ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackage ../development/haskell-modules rec { + ghcjs80 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjs82 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs82; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; + ghcjs84 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs84; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. @@ -170,7 +189,7 @@ in rec { (name: ! builtins.elem name integerSimpleExcludes) (pkgs.lib.attrNames packages); in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { - ghc = compiler.integer-simple."${name}"; + ghc = bh.compiler.integer-simple."${name}"; overrides = _self : _super : { integer-simple = null; integer-gmp = null; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index a9f21e45aed4..df462665dd16 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -41,7 +41,7 @@ in # fix-point made by Nixpkgs. overlays ? let isDir = path: pathExists (path + "/."); - pathOverlays = try <nixpkgs-overlays> ""; + pathOverlays = try (toString <nixpkgs-overlays>) ""; homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix"; homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays"; overlays = path: diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3da443098037..e6ec2f8ed9d8 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -267,14 +267,14 @@ let }; luafilesystem = buildLuaPackage rec { - version = "1.6.3"; + version = "1.7.0"; name = "filesystem-${version}"; src = fetchFromGitHub { owner = "keplerproject"; repo = "luafilesystem"; rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}"; - sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; + sha256 = "0fibrasshlgpa71m9wkpjxwmylnxpcf06rpqbaa0qwvqh94nhwby"; }; preConfigure = '' diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 741a58ce588a..bce2662abfd1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,10 +217,7 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eliom = callPackage ../development/ocaml-modules/eliom { - lwt = lwt2; - js_of_ocaml = js_of_ocaml_2; - }; + eliom = callPackage ../development/ocaml-modules/eliom { }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; @@ -504,7 +501,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; @@ -1046,5 +1043,10 @@ in rec ocamlPackages_latest = ocamlPackages_4_06; - ocamlPackages = ocamlPackages_4_05; + ocamlPackages = + # OCaml 4.05 is broken on aarch64 + if system == "aarch64-linux" then + ocamlPackages_4_06 + else + ocamlPackages_4_05; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3278311f25c0..8956f9806684 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -365,14 +365,13 @@ let self = _self // overrides; _self = with self; { }; AppSt = buildPerlPackage rec { - name = "App-St-1.1.2"; + name = "App-St-1.1.4"; src = fetchurl { - url = https://github.com/nferraz/st/archive/v1.1.2.tar.gz; - sha256 = "1j1iwcxl16m4x5kl1vcv0linb93r55ndh3jm0w6qf459jl4x38s6"; + url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz; + sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0"; }; postInstall = '' - sed -e "1 s|\(.*\)|\1 -I $out/lib/perl5/site_perl|" -i $out/bin/st ($out/bin/st --help || true) | grep Usage ''; meta = { @@ -450,20 +449,6 @@ let self = _self // overrides; _self = with self; { }; }; - ListCompare = buildPerlPackage rec { - name = "List-Compare-0.53"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; - sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; - }; - buildInputs = [ IOCaptureOutput ]; - meta = { - homepage = http://thenceforward.net/perl/modules/List-Compare/; - description = "Compare elements of two or more lists"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - ArchiveCpio = buildPerlPackage rec { name = "Archive-Cpio-0.10"; src = fetchurl { @@ -2078,6 +2063,19 @@ let self = _self // overrides; _self = with self; { }; }; + ClassEHierarchy = buildPerlPackage rec { + name = "Class-EHierarchy-2.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/${name}.tar.gz"; + sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb"; + }; + meta = { + description = "Base class for hierarchally ordered objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + ClassFactory = buildPerlPackage { name = "Class-Factory-1.06"; src = fetchurl { @@ -8524,6 +8522,21 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + LinuxACL = buildPerlPackage rec { + name = "Linux-ACL-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz"; + sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; + }; + buildInputs = [ pkgs.acl ]; + NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl"; + meta = { + maintainers = [ maintainers.limeytexan ]; + description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LinuxDistribution = buildPerlModule { name = "Linux-Distribution-0.23"; src = fetchurl { @@ -8571,6 +8584,20 @@ let self = _self // overrides; _self = with self; { }; }; + ListCompare = buildPerlPackage rec { + name = "List-Compare-0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; + sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; + }; + buildInputs = [ IOCaptureOutput ]; + meta = { + homepage = http://thenceforward.net/perl/modules/List-Compare/; + description = "Compare elements of two or more lists"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ListMoreUtils = buildPerlPackage rec { name = "List-MoreUtils-0.428"; src = fetchurl { @@ -11758,6 +11785,22 @@ let self = _self // overrides; _self = with self; { }; }; + NetZooKeeper = buildPerlPackage rec { + name = "Net-ZooKeeper-0.41"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAF/${name}.tar.gz"; + sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; + }; + buildInputs = [ pkgs.zookeeper_mt ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; + meta = { + maintainers = [ maintainers.limeytexan ]; + homepage = https://github.com/mark-5/p5-net-zookeeper; + license = stdenv.lib.licenses.asl20; + }; + }; + PackageConstants = buildPerlPackage { name = "Package-Constants-0.06"; src = fetchurl { @@ -11923,6 +11966,25 @@ let self = _self // overrides; _self = with self; { }; }; + Paranoid = buildPerlPackage rec { + name = "Paranoid-2.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz"; + sha256 = "583dfa0279733531f360795ad1cf4aa652d537b2b0bbd3c6925d0c8d75cbb3df"; + }; + patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; + preConfigure = '' + # Capture the path used when compiling this module as the "blessed" + # system path, analogous to the module's own use of '/bin:/sbin'. + sed -i "s#__BLESSED_PATH__#${pkgs.coreutils}/bin#" lib/Paranoid.pm t/01_init_core.t + ''; + meta = { + description = "General function library for safer, more secure programming"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + PARDist = buildPerlPackage { name = "PAR-Dist-0.49"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6635721ee958..ca5cfb677a2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -271,10 +271,14 @@ in { intelhex = callPackage ../development/python-modules/intelhex { }; + jira = callPackage ../development/python-modules/jira { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; logster = callPackage ../development/python-modules/logster { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -301,6 +305,8 @@ in { oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + outcome = callPackage ../development/python-modules/outcome {}; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -434,6 +440,10 @@ in { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + trustme = callPackage ../development/python-modules/trustme {}; + + trio = callPackage ../development/python-modules/trio {}; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { }; @@ -1627,6 +1637,8 @@ in { contexter = callPackage ../development/python-modules/contexter { }; + contextvars = callPackage ../development/python-modules/contextvars {}; + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -2810,56 +2822,11 @@ in { gpy = callPackage ../development/python-modules/gpy { }; - gitdb = buildPythonPackage rec { - name = "gitdb-0.6.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gitdb/${name}.tar.gz"; - sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ smmap ]; - - checkPhase = '' - nosetests - ''; - - doCheck = false; # Bunch of tests fail because they need an actual git repo + gitdb = callPackage ../development/python-modules/gitdb { }; - meta = { - description = "Git Object Database"; - maintainers = with maintainers; [ ]; - homepage = https://github.com/gitpython-developers/gitdb; - license = licenses.bsd3; - }; - - }; - - GitPython = buildPythonPackage rec { - version = "2.0.8"; - name = "GitPython-${version}"; + gitdb2 = callPackage ../development/python-modules/gitdb2 { }; - src = pkgs.fetchurl { - url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz"; - sha256 = "7c03d1130f903aafba6ae5b89ccf8eb433a995cd3120cbb781370e53fc4eb222"; - }; - - buildInputs = with self; [ mock nose ]; - propagatedBuildInputs = with self; [ gitdb ]; - - # All tests error with - # InvalidGitRepositoryError: /tmp/nix-build-python2.7-GitPython-1.0.1.drv-0/GitPython-1.0.1 - # Maybe due to being in a chroot? - doCheck = false; - - meta = { - description = "Python Git Library"; - maintainers = with maintainers; [ ]; - homepage = https://github.com/gitpython-developers/GitPython; - license = licenses.bsd3; - }; - }; + GitPython = callPackage ../development/python-modules/GitPython { }; git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; @@ -2984,6 +2951,8 @@ in { }; + hiro = callPackage ../development/python-modules/hiro {}; + hglib = callPackage ../development/python-modules/hglib {}; humanize = buildPythonPackage rec { @@ -3118,6 +3087,8 @@ in { imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; + immutables = callPackage ../development/python-modules/immutables {}; + imread = buildPythonPackage rec { name = "python-imread-${version}"; version = "0.6"; @@ -3878,37 +3849,9 @@ in { podcastparser = callPackage ../development/python-modules/podcastparser { }; - pomegranate = callPackage ../development/python-modules/pomegranate { }; - - poppler-qt4 = buildPythonPackage rec { - name = "poppler-qt4-${version}"; - version = "0.18.1"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-poppler-qt4/" + - "python-poppler-qt4-${version}.tar.gz"; - sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; - }; + podcats = callPackage ../development/python-modules/podcats { }; - propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; - - preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; - - NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/"; - - meta = { - description = "A Python binding to Poppler-Qt4"; - longDescription = '' - A Python binding to Poppler-Qt4 that aims for completeness - and for being actively maintained. - ''; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ sepi ]; - platforms = platforms.all; - }; - }; + pomegranate = callPackage ../development/python-modules/pomegranate { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; @@ -5088,6 +5031,7 @@ in { }; }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt {}; SPARQLWrapper = buildPythonPackage rec { name = "SPARQLWrapper-${version}"; @@ -5651,7 +5595,29 @@ in { }; }; - pytorch = callPackage ../development/python-modules/pytorch { }; + pytorch = let + # Fails with CUDA 9.1 and GCC 6.4: + # https://github.com/pytorch/pytorch/issues/5831 + # https://devtalk.nvidia.com/default/topic/1028112 + # We should be able to remove this when CUDA 9.2 is released. + cudatoolkit9 = pkgs.cudatoolkit9.override { + gcc6 = pkgs.gcc5; + }; + in callPackage ../development/python-modules/pytorch { + cudaSupport = pkgs.config.cudaSupport or false; + cudatoolkit = cudatoolkit9; + cudnn = pkgs.cudnn_cudatoolkit9.override { + inherit cudatoolkit9; + }; + }; + + pytorchWithCuda = self.pytorch.override { + cudaSupport = true; + }; + + pytorchWithoutCuda = self.pytorch.override { + cudaSupport = false; + }; python2-pythondialog = buildPythonPackage rec { name = "python2-pythondialog-${version}"; @@ -6122,11 +6088,11 @@ in { github3_py = buildPythonPackage rec { name = "github3.py-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/g/github3.py/${name}.tar.gz"; - sha256 = "1g91a8q9w0dalf4y4v0g72zi7vfrxwpx639an28vvys20y5zlvwp"; + sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf"; }; buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers dateutil ]; @@ -6412,21 +6378,7 @@ in { httpbin = callPackage ../development/python-modules/httpbin { }; - httplib2 = buildPythonPackage rec { - name = "httplib2-0.9.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/httplib2/${name}.tar.gz"; - sha256 = "126rsryvw9vhbf3qmsfw9lf4l4xm2srmgs439lgma4cpag4s3ay3"; - }; - - meta = { - homepage = http://code.google.com/p/httplib2; - description = "A comprehensive HTTP client library"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + httplib2 = callPackage ../development/python-modules/httplib2 { }; hvac = callPackage ../development/python-modules/hvac { }; @@ -6804,24 +6756,7 @@ in { iso8601 = callPackage ../development/python-modules/iso8601 { }; - isort = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "isort"; - version = "4.2.5"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0p7a6xaq7zxxq5vr5gizshnsbk2afm70apg97xwfdxiwyi201cjn"; - }; - buildInputs = with self; [ mock pytest ]; - # No tests distributed - doCheck = false; - meta = { - description = "A Python utility / library to sort Python imports"; - homepage = https://github.com/timothycrosley/isort; - license = licenses.mit; - maintainers = with maintainers; [ couchemar nand0p ]; - }; - }; + isort = callPackage ../development/python-modules/isort {}; jabberbot = callPackage ../development/python-modules/jabberbot {}; @@ -7136,6 +7071,7 @@ in { libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; }; librepo = toPythonModule (pkgs.librepo.override { @@ -9121,46 +9057,7 @@ in { plone-testing = callPackage ../development/python-modules/plone-testing { }; - ply = buildPythonPackage (rec { - name = "ply-3.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/ply/${name}.tar.gz"; - sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8"; - }; - - checkPhase = '' - ${python.interpreter} test/testlex.py - ${python.interpreter} test/testyacc.py - ''; - - # Test suite appears broken - doCheck = false; - - meta = { - homepage = http://www.dabeaz.com/ply/; - - description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; - - longDescription = '' - PLY is an implementation of lex and yacc parsing tools for Python. - In a nutshell, PLY is nothing more than a straightforward lex/yacc - implementation. Here is a list of its essential features: It's - implemented entirely in Python; It uses LR-parsing which is - reasonably efficient and well suited for larger grammars; PLY - provides most of the standard lex/yacc features including support for - empty productions, precedence rules, error recovery, and support for - ambiguous grammars; PLY is straightforward to use and provides very - extensive error checking; PLY doesn't try to do anything more or less - than provide the basic lex/yacc functionality. In other words, it's - not a large parsing framework or a component of some larger system. - ''; - - license = licenses.bsd3; - - maintainers = [ ]; - }; - }); + ply = callPackage ../development/python-modules/ply { }; plyvel = buildPythonPackage (rec { name = "plyvel-0.9"; @@ -11599,11 +11496,15 @@ in { sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; }; propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ]; - patchPhase = '' - sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py - sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py - sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py - sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py + patchPhase = let + ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + substituteInPlace OpenGL/platform/glx.py \ + --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ + --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \ + --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" + substituteInPlace OpenGL/platform/darwin.py \ + --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ + --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'" ''; meta = { homepage = http://pyopengl.sourceforge.net/; @@ -13042,6 +12943,7 @@ in { Theano = callPackage ../development/python-modules/Theano rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; + inherit (pkgs.linuxPackages) nvidia_x11; }; TheanoWithoutCuda = self.Theano.override { @@ -14296,18 +14198,9 @@ in { tqdm = callPackage ../development/python-modules/tqdm { }; - smmap = buildPythonPackage rec { - name = "smmap-0.9.0"; - disabled = isPyPy; # This fails the tests if built with pypy - meta.maintainers = with maintainers; [ ]; + smmap = callPackage ../development/python-modules/smmap { }; - buildInputs = with self; [ nosexcover ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/smmap/${name}.tar.gz"; - sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf"; - }; - }; + smmap2 = callPackage ../development/python-modules/smmap2 { }; traits = buildPythonPackage rec { name = "traits-${version}"; @@ -14733,6 +14626,8 @@ in { uritemplate = callPackage ../development/python-modules/uritemplate { }; + uproot = callPackage ../development/python-modules/uproot {}; + uptime = buildPythonPackage rec { name = "uptime-${version}"; version = "3.0.1"; @@ -17861,15 +17756,7 @@ EOF }; }; - rocket-errbot = buildPythonPackage rec { - name = "rocket-errbot-${version}"; - version = "1.2.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rocket-errbot/${name}.tar.gz"; - sha256 = "181y1wqjvlry5xdzbliajvrxvswzh3myh795jnj1pm92r5grqzda"; - }; - }; + rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; Yapsy = buildPythonPackage rec { name = "Yapsy-${version}"; @@ -18258,6 +18145,8 @@ EOF pyspark = callPackage ../development/python-modules/pyspark { }; + pysensors = callPackage ../development/python-modules/pysensors { }; + sseclient = callPackage ../development/python-modules/sseclient { }; warrant = callPackage ../development/python-modules/warrant { }; @@ -18289,6 +18178,16 @@ EOF h11 = callPackage ../development/python-modules/h11 { }; python-docx = callPackage ../development/python-modules/python-docx { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; + + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + + pyowm = callPackage ../development/python-modules/pyowm { }; + + prometheus_client = callPackage ../development/python-modules/prometheus_client { }; }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3ea873cdc7ff..efced59ad91b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -107,6 +107,13 @@ let jobs.tests.cc-wrapper.x86_64-linux jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-gcc7.x86_64-linux + jobs.tests.cc-wrapper-gcc7.x86_64-darwin + jobs.tests.cc-wrapper-gcc8.x86_64-linux + + # broken see issue #40038 + # jobs.tests.cc-wrapper-gcc8.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 26adcda8ee17..36fba3fbd479 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -11,7 +11,6 @@ # input, not "procps" which requires Linux. let - singleBinary = cmd: providers: let provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; in runCommand cmd { @@ -27,8 +26,6 @@ let ln -s "${provider}" "$out/bin/${cmd}" ''; -in rec { - # more is unavailable in darwin # just use less more_compat = runCommand "more" {} '' @@ -36,117 +33,114 @@ in rec { ln -s ${pkgs.less}/bin/less $out/bin/more ''; - # singular binaries - arp = singleBinary "arp" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - col = singleBinary "col" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.text_cmds; - }; - eject = singleBinary "eject" { - linux = pkgs.utillinux; - }; - getopt = singleBinary "getopt" { - linux = pkgs.utillinux; - darwin = pkgs.getopt; - }; - fdisk = singleBinary "fdisk" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - fsck = singleBinary "fsck" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - hexdump = singleBinary "hexdump" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - hostname = singleBinary "hostname" { - linux = pkgs.nettools; - darwin = pkgs.darwin.shell_cmds; - }; - ifconfig = singleBinary "ifconfig" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - logger = singleBinary "logger" { - linux = pkgs.utillinux; - }; - more = singleBinary "more" { - linux = pkgs.utillinux; - darwin = more_compat; - }; - mount = singleBinary "mount" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - netstat = singleBinary "netstat" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - ping = singleBinary "ping" { - linux = pkgs.iputils; - darwin = pkgs.darwin.network_cmds; + bins = lib.mapAttrs singleBinary { + # singular binaries + arp = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + col = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.text_cmds; + }; + eject = { + linux = pkgs.utillinux; + }; + getopt = { + linux = pkgs.utillinux; + darwin = pkgs.getopt; + }; + fdisk = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + fsck = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + hexdump = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + hostname = { + linux = pkgs.nettools; + darwin = pkgs.darwin.shell_cmds; + }; + ifconfig = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + logger = { + linux = pkgs.utillinux; + }; + more = { + linux = pkgs.utillinux; + darwin = more_compat; + }; + mount = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + netstat = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + ping = { + linux = pkgs.iputils; + darwin = pkgs.darwin.network_cmds; + }; + ps = { + linux = pkgs.procps; + darwin = pkgs.darwin.ps; + }; + quota = { + linux = pkgs.linuxquota; + darwin = pkgs.darwin.diskdev_cmds; + }; + route = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + script = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + sysctl = { + linux = pkgs.procps; + darwin = pkgs.darwin.system_cmds; + }; + top = { + linux = pkgs.procps; + darwin = pkgs.darwin.top; + }; + umount = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + whereis = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + wall = { + linux = pkgs.utillinux; + }; + write = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.basic_cmds; + }; }; - ps = singleBinary "ps" { - linux = pkgs.procps; - darwin = pkgs.darwin.ps; - }; - quota = singleBinary "quota" { - linux = pkgs.linuxquota; - darwin = pkgs.darwin.diskdev_cmds; - }; - route = singleBinary "route" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - script = singleBinary "script" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - sysctl = singleBinary "sysctl" { - linux = pkgs.procps; - darwin = pkgs.darwin.system_cmds; - }; - top = singleBinary "top" { - linux = pkgs.procps; - darwin = pkgs.darwin.top; - }; - umount = singleBinary "umount" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - whereis = singleBinary "whereis" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - wall = singleBinary "wall" { - linux = pkgs.utillinux; - }; - write = singleBinary "write" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.basic_cmds; + + makeCompat = name': value: buildEnv { + name = name' + "-compat"; + paths = value; }; # Compatibility derivations # Provided for old usage of these commands. - - procps = buildEnv { - name = "procps-compat"; - paths = [ ps sysctl top ]; - }; - - utillinux = buildEnv { - name = "utillinux-compat"; - paths = [ fsck fdisk getopt hexdump mount - script umount whereis write col ]; - }; - - nettools = buildEnv { - name = "nettools-compat"; - paths = [ arp hostname ifconfig netstat route ]; + compat = with bins; lib.mapAttrs makeCompat { + procps = [ ps sysctl top ]; + utillinux = [ fsck fdisk getopt hexdump mount + script umount whereis write col ]; + nettools = [ arp hostname ifconfig netstat route ]; }; -} +in bins // compat diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix new file mode 100644 index 000000000000..109f01362555 --- /dev/null +++ b/pkgs/top-level/wine-packages.nix @@ -0,0 +1,50 @@ +{ stdenv, config, callPackage }: + +rec { + minimal = callPackage ../misc/emulators/wine { + wineRelease = config.wine.release or "stable"; + wineBuild = config.wine.build or "wine32"; + }; + + base = minimal.override { + pngSupport = true; + jpegSupport = true; + tiffSupport = true; + gettextSupport = true; + fontconfigSupport = true; + alsaSupport = true; + openglSupport = true; + vulkanSupport = stdenv.isLinux; + tlsSupport = true; + cupsSupport = true; + dbusSupport = true; + cairoSupport = true; + cursesSupport = true; + saneSupport = true; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + udevSupport = true; + xineramaSupport = true; + xmlSupport = true; + }; + + full = base.override { + gtkSupport = true; + gstreamerSupport = true; + colorManagementSupport = true; + mpg123Support = true; + openalSupport = true; + openclSupport = true; + odbcSupport = true; + netapiSupport = true; + vaSupport = true; + pcapSupport = true; + v4lSupport = true; + gsmSupport = true; + gphoto2Support = true; + ldapSupport = true; + }; + + stable = base.override { wineRelease = "stable"; }; + unstable = base.override { wineRelease = "unstable"; }; + staging = base.override { wineRelease = "staging"; }; +} |