diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 55 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 219 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 141 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 18 |
5 files changed, 242 insertions, 209 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5b26ecb2da6e..66a2e36fa15f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,8 @@ mapAliases ({ bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 + buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 + buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 catfish = xfce.catfish; # added 2019-12-22 @@ -166,6 +168,7 @@ mapAliases ({ gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 + go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 @@ -212,6 +215,7 @@ mapAliases ({ keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 @@ -249,6 +253,7 @@ mapAliases ({ libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 + libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 @@ -334,48 +339,50 @@ mapAliases ({ pg_tmp = ephemeralpg; # added 2018-01-16 php-embed = throw '' - php*-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }) + php*-embed has been dropped, you can build something similar + with the following snippet: + php74.override { embedSupport = true; apxs2Support = false; } ''; # added 2020-04-01 php72-embed = php-embed; # added 2020-04-01 php73-embed = php-embed; # added 2020-04-01 php74-embed = php-embed; # added 2020-04-01 phpPackages-embed = throw '' - php*Packages-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }).packages + php*Packages-embed has been dropped, you can build something + similar with the following snippet: + (php74.override { embedSupport = true; apxs2Support = false; }).packages ''; # added 2020-04-01 php74Packages-embed = phpPackages-embed; php73Packages-embed = phpPackages-embed; php72Packages-embed = phpPackages-embed; php-unit = throw '' - php*-unit has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }) + php*-unit has been dropped, you can build something similar with + the following snippet: + php74.override { + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + } ''; # added 2020-04-01 php72-unit = php-unit; # added 2020-04-01 php73-unit = php-unit; # added 2020-04-01 php74-unit = php-unit; # added 2020-04-01 phpPackages-unit = throw '' - php*Packages-unit has been dropped, you can build the same package by using - something similar with this following snippet: + php*Packages-unit has been dropped, you can build something + similar with this following snippet: (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }).packages + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + }).packages ''; # added 2020-04-01 php74Packages-unit = phpPackages-unit; php73Packages-unit = phpPackages-unit; @@ -525,6 +532,7 @@ mapAliases ({ spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16 + spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 @@ -570,6 +578,7 @@ mapAliases ({ transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cdc4f041d99..929227916139 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -292,11 +292,7 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { - # Version 2.6.0 fails to build with go 1.13 due to nested modules: - # go: directory v2/packr2 is outside main module - buildGoModule = buildGo112Module; - }; + packr = callPackage ../development/libraries/packr { }; pet = callPackage ../development/tools/pet { }; @@ -877,6 +873,8 @@ in ctrtool = callPackage ../tools/archivers/ctrtool { }; + crowbar = callPackage ../tools/security/crowbar { }; + crumbs = callPackage ../applications/misc/crumbs { }; crc32c = callPackage ../development/libraries/crc32c { }; @@ -1176,6 +1174,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { }); + bc = callPackage ../tools/misc/bc { }; bdf2psf = callPackage ../tools/misc/bdf2psf { }; @@ -1497,11 +1497,7 @@ in compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { - # Version 1.6.0 fails to build with go 1.13 due to broken dependency: - # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" - buildGoPackage = buildGo112Package; - }; + consul = callPackage ../servers/consul { }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; @@ -2772,11 +2768,7 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { - # Version 1.2.0 fails to build with go 1.13 due to: - # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused - buildGoModule = buildGo112Module; - }; + curlie = callPackage ../tools/networking/curlie { }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -3074,6 +3066,8 @@ in kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { @@ -3128,6 +3122,8 @@ in wob = callPackage ../tools/misc/wob { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; @@ -3900,9 +3896,7 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { - buildGoModule = buildGo112Module; - }; + grpcui = callPackage ../tools/networking/grpcui { }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; @@ -4301,6 +4295,8 @@ in intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intermodal = callPackage ../tools/misc/intermodal { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -4325,12 +4321,7 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { - # Version 0.4.22 fails to build with go 1.13 due to version validation: - # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) - # This is fixed in master, but release containing the fix does not exist yet. - buildGoModule = buildGo112Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; @@ -4803,10 +4794,14 @@ in nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix { enableNpm = false; }; + nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; + nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-13_x; - nodejs-slim_latest = nodejs-slim-13_x; + nodejs_latest = nodejs-14_x; + nodejs-slim_latest = nodejs-slim-14_x; nodePackages_13_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v13.nix { nodejs = pkgs.nodejs-13_x; @@ -5431,7 +5426,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { }; @@ -5539,6 +5534,8 @@ in nylon = callPackage ../tools/networking/nylon { }; + nym = callPackage ../applications/networking/nym { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; @@ -5985,7 +5982,8 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -6027,8 +6025,6 @@ in prettyping = callPackage ../tools/networking/prettyping { }; - prey-bash-client = callPackage ../tools/security/prey { }; - profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; @@ -7379,6 +7375,10 @@ in wootility = callPackage ../tools/misc/wootility { }; + wormhole = callPackage ../tools/networking/wormhole { + inherit (darwin.apple_sdk.frameworks) Security; + }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -7433,6 +7433,8 @@ in tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; + tweeny = callPackage ../development/libraries/tweeny { }; + qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; @@ -8573,13 +8575,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -8984,6 +8979,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; + pforth = callPackage ../development/compilers/pforth {}; picat = callPackage ../development/compilers/picat { }; @@ -9059,6 +9056,9 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-deny = callPackage ../development/tools/rust/cargo-deny { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { @@ -9482,9 +9482,9 @@ in php73Extensions = recurseIntoAttrs php73.extensions; php74Extensions = recurseIntoAttrs php74.extensions; - inherit (callPackages ../development/interpreters/php { + inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73 php72 php74base php73base php72base; + }) php74 php73 php72; picoc = callPackage ../development/interpreters/picoc {}; @@ -9697,26 +9697,6 @@ in ### DEVELOPMENT / MISC - amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - - amdappsdk26 = amdappsdk.override { - version = "2.6"; - }; - - amdappsdk27 = amdappsdk.override { - version = "2.7"; - }; - - amdappsdk28 = amdappsdk.override { - version = "2.8"; - }; - - amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - - amdappsdkFull = amdappsdk.override { - samples = true; - }; - h3 = callPackage ../development/misc/h3 { }; amtk = callPackage ../development/libraries/amtk { }; @@ -9951,9 +9931,7 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { - go = go_1_12; - }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; @@ -9983,6 +9961,8 @@ in bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix + black = with python3Packages; toPythonApplication black; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -12227,6 +12207,11 @@ in nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu67 = callPackage ../development/libraries/icu/67.nix ({ + nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu = icu64; @@ -12362,10 +12347,6 @@ in kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { - openssl = openssl_1_0_2; - }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -12804,6 +12785,8 @@ in libf2c = callPackage ../development/libraries/libf2c {}; + libfabric = callPackage ../os-specific/linux/libfabric {}; + libfive = callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; @@ -13358,7 +13341,7 @@ in liburcu = callPackage ../development/libraries/liburcu { }; - libusb = callPackage ../development/libraries/libusb {}; + libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; @@ -15206,18 +15189,12 @@ in ### DEVELOPMENT / GO MODULES - buildGo112Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_12; - }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; buildGoPackage = buildGo114Package; - buildGo112Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_12; - }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; @@ -15536,9 +15513,7 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - gobetween = callPackage ../servers/gobetween { - buildGoModule = buildGo112Module; - }; + gobetween = callPackage ../servers/gobetween { }; h2o = callPackage ../servers/http/h2o { }; @@ -15996,11 +15971,7 @@ in prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.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 { - # Version 1.5.1 fails to build with go 1.13 due to test failure - # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s - buildGoModule = buildGo112Module; - }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -16144,7 +16115,7 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - spring-boot = callPackage ../development/tools/spring-boot { }; + spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; squid = callPackage ../servers/squid { }; @@ -16396,9 +16367,7 @@ in cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - buildGoPackage = buildGo112Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -17252,11 +17221,7 @@ in gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { - # Version 0.3.5 fails to build with go 1.13: - # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain - buildGoModule = buildGo112Module; - }; + gotestsum = callPackage ../development/tools/gotestsum { }; impl = callPackage ../development/tools/impl { }; @@ -18743,11 +18708,7 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { - # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: - # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -19613,6 +19574,8 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; + havoc = callPackage ../applications/misc/havoc { }; + vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -19825,7 +19788,7 @@ in gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; - guvcview = callPackage ../os-specific/linux/guvcview { }; + guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; @@ -19848,7 +19811,9 @@ in heme = callPackage ../applications/editors/heme { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { + asciidoc = asciidoc-full; + }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -19876,6 +19841,8 @@ in howl = callPackage ../applications/editors/howl { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; @@ -20324,6 +20291,8 @@ in kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubernix = callPackage ../applications/networking/cluster/kubernix { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; @@ -20562,10 +20531,7 @@ in marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum - buildGoModule = buildGo112Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; matchbox = callPackage ../applications/window-managers/matchbox { }; @@ -20688,6 +20654,7 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; + botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { @@ -20853,9 +20820,7 @@ in open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openshift = callPackage ../applications/networking/cluster/openshift { - buildGoPackage = buildGo112Package; - }; + openshift = callPackage ../applications/networking/cluster/openshift { }; oroborus = callPackage ../applications/window-managers/oroborus {}; @@ -21097,7 +21062,7 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { }; + octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; ocrad = callPackage ../applications/graphics/ocrad { }; @@ -21479,7 +21444,12 @@ in qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { + guvcview = guvcview.override { + useQt = true; + useGtk = false; + }; + }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; @@ -22085,9 +22055,7 @@ in teleprompter = callPackage ../applications/misc/teleprompter {}; - tendermint = callPackage ../tools/networking/tendermint { - buildGoModule = buildGo112Module; - }; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -23131,9 +23099,7 @@ in }; litecoind = litecoin.override { withGui = false; }; - lnd = callPackage ../applications/blockchains/lnd.nix { - buildGoModule = buildGo112Module; - }; + lnd = callPackage ../applications/blockchains/lnd.nix { }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; @@ -23301,9 +23267,7 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o { - buildGoPackage = buildGo112Package; - }; + cri-o = callPackage ../applications/virtualization/cri-o { }; ckan = callPackage ../games/ckan { }; @@ -23800,9 +23764,7 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { - buildGoPackage = buildGo112Package; - }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -24171,6 +24133,7 @@ in timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; @@ -24661,7 +24624,9 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; - ### PHYSICS + ### SCIENCE/PHYSICS + + elmerfem = callPackage ../applications/science/physics/elmerfem {}; sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -25761,7 +25726,9 @@ in physlock = callPackage ../misc/screensavers/physlock { }; - pjsip = callPackage ../applications/networking/pjsip { }; + pjsip = callPackage ../applications/networking/pjsip { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; pounce = callPackage ../servers/pounce { }; @@ -26181,6 +26148,11 @@ in xzoom = callPackage ../tools/X11/xzoom {}; + yabai = callPackage ../os-specific/darwin/yabai { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { freeglut = null; openal = null; @@ -26246,8 +26218,8 @@ in dart = callPackage ../development/interpreters/dart { }; dart_old = dart.override { version = "1.24.3"; }; - dart_stable = dart.override { version = "2.7.1"; }; - dart_dev = dart.override { version = "2.8.0-dev.10.0"; }; + dart_stable = dart.override { version = "2.7.2"; }; + dart_dev = dart.override { version = "2.9.0-4.0.dev"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -26489,4 +26461,7 @@ in jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; zenstates = callPackage ../os-specific/linux/zenstates {}; + + vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d75b8bc6a2a9..9517769f7b38 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -593,8 +593,6 @@ let comparelib = callPackage ../development/ocaml-modules/comparelib { }; - core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; - core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core_p4 = callPackage ../development/ocaml-modules/core { }; @@ -926,17 +924,10 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = - if lib.versionAtLeast ocaml.version "4.3" - then callPackage ../development/ocaml-modules/uri { } - else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + uri = callPackage ../development/ocaml-modules/uri { }; uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; - uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { - legacyVersion = true; - }; - uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; @@ -1201,13 +1192,6 @@ let then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} else textutils_p4; - core_extended = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.core_extended - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} - else core_extended_p4; - async_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_kernel diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0cda058459df..9532f113ae3d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, php, phpWithExtensions, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -8,7 +8,8 @@ let buildPecl = import ../build-support/build-pecl.nix { - inherit php lib; + php = php.unwrapped; + inherit lib; inherit (pkgs) stdenv autoreconfHook fetchurl re2c; }; @@ -43,7 +44,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/box/box.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/box \ + makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" ''; @@ -51,17 +52,17 @@ in description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://box-project.github.io/box2/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; composer = mkDerivation rec { - version = "1.9.3"; + version = "1.10.5"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; + sha256 = "0a9iwhd7ijm8gkp3zadxza0xb6xwa5ps0d16pz4mz2p21gfzvwym"; }; dontUnpack = true; @@ -71,7 +72,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/composer \ + makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; @@ -80,17 +81,17 @@ in description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; - maintainers = with maintainers; [ globin offline ]; + maintainers = with maintainers; [ offline ] ++ teams.php.members; }; }; php-cs-fixer = mkDerivation rec { - version = "2.16.1"; + version = "2.16.3"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68"; + sha256 = "195j61qbgbdn5xi0l6030mklji8m7fan2kf3446a1m2n4df3f5hb"; }; phases = [ "installPhase" ]; @@ -107,7 +108,7 @@ in description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -144,17 +145,17 @@ in description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; phpcbf = mkDerivation rec { - version = "3.5.4"; + version = "3.5.5"; pname = "phpcbf"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "18x7fk59l821pivw1i2r868y78qgs0qk47b9il1smwi6plwyyflr"; + sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g"; }; phases = [ "installPhase" ]; @@ -163,7 +164,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcbf \ + makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" ''; @@ -171,17 +172,17 @@ in description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai etu ]; + maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; }; }; phpcs = mkDerivation rec { - version = "3.5.4"; + version = "3.5.5"; pname = "phpcs"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "1lrybdxxig3yqd3i3nwji5jjn377p50sbpm4s4852dlsxz9qnlgs"; + sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa"; }; phases = [ "installPhase" ]; @@ -190,7 +191,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcs \ + makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" ''; @@ -198,17 +199,17 @@ in description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre etu ]; + maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; phpstan = mkDerivation rec { - version = "0.12.18"; + version = "0.12.19"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0xf0q2z6rhpnbys53si05mddfyjn3wx5wc8zx5y6dv5fzw6z7rch"; + sha256 = "15fz7rixi9s46qqxpj26349aky7wxqnzmfsnwlh1f2p4jsfd85ki"; }; phases = [ "installPhase" ]; @@ -217,32 +218,32 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpstan \ + makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" ''; meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually running - it. It catches whole classes of bugs even before you write tests for the - code. It moves PHP closer to compiled languages in the sense that the - correctness of each line of the code can be checked before you run the - actual line. - ''; + PHPStan focuses on finding errors in your code without actually + running it. It catches whole classes of bugs even before you write + tests for the code. It moves PHP closer to compiled languages in the + sense that the correctness of each line of the code can be checked + before you run the actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = with maintainers; [ etu ]; + maintainers = teams.php.members; }; }; psalm = mkDerivation rec { - version = "3.9.3"; + version = "3.11.2"; pname = "psalm"; src = pkgs.fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; + sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0"; }; phases = [ "installPhase" ]; @@ -259,16 +260,17 @@ in description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; + maintainers = teams.php.members; }; }; psysh = mkDerivation rec { - version = "0.9.12"; + version = "0.10.3"; pname = "psysh"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc"; + sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71"; }; phases = [ "installPhase" ]; @@ -285,7 +287,7 @@ in description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ]; + maintainers = with maintainers; [ caugner ] ++ teams.php.members; }; }; }; @@ -308,6 +310,8 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -320,6 +324,8 @@ in php.extensions.apcu pcre' ]; + + meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -327,6 +333,8 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { @@ -374,6 +382,7 @@ in '') ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -406,6 +415,7 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; }; }; @@ -418,6 +428,8 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -429,6 +441,8 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -440,6 +454,8 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; + + meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -459,7 +475,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; }; @@ -486,6 +502,8 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -503,6 +521,8 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -516,6 +536,8 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; + + meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -525,6 +547,8 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -533,11 +557,12 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; pdo_oci = buildPecl rec { - inherit (php) src version; + inherit (php.unwrapped) src version; pname = "pdo_oci"; sourceRoot = "php-${version}/ext/pdo_oci"; @@ -548,19 +573,23 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta.maintainers = lib.teams.php.members; }; pdo_sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "pdo_sqlsrv"; - sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; + sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -576,6 +605,8 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; + + meta.maintainers = lib.teams.php.members; }; pinba = let @@ -601,6 +632,7 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; + maintainers = teams.php.members; }; }; @@ -618,6 +650,7 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; }; }; @@ -653,15 +686,19 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; + + meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "sqlsrv"; - sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; + sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -672,6 +709,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -683,6 +722,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -696,6 +737,8 @@ in checkTarget = "test"; zendExtension = true; + + meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -709,6 +752,8 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -723,6 +768,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -746,11 +792,11 @@ in pname = "php-${name}"; extensionName = name; - inherit (php) version src; + inherit (php.unwrapped) version src; sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; @@ -782,6 +828,11 @@ in --prune-empty-dirs \ . $dev/include/ ''; + + meta = { + description = "PHP upstream extension: ${name}"; + inherit (php.meta) maintainers homepage license; + }; }); # This list contains build instructions for different modules that one may diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45cf2f3c05b9..5548f8c75a7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -248,6 +248,8 @@ in { authres = callPackage ../development/python-modules/authres { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; + autograd = callPackage ../development/python-modules/autograd { }; autologging = callPackage ../development/python-modules/autologging { }; @@ -278,8 +280,6 @@ in { withPython = true; }); - azure = callPackage ../development/python-modules/azure { }; - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; azure-common = callPackage ../development/python-modules/azure-common { }; @@ -308,6 +308,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-certificates = callPackage ../development/python-modules/azure-keyvault-certificates { }; + azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { }; @@ -374,6 +376,8 @@ in { azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + azure-mgmt-core = callPackage ../development/python-modules/azure-mgmt-core { }; + azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; @@ -454,6 +458,8 @@ in { azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; + azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; @@ -1220,6 +1226,10 @@ in { pylev = callPackage ../development/python-modules/pylev { }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { + inherit (pkgs) libusb1; + }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; @@ -1461,6 +1471,8 @@ in { transformers = callPackage ../development/python-modules/transformers { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; + sentinel = callPackage ../development/python-modules/sentinel { }; sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; @@ -2218,6 +2230,8 @@ in { closure-linter = callPackage ../development/python-modules/closure-linter { }; + cloudflare = callPackage ../development/python-modules/cloudflare { }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cmdline = callPackage ../development/python-modules/cmdline { }; |