From d6cfb865adab6b5916f408aadfd06fe82c429a44 Mon Sep 17 00:00:00 2001 From: Default email Date: Sun, 18 Oct 2020 20:13:06 -0400 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 5265d49a36bb5a18c85e6817b338b456acc3b8cc --- third_party/nixpkgs/.editorconfig | 15 +- .../nixpkgs/doc/builders/packages/opengl.xml | 2 +- .../nixpkgs/maintainers/maintainer-list.nix | 6 + .../doc/manual/release-notes/rl-2103.xml | 6 + .../modules/i18n/input-method/default.xml | 4 +- .../nixos/modules/i18n/input-method/hime.nix | 18 +- .../nixpkgs/nixos/modules/misc/ids.nix | 2 +- .../nixpkgs/nixos/modules/module-list.nix | 1 + .../services/networking/pdns-recursor.nix | 52 +- .../services/web-servers/nginx/default.nix | 1 - .../pkgs/applications/audio/cava/default.nix | 4 +- .../audio/csound/csound-qt/default.nix | 2 +- .../applications/audio/ft2-clone/default.nix | 4 +- .../applications/audio/gspeech/default.nix | 2 +- .../audio/mellowplayer/default.nix | 2 +- .../applications/audio/mopidy/default.nix | 4 +- .../pkgs/applications/audio/mopidy/iris.nix | 2 +- .../audio/mopidy/local-images.nix | 32 - .../audio/mopidy/local-sqlite.nix | 25 - .../pkgs/applications/audio/mopidy/local.nix | 30 + .../pkgs/applications/audio/mopidy/mopidy.nix | 21 +- .../pkgs/applications/audio/mopidy/tunein.nix | 2 +- .../applications/audio/orca-c/default.nix | 2 +- .../applications/audio/picoloop/default.nix | 4 +- .../applications/audio/plexamp/default.nix | 2 +- .../applications/audio/puddletag/default.nix | 13 +- .../audio/pulseaudio-ctl/default.nix | 2 +- .../applications/blockchains/ergo/default.nix | 4 +- .../ledger-live-desktop/default.nix | 7 +- .../blockchains/monero-gui/default.nix | 16 +- .../blockchains/monero/default.nix | 11 +- .../editors/code-browser/default.nix | 2 +- .../applications/graphics/drawio/default.nix | 4 +- .../applications/graphics/feh/default.nix | 2 +- .../applications/graphics/freecad/default.nix | 7 +- .../applications/graphics/freecad/stable.nix | 85 --- .../applications/graphics/gnuclad/default.nix | 2 +- .../graphics/lightburn/default.nix | 2 +- .../applications/graphics/meshlab/default.nix | 2 +- .../graphics/write_stylus/default.nix | 2 +- .../pkgs/applications/misc/doing/default.nix | 2 +- .../pkgs/applications/misc/fslint/default.nix | 2 +- .../pkgs/applications/misc/gmtp/default.nix | 2 +- .../applications/misc/go-jira/default.nix | 6 +- .../pkgs/applications/misc/hugo/default.nix | 8 +- .../pkgs/applications/misc/icesl/default.nix | 2 +- .../applications/misc/marktext/default.nix | 2 +- .../pkgs/applications/misc/navi/default.nix | 6 +- .../pkgs/applications/misc/ola/default.nix | 2 +- .../applications/misc/osm2xmap/default.nix | 2 +- .../plasma-applet-volumewin7mixer/default.nix | 2 +- .../applications/misc/qlcplus/default.nix | 2 +- .../applications/misc/wordnet/default.nix | 5 +- .../applications/misc/xsuspender/default.nix | 2 +- .../pkgs/applications/misc/yarssr/default.nix | 2 +- .../applications/networking/c14/default.nix | 2 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/argo/default.nix | 6 +- .../cluster/docker-machine/default.nix | 2 +- .../cluster/docker-machine/hyperkit.nix | 2 +- .../networking/cluster/docker-machine/kvm.nix | 2 +- .../cluster/docker-machine/kvm2.nix | 2 +- .../cluster/docker-machine/xhyve.nix | 2 +- .../networking/cluster/fluxctl/default.nix | 6 +- .../networking/cluster/helmfile/default.nix | 6 +- .../networking/cluster/jx/default.nix | 2 +- .../networking/cluster/k3s/default.nix | 6 +- .../networking/cluster/k9s/default.nix | 2 +- .../networking/cluster/kpt/default.nix | 6 +- .../networking/cluster/kubeseal/default.nix | 4 +- .../networking/cluster/linkerd/default.nix | 2 +- .../networking/cluster/terragrunt/default.nix | 2 +- .../feedreaders/rss2email/default.nix | 2 +- .../instant-messengers/mirage/default.nix | 2 +- .../pantalaimon/default.nix | 2 +- .../instant-messengers/spectral/default.nix | 2 +- .../instant-messengers/teams/default.nix | 4 +- .../evolution/evolution-ews/default.nix | 2 +- .../networking/omping/default.nix | 2 +- .../networking/p2p/magnetico/default.nix | 2 +- .../networking/p2p/opentracker/default.nix | 2 +- .../networking/protonvpn-gui/default.nix | 2 +- .../networking/super-productivity/default.nix | 2 +- .../applications/networking/tsung/default.nix | 2 +- .../applications/office/grisbi/default.nix | 2 +- .../pkgs/applications/office/gtg/default.nix | 2 +- .../applications/office/portfolio/default.nix | 2 +- .../applications/office/softmaker/generic.nix | 35 +- .../applications/office/trilium/default.nix | 2 +- .../applications/radio/noaa-apt/default.nix | 2 +- .../science/biology/bedtools/default.nix | 2 +- .../science/biology/mosdepth/default.nix | 2 +- .../science/biology/snpeff/default.nix | 2 +- .../science/electronics/flatcam/default.nix | 2 +- .../science/electronics/kicad/default.nix | 8 +- .../science/logic/lean/default.nix | 4 +- .../science/math/bliss/default.nix | 4 +- .../science/physics/elmerfem/default.nix | 2 +- .../science/programming/scyther/default.nix | 2 +- .../science/robotics/mavproxy/default.nix | 4 +- .../git-and-tools/default.nix | 2 + .../git-and-tools/git-vanity-hash/default.nix | 27 + .../version-management/git-up/default.nix | 2 +- .../version-management/gitoxide/default.nix | 6 +- .../sparkleshare/default.nix | 2 +- .../applications/video/mkclean/default.nix | 2 +- .../applications/video/obs-studio/obs-ndi.nix | 6 +- .../video/plex-mpv-shim/default.nix | 2 +- .../video/webtorrent_desktop/default.nix | 2 +- .../window-managers/i3/layout-manager.nix | 2 +- .../window-managers/i3/lock-fancy.nix | 2 +- .../make-desktopitem/default.nix | 2 +- .../pkgs/data/fonts/cozette/default.nix | 2 +- .../pkgs/data/fonts/eunomia/default.nix | 2 +- .../nixpkgs/pkgs/data/fonts/f5_6/default.nix | 2 +- .../pkgs/data/fonts/ferrum/default.nix | 2 +- .../data/fonts/fixedsys-excelsior/default.nix | 2 +- .../pkgs/data/fonts/lmmath/default.nix | 2 +- .../nixpkgs/pkgs/data/fonts/vegur/default.nix | 2 +- .../pkgs/data/icons/luna-icons/default.nix | 8 +- .../data/misc/conway_polynomials/default.nix | 2 +- .../pkgs/data/themes/lounge/default.nix | 4 +- .../pkgs/data/themes/stilo/default.nix | 6 +- .../desktops/enlightenment/efl/default.nix | 4 +- .../desktops/lxde/core/lxrandr/default.nix | 2 +- .../development/compilers/acme/default.nix | 2 +- .../compilers/bs-platform/default.nix | 2 +- .../development/compilers/copper/default.nix | 2 +- .../development/compilers/inform7/default.nix | 2 +- .../pkgs/development/compilers/julia/0.7.nix | 9 - .../pkgs/development/compilers/julia/1.1.nix | 9 - .../development/compilers/mozart/default.nix | 2 +- .../development/compilers/nim/default.nix | 4 +- .../compilers/openjdk/openjfx/11.nix | 2 +- .../compilers/openjdk/openjfx/14.nix | 2 +- .../compilers/ponyc/pony-stable.nix | 2 +- .../compilers/scala/dotty-bare.nix | 2 +- .../development/compilers/shaderc/default.nix | 2 +- .../compilers/x11basic/default.nix | 2 +- .../development/interpreters/alda/default.nix | 6 +- .../interpreters/joker/default.nix | 4 +- .../interpreters/racket/minimal.nix | 2 +- .../libraries/cpp-utilities/default.nix | 4 +- .../development/libraries/embree/default.nix | 4 +- .../development/libraries/faudio/default.nix | 4 +- .../libraries/flatbuffers/default.nix | 2 +- .../development/libraries/galario/default.nix | 10 +- .../development/libraries/gtest/default.nix | 7 +- .../libraries/intel-media-sdk/default.nix | 2 +- .../development/libraries/jcal/default.nix | 2 +- .../development/libraries/jsoncpp/default.nix | 2 +- .../development/libraries/libdynd/default.nix | 2 +- .../libraries/libipfix/default.nix | 2 +- .../libmysqlconnectorcpp/default.nix | 2 +- .../libraries/libnetfilter_acct/default.nix | 2 +- .../libraries/libplacebo/default.nix | 4 - .../libraries/libroxml/default.nix | 2 +- .../development/libraries/libui/default.nix | 2 +- .../libraries/muparserx/default.nix | 2 +- .../libraries/mypaint-brushes/1.0.nix | 2 +- .../libraries/mypaint-brushes/default.nix | 2 +- .../libraries/opencascade-occt/7.3.nix | 29 - .../libraries/pangoxsl/default.nix | 2 +- .../development/libraries/pdal/default.nix | 2 +- .../libraries/properties-cpp/default.nix | 2 +- .../libraries/python-qt/default.nix | 2 +- .../development/libraries/rlottie/default.nix | 2 +- .../science/biology/elastix/default.nix | 20 +- .../libraries/science/math/brial/default.nix | 4 +- .../libraries/science/math/itpp/default.nix | 2 +- .../libraries/serialdv/default.nix | 2 +- .../development/libraries/taglib/default.nix | 2 +- .../development/libraries/vsqlite/default.nix | 2 +- .../pkgs/development/misc/h3/default.nix | 4 +- .../development/mobile/cocoapods/default.nix | 2 +- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 545 ++++++++---------- .../python-modules/Theano/default.nix | 6 +- .../python-modules/accuweather/default.nix | 28 + .../python-modules/aiokafka/default.nix | 4 +- .../python-modules/aubio/default.nix | 35 ++ .../python-modules/azure-mgmt-sql/default.nix | 4 +- .../azure-mgmt-subscription/default.nix | 4 +- .../python-modules/bids-validator/default.nix | 4 +- .../python-modules/bravia-tv/default.nix | 4 +- .../python-modules/bugsnag/default.nix | 6 +- .../python-modules/cx_oracle/default.nix | 4 +- .../python-modules/datasette/default.nix | 21 +- .../python-modules/debian/default.nix | 4 +- .../python-modules/diff_cover/default.nix | 4 +- .../python-modules/fastprogress/default.nix | 32 + .../google_cloud_firestore/default.nix | 4 +- .../google_resumable_media/default.nix | 4 +- .../python-modules/holoviews/default.nix | 4 +- .../python-modules/howdoi/default.nix | 4 +- .../python-modules/identify/default.nix | 4 +- .../development/python-modules/jc/default.nix | 2 +- .../python-modules/lightgbm/default.nix | 4 +- .../msal-extensions/default.nix | 4 + .../python-modules/msal/default.nix | 4 +- .../python-modules/pdfminer_six/default.nix | 4 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/phonopy/default.nix | 4 +- .../python-modules/pyexcel-io/default.nix | 7 +- .../python-modules/pyexcel-ods/default.nix | 4 +- .../python-modules/pyexcel-xls/default.nix | 4 +- .../python-modules/pyexcel/default.nix | 9 +- .../python-modules/pymc3/default.nix | 5 + .../python-modules/pynacl/default.nix | 14 +- .../python-modules/pyside2/default.nix | 4 +- .../python-modules/pysonos/default.nix | 4 +- .../python-modules/pyspark/default.nix | 4 +- .../python-modules/pytest-flask/default.nix | 8 +- .../python-modules/python-openems/default.nix | 49 ++ .../python-modules/pywal/default.nix | 2 +- .../python-modules/sacn/default.nix | 28 + .../python-modules/simplefix/default.nix | 4 +- .../snowflake-connector-python/default.nix | 9 +- .../snowflake-sqlalchemy/default.nix | 4 +- .../python-modules/sqlobject/default.nix | 4 +- .../python-modules/sseclient/default.nix | 8 +- .../python-modules/treq/default.nix | 4 +- .../python-modules/trio/default.nix | 6 +- .../python-modules/uamqp/default.nix | 4 +- .../python-modules/wled/default.nix | 47 ++ .../python-modules/yamllint/default.nix | 4 +- .../development/python-modules/yq/default.nix | 2 +- .../tools/analysis/checkstyle/default.nix | 4 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/flow/default.nix | 4 +- .../garcosim/tracefilesim/default.nix | 2 +- .../tools/analysis/pev/default.nix | 6 +- .../development/tools/bazel-kazel/default.nix | 4 +- .../tools/bazel-watcher/default.nix | 2 +- .../development/tools/bazelisk/default.nix | 4 +- .../bazel/bazel-remote/default.nix | 2 +- .../bazel/buildtools/default.nix | 2 +- .../tools/build-managers/bloop/default.nix | 2 +- .../pkgs/development/tools/check/default.nix | 2 +- .../development/tools/clj-kondo/default.nix | 2 +- .../drone-cli/default.nix | 2 +- .../continuous-integration/fly/default.nix | 4 +- .../development/tools/corundum/default.nix | 2 +- .../development/tools/deadcode/default.nix | 2 +- .../pkgs/development/tools/deis/default.nix | 2 +- .../development/tools/deisctl/default.nix | 2 +- .../pkgs/development/tools/doctl/default.nix | 4 +- .../development/tools/drm_info/default.nix | 2 +- .../pkgs/development/tools/ejson/default.nix | 2 +- .../development/tools/errcheck/default.nix | 2 +- .../pkgs/development/tools/gauge/default.nix | 4 +- .../pkgs/development/tools/gdm/default.nix | 2 +- .../development/tools/git-ftp/default.nix | 2 +- .../development/tools/go-migrate/default.nix | 2 +- .../development/tools/go-outline/default.nix | 2 +- .../development/tools/go-symbols/default.nix | 2 +- .../development/tools/go-tools/default.nix | 6 +- .../development/tools/goconvey/default.nix | 2 +- .../development/tools/gocyclo/default.nix | 2 +- .../tools/gomodifytags/default.nix | 2 +- .../pkgs/development/tools/gopkgs/default.nix | 2 +- .../pkgs/development/tools/gore/default.nix | 2 +- .../development/tools/gotests/default.nix | 2 +- .../development/tools/gotestsum/default.nix | 6 +- .../pkgs/development/tools/impl/default.nix | 2 +- .../development/tools/ineffassign/default.nix | 2 +- .../development/tools/interfacer/default.nix | 2 +- .../tools/irony-server/default.nix | 2 +- .../pkgs/development/tools/jsduck/default.nix | 2 +- .../tools/knightos/kcc/default.nix | 1 + .../tools/knightos/kimg/default.nix | 1 + .../tools/knightos/kpack/default.nix | 1 + .../tools/knightos/patchrom/default.nix | 1 + .../tools/knightos/scas/default.nix | 2 +- .../tools/knightos/z80e/default.nix | 27 + .../pkgs/development/tools/kythe/default.nix | 2 +- .../tools/librarian-puppet-go/default.nix | 2 +- .../development/tools/maligned/default.nix | 2 +- .../development/tools/minizinc/default.nix | 2 +- .../development/tools/misc/act/default.nix | 4 +- .../development/tools/misc/asls/default.nix | 4 +- .../tools/misc/bsdbuild/default.nix | 2 +- .../development/tools/misc/ccache/default.nix | 4 +- .../tools/misc/circleci-cli/default.nix | 6 +- .../tools/misc/clojure-lsp/default.nix | 4 +- .../tools/misc/tockloader/default.nix | 2 +- .../development/tools/mockgen/default.nix | 2 +- .../tools/ocaml/ocamlformat/default.nix | 86 +-- .../tools/ocaml/ocamlformat/generic.nix | 68 +++ .../tools/operator-sdk/default.nix | 2 +- .../tools/parinfer-rust/default.nix | 2 +- .../pkgs/development/tools/pax-rs/default.nix | 2 +- .../pkgs/development/tools/richgo/default.nix | 2 +- .../tools/rust/bindgen/default.nix | 2 +- .../tools/rust/cargo-embed/default.nix | 2 +- .../tools/rust/cargo-flash/default.nix | 2 +- .../tools/rust/cargo-geiger/default.nix | 2 +- .../tools/rust/cargo-make/default.nix | 6 +- .../tools/rust/cargo-udeps/default.nix | 6 +- .../tools/setupcfg2nix/default.nix | 2 +- .../development/tools/systemfd/default.nix | 2 +- .../development/tools/toxiproxy/default.nix | 2 +- .../pkgs/development/tools/tracy/default.nix | 2 +- .../pkgs/development/tools/tychus/default.nix | 2 +- .../pkgs/development/tools/vogl/default.nix | 2 +- .../pkgs/development/tools/xqilla/default.nix | 2 +- .../pkgs/development/web/flyctl/default.nix | 6 +- .../nixpkgs/pkgs/games/fltrator/default.nix | 2 +- .../nixpkgs/pkgs/games/frotz/default.nix | 2 +- .../nixpkgs/pkgs/games/gtetrinet/default.nix | 2 +- .../pkgs/games/opendungeons/default.nix | 2 +- .../nixpkgs/pkgs/games/pacvim/default.nix | 2 +- .../nixpkgs/pkgs/games/redeclipse/default.nix | 2 +- .../nixpkgs/pkgs/games/t4kcommon/default.nix | 2 +- .../nixpkgs/pkgs/games/trigger/default.nix | 19 +- .../nixpkgs/pkgs/games/xbill/default.nix | 2 +- .../misc/cups/drivers/cnijfilter2/default.nix | 2 +- .../cups/drivers/cnijfilter_4_00/default.nix | 2 +- .../documentation-highlighter/default.nix | 2 +- .../pkgs/misc/drivers/epkowa/default.nix | 109 ++-- .../pkgs/misc/emulators/np2kai/default.nix | 2 +- third_party/nixpkgs/pkgs/misc/hdt/default.nix | 2 +- .../nixpkgs/pkgs/misc/riscv-pk/default.nix | 2 +- .../screensavers/betterlockscreen/default.nix | 2 +- .../screensavers/i3lock-pixeled/default.nix | 2 +- .../misc/screensavers/xautolock/default.nix | 2 +- .../nixpkgs/pkgs/misc/uboot/default.nix | 4 +- .../pkgs/misc/vim-plugins/overrides.nix | 3 + .../os-specific/darwin/osxsnarf/default.nix | 2 +- .../pkgs/os-specific/linux/cpuset/default.nix | 2 +- .../firmware/system76-firmware/default.nix | 2 +- .../linux/intel-compute-runtime/default.nix | 2 +- .../linux/kernel/hardened/patches.json | 25 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-4.4.nix | 4 +- .../os-specific/linux/kernel/linux-4.9.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-5.8.nix | 4 +- .../os-specific/linux/kernel/linux-5.9.nix | 4 +- .../os-specific/linux/libevdevc/default.nix | 2 +- .../os-specific/linux/libgestures/default.nix | 2 +- .../linux/lksctp-tools/default.nix | 2 +- .../os-specific/linux/nvidia-x11/default.nix | 8 +- .../os-specific/linux/psftools/default.nix | 24 + .../os-specific/linux/usbguard/default.nix | 2 +- .../linux/xf86-input-cmt/default.nix | 2 +- .../pkgs/os-specific/solo5/default.nix | 2 +- .../pkgs/servers/code-server/default.nix | 2 +- .../nixpkgs/pkgs/servers/consul/default.nix | 6 +- .../nixpkgs/pkgs/servers/dante/default.nix | 2 +- .../servers/dns/pdns-recursor/default.nix | 2 +- .../nixpkgs/pkgs/servers/gerbera/default.nix | 6 +- .../home-assistant/component-packages.nix | 4 +- .../pkgs/servers/http/tengine/default.nix | 2 +- .../pkgs/servers/http/unit/default.nix | 2 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 6 +- .../servers/monitoring/do-agent/default.nix | 4 +- .../servers/monitoring/plugins/default.nix | 2 +- .../monitoring/plugins/labs_consol_de.nix | 6 +- .../prometheus/keylight-exporter.nix | 2 +- .../prometheus/modemmanager-exporter.nix | 2 +- .../prometheus/nextcloud-exporter.nix | 2 +- .../prometheus/wireguard-exporter.nix | 2 +- .../servers/monitoring/telegraf/default.nix | 2 +- .../nixpkgs/pkgs/servers/openbgpd/default.nix | 2 +- .../nixpkgs/pkgs/servers/pinnwand/default.nix | 2 +- .../nixpkgs/pkgs/servers/pinnwand/steck.nix | 2 +- .../pkgs/servers/roon-server/default.nix | 2 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 8 +- .../nixpkgs/pkgs/servers/tang/default.nix | 2 +- .../nixpkgs/pkgs/servers/tautulli/default.nix | 2 +- .../servers/web-apps/jirafeau/default.nix | 2 +- .../web-apps/pgpkeyserver-lite/default.nix | 2 +- .../pkgs/shells/zsh/antigen/default.nix | 2 +- .../pkgs/shells/zsh/zsh-prezto/default.nix | 2 +- .../pkgs/tools/admin/daemontools/default.nix | 2 +- .../pkgs/tools/admin/eksctl/default.nix | 6 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../pkgs/tools/admin/lexicon/default.nix | 2 +- .../pkgs/tools/admin/stripe-cli/default.nix | 26 + .../pkgs/tools/audio/picotts/default.nix | 2 +- .../pkgs/tools/compression/pbzx/default.nix | 2 +- .../pkgs/tools/filesystems/convoy/default.nix | 2 +- .../pkgs/tools/graphics/gifski/default.nix | 6 +- .../pkgs/tools/inputmethods/hime/default.nix | 28 +- .../tools/inputmethods/keyfuzz/default.nix | 2 +- .../pkgs/tools/misc/adafruit-ampy/default.nix | 2 +- .../tools/misc/asciinema-scenario/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/chafa/default.nix | 2 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/dijo/default.nix | 2 +- .../pkgs/tools/misc/dmg2img/default.nix | 2 +- .../pkgs/tools/misc/fselect/default.nix | 6 +- .../pkgs/tools/misc/go.rice/default.nix | 2 +- .../pkgs/tools/misc/gotify-cli/default.nix | 2 +- .../pkgs/tools/misc/hacksaw/default.nix | 2 +- .../pkgs/tools/misc/ical2org/default.nix | 2 +- .../pkgs/tools/misc/intermodal/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/kargo/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/lice/default.nix | 2 +- .../pkgs/tools/misc/logtop/default.nix | 2 +- .../pkgs/tools/misc/lokalise2-cli/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/noti/default.nix | 2 +- .../pkgs/tools/misc/nyancat/default.nix | 2 +- .../misc/pandoc-plantuml-filter/default.nix | 2 +- .../pkgs/tools/misc/shunit2/default.nix | 2 +- .../pkgs/tools/misc/silicon/default.nix | 2 +- .../pkgs/tools/misc/statserial/default.nix | 2 +- .../pkgs/tools/misc/svtplay-dl/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/td/default.nix | 2 +- .../pkgs/tools/misc/thefuck/default.nix | 2 +- .../pkgs/tools/misc/wootility/default.nix | 2 +- .../tools/misc/yubikey-manager-qt/default.nix | 2 +- .../tools/misc/yubikey-manager/default.nix | 2 +- .../pkgs/tools/networking/amass/default.nix | 6 +- .../tools/networking/bandwhich/default.nix | 6 +- .../pkgs/tools/networking/clash/default.nix | 6 +- .../pkgs/tools/networking/croc/default.nix | 6 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../tools/networking/dnstracer/default.nix | 2 +- .../tools/networking/findomain/default.nix | 6 +- .../pkgs/tools/networking/flannel/default.nix | 4 +- .../pkgs/tools/networking/frp/default.nix | 6 +- .../tools/networking/goreplay/default.nix | 2 +- .../pkgs/tools/networking/grpcui/default.nix | 6 +- .../pkgs/tools/networking/mcrcon/default.nix | 2 +- .../pkgs/tools/networking/ocserv/default.nix | 2 +- .../tools/networking/persepolis/default.nix | 2 +- .../tools/networking/quickserve/default.nix | 2 +- .../tools/networking/radsecproxy/default.nix | 2 +- .../networking/tcptraceroute/default.nix | 2 +- .../tools/networking/tendermint/default.nix | 2 +- .../tools/nix/nix-output-monitor/default.nix | 6 +- .../pkgs/tools/nix/nix-script/default.nix | 2 +- .../elm-github-install/default.nix | 2 +- .../package-management/morph/default.nix | 2 +- .../mynewt-newt/default.nix | 2 +- .../pkgs/tools/security/acsccid/default.nix | 2 +- .../pkgs/tools/security/doppler/default.nix | 4 +- .../pkgs/tools/security/ecdsatool/default.nix | 2 +- .../pkgs/tools/security/fpm2/default.nix | 2 +- .../pkgs/tools/security/genpass/default.nix | 2 +- .../pkgs/tools/security/gopass/default.nix | 2 +- .../pkgs/tools/security/hashdeep/default.nix | 2 +- .../tools/security/hcxdumptool/default.nix | 4 +- .../pkgs/tools/security/hologram/default.nix | 2 +- .../pkgs/tools/security/kbs2/default.nix | 6 +- .../pkgs/tools/security/keybase/default.nix | 2 +- .../pkgs/tools/security/minica/default.nix | 2 +- .../pkgs/tools/security/rbw/default.nix | 9 +- .../pkgs/tools/security/zzuf/default.nix | 2 +- .../pkgs/tools/system/incron/default.nix | 2 +- .../pkgs/tools/system/inxi/default.nix | 4 +- .../pkgs/tools/system/jump/default.nix | 2 +- .../pkgs/tools/system/pcstat/default.nix | 2 +- .../pkgs/tools/text/fastmod/default.nix | 6 +- .../pkgs/tools/text/miller/default.nix | 2 +- .../tools/text/platinum-searcher/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 4 +- .../tools/typesetting/docbookrx/default.nix | 2 +- .../typesetting/kramdown-asciidoc/default.nix | 2 +- .../tools/typesetting/tectonic/default.nix | 8 +- .../virtualization/cloudmonkey/default.nix | 2 +- .../nixpkgs/pkgs/top-level/aliases.nix | 4 + .../nixpkgs/pkgs/top-level/all-packages.nix | 45 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 16 + .../pkgs/top-level/python-packages.nix | 12 + 469 files changed, 1580 insertions(+), 1450 deletions(-) delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/0.7.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/1.1.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix diff --git a/third_party/nixpkgs/.editorconfig b/third_party/nixpkgs/.editorconfig index 66a23a2057..d8a320e495 100644 --- a/third_party/nixpkgs/.editorconfig +++ b/third_party/nixpkgs/.editorconfig @@ -65,9 +65,7 @@ trim_trailing_whitespace = unset [gemset.nix] insert_final_newline = unset -[node-{composition,packages}.nix] -insert_final_newline = unset -[node-packages-generated.nix] +[node-{composition,packages,packages-generated}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -76,9 +74,6 @@ trim_trailing_whitespace = unset [nixos/tests/systemd-networkd-vrf.nix] trim_trailing_whitespace = unset -[pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json] -indent_size = unset - [pkgs/build-support/dotnetenv/Wrapper/**] end_of_line = unset insert_final_newline = unset @@ -91,12 +86,8 @@ trim_trailing_whitespace = unset end_of_line = unset insert_final_newline = unset -[pkgs/development/lisp-modules/quicklisp-to-nix.nix] -indent_size = unset - [pkgs/development/haskell-modules/hackage-packages.nix] indent_style = unset -indent_size = unset trim_trailing_whitespace = unset [pkgs/development/mobile/androidenv/generated/{addons,packages}.nix] @@ -106,7 +97,6 @@ trim_trailing_whitespace = unset insert_final_newline = unset [pkgs/servers/dict/wordnet_structures.py] -indent_size = unset trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] @@ -118,6 +108,3 @@ trim_trailing_whitespace = unset [pkgs/top-level/emscripten-packages.nix] trim_trailing_whitespace = unset - -[pkgs/top-level/perl-packages.nix] -indent_size = unset diff --git a/third_party/nixpkgs/doc/builders/packages/opengl.xml b/third_party/nixpkgs/doc/builders/packages/opengl.xml index 5f4433a288..dfd64b1885 100644 --- a/third_party/nixpkgs/doc/builders/packages/opengl.xml +++ b/third_party/nixpkgs/doc/builders/packages/opengl.xml @@ -4,6 +4,6 @@ OpenGL - Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa_drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. + Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa.drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 144ff0611a..b110e34f23 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -4240,6 +4240,12 @@ githubId = 1786438; name = "Jonas Schievink"; }; + jshcmpbll = { + email = "me@joshuadcampbell.com"; + github = "jshcmpbll"; + githubId = 16374374; + name = "Joshua Campbell"; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml index fb1d50434b..c160ab5783 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml @@ -93,6 +93,12 @@ kicad/default.nix. + + + The socket for the pdns-recursor module was moved from /var/lib/pdns-recursor + to /run/pdns-recursor to match upstream. + + diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml index e15f666908..73911059f8 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml @@ -252,8 +252,8 @@ i18n.inputMethod = { Hime is an extremely easy-to-use input method framework. It is lightweight, stable, powerful and supports many commonly used input methods, including - Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Japanese Anthy, Korean Pinyin, - Latin Alphabet, Rancang hunting birds, cool music, etc... + Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Korean Pinyin, Latin Alphabet, + etc... diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix index a1b346a0f8..8482130db3 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix @@ -1,23 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; { - options = { - i18n.inputMethod.hime = { - enableChewing = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable chewing input method"; - }; - enableAnthy = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable anthy input method"; - }; - }; - }; - config = mkIf (config.i18n.inputMethod.enabled == "hime") { + i18n.inputMethod.package = pkgs.hime; environment.variables = { GTK_IM_MODULE = "hime"; QT_IM_MODULE = "hime"; diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 81d5d04fa5..cd21a1609c 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -297,7 +297,7 @@ in headphones = 266; couchpotato = 267; gogs = 268; - pdns-recursor = 269; + #pdns-recursor = 269; # dynamically allocated as of 2020-20-18 #kresd = 270; # switched to "knot-resolver" with dynamic ID rpc = 271; geoip = 272; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 78cfb73717..ed6201237b 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -79,6 +79,7 @@ ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix + ./i18n/input-method/hime.nix ./i18n/input-method/ibus.nix ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix b/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix index 6ff181377f..a326eccfd6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix @@ -3,9 +3,6 @@ with lib; let - dataDir = "/var/lib/pdns-recursor"; - username = "pdns-recursor"; - cfg = config.services.pdns-recursor; oneOrMore = type: with types; either type (listOf type); @@ -21,7 +18,7 @@ let else if builtins.isList val then (concatMapStringsSep "," serialize val) else ""; - configFile = pkgs.writeText "recursor.conf" + configDir = pkgs.writeTextDir "recursor.conf" (concatStringsSep "\n" (flip mapAttrsToList cfg.settings (name: val: "${name}=${serialize val}"))); @@ -173,45 +170,30 @@ in { serve-rfc1918 = cfg.serveRFC1918; lua-config-file = pkgs.writeText "recursor.lua" cfg.luaConfig; + daemon = false; + write-pid = false; log-timestamp = false; disable-syslog = true; }; - users.users.${username} = { - home = dataDir; - createHome = true; - uid = config.ids.uids.pdns-recursor; + systemd.packages = [ pkgs.pdns-recursor ]; + + systemd.services.pdns-recursor = { + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = [ "" "${pkgs.pdns-recursor}/bin/pdns_recursor --config-dir=${configDir}" ]; + }; + }; + + users.users.pdns-recursor = { + isSystemUser = true; + group = "pdns-recursor"; description = "PowerDNS Recursor daemon user"; }; - systemd.services.pdns-recursor = { - unitConfig.Documentation = "man:pdns_recursor(1) man:rec_control(1)"; - description = "PowerDNS recursive server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + users.groups.pdns-recursor = {}; - serviceConfig = { - User = username; - Restart ="on-failure"; - RestartSec = "5"; - PrivateTmp = true; - PrivateDevices = true; - AmbientCapabilities = "cap_net_bind_service"; - ExecStart = ''${pkgs.pdns-recursor}/bin/pdns_recursor \ - --config-dir=${dataDir} \ - --socket-dir=${dataDir} - ''; - }; - - preStart = '' - # Link configuration file into recursor home directory - configPath=${dataDir}/recursor.conf - if [ "$(realpath $configPath)" != "${configFile}" ]; then - rm -f $configPath - ln -s ${configFile} $configPath - fi - ''; - }; }; imports = [ diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 39bcb14e5a..6d2ddea927 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -34,7 +34,6 @@ let proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; - proxy_set_header Accept-Encoding ""; ''; upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix index 26cc8cd78d..a92a5325f1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.7.2"; + version = "0.7.3"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1chc08spjf5i17n8y48aqzdxsj8vvf0r2l62ldw2pqgw60dacvs1"; + sha256 = "04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix index 895609d3c0..e6060c056c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; + description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index bcdc1fe719..4eae53e054 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.31"; + version = "1.36"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "02j876d4xmbdmqairrs5190dzdm3k4s5hi3g9wvx62cxnnw7igha"; + sha256 = "0hsgzh7s2qgl8ah8hzmhfl74v5y8wc7f6z8ly9026h5r6pb09id0"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix index 920c06038f..21a4d6748b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; meta = with lib; { - description = "A minimal GUI for the Text To Speech 'Svox Pico'. Read clipboard or selected text in different languages and manage it : pause, stop, replay."; + description = "A minimal GUI for the Text To Speech 'Svox Pico'. Read clipboard or selected text in different languages and manage it : pause, stop, replay"; homepage = "https://github.com/mothsART/gSpeech"; maintainers = with maintainers; [ mothsart ]; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix index a117611fdf..26736ea3e8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { meta = with lib; { inherit (qtbase.meta) platforms; - description = "Cloud music integration for your desktop."; + description = "Cloud music integration for your desktop"; homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer"; license = licenses.gpl2; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix index 23322ca566..fc532482cb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -14,9 +14,7 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-local-images = callPackage ./local-images.nix { }; - - mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; + mopidy-local = callPackage ./local.nix { }; mopidy-spotify = callPackage ./spotify.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 467ba6fe3f..48f955fd71 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy, mopidy-local-images }: +{ stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix deleted file mode 100644 index 085fe855e8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobject-introspection }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-local-images"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-images"; - rev = "v${version}"; - sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; - }; - - buildInputs = [ gobject-introspection ]; - - checkInputs = [ - pythonPackages.mock - ]; - - propagatedBuildInputs = [ - mopidy - pythonPackages.pykka - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-images"; - description = "Mopidy local library proxy extension for handling embedded album art"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix deleted file mode 100644 index 23e01c02a0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-local-sqlite"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-sqlite"; - rev = "v${version}"; - sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv"; - }; - - propagatedBuildInputs = [ - mopidy - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-sqlite"; - description = "Mopidy SQLite local library extension"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix new file mode 100644 index 0000000000..4355428056 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix @@ -0,0 +1,30 @@ +{ lib +, mopidy +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Local"; + version = "3.1.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j"; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.uritools + ]; + + checkInputs = [ + python3Packages.pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/mopidy/mopidy-local"; + description = "Mopidy extension for playing music from your local music archive"; + license = licenses.asl20; + maintainers = with maintainers; [ ruuda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index 28216020b7..eb5672fe13 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix @@ -16,13 +16,24 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib-networking gobject-introspection + glib-networking + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly ]; - propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests setuptools - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; + propagatedBuildInputs = [ + gobject-introspection + ] ++ (with pythonPackages; [ + gst-python + pygobject3 + pykka + requests + setuptools + tornado + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python + ); # There are no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix index 569d08fb4a..9ab0323205 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_tunein.tunein" ]; meta = with stdenv.lib; { - description = "Mopidy extension for playing music from tunein."; + description = "Mopidy extension for playing music from tunein"; homepage = "https://github.com/kingosticks/mopidy-tunein"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix b/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix index 3a4f4b2ce2..74c74578be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "An esoteric programming language designed to quickly create procedural sequencers."; + description = "An esoteric programming language designed to quickly create procedural sequencers"; homepage = "https://github.com/hundredrabbits/Orca-c"; license = licenses.mit; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix index 1dc9c70af8..7f6773f5e5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { SDL2_image SDL2_ttf alsaLib - libjack2 + libjack2 ]; sourceRoot = "source/picoloop"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)."; + description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)"; homepage = "https://github.com/yoyz/picoloop"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 36462aa28b..2773824523 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -30,7 +30,7 @@ in appimageTools.wrapType2 { ''; meta = with lib; { - description = "A beautiful Plex music player for audiophiles, curators, and hipsters."; + description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; license = licenses.unfree; maintainers = with maintainers; [ killercup ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix index 56fcdcc94c..55cde08fe8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: python3Packages.buildPythonApplication rec { pname = "puddletag"; @@ -13,6 +13,8 @@ python3Packages.buildPythonApplication rec { sourceRoot = "source/source"; + nativeBuildInputs = [ wrapQtAppsHook ]; + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen @@ -20,9 +22,13 @@ python3Packages.buildPythonApplication rec { pyqt5 ]); - doCheck = false; # there are no tests + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; - dontStrip = true; # we are not generating any binaries + doCheck = false; # there are no tests + + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; @@ -30,6 +36,5 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - broken = true; # Needs Qt wrapping }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix index 125dafc132..6cabdc6534 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils."; + description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils"; homepage = "https://bbs.archlinux.org/viewtopic.php?id=124513"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index a61df3e91b..685a562f21 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1lsqshpbc5p5qm8kic8a90xmvd2zx2s7jf613j9ng4h3hh75wbff"; + sha256 = "0psq0nxb4c0fsxjzjxb4sy6lh4kj4w8aizd81r92fdv8izbm25sk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 323b9936af..3bd379ce27 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.9.0"; + version = "2.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1ajpmsq4h37w3jzcxijg3myp3mvgbrjis6jrz1cl79m78ripb6cy"; + sha256 = "057g77nd8qxi8dw9sp7x068wsxmrpnsdfrca876f0bpw7lpb0bqq"; }; appimageContents = appimageTools.extractType2 { @@ -30,7 +30,8 @@ in appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister nyanloutre ]; + maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood ]; platforms = [ "x86_64-linux" ]; }; } + diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index 776d51ca6b..c079fa88a7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.0.1"; + version = "0.17.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1i9a3ampppyzsl4sllbqlr3w43sjpb3fdfxhb1j4n49p8g0jzmf3"; + sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84"; }; nativeBuildInputs = [ @@ -65,9 +65,6 @@ stdenv.mkDerivation rec { substituteInPlace src/version.js.in \ --replace '@VERSION_TAG_GUI@' '${version}' - # remove this line on the next release - rm cmake/Version.cmake - # use monerod from the monero package substituteInPlace src/daemon/DaemonManager.cpp \ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' @@ -78,10 +75,11 @@ stdenv.mkDerivation rec { 'add_subdirectory(monero EXCLUDE_FROM_ALL)' ''; - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=$out/bin" - "-DARCH=${arch}" - ]; + preConfigure = '' + # because $out needs to be expanded + cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin") + cmakeFlagsArray+=("-DARCH=${arch}") + ''; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix index 935040bc7b..7d55a5f6f3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -17,25 +17,18 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.0.1"; + version = "0.17.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1v0phvg5ralli4dr09a60nq032xqlci5d6v4zfq8304vgrn1ffgp"; + sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw"; fetchSubmodules = true; }; patches = [ ./use-system-libraries.patch - - # This fixes a bug in the monero-gui build system, - # remove it once the PR has been merged - (fetchpatch { - url = "https://github.com/monero-project/monero/pull/6867.patch"; - sha256 = "0nxa6861df1fadrm9bmhqf2g6mljgr4jndsbxqp7g501hv9z51j3"; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix b/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix index 11476cae70..ed11298c62 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals withQt [ "UI=qt" ] ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; meta = with stdenv.lib; { - description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code."; + description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; homepage = "https://tibleiz.net/code-browser/"; license = licenses.gpl2; platforms = platforms.x86_64; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 5a5ce5d8b2..5c76e523c0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.7.3"; + version = "13.7.9"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "14wcj9jbpv1rg0g7djihzzq088aj96mwys4rc9540ajbkbbm9d36"; + sha256 = "1h0baxh9gvshdfqb77x5m8v95lw4lw4djj3gwrna0jjpfhmcs4vq"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 82128f8135..467e593025 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perlPackages -, enableAutoreload ? true }: +, enableAutoreload ? !stdenv.hostPlatform.isDarwin }: with stdenv.lib; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index f9322add5c..3a5d36dfac 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -9,13 +9,13 @@ let pythonPackages = python3Packages; in mkDerivation rec { pname = "freecad-unstable"; - version = "2020-09-25"; + version = "2020-10-17"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = "7616153b3c31ace006169cdc2fdafab484498858"; - sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch"; + rev = "f3bdaaa55a6c03b297924c40819d23e4603fa55b"; + sha256 = "1q1iy4i9k65v8z7h8a6r4bf5ycn124jp26xwp0xwbar4gnkx2jiq"; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ in mkDerivation rec { libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost + GitPython # for addon manager ]); cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix deleted file mode 100644 index 657caeca8b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, -xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, -opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: - -assert mpi != null; - -let - pythonPackages = python3Packages; -in mkDerivation rec { - pname = "freecad"; - version = "0.18.4"; - - src = fetchFromGitHub { - owner = "FreeCAD"; - repo = "FreeCAD"; - rev = version; - sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; - }; - - nativeBuildInputs = [ - cmake - ninja - pkgconfig - pythonPackages.pyside2-tools - wrapQtAppsHook - ]; - - buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts - zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu qtbase qttools qtwebkit - ] ++ (with pythonPackages; [ - matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost - ]); - - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions >= 0.19 - patches = [ - (fetchpatch { - url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; - sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; - }) - ]; - - cmakeFlags = [ - "-DBUILD_QT5=ON" - "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" - + ";${pythonPackages.pyside2}/include/PySide2/QtCore" - + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" - + ";${pythonPackages.pyside2}/include/PySide2/QtGui" - ) - "-DPYSIDE_LIBRARY=PySide2::pyside2" - ]; - - # This should work on both x86_64, and i686 linux - preBuild = '' - export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; - ''; - - # Their main() removes PYTHONPATH=, and we rely on it. - preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - - qtWrapperArgs = [ - "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" - ]; - - postFixup = '' - mv $out/share/doc $out - ''; - - meta = with stdenv.lib; { - description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = "https://www.freecadweb.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ viric gebner ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix index fcb4bdb537..d27c2636e2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/gnuclad"; - description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project."; + description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 7fcec93446..a5a255338e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "LightBurn is layout, editing, and control software for your laser cutter."; + description = "LightBurn is layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ q3k ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index 75940fdc45..50962d54eb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -87,7 +87,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A system for processing and editing 3D triangular meshes."; + description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ viric ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix index 8396ce72e5..3c2ad8f4fa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.styluslabs.com/"; - description = "Write is a word processor for handwriting."; + description = "Write is a word processor for handwriting"; platforms = platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/doing/default.nix b/third_party/nixpkgs/pkgs/applications/misc/doing/default.nix index 48e45328f6..e539cf3ae1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/doing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/doing/default.nix @@ -11,7 +11,7 @@ bundlerEnv { passthru.updateScript = bundlerUpdateScript "doing"; meta = with lib; { - description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done."; + description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done"; longDescription = '' doing is a basic CLI for adding and listing "what was I doing" reminders in a TaskPaper-formatted text file. It allows for multiple diff --git a/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix index f6e1071ac5..1f2ec28054 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A utility to find and clean various forms of lint on a filesystem."; + description = "A utility to find and clean various forms of lint on a filesystem"; homepage = "https://www.pixelbeat.org/fslint/"; license = licenses.gpl2Plus; maintainers = [ maintainers.dasj19 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmtp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gmtp/default.nix index 5ed69e7bc6..c568afac31 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gmtp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gmtp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; + description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; homepage = "https://gmtp.sourceforge.io"; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 8b3ca1e2d8..001f3d1de4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.24"; + version = "1.0.27"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd"; + sha256 = "1sw56aqghfxh88mfchf0nvqld0x7w22jfwx13pd24slxv1iag1nb"; }; - vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; + vendorSha256 = "0d64gkkzfm6hbgqaibj26fpaqnjs50p1675ycrshdhn6blb5mbxg"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 37965fd6e3..72ebefb98e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.75.1"; + version = "0.76.5"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1c3l3q2xkibl1lz2mbvhgj94s6d9g5nakhpzj252s3m3cgk4w5wh"; + sha256 = "0p7zz9cif1vihhs21nvh4n3y1p2cwpga59rilpam7yvza4nzx7ay"; }; - vendorSha256 = "0gdd8fqd4mwg69wj8dxmm5wh1pjhdc189l2gy6njgpmwh93xbvdg"; + vendorSha256 = "0kiqy8n2df52gsgsbmr96rph8lpnw06g622123hlwk7kqg0z9ifh"; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - description = "A fast and modern static website engine."; + description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; maintainers = with maintainers; [ schneefux filalex77 Frostman ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix index 7b642dffa5..edcc5a58ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing."; + description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "http://shapeforge.loria.fr/icesl/index.html"; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix index e7600752ce..83a7aabaef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix @@ -32,7 +32,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; meta = with lib; { - description = "A simple and elegant markdown editor, available for Linux, macOS and Windows."; + description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; homepage = "https://marktext.app"; license = licenses.mit; maintainers = with maintainers; [ nh2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix index 1965a8ad5e..7553b078ef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4"; + sha256 = "1vrj8ad004h6jgmcb56f3f19s4xk6gvcpwysj78bxzgpa1998r3r"; }; - cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7"; + cargoSha256 = "0yifgcf2pfszzny523ax7pb9a5r3012nynbnhdqg0j1ia1pdymf3"; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix index 7682b56e4d..a9f12d572c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "A framework for controlling entertainment lighting equipment."; + description = "A framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = with maintainers; [ globin ]; license = with licenses; [ lgpl21 gpl2Plus ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix index e5838dc1bb..1c89333649 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/sembruk/osm2xmap"; - description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format."; + description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format"; license = licenses.gpl3; maintainers = [ maintainers.mpickering ]; platforms = with stdenv.lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 15dd7222b2..820048bdd6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; meta = with stdenv.lib; { - description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)."; + description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index 77a24413bd..b47d8feecf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc."; + description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; maintainers = [ maintainers.globin ]; license = licenses.asl20; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix index 1f0414838a..f681923978 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: +{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk xlibsWrapper makeWrapper]; + buildInputs = [ tcl tk xlibsWrapper makeWrapper ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix index 55ecd358c6..02559691f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Auto-suspend inactive X11 applications."; + description = "Auto-suspend inactive X11 applications"; homepage = "https://kernc.github.io/xsuspender/"; license = licenses.wtfpl; maintainers = with maintainers; [ offline ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix index c5489b8b98..805c708ea0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; + description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes"; license = licenses.gpl1; platforms = platforms.linux; maintainers = with maintainers; [ xurei ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix b/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix index afd9aa53ac..58d9d026f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - description = "C14 is designed for data archiving & long-term backups."; + description = "C14 is designed for data archiving & long-term backups"; homepage = "https://www.online.net/en/storage/c14-cold-storage"; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 96767f6365..47e2cc04b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.6.1"; + version = "2020.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb"; + sha256 = "1ssmyll13pf19fxq34iw4x7ps8p4mcg9nwlx00hp5sahhwx4iz01"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 72c3955f90..b370381b90 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.10.1"; + version = "2.11.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1k023rq4p0hvq5famxm83csp3zsijrki8myk6v83xyfigwxc8sia"; + sha256 = "0p72v6bb2hbw2xndrzr13zkc91i1jcd67x4qgai136hp9mv97bk3"; }; - vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz"; + vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix index a801a12237..93f5a85c33 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://docs.docker.com/machine/"; - description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; + description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index a9cdbf7907..d05b34cd7d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; - description = "HyperKit driver for docker-machine."; + description = "HyperKit driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; platforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 9352ba69da..024572ec3d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/dhiltgen/docker-machine-kvm"; - description = "KVM driver for docker-machine."; + description = "KVM driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 172370d25e..9ef43bed2e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://minikube.sigs.k8s.io/docs/drivers/kvm2"; - description = "KVM2 driver for docker-machine."; + description = "KVM2 driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 8c63a70b6d..a740d0486d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -31,7 +31,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve"; - description = "Xhyve driver for docker-machine."; + description = "Xhyve driver for docker-machine"; license = licenses.bsd3; maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 44e21de0a0..fe45b9ccb4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1a44lmrvi5f9jr04rblhcsg3zvqzvdp9wyw4m4h4scsqp5g7dfb7"; + sha256 = "007i6kb80142v19w2dm3667sskcvdp1ilg3q3f9gjgr9c5nrg1m2"; }; - vendorSha256 = "1yzh6iglrzd43yqs1b6qh1i62b6qaz3232lgxyg3gmc81p0i5kr0"; + vendorSha256 = "01v4x2mk5jglnigq0iic52f84vzx56zh46i7v2wlq8ninj8y1k0x"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 785a454fea..8cd9a230be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.130.1"; + version = "0.131.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "14k3281sxin4ki78f2v75nyky1jxyhyq5aw06mhdp0w5ql9b02m4"; + sha256 = "1jhmw916acf0i3wji0i1srni90n2rxax95y09h1zszpccw60x4bf"; }; - vendorSha256 = "1k3aamsm97w22pdip2916a5f619rvnif7s8g6815pzsapgnpp4qp"; + vendorSha256 = "1r94yc9b57jvpa2mhnla32nxa01rh9s7zf8qjgcpw63hm20mbbgc"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 5199bbfaf3..6fbec33180 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "JX is a command line tool for installing and using Jenkins X."; + description = "JX is a command line tool for installing and using Jenkins X"; homepage = "https://jenkins-x.io"; longDescription = '' Jenkins X provides automated CI+CD for Kubernetes with Preview diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index aed60bbfe8..ca0da973f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -150,7 +150,7 @@ let ''; meta = { - description = "The various binaries that get packaged into the final k3s binary."; + description = "The various binaries that get packaged into the final k3s binary"; license = licenses.asl20; homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; @@ -211,7 +211,7 @@ let ''; meta = { - description = "The k3s go binary which is used by the final wrapped output below."; + description = "The k3s go binary which is used by the final wrapped output below"; license = licenses.asl20; homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A lightweight Kubernetes distribution."; + description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index c365bf1e7a..575bc5a506 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { doCheck = false; meta = with stdenv.lib; { - description = "Kubernetes CLI To Manage Your Clusters In Style."; + description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih markus1189 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index a380cc200d..9b43f143bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1x4g45sq8licjcccvad6w1yb9h2z2cc2xbpp073j1pafnqwmrswq"; + sha256 = "0pk4j809hh4hkr58wx42vyzcn2g7l2lb60f4j1837hkk3rwrxkpm"; }; - vendorSha256 = "1vpljhqbvwv3a7k4c7p3n4ixh32f8hp9cqj8jz03mzqlmf60pyfs"; + vendorSha256 = "0c5ycyjhzz18ny544ddrag39la0fl0d3zrbbv8szb5jx87jx67jj"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index 0bd1967aec..51b53ed8fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "135ls3ngdz43qx6a49faczs2vdmccalsgak2hg0rairpy2jxym37"; + sha256 = "0h8v751jf8hws8zcai6vfsk5vmq6f9kwz2dg79l6xa0dfc2rv4zf"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 70aeb78415..63e4e59ff4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -18,7 +18,7 @@ buildGoModule { subPackages = [ "cli/cmd" ]; meta = with stdenv.lib; { - description = "A service mesh for Kubernetes and beyond."; + description = "A service mesh for Kubernetes and beyond"; homepage = "https://linkerd.io/"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 8cf4ba749f..0281a72113 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; + description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix index 977b71ebc5..0a28f9e074 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "A tool that converts RSS/Atom newsfeeds to email."; + description = "A tool that converts RSS/Atom newsfeeds to email"; homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; maintainers = with maintainers; [ jb55 Profpatsch ekleog ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index 1101d6f9b0..0aa2dbf889 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication."; + description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index a751501376..3b1fb255b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "An end-to-end encryption aware Matrix reverse proxy daemon."; + description = "An end-to-end encryption aware Matrix reverse proxy daemon"; homepage = "https://github.com/matrix-org/pantalaimon"; license = licenses.asl20; maintainers = with maintainers; [ valodim ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix index 23659e8a6c..b0819ade4f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client."; + description = "A glossy cross-platform Matrix client"; homepage = "https://spectral.im"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index d58e27cc62..f116bf1e86 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.16851"; + version = "1.3.00.25560"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3"; + sha256 = "0kpcd9q6v2qh0dzddykisdbi3djbxj2rl70wchlzrb6bx95hkzmc"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 26d8fb1aab..d3f5988b47 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Evolution connector for Microsoft Exchange Server protocols."; + description = "Evolution connector for Microsoft Exchange Server protocols"; homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; license = "LGPL-2.1-only OR LGPL-3.0-only"; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 maintainers = [ maintainers.dasj19 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix b/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix index dc52d76743..33d5a5f511 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN."; + description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix index b8c1991c88..44084daf9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Autonomous (self-hosted) BitTorrent DHT search engine suite."; + description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/boramalper/magnetico"; license = licenses.agpl3; badPlatforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix index ed44ff24fe..82480b1ed2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; platforms = platforms.linux; - description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router."; + description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router"; maintainers = with maintainers; [ makefu ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index 38ffb42aaf..c2d7fbd10b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -77,7 +77,7 @@ in python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "Linux GUI for ProtonVPN, written in Python."; + description = "Linux GUI for ProtonVPN, written in Python"; homepage = "https://github.com/ProtonVPN/linux-gui"; maintainers = with maintainers; [ offline ]; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix index 7a70375e42..3c4c0f0df3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation { dontStrip = true; meta = with stdenv.lib; { - description = "To Do List / Time Tracker with Jira Integration."; + description = "To Do List / Time Tracker with Jira Integration"; homepage = "https://super-productivity.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix b/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix index 6f5a3f3ec1..7b14224968 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://tsung.erlang-projects.org/"; - description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc."; + description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc"; longDescription = '' Tsung is a distributed load testing tool. It is protocol-independent and can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL, diff --git a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix index d4f08b141a..812218d0a3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A personnal accounting application."; + description = "A personnal accounting application"; longDescription = '' Grisbi is an application written by French developers, so it perfectly respects French accounting rules. Grisbi can manage multiple accounts, diff --git a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix index 9fccd574eb..2cc3e8eb92 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { checkPhase = "python3 ../run-tests"; meta = with stdenv.lib; { - description = " A personal tasks and TODO-list items organizer."; + description = " A personal tasks and TODO-list items organizer"; longDescription = '' "Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology. GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects. diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index b3538dd2b7..bb02c89486 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple tool to calculate the overall performance of an investment portfolio."; + description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix index c1e25ecb00..56f3cb7436 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix @@ -5,7 +5,10 @@ # For fixing up execution of /bin/ls, which is necessary for # product unlocking. -, coreutils +, coreutils, libredirect + + # Extra utilities used by the SoftMaker applications. +, gnugrep, utillinux, which , pname, version, edition, suiteName, src, archive @@ -52,7 +55,26 @@ in stdenv.mkDerivation { runHook postUnpack ''; - installPhase = '' + installPhase = let + # SoftMaker/FreeOffice collects some system information upon + # unlocking the product. But in doing so, it attempts to execute + # /bin/ls. If the execve syscall fails, the whole unlock + # procedure fails. This works around that by rewriting /bin/ls + # to the proper path. + # + # In addition, it expects some common utilities (which, whereis) + # to be in the path. + # + # SoftMaker Office restarts itself upon some operations, such + # changing the theme and unlocking. Unfortunately, we do not + # have control over its environment then and it will fail + # with an error. + extraWrapperArgs = '' + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep utillinux which ]}" + ''; + in '' runHook preInstall mkdir -p $out/share @@ -61,9 +83,12 @@ in stdenv.mkDerivation { # Wrap rather than symlinking, so that the programs can determine # their resource path. mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ + ${extraWrapperArgs} + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ + ${extraWrapperArgs} + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ + ${extraWrapperArgs} for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 3d577a8852..217f1fd85d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -1,7 +1,7 @@ { stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: let - description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; + description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; desktopItem = makeDesktopItem { name = "Trilium"; exec = "trilium"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix b/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix index 55703ea44d..5034d5fd93 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "NOAA APT image decoder."; + description = "NOAA APT image decoder"; homepage = "http://noaa-apt.mbernardi.com.ar/"; license = licenses.gpl3Only; maintainers = with maintainers; [ trepetti ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix index 332e06ea0c..f92e912f68 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} install"; meta = with stdenv.lib; { - description = "A powerful toolset for genome arithmetic."; + description = "A powerful toolset for genome arithmetic"; license = licenses.gpl2; homepage = "https://bedtools.readthedocs.io/en/latest/"; maintainers = with maintainers; [ jbedo ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index 1ce6357d2e..d0f98719fa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin mosdepth"; meta = with stdenv.lib; { - description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing."; + description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; license = licenses.mit; homepage = "https://github.com/brentp/mosdepth"; maintainers = with maintainers; [ jbedo ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix index c68fcfada3..941f107a58 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Genetic variant annotation and effect prediction toolbox."; + description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; homepage = "http://snpeff.sourceforge.net/"; maintainers = with maintainers; [ jbedo ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix index 247f99485b..360c6df7fe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "2-D post processing for PCB fabrication on CNC routers."; + description = "2-D post processing for PCB fabrication on CNC routers"; homepage = "https://bitbucket.org/jpcgt/flatcam"; license = licenses.mit; maintainers = with maintainers; [ trepetti ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 7bf45a8fc5..7290503311 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -197,13 +197,13 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" + "--set-default KISYSMOD ${footprints}/share/kicad/modules" + "--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set-default KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 32a75cabc1..eae2e384df 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.19.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v"; + sha256 = "1c7f2x6hdamjkr50761gcb5mg8hhlc75k1mf18vn1k9zsy1gxlgz"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix index 361b088466..52b05646a7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include/bliss - mv bliss $out/bin + mv bliss $out/bin mv html/* COPYING* $out/share/doc/bliss mv *.a $out/lib mv *.h *.hh $out/include/bliss ''; meta = with stdenv.lib; { - description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs."; + description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs"; homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix index 46cc32fa16..a76fe3a727 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://elmerfem.org/"; - description = "A finite element software for multiphysical problems."; + description = "A finite element software for multiphysical problems"; platforms = platforms.unix; maintainers = [ maintainers.wulfsta ]; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/scyther/default.nix b/third_party/nixpkgs/pkgs/applications/science/programming/scyther/default.nix index 5cfe081072..d1e948fe18 100644 --- a/third_party/nixpkgs/pkgs/applications/science/programming/scyther/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/programming/scyther/default.nix @@ -13,7 +13,7 @@ let }; meta = with lib; { - description = "Scyther is a tool for the automatic verification of security protocols."; + description = "Scyther is a tool for the automatic verification of security protocols"; homepage = "https://www.cs.ox.ac.uk/people/cas.cremers/scyther/"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index c354dad804..9c7166afc2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.19"; + version = "1.8.22"; src = fetchPypi { inherit pname version; - sha256 = "1rbq2nm01212rp5xbl8p8kjl2mpgfppkwjsq3lnfw1v6g0m4359h"; + sha256 = "87d7f9c0b8f4f1db3ce3521f67cd244fe3b89ffead797e92f35a7f71bbe8b958"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index 130ace63b4..e5d2f9f85d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -239,6 +239,8 @@ let transcrypt = callPackage ./transcrypt { }; + git-vanity-hash = callPackage ./git-vanity-hash { }; + ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff; } // lib.optionalAttrs (config.allowAliases or true) (with self; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix new file mode 100644 index 0000000000..839acc5cca --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "git-vanity-hash"; + version = "2020-02-26-unstable"; + + src = fetchFromGitHub { + owner = "prasmussen"; + repo = "git-vanity-hash"; + rev = "000004122124005af8d118a3f379bfc6ecc1e7c7"; + sha256 = "1wf342zawbphlzvji0yba0qg4f6v67h81nhxqcsir132jv397ma7"; + }; + + cargoSha256 = "0mbdis1kxmgj3wlgznr9bqf5yv0jwlj2f63gr5c99ja0ijccp99h"; + + postInstall = '' + mkdir -p $out/share/doc/git-vanity-hash + cp README.md $out/share/doc/git-vanity-hash + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/prasmussen/git-vanity-hash"; + description = "Tool for creating commit hashes with a specific prefix"; + license = [ licenses.mit ]; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix index faed3d25a8..2a0a97771c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/msiemens/PyGitUp"; - description = "A git pull replacement that rebases all local branches when pulling."; + description = "A git pull replacement that rebases all local branches when pulling"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index b6b9c7e566..0b9d29bd52 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.4.0"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "0sx3z9l9n9qq2zj91pgm7znhxjsj59zvwms3aivfglhawwj3iwyj"; + sha256 = "0ap5ih4s99c4ah95mcafqsvy4yhfqab6vg1c6ydzfa4czczgcxff"; }; - cargoSha256 = "0ykkh86p4csi0v3pb2idjk94w9m32a34a5qrvna7ml5yz84m8hva"; + cargoSha256 = "0vj7g2jhvd5d37rcq02hval9axpciwyqyd10z2a0bsvw0r4bh943"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix index ef61d518a1..8f77fdbe54 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows."; + description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows"; homepage = "https://sparkleshare.org"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ kevincox ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mkclean/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkclean/default.nix index 4a3cbc81b3..6bb1bcc5d8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkclean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkclean/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed."; + description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed"; homepage = "https://www.matroska.org"; license = licenses.bsdOriginal; maintainers = with maintainers; [ chrisaw ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix index f22ddd39ee..a250a365ac 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.7.1"; + version = "4.9.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ndi ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "040fkbf3f3qgqcrd3072y3zrjb4fwga8zr10jym744xd7bgyylqh"; + sha256 = "1y3xdqp55jayhg4sinwiwpk194zc4f4jf0abz647x2fprsk9jz7s"; }; patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; - maintainers = with maintainers; [ peti ]; + maintainers = with maintainers; [ peti jshcmpbll ]; license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index 993bdd67b0..16e6cd826e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/iwalton3/plex-mpv-shim"; - description = "Allows casting of videos to MPV via the Plex mobile and web app."; + description = "Allows casting of videos to MPV via the Plex mobile and web app"; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix index ef50dad86b..961cb403f1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix @@ -85,7 +85,7 @@ ''; meta = with stdenv.lib; { - description = "Streaming torrent app for Mac, Windows, and Linux."; + description = "Streaming torrent app for Mac, Windows, and Linux"; homepage = "https://webtorrent.io/desktop"; license = licenses.mit; maintainers = [ maintainers.flokli ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix index f4c2a53b7a..c91b1d31b9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/klaxalk/i3-layout-manager"; - description = "Saving, loading and managing layouts for i3wm."; + description = "Saving, loading and managing layouts for i3wm"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix index 9b9b2dea13..c71ed04e48 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { - description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; + description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; maintainers = with maintainers; [ ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix index fd46e29851..8e51dc1b84 100644 --- a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix @@ -30,7 +30,7 @@ let "Icon" = nullableToString icon; "Comment" = nullableToString comment; "Terminal" = nullableToString terminal; - "Name" = toString name; + "Name" = toString desktopName; "GenericName" = nullableToString genericName; "MimeType" = nullableToString mimeType; "Categories" = nullableToString categories; diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix index a5bc752c4c..3550facfc1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -19,7 +19,7 @@ fetchzip rec { ''; meta = with lib; { - description = "A bitmap programming font optimized for coziness."; + description = "A bitmap programming font optimized for coziness"; homepage = "https://github.com/slavfox/cozette"; license = licenses.mit; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix b/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix index e68f528ff3..272649582c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/eunomia/"; - description = "A futuristic decorative font."; + description = "A futuristic decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix b/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix index 175648198c..112111faa3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/${pname}/"; - description = "A weighted decorative font."; + description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix index fe40252ab2..3f122d22da 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/${pname}/"; - description = "A decorative font."; + description = "A decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.cc0; diff --git a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index c8d2d1c2a9..4222b802d5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -21,7 +21,7 @@ in fetchurl rec { sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; meta = { - description = "Pan-unicode version of Fixedsys, a classic DOS font."; + description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix index a66bd48c89..0530141317 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; meta = with lib; { - description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth."; + description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; homepage = "http://www.gust.org.pl/projects/e-foundry/lm-math"; # "The Latin Modern Math font is licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public diff --git a/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix index af6c00e32c..2f03dac391 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix @@ -18,7 +18,7 @@ in fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/vegur/"; - description = "A humanist sans serif font."; + description = "A humanist sans serif font"; platforms = platforms.all; maintainers = [ maintainers.samueldr ]; license = licenses.cc0; diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 3125df5fe1..2cbf1c5063 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "2020-08-09"; + version = "0.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "d32aacabcc018212c460833327e1b54a716a5a23"; - sha256 = "1f1ypxcvmd97afn7612i8gxmbrj80vx45vqrrh3n0p65jw5lg7zc"; + rev = version; + sha256 = "1lm7ws7in8cjjl38c7xw67jr42d717kk5kkfac7rprk0z7pb104l"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -a Luna* $out/share/icons for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme + gtk-update-icon-cache "$theme" done runHook postInstall diff --git a/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix b/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix index 48b538fe18..f51d2293a7 100644 --- a/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Contains a small database of Conway polynomials."; + description = "Contains a small database of Conway polynomials"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix b/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix index cda1a4e7d0..a62ff72db6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; - version = "1.22"; + version = "1.24"; src = fetchFromGitHub { owner = "monday15"; repo = pname; rev = version; - sha256 = "1y1wkfsv2zrxqcqr53lmr9743mvzcy4swi5j6sxmk1aykx6ccs1p"; + sha256 = "0ima0aa5j296xn4y0d1zj6vcdrdpnihqdidj7bncxzgbnli1vazs"; }; nativeBuildInputs = [ meson ninja sassc gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix b/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix index ecef868f28..066d122d44 100644 --- a/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.36-2"; + version = "3.36-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0w4il6rk1f8yjmdxpnzq6zll2jjqbyp9dckxhzxgs4zh8fy9pzvh"; + sha256 = "0haxzqxyfx3rc305w7f744fp2xb6j7yn28ldynnvmm47h7ga3as3"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic GTK, gnome shell and Xfce themes"; homepage = "https://github.com/lassekongo83/stilo-themes"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix index 0ba607524a..f8cb1a1c74 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k"; + sha256 = "0svybbrvpf6q955y6fclxh3md64z0dgmh0x54x2j60503hhs071m"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix index 421c999ea2..9df84b6b1e 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; meta = with stdenv.lib; { - description = "LXRandR is the standard screen manager of LXDE."; + description = "LXRandR is the standard screen manager of LXDE"; homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ rawkode ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/acme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/acme/default.nix index c5a997ad75..89c5620f5f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/acme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/acme/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A multi-platform cross assembler for 6502/6510/65816 CPUs."; + description = "A multi-platform cross assembler for 6502/6510/65816 CPUs"; homepage = "https://sourceforge.net/projects/acme-crossass/"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix index 18436bca34..6eb7d50bfc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix @@ -18,7 +18,7 @@ in }; }).overrideAttrs (attrs: { meta = with stdenv.lib; { - description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code."; + description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code"; homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; maintainers = with maintainers; [ turbomack gamb anmonteiro ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix index 4d24c78f25..67bc786e66 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make BACKEND=elf64 install prefix=$out ''; meta = with stdenv.lib; { - description = "Simple imperative language, statically typed with type inference and genericity."; + description = "Simple imperative language, statically typed with type inference and genericity"; homepage = "https://tibleiz.net/copper/"; license = licenses.bsd2; platforms = platforms.x86_64; diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix index 62bd0142f3..8e5f02e792 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "A design system for interactive fiction."; + description = "A design system for interactive fiction"; homepage = "http://inform7.com/"; license = licenses.artistic2; maintainers = with maintainers; [ mbbx6spp ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/0.7.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/0.7.nix deleted file mode 100644 index e0992d8000..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/0.7.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "0"; - minorVersion = "7"; - maintenanceVersion = "0"; - src_sha256 = "1j57569qm2ii8ddzsp08hds2navpk7acdz83kh27dvk44axhwj6f"; - - libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; - libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.1.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.1.nix deleted file mode 100644 index 5be34b4c4b..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.1.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "1"; - minorVersion = "1"; - maintenanceVersion = "1"; - src_sha256 = "1yqjd0n42xf9hzxpvc9vysyjj98p42by216jkdqakdy7dkjcmnhq"; - - libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60"; - libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix index 025652c749..d9ab475880 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ]; meta = { - description = "An open source implementation of Oz 3."; + description = "An open source implementation of Oz 3"; maintainers = [ lib.maintainers.layus ]; license = lib.licenses.bsd2; homepage = "https://mozart.github.io"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 72eee7ac81..0ec259b660 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -4,10 +4,10 @@ , boehmgc, sqlite, nim-unwrapped, nim }: let - version = "1.4.0"; + version = "1.2.6"; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "0rmisiipi7dxl7xc631jlp18bakz3dglhp9bygl2awf21c6b0cq0"; + sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index adb564f7cf..513f4d968f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -106,7 +106,7 @@ in makePackage { meta = with stdenv.lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; - description = "The next-generation Java client toolkit."; + description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix index 22b5be7dc6..51512c5afc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -108,7 +108,7 @@ in makePackage { meta = with stdenv.lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; - description = "The next-generation Java client toolkit."; + description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix index 0a52602390..3c1b2a0f91 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=${placeholder "out"}" "install" ]; meta = { - description = "A simple dependency manager for the Pony language."; + description = "A simple dependency manager for the Pony language"; homepage = "https://www.ponylang.org"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix index 9b06022706..cefa4537c3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Research platform for new language concepts and compiler technologies for Scala."; + description = "Research platform for new language concepts and compiler technologies for Scala"; longDescription = '' Dotty is a platform to try out new language concepts and compiler technologies for Scala. The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), diff --git a/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix index 6a0c7ded4b..23532cc844 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = "A collection of tools, libraries and tests for shader compilation."; + description = "A collection of tools, libraries and tests for shader compilation"; license = [ licenses.asl20 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix b/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix index cc4788e3ce..9bf6b3d287 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://x11-basic.sourceforge.net/"; - description = "A Basic interpreter and compiler with graphics capabilities."; + description = "A Basic interpreter and compiler with graphics capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix index 3e5273d632..b82b0b978f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "1d0412jw37gh1y7i8cmaml8r4sn516i6pxmm8m16yprqmz6glx28"; + sha256 = "1c9rbwb3ga8w7zi0ndqq02hjr4drdw8s509qxxd3fh5vfy6x3qi2"; }; dontUnpack = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A music programming language for musicians."; + description = "A music programming language for musicians"; homepage = "https://alda.io"; license = licenses.epl10; maintainers = [ maintainers.ericdallo ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix index 7f773882d8..2eb01b3764 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1yi9q8ibia6gz6s30i3bjrbmlhj6knrb3d73113dxrs8abi1mkbh"; + sha256 = "01mlizkflajad4759yl60ymibymrvanhc22jaffj50k9b77v97kq"; }; vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index 02aed6e892..abff21c798 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix @@ -9,7 +9,7 @@ racket.overrideAttrs (oldAttrs: rec { }; meta = oldAttrs.meta // { - description = "Racket without bundled packages, such as Dr. Racket."; + description = "Racket without bundled packages, such as Dr. Racket"; longDescription = ''The essential package racket-libs is included, as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index cbe628aaf4..b821faebde 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0998pyrxicpalm2w1wmv7qrfhzgr45kl6xh9gv0zxhx2a4xjqq5v"; + sha256 = "04483v9bw6wp831f34fn46zj54v9y7f6qqfmx85fjxhkr3rqk4i0"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index 60d6af9476..650c1d4ce4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "1q06fkfww8z8pcnhaqc4d2zi8hn620i9h9dmpnrfy3azalvizhkq"; + sha256 = "0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index cc1bb09d39..2898eb937f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.09"; + version = "20.10"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "097pdpd34aw420c46j6nrl5wdklgqrsznml0q2qxw1m7hrl7gkk6"; + sha256 = "0f5b45zdsy3yv2jsdy5zsd6xcfk1z5w5vlyvnim3d4bn875sp370"; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix index 0b0e0fd9e2..424aeb8637 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Memory Efficient Serialization Library."; + description = "Memory Efficient Serialization Library"; longDescription = '' FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix index 08450e5698..84594b8dbe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix @@ -18,20 +18,20 @@ let in stdenv.mkDerivation rec { pname = "galario"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "mtazzari"; repo = pname; rev = "v${version}"; - sha256 = "1akz7md7ly16a89zr880c265habakqdg9sj8iil90klqa0i21w6g"; + sha256 = "0dw88ga50x3jwyfgcarn4azlhiarggvdg262hilm7rbrvlpyvha0"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ fftw fftwFloat ] - ++ stdenv.lib.optional enablePython pythonPackages.python - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp + ++ stdenv.lib.optional enablePython pythonPackages.python + ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = stdenv.lib.optional enablePython [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = stdenv.lib.optional enablePython pythonPackages.scipy; + checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; preConfigure = '' mkdir -p build/external/src diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix index 62234651aa..4e8ce95737 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "gtest"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-cmake-config-includedir.patch + (fetchpatch { + name = "fix-pkgconfig-paths.patch"; + url = "https://github.com/google/googletest/commit/5126ff48d9ac54828d1947d1423a5ef2a8efee3b.patch"; + sha256 = "sha256-TBvECU/9nuvwjsCjWJP2b6DNy+FYnHIFZeuVW7g++JE="; + }) ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 83d901780c..90f6b4d49b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "Intel Media SDK."; + description = "Intel Media SDK"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jcal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jcal/default.nix index 8e7818bf4e..a40de74037 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jcal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jcal/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preAutoreconf = "cd sources/"; meta = with stdenv.lib; { - description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system."; + description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system"; homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 8635c1fb40..5e361a09d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; - description = "A C++ library for interacting with JSON."; + description = "A C++ library for interacting with JSON"; maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix index eec982aeeb..cc9018421f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { outputDoc = "dev"; meta = with stdenv.lib; { - description = "C++ dynamic ndarray library, with Python exposure."; + description = "C++ dynamic ndarray library, with Python exposure"; homepage = "http://libdynd.org"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix index 1b8aef201a..69918b5d36 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { homepage = "http://libipfix.sourceforge.net/"; - description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF."; + description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ lewo ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index ecec1e7949..6c4874112b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; - description = "C++ library for connecting to mysql servers."; + description = "C++ library for connecting to mysql servers"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix index d33782ad7e..268da3813e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; - description = "Userspace library providing interface to extended accounting infrastructure."; + description = "Userspace library providing interface to extended accounting infrastructure"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index dc3e5e30c7..0b36efa189 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -31,10 +31,6 @@ stdenv.mkDerivation rec { url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; }) - (fetchpatch { - url = "https://code.videolan.org/videolan/libplacebo/-/commit/82e3be1839379791b58e98eb049415b42888d5b0.patch"; - sha256 = "0nklj9gfiwkbbj6wfm1ck33hphaxrvzb84c4h2nfj88bapnlm90l"; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libroxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libroxml/default.nix index 3993451e19..b72ffb5b7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libroxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libroxml/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { homepage = "http://www.libroxml.net/"; - description = "This library is minimum, easy-to-use, C implementation for xml file parsing."; + description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ mpickering ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix index c009c78667..5cb19f863c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/andlabs/libui"; - description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; + description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix index 2c5bde316b..d7de5ff00f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more."; + description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix b/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix index c66329fa63..570588e22f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://mypaint.org/"; - description = "Brushes used by MyPaint and other software using libmypaint."; + description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix index 20caf6e577..d2fb8ed143 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://mypaint.org/"; - description = "Brushes used by MyPaint and other software using libmypaint."; + description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix deleted file mode 100644 index 5f8302aff3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, - libGL, libGLU, libXext, libXmu, libXi, darwin }: - -stdenv.mkDerivation rec { - pname = "opencascade-occt"; - version = "7.3.0p3"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - - src = fetchurl { - name = "occt-${commit}.tar.gz"; - url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; - }; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - meta = with stdenv.lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://www.opencascade.org/"; - license = licenses.lgpl21; # essentially... - # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt - # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky ]; - platforms = platforms.all; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix index d316250411..26d012e81e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango"; homepage = "https://sourceforge.net/projects/pangopdf"; platforms = platforms.unix; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix index 2059b4db7f..4fbf5df077 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data."; + description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; maintainers = with maintainers; [ nh2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix index ce56c46458..fb99816959 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/properties-cpp"; - description = "A very simple convenience library for handling properties and signals in C++11."; + description = "A very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix index a52b3608eb..6f2550ca9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications."; + description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "http://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix index a77c851ebc..3713bcf1df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/Samsung/rlottie"; - description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime."; + description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING platforms = platforms.all; maintainers = with maintainers; [ CRTified ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix index 4d98b12928..e55a72fb9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "SuperElastix"; repo = pname; rev = version; - sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; + sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; }; patches = [ (fetchpatch { - name = "itk-5.1-compat.patch"; - url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; - sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; - }) - (fetchpatch { - name = "fix-osx-build.patch"; - url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; - sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 + url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; + sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; }) ]; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk ]; + buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 90d7357cc0..2e85732f3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.2.10"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"; + sha256 = "1qg6ssp87rb8p37kahxmm88fbxqg6r540cky5v7wq7l19n2b1bss"; }; # FIXME package boost-test and enable checks diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index d7fae9ae47..c74a7408e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions."; + description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; homepage = http://itpp.sourceforge.net/; license = licenses.gpl3; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix index d711cd9fc8..47d4e68f65 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link."; + description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix index c553405878..28373605a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://taglib.org/"; repositories.git = "git://github.com/taglib/taglib.git"; - description = "A library for reading and editing audio file metadata."; + description = "A library for reading and editing audio file metadata"; longDescription = '' TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix index e54a4a40af..a4c9cb556b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vsqlite.virtuosic-bytes.com/"; - description = "C++ wrapper library for sqlite."; + description = "C++ wrapper library for sqlite"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix index 32f65c0925..8b8515261a 100644 --- a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "h3"; - version = "3.6.4"; + version = "3.7.1"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; rev = "v${version}"; - sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7"; + sha256 = "1ccyzbvbacf0bl9av4yp15zmhiqr3679nnbab11yrhxm9csyal16"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/default.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/default.nix index f0d1a3b89d..2ab285b173 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/default.nix @@ -13,7 +13,7 @@ bundlerApp { passthru.updateScript = toString ./update; meta = with lib; { - description = "CocoaPods manages dependencies for your Xcode projects."; + description = "CocoaPods manages dependencies for your Xcode projects"; homepage = "https://github.com/CocoaPods/CocoaPods"; license = licenses.mit; platforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 6e98f2f1e5..6243a735df 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -20,6 +20,7 @@ , "clean-css-cli" , "clubhouse-cli" , "coc-css" +, "coc-diagnostic" , "coc-emmet" , "coc-eslint" , "coc-git" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 3fbd984eb1..7736cbf947 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -328,13 +328,13 @@ let sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; }; }; - "@babel/core-7.12.1" = { + "@babel/core-7.12.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.1"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.1.tgz"; - sha512 = "6bGmltqzIJrinwRRdczQsMhruSi9Sqty9Te+/5hudn4Izx/JYRhW1QELpR+CIL0gC/c9A7WroH6FmkDGxmWx3w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"; + sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; }; }; "@babel/core-7.9.0" = { @@ -589,13 +589,13 @@ let sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; }; }; - "@babel/helper-wrap-function-7.10.4" = { + "@babel/helper-wrap-function-7.12.3" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.10.4"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; - sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; + sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; "@babel/helpers-7.12.1" = { @@ -616,13 +616,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.2" = { + "@babel/parser-7.12.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.2"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.2.tgz"; - sha512 = "LMN+SqTiZEonUw4hQA0A3zG8DnN0E1F4K107LbDDUnC+0chML1rvWgsHloC9weB4RmZweE0uhFq0eGX7Nr/PBQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; + sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -2056,22 +2056,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.147.0" = { + "@fluentui/react-7.147.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.147.0"; + version = "7.147.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.0.tgz"; - sha512 = "i7rUpUytr/futFBiSXtpg2bPRX60AYcudRx/KpQ3dKkboR+OVdSzETMtS4ljUt4DzU/DuBo981CzJKWPj9khig=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.1.tgz"; + sha512 = "Zk3MygGDVEHrgKi1M12ETozWRxQ0Go8O9RP/mXqWQUHcXK++KfAO6xJZTpMKQ9o18Sb/ZQwjIrYPpYc6JwuyfA=="; }; }; - "@fluentui/react-focus-7.16.12" = { + "@fluentui/react-focus-7.16.13" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.12"; + version = "7.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.12.tgz"; - sha512 = "i8UYrysWU6T3mVqYdGyjpNpZ9OXNKu8+hyRHie29d3r1HKmt01Sy7wBbOlGqqkozuVAC5XcqPbXhgrQabc1ZtA=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.13.tgz"; + sha512 = "MWyI64GSEZigYe75aCy8VGGIr/tWwk+H8oqPxamoVOHef4kCqYm/70mhrDpBP1oAhJVmdY/Lia6dtkIz3J9wgw=="; }; }; "@fluentui/react-window-provider-0.3.3" = { @@ -2083,13 +2083,13 @@ let sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; }; }; - "@fluentui/theme-1.5.0" = { + "@fluentui/theme-1.5.1" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.0.tgz"; - sha512 = "44/1JAnFxuXt8ZfVa3VXdDOvzcdXYA0DbGrRLDMFa8ZiQMhcN6/Y5mUwBRPEuE3sLkGHL39hQ0Vw3EVeH7TYlg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.1.tgz"; + sha512 = "w5986/CN3hWuH44WmlQNxtndBx0khnb1xjISb/4bktRpehYxIlDBmQYRUOUYXr6zwdK7JXJaJPGjOJzSh2DCDg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -3307,13 +3307,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.113" = { + "@microsoft/load-themed-styles-1.10.114" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.113"; + version = "1.10.114"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.113.tgz"; - sha512 = "33AgF552U+tpwavHsMEY6E196p4kBopTRLndctbO0jxbAC0qU43qYPt7kMqVSBPSZjEA1dGveHNKUhoIFfZqwQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.114.tgz"; + sha512 = "baefCOffrEAN86rNBY5uVFt1hEH3DMhMVqeKwmbf1L0u51r0KhvMCdQVS9YRi4VHbiufiea2g7vlFf51RDatkQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -6070,22 +6070,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.13" = { + "@uifabric/foundation-7.9.14" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.13"; + version = "7.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.13.tgz"; - sha512 = "XVIniUkMAomET81VI1QCMHbtIzD/w2DTv3IspwTKpuvD1rswtRF07yMinyCLcd2of2crYAC1V5vWsz90QqAKjg=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.14.tgz"; + sha512 = "AWsSt28+mid44YPofHB8N1nm4C0QmLJ9WXFps5GyjaBHES6/4bfJ7rKzYioa5bN0TxElyK8rRHzwqKNQhWDBYA=="; }; }; - "@uifabric/icons-7.5.11" = { + "@uifabric/icons-7.5.12" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.11"; + version = "7.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.11.tgz"; - sha512 = "htUsBpAsE2AoC1I/ijBVnpHZXAmFl12o4I0WILOONNK6ruhHERu/eg/0eCBv6T0hvcoa13vuTLiuj8RBrDFh2g=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.12.tgz"; + sha512 = "VIqj4oMwi4HJPqH3+3RblLoYjPfYzjVyZ8Kk57dmA7tj+vbM38Zn9vObe+Xg/EVEfohD3kD0fyEqPmnEqY17Pg=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6115,13 +6115,13 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.12" = { + "@uifabric/styling-7.16.13" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.12"; + version = "7.16.13"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.12.tgz"; - sha512 = "0TH6nz4ozJte7mp/rDlKI9IjDf5riFe6aKuDg3DDLshyCihBmn6VRF2geVhD7basxk/py/COKJROHZkP4T9ioQ=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.13.tgz"; + sha512 = "jj5FH7XuQXz8HgRhCXNApeUAynDBv2nfmTpzHawE55x7YR+oliQfsJSY8Ow4YbLAazIR5BuW1n9eKuGxxmIw1w=="; }; }; "@uifabric/utilities-7.32.4" = { @@ -6142,6 +6142,15 @@ let sha512 = "CAqefTFAfnUPwYqsWHXpOxHaq1Zo5UQ3m9Zm2p09LggGe57rqHoBn3c++xcoomzXKynAUuiBMDUCQvKMnXjUpA=="; }; }; + "@ungap/promise-all-settled-1.1.2" = { + name = "_at_ungap_slash_promise-all-settled"; + packageName = "@ungap/promise-all-settled"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; + }; + }; "@vue/cli-shared-utils-4.5.7" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -6961,13 +6970,13 @@ let sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; }; }; - "abstract-logging-2.0.0" = { + "abstract-logging-2.0.1" = { name = "abstract-logging"; packageName = "abstract-logging"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.0.tgz"; - sha512 = "/oA9z7JszpIioo6J6dB79LVUgJ3eD3cxkAmdCkvWWS+Y9tPtALs1rLqOekLUXUbYqM2fB9TTK0ibAyZJJOP/CA=="; + url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz"; + sha512 = "2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA=="; }; }; "abstract-random-access-1.1.2" = { @@ -8860,15 +8869,6 @@ let sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; }; }; - "array.prototype.map-1.0.2" = { - name = "array.prototype.map"; - packageName = "array.prototype.map"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz"; - sha512 = "Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw=="; - }; - }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -12082,6 +12082,15 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; + "camelcase-6.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz"; + sha512 = "WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -16547,6 +16556,15 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; + "debug-4.2.0" = { + name = "debug"; + packageName = "debug"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + }; + }; "debug-4.3.0" = { name = "debug"; packageName = "debug"; @@ -17573,13 +17591,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.13" = { + "diff2html-3.1.14" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.13"; + version = "3.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.13.tgz"; - sha512 = "Gs4NbtynANYqkPbbGqZN6zwWJq6JofAb5it76xnEUTpFjWJndaCCjFVUoD7yFjEPB36MtwTtT/ptWcKyD9Vw9g=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.14.tgz"; + sha512 = "Qot+l+v+aqGcuvJe1C8ZPev17deSyg+DOwICF3m8Ka/C3af1K2Wh2WENYulxv9CQyVhy2VarluR5fMfN5BEHIg=="; }; }; "diff3-0.0.3" = { @@ -18987,6 +19005,15 @@ let sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; }; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + }; + }; "env-ci-3.2.2" = { name = "env-ci"; packageName = "env-ci"; @@ -19158,15 +19185,6 @@ let sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; }; }; - "es-array-method-boxes-properly-1.0.0" = { - name = "es-array-method-boxes-properly"; - packageName = "es-array-method-boxes-properly"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; - sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; - }; - }; "es-get-iterator-1.1.0" = { name = "es-get-iterator"; packageName = "es-get-iterator"; @@ -25000,13 +25018,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "htmlnano-0.2.6" = { + "htmlnano-0.2.7" = { name = "htmlnano"; packageName = "htmlnano"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.6.tgz"; - sha512 = "HUY/99maFsWX2LRoGJpZ/8QRLCkyY0UU1El3wgLLFAHQlD3mCxCJJNcWJk5SBqaU49MLhIWVDW6cGBeuemvaPQ=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.7.tgz"; + sha512 = "ozbK3npguK3MTn77WCKngBtCDhc94fmEptPQsn+dO+uIWoEghIMKsjzCMnDJuu403M01ePg9GA5MpXhRBQ3PVg=="; }; }; "htmlparser2-3.10.1" = { @@ -28025,24 +28043,6 @@ let sha512 = "RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q=="; }; }; - "iterate-iterator-1.0.1" = { - name = "iterate-iterator"; - packageName = "iterate-iterator"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz"; - sha512 = "3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw=="; - }; - }; - "iterate-value-1.0.2" = { - name = "iterate-value"; - packageName = "iterate-value"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz"; - sha512 = "A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ=="; - }; - }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -34083,13 +34083,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.1.3" = { + "mocha-8.2.0" = { name = "mocha"; packageName = "mocha"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; - sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz"; + sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw=="; }; }; "mock-require-3.0.3" = { @@ -34839,6 +34839,15 @@ let sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; }; }; + "nanoid-3.1.12" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; + sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + }; + }; "nanolru-1.0.0" = { name = "nanolru"; packageName = "nanolru"; @@ -35615,13 +35624,13 @@ let sha512 = "WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw=="; }; }; - "node-gyp-7.1.1" = { + "node-gyp-7.1.2" = { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.1.tgz"; - sha512 = "+7TqukzQVlne5EcLrw0Cdm8S26OC4H2mTb5wji4HlsocgB6a9aYHgqlKLKxRMlH/PWNyVQjyRjFhiet7+QZefA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; + sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; }; "node-gyp-build-3.7.0" = { @@ -36038,15 +36047,6 @@ let sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; - "normalize-html-whitespace-1.0.0" = { - name = "normalize-html-whitespace"; - packageName = "normalize-html-whitespace"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz"; - sha512 = "9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA=="; - }; - }; "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -36939,13 +36939,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.147.0" = { + "office-ui-fabric-react-7.147.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.147.0"; + version = "7.147.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.0.tgz"; - sha512 = "hCdHsBLAcq+Uj2SQ+P35gp/O7TRvf/Q0LQ46uklAPS+71WrsMIu/0jzj/e7dSzuLySE2TtiozwFKfD2Byf7bZw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.1.tgz"; + sha512 = "nG3h14lvWoTqcO8wxabIDozw84vV0ZtoUvDe6g8QEKsG1oRHaDe8WhCkCy8XCPnsy7f/5aItlbum7AyZtKdgBQ=="; }; }; "omggif-1.0.10" = { @@ -41161,15 +41161,6 @@ let sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; }; }; - "promise.allsettled-1.0.2" = { - name = "promise.allsettled"; - packageName = "promise.allsettled"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz"; - sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; - }; - }; "promise.prototype.finally-3.1.2" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; @@ -49198,15 +49189,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strip-json-comments-3.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; - }; - }; "strip-json-comments-3.1.0" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -49576,15 +49558,6 @@ let sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; - "supports-color-7.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -56156,13 +56129,13 @@ let sha512 = "P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg=="; }; }; - "workerpool-6.0.0" = { + "workerpool-6.0.2" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz"; - sha512 = "fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; + sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; }; }; "wrap-ansi-2.1.0" = { @@ -57255,13 +57228,13 @@ let sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; }; }; - "yargs-unparser-1.6.1" = { + "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; - version = "1.6.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz"; - sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; "yarn-1.22.10" = { @@ -59149,7 +59122,7 @@ in sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."@babel/generator-7.12.1" sources."@babel/types-7.12.1" @@ -59228,14 +59201,14 @@ in }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" (sources."@babel/helpers-7.12.1" // { dependencies = [ sources."@babel/types-7.12.1" ]; }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -59908,7 +59881,7 @@ in sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."env-ci-3.2.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" @@ -61096,7 +61069,7 @@ in sources."@babel/generator-7.12.1" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/template-7.10.4" sources."@babel/types-7.12.1" sources."@webassemblyjs/ast-1.9.1" @@ -61178,7 +61151,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -61200,7 +61173,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.1" sources."@babel/types-7.12.1" @@ -62401,6 +62374,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-diagnostic = nodeEnv.buildNodePackage { + name = "coc-diagnostic"; + packageName = "coc-diagnostic"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.9.0.tgz"; + sha512 = "p64cBvczMAK7JWAjZYAsvCiXAySybq32wWwKSdJx4hNn+jX8clwUmkbnhYaYfejyvz7fBzFTgMdbmOGOH4/DqA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "diagnostic-languageserver extension for coc.nvim"; + homepage = "https://github.com/iamcco/coc-diagnostic#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-emmet = nodeEnv.buildNodePackage { name = "coc-emmet"; packageName = "coc-emmet"; @@ -62977,7 +62968,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -63902,7 +63893,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" @@ -63920,7 +63911,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.1" sources."@babel/types-7.12.1" @@ -63983,7 +63974,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -67829,7 +67820,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" @@ -67847,7 +67838,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -68179,10 +68170,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.147.0" - sources."@fluentui/react-focus-7.16.12" + sources."@fluentui/react-7.147.1" + sources."@fluentui/react-focus-7.16.13" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.5.0" + sources."@fluentui/theme-1.5.1" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -68194,7 +68185,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.113" + sources."@microsoft/load-themed-styles-1.10.114" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -68235,12 +68226,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.13" - sources."@uifabric/icons-7.5.11" + sources."@uifabric/foundation-7.9.14" + sources."@uifabric/icons-7.5.12" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.6" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.12" + sources."@uifabric/styling-7.16.13" sources."@uifabric/utilities-7.32.4" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -69157,7 +69148,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.147.0" + sources."office-ui-fabric-react-7.147.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70085,14 +70076,14 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -71000,7 +70991,7 @@ in sources."memory-fs-0.5.0" ]; }) - sources."entities-2.0.3" + sources."entities-2.1.0" sources."env-editor-0.4.1" sources."env-paths-2.2.0" sources."envinfo-7.5.0" @@ -71598,7 +71589,7 @@ in sources."no-case-3.0.3" sources."node-fetch-2.6.1" sources."node-forge-0.7.6" - (sources."node-gyp-7.1.1" // { + (sources."node-gyp-7.1.2" // { dependencies = [ sources."rimraf-3.0.2" sources."semver-7.3.2" @@ -72088,7 +72079,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -77395,7 +77386,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -77522,7 +77513,7 @@ in sources."domelementtype-2.0.2" sources."domhandler-3.3.0" sources."domutils-2.4.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."http-errors-1.8.0" @@ -78140,7 +78131,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -78193,7 +78184,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -81100,7 +81091,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" @@ -81125,14 +81116,14 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" @@ -82720,10 +82711,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.1"; + version = "8.8.2-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.1.tgz"; - sha512 = "cESM33+QjLuHUcMk9B2qpsplx4h+97adwI/P0/2SvFwFlhVsFfi82a53vV1638hIBLac+RxGG2aT+Fq8YYHHRQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.2-beta.8.tgz"; + sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g=="; }; dependencies = [ sources."@types/node-14.11.10" @@ -82809,19 +82800,19 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.147.0" - sources."@fluentui/react-focus-7.16.12" + sources."@fluentui/react-7.147.1" + sources."@fluentui/react-focus-7.16.13" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.5.0" - sources."@microsoft/load-themed-styles-1.10.113" + sources."@fluentui/theme-1.5.1" + sources."@microsoft/load-themed-styles-1.10.114" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.13" - sources."@uifabric/icons-7.5.11" + sources."@uifabric/foundation-7.9.14" + sources."@uifabric/icons-7.5.12" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.6" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.12" + sources."@uifabric/styling-7.16.13" sources."@uifabric/utilities-7.32.4" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -82948,7 +82939,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.147.0" + sources."office-ui-fabric-react-7.147.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -83078,18 +83069,18 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; - sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz"; + sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw=="; }; dependencies = [ + sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."argparse-1.0.10" - sources."array.prototype.map-1.0.2" sources."balanced-match-1.0.0" sources."binary-extensions-2.1.0" sources."brace-expansion-1.1.11" @@ -83097,7 +83088,7 @@ in sources."browser-stdout-1.3.1" sources."camelcase-5.3.1" sources."chalk-4.1.0" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83108,67 +83099,39 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-4.1.1" + sources."debug-4.2.0" sources."decamelize-1.2.0" - sources."define-properties-1.1.3" sources."diff-4.0.2" sources."emoji-regex-7.0.3" - (sources."es-abstract-1.17.7" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.1" - ]; - }) - sources."es-array-method-boxes-properly-1.0.0" - sources."es-get-iterator-1.1.0" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-4.1.1" + sources."flat-5.0.2" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" - sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."growl-1.10.5" - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.1" sources."he-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-map-2.0.1" - sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" - sources."is-regex-1.1.1" - sources."is-set-2.0.1" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."isarray-2.0.5" + sources."is-plain-obj-2.1.0" sources."isexe-2.0.0" - sources."iterate-iterator-1.0.1" - sources."iterate-value-1.0.2" sources."js-yaml-3.14.0" sources."locate-path-6.0.0" sources."log-symbols-4.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" + sources."nanoid-3.1.12" sources."normalize-path-3.0.0" - sources."object-inspect-1.8.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" sources."once-1.4.0" sources."p-limit-3.0.2" sources."p-locate-5.0.0" @@ -83176,26 +83139,23 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" - sources."promise.allsettled-1.0.2" sources."randombytes-2.1.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.1" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" - sources."strip-json-comments-3.0.1" - sources."supports-color-7.1.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."which-2.0.2" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."workerpool-6.0.0" + sources."workerpool-6.0.2" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83221,18 +83181,10 @@ in ]; }) sources."yargs-parser-13.1.2" - (sources."yargs-unparser-1.6.1" // { + (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."yargs-14.2.3" - sources."yargs-parser-15.0.1" + sources."camelcase-6.1.0" + sources."decamelize-4.0.0" ]; }) ]; @@ -83381,7 +83333,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."semver-5.7.1" ]; @@ -83414,10 +83366,10 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -85224,10 +85176,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.1.tgz"; - sha512 = "+7TqukzQVlne5EcLrw0Cdm8S26OC4H2mTb5wji4HlsocgB6a9aYHgqlKLKxRMlH/PWNyVQjyRjFhiet7+QZefA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; + sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -86819,7 +86771,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."node-gyp-7.1.1" + sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" @@ -87167,7 +87119,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - (sources."@babel/core-7.12.1" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" @@ -87203,10 +87155,10 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -87511,7 +87463,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.2" - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."domain-browser-1.2.0" @@ -87623,7 +87575,7 @@ in sources."html-comment-regex-1.1.2" sources."html-encoding-sniffer-1.0.2" sources."html-tags-1.2.0" - (sources."htmlnano-0.2.6" // { + (sources."htmlnano-0.2.7" // { dependencies = [ sources."posthtml-0.13.4" sources."posthtml-parser-0.5.0" @@ -87775,7 +87727,6 @@ in ]; }) sources."node-releases-1.1.63" - sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -87938,6 +87889,7 @@ in sources."jsesc-0.5.0" ]; }) + sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -90448,7 +90400,7 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.1" @@ -90907,6 +90859,7 @@ in ]; }) sources."@typescript-eslint/visitor-keys-3.10.1" + sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."agent-base-4.3.0" @@ -90916,7 +90869,6 @@ in sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" - sources."array.prototype.map-1.0.2" sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" @@ -90940,7 +90892,7 @@ in ]; }) sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -90962,7 +90914,6 @@ in sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" sources."diff-4.0.2" @@ -90979,15 +90930,6 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."entities-1.1.2" - (sources."es-abstract-1.17.7" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.1" - ]; - }) - sources."es-array-method-boxes-properly-1.0.0" - sources."es-get-iterator-1.1.0" - sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -91022,22 +90964,19 @@ in sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-4.1.1" + sources."flat-5.0.2" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."growl-1.10.5" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" sources."he-1.2.0" sources."htmlparser2-3.10.1" (sources."http-proxy-agent-2.1.0" // { @@ -91056,28 +90995,15 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-map-2.0.1" sources."is-module-1.0.0" - sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" + sources."is-plain-obj-2.1.0" sources."is-reference-1.2.1" - sources."is-regex-1.1.1" - sources."is-set-2.0.1" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."iterate-iterator-1.0.1" - sources."iterate-value-1.0.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" @@ -91102,24 +91028,21 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.1.3" // { + (sources."mocha-8.2.0" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.2.0" sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."strip-json-comments-3.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."nanoid-3.1.12" sources."natural-compare-1.4.0" sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-1.0.2" - sources."object-inspect-1.8.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" sources."once-1.4.0" sources."optionator-0.9.1" sources."os-0.1.1" @@ -91144,13 +91067,12 @@ in sources."picomatch-2.2.2" sources."prelude-ls-1.2.1" sources."progress-2.0.3" - sources."promise.allsettled-1.0.2" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -91160,7 +91082,7 @@ in sources."rollup-2.32.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -91174,8 +91096,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" @@ -91224,7 +91144,7 @@ in ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.0.0" + sources."workerpool-6.0.2" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -91245,15 +91165,10 @@ in ]; }) sources."yargs-parser-13.1.2" - (sources."yargs-unparser-1.6.1" // { + (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."yargs-14.2.3" - sources."yargs-parser-15.0.1" + sources."camelcase-6.1.0" + sources."decamelize-4.0.0" ]; }) sources."yauzl-2.10.0" @@ -95632,7 +95547,7 @@ in }) sources."domelementtype-1.3.1" sources."domutils-1.7.0" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -97615,7 +97530,7 @@ in sources."@types/node-14.11.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."abstract-logging-2.0.0" + sources."abstract-logging-2.0.1" sources."accepts-1.3.7" sources."after-0.8.2" (sources."agent-base-6.0.1" // { @@ -98640,7 +98555,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.13" + sources."diff2html-3.1.14" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -102373,7 +102288,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.1" - sources."@babel/core-7.12.1" + sources."@babel/core-7.12.3" sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" @@ -102398,10 +102313,10 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.2" + sources."@babel/parser-7.12.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix index cc2b681e41..ce32e42e47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix @@ -68,7 +68,9 @@ in buildPythonPackage rec { --replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')' ''; - preCheck = '' + # needs to be postFixup so it runs before pythonImportsCheck even when + # doCheck = false (meaning preCheck would be disabled) + postFixup = '' mkdir -p check-phase export HOME=$(pwd)/check-phase ''; @@ -81,6 +83,8 @@ in buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; + pythonImportsCheck = [ "theano" ]; + meta = with stdenv.lib; { homepage = "http://deeplearning.net/software/theano/"; description = "A Python library for large-scale array computation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix new file mode 100644 index 0000000000..ed6dcb5437 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -0,0 +1,28 @@ +{ aiohttp, buildPythonPackage, fetchFromGitHub, lib, pytest, pytestCheckHook +, pytestcov, pytestrunner, pytest-asyncio, python, pythonOlder }: + +buildPythonPackage rec { + pname = "accuweather"; + version = "0.0.11"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "1sgbw9yldf81phwx6pbvqg9sp767whxymyj0ca9pwx1r6ipr080h"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ aiohttp ]; + checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + + meta = with lib; { + description = + "Python wrapper for getting weather data from AccuWeather servers."; + homepage = "https://github.com/bieniu/accuweather"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix index b83da06c48..c6cfe99297 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.5.2"; + version = "0.6.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiokafka"; rev = "v${version}"; - sha256 = "062kqsq75fi5pbpqf2a8nxm43pxpr6bwplg6bp4nv2a68r850pki"; + sha256 = "1l5nkz9blmfrbsj7m76vm8vcfdgvab33anzpq62384scp9yf8dln"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix new file mode 100644 index 0000000000..4616e1b6ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aubio"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0fhxikvlr010nbh02g455d5y8bq6j5yw180cdh4gsd0hb43y3z26"; + }; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "aubio" ]; + + meta = with lib; { + description = "a library for audio and music analysis"; + homepage = "https://aubio.org"; + license = licenses.gpl3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index e4ee9c9051..dd80641a48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.21.0"; + version = "0.22.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7bf7a41d2e42532a00b5f41d3fc0512244451a35f038ac0a25c96ef2c5c04300"; + sha256 = "01c82a1559f49e5f51021b8fbd35e738e08cbede1f39cf00da8085c853575f39"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 6a429a056f..ee66162722 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7448a322eceed3d300e181fde0f626c0e37df773f6c7297df2b73d98cb0936cf"; + sha256 = "37f570b8872ae65dce312da116588ab8407a5c8a10d959597e61d19b21799f77"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index bcf45aff83..f97fffe93f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.6"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "b8292f4efb3617532f93c60acfec242150406bfd9e298d7f01187d67c311aa91"; + sha256 = "ef9476ded8226c86fe1d6e6b9f380666ada7a0f4ae39bd5afd7eabbbc6979ab7"; }; # needs packages which are not available in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix index 00d554ef14..cfb30a926d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.6"; + version = "1.0.7"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "07i1j3y04w2jwylff8w1aimmy4fj1g42wq8iz83an7dl4cz3rap9"; + sha256 = "0bg33nilybh46s6yz3x7a7x8biwbvy5scqdrl4didhn7vjd4w5fn"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index adae7ff1c3..a2c41599b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -1,17 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , six , webob }: buildPythonPackage rec { pname = "bugsnag"; - version = "3.7.1"; + version = "4.0.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "32966bfe625ec6fc0dbc9d86d79a18f31b22b2fdec3ca070eeb3495304f7e18d"; + sha256 = "01c2186f6c2a6f801b66d8fc73b8986bd2d4931a6ab40b720e5fd0b66757facc"; }; propagatedBuildInputs = [ six webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix index cecb41c3d8..440e43cf81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.0.0"; + version = "8.0.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "cddc298301789c724de5817611f7bd38b4859b371928e2e85a9c37af222f73c8"; + sha256 = "f10ada7f821a325c6befdd6fef1cac44ebc830736d0b75dda7b8ac9f851087b2"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 5fa42c861e..3ae2142181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -73,19 +73,26 @@ buildPythonPackage rec { --replace "PyYAML~=5.3" "PyYAML" ''; - # test_html is very slow - # test_black fails on darwin - dontUseSetuptoolsCheck = true; + # takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews + # with pytest-xdist, it still takes around 10mins with 32 cores + # just run the messages tests, as this should give some indictation of correctness pytestFlagsArray = [ - "--ignore=tests/test_html.py" - "--ignore=tests/test_docs.py" - "--ignore=tests/test_black.py" + "tests/test_messages.py" ]; disabledTests = [ "facet" "_invalid_database" # checks error message when connecting to invalid database ]; - pythonImportsCheck = [ "datasette" ]; + + pythonImportsCheck = [ + "datasette" + "datasette.cli" + "datasette.app" + "datasette.database" + "datasette.renderer" + "datasette.tracer" + "datasette.plugins" + ]; meta = with lib; { description = "An instant JSON API for your SQLite databases"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix index dec6fc2dad..9f5cb744e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.37"; + version = "0.1.38"; src = fetchPypi { inherit pname version; - sha256 = "ab04f535155810c46c8abf3f7d46364b67b034c49ff8690cdb510092eee56750"; + sha256 = "a352bb5f9ef19b0272078f516ee0ec42b05e90ac85651d87c10e7041550dcc1d"; }; propagatedBuildInputs = [ chardet six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix index 9f96c7644d..ab9d9493fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "3.0.1"; + version = "4.0.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "13768c8bc755dd8e1184ce79b95bbc8115ea566282f4b06efbeca72a4d00427b"; + sha256 = "61a98ec126552d985c0e3e3c33cc72e79d7577f91f6edba99f635411a173d3b9"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix new file mode 100644 index 0000000000..a542b58056 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fastprogress"; + version = "1.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; + }; + + propagatedBuildInputs = [ numpy ]; + + # no real tests + doCheck = false; + pythonImportsCheck = [ "fastprogress" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/fastai/fastprogress"; + description = "Simple and flexible progress bar for Jupyter Notebook and console"; + license = licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix index efc52657fd..a5d349456f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "dfe02fc0a77a4e28144c46d441553352d81498ffd8f49906b57342d06c7f5b54"; + sha256 = "d8a56919a3a32c7271d1253542ec24cb13f384a726fed354fdeb2a2269f25d1c"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix index 5bd95004f9..37bfbfc481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "FzrMa63hSApSn6KcbCcXVDri3AnULpRh/bhvOVAu/PI="; + sha256 = "dcdab13e95bc534d268f87d5293e482cce5bc86dfce6ca0f2e2e89cbb73ef38c"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 796ddaace8..287216cc94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.13.3"; + version = "1.13.4"; src = fetchPypi { inherit pname version; - sha256 = "e6753651a8598f21fc2c20e8456865ecec276cfea1519182a76d957506727934"; + sha256 = "34dc09dfb557f79515a011a72b343daf31b5e5d67403a008dded59bab658267c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index a4f1ab6b77..5b8cb6cecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.5"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "8e4d048ae7ca6182d648f62a66d07360cca2504fe46649c32748b6ef2735f7f4"; + sha256 = "09362f7390119dffd83c61a942801ad4d19aee499340ef7e8d5871167391d3d6"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index b9134ef16e..3385e5bfc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.5.5"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"; + sha256 = "969d844b7a85d32a5f9ac4e163df6e846d73c87c8b75847494ee8f4bd2186421"; }; # Tests not included in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index e37f5bc7e6..cc74076b6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { - description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; + description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; homepage = "https://github.com/kellyjonbrazil/jc"; license = licenses.mit; maintainers = with maintainers; [ atemu ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index 95dac53c97..27b2e94877 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "2.3.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "bd1817be401e74c0d8b049e97ea2f35d2ce155cfa130119ce4195ea207bd6388"; + sha256 = "05f5b358469a679dbf27521d926750ca53ff1e61a6c0293d49af30094ebd9d4a"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix index 6f3a8b8924..91f7ecf966 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix @@ -1,9 +1,11 @@ { buildPythonPackage , fetchPypi , lib +, isPy27 # pythonPackages , msal +, pathlib2 , portalocker }: @@ -19,6 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ msal portalocker + ] ++ lib.optionals isPy27 [ + pathlib2 ]; # No tests found diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index a75560e3b5..eae7eadb7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "51b8e8e0d918d9b4813f006324e7c4e21eb76268dd4c1a06d811a3475ad4ac57"; + sha256 = "cc67d3a14850ba7e533ec5d05a4c23a34dd74a7fa5e0210daebef397b2009b0e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix index 08f482e622..9bc8f89157 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200726"; + version = "20201018"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z"; + sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr"; }; propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 8693901c93..e4cb59f5b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.10"; + version = "8.12.11"; src = fetchPypi { inherit pname version; - sha256 = "d6e108352e7113c55cf0d92f8aede876a379580e46a3b9c2e779dc3601f11863"; + sha256 = "17f39f06c1e0e20eabe69ff735b1c08e4547d12a12595da3d835fd3256a9ee0c"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index b476543c06..1a768b7cf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.7.1"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c"; + sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix index 8a788402b4..6fe2245385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchPypi , lml +, isPy3k }: buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.5.20"; + version = "0.6.3"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk="; + sha256 = "8fb7a201eb3e5763bb8f9d6e096ceed9e5f1baecd784c9fadbe0fb3d59174c0e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix index 9e5b32ea86..b923932ec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyexcel-ods"; - version = "0.5.6"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM="; + sha256 = "f61b56515fd4ccd4687f0a112422f74ce8535247ad2da49db90038d7e3ed397c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix index 2dd4533c2a..418dfbf42f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyexcel-xls"; - version = "0.5.9"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU="; + sha256 = "64bac180274c52efe970c664d3e8bb12402c9d10e0734d9fe87655646a876c45"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix index 71219c32ae..d62302c9c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, isPy3k , lml , pyexcel-io , texttable @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "pyexcel"; - version = "0.6.4"; - disabled = isPy27; + version = "0.6.5"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8="; + sha256 = "36588573ccb1c86e1a8869e1e9f6b31975a38c13803f015a197c18efd2e685ad"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix index bda74c5063..dfbfe90d24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix @@ -14,6 +14,8 @@ , pytest , nose , parameterized +, fastprogress +, typing-extensions }: buildPythonPackage rec { @@ -41,6 +43,8 @@ buildPythonPackage rec { h5py arviz packaging + fastprogress + typing-extensions ]; checkInputs = [ @@ -52,6 +56,7 @@ buildPythonPackage rec { # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; + pythonImportsCheck = [ "pymc3" ]; # For some reason tests are run as a part of the *install* phase if enabled. # Theano writes compiled code to ~/.theano hence we set $HOME. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix index 78fe9672a8..5ce85acc19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pynacl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit version; pname = "PyNaCl"; - sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"; + sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal"; }; checkInputs = [ pytest hypothesis_4 ]; @@ -24,20 +24,10 @@ buildPythonPackage rec { SODIUM_INSTALL = "system"; - # fixed in next release 1.3.0+ - # https://github.com/pyca/pynacl/pull/480 - postPatch = '' - substituteInPlace tests/test_bindings.py \ - --replace "average_size=128," "" - ''; - checkPhase = '' py.test ''; - # https://github.com/pyca/pynacl/issues/550 - PYTEST_ADDOPTS = "-k 'not test_wrong_types'"; - meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index 6d8b828fb9..ed0ab2d533 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi"; + sha256 = "1yn3f414ql8rrvwxlfpp2sckpmb89zj5iszgy1690mrjh7cc2xgi"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index cf1f74b9b7..c51849d171 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.32"; + version = "0.0.35"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b739d20807f5fac95f8e02831faaf04023b7a8cb6f371024d89fd16c6bd8a589"; + sha256 = "3a0f8f6eb6ba0623b93a6995c1978cf72c4eedc5fbedac194e6d89e1b6b985e4"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 22b6840608..d71cf2a0f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "8c6e5cc51d91eb8d43e81d0b7093292b5e144ac81445491d5f887d2cf4fe121f"; + sha256 = "38b485d3634a86c9a2923c39c8f08f003fdd0e0a3d7f07114b2fb4392ce60479"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix index 047b06d979..61c9d37267 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; version = "1.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -11,11 +12,8 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ - pytest - ]; - propagatedBuildInputs = [ + pytest flask werkzeug ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix new file mode 100644 index 0000000000..dd669cf547 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, openems +, csxcad +, boost +, python-csxcad +, numpy +, h5py +}: + +buildPythonPackage rec { + pname = "python-openems"; + version = "unstable-2020-02-15"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "openEMS"; + rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; + sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; + }; + + sourceRoot = "source/python"; + + nativeBuildInputs = [ + cython + boost + ]; + + propagatedBuildInputs = [ + openems + csxcad + python-csxcad + numpy + h5py + ]; + + setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib"; + pythonImportsCheck = [ "openEMS" ]; + + meta = with lib; { + description = "Python interface to OpenEMS"; + homepage = "http://openems.de/index.php/Main_Page.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywal/default.nix index b565188cce..ccc862f8aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywal/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; + description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; homepage = "https://github.com/dylanaraps/pywal"; license = licenses.mit; maintainers = with maintainers; [ Fresheyeball ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix new file mode 100644 index 0000000000..35c7a74432 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +}: + +buildPythonPackage rec { + pname = "sacn"; + version = "1.4.6"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "015wa9nhqgd0kb60bw19g86ga25s9mpvsbqkahi3kw6df6j0wzss"; + }; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "sacn" ]; + + meta = with lib; { + description = "A simple ANSI E1.31 (aka sACN) module for python"; + homepage = "https://github.com/Hundemeier/sacn"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix index 0696844342..6e498ebeae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simplefix"; - version = "1.0.12"; + version = "1.0.14"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; rev = "v${version}"; - sha256 = "0pnyqxpki1ija0kha7axi6irgiifcz4w77libagkv46b1z11cc4r"; + sha256 = "1qccb63w6swq7brp0zinkkngpazmb25r21adry5cq6nniqs5g5zx"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index bdedfc0ed4..f33d2639db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.3.2"; + version = "2.3.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0as7m736wgx684wssnvhvixjkqidnhxn9i98rcdgagr67s3akfdy"; + sha256 = "18w6ibpibqj3v136jjfklbax1l4y80v8mfk19apxlaprf6wvwpwy"; }; propagatedBuildInputs = [ @@ -57,13 +57,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \ --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ --replace "'idna<2.10'," "'idna'," \ --replace "'requests<2.24.0'," "'requests'," ''; - # tests are not working - # XXX: fix the tests + # tests require encrypted secrets, see + # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; pythonImportsCheck = [ "snowflake" "snowflake.connector" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 0eb0b6bebe..99c5822f35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "2c598ef37623ef4d035a827f1e84725b3239a47f4366417d089de88f72fc4ac9"; + sha256 = "e79d83d4947a0945488699324802eda4ad4a63c7680ad5b2a42c71f4faa2cd8b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index 05dab8d026..ccd4190bbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.8.0"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "00fb93313067cdbe52fe436eef1e79038b42c969cf44016b24f9eae0511db2d7"; + sha256 = "620657105ab5720658222d10ad13c52281fe524137b59ab166eee4427ee2f548"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix index 8ba678ed57..ebc6435bc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , requests, six , backports_unittest-mock, pytestCheckHook, pytestrunner }: buildPythonPackage rec { pname = "sseclient"; - version = "0.0.26"; + version = "0.0.27"; src = fetchPypi { inherit pname version; - sha256 = "33f45ab71bb6369025d6a1014e15f12774f7ea25b7e80eeb00bd73668d5fefad"; + sha256 = "b2fe534dcb33b1d3faad13d60c5a7c718e28f85987f2a034ecf5ec279918c11c"; }; propagatedBuildInputs = [ requests six ]; + # some tests use python3 strings + doCheck = !isPy27; checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; # tries to open connection to wikipedia diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix index 1ec88ff1b7..919ef52940 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "20.4.1"; + version = "20.9.0"; src = fetchPypi { inherit pname version; - sha256 = "115wwb3sripl3xvwpygwyrxrapyis0i7w1yq591z3dwl9k9fgzk8"; + sha256 = "83cd2ca75aef4f1fbdbe144c186426d930c3e8b20385df8cec9e12d442986da2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index 658dea9104..94da63cd3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.16.0"; - disabled = pythonOlder "3.5"; + version = "0.17.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "df067dd0560c321af39d412cd81fc3a7d13f55af9150527daab980683e9fcf3c"; + sha256 = "0zcxirpdvvl54pbfkgw7vz984879xwvdygqfpggnam24is2zjp78"; }; checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 1e7132525a..47a0d6cc26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.10"; + version = "1.2.12"; src = fetchPypi { inherit pname version; - sha256 = "398dd818e9a6c14f00c434e7ad3fcbe1d0344f2f4c23bca8c5026280ae032f4f"; + sha256 = "c6657f1d8aae566b89d02c6282827dddcec2a90f75dc0d2d91a47e00c8999d99"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix new file mode 100644 index 0000000000..329cdd5b61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, backoff +, packaging +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "wled"; + version = "0.4.4"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-wled"; + rev = "v${version}"; + sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3"; + }; + + propagatedBuildInputs = [ + aiohttp + backoff + packaging + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportCheck = [ "wled" ]; + + meta = with lib; { + description = "Asynchronous Python client for WLED"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 892a9840a3..f0407dff17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.24.2"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "07xn11i0c7x72xjxkkzrq9zxl40vfdr41mfvhlayrk6dpbk8vdj0"; + sha256 = "b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index 05f608ff4e..6108763926 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "yq" ]; meta = with lib; { - description = "Command-line YAML processor - jq wrapper for YAML documents."; + description = "Command-line YAML processor - jq wrapper for YAML documents"; homepage = "https://github.com/kislyuk/yq"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 5dba30e766..7e468f44b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.36"; + version = "8.36.2"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; + sha256 = "05yb3020q0r75ggh0nm56yj45ha2ppyhbnjn34wqpadi842pzpfh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index e450bbefe2..811c2b2463 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.5"; + version = "2.3.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; + sha256 = "1wbqccvj2a31b3h44rfanjrcv9gm4jl60a66mpxrbfjpmkd5hl35"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index cc3ef8ed0f..44ecfceb8d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.133.0"; + version = "0.136.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; + sha256 = "1gpf9jk4ny5jps93scfcndzg1r93kz3hq8pijpfk4ab8qray83g6"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 7a6f3481d5..10f0d74c0d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques."; + description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques"; homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pev/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pev/default.nix index 8e8f438b5e..cf09d249a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pev/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "merces"; repo = "pev"; - rev = "aa4ef7f"; - sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; + rev = "aa4ef7f"; + sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; fetchSubmodules = true; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries."; + description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; homepage = "http://pev.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix index 55f79a993a..20b17de0c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "121asn0h2vfgqnjk72wqjcfq0w15k15abjdm39i8hv455kzrc2hs"; + sha256 = "0d59kf0y12sa1bki7gzcb2nzppwj3gxlv133bsnl9gc8vx1d8ldg"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index fae1310bd5..59a345faf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -73,7 +73,7 @@ buildBazelPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel-watcher"; - description = "Tools for building Bazel targets when source files change."; + description = "Tools for building Bazel targets when source files change"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 3d475c1f88..26a0dd8667 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "18akakh9bnpn0sngxar9f0r9hhx7dkd8y6q4j16x2d193gcw53c7"; + sha256 = "0psqhv2cm2xwjyivaza2s6x780q6yjn1nsjdy538zjky22dazqq4"; }; vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 9910256afc..4cde308b83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -82,7 +82,7 @@ buildBazelPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/buchgr/bazel-remote"; - description = "A remote HTTP/1.1 cache for Bazel."; + description = "A remote HTTP/1.1 cache for Bazel"; license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index dd9bc4016f..43a70c6a76 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; meta = with stdenv.lib; { - description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps."; + description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index c3049edee6..45612182ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; - description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way."; + description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ tomahna ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/check/default.nix b/third_party/nixpkgs/pkgs/development/tools/check/default.nix index 107b8b5802..a28124828f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/check/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/check/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "A set of utilities for checking Go sources."; + description = "A set of utilities for checking Go sources"; homepage = "https://gitlab.com/opennota/check"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index b7eec641b4..f64041d1be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A linter for Clojure code that sparks joy."; + description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; platforms = graalvm8.meta.platforms; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 3df406eb56..66fb878aa2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -24,6 +24,6 @@ in buildGoModule rec { meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; - description = "Command line client for the Drone continuous integration server."; + description = "Command line client for the Drone continuous integration server"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index c85f5473de..1dcb247a4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.5.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc"; + sha256 = "09cfsq8vfjhavhqcydg0l3bi1g12y2p160yi2v0y5vk7ipiqyzrd"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; diff --git a/third_party/nixpkgs/pkgs/development/tools/corundum/default.nix b/third_party/nixpkgs/pkgs/development/tools/corundum/default.nix index 3497f70996..62d00cbc37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/corundum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/corundum/default.nix @@ -8,7 +8,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "corundum"; meta = with lib; { - description = "Tool and libraries for maintaining Ruby gems."; + description = "Tool and libraries for maintaining Ruby gems"; homepage = "https://github.com/nyarly/corundum"; license = licenses.mit; maintainers = with maintainers; [ nyarly nicknovitski ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/deadcode/default.nix b/third_party/nixpkgs/pkgs/development/tools/deadcode/default.nix index 44c824b2c1..516eeff209 100644 --- a/third_party/nixpkgs/pkgs/development/tools/deadcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/deadcode/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "deadcode is a very simple utility which detects unused declarations in a Go package."; + description = "deadcode is a very simple utility which detects unused declarations in a Go package"; homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/deis/default.nix b/third_party/nixpkgs/pkgs/development/tools/deis/default.nix index 9e45d5988c..4a07a05a63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/deis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/deis/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://deis.io"; - description = "A command line utility used to interact with the Deis open source PaaS."; + description = "A command line utility used to interact with the Deis open source PaaS"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix index 057a8b87a0..a245a06afe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://deis.io"; - description = "A command-line utility used to provision and operate a Deis cluster."; + description = "A command-line utility used to provision and operate a Deis cluster"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 45795b67ea..ba42f3914b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.46.0"; + version = "1.48.1"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1f9gw1qjannswx1vy64a5a2cfr8azsci241pk0xhrhk6aqpjzx1n"; + sha256 = "1bykvwv1zhiki7c86hycwck78s8gqw4dzd7smfp4iz609wyk1wqb"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix b/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix index 9243bbb161..c052db92e0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm json_c pciutils ]; meta = with stdenv.lib; { - description = "Small utility to dump info about DRM devices."; + description = "Small utility to dump info about DRM devices"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix b/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix index 17e3f5f7be..05deb05ed7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix @@ -35,7 +35,7 @@ in buildGoPackage rec { ''; meta = with lib; { - description = "A small library to manage encrypted secrets using asymmetric encryption."; + description = "A small library to manage encrypted secrets using asymmetric encryption"; license = licenses.mit; homepage = "https://github.com/Shopify/ejson"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix index d288ff4dfe..01dc924c81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "errcheck is a program for checking for unchecked errors in go programs."; + description = "errcheck is a program for checking for unchecked errors in go programs"; homepage = "https://github.com/kisielk/errcheck"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix index 8755466ec8..457d7b7a4b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.1.3"; + version = "1.1.4"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "11qllg1alv9khkgjarpzlsqg5ygisjprg79n2jqhv1w6izx88cqc"; + sha256 = "07kq6j5scbcicgb8dqkf129q5ppvnlvkfp165ql30jrkfd6ybf6y"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix index 2217ea591f..2f26a1c35f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "Minimalist dependency manager for Go written in Go."; + description = "Minimalist dependency manager for Go written in Go"; homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; maintainers = [ maintainers.mic92 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix index 7e62a93d56..0c107ecc50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [pandoc man]; meta = with stdenv.lib; { - description = "Git powered FTP client written as shell script."; + description = "Git powered FTP client written as shell script"; homepage = "https://git-ftp.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ tweber ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix index ee942beb92..96b66ebc0b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/golang-migrate/migrate"; - description = "Database migrations. CLI and Golang library."; + description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix index 3df1d5cae2..f10ee426c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { }; meta = { - description = "Utility to extract JSON representation of declarations from a Go source file."; + description = "Utility to extract JSON representation of declarations from a Go source file"; homepage = "https://github.com/ramya-rao-a/go-outline"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-symbols/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-symbols/default.nix index bdee5e4b25..1e2b63ba15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-symbols/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-symbols/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = { - description = "A utility for extracting a JSON representation of the package symbols from a go source tree."; + description = "A utility for extracting a JSON representation of the package symbols from a go source tree"; homepage = "https://github.com/acroca/go-symbols"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix index ec4b1ee66b..c566ea528b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.5"; + version = "2020.1.6"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za"; + sha256 = "1r83gx7k4fiz3wlshhniz1i39xv492nni1nvfxjfqgnmkavb6r4x"; }; - vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; + vendorSha256 = "1g04rzirjv90s1i542cqi2abhgh8b74qwhp1hp1cszgb7k8nndmr"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix b/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix index 4c4d651ce6..173da3ff29 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = { - description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go."; + description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; homepage = "https://github.com/smartystreets/goconvey"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix b/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix index 4ce97349fd..d11cf60932 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "Calculate cyclomatic complexities of functions in Go source code."; + description = "Calculate cyclomatic complexities of functions in Go source code"; homepage = "https://github.com/alecthomas/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix index cf2c5a5b9a..70bbc635cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; meta = { - description = "Go tool to modify struct field tags."; + description = "Go tool to modify struct field tags"; homepage = "https://github.com/fatih/gomodifytags"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopkgs/default.nix index d112654ab4..8d26ca7eb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopkgs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopkgs/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { doCheck = false; meta = { - description = "Tool to get list available Go packages."; + description = "Tool to get list available Go packages"; homepage = "https://github.com/uudashr/gopkgs"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/gore/default.nix b/third_party/nixpkgs/pkgs/development/tools/gore/default.nix index fbc3152cef..ca9c8d9eec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gore/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gore/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; meta = with stdenv.lib; { - description = "Yet another Go REPL that works nicely."; + description = "Yet another Go REPL that works nicely"; homepage = "https://github.com/motemen/gore"; license = licenses.mit; maintainers = with maintainers; [ offline ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix index 13d3c700ce..43f221bd32 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = { - description = "Generate Go tests from your source code."; + description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 71bccc74ce..bc0b331c54 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1jq529m788yp3b6j4dhxgcw7qm1lyxx1ir2vwr41vp7gh17fmwar"; + sha256 = "1nmx91a5faixj1pzg9wbmxn8z1mphmdcvd6lajqy1ds21fzn2g1i"; }; - vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; + vendorSha256 = "02av4z3lxfb6xrv3ij1alf5k8xhxz0dasnf2farbcszz021bzfrq"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/impl/default.nix b/third_party/nixpkgs/pkgs/development/tools/impl/default.nix index 88b8abd842..327226fe7a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/impl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/impl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "impl generates method stubs for implementing an interface."; + description = "impl generates method stubs for implementing an interface"; homepage = "https://github.com/josharian/impl"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix b/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix index 2be22301cd..85c643537a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "Detect ineffectual assignments in Go code."; + description = "Detect ineffectual assignments in Go code"; homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/interfacer/default.nix b/third_party/nixpkgs/pkgs/development/tools/interfacer/default.nix index ff59ce5048..b7f568f4d2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/interfacer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/interfacer/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "A linter that suggests interface types."; + description = "A linter that suggests interface types"; homepage = "https://github.com/mvdan/interfacer"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix index 228a82f600..cc56b27ca2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - description = "The server part of irony."; + description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; maintainers = [ maintainers.deepfire ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix b/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix index 8748fb8e51..233b393387 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "jsduck"; meta = with lib; { - description = "Simple JavaScript Duckumentation generator."; + description = "Simple JavaScript Duckumentation generator"; homepage = "https://github.com/senchalabs/jsduck"; license = with licenses; gpl3; maintainers = with maintainers; [ periklis nicknovitski ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix index 49851dd0c0..2ec7d7f202 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "KnightOS C compiler"; license = licenses.gpl2Plus; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix index b6f490e1d9..bd4320637d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Converts image formats supported by ImageMagick to the KnightOS image format"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix index 96af43e616..c1ecb963d2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "A tool to create or extract KnightOS packages"; license = licenses.lgpl2Only; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix index ed34053d83..9feab36ec8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Patches jumptables into TI calculator ROM files and generates an include file"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix index ad21e68eed..2269c3781a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://knightos.org/"; - description = "Assembler and linker for the Z80."; + description = "Assembler and linker for the Z80"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix new file mode 100644 index 0000000000..6aad8f687e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: + +stdenv.mkDerivation rec { + pname = "z80e"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "z80e"; + rev = version; + sha256 = "18nnip6nv1pq19bxgd07fv7ci3c5yj8d9cip97a4zsfab7bmbq6k"; + }; + + nativeBuildInputs = [ cmake knightos-scas ]; + + buildInputs = [ readline SDL2 ]; + + cmakeFlags = [ "-Denable-sdl=YES" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "A Z80 calculator emulator and debugger"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/kythe/default.nix b/third_party/nixpkgs/pkgs/development/tools/kythe/default.nix index e9748d6e45..601634b318 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kythe/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kythe/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code."; + description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code"; longDescription = '' The Kythe project was founded to provide and support tools and standards that encourage interoperability among programs that manipulate source diff --git a/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix index 7f40824c47..6144b533d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { inherit (src.meta) homepage; - description = "librarian-puppet implementation in go."; + description = "librarian-puppet implementation in go"; license = licenses.mit; maintainers = with maintainers; [ womfoo ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix b/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix index 15d14df3ff..06cd23e40f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "Tool to detect Go structs that would take less memory if their fields were sorted."; + description = "Tool to detect Go structs that would take less memory if their fields were sorted"; homepage = "https://github.com/mdempsky/maligned"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix index 8cd4fc9f7f..bf182a1ae4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.minizinc.org/"; - description = "MiniZinc is a medium-level constraint modelling language."; + description = "MiniZinc is a medium-level constraint modelling language"; longDescription = '' MiniZinc is a medium-level constraint modelling diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 358fdd0369..9456335d72 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "17mh7nxzj597vn51c92ridnvfz17rq9sxynfpx9lj32hqw2r45ap"; + sha256 = "0zhn6av1adphkk9g13m5na63r8fqcjw8wibcja9v9mbw886zcc3p"; }; vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix index 5b53456dea..0e08acdeb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "asls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; - sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5"; + sha256 = "05kp44p4q4sdykfw0b4k9j3qdp0qvwgjbs48ncmnd0ass0xrmi3s"; }; buildInputs = [ erlangR22 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix index 35406c4853..6ba8064c09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix @@ -49,7 +49,7 @@ EOF meta = { homepage = "http://bsdbuild.hypertriton.com"; - description = "A cross-platform build system."; + description = "A cross-platform build system"; longDescription = '' BSDBuild is a cross-platform build system. Derived from the diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index e0a6a8065b..d87de2e648 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -2,13 +2,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.11"; + version = "3.7.12"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "v${version}"; - sha256 = "03c6riz4vb0jipplk69c1j8arjjrjn676kglsrzqf8cidrh8j91c"; + sha256 = "1xnv4g4n1jk1i98sa53k8w6q7hbwbw62svs30lssppysbrv8x3gz"; }; nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index b434358e1d..255403a0c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.9454"; + version = "0.1.10993"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; + sha256 = "1pi31zcg4nvrsyb66znf7g51z51qfw56kml6l2vgg4dbpwmzg87h"; }; - vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; + vendorSha256 = "0fjj8hh0s0jcgz48japbcfpl4ihba2drvvxlyg69j8hrcb9lmi4l"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 65f12bfbb0..1641df1562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200828T065654"; + version = "20201009T224414"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2"; + sha256 = "1az87b4cq6yyibs4knd0ywd0qfgmfzai4bqry4b7h2ycnfhfxdpa"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix index 298e6f7c9d..3aff6c6d36 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/tock/tockloader"; license = licenses.mit; - description = "Tool for programming Tock onto hardware boards."; + description = "Tool for programming Tock onto hardware boards"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix index def5e892e2..104988eb21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "mockgen" ]; meta = with lib; { - description = "GoMock is a mocking framework for the Go programming language."; + description = "GoMock is a mocking framework for the Go programming language"; homepage = "https://github.com/golang/mock"; license = licenses.asl20; maintainers = with maintainers; [ bouk ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 5b607d3d6c..1de95187af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,115 +1,43 @@ -{ lib, fetchurl, fetchzip, ocamlPackages }: +{ lib, fetchurl, fetchzip, callPackage }: -with ocamlPackages; - -let - mkOCamlformat = { - version, - sha256, - buildInputs, - useDune2 ? true, - tarballName ? "ocamlformat-${version}.tbz", - # The 'src' argument can be removed when 0.11.0 is pruned - src ? fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; - inherit sha256; - } - }: - buildDunePackage rec { - pname = "ocamlformat"; - - minimumOCamlVersion = "4.06"; - - inherit src version useDune2 buildInputs; - - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; - license = lib.licenses.mit; - }; - }; - - post_0_11_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - ]; - - post_0_14_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - fix - menhir - ]; -in +let mkOCamlformat = callPackage ./generic.nix; in # Older versions should be removed when their usage decrease # This script scraps Github looking for OCamlformat's options and versions usage: # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_11_0 = mkOCamlformat rec { + ocamlformat_0_11_0 = mkOCamlformat { version = "0.11.0"; - src = fetchzip { - url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; - inherit sha256; - }; - sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_12 = mkOCamlformat { version = "0.12"; - sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_13_0 = mkOCamlformat rec { version = "0.13.0"; - sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; tarballName = "ocamlformat-${version}-2.tbz"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_14_0 = mkOCamlformat { version = "0.14.0"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_1 = mkOCamlformat { version = "0.14.1"; - sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_2 = mkOCamlformat { version = "0.14.2"; - sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; - buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_3 = mkOCamlformat { + version = "0.14.3"; }; ocamlformat_0_15_0 = mkOCamlformat { version = "0.15.0"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - buildInputs = post_0_14_buildInputs; }; ocamlformat = ocamlformat_0_15_0; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix new file mode 100644 index 0000000000..c39ade7c07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -0,0 +1,68 @@ +{ lib, fetchurl, fetchzip, ocamlPackages +, version +, tarballName ? "ocamlformat-${version}.tbz", +}: + +let src = + if version == "0.11.0" + then fetchzip { + url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; + } else fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + sha256 = { + "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; + "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + }."${version}"; + } +; in + +with ocamlPackages; + +buildDunePackage rec { + pname = "ocamlformat"; + inherit src version; + + minimumOCamlVersion = "4.06"; + + useDune2 = lib.versionAtLeast version "0.14"; + + buildInputs = + if lib.versionAtLeast version "0.14" + then [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + fix + menhir + ] else [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + ]; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 79baecd74f..c803207f88 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding."; + description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding"; homepage = "https://github.com/operator-framework/operator-sdk"; license = licenses.asl20; maintainers = with maintainers; [ arnarg ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index f1627c7ed3..f697e00b56 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Infer parentheses for Clojure, Lisp, and Scheme."; + description = "Infer parentheses for Clojure, Lisp, and Scheme"; homepage = "https://github.com/eraserhd/parinfer-rust"; license = licenses.isc; maintainers = with maintainers; [ eraserhd ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix index 72516fb7d1..6aa38104bc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix @@ -6,7 +6,7 @@ buildRustPackage rec { version = "0.4.0"; meta = with stdenv.lib; { - description = "The fastest JavaScript bundler in the galaxy."; + description = "The fastest JavaScript bundler in the galaxy"; longDescription = '' The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(). ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/richgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/richgo/default.nix index e6478086f7..441c0d8bdf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/richgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/richgo/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - description = "Enrich `go test` outputs with text decorations."; + description = "Enrich `go test` outputs with text decorations"; homepage = "https://github.com/kyoh86/richgo"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index cc1bf1c747..0c476a58e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Automatically generates Rust FFI bindings to C (and some C++) libraries."; + description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; longDescription = '' Bindgen takes a c or c++ header file and turns them into rust ffi declarations. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index dafcd1ded2..a9c18b021b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 ]; meta = with lib; { - description = "A cargo extension for working with microcontrollers."; + description = "A cargo extension for working with microcontrollers"; homepage = "http://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index d4844de21a..e5d23c9258 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 ]; meta = with lib; { - description = "A cargo extension for working with microcontrollers."; + description = "A cargo extension for working with microcontrollers"; homepage = "http://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix index d30c3ad629..1e79a720a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Detects usage of unsafe Rust in a Rust crate and its dependencies."; + description = "Detects usage of unsafe Rust in a Rust crate and its dependencies"; homepage = "https://github.com/rust-secure-code/cargo-geiger"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index a1e9f7971f..4d1c851198 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.4"; + version = "0.32.7"; src = fetchCrate { inherit pname version; - sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; + sha256 = "0x8alv0jdk7xl63b2m4696w2hwqnbwxfqz6f3gisljll42xp6n2z"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; + cargoSha256 = "1y2izxlc1nz3kqzrnhh9ir8j1gwvpj4cma2iqd65s9cf7xpkr6cx"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index b7879adcc3..cc3aa00b27 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0imvq63i3s9qmm0x8cbaknjap2yfmpzva3y0sxmgkcm8ajkvp114"; + sha256 = "0qnmz7sxbwnjdsl17h876szxd04z0q9arbl1ib45b6346x7mq8n4"; }; - cargoSha256 = "196w9rgz4pwqvkiy839kqz765ljqx1k129w4nvxgxv3rcmy4lbzm"; + cargoSha256 = "1jnbf0a3bggjf0wapr9xdj9hwfpgki2csg7rhg5maqavm8m0mirm"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/setupcfg2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/setupcfg2nix/default.nix index 9762862cf6..4cc1ec320c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/setupcfg2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/setupcfg2nix/default.nix @@ -10,7 +10,7 @@ buildSetupcfg rec { }; application = true; meta = { - description = "Generate nix expressions from setup.cfg for a python package."; + description = "Generate nix expressions from setup.cfg for a python package"; homepage = "https://github.com/target/setupcfg2nix"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix b/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix index a0037050b6..c25f0491c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix @@ -8,7 +8,7 @@ crateOverrides = defaultCrateOverrides // { systemfd = attrs: { meta = { - description = "A convenient helper for passing sockets into another process."; + description = "A convenient helper for passing sockets into another process"; homepage = "https://github.com/mitsuhiko/systemfd"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.adisbladis ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix b/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix index 3587454b84..448c14ffaf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = { - description = "Proxy for for simulating network conditions."; + description = "Proxy for for simulating network conditions"; maintainers = with lib.maintainers; [ avnik ]; license = lib.licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix index d0d2cbd79e..5839a7771d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; + description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications"; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix b/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix index 5eb6dd0978..edd428480a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { buildFlags = [ "--tags" "release" ]; meta = { - description = "Command line utility to live-reload your application."; + description = "Command line utility to live-reload your application"; homepage = "https://github.com/devlocker/tychus"; license = stdenv.lib.licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix b/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix index 7821c34bb1..5c3b2abe4a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix @@ -47,7 +47,7 @@ mkDerivation { ]; meta = with lib; { - description = "OpenGL capture / playback debugger."; + description = "OpenGL capture / playback debugger"; homepage = "https://github.com/ValveSoftware/vogl"; license = licenses.mit; maintainers = [ maintainers.deepfire ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/xqilla/default.nix b/third_party/nixpkgs/pkgs/development/tools/xqilla/default.nix index 44a7254a3d..7d8029ee1f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xqilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xqilla/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xerces=${xercesc}" ]; meta = with stdenv.lib; { - description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library."; + description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; license = licenses.asl20 ; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 8a2cbbe385..32be24f954 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.140"; + version = "0.0.144"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "19yap6n3fw8cf9y6bb6yzl24m4f49jv38j7dj4hs09a5qwh85rz4"; + sha256 = "1wg8dgz930hj3q448gg5kxri31q078w5nshvlfkga7vzn8pdg3bk"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0vxfnq9ng7ybkw1xla7m2in2sg6hzvghczqnjrj96n07fln0s9rs"; + vendorSha256 = "0ryb97cwknxwhascz74filvx3wfwd0dhm6x36n4d7z2kiw7fgmh9"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/games/fltrator/default.nix b/third_party/nixpkgs/pkgs/games/fltrator/default.nix index 7cf16e0783..e01a3f9fb9 100644 --- a/third_party/nixpkgs/pkgs/games/fltrator/default.nix +++ b/third_party/nixpkgs/pkgs/games/fltrator/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple retro style arcade side-scroller game."; + description = "A simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator homepage = "http://fltrator.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/games/frotz/default.nix b/third_party/nixpkgs/pkgs/games/frotz/default.nix index 800da177a3..6ff163105d 100644 --- a/third_party/nixpkgs/pkgs/games/frotz/default.nix +++ b/third_party/nixpkgs/pkgs/games/frotz/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://davidgriffith.gitlab.io/frotz/"; changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; - description = "A z-machine interpreter for Infocom games and other interactive fiction."; + description = "A z-machine interpreter for Infocom games and other interactive fiction"; platforms = platforms.unix; maintainers = with maintainers; [ nicknovitski ddelabru ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix b/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix index 824e7afd73..f3cc9ab000 100644 --- a/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix +++ b/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "Client for Tetrinet, a multiplayer online Tetris game."; + description = "Client for Tetrinet, a multiplayer online Tetris game"; longDescription = '' GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. diff --git a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix b/third_party/nixpkgs/pkgs/games/opendungeons/default.nix index 467c782211..64b6c07f4a 100644 --- a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix +++ b/third_party/nixpkgs/pkgs/games/opendungeons/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpthread"; meta = with stdenv.lib; { - description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; + description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius"; homepage = "https://opendungeons.github.io"; license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/pacvim/default.nix b/third_party/nixpkgs/pkgs/games/pacvim/default.nix index d7805ad66f..4692c36037 100644 --- a/third_party/nixpkgs/pkgs/games/pacvim/default.nix +++ b/third_party/nixpkgs/pkgs/games/pacvim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/jmoon018/PacVim"; - description = "PacVim is a game that teaches you vim commands."; + description = "PacVim is a game that teaches you vim commands"; maintainers = with maintainers; [ infinisil ]; license = licenses.lgpl3; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/games/redeclipse/default.nix b/third_party/nixpkgs/pkgs/games/redeclipse/default.nix index fc6f50ef97..d99d7ccb1d 100644 --- a/third_party/nixpkgs/pkgs/games/redeclipse/default.nix +++ b/third_party/nixpkgs/pkgs/games/redeclipse/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A first person arena shooter, featuring parkour, impulse boosts, and more."; + description = "A first person arena shooter, featuring parkour, impulse boosts, and more"; longDescription = '' Red Eclipse is a fun-filled new take on the first person arena shooter, featuring parkour, impulse boosts, and more. The development is geared diff --git a/third_party/nixpkgs/pkgs/games/t4kcommon/default.nix b/third_party/nixpkgs/pkgs/games/t4kcommon/default.nix index f2e226cb57..997ce72db3 100644 --- a/third_party/nixpkgs/pkgs/games/t4kcommon/default.nix +++ b/third_party/nixpkgs/pkgs/games/t4kcommon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; meta = with stdenv.lib; { - description = "A library of code shared between tuxmath and tuxtype."; + description = "A library of code shared between tuxmath and tuxtype"; homepage = "https://github.com/tux4kids/t4kcommon"; license = licenses.gpl3Plus; maintainers = [ maintainers.aanderse ]; diff --git a/third_party/nixpkgs/pkgs/games/trigger/default.nix b/third_party/nixpkgs/pkgs/games/trigger/default.nix index e5a299052d..74a56f1fd4 100644 --- a/third_party/nixpkgs/pkgs/games/trigger/default.nix +++ b/third_party/nixpkgs/pkgs/games/trigger/default.nix @@ -2,15 +2,26 @@ , zlib, libGLU, libGL, glew, tinyxml-2 }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.6.1"; + pname = "trigger-rally"; + version = "0.6.6.1"; src = fetchurl { - url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; + url = "mirror://sourceforge/trigger-rally/${pname}-${version}.tar.gz"; sha256 = "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"; }; - buildInputs = - [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew tinyxml-2 ]; + buildInputs = [ + SDL2 + freealut + SDL2_image + openal + physfs + zlib + libGLU + libGL + glew + tinyxml-2 + ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs diff --git a/third_party/nixpkgs/pkgs/games/xbill/default.nix b/third_party/nixpkgs/pkgs/games/xbill/default.nix index 8a6d4cf14c..f021d9ac7a 100644 --- a/third_party/nixpkgs/pkgs/games/xbill/default.nix +++ b/third_party/nixpkgs/pkgs/games/xbill/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv; { - description = "Protect a computer network from getting infected."; + description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; license = lib.licenses.gpl1; maintainers = with lib.maintainers; [ aw ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index b04ef89d21..ce11f4a055 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; + description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series"; homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 9b328c20b7..f6504b598c 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with lib; { - description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; + description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series"; homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix b/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix index 72f1da6b0d..16b47d01f2 100644 --- a/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix +++ b/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix @@ -1,7 +1,7 @@ { stdenv, runCommand }: runCommand "documentation-highlighter" { meta = { - description = "Highlight.js sources for the Nix Ecosystem's documentation."; + description = "Highlight.js sources for the Nix Ecosystem's documentation"; homepage = "https://highlightjs.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index 6016cc779f..eb88476432 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, fetchpatch, makeWrapper, symlinkJoin, -pkgconfig, libtool, -gtk2, -libxml2, -libxslt, -libusb-compat-0_1, -sane-backends, -rpm, cpio, -getopt, -patchelf, autoPatchelfHook, gcc +{ stdenv +, fetchurl +, fetchpatch +, makeWrapper +, symlinkJoin +, pkgconfig +, libtool +, gtk2 +, libxml2 +, libxslt +, libusb-compat-0_1 +, sane-backends +, rpm +, cpio +, getopt +, patchelf +, autoPatchelfHook +, gcc }: - let common_meta = { - homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; - license = with stdenv.lib.licenses; epson; - platforms = with stdenv.lib.platforms; linux; - }; + homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; + license = with stdenv.lib.licenses; epson; + platforms = with stdenv.lib.platforms; linux; +}; in ############################ # @@ -23,7 +30,6 @@ in ############################ # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... - let plugins = { v330 = stdenv.mkDerivation rec { name = "iscan-v330-bundle"; @@ -33,7 +39,7 @@ let plugins = { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" @@ -49,17 +55,17 @@ let plugins = { mkdir $out{,/share,/lib} cp -r ./usr/share/{iscan-data,esci}/ $out/share/ cp -r ./usr/lib64/esci $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" - ''; + ''; hw = "Perfection V330 Photo"; - }; - meta = common_meta // { description = "Plugin to support "+passthru.hw+" scanner in sane."; }; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; - x770 = stdenv.mkDerivation rec { + x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; @@ -79,20 +85,20 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" - ''; + ''; hw = "Perfection V500 Photo"; - }; - meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; }; }; + meta = common_meta // { description = "iscan esci x770 plugin for " + passthru.hw; }; + }; f720 = stdenv.mkDerivation rec { pname = "iscan-gt-f720-bundle"; version = "2.30.4"; - nativeBuildInputs= [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc.cc.lib ]; src = fetchurl { urls = [ @@ -107,16 +113,16 @@ let plugins = { mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" - ''; + ''; hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; - }; + }; - meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci f720 plugin for " + passthru.hw; }; }; s80 = stdenv.mkDerivation rec { pname = "iscan-gt-s80-bundle"; @@ -139,7 +145,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = '' @@ -147,11 +153,11 @@ let plugins = { $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" - ''; + ''; hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; - }; + }; - meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; @@ -175,16 +181,16 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" - ''; + ''; hw = "GT-S650, Perfection V19, Perfection V39"; }; - meta = common_meta // { description = "iscan GT-S650 for "+passthru.hw; }; + meta = common_meta // { description = "iscan GT-S650 for " + passthru.hw; }; }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; @@ -209,7 +215,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = ""; hw = "network"; @@ -219,9 +225,6 @@ let plugins = { }; }; in - - - let fwdir = symlinkJoin { name = "esci-firmware-dir"; paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; @@ -278,14 +281,14 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ./sscanf.patch - ]; + ]; patchFlags = [ "-p0" ]; - configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; + configureFlags = [ "--enable-dependency-reduction" "--disable-frontend" ]; postConfigure = '' echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h - ''; + ''; postInstall = '' mkdir -p $out/etc/sane.d @@ -294,18 +297,20 @@ stdenv.mkDerivation rec { ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data mkdir -p $out/lib/iscan ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network - ''; + ''; postFixup = '' # iscan-registry is a shell script requiring getopt wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; - '' + - stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' - plugin=${value}; - ${value.passthru.registrationCommand} - '') plugins); + '' + + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList + (name: value: '' + plugin=${value}; + ${value.passthru.registrationCommand} + '') + plugins); meta = common_meta // { - description = "sane-epkowa backend for some epson scanners."; + description = "sane-epkowa backend for some epson scanners"; longDescription = '' Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : diff --git a/third_party/nixpkgs/pkgs/misc/emulators/np2kai/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/np2kai/default.nix index 245bad1d53..0ed47af8f5 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/np2kai/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/np2kai/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A PC-9801 series emulator."; + description = "A PC-9801 series emulator"; homepage = "https://github.com/AZO234/NP2kai"; license = licenses.mit; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/third_party/nixpkgs/pkgs/misc/hdt/default.nix b/third_party/nixpkgs/pkgs/misc/hdt/default.nix index 8a4c7c3e6f..a8cf5c5d4d 100644 --- a/third_party/nixpkgs/pkgs/misc/hdt/default.nix +++ b/third_party/nixpkgs/pkgs/misc/hdt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.rdfhdt.org/"; - description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns."; + description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.koslambrou ]; diff --git a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix b/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix index 3e1f63e5e3..6ef50a33a5 100644 --- a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ''; meta = { - description = "RISC-V Proxy Kernel and Bootloader."; + description = "RISC-V Proxy Kernel and Bootloader"; homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index 36f8981957..735a2cd3b7 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 5ffe5f7226..3949791775 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; + description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active"; homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix index cefcdbc75a..d46f772e49 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - description = "Launch a given program when your X session has been idle for a given time."; + description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 59f73b4243..d3ce3e5987 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.07"; + defaultVersion = "2020.10"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1"; + sha256 = "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"; }; buildUBoot = { version ? null diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index a7fdc8b5a1..98c52a5a0a 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -603,6 +603,8 @@ self: super: { in '' ln -s ${maple-bin}/bin/maple $target/bin/maple ''; + + meta.platforms = stdenv.lib.platforms.all; }); completion-tabnine = super.completion-tabnine.overrideAttrs(old: { @@ -618,6 +620,7 @@ self: super: { nodePackageNames = [ "coc-go" "coc-css" + "coc-diagnostic" "coc-emmet" "coc-eslint" "coc-git" diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix index d9a0de6c7f..e31271ed2b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { - description = "A Plan 9-inspired way to share your OS X clipboard."; + description = "A Plan 9-inspired way to share your OS X clipboard"; homepage = "https://github.com/eraserhd/osxsnarf"; license = licenses.unlicense; platforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix index 0a9b38f288..57cffe5f9e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { }; meta = with stdenv.lib; { - description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier."; + description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier"; homepage = "https://github.com/wykurz/cpuset"; license = licenses.gpl2; maintainers = with maintainers; [ wykurz ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 6da1df98b2..f19af3d10f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ''; meta = { - description = "Tools for managing firmware updates for system76 devices."; + description = "Tools for managing firmware updates for system76 devices"; homepage = "https://github.com/pop-os/system76-firmware"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.shlevy ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index bba3549daf..e33a40e6a8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/intel/compute-runtime"; - description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond."; + description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gloaming ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 036cc44ece..ff410b2ab2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,22 +1,27 @@ { "4.14": { - "name": "linux-hardened-4.14.201.a.patch", - "sha256": "16jkhib0fc8l96a092srqpg850wh0n49pa0yghpviz29rlids6vs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.201.a/linux-hardened-4.14.201.a.patch" + "name": "linux-hardened-4.14.202.a.patch", + "sha256": "0ns5yq087m7i7ciq2b4skxclnlym0zm5v0vjqvzi9r375fd0gm9s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.202.a/linux-hardened-4.14.202.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.151.a.patch", - "sha256": "12sh1zvc72p7kkbgpm4cjppv1vlqbywsqfsva76pjx1mw0wsj7sj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.151.a/linux-hardened-4.19.151.a.patch" + "name": "linux-hardened-4.19.152.a.patch", + "sha256": "0zc36yklzjb3sqd61m12c1988mazkrv242wbk7cn0a2b5sw7a373", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.152.a/linux-hardened-4.19.152.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.71.a.patch", + "name": "linux-hardened-5.4.72.a.patch", "sha256": "1w4sfkx4qj9vx47z06bkf4biaiz58z2qp536g7dss26zdbx1im26", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.71.a/linux-hardened-5.4.71.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.72.a/linux-hardened-5.4.72.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.15.a.patch", + "name": "linux-hardened-5.8.16.a.patch", "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.15.a/linux-hardened-5.8.15.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.16.a/linux-hardened-5.8.16.a.patch" + }, + "5.9": { + "name": "linux-hardened-5.9.1.a.patch", + "sha256": "07897dgkldm2dxsriapjlg9b118sd32qmd1z8xja01xcgd3r6vp7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.1.a/linux-hardened-5.9.1.a.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index dd0d2c2a62..cdbedb34f8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.201"; + version = "4.14.202"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0nr3w5m7dz28v7qfhp99ih4c369qrhq751wfikbz8ga3di0dqa72"; + sha256 = "0a739g3s0lc579zp4478xr645qzvhmrm1w19x0rj7p8bbfmigiwm"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index d4e72cb3cb..4c0d7b06ef 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.151"; + version = "4.19.152"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0vm3nsi9la3azxrsvndbd6fpz79pch7309f2144xyxszsk339cf7"; + sha256 = "0p857b1gmmc2bv8limrdbfb3zsnchvg275sx5fkyy4185jfam9m5"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 49591f6347..539a783e0a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.239"; + version = "4.4.240"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03myd9ngmjmnddh4iqqsgcfg9rd11vyvwym38yh4m1p08j1zbg0k"; + sha256 = "131pamgxxmx4ba4gn2qxczv8w3lxrmwlqg0a7pdjzg0sy9lirygk"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 114629bad5..58ae294542 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.239"; + version = "4.9.240"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0lfbn5amykvwz1svvxayzhsz1dvm4mgzsnq1g0wqffclxm148hr3"; + sha256 = "0vvpvw5wsvjnwch5ci63x08qc7qyzpyxbiaxx4521nl8d7371r06"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 35025efb65..9203321f1f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.71"; + version = "5.4.72"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ivcimngj5h7lxslkrdljpfw9hfvdhrm8wrp7gp4d3gk7kpljw3k"; + sha256 = "0whi5kr1ziy9y20p42adnmqks41cavsraa36g9dbbrbgsmdn890f"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix index 3e13d9eb9c..35bc489c3c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.15"; + version = "5.8.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0hfnq4n902pws8sjxd1lsdxxa0v45g988imp73xnqfqv2d71r0bj"; + sha256 = "1icxa0pgqhji924ryz37mpjjf4zlkrm8bidanjyn2mzbar7migzx"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix index a7aefa209c..d96dd841d8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9"; + version = "5.9.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "01hsddf4sf9q5l1innyyl34b51y48v5wi34qpr421gsh2bpa8f9j"; + sha256 = "0dn0xz81pphca5dkg6zh8c78p05f63rrr5ihqqsmhc4n73li2jms"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix index e3dfbd3d6c..372f110f34 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; meta = with stdenv.lib; { - description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros."; + description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros"; license = licenses.bsd3; platforms = platforms.linux; homepage = "https://chromium.googlesource.com/chromiumos/platform/libevdev/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix index 4c51525727..46d25df31b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; meta = with stdenv.lib; { - description = "ChromiumOS libgestures modified to compile for Linux."; + description = "ChromiumOS libgestures modified to compile for Linux"; license = licenses.bsd3; platforms = platforms.linux; homepage = "https://chromium.googlesource.com/chromiumos/platform/gestures"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix index bef74cd33b..6ddf4db562 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Linux Kernel Stream Control Transmission Protocol Tools."; + description = "Linux Kernel Stream Control Transmission Protocol Tools"; homepage = "http://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 7c37fcf231..75ce13da0d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "450.66"; - sha256_64bit = "1a6va0gvbzpkyza693v2ml1is4xbv8wxasqk0zd5y7rxin94c1ms"; - settingsSha256 = "0mkgs91gx7xb7f24xkq9fl7i8d4l7s0wr9a44b1gm1vkw82fm7lj"; - persistencedSha256 = "02id8cg8fba7c1j4m6vj4gp2mv39lz2k557kdjw8lszcpw6f1fhh"; + version = "455.28"; + sha256_64bit = "03ysf61qrb272yqkn7bhn9d65lcfhmqc2c0dbh5prp5f2ndlkqg4"; + settingsSha256 = "0r9vclmh48yhcrnz9yrswfipj5450ga73jywdjg19gaq2s2aaf1f"; + persistencedSha256 = "04v9d2g1r0x5dgyy9hqqyp0p9a3qxy1kzl13vklfqrwswb8jw7z1"; } else legacy_390; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix new file mode 100644 index 0000000000..a71e7ef0dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + pname = "psftools"; + version = "1.0.13"; + src = fetchurl { + url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz"; + sha256 = "0rgg1lhryqi6sgm4afhw0z6pjivdw4hyhpxanj8rabyabn4fcqcw"; + }; + outputs = ["out" "man" "dev" "lib"]; + + meta = with stdenv.lib; { + homepage = "https://www.seasip.info/Unix/PSF"; + description = "Conversion tools for .PSF fonts"; + longDescription = '' + The PSFTOOLS are designed to manipulate fixed-width bitmap fonts, + such as DOS or Linux console fonts. Both the PSF1 (8 pixels wide) + and PSF2 (any width) formats are supported; the default output + format is PSF2. + ''; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix index ad751b9cfe..0ece2f8360 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "The USBGuard software framework helps to protect your computer against BadUSB."; + description = "The USBGuard software framework helps to protect your computer against BadUSB"; homepage = "https://usbguard.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.tnias ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix index 9f9b278d6f..93fd7dd5b0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Chromebook touchpad driver."; + description = "Chromebook touchpad driver"; license = licenses.bsd3; platforms = platforms.linux; homepage = "https://www.github.com/hugegreenbug/xf86-input-cmt"; diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix index 689bc2f385..283cceb124 100644 --- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { null; meta = with lib; { - description = "Sandboxed execution environment."; + description = "Sandboxed execution environment"; homepage = "https://github.com/solo5/solo5"; license = licenses.isc; maintainers = [ maintainers.ehmry ]; diff --git a/third_party/nixpkgs/pkgs/servers/code-server/default.nix b/third_party/nixpkgs/pkgs/servers/code-server/default.nix index 91da7e179b..c62fc072ec 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/code-server/default.nix @@ -174,7 +174,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Run VS Code on a remote server."; + description = "Run VS Code on a remote server"; longDescription = '' code-server is VS Code running on a remote server, accessible through the browser. diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index b2f9b27e8f..c153cc3907 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.3"; + version = "1.8.4"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "172m8izv0jqvwxl8nwxdy6x7syp7gn70x4zx41h6ajy4h564l16y"; + sha256 = "0rm6qf8jnn6khrx9dy8r4ji1yd89hai52d9zggb5r99k7m9wd291"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "1q4mvmypza2n2kqnri71y9k2qqmb34x3pa7ifql8gwlp8r0bicy7"; + vendorSha256 = "1g3a9m6aqarq0rqf7qrp9yxcsc3sjnx0vbypakzmrq1ndgdivk16"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dante/default.nix b/third_party/nixpkgs/pkgs/servers/dante/default.nix index c36ca2f8f5..6be80c491f 100644 --- a/third_party/nixpkgs/pkgs/servers/dante/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dante/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; meta = with stdenv.lib; { - description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; + description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity"; homepage = "https://www.inet.no/dante/"; maintainers = [ maintainers.arobyn ]; license = licenses.bsdOriginal; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 3e62d520be..d3b440f1d0 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-reproducible" - "--with-systemd" + "--enable-systemd" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix index 93bd7778d0..c3f36a7592 100644 --- a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix @@ -21,13 +21,13 @@ let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256:05ca27r9sidbl7xns9hcdan8wgjrpg26n1wq1vp247c9bqhpyql8"; + sha256 = "0vkgbw2ibvfr0zffnmmws7389msyqsiw8anfad6awvkda3z3rxjm"; }; cmakeFlags = [ @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://docs.gerbera.io/; + homepage = "https://docs.gerbera.io/"; description = "UPnP Media Server for 2020"; longDescription = '' Gerbera is a Mediatomb fork. diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index cbcc650111..1f54f54483 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -5,7 +5,7 @@ version = "0.116.4"; components = { "abode" = ps: with ps; [ abodepy ]; - "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather + "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; @@ -922,7 +922,7 @@ "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api - "wled" = ps: with ps; [ ]; # missing inputs: wled + "wled" = ps: with ps; [ wled ]; "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "workday" = ps: with ps; [ holidays ]; "worldclock" = ps: with ps; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix index f3cae597ef..cc6363e75d 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A web server based on Nginx and has many advanced features, originated by Taobao."; + description = "A web server based on Nginx and has many advanced features, originated by Taobao"; homepage = "https://tengine.taobao.org"; license = licenses.bsd2; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 27f45fe6e4..cbe17cdb80 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { passthru.tests.unit-php = nixosTests.unit-php; meta = { - description = "Dynamic web and application server, designed to run applications in multiple languages."; + description = "Dynamic web and application server, designed to run applications in multiple languages"; homepage = "https://unit.nginx.org/"; license = licenses.asl20; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 67975efb4a..89bf306fef 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.1670"; + version = "0.16.1757"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1jjvk2y56j6hx4588jsdvj2yk7slacn49z09vhw9vf9nkddx1mgb"; + sha256 = "1scf7sh4cpq0drz6jn60l6163g0dcqvp6ifq5gyj3484zwpxmnsf"; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "API Support for your favorite torrent trackers."; + description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index bbfdc97b6d..d7c7e04298 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = "${version}"; - sha256 = "024fs2yln2i4s5aihwlz103w5wvmcwqx7hz9q3fw3dm18k3fjmn2"; + sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf"; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix index 8f1c08bebd..8edac875a3 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix @@ -77,7 +77,7 @@ _EOF ''; meta = { - description = "Official monitoring plugins for Nagios/Icinga/Sensu and others."; + description = "Official monitoring plugins for Nagios/Icinga/Sensu and others"; homepage = "https://www.monitoring-plugins.org"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 8464d4f1b2..e7a6fa6e40 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -55,7 +55,7 @@ in { pname = "check_mssql_health"; version = "2.6.4.15"; sha256 = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg"; - description = "Check plugin for Microsoft SQL Server."; + description = "Check plugin for Microsoft SQL Server"; buildInputs = [ perlPackages.DBDsybase ]; }; @@ -63,7 +63,7 @@ in { pname = "check_nwc_health"; version = "7.10.0.6"; sha256 = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2"; - description = "Check plugin for network equipment."; + description = "Check plugin for network equipment"; buildInputs = [ perlPackages.NetSNMP ]; }; @@ -71,7 +71,7 @@ in { pname = "check_ups_health"; version = "2.8.3.3"; sha256 = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm"; - description = "Check plugin for UPSs."; + description = "Check plugin for UPSs"; buildInputs = [ perlPackages.NetSNMP ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index 47a91d7e3a..f1a7d0c38e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/keylight_exporter"; - description = "Prometheus exporter for Elgato Key Light devices."; + description = "Prometheus exporter for Elgato Key Light devices"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index 4c49c94f28..34b927e0f7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/modemmanager_exporter"; - description = "Prometheus exporter for ModemManager and its devices."; + description = "Prometheus exporter for ModemManager and its devices"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index d628cf32c5..b3eb3a5cd8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -20,7 +20,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; meta = with lib; { - description = "Prometheus exporter for Nextcloud servers."; + description = "Prometheus exporter for Nextcloud servers"; homepage = "https://github.com/xperimental/nextcloud-exporter"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 8f927f32e2..0f303f669a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; meta = with lib; { - description = "A Prometheus exporter for WireGuard, written in Rust."; + description = "A Prometheus exporter for WireGuard, written in Rust"; homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter"; license = licenses.mit; maintainers = with maintainers; [ ma27 globin ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index b0e9ef356a..a12b9e50ad 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) telegraf; }; meta = with lib; { - description = "The plugin-driven server agent for collecting & reporting metrics."; + description = "The plugin-driven server agent for collecting & reporting metrics"; license = licenses.mit; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; diff --git a/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix b/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix index 2e0c787d0b..d753cb47a6 100644 --- a/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol."; + description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; license = licenses.isc; homepage = "http://www.openbgpd.org/"; maintainers = with maintainers; [ kloenk ]; diff --git a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix index a2f417d88f..16fa6a7196 100644 --- a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix @@ -48,7 +48,7 @@ in with python.pkgs; buildPythonApplication rec { meta = with lib; { homepage = "https://supakeen.com/project/pinnwand/"; license = licenses.mit; - description = "A Python pastebin that tries to keep it simple."; + description = "A Python pastebin that tries to keep it simple"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/pinnwand/steck.nix b/third_party/nixpkgs/pkgs/servers/pinnwand/steck.nix index 09b20efc36..90f7d6b49f 100644 --- a/third_party/nixpkgs/pkgs/servers/pinnwand/steck.nix +++ b/third_party/nixpkgs/pkgs/servers/pinnwand/steck.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/supakeen/steck"; license = licenses.mit; - description = "Client for pinnwand pastebin."; + description = "Client for pinnwand pastebin"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index 9c08f39204..06541b8950 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -59,7 +59,7 @@ ''; meta = with lib; { - description = "The music player for music lovers."; + description = "The music player for music lovers"; homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault steell ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 9e4eadf72d..0ee6bd26c2 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "dolt"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx"; + sha256 = "0w9k48jxklhaql8qbbm9ay0md5nia6x3wr0zz3w44pw3gl5kvxyw"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb"; + vendorSha256 = "16xh4s7zmar0r3kwps5bbl168imyx252lvz9s3snvxzz5kd8wlnm"; doCheck = false; meta = with lib; { - description = "Relational database with version control and CLI a-la Git."; + description = "Relational database with version control and CLI a-la Git"; homepage = "https://github.com/liquidata-inc/dolt"; license = licenses.asl20; maintainers = with maintainers; [ danbst ]; diff --git a/third_party/nixpkgs/pkgs/servers/tang/default.nix b/third_party/nixpkgs/pkgs/servers/tang/default.nix index 5aa261bd8a..caeb969f23 100644 --- a/third_party/nixpkgs/pkgs/servers/tang/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tang/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = { - description = "Server for binding data to network presence."; + description = "Server for binding data to network presence"; homepage = "https://github.com/latchset/tang"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index ff2f993ecc..1fbf94beb1 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Python based monitoring and tracking tool for Plex Media Server."; + description = "A Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix index 3dc9fb1719..e0b119da6d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it."; + description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it"; license = licenses.agpl3; homepage = "https://gitlab.com/mojo42/Jirafeau"; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index 8fea1f9925..f983885706 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/mattrude/pgpkeyserver-lite"; - description = "A lightweight static front-end for a sks keyserver."; + description = "A lightweight static front-end for a sks keyserver"; license = licenses.gpl3; maintainers = with maintainers; [ calbrecht globin ]; }; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix index b4812428ad..5603e5edf5 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The plugin manager for zsh."; + description = "The plugin manager for zsh"; homepage = "http://antigen.sharats.me"; license = stdenv.lib.licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix index 9f7a7f1870..dffecf617b 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp ./* $out/ -R ''; meta = with stdenv.lib; { - description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes."; + description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes"; homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix b/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix index 660563d975..2bfdb9b69d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.publicDomain; homepage = "https://cr.yp.to/daemontools.html"; - description = "A collection of tools for managing UNIX services."; + description = "A collection of tools for managing UNIX services"; maintainers = with stdenv.lib.maintainers; [ kevincox ]; platforms = stdenv.lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 74cc3f3f17..271034fa88 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.27.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v"; + sha256 = "0kg966czixkmaaznl7xm751jpx4252nkm99vaigg1iwhlx2yczh9"; }; - vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys"; + vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 41fc026092..e131389aa8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "01bll978dis8pqvgrbigzgszkx3kjm6acrw44z6j7algw3an352r"; + sha256 = "05j9bwg8ph3xysd3rvykfznzs476w6wi6hj4mfg7jzw5r23ddc7k"; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix index 4f02615b4a..4e87a68866 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix @@ -75,7 +75,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "Manipulate DNS records on various DNS providers in a standardized way."; + description = "Manipulate DNS records on various DNS providers in a standardized way"; homepage = "https://github.com/AnalogJ/lexicon"; maintainers = with maintainers; [ flyfloh ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix new file mode 100644 index 0000000000..3ceb0e8509 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "stripe-cli"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "stripe"; + repo = pname; + rev = "v${version}"; + sha256 = "0anrn7dkxgbzilh45gyqrp2930bkg3g3diarb50qp0rlim302sgy"; + }; + + vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; + + subPackages = [ + "cmd/stripe" + ]; + + meta = with stdenv.lib; { + homepage = "https://stripe.com/docs/stripe-cli"; + description = "A command-line tool for Stripe"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ RaghavSood ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix index 023bf45777..5b7ab80d86 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sourceRoot = "source/pico"; preConfigure = "./autogen.sh"; meta = { - description = "Text to speech voice sinthesizer from SVox."; + description = "Text to speech voice sinthesizer from SVox"; homepage = "https://github.com/naggety/picotts"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.canndrew ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix index 13e5882788..2804ed7a0b 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp pbzx $out/bin ''; meta = with lib; { - description = "Stream parser of Apple's pbzx compression format."; + description = "Stream parser of Apple's pbzx compression format"; platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.matthewbauer ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/convoy/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/convoy/default.nix index f12187be81..3372ec8353 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/convoy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/convoy/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/rancher/convoy"; - description = "A Docker volume plugin, managing persistent container volumes."; + description = "A Docker volume plugin, managing persistent container volumes"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 4758dece42..612db49c8a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0yziqgvjjb5bblmm060li7dv1i23gpn0f75jb72z8cdf2wg1qmxb"; + sha256 = "175wlvn6psa3xx9g2i05xykk24wpmkr0m27rm95jyi0kzlqdc466"; }; - cargoSha256 = "1y4q6p6hbmpwdpahmspgngm842qrq1srl7319wslq9ydl09m1x3x"; + cargoSha256 = "01gf8v6q2rpaik6dyxch8n2mpaxp222v32zrw19059hn3smg98l0"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix index cce1ec4951..4d2b44456a 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, which, gtk2, gtk3, qt4, qt5, libXtst, lib, -enableChewing ? true, libchewing, -enableAnthy ? true, anthy, }: +# chewing and anthy do not work well +# so we do not enable these input method at this moment + stdenv.mkDerivation { name = "hime"; version = "unstable-2020-06-27"; @@ -16,25 +17,18 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ] - ++ lib.optional enableChewing libchewing - ++ lib.optional enableAnthy anthy; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; - patchPhase = '' - patchShebangs configure - ''; - - # The configure script already auto-detect libchewing and anthy, - # so we do not need additional flags for libchewing or anthy + preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; meta = with stdenv.lib; { - homepage = "http://hime-ime.github.io/"; - downloadPage = "https://github.com/hime-ime/hime/downloads"; - description = "A useful input method engine for Asia region"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ yanganto ]; + homepage = "http://hime-ime.github.io/"; + downloadPage = "https://github.com/hime-ime/hime/downloads"; + description = "A useful input method engine for Asia region"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ yanganto ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix index 489a24c3a5..0b2883f70a 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.2"; meta = with stdenv.lib; { - description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; + description = "Manipulate the scancode/keycode translation tables of keyboard drivers"; homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix index be47d42dc8..31ef3e2487 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/pycampers/ampy"; license = licenses.mit; - description = "Utility to interact with a MicroPython board over a serial connection."; + description = "Utility to interact with a MicroPython board over a serial connection"; maintainers = with maintainers; [ etu ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix index 29538f9401..cff96a4ec8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk"; meta = with stdenv.lib; { - description = "Create asciinema videos from a text file."; + description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; maintainers = with maintainers; [ garbas ]; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index 62ca179cfd..fb0868016d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.0"; + version = "1.0.3"; src = fetchCrate { inherit pname version; - sha256 = "1dc6lb6ihj4s0mcp1say16j9yr61jdbzhmayxxsm4ansngbzmw45"; + sha256 = "046yg270hnwzhap2rraihywpqjq5s3qxmyfcvfgfayz25216jmvc"; }; - cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg"; + cargoSha256 = "02l6cdfx2sglygsdgnm474vmpbmpm2a1s6srd9cy66k6hjm1m0bn"; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix index 9afdd93ad0..5ed477c93a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Terminal graphics for the 21st century."; + description = "Terminal graphics for the 21st century"; homepage = "https://hpjansson.org/chafa/"; license = licenses.lgpl3Plus; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index d7b7646afe..448c0859c5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.5"; + version = "1.8.7"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "16sv1kbd66rllnnl851y3x54wkl0p7g0qsblprvfr9715svk1835"; + sha256 = "1inmrcp01rxrjylkj9vzgw3q713q6jsqbnqllbzvp8q6kqfliayg"; }; - vendorSha256 = "1i9d672mzmb97s26n0v01m70g4viyl9pdk25haxr6ny4rab2wbi7"; + vendorSha256 = "0m946g6iw42q5ggki2j1lqdshpsxjmdsm1snnyzjzyy8gd88m4cx"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix index da504ad3ba..2a3fa24269 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { cargoSha256 = "0pm048xf8hkva8q8fjmhrdnk7h2im28ix7xy784xwkkdnilm4j7f"; meta = with lib; { - description = "Scriptable, curses-based, digital habit tracker."; + description = "Scriptable, curses-based, digital habit tracker"; homepage = "https://github.com/NerdyPepper/dijo"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix index 267983dd43..b132079a28 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool."; + description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool"; license = stdenv.lib.licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index 312c7bbe3e..bf0496037b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.10"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra"; + sha256 = "1q7y5agsi6wjb1dnyvdhm4qmdhpv30cx5a8m1blks8is9z2bblz0"; }; - cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626"; + cargoSha256 = "0r2zj0dvf6h4ph3b75z2rdlqwzkdjrjj2iad4dbf9nsr63giwd9n"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/go.rice/default.nix b/third_party/nixpkgs/pkgs/tools/misc/go.rice/default.nix index 340b2d41c6..33e6975bb0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/go.rice/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/go.rice/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/GeertJohan/go.rice"; - description = "A Go package that makes working with resources such as html, js, css, images, templates very easy."; + description = "A Go package that makes working with resources such as html, js, css, images, templates very easy"; license = licenses.bsd2; maintainers = with maintainers; [ blaggacao ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index cd60f0e98f..36a7055f87 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { license = licenses.mit; homepage = "https://github.com/gotify/cli"; - description = "A command line interface for pushing messages to gotify/server."; + description = "A command line interface for pushing messages to gotify/server"; maintainers = with maintainers; [ ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix index bf0daa38ab..a0e884e82d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "01draql3x71h7xl2xcc69dv7vpi3smnajhrvaihs5vij81pyfrzk"; meta = with lib; { - description = "Lightweight selection tool for usage in screenshot scripts etc."; + description = "Lightweight selection tool for usage in screenshot scripts etc"; homepage = "https://github.com/neXromancers/hacksaw"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ TethysSvensson ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ical2org/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ical2org/default.nix index ffdb4e93f5..bcba352d6d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ical2org/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ical2org/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; + description = "Convert an iCal file to org agenda format, optionally deduplicating entries"; homepage = "https://github.com/rjhorniii/ical2org"; license = licenses.gpl3; maintainers = with maintainers; [ swflint ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix index fe5d724e69..438758a794 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "1wqf227ljfys16jfbxi6mlkgdczgqrh15ixl9vi6higlxfi2wsj2"; + sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68"; }; - cargoSha256 = "0lx8y1y5mf8ga7iz74dnfyf2b9jx15wishw0khfxknmh96h2y99h"; + cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix index eb9805b22d..ac40eb762d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/kubespray/kargo-cli"; - description = "A tool helps to deploy a kubernetes cluster with Ansible."; + description = "A tool helps to deploy a kubernetes cluster with Ansible"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix index f4653f81f3..2d96819e87 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { }; meta = with stdenv.lib; { - description = "Print license based on selection and user options."; + description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; license = licenses.bsd3; maintainers = with maintainers; [ swflint ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix index 76c287fe39..a7b2f6282f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Displays a real-time count of strings received from stdin."; + description = "Displays a real-time count of strings received from stdin"; longDescription = '' logtop displays a real-time count of strings received from stdin. It can be useful in some cases, like getting the IP flooding your diff --git a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index 3705d7df6f..19dafb4cef 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "Translation platform for developers. Upload language files, translate, integrate via API."; + description = "Translation platform for developers. Upload language files, translate, integrate via API"; homepage = "https://lokalise.com"; license = licenses.bsd3; maintainers = with maintainers; [ timstott ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix index 883e353b0b..9bfc7e259d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { ''; meta = with lib; { - description = "Monitor a process and trigger a notification."; + description = "Monitor a process and trigger a notification"; longDescription = '' Monitor a process and trigger a notification. diff --git a/third_party/nixpkgs/pkgs/tools/misc/nyancat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nyancat/default.nix index a7b0661478..d4092c237d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nyancat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nyancat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Nyancat in your terminal, rendered through ANSI escape sequences."; + description = "Nyancat in your terminal, rendered through ANSI escape sequences"; homepage = "https://nyancat.dakko.us"; license = licenses.ncsa; maintainers = with maintainers; [ midchildan ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix index 61a0f14d59..cdf0ab862d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/timofurrer/pandoc-plantuml-filter"; - description = "Pandoc filter which converts PlantUML code blocks to PlantUML images."; + description = "Pandoc filter which converts PlantUML code blocks to PlantUML images"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix index 186235be44..e08a5b576d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/kward/shunit2"; - description = "A xUnit based unit test framework for Bourne based shell scripts."; + description = "A xUnit based unit test framework for Bourne based shell scripts"; maintainers = with maintainers; [ cdepillabout utdemir ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix index 99de1c3d17..7c3d6a4f70 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with lib; { - description = "Create beautiful image of your source code."; + description = "Create beautiful image of your source code"; homepage = "https://github.com/Aloxaf/silicon"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ evanjs ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix b/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix index 66ae899b9c..448323f434 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://sites.google.com/site/tranter/software"; - description = "Display serial port modem status lines."; + description = "Display serial port modem status lines"; license = licenses.gpl2; longDescription = diff --git a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 0c7e0141f9..a3e973be54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1d969ig4w6irx5822crhpab2f53svpiyf1vfx87irapy309dqy2y"; + sha256 = "0gcw7hwbr9jniwvqix37vvd2fiplsz70qab9w45d21i8jrfnhxb5"; }; pythonPaths = [ pycrypto pyyaml requests ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/td/default.nix b/third_party/nixpkgs/pkgs/tools/misc/td/default.nix index f4b120d1bc..bca5bd601d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/td/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/td/default.nix @@ -8,7 +8,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "td"; meta = with lib; { - description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; + description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing"; homepage = "https://github.com/treasure-data/td"; license = licenses.asl20; maintainers = with maintainers; [ groodt nicknovitski ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix index b2d31a6291..d923a3f449 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/nvbn/thefuck"; - description = "Magnificent app which corrects your previous console command."; + description = "Magnificent app which corrects your previous console command"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix index 91203e5f7b..cc192951ca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -35,7 +35,7 @@ appimageTools.wrapType2 rec { meta = with lib; { homepage = "https://wooting.io/wootility"; - description = "Wootility is customization and management software for Wooting keyboards."; + description = "Wootility is customization and management software for Wooting keyboards"; platforms = [ "x86_64-linux" ]; license = "unknown"; maintainers = with maintainers; [ davidtwco ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 01454b4825..5b5fb66be3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; - description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; + description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index a6b0a93324..505d26bb58 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; - description = "Command line tool for configuring any YubiKey over all USB transports."; + description = "Command line tool for configuring any YubiKey over all USB transports"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index 61746ebfcc..6277c158f2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.10.3"; + version = "3.10.5"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc"; + sha256 = "0zxjgg9z45cs116wa643dfh12skz8zydb85vn03ss150hdlgspda"; }; - vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; + vendorSha256 = "1l7y2h7kpvj6lh3dki5sw0ziyzwihfy0scdk8jqf108ca23g8zv8"; outputs = [ "out" "wordlists" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 58bb1e3e39..909f08e7bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0963yfbf88hb5fvyckhs1vfvib5skkj9n17qibpv5vsdlynbaa96"; + sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; }; - cargoSha256 = "0xp45kb0z7wiq6vnws4q7khbzslywh24sb43ssr39l1rajf7w64r"; + cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index 4447ab0f04..9127168941 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "0cbbih035h40hhl7ykmyh9q9nzdqq1p8hmvzd4358cigz1gjc3j2"; + sha256 = "16dgpq67bcy9z5lqwykwh61kwxi164khxqc78i6a3dc9xyivwfya"; }; - vendorSha256 = "0s7mhbjfpfmzqf48d7k0d416m39x6fh5ds4q3xnvhcfx5kmdymq6"; + vendorSha256 = "0gmyq54h9zb4ry2p24nsp8ybqrmaq69zlyp220w16kamx790j07j"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 97da6497c6..1211ff14da 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0c8gj4fv5q8zl48lfvw06rxng2scgivb6zls136kxq5f2fb2dyk5"; + sha256 = "1b0bcqgvlalgz82s1dnq7lkmwvznc5vnh27al9j1dqg4hx97md2j"; }; - vendorSha256 = "0cgvbwxscmqjzva0bp5sqb4hnvk2ww50yqw34iya5lk2db9vn3ha"; + vendorSha256 = "15bis2hssk7x2r0m728l1rmbl8nl5p4kzdf5382bcs8p3hscp0gl"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 8f279ff688..68739507d3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.32.0"; + version = "0.32.6"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "14iwwg1iqfxjhpw9p3ddq53l901v9l9n2r60q9q6jls8hfqcgsnj"; + sha256 = "0wcn2wr521n2vcmpnwphgycq109251nkfdr0wzn7lk2zl5qx81ax"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix index 7109a29454..b0369ec80b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; meta = with stdenv.lib; { - description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; + description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; maintainers = with maintainers; [ andir ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index 2caf18d9a4..a98c634f90 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx"; + sha256 = "0g0kw1b18kk9jhvw88hcxc04ccj8k22fdzky7l2dv3r37vndd91w"; }; - cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk"; + cargoSha256 = "0cmp4w86qnzd2b2w4s3w019857pxysgikkl1g7ldkiylrsm5vlpn"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix index 7ecfb559dc..86010f4adb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "flannel"; - version = "0.12.0"; + version = "0.13.0"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd"; + sha256 = "0mmswnaybwpf18h832haapcs5b63wn5w2hax0smm3inldiggsbw8"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 6bc05139f8..0e00009751 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1f0cr7211wkam1204x6gsflhw7gc995lia3jq4v6n3ijfwy5vyvm"; + sha256 = "1n1b7rr6njblz3rmsdl6xng4swlagg2z3jnik0gnajiq3w8ajwdj"; }; - vendorSha256 = "1ym4qcqgbbj6pa4cgmxmny7krxwjfl8l02hb3r5jh9qj886fwhdr"; + vendorSha256 = "18d9478ndzywwmh0jsxcb4i2rqyn3vzrgwflqrsv7krijalknsc9"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix index 3daa6a983b..86548bf995 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { homepage = "https://github.com/buger/goreplay"; license = stdenv.lib.licenses.lgpl3Only; - description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic."; + description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix index be3ed2ea2c..a9fb7c823f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "0b6rc294v8jagk79hcjbaldfi7y7idx8bknsbdi3djym5rspdg6s"; + sha256 = "1l8ldx7nx2pa2ac5znss0j0dhapn3syj02xqys4jz22hr5gvfj6m"; }; - vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9"; + vendorSha256 = "15qgpbsl41swifw8w1lx0pbniwv3rf35127ald7h1r157vfa0r8b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mcrcon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mcrcon/default.nix index 4f943f2cec..7a5e8b8c5a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mcrcon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mcrcon/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/"; - description = "Minecraft console client with Bukkit coloring support."; + description = "Minecraft console client with Bukkit coloring support"; longDescription = '' Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support. It is well suited for remote administration and to be used as part of automated server maintenance scripts. diff --git a/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix index dea0d10a27..daaa483149 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; - description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client."; + description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client"; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix index ecceed2166..32fb053f81 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -62,7 +62,7 @@ buildPythonApplication rec { ]; meta = with stdenv.lib; { - description = "Persepolis Download Manager is a GUI for aria2."; + description = "Persepolis Download Manager is a GUI for aria2"; homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/quickserve/default.nix b/third_party/nixpkgs/pkgs/tools/networking/quickserve/default.nix index 8f4876b6ee..53d649d791 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/quickserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/quickserve/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "A simple HTTP server for quickly sharing files."; + description = "A simple HTTP server for quickly sharing files"; homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix index e2a0c900c5..283131b567 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://software.nordu.net/radsecproxy/"; - description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports."; + description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports"; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix index 6901166e38..e1e711ef16 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap libnet ]; meta = { - description = "A traceroute implementation using TCP packets."; + description = "A traceroute implementation using TCP packets"; homepage = "https://github.com/mct/tcptraceroute"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 081819458f..4ca5529bdc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; meta = with stdenv.lib; { - description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; + description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short"; homepage = "https://tendermint.com/"; license = licenses.asl20; maintainers = with maintainers; [ alexfmpe ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index b01f1a4142..1c35e0ccd5 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -4,12 +4,12 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "0.1.0.0"; + version = "0.1.0.2"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1k9fni02y7xb97mkif1k7s0y1xv06hnqbkds35k4gg8mnf5z911i"; - rev = "a0e0b09"; + sha256 = "0r4348cbmnpawbfa20qw3wnywiqp0jkl5svzl27jrm2yk2g51509"; + rev = "5bf7534"; }; isLibrary = true; isExecutable = true; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-script/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-script/default.nix index da8ba3bce8..d604463bb0 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-script/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-script/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "A shebang for running inside nix-shell."; + description = "A shebang for running inside nix-shell"; homepage = "https://github.com/bennofs/nix-script"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs rnhmjoj ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix index 8da05981da..f86cdc55ec 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix @@ -12,7 +12,7 @@ bundlerEnv rec { passthru.updateScript = bundlerUpdateScript "elm-github-install"; meta = with lib; { - description = "Install Elm packages from git repositories."; + description = "Install Elm packages from git repositories"; homepage = "https://github.com/gdotdesign/elm-github-install"; license = licenses.unfree; maintainers = with maintainers; [ roberth nicknovitski ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix index 5ae4f5731b..1a75fa43d4 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { outputs = [ "out" "lib" ]; meta = with lib; { - description = "Morph is a NixOS host manager written in Golang."; + description = "Morph is a NixOS host manager written in Golang"; license = licenses.mit; homepage = "https://github.com/dbcdk/morph"; maintainers = with maintainers; [adamt johanot]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index d559ca8921..63e2ae12a6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://mynewt.apache.org/"; - description = "Build and package management tool for embedded development."; + description = "Build and package management tool for embedded development"; longDescription = '' Apache Newt is a smart build and package management tool, designed for C and C++ applications in embedded contexts. Newt diff --git a/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix b/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix index 5b79b3db70..3e61b124fe 100644 --- a/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers."; + description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers"; longDescription = '' acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers. This library provides a PC/SC IFD handler implementation and diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 847d5d0caf..8858fb1575 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.10.3"; + version = "3.15.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4"; + sha256 = "06icddb99ahmi5djrslpqsjjd38agvkhnfls5wqahclf0j4dylr6"; }; vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsatool/default.nix b/third_party/nixpkgs/pkgs/tools/security/ecdsatool/default.nix index 524f38982c..b1a86fe7e6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ecdsatool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ecdsatool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = with pkgs; [libuecc]; meta = with stdenv.lib; { - description = "Create and manipulate ECC NISTP256 keypairs."; + description = "Create and manipulate ECC NISTP256 keypairs"; homepage = "https://github.com/kaniini/ecdsatool/"; license = with licenses; [free]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/security/fpm2/default.nix b/third_party/nixpkgs/pkgs/tools/security/fpm2/default.nix index 3d082523f6..aff4e1ee1e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fpm2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fpm2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { - description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; + description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; homepage = "https://als.regnet.cz/fpm2/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix index 39a84112d6..4310d3a891 100644 --- a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with stdenv.lib; { - description = "A simple yet robust commandline random password generator."; + description = "A simple yet robust commandline random password generator"; homepage = "https://github.com/cyplo/genpass"; license = licenses.agpl3; maintainers = with maintainers; [ cyplo ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 15ad1c70a8..80a9c40ebc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -54,7 +54,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; + description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go"; homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ andir rvolosatovs ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/hashdeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/hashdeep/default.nix index 8c8ab5b01a..4ad656462b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hashdeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hashdeep/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - description = "A set of cross-platform tools to compute hashes."; + description = "A set of cross-platform tools to compute hashes"; homepage = "https://github.com/jessek/hashdeep"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix index 63752b5f12..4ffc4133c1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.1.2"; + version = "6.1.3"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "0y73a5p23rg4zx6vkgpq1p3j2dzqcvzwn1ymswfkqm5zihbi17d7"; + sha256 = "1bbf617islljmcw665vqwlplbkpa36w2n4fc4avy7blj773lxp6y"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix index 7c5a2d5a4c..9a8722ac26 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/AdRoll/hologram/"; - description = "Easy, painless AWS credentials on developer laptops."; + description = "Easy, painless AWS credentials on developer laptops"; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix index b61a39d603..78935040fe 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1zyggdsnxzdbfyxk5jcx9r4ra049ddb51krc81s6nik27d5nivmf"; + sha256 = "0n83d4zvy74rn38fqq84lm58l24c3r87m2di2sw4cdr1hkjg3nbl"; }; - cargoSha256 = "0yxqn8jhcj4rxp0g77jsdp02g5qbc0axaaz1j4gp1bkcww6a9k7v"; + cargoSha256 = "0kafyljn3b87k5m0wdii0gfa4wj1yfys8jqx79inj82m0w1khprk"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix index ee1cfa9d2a..bd1ee471b7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://www.keybase.io/"; - description = "The Keybase official command-line utility and service."; + description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ]; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix index 20ae3878a7..49f1e2beb4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; meta = with lib; { - description = "A simple tool for generating self signed certificates."; + description = "A simple tool for generating self signed certificates"; longDescription = '' Minica is a simple CA intended for use in situations where the CA operator also operates each host where a certificate will be used. It diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index dd7d96c361..9e778a636c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "0.4.6"; + version = "0.5.0"; src = fetchCrate { inherit version; crateName = "${pname}"; - sha256 = "0vq7cwk3i57fvn54q2rgln74j4p9vqm5zyhap94s73swjywicwk0"; + sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw"; }; - cargoSha256 = "1h253ncick2v9aki5rf1bdrg5rj3h4nrvx5q01gw03cgwnqvyiiy"; + cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063"; nativeBuildInputs = [ pkgconfig @@ -73,7 +73,6 @@ rustPlatform.buildRustPackage rec { description = "Unofficial command line client for Bitwarden"; homepage = "https://crates.io/crates/rbw"; license = licenses.mit; - maintainers = with maintainers; [ albakham luc65r ]; - platforms = platforms.all; + maintainers = with maintainers; [ albakham luc65r marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/zzuf/default.nix b/third_party/nixpkgs/pkgs/tools/security/zzuf/default.nix index 5dab990e22..428f1ec1d0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/zzuf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/zzuf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - description = "Transparent application input fuzzer."; + description = "Transparent application input fuzzer"; homepage = "http://caca.zoy.org/wiki/zzuf"; license = licenses.wtfpl; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/system/incron/default.nix b/third_party/nixpkgs/pkgs/tools/system/incron/default.nix index 4b5709e622..d407982bb6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/incron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/incron/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A cron-like daemon which handles filesystem events."; + description = "A cron-like daemon which handles filesystem events"; homepage = "https://github.com/ar-/incron"; license = licenses.gpl2; maintainers = [ maintainers.aanderse ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix index f19f50e5e3..2ede543cd3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.07-1"; + version = "3.1.08-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0hs4m2vmfc6srscaz72r6zpkn6n7msgzlps376ks38gj1l103xfn"; + sha256 = "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a"; }; buildInputs = [ perl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix index 9966ace14f..d8e838dd36 100644 --- a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Jump helps you navigate faster by learning your habits."; + description = "Jump helps you navigate faster by learning your habits"; longDescription = '' Jump integrates with the shell and learns about your navigational habits by keeping track of the directories you visit. It diff --git a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix b/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix index 5febbcb6ef..436fa5cae6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "Page Cache stat: get page cache stats for files on Linux."; + description = "Page Cache stat: get page cache stats for files on Linux"; homepage = "https://github.com/tobert/pcstat"; license = licenses.asl20; maintainers = with maintainers; [ aminechikhaoui ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix b/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix index d15683894a..023cc58f4a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "fastmod"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; rev = "v${version}"; - sha256 = "0089a17h0wgan3fs6x1la35lzjs1pib7p81wqkh3zcwvx8ffa8z8"; + sha256 = "0nrh6h5imbpl7i0sqqm16x9ggazww5739vng1ay1v6sgbbs0a095"; }; - cargoSha256 = "02nkxjwfiljndmi0pv98chfsw9vmjzgmp5r14mchpayp4943qk9m"; + cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix index 28f2c54729..bf082abadb 100644 --- a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex libtool ]; meta = with stdenv.lib; { - description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON."; + description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON"; homepage = "http://johnkerl.org/miller/"; license = licenses.bsd2; maintainers = with maintainers; [ mstarzyk ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix b/third_party/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix index b53c5646e7..e621d13f01 100644 --- a/third_party/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/monochromegane/the_platinum_searcher"; - description = "A code search tool similar to ack and the_silver_searcher(ag)."; + description = "A code search tool similar to ack and the_silver_searcher(ag)"; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 8a63d82eac..e2fb6b71ea 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.3.4"; + version = "2.4.3"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0vk7kk2a2891vm46lss8q2893n2zdirlicac2f3xfkrbb5lhkicd"; + sha256 = "1qjsrwabqg9brr5q46dl0zrhy5m5qqp68m5v0kskwkykd3r97qwn"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix index 6bfb0188a3..a41276ea43 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { - description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby."; + description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby"; homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index 3b54eb637d..655cd5a61e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -26,7 +26,7 @@ let # }; meta = with lib; { - description = "A kramdown extension for converting Markdown documents to AsciiDoc."; + description = "A kramdown extension for converting Markdown documents to AsciiDoc"; homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 34060ffb05..db976e9022 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "0dzqf67y4ci1vsl3zhmjkzfnf22w2bbk5w5qj2gryzrhp1q9ajyr"; + sha256 = "VHhvdIBFPE5CkWVQ4tzMionUnAkZTucVXl5zp5prgok="; }; - cargoSha256 = "1p0wzylkw1gxaff0m47il7qa0dfflxdyshvkvdirvjidg5cam9bk"; + cargoSha256 = "/f/suiI5XzI0+lCscsqLZTWU6slHdXgR+5epYpxyU1w="; nativeBuildInputs = [ pkgconfig ]; @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; license = with licenses; [ mit ]; - maintainers = [ maintainers.lluchs ]; + maintainers = [ maintainers.lluchs maintainers.doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix index 2565d9346b..8b9cd18cd0 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { }; meta = with lib; { - description = "CLI for Apache CloudStack."; + description = "CLI for Apache CloudStack"; homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 3e9cdc8e87..df24809689 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -222,6 +222,8 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 + julia_07 = throw "deprecated in favor of julia_10 LTS"; # added 2020-09-15 + julia_11 = throw "deprecated in favor of latest Julia version"; # added 2020-09-15 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 @@ -301,6 +303,8 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 3c4189b831..9534a53d61 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -1106,6 +1106,8 @@ in google-amber = callPackage ../tools/graphics/amber { }; + hime = callPackage ../tools/inputmethods/hime {}; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -2412,6 +2414,8 @@ in string-machine = callPackage ../applications/audio/string-machine { }; + stripe-cli = callPackage ../tools/admin/stripe-cli { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; @@ -5617,13 +5621,6 @@ in nabi = callPackage ../tools/inputmethods/nabi { }; - hime = callPackage ../tools/inputmethods/hime {}; - - hime-all = callPackage ../tools/inputmethods/hime { - enableChewing = true; - enableAnthy = true; - }; - nahid-fonts = callPackage ../data/fonts/nahid-fonts { }; namazu = callPackage ../tools/text/namazu { }; @@ -9328,21 +9325,11 @@ in javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - julia_07 = callPackage ../development/compilers/julia/0.7.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - julia_11 = callPackage ../development/compilers/julia/1.1.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_13 = callPackage ../development/compilers/julia/1.3.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -9374,6 +9361,8 @@ in knightos-scas = callPackage ../development/tools/knightos/scas { }; + knightos-z80e = callPackage ../development/tools/knightos/z80e { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -9577,7 +9566,7 @@ in inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 - ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_15_0; + ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0; orc = callPackage ../development/compilers/orc { }; @@ -12345,7 +12334,9 @@ in egl-wayland = callPackage ../development/libraries/egl-wayland {}; - elastix = callPackage ../development/libraries/science/biology/elastix { }; + elastix = callPackage ../development/libraries/science/biology/elastix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; @@ -14716,7 +14707,6 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; - opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -20739,7 +20729,7 @@ in gradio = callPackage ../applications/audio/gradio { }; - puddletag = callPackage ../applications/audio/puddletag { }; + puddletag = libsForQt5.callPackage ../applications/audio/puddletag { }; w_scan = callPackage ../applications/video/w_scan { }; @@ -20855,11 +20845,6 @@ in freecad = libsForQt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; - freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix { - mpi = openmpi; - opencascade-occt = opencascade-occt730; - python3Packages = python37Packages; - }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -22131,8 +22116,7 @@ in mopidy mopidy-gmusic mopidy-iris - mopidy-local-images - mopidy-local-sqlite + mopidy-local mopidy-moped mopidy-mopify mopidy-mpd @@ -24170,7 +24154,9 @@ in wofi = callPackage ../applications/misc/wofi { }; - wordnet = callPackage ../applications/misc/wordnet { }; + wordnet = callPackage ../applications/misc/wordnet { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; wordgrinder = callPackage ../applications/office/wordgrinder { }; @@ -28311,4 +28297,5 @@ in cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {}; + psftools = callPackage ../os-specific/linux/psftools {}; } diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 6f6c45a27d..1b0e299fe0 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -9956,6 +9956,22 @@ let }; }; + IOAsyncSSL = buildPerlModule { + pname = "IO-Async-SSL"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz"; + sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21"; + }; + buildInputs = [ TestIdentity ]; + propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; + meta = { + description = "Use SSL/TLS with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + IOCapture = buildPerlPackage { pname = "IO-Capture"; version = "0.05"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 809a54de67..6d2d7bed26 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -150,6 +150,8 @@ in { absl-py = callPackage ../development/python-modules/absl-py { }; + accuweather = callPackage ../development/python-modules/accuweather { }; + accupy = callPackage ../development/python-modules/accupy { }; acebinf = callPackage ../development/python-modules/acebinf { }; @@ -452,6 +454,8 @@ in { attrs = callPackage ../development/python-modules/attrs { }; + aubio = callPackage ../development/python-modules/aubio { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; audioread = callPackage ../development/python-modules/audioread { }; @@ -2002,6 +2006,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fastprogress = callPackage ../development/python-modules/fastprogress { }; + fastrlock = callPackage ../development/python-modules/fastrlock { }; fasttext = callPackage ../development/python-modules/fasttext { }; @@ -4510,6 +4516,8 @@ in { python-csxcad = callPackage ../development/python-modules/python-csxcad { }; + python-openems = callPackage ../development/python-modules/python-openems { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; @@ -6309,6 +6317,8 @@ in { sabyenc = callPackage ../development/python-modules/sabyenc { }; + sacn = callPackage ../development/python-modules/sacn { }; + sacremoses = callPackage ../development/python-modules/sacremoses { }; safe = callPackage ../development/python-modules/safe { }; @@ -7546,6 +7556,8 @@ in { willow = callPackage ../development/python-modules/willow { }; + wled = callPackage ../development/python-modules/wled { }; + word2vec = callPackage ../development/python-modules/word2vec { }; wordcloud = callPackage ../development/python-modules/wordcloud { };