diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/agda-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 108 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 2 |
7 files changed, 131 insertions, 36 deletions
diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 601ab6d42b9dc..7434134d28f29 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -11,6 +11,8 @@ let in { inherit mkDerivation; + lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); + agda = withPackages [] // { inherit withPackages; }; standard-library = callPackage ../development/libraries/agda/standard-library { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb2fb36bb5b30..27c2b48e66bdf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -709,6 +709,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 @@ -717,6 +718,7 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 @@ -847,6 +849,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 fcbe39fb6e5f9..353190e2580db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -218,6 +218,8 @@ in containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; + cp437 = callPackage ../tools/misc/cp437 { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -230,6 +232,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + each = callPackage ../tools/text/each { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; glade = callPackage ../development/tools/glade { }; @@ -1259,6 +1263,8 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flavours = callPackage ../applications/misc/flavours { }; + flood = nodePackages.flood; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; @@ -2660,8 +2666,6 @@ in pbgopy = callPackage ../tools/text/pbgopy { }; - pbpst = callPackage ../applications/misc/pbpst { }; - pbzx = callPackage ../tools/compression/pbzx { }; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; @@ -3734,6 +3738,8 @@ in edid-generator = callPackage ../tools/misc/edid-generator { }; + edir = callPackage ../tools/misc/edir { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -5329,7 +5335,9 @@ in ispike = callPackage ../development/libraries/science/robotics/ispike { }; - isync = callPackage ../tools/networking/isync { }; + isync = callPackage ../tools/networking/isync { + inherit (darwin.apple_sdk.frameworks) Security; + }; itm-tools = callPackage ../development/tools/misc/itm-tools { }; @@ -5820,6 +5828,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 {}; @@ -6046,7 +6056,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 @@ -6061,6 +6071,8 @@ in madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; + maeparser = callPackage ../development/libraries/maeparser { }; + mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; maildrop = callPackage ../tools/networking/maildrop { }; @@ -7983,6 +7995,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; }; @@ -8047,7 +8061,7 @@ in subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; - sudo = if stdenv.isDarwin then darwin.sudo else callPackage ../tools/security/sudo { }; + sudo = callPackage ../tools/security/sudo { }; suidChroot = callPackage ../tools/system/suid-chroot { }; @@ -8263,7 +8277,7 @@ in textadept11 = callPackage ../applications/editors/textadept/11 { }; - texworks = libsForQt514.callPackage ../applications/editors/texworks { }; + texworks = libsForQt5.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -8547,12 +8561,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 { }; @@ -8964,10 +8978,6 @@ in hitch = callPackage ../servers/hitch { }; - venus = callPackage ../tools/misc/venus { - python = python27; - }; - veracrypt = callPackage ../applications/misc/veracrypt { wxGTK = wxGTK30; }; @@ -9227,7 +9237,7 @@ in zplug = callPackage ../shells/zsh/zplug { }; - zplugin = callPackage ../shells/zsh/zplugin {} ; + zinit = callPackage ../shells/zsh/zinit {} ; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; @@ -11683,6 +11693,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 {}; @@ -11723,10 +11735,10 @@ in bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8_headless; - buildJdkName = "jdk8"; + buildJdk = jdk11_headless; + buildJdkName = "java11"; runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_3; }; @@ -12967,6 +12979,8 @@ in yaml2json = callPackage ../development/tools/yaml2json { }; + yams = callPackage ../applications/audio/yams { }; + ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; @@ -13769,6 +13783,10 @@ in rev = "v${version}"; sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; }; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -15142,6 +15160,8 @@ in libkate = callPackage ../development/libraries/libkate { }; + libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + libkml = callPackage ../development/libraries/libkml { }; libksba = callPackage ../development/libraries/libksba { }; @@ -18426,6 +18446,8 @@ in storm = callPackage ../servers/computing/storm { }; + switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; + slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; @@ -19107,10 +19129,10 @@ in for a specific kernel. This function can then be called for whatever kernel you're using. */ - linuxPackagesFor = kernel: lib.makeExtensible (self: with self; { + linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; { callPackage = newScope self; - inherit kernel; + kernel = kernel_; inherit (kernel) stdenv; # in particular, use the same compiler by default # to help determine module compatibility @@ -19515,6 +19537,8 @@ in enableCmdlib = true; }; + maddy = callPackage ../servers/maddy/default.nix { }; + mbelib = callPackage ../development/libraries/audio/mbelib { }; mbpfan = callPackage ../os-specific/linux/mbpfan { }; @@ -20332,6 +20356,12 @@ in greybird = callPackage ../data/themes/greybird { }; + gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; + + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { + inherit (plasma5Packages) breeze-icons; + }; + gubbi-font = callPackage ../data/fonts/gubbi { }; gyre-fonts = callPackage ../data/fonts/gyre {}; @@ -20764,6 +20794,8 @@ in inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; + scientifica = callPackage ../data/fonts/scientifica { }; + siji = callPackage ../data/fonts/siji { inherit (buildPackages.xorg) mkfontscale fonttosfnt; }; @@ -21798,6 +21830,8 @@ in eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etebase-server = with python3Packages; toPythonApplication etebase-server; + etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; @@ -22636,6 +22670,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 { }; @@ -23063,7 +23101,7 @@ in keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; + keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { }; kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; @@ -23154,6 +23192,8 @@ in lame = callPackage ../development/libraries/lame { }; + labwc = callPackage ../applications/window-managers/labwc { }; + larswm = callPackage ../applications/window-managers/larswm { }; lash = callPackage ../applications/audio/lash { }; @@ -23214,11 +23254,10 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt514.callPackage ../applications/office/libreoffice + libreoffice = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; - jdk = jdk11; }); }); @@ -23226,7 +23265,6 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; - jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; @@ -23234,10 +23272,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { - stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 - icu = icu64; variant = "still"; - jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -24078,10 +24113,7 @@ in osmium-tool = callPackage ../applications/misc/osmium-tool { }; - osu-lazer = callPackage ../games/osu-lazer { - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-netcore = dotnetCorePackages.netcore_3_1; - }; + osu-lazer = callPackage ../games/osu-lazer { }; owamp = callPackage ../applications/networking/owamp { }; @@ -24110,8 +24142,8 @@ in osmo = callPackage ../applications/office/osmo { }; palemoon = callPackage ../applications/networking/browsers/palemoon { - # https://www.palemoon.org/sourcecode.shtml - stdenv = gcc7Stdenv; + # https://developer.palemoon.org/build/linux/ + stdenv = gcc8Stdenv; }; webbrowser = callPackage ../applications/networking/browsers/webbrowser {}; @@ -24568,7 +24600,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -25147,7 +25179,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 { }; @@ -25512,7 +25546,9 @@ in volnoti = callPackage ../applications/misc/volnoti { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { + autoreconfHook = buildPackages.autoreconfHook269; + }; vscode = callPackage ../applications/editors/vscode/vscode.nix { }; @@ -26308,6 +26344,8 @@ in abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + abuse = callPackage ../games/abuse { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -27303,6 +27341,8 @@ in zeroad = zeroadPackages.zeroad; + _0verkill = callPackage ../games/0verkill { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b979599e63075..c0faba640a269 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 3a10ac7bb513f..f11bd450ef360 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6986,6 +6986,23 @@ let }; }; + EmailStuffer = buildPerlPackage { + pname = "Email-Stuffer"; + version = "0.018"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.018.tar.gz"; + sha256 = "02wapphmcqbl1sg32x2az863lz5bb2dlckibxfqrjdlny27a406h"; + }; + buildInputs = [ Moo TestFatal ]; + propagatedBuildInputs = [ EmailMIME EmailSender ModuleRuntime ParamsUtil ]; + meta = { + homepage = "https://github.com/rjbs/Email-Stuffer"; + description = "A more casual approach to creating and sending Email:: emails"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + EmailValid = buildPerlPackage { pname = "Email-Valid"; version = "1.202"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d7f168162c75..f14264d6efc92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -254,6 +254,8 @@ in { aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aioinflux = callPackage ../development/python-modules/aioinflux { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; aiokafka = callPackage ../development/python-modules/aiokafka { }; @@ -484,6 +486,8 @@ in { asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; + asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; asyncpg = callPackage ../development/python-modules/asyncpg { }; @@ -1956,6 +1960,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drms = callPackage ../development/python-modules/drms { }; @@ -2083,6 +2089,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + etebase-server = callPackage ../servers/etebase { }; + etesync = callPackage ../development/python-modules/etesync { }; eth-hash = callPackage ../development/python-modules/eth-hash { }; @@ -2926,6 +2934,8 @@ in { hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hijri-converter = callPackage ../development/python-modules/hijri-converter { }; + hiredis = callPackage ../development/python-modules/hiredis { }; hiro = callPackage ../development/python-modules/hiro { }; @@ -4880,6 +4890,8 @@ in { inherit (pkgs.libsForQt5) soqt; }; + pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -4888,14 +4900,20 @@ 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 { }; python-openems = callPackage ../development/python-modules/python-openems { }; + python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; + python-tado = callPackage ../development/python-modules/python-tado { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -5707,6 +5725,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 { }; @@ -5917,6 +5937,8 @@ in { pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + pysma = callPackage ../development/python-modules/pysma { }; + pysmb = callPackage ../development/python-modules/pysmb { }; pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; @@ -5991,6 +6013,8 @@ in { pysychonaut = callPackage ../development/python-modules/pysychonaut { }; + pysyncobj = callPackage ../development/python-modules/pysyncobj { }; + pytabix = callPackage ../development/python-modules/pytabix { }; pytado = callPackage ../development/python-modules/pytado { }; @@ -6093,6 +6117,8 @@ in { pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; @@ -6647,6 +6673,8 @@ in { rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + rdkit = callPackage ../development/python-modules/rdkit { }; + re-assert = callPackage ../development/python-modules/re-assert { }; readchar = callPackage ../development/python-modules/readchar { }; @@ -7260,6 +7288,8 @@ in { softlayer = callPackage ../development/python-modules/softlayer { }; + solax = callPackage ../development/python-modules/solax { }; + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); somajo = callPackage ../development/python-modules/somajo { }; @@ -8322,6 +8352,8 @@ in { xattr = callPackage ../development/python-modules/xattr { }; + xboxapi = callPackage ../development/python-modules/xboxapi { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xcffib = callPackage ../development/python-modules/xcffib { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f3708f0ab45f0..223132217a5dc 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -95,8 +95,6 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; - libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; liblastfm = callPackage ../development/libraries/liblastfm { }; |