diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 171 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 34 |
7 files changed, 188 insertions, 53 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fbd30aea40a0..77ca1204bf41 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -150,6 +150,7 @@ mapAliases ({ dydisnix = throw "dydisnix has been removed."; # added 2021-01-27 dysnomia = throw "dysnomia has been removed."; # added 2021-01-27 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 @@ -178,6 +179,9 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 @@ -261,6 +265,7 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 @@ -384,6 +389,7 @@ mapAliases ({ mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream."; mozart = mozart2-binary; # added 2019-09-23 mozart-binary = mozart2-binary; # added 2019-09-23 + mpd_clientlib = libmpdclient; # added 2021-02-11 mpich2 = mpich; # added 2018-08-06 msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 @@ -709,6 +715,7 @@ mapAliases ({ ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 + untrunc = untrunc-anthwlock; # added 2021-02-01 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 @@ -848,6 +855,8 @@ mapAliases ({ /* Added 2021-01-02 */ ttyrec = ovh-ttyrec; + zplugin = zinit; # Added 2021-01-30 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cff4962d029c..b20cca4406fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -705,6 +705,8 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; + agate = callPackage ../servers/gemini/agate { }; + agda-pkg = callPackage ../development/tools/agda-pkg { }; agrep = callPackage ../tools/text/agrep { }; @@ -1112,6 +1114,8 @@ in bmap-tools = callPackage ../tools/misc/bmap-tools { }; + bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; bonfire = callPackage ../tools/misc/bonfire { }; @@ -2456,6 +2460,8 @@ in interlock = callPackage ../servers/interlock {}; + iotools = callPackage ../tools/misc/iotools { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; @@ -2664,8 +2670,6 @@ in pbgopy = callPackage ../tools/text/pbgopy { }; - pbpst = callPackage ../applications/misc/pbpst { }; - pbzx = callPackage ../tools/compression/pbzx { }; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; @@ -3117,7 +3121,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_12_0; + citrix_workspace = citrix_workspace_21_01_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3125,6 +3129,7 @@ in citrix_workspace_20_09_0 citrix_workspace_20_10_0 citrix_workspace_20_12_0 + citrix_workspace_21_01_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -3738,6 +3743,8 @@ in edid-generator = callPackage ../tools/misc/edid-generator { }; + edir = callPackage ../tools/misc/edir { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -4348,6 +4355,8 @@ in gtk = gtk3; }; + free42 = callPackage ../applications/misc/free42 { }; + galen = callPackage ../development/tools/galen {}; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -4828,6 +4837,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + robodoc = callPackage ../tools/text/robodoc { }; + ucg = callPackage ../tools/text/ucg { }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -4983,9 +4994,7 @@ in hdf4 = null; }; - haproxy = callPackage ../tools/networking/haproxy { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + haproxy = callPackage ../tools/networking/haproxy { }; hackertyper = callPackage ../tools/misc/hackertyper { }; @@ -5011,8 +5020,6 @@ in haste-client = callPackage ../tools/misc/haste-client { }; - hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -5422,7 +5429,7 @@ in jo = callPackage ../development/tools/jo { }; - jrnl = callPackage ../applications/misc/jrnl { }; + jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; @@ -5826,6 +5833,8 @@ in np2kai = callPackage ../misc/emulators/np2kai { }; + ox = callPackage ../applications/editors/ox { }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; @@ -6052,7 +6061,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -6501,16 +6510,13 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_12; + nomad = nomad_1_0; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; inherit (linuxPackages) nvidia_x11; @@ -6670,6 +6676,8 @@ in opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; + openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; obexfs = callPackage ../tools/bluetooth/obexfs { }; @@ -7173,6 +7181,8 @@ in povray = callPackage ../tools/graphics/povray { }; + power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; + ppl = callPackage ../development/libraries/ppl { }; pplatex = callPackage ../tools/typesetting/tex/pplatex { }; @@ -7991,6 +8001,8 @@ in stubby = callPackage ../tools/networking/stubby { }; + surface-control = callPackage ../applications/misc/surface-control { }; + syntex = callPackage ../tools/graphics/syntex {}; sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; @@ -8411,10 +8423,14 @@ in trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; + trezorctl = with python3Packages; toPythonApplication trezor; + trezord = callPackage ../servers/trezord { }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; + trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -8499,6 +8515,8 @@ in libX11 = xorg.libX11; }; + twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twtxt = callPackage ../applications/networking/twtxt { }; @@ -8555,12 +8573,12 @@ in untex = callPackage ../tools/text/untex { }; - untrunc = callPackage ../tools/video/untrunc { }; - untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; up = callPackage ../tools/misc/up { }; + upterm = callPackage ../tools/misc/upterm { }; + upx = callPackage ../tools/compression/upx { }; uq = callPackage ../misc/uq { }; @@ -9231,10 +9249,12 @@ in zplug = callPackage ../shells/zsh/zplug { }; - zplugin = callPackage ../shells/zsh/zplugin {} ; + zinit = callPackage ../shells/zsh/zinit {} ; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; + zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; + zsh-bd = callPackage ../shells/zsh/zsh-bd { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; @@ -9249,6 +9269,8 @@ in zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; + zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { }; + zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; @@ -10037,7 +10059,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; inherit (haskellPackages) ghc; @@ -10171,6 +10193,8 @@ in inherit (emacs.pkgs.melpaStablePackages) irony; }; + holo-build = callPackage ../tools/package-management/holo-build { }; + hugs = callPackage ../development/interpreters/hugs { }; openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; @@ -10820,7 +10844,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - maturin = callPackage ../development/tools/rust/maturin { }; + maturin = callPackage ../development/tools/rust/maturin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -10873,6 +10900,8 @@ in smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { }; + smlpkg = callPackage ../tools/package-management/smlpkg { }; + solc = callPackage ../development/compilers/solc { }; souffle = callPackage ../development/compilers/souffle { @@ -11687,6 +11716,8 @@ in avrdude = callPackage ../development/tools/misc/avrdude { }; + b4 = callPackage ../development/tools/b4 { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; bam = callPackage ../development/tools/build-managers/bam {}; @@ -11734,6 +11765,16 @@ in bazel_self = bazel_3; }; + bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + buildJdkName = "java11"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_4; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -12108,6 +12149,8 @@ in editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; + edb = libsForQt5.callPackage ../development/tools/misc/edb { }; + eggdbus = callPackage ../development/tools/misc/eggdbus { }; effitask = callPackage ../applications/misc/effitask { }; @@ -13775,6 +13818,10 @@ in rev = "v${version}"; sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; }; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -14516,6 +14563,8 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; + libaudec = callPackage ../development/libraries/libaudec { }; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; @@ -15633,6 +15682,8 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; + rang = callPackage ../development/libraries/rang { }; libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { @@ -16163,7 +16214,7 @@ in poco = callPackage ../development/libraries/poco { }; - podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + podofo = callPackage ../development/libraries/podofo { }; polkit = callPackage ../development/libraries/polkit { }; @@ -16606,6 +16657,8 @@ in shapelib = callPackage ../development/libraries/shapelib { }; + sharness = callPackage ../development/libraries/sharness { }; + shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; skaffold = callPackage ../development/tools/skaffold { }; @@ -17846,6 +17899,8 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; + mastodon = callPackage ../servers/mastodon { }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -17883,7 +17938,7 @@ in inherit (callPackages ../servers/mpd { }) mpd mpd-small mpdWithFeatures; - mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; mpdscribble = callPackage ../tools/misc/mpdscribble { }; @@ -18240,6 +18295,7 @@ in prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; + prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; @@ -18632,6 +18688,8 @@ in libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; + aseq2json = callPackage ../os-specific/linux/aseq2json {}; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -18751,9 +18809,10 @@ in erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; - fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; + fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -20857,9 +20916,7 @@ in ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; - twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { - inherit (nodePackages) svgo; - }; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { }; twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; @@ -21414,7 +21471,7 @@ in cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; }; @@ -21652,14 +21709,9 @@ in inherit (gnome2) libgnomeui; }; - dwm = callPackage ../applications/window-managers/dwm { - patches = config.dwm.patches or []; - }; + dwl = callPackage ../applications/window-managers/dwl { }; - dwm-git = callPackage ../applications/window-managers/dwm/git.nix { - patches = config.dwm.patches or []; - conf = config.dwm.conf or null; - }; + dwm = callPackage ../applications/window-managers/dwm { }; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; @@ -22229,14 +22281,6 @@ in flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); - - flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {}); - - flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; - }; - fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { @@ -22658,6 +22702,10 @@ in ht = callPackage ../applications/editors/ht { }; + ht-rust = callPackage ../tools/networking/ht-rust { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hubstaff = callPackage ../applications/misc/hubstaff { }; hue-cli = callPackage ../tools/networking/hue-cli { }; @@ -22763,6 +22811,8 @@ in waybar = callPackage ../applications/misc/waybar {}; + wbg = callPackage ../applications/misc/wbg { }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { @@ -23058,6 +23108,8 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -23530,6 +23582,8 @@ in mmsd = callPackage ../tools/networking/mmsd { }; + mmtc = callPackage ../applications/audio/mmtc { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -23588,6 +23642,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-subidy mopidy-tunein mopidy-youtube; @@ -23817,6 +23872,8 @@ in i3GapsSupport = false; }; + yambar = callPackage ../applications/misc/yambar { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { @@ -23886,6 +23943,8 @@ in rep-gtk = callPackage ../development/libraries/rep-gtk { }; + reproc = callPackage ../development/libraries/reproc { }; + sawfish = callPackage ../applications/window-managers/sawfish { }; sc68 = callPackage ../applications/audio/sc68 { }; @@ -24306,6 +24365,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + piston-cli = callPackage ../tools/misc/piston-cli { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; plexamp = callPackage ../applications/audio/plexamp { }; @@ -25078,6 +25139,8 @@ in tabula = callPackage ../applications/misc/tabula { }; + tabula-java = callPackage ../applications/misc/tabula-java { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -25163,7 +25226,9 @@ in ticpp = callPackage ../development/libraries/ticpp { }; - tickrs = callPackage ../applications/misc/tickrs { }; + tickrs = callPackage ../applications/misc/tickrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; tig = callPackage ../applications/version-management/git-and-tools/tig { }; @@ -25960,6 +26025,8 @@ in xineUI = callPackage ../applications/video/xine-ui { }; + xlsxgrep = callPackage ../applications/search/xlsxgrep { }; + xmind = callPackage ../applications/misc/xmind { }; xneur = callPackage ../applications/misc/xneur { @@ -26326,6 +26393,8 @@ in abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + abuse = callPackage ../games/abuse { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -27227,9 +27296,7 @@ in wesnoth-dev = wesnoth; - widelands = callPackage ../games/widelands { - lua = lua5_2; - }; + widelands = callPackage ../games/widelands { }; worldofgoo = callPackage ../games/worldofgoo { }; @@ -27321,6 +27388,8 @@ in zeroad = zeroadPackages.zeroad; + _0verkill = callPackage ../games/0verkill { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -28694,6 +28763,8 @@ in libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; + keynav = callPackage ../tools/X11/keynav { }; kmon = callPackage ../tools/system/kmon { }; @@ -28771,8 +28842,6 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {}; - nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; @@ -29650,7 +29719,9 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - sccache = callPackage ../development/tools/misc/sccache { }; + sccache = callPackage ../development/tools/misc/sccache { + inherit (darwin.apple_sdk.frameworks) Security; + }; sequeler = callPackage ../applications/misc/sequeler { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 46e222261fc8..6c8e3e7d855d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -114,6 +114,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -221,6 +231,11 @@ in { ghc = bh.compiler.ghc8103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b979599e6307..c0faba640a26 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -506,6 +506,8 @@ let kafka = callPackage ../development/ocaml-modules/kafka { }; + kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f11bd450ef36..f0ca4bdbaeca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8480,10 +8480,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.47"; + version = "0.48"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3"; + sha256 = "077jnf5a07x0p30iqcw3kh53xh3dplhb0jyyyq9b4c79ira3ds6r"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 932c2a867f02..3df697d3d560 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -134,6 +134,8 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; + smbclient = callPackage ../development/php-packages/smbclient { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; v8 = buildPecl { @@ -508,6 +510,8 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xmlrpc"; buildInputs = [ libxml2 libiconv ]; + # xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc + enable = lib.versionOlder php.version "8.0"; configureFlags = [ "--with-xmlrpc" ] # Required to build on darwin. ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } @@ -518,7 +522,7 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xsl"; buildInputs = [ libxslt libxml2 ]; - doCheck = !(lib.versionOlder php.version "7.4"); + doCheck = lib.versionOlder php.version "8.0"; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } { name = "zip"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d66eaaa5b0a..fde6b79b958f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + ailment = callPackage ../development/python-modules/ailment { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; @@ -276,6 +278,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; + aioredis = callPackage ../development/python-modules/aioredis { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; @@ -459,6 +463,8 @@ in { aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + asteval = callPackage ../development/python-modules/asteval { }; + astor = callPackage ../development/python-modules/astor { }; astral = callPackage ../development/python-modules/astral { }; @@ -1281,6 +1287,8 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; + claripy = callPackage ../development/python-modules/claripy { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -3660,6 +3668,8 @@ in { inherit python; })).py; + libpurecool = callPackage ../development/python-modules/libpurecool { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4890,6 +4900,10 @@ in { inherit (pkgs.libsForQt5) soqt; }; + pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + + pkce = callPackage ../development/python-modules/pkce { }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -4898,8 +4912,12 @@ in { pynndescent = callPackage ../development/python-modules/pynndescent { }; + pynuki = callPackage ../development/python-modules/pynuki { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + pyshark = callPackage ../development/python-modules/pyshark { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-csxcad = callPackage ../development/python-modules/python-csxcad { }; @@ -5071,6 +5089,8 @@ in { prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let @@ -5179,6 +5199,8 @@ in { pyahocorasick = callPackage ../development/python-modules/pyahocorasick { }; + pyairnow = callPackage ../development/python-modules/pyairnow { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -5650,6 +5672,8 @@ in { py-multibase = callPackage ../development/python-modules/py-multibase { }; + py-multicodec = callPackage ../development/python-modules/py-multicodec { }; + py-multihash = callPackage ../development/python-modules/py-multihash { }; pymumble = callPackage ../development/python-modules/pymumble { }; @@ -5719,6 +5743,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopenuv = callPackage ../development/python-modules/pyopenuv { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; pyosf = callPackage ../development/python-modules/pyosf { }; @@ -5939,6 +5965,8 @@ in { pysmi = callPackage ../development/python-modules/pysmi { }; + pysmt = callPackage ../development/python-modules/pysmt { }; + pysnmp = callPackage ../development/python-modules/pysnmp { }; pysnooper = callPackage ../development/python-modules/pysnooper { }; @@ -6508,6 +6536,8 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyvex = callPackage ../development/python-modules/pyvex { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { @@ -6570,6 +6600,8 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -7903,6 +7935,8 @@ in { twisted = callPackage ../development/python-modules/twisted { }; + twitch-python = callPackage ../development/python-modules/twitch-python { }; + twitter = callPackage ../development/python-modules/twitter { }; twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; |