diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 351 | ||||
| -rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 147 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 90 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 304 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 16 |
10 files changed, 332 insertions, 629 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae7137d3a6a..b8298b76d77 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -81,6 +81,8 @@ mapAliases ({ dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 emacsMelpa = emacs25PackagesNg; # for backward compatibility + emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 + emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 @@ -129,6 +131,7 @@ mapAliases ({ iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 inotifyTools = inotify-tools; + jbuilder = dune; # added 2018-09-09 joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 @@ -290,9 +293,12 @@ mapAliases ({ vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06 + weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 + morituri = whipper; # added 2018-09-13 x11 = xlibsWrapper; # added 2015-09 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9df4ea4fb8..7acf0e4df12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -129,8 +129,7 @@ with pkgs; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; - # go 1.9 pin until https://github.com/moby/moby/pull/35739 - dockerTools = callPackage ../build-support/docker { go = go_1_9; }; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -152,6 +151,8 @@ with pkgs; ebook2cw = callPackage ../applications/misc/ebook2cw { }; + etBook = callPackage ../data/fonts/et-book { }; + fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; @@ -425,6 +426,8 @@ with pkgs; acct = callPackage ../tools/system/acct { }; + accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; + acme-sh = callPackage ../tools/admin/acme.sh { }; acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { @@ -843,7 +846,9 @@ with pkgs; bashmount = callPackage ../tools/filesystems/bashmount {}; - bat = callPackage ../tools/misc/bat { }; + bat = callPackage ../tools/misc/bat { + inherit (darwin.apple_sdk.frameworks) Security; + }; bc = callPackage ../tools/misc/bc { }; @@ -1238,6 +1243,8 @@ with pkgs; dtrx = callPackage ../tools/compression/dtrx { }; + dune = callPackage ../development/tools/ocaml/dune { }; + duperemove = callPackage ../tools/filesystems/duperemove { }; dylibbundler = callPackage ../tools/misc/dylibbundler { }; @@ -1398,8 +1405,6 @@ with pkgs; interlock = callPackage ../servers/interlock {}; - jbuilder = callPackage ../development/tools/ocaml/jbuilder { }; - kapacitor = callPackage ../servers/monitoring/kapacitor { }; kisslicer = callPackage ../tools/misc/kisslicer { }; @@ -1462,6 +1467,8 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; + noti = callPackage ../tools/misc/noti { }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; nwipe = callPackage ../tools/security/nwipe { }; @@ -1790,6 +1797,8 @@ with pkgs; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; + codimd = callPackage ../servers/web-apps/codimd { }; + colord = callPackage ../tools/misc/colord { }; colord-gtk = callPackage ../tools/misc/colord-gtk { }; @@ -2345,7 +2354,9 @@ with pkgs; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; - cryfs = callPackage ../tools/filesystems/cryfs { }; + cryfs = callPackage ../tools/filesystems/cryfs { + spdlog = spdlog_0; + }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -2385,7 +2396,7 @@ with pkgs; exempi = callPackage ../development/libraries/exempi { }; - execline = callPackage ../tools/misc/execline { }; + execline = skawarePackages.execline; exif = callPackage ../tools/graphics/exif { }; @@ -2909,7 +2920,10 @@ with pkgs; }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); grin = callPackage ../tools/text/grin { }; - ripgrep = callPackage ../tools/text/ripgrep { }; + + ripgrep = callPackage ../tools/text/ripgrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -2931,6 +2945,7 @@ with pkgs; grub = pkgsi686Linux.callPackage ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + stdenv = overrideCC stdenv pkgsi686Linux.gcc6; }; trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; @@ -3082,6 +3097,8 @@ with pkgs; hdapsd = callPackage ../os-specific/linux/hdapsd { }; + hdaps-gl = callPackage ../tools/misc/hdaps-gl { }; + hddtemp = callPackage ../tools/misc/hddtemp { }; hdf4 = callPackage ../tools/misc/hdf4 { @@ -3192,6 +3209,8 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; + hylafaxplus = callPackage ../servers/hylafaxplus { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; i2p = callPackage ../tools/networking/i2p {}; @@ -3354,7 +3373,7 @@ with pkgs; jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { - mono = mono50; + mono = mono5; }; jade = callPackage ../tools/text/sgml/jade { }; @@ -3601,8 +3620,6 @@ with pkgs; mmv = callPackage ../tools/misc/mmv { }; - morituri = callPackage ../applications/audio/morituri { }; - most = callPackage ../tools/misc/most { }; motion = callPackage ../applications/video/motion { }; @@ -3678,11 +3695,11 @@ with pkgs; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix { @@ -3718,7 +3735,7 @@ with pkgs; ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -4584,6 +4601,8 @@ with pkgs; pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdftag = callPackage ../tools/graphics/pdftag { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; fmodex = callPackage ../games/zandronum/fmod.nix { }; @@ -4736,6 +4755,8 @@ with pkgs; pptpd = callPackage ../tools/networking/pptpd {}; + prettyping = callPackage ../tools/networking/prettyping { }; + prey-bash-client = callPackage ../tools/security/prey { }; profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; @@ -4899,6 +4920,8 @@ with pkgs; redsocks = callPackage ../tools/networking/redsocks { }; + richgo = callPackage ../development/tools/richgo { }; + rst2html5 = callPackage ../tools/text/rst2html5 { }; rt = callPackage ../servers/rt { }; @@ -5062,13 +5085,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = skawarePackages.s6-dns; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = skawarePackages.s6-linux-utils; - s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = skawarePackages.s6-networking; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = skawarePackages.s6-portable-utils; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -5560,7 +5583,7 @@ with pkgs; tokei = callPackage ../development/tools/misc/tokei { }; tor = callPackage ../tools/security/tor { - openssl = openssl_1_1_0; + openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { sslSupport = false; @@ -5569,7 +5592,9 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { + inherit (gnome3) defaultIconTheme; + }; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; @@ -5816,6 +5841,8 @@ with pkgs; welkin = callPackage ../tools/graphics/welkin {}; + whipper = callPackage ../applications/audio/whipper { }; + whois = callPackage ../tools/networking/whois { }; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; @@ -6036,9 +6063,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { - overrideDerivation = lib.overrideDerivation; - }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -6199,6 +6224,8 @@ with pkgs; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; + zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; + zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; @@ -6220,7 +6247,7 @@ with pkgs; ### SHELLS - runtimeShell = "${runtimeShellPackage}/bin/bash"; + runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); @@ -6304,10 +6331,6 @@ with pkgs; binaryen = callPackage ../development/compilers/binaryen { }; - boo = callPackage ../development/compilers/boo { - inherit (gnome2) gtksourceview; - }; - colm = callPackage ../development/compilers/colm { }; fetchegg = callPackage ../build-support/fetchegg { }; @@ -6904,7 +6927,7 @@ with pkgs; jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { + julia_06 = callPackage ../development/compilers/julia { gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -6923,6 +6946,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia = julia_06; + jwasm = callPackage ../development/compilers/jwasm { }; kotlin = callPackage ../development/compilers/kotlin { }; @@ -7131,7 +7156,8 @@ with pkgs; opaline = callPackage ../development/tools/ocaml/opaline { }; - opam = callPackage ../development/tools/ocaml/opam { + opam = callPackage ../development/tools/ocaml/opam { }; + opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -7158,11 +7184,14 @@ with pkgs; }); inherit (rust) cargo rustc; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; - cargo-web = callPackage ../development/tools/cargo-web { }; + cargo-web = callPackage ../development/tools/cargo-web { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -7185,6 +7214,7 @@ with pkgs; }; }); + cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; @@ -7896,12 +7926,13 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_1_1; + apacheKafka = apacheKafka_2_0; 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"; }; + apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; kt = callPackage ../tools/misc/kt {}; @@ -7949,6 +7980,11 @@ with pkgs; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; + bazel_jdk10 = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + runJdk = jdk10; + }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; @@ -8270,7 +8306,7 @@ with pkgs; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; + gede = libsForQt59.callPackage ../development/tools/misc/gede { }; gdbgui = callPackage ../development/tools/misc/gdbgui { }; @@ -8486,14 +8522,12 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; - nant = callPackage ../development/tools/build-managers/nant { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; gn = callPackage ../development/tools/build-managers/gn { }; nixbang = callPackage ../development/tools/misc/nixbang { - pythonPackages = python3Packages; + pythonPackages = python3Packages; }; nexus = callPackage ../development/tools/repository-managers/nexus { }; @@ -8738,13 +8772,9 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" (texinfo.override { - interactive = true; - # doCheck = true -> some xlocale.h problem with perl 5.28.0 - # (it's mistakenly trying to include the non-existent header) - perl = perl526; - buildPackages = buildPackages // { perl = buildPackages.perl526; }; - }); + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -9844,7 +9874,7 @@ with pkgs; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; - libheimdal = heimdal.override { type = "lib"; }; + libheimdal = heimdal; harfbuzz = callPackage ../development/libraries/harfbuzz { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; @@ -10388,12 +10418,16 @@ with pkgs; libgrss = callPackage ../development/libraries/libgrss { }; + libiio = callPackage ../development/libraries/libiio { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; libserialport = callPackage ../development/libraries/libserialport { }; + libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { }; + libsoundio = callPackage ../development/libraries/libsoundio { inherit (darwin.apple_sdk.frameworks) AudioUnit; }; @@ -11243,6 +11277,8 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; + mtxclient = callPackage ../development/libraries/mtxclient { }; + mu = callPackage ../tools/networking/mu { texinfo = texinfo4; }; @@ -11316,6 +11352,8 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; + nsss = skawarePackages.nsss; + ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -11439,7 +11477,7 @@ with pkgs; }; }) openssl_1_0_2 - openssl_1_1_0; + openssl_1_1; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { @@ -11712,7 +11750,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2 kholidays kpurpose; + syndication threadweaver kirigami2 kholidays kpurpose; ### KDE PLASMA 5 @@ -12008,7 +12046,24 @@ with pkgs; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; - skalibs = callPackage ../development/libraries/skalibs { }; + skalibs = skawarePackages.skalibs; + + skawarePackages = recurseIntoAttrs { + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + + skalibs = callPackage ../development/libraries/skalibs { }; + execline = callPackage ../tools/misc/execline { }; + + s6 = callPackage ../tools/system/s6 { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-rc = callPackage ../tools/system/s6-rc { }; + + nsss = callPackage ../development/libraries/nsss { }; + + }; skydive = callPackage ../tools/networking/skydive { }; @@ -12830,8 +12885,8 @@ with pkgs; rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -12855,8 +12910,8 @@ with pkgs; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -13104,6 +13159,8 @@ with pkgs; nas = callPackage ../servers/nas { }; + nats-streaming-server = callPackage ../servers/nats-streaming-server { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; @@ -13288,6 +13345,8 @@ with pkgs; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; + nullidentdmod = callPackage ../servers/identd/nullidentdmod {}; + riemann = callPackage ../servers/monitoring/riemann { }; riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; @@ -13312,6 +13371,8 @@ with pkgs; cbfstool = callPackage ../applications/virtualization/cbfstool { }; + nvramtool = callPackage ../tools/misc/nvramtool { }; + vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; pgbouncer = callPackage ../servers/sql/pgbouncer { }; @@ -13418,9 +13479,9 @@ with pkgs; boost = boost159; }; - s6 = callPackage ../tools/system/s6 { }; + s6 = skawarePackages.s6; - s6-rc = callPackage ../tools/system/s6-rc { }; + s6-rc = skawarePackages.s6-rc; supervise = callPackage ../tools/system/supervise { }; @@ -13674,6 +13735,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + bluez = bluez5; inherit (python3Packages) bedup; @@ -13932,14 +13995,6 @@ with pkgs; ]; }; - linux_copperhead_lts = (linux_4_14.override { - kernelPatches = linux_4_14.kernelPatches ++ [ - kernelPatches.copperhead_4_14 - kernelPatches.tag_hardened - ]; - modDirVersionArg = linux_4_14.modDirVersion + "-hardened"; - }); - # linux mptcp is based on the 4.4 kernel linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = @@ -14010,16 +14065,6 @@ with pkgs; ]; }; - linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14027,6 +14072,18 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + + # https://github.com/NixOS/nixpkgs/issues/45165 + # TODO: remove this patch once it is merged upstream and released. + (rec { + name = "hid-core-fix-grouping-by-application"; + patch = fetchpatch { + name = name + ".patch"; + # https://patchwork.kernel.org/patch/10587369/ + url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a; + sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m"; + }; + }) ]; }; @@ -14230,7 +14287,6 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! @@ -14281,8 +14337,6 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); - # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); linuxPackages_samus_latest = linuxPackages_samus_4_12; @@ -14445,6 +14499,8 @@ with pkgs; govers = callPackage ../development/tools/govers { }; + govendor = callPackage ../development/tools/govendor { }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; @@ -14528,6 +14584,8 @@ with pkgs; policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -15131,6 +15189,7 @@ with pkgs; powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; profont = callPackage ../data/fonts/profont { }; @@ -15486,6 +15545,8 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; + aesop = callPackage ../applications/office/aesop { }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avrdudess = callPackage ../applications/misc/avrdudess { }; @@ -15521,11 +15582,6 @@ with pkgs; barrier = callPackage ../applications/misc/barrier {}; - banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome2.GConf; - libgpod = pkgs.libgpod.override { monoSupport = true; }; - }; - bashSnippets = callPackage ../applications/misc/bashSnippets { }; batik = callPackage ../applications/graphics/batik { }; @@ -15689,6 +15745,8 @@ with pkgs; browsh = callPackage ../applications/networking/browsers/browsh { }; + bookworm = callPackage ../applications/office/bookworm { }; + chromium = callPackage ../applications/networking/browsers/chromium { channel = "stable"; pulseSupport = config.pulseaudio or true; @@ -15807,7 +15865,7 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc802.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -15824,6 +15882,7 @@ with pkgs; datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { pythonPackages = datadog-integrations-core {}; }; + datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { python = python27; extraIntegrations = extras; @@ -16035,7 +16094,7 @@ with pkgs; ImageCaptureCore GSS ImageIO; }; - emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -16178,10 +16237,10 @@ with pkgs; cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; - emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages; + emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages; + emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages; - emacsPackagesNgGen = emacs: import ./emacs-packages.nix { + emacsPackagesNgFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch; inherit emacs texinfo makeWrapper runCommand writeText; @@ -16203,9 +16262,9 @@ with pkgs; }; }; - emacs25PackagesNg = emacsPackagesNgGen emacs25; + emacs25PackagesNg = emacsPackagesNgFor emacs25; emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26PackagesNg = emacsPackagesNgGen emacs26; + emacs26PackagesNg = emacsPackagesNgFor emacs26; emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; @@ -16296,8 +16355,7 @@ with pkgs; fldigi = callPackage ../applications/audio/fldigi { }; flink = callPackage ../applications/networking/cluster/flink { }; - flink_1_3 = flink.override { version = "1.3"; }; - flink_1_4 = flink.override { version = "1.4"; }; + flink_1_5 = flink.override { version = "1.5"; }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; @@ -16340,7 +16398,7 @@ with pkgs; gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; + gnss-sdr = callPackage ../applications/misc/gnss-sdr { boost=boost166; }; gnuradio = callPackage ../applications/misc/gnuradio { inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; @@ -16839,6 +16897,8 @@ with pkgs; inherit (gnome2) gnome_python; }; + hashit = callPackage ../tools/misc/hashit { }; + hello = callPackage ../applications/misc/hello { }; hello-unfree = callPackage ../applications/misc/hello-unfree { }; @@ -17212,7 +17272,6 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; - poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -17293,15 +17352,12 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13 - stdenv = overrideCC stdenv gcc5; }; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice + libreoffice-unwrapped = callPackage ../applications/office/libreoffice (libreoffice-args // { }); - libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + libreoffice-still-unwrapped = callPackage ../applications/office/libreoffice/still.nix (libreoffice-args // { poppler = poppler_0_61; }); @@ -17440,6 +17496,8 @@ with pkgs; mediathekview = callPackage ../applications/video/mediathekview { }; + meteo = callPackage ../applications/networking/weather/meteo { }; + meld = callPackage ../applications/version-management/meld { }; meme = callPackage ../applications/graphics/meme { }; @@ -17614,6 +17672,8 @@ with pkgs; mm = callPackage ../applications/networking/instant-messengers/mm { }; + matrique = libsForQt5.callPackage ../applications/networking/instant-messengers/matrique { }; + mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ @@ -17782,6 +17842,8 @@ with pkgs; typora = callPackage ../applications/editors/typora { }; + taxi = callPackage ../applications/networking/ftp/taxi { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; @@ -17834,6 +17896,8 @@ with pkgs; nanoblogger = callPackage ../applications/misc/nanoblogger { }; + nanorc = callPackage ../applications/editors/nano/nanorc { }; + navipowm = callPackage ../applications/misc/navipowm { }; navit = libsForQt5.callPackage ../applications/misc/navit { }; @@ -17862,6 +17926,8 @@ with pkgs; gmime = gmime3; }; + notejot = callPackage ../applications/misc/notejot { }; + notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; @@ -18268,6 +18334,8 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc {}; + quilter = callPackage ../applications/editors/quilter { }; + quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; @@ -18768,7 +18836,7 @@ with pkgs; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - uaskjuggler = callPackage ../applications/misc/taskjuggler { }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; tasknc = callPackage ../applications/misc/tasknc { }; @@ -18824,6 +18892,8 @@ with pkgs; nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thonny = callPackage ../applications/editors/thonny { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; @@ -19125,6 +19195,8 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; + vocal = callPackage ../applications/audio/vocal { }; + vogl = libsForQt5.callPackage ../development/tools/vogl { }; volnoti = callPackage ../applications/misc/volnoti { }; @@ -19190,13 +19262,7 @@ with pkgs; guile = guile_2_0; }; - weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge { - inherit (luaPackages) cjson; - }; - - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { - inherit (pythonPackages) pydns; - }; + weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; westonLite = weston.override { pango = null; @@ -19415,6 +19481,8 @@ with pkgs; xdaliclock = callPackage ../tools/misc/xdaliclock {}; + xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { }; + xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; @@ -19582,6 +19650,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + ydiff = callPackage ../development/tools/ydiff { }; + yed = callPackage ../applications/graphics/yed {}; inherit (gnome3) yelp; @@ -19627,7 +19697,7 @@ with pkgs; zim = callPackage ../applications/office/zim { }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -19725,7 +19795,7 @@ with pkgs; chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt5.callPackage ../games/chessx { }; + chessx = libsForQt59.callPackage ../games/chessx { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -20177,7 +20247,7 @@ with pkgs; lua = lua5_1; }; - solarus = callPackage ../games/solarus { }; + solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; @@ -20210,6 +20280,8 @@ with pkgs; nativeOnly = true; }).run; + steamcmd = steamPackages.steamcmd; + linux-steam-integration = callPackage ../games/linux-steam-integration { gtk = pkgs.gtk3; }; @@ -20577,6 +20649,18 @@ with pkgs; pymol = callPackage ../applications/science/chemistry/pymol { }; + quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { }; + + quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { + mpi = openmpi; + }; + + siesta = callPackage ../applications/science/chemistry/siesta { }; + + siesta-mpi = callPackage ../applications/science/chemistry/siesta { + mpi = openmpi; + }; + ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { @@ -20587,6 +20671,10 @@ with pkgs; tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT + ### SCIENCE/BENCHMARK + + papi = callPackage ../development/libraries/science/benchmark/papi { }; + ### SCIENCE/BIOLOGY alliance = callPackage ../applications/science/electronics/alliance { }; @@ -20615,6 +20703,8 @@ with pkgs; ezminc = callPackage ../applications/science/biology/EZminc { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; + htslib = callPackage ../development/libraries/science/biology/htslib { }; igv = callPackage ../applications/science/biology/igv { }; @@ -20696,6 +20786,8 @@ with pkgs; strelka = callPackage ../applications/science/biology/strelka { }; + seaview = callPackage ../applications/science/biology/seaview { }; + varscan = callPackage ../applications/science/biology/varscan { }; hmmer = callPackage ../applications/science/biology/hmmer { }; @@ -20774,6 +20866,10 @@ with pkgs; planarity = callPackage ../development/libraries/science/math/planarity { }; + scalapack = callPackage ../development/libraries/science/math/scalapack { + mpi = openmpi; + }; + rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; fenics = callPackage ../development/libraries/science/math/fenics { @@ -20803,6 +20899,10 @@ with pkgs; petsc = callPackage ../development/libraries/science/math/petsc { }; + parmetis = callPackage ../development/libraries/science/math/parmetis { + mpi = openmpi; + }; + scs = callPackage ../development/libraries/science/math/scs { liblapack = liblapackWithoutAtlas; }; @@ -21294,29 +21394,7 @@ with pkgs; fastnlo = callPackage ../development/libraries/physics/fastnlo { }; - geant4 = callPackage ../development/libraries/physics/geant4 { - enableMultiThreading = true; - enableG3toG4 = false; - enableInventor = false; - enableGDML = false; - enableQT = false; - enableXM = false; - enableOpenGLX11 = true; - enableRaytracerX11 = false; - - # Optional system packages, otherwise internal GEANT4 packages are used. - clhep = null; - zlib = null; - - # For enableGDML. - xercesc = null; - - # For enableQT. - qt = null; # qt4SDK or qt5SDK - - # For enableXM. - motif = null; # motif or lesstif - }; + geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; cernlib = callPackage ../development/libraries/physics/cernlib { }; @@ -21611,6 +21689,8 @@ with pkgs; martyr = callPackage ../development/libraries/martyr { }; + matcha = callPackage ../misc/themes/matcha { }; + # previously known as flat-plat materia-theme = callPackage ../misc/themes/materia-theme { }; @@ -21934,6 +22014,8 @@ with pkgs; libsemanage = libsemanage.override { python = python3; }; }; + sierra-gtk-theme = callPackage ../misc/themes/sierra { }; + slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; }; @@ -22038,9 +22120,7 @@ with pkgs; valauncher = callPackage ../applications/misc/valauncher { }; - vault = callPackage ../tools/security/vault { - go = go_1_10; - }; + vault = callPackage ../tools/security/vault { }; vaultenv = haskellPackages.vaultenv; @@ -22227,9 +22307,14 @@ with pkgs; inherit (gnome2) gtksourceview; }; - bullet = callPackage ../development/libraries/bullet {}; + bullet = callPackage ../development/libraries/bullet { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; + + inherit (callPackages ../development/libraries/spdlog { }) + spdlog_0 spdlog_1; - spdlog = callPackage ../development/libraries/spdlog { }; + spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; dart_stable = dart.override { version = "1.24.3"; }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 3782fc33d6a..ee1b94c8638 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -402,50 +402,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Deedle = buildDotnetPackage rec { + Deedle = fetchNuGet rec { baseName = "Deedle"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "BlueMountainCapital"; - repo = baseName; - rev = "v${version}"; - sha256 = "115zzh3q57w8wr02cl2v8wijnj1rg01j1mk9zbzixbb4aird72n5"; - }; - - # Enough files from this repo are needed that it will be quicker to just get the entire repo - fsharpDataSrc = fetchFromGitHub { - owner = "fsharp"; - repo = "FSharp.Data"; - rev = "2.2.3"; - sha256 = "1h3v9rc8k0khp61cv5n01larqbxd3xcx3q52sw5zf9l0661vw7qr"; - }; - - buildInputs = [ - fsharp - dotnetPackages.FsCheck - dotnetPackages.FSharpCompilerService - dotnetPackages.FSharpData - dotnetPackages.FSharpFormatting - dotnetPackages.MathNetNumerics - dotnetPackages.NUnit - ]; - - preConfigure = '' - mkdir -vp paket-files/fsharp - ln -sv ${fsharpDataSrc} paket-files/fsharp/FSharp.Data - ''; - - xBuildFiles = [ "Deedle.Core.sln" ]; # Come back later to get RProvider as well - outputFiles = [ "bin/*" "LICENSE.md" ]; - - meta = { - description = "Deedle is an easy to use library for data and time series manipulation and for scientific programming"; - homepage = "http://bluemountaincapital.github.io/Deedle/"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; - }; + version = "1.2.5"; + sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw"; + outputFiles = [ "*" ]; }; ExcelDna = buildDotnetPackage rec { @@ -871,40 +832,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - NewtonsoftJson = buildDotnetPackage rec { + NewtonsoftJson = fetchNuGet { baseName = "Newtonsoft.Json"; - version = "6.0.8"; - - src = fetchurl { - name = "${baseName}-${version}.tar.gz"; - url = "https://github.com/JamesNK/Newtonsoft.Json/archive/${version}.tar.gz"; - sha256 = "14znf5mycka578bxjnlnz6a3f9nfkc682hgmgg42gdzksnarvhlm"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - dotnetPackages.SystemCollectionsImmutable - dotnetPackages.Autofac - ]; - - patches = [ ../development/dotnet-modules/patches/newtonsoft-json.references.patch ]; - - postConfigure = '' - # Just to make sure there's no attempt to call these executables - rm -rvf Tools - ''; - - xBuildFiles = [ "Src/Newtonsoft.Json.sln" ]; - outputFiles = [ "Src/Newtonsoft.Json/bin/Release/Net45/*" ]; - - meta = { - description = "Popular high-performance JSON framework for .NET"; - homepage = "https://www.newtonsoft.com/json"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; - }; + version = "11.0.2"; + sha256 = "07na27n4mlw77f3hg5jpayzxll7f4gyna6x7k9cybmxpbs6l77k7"; + outputFiles = [ "*" ]; }; Nuget = buildDotnetPackage { @@ -927,66 +859,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { exeFiles = [ "nuget.exe" ]; }; - Paket = buildDotnetPackage rec { + Paket = fetchNuGet { baseName = "Paket"; - version = "1.18.2"; - - src = fetchFromGitHub { - owner = "fsprojects"; - repo = "Paket"; - rev = version; - sha256 = "04iwy3mggz7xn36lhzyrwqzlw451a16jblwx131qjm6fnac6rq1m"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NewtonsoftJson - dotnetPackages.UnionArgParser - dotnetPackages.NUnit - ]; - - fileFsUnit = fetchurl { - name = "FsUnit.fs"; - url = https://raw.githubusercontent.com/forki/FsUnit/81d27fd09575a32c4ed52eadb2eeac5f365b8348/FsUnit.fs; - sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp"; - }; - - fileGlobbing = fetchurl { - name = "Globbing.fs"; - url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs; - sha256 = "1v7d7666a61j6f8ksh0q40hfsc5b03448viq17xa91xgb7skhyx7"; - }; - - fileErrorHandling = fetchurl { - name = "ErrorHandling.fs"; - url = https://raw.githubusercontent.com/fsprojects/Chessie/3017092260b4a59a3b4b25bf8fca6be6eb7487eb/src/Chessie/ErrorHandling.fs; - sha256 = "0ka9ilfbl4izxc1wqd5vlfjnp7n2xcckfhp13gzhqbdx7464van9"; - }; - - postConfigure = '' - # Copy said single-files-in-git-repos - mkdir -p "paket-files/forki/FsUnit" - cp -v "${fileFsUnit}" "paket-files/forki/FsUnit/FsUnit.fs" - - mkdir -p "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing" - cp -v "${fileGlobbing}" "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing/Globbing.fs" - - mkdir -p "paket-files/fsprojects/Chessie/src/Chessie" - cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs" - ''; - - xBuildFiles = [ "Paket.sln" ]; - - outputFiles = [ "bin/*" ]; - exeFiles = [ "paket.exe" ]; - - meta = { - description = "A dependency manager for .NET and Mono projects"; - homepage = "http://fsprojects.github.io/Paket/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; - }; + version = "5.179.1"; + sha256 = "11rzna03i145qj08hwrynya548fwk8xzxmg65swyaf19jd7gzg82"; + outputFiles = [ "*" ]; }; Projekt = buildDotnetPackage rec { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba82bd217fd..a83c3baaa4a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -178,7 +178,7 @@ let for file in elpy.el elpy-pkg.el; do substituteInPlace $file \ --replace "company \"0.8.2\"" "company \"${company.version}\"" \ - --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \ + --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \ --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \ --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \ --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\"" @@ -226,31 +226,6 @@ let ess-R-object-popup = callPackage ../applications/editors/emacs-modes/ess-R-object-popup { }; - find-file-in-project = melpaBuild rec { - pname = "find-file-in-project"; - version = "3.5"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = pname; - rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177"; - sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd"; - }; - recipe = writeText "recipe" '' - (find-file-in-project - :repo "technomancy/find-file-in-project" - :fetcher github) - ''; - meta = { - description = "Quick access to project files in Emacs"; - longDescription = '' - Find files in a project quickly. - This program provides a couple methods for quickly finding any file in a - given project. It depends on GNU find. - ''; - license = gpl3Plus; - }; - }; - filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { }; font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { }; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index f7f128547ba..a0c99847274 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -54,7 +54,7 @@ releaseTools.sourceTarball rec { mkdir $TMPDIR/foo ln -s $(readlink -f .) $TMPDIR/foo/bar p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace) - p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox) + p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace) if [ "$p1" != "$p2" ]; then echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" exit 1 @@ -63,9 +63,9 @@ releaseTools.sourceTarball rec { # Run the regression tests in `lib'. if # `set -e` doesn't work inside here, so need to && instead :( - res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \ + res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \ && [[ "$res" == "[ ]" ]] \ - && res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \ + && res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \ && [[ "$res" == "[ ]" ]] then true diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b6af70ebcf..f5e5cfb3972 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -564,6 +564,8 @@ let result = callPackage ../development/ocaml-modules/ocaml-result { }; + seq = callPackage ../development/ocaml-modules/seq { }; + sequence = callPackage ../development/ocaml-modules/sequence { }; spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51d1a1c2215..714dba45aa2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1250,7 +1250,6 @@ let meta = { description = "Serves PODs right from your Catalyst application"; license = stdenv.lib.licenses.bsd3; - maintainers = [ maintainers.rycee ]; }; }; @@ -1478,7 +1477,6 @@ let propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1506,7 +1504,6 @@ let meta = { description = "Catalyst Plugin for Log::Handler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1534,7 +1531,6 @@ let meta = { description = "Per-session custom expiry times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1572,7 +1568,6 @@ let meta = { description = "File storage backend for session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1614,7 +1609,6 @@ let meta = { description = "Handle passing of status messages between screens of a web application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1629,7 +1623,6 @@ let meta = { description = "CSV view class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1752,7 +1745,6 @@ let meta = { description = "Handle Common Gateway Interface requests and responses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1895,7 +1887,6 @@ let meta = { description = "Unified cache handling interface"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2509,7 +2500,6 @@ let homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2568,7 +2558,6 @@ let homepage = https://github.com/rjbs/Config-MVP; description = "Multivalue-property package-oriented configuration"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2631,6 +2620,7 @@ let prePatch = '' # Attempts to use network. rm t/01-proxy-http.t + rm t/01-proxy-proc-safeexec.t ''; meta = { description = "A generic connection to a hierarchical-structured data set"; @@ -2801,7 +2791,6 @@ let meta = { description = "Read and write Changes files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -3074,7 +3063,6 @@ let meta = with stdenv.lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; platforms = platforms.unix; }; }; @@ -3561,7 +3549,6 @@ let meta = { description = "Domain and host name validation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3576,7 +3563,6 @@ let meta = { description = "IPv4 and IPv6 validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3590,7 +3576,6 @@ let meta = { description = "Common URL validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3823,7 +3808,6 @@ let meta = { description = "Parse and format MySQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4333,7 +4317,6 @@ let meta = { description = "Adding keywords to perl, in perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -4495,7 +4478,6 @@ let meta = { description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.rycee ]; }; }; @@ -4915,7 +4897,6 @@ let homepage = https://github.com/rjbs/Email-Abstract; description = "Unified interface to mail representations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4967,7 +4948,6 @@ let homepage = https://github.com/rjbs/Email-Date-Format; description = "Produce RFC 2822 date strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5009,7 +4989,6 @@ let homepage = https://github.com/rjbs/Email-MIME; description = "Easy MIME message handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -5038,7 +5017,6 @@ let homepage = https://github.com/rjbs/Email-MIME-ContentType; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; propagatedBuildInputs = [ Encode ]; }; @@ -5054,7 +5032,6 @@ let homepage = https://github.com/rjbs/Email-MIME-Encodings; description = "A unified interface to MIME encoding and decoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -5069,7 +5046,6 @@ let homepage = https://github.com/rjbs/Email-Send; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; buildInputs = [ MIMETools MailTools ]; }; @@ -5102,7 +5078,6 @@ let homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5117,7 +5092,6 @@ let homepage = https://github.com/rjbs/Email-Simple; description = "Simple parsing of RFC2822 message format and headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5140,7 +5114,6 @@ let propagatedBuildInputs = [ EmailValid ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5220,7 +5193,6 @@ let meta = { description = "Determine the locale encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5936,7 +5908,6 @@ let meta = { description = "Determine MIME types of data or files using libmagic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6053,7 +6024,6 @@ let meta = { description = "Read a file backwards by lines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6239,7 +6209,6 @@ let homepage = https://github.com/tommybutler/file-util/wiki; description = "Easy, versatile, portable file handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6352,7 +6321,6 @@ let meta = { description = "Validation with simple chains of constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; buildInputs = [ CGI ]; }; @@ -6465,10 +6433,10 @@ let }; GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.103"; + name = "Getopt-Long-Descriptive-0.102"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "70e1bae7404a9dfb638b5d12e5bd4ea97e3bee743a4555909307d68e0111f4b2"; + sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -6868,7 +6836,6 @@ let meta = { description = "Provide the stuff missing in Hash::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7591,7 +7558,6 @@ let meta = { description = "Alternative but compatible interface to modules that export symbols"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7694,7 +7660,6 @@ let meta = { description = "Open an HTML file with automatic charset detection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7825,7 +7790,6 @@ let meta = { description = "IO::Socket with read/write timeout"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8785,7 +8749,6 @@ let homepage = https://github.com/preaction/Log-Any; description = "Bringing loggers and listeners together"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8830,7 +8793,6 @@ let meta = { description = "Log messages to several outputs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8890,7 +8852,6 @@ let homepage = https://mschilli.github.io/log4perl/; description = "Log4j implementation for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9221,7 +9182,6 @@ let meta = { description = "Various e-mail related modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9510,7 +9470,6 @@ let meta = { description = "Low-calorie MIME generator (DEPRECATED)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9551,7 +9510,6 @@ let homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9692,11 +9650,12 @@ let sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh"; }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; + propagatedBuildInputs = [ DevelCheckCompiler ]; + perlPreHook = "export LD=$CC"; meta = { description = "A Module::Build class for building XS modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ DevelCheckCompiler ]; }; ModuleCPANTSAnalyse = buildPerlPackage rec { @@ -10031,10 +9990,10 @@ let }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.93"; + name = "Mojolicious-7.88"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "00c30fc566fee0823af0a75bdf4f170531655df14beca6d51f0e453a43aaad5d"; + sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785"; }; meta = { homepage = https://mojolicious.org/; @@ -10095,7 +10054,6 @@ let meta = { description = "Minimalist Object Orientation (with Moose compatibility)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10403,7 +10361,6 @@ let homepage = https://github.com/gfx/mousex-getopt; description = "A Mouse role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10504,7 +10461,6 @@ let homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10763,7 +10719,6 @@ let homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10929,6 +10884,7 @@ let sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; + perlPreHook = "export LD=$CC"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; }; @@ -11060,7 +11016,6 @@ let meta = { description = "Manages IPv4 and IPv6 addresses and subnets"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11253,7 +11208,6 @@ let meta = { description = "Work with TLD names"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11694,6 +11648,8 @@ let sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; }; buildInputs = [ pkgs.zookeeper_mt ]; + # fix "error: format not a string literal and no format arguments [-Werror=format-security]" + hardeningDisable = stdenv.lib.optional (stdenv.lib.versionAtLeast perl.version "5.28") "format"; NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; meta = { @@ -11794,7 +11750,6 @@ let homepage = https://github.com/dluxhu/perl-parallel-forkmanager; description = "A simple parallel processing fork manager"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12189,7 +12144,6 @@ let meta = { description = "A PerlIO layer that adds read & write timeout to a handle"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12811,7 +12765,6 @@ let homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12852,7 +12805,6 @@ let homepage = https://github.com/neilb/Pod-POM; description = "POD Object Model"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12866,7 +12818,6 @@ let meta = { description = "Generate the TOC of a POD with Pod::POM"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13041,7 +12992,6 @@ let homepage = https://github.com/rjbs/Pod-Weaver; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13105,7 +13055,6 @@ let homepage = https://github.com/sanko/readonly; description = "Facility for creating read-only scalars, arrays, hashes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13130,7 +13079,6 @@ let homepage = https://github.com/PerlRedis/perl-redis; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.rycee ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13318,7 +13266,6 @@ let meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13593,7 +13540,6 @@ let homepage = https://github.com/rjbs/Software-License; description = "Packages that provide templated software licenses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14147,7 +14093,6 @@ let homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14201,7 +14146,6 @@ let meta = { description = "Tool for inspecting subroutines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14228,7 +14172,6 @@ let homepage = https://github.com/p5sagit/Sub-Name; description = "(Re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14408,7 +14351,6 @@ let meta = { description = "Perl interface to the UNIX syslog(3) calls"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14797,7 +14739,6 @@ let meta = { description = "Format a header and rows into a table"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14873,7 +14814,6 @@ let meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14925,6 +14865,7 @@ let meta = { description = "Aggregate C<*.t> tests to make them run faster"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + broken = stdenv.lib.versionAtLeast perl.version "5.26"; # This module only works with Test::More version < 1.3, but you have 1.302133 }; }; @@ -14963,7 +14904,6 @@ let meta = { description = "Easily create test classes in an xUnit/JUnit style"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15172,7 +15112,6 @@ let homepage = https://github.com/rjbs/Test-Fatal; description = "Incredibly simple helpers for testing code with exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15725,6 +15664,7 @@ let }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; + doCheck = !stdenv.isDarwin; meta = { homepage = http://web-cpan.berlios.de/modules/Test-Run/; description = "Analyze tests from the command line using Test::Run"; @@ -15859,7 +15799,6 @@ let meta = { description = "Basic utilities for writing tests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16014,7 +15953,6 @@ let homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16211,7 +16149,6 @@ let meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16225,7 +16162,6 @@ let meta = { description = "Encoding aware Text::CSV"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16733,7 +16669,6 @@ let homepage = https://github.com/rjbs/Throwable; description = "A role for classes that can be thrown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -17056,6 +16991,7 @@ let meta = { description = "Turns ref() into a multimethod"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + broken = stdenv.lib.versionAtLeast perl.version "5.26"; # 'OP {aka struct op}' has no member named 'op_sibling' }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ef6da6ed804..f235cb639df 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -198,9 +198,9 @@ let }; xdebug26 = assert isPhp7; buildPecl { - name = "xdebug-2.6.0"; + name = "xdebug-2.6.1"; - sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm"; + sha256 = "0xxxy6n4lv7ghi9liqx133yskg07lw316vhcds43n1sjq3b93rns"; doCheck = true; checkTarget = "test"; @@ -335,11 +335,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.6.5"; + version = "1.7.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7"; + sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c"; }; unpackPhase = ":"; @@ -504,11 +504,11 @@ let psysh = pkgs.stdenv.mkDerivation rec { name = "psysh-${version}"; - version = "0.9.6"; + version = "0.9.8"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6"; + sha256 = "0xs9bl0hplkm2hajmm4qca65bm2x7wnx4vbmk0d2jxpvwrgqgnzd"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fdbb4f90bab..c4e46ea8889 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -216,6 +216,8 @@ in { backports_csv = callPackage ../development/python-modules/backports_csv {}; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocamlPackages.bap; }; @@ -288,6 +290,8 @@ in { distorm3 = callPackage ../development/python-modules/distorm3 { }; + distributed = callPackage ../development/python-modules/distributed { }; + docutils = callPackage ../development/python-modules/docutils { }; dogtail = callPackage ../development/python-modules/dogtail { }; @@ -298,6 +302,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + genanki = callPackage ../development/python-modules/genanki { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -334,6 +340,8 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + markerlib = callPackage ../development/python-modules/markerlib { }; + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { @@ -461,10 +469,14 @@ in { pykerberos = callPackage ../development/python-modules/pykerberos { }; + pykeepass = callPackage ../development/python-modules/pykeepass { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pyparser = callPackage ../development/python-modules/pyparser { }; @@ -497,6 +509,8 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; + python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + python-igraph = callPackage ../development/python-modules/python-igraph { pkgconfig = pkgs.pkgconfig; igraph = pkgs.igraph; @@ -536,6 +550,8 @@ in { seekpath = callPackage ../development/python-modules/seekpath { }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; @@ -568,6 +584,8 @@ in { trio = callPackage ../development/python-modules/trio {}; + sniffio = callPackage ../development/python-modules/sniffio { }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { }; @@ -1448,6 +1466,8 @@ in { disabled = !isPy27; + buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; + src = pkgs.fetchurl { url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; @@ -1645,6 +1665,12 @@ in { envs = callPackage ../development/python-modules/envs { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; + + eth-typing = callPackage ../development/python-modules/eth-typing { }; + + eth-utils = callPackage ../development/python-modules/eth-utils { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; @@ -1704,35 +1730,7 @@ in { idna = callPackage ../development/python-modules/idna { }; - mahotas = buildPythonPackage rec { - name = "python-mahotas-${version}"; - version = "1.4.2"; - - src = pkgs.fetchurl { - url = "https://github.com/luispedro/mahotas/archive/v${version}.tar.gz"; - sha256 = "1mvsxh0pa5vdvbknlv1m68n7gw2cv4pyqgqp3r770rnmf6nxbp7m"; - }; - - buildInputs = with self; [ - nose - pillow - scipy - ]; - propagatedBuildInputs = with self; [ - numpy - imread - ]; - - disabled = stdenv.isi686; # Failing tests - - meta = with stdenv.lib; { - description = "Computer vision package based on numpy"; - homepage = http://mahotas.readthedocs.io/; - maintainers = with maintainers; [ luispedro ]; - license = licenses.mit; - platforms = platforms.linux; - }; - }; + mahotas = callPackage ../development/python-modules/mahotas { }; MDP = callPackage ../development/python-modules/mdp {}; @@ -1788,6 +1786,13 @@ in { doCheck = !isPy3k; + postPatch = '' + substituteInPlace python/setup.py \ + --replace "graphviz<0.9.0" "graphviz<0.10.0" \ + --replace "numpy<=1.15.0" "numpy<1.16.0" \ + --replace "requests<2.19.0" "requests<2.20.0" + ''; + preConfigure = '' cd python ''; @@ -1890,6 +1895,8 @@ in { pytest-django = callPackage ../development/python-modules/pytest-django { }; + pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { }; + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-forked = callPackage ../development/python-modules/pytest-forked { }; @@ -1914,6 +1921,8 @@ in { pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; @@ -1981,34 +1990,6 @@ in { zict = callPackage ../development/python-modules/zict { }; - distributed = buildPythonPackage rec { - - name = "distributed-${version}"; - version = "1.15.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/distributed/${name}.tar.gz"; - sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6"; - }; - - buildInputs = with self; [ pytest docutils ]; - propagatedBuildInputs = with self; [ - dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado - psutil botocore zict lz4 sortedcollections sortedcontainers - ] ++ (if !isPy3k then [ singledispatch ] else []); - - # py.test not picking up local config file, even when running - # manually: E ValueError: no option named '--runslow' - doCheck = false; - - meta = { - description = "Distributed computation in Python."; - homepage = "http://distributed.readthedocs.io/en/latest/"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; leather = callPackage ../development/python-modules/leather { }; @@ -2031,6 +2012,8 @@ in { requests-cache = callPackage ../development/python-modules/requests-cache { }; + requests-file = callPackage ../development/python-modules/requests-file { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; @@ -2617,48 +2600,9 @@ in { GeoIP = callPackage ../development/python-modules/GeoIP { }; - gmpy = buildPythonPackage rec { - name = "gmpy-1.17"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gmpy/${name}.zip"; - sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14"; - }; + gmpy = callPackage ../development/python-modules/gmpy { }; - buildInputs = [ - pkgs.gcc - pkgs.gmp - ]; - - meta = { - description = "GMP or MPIR interface to Python 2.4+ and 3.x"; - homepage = http://code.google.com/p/gmpy/; - }; - }; - - gmpy2 = buildPythonPackage rec { - name = "gmpy2-2.0.6"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gmpy2/${name}.zip"; - sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4"; - }; - - buildInputs = [ - pkgs.gcc - pkgs.gmp - pkgs.mpfr - pkgs.libmpc - ]; - - meta = { - description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; - homepage = http://code.google.com/p/gmpy/; - license = licenses.gpl3Plus; - }; - }; + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; gmusicapi = with pkgs; buildPythonPackage rec { name = "gmusicapi-10.1.0"; @@ -3725,6 +3669,8 @@ in { }; }; + phe = callPackage ../development/python-modules/phe { }; + phpserialize = callPackage ../development/python-modules/phpserialize { }; plaid-python = callPackage ../development/python-modules/plaid-python { }; @@ -5916,14 +5862,14 @@ in { glances = buildPythonPackage rec { name = "glances-${version}"; - version = "3.0"; + version = "3.0.1"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "19pymw104l05af710ph69znqiz9av3if7436kigjlwd65gxnghkc"; + sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x"; }; # Requires access to /sys/class/power_supply @@ -7937,11 +7883,11 @@ in { graphviz = buildPythonPackage rec { name = "graphviz-${version}"; - version = "0.5.2"; + version = "0.9"; src = pkgs.fetchurl { url = "mirror://pypi/g/graphviz/${name}.zip"; - sha256 = "0jh31nlm0qbxwylhdkwnb69pcjlc5z03fcfbs0gvgzp3hfrngsk0"; + sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6"; }; propagatedBuildInputs = [ pkgs.graphviz ]; @@ -10905,6 +10851,8 @@ in { python-language-server = callPackage ../development/python-modules/python-language-server {}; + python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {}; + pyls-black = callPackage ../development/python-modules/pyls-black {}; pyls-isort = callPackage ../development/python-modules/pyls-isort {}; @@ -11209,6 +11157,8 @@ in { }; }); + pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyscss = buildPythonPackage rec { name = "pyScss-${version}"; version = "1.3.5"; @@ -14951,6 +14901,7 @@ EOF }; tornado = callPackage ../development/python-modules/tornado { }; + tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; }; tokenlib = buildPythonPackage rec { name = "tokenlib-${version}"; @@ -16286,6 +16237,8 @@ EOF potr = callPackage ../development/python-modules/potr {}; + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + pluggy = callPackage ../development/python-modules/pluggy {}; xcffib = callPackage ../development/python-modules/xcffib {}; @@ -16802,22 +16755,7 @@ EOF cudaSupport = true; }; - tflearn = buildPythonPackage rec { - name = "tflearn-0.2.1"; - - meta = { - description = "Deep learning library featuring a higher-level API for TensorFlow"; - homepage = "https://github.com/tflearn/tflearn"; - license = licenses.mit; - }; - - propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tflearn/${name}.tar.gz"; - sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0"; - }; - }; + tflearn = callPackage ../development/python-modules/tflearn { }; simpleai = buildPythonPackage rec { version = "0.7.11"; @@ -16960,137 +16898,25 @@ EOF python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; - irc = buildPythonPackage rec { - name = "irc-${version}"; - version = "14.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/irc/${name}.tar.gz"; - sha256 = "0a6qjl4fjj98wxc8gaf5rxg94v7a0ydjdiw6pcka5fy814xl2i28"; - }; - - doCheck = false; - - buildInputs = with self; [ setuptools_scm ]; - - propagatedBuildInputs = with self; [ - six jaraco_logging jaraco_text jaraco_stream jaraco_stream pytz - jaraco_itertools - ]; - }; - - jaraco_logging = buildPythonPackage rec { - name = "jaraco.logging-${version}"; - version = "1.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.logging/${name}.tar.gz"; - sha256 = "1lvw9zphiymiiar47kd0x0dbc9x2jks8w1kirg3ff8nd80k95j05"; - }; - - doCheck = false; - - buildInputs = with self; [ setuptools_scm ]; - - propagatedBuildInputs = with self; [ tempora six ]; - }; - - jaraco_text = buildPythonPackage rec { - name = "jaraco.text-${version}"; - version = "1.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.text/${name}.tar.gz"; - sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh"; - }; - - doCheck = false; - - buildInputs = with self; [ setuptools_scm ]; - - propagatedBuildInputs = with self; [ jaraco_functools jaraco_collections ]; - }; + irc = callPackage ../development/python-modules/irc { }; - jaraco_collections = buildPythonPackage rec { - name = "jaraco.collections-${version}"; - version = "1.3.2"; + jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.collections/${name}.tar.gz"; - sha256 = "0mvyn9d4bs5zw9z84wwsbgff6s28vg6h4i8qhyb667fqi7xgr1w5"; - }; + jaraco_text = callPackage ../development/python-modules/jaraco_text { }; - doCheck = false; + jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; - buildInputs = with self; [ setuptools_scm ]; + jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; - propagatedBuildInputs = with self; [ six jaraco_classes ]; - - # break dependency cycle - patchPhase = '' - sed -i "/'jaraco.text',/d" setup.py - ''; - }; - - jaraco_itertools = buildPythonPackage rec { - name = "jaraco.itertools-${version}"; - version = "1.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.itertools/${name}.tar.gz"; - sha256 = "0yvxp5nwhy4wc4naq5v152vbnxqcn5k031g089chq2lk5kr7np5z"; - }; - - doCheck = false; - - buildInputs = with self; [ setuptools_scm ]; - - propagatedBuildInputs = with self; [ inflect more-itertools six ]; - }; - - inflect = buildPythonPackage rec { - name = "inflect-${version}"; - version = "0.2.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/inflect/${name}.tar.gz"; - sha256 = "065866j9msrivbr74yrag53ch0lav7xz18qvjkiblkhinbfch510"; - }; - }; + inflect = callPackage ../development/python-modules/inflect { }; more-itertools = callPackage ../development/python-modules/more-itertools { }; jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; - jaraco_classes = buildPythonPackage rec { - name = "jaraco.classes-${version}"; - version = "1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.classes/${name}.tar.gz"; - sha256 = "1yn1wa6m5rdhk4grmnycx3i5pzzdlwfx83h944c9g5rqggmg612h"; - }; - - doCheck = false; - - buildInputs = with self; [ setuptools_scm ]; - }; - - jaraco_stream = buildPythonPackage rec { - name = "jaraco.stream-${version}"; - version = "1.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.stream/${name}.tar.gz"; - sha256 = "0iwg5ljc2z8wwyl2wv7lldwviwd0q4rsccascyqvqqs0l2rcn4gi"; - }; - - doCheck = false; + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; - buildInputs = with self; [ setuptools_scm ]; - - propagatedBuildInputs = with self; [ six ]; - }; + jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; tempora= callPackage ../development/python-modules/tempora { }; @@ -17266,6 +17092,8 @@ EOF textacy = callPackage ../development/python-modules/textacy { }; + tldextract = callPackage ../development/python-modules/tldextract { }; + pyemd = callPackage ../development/python-modules/pyemd { }; pulp = callPackage ../development/python-modules/pulp { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index ff09fa5ad1f..06978d1067b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -79,17 +79,11 @@ let # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. - platformCompat = self: super: { - buildPlatform = lib.warn - "top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`." - super.stdenv.buildPlatform; - hostPlatform = lib.warn - "top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`." - super.stdenv.hostPlatform; - targetPlatform = lib.warn - "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." - super.stdenv.targetPlatform; - inherit (super.stdenv.hostPlatform) system; + platformCompat = self: super: let + inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; + in { + inherit buildPlatform hostPlatform targetPlatform; + inherit (buildPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); |