git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commita510aa2672dae525c1eb152f00fd0e6f8eb10f39 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateMon 3 Dec 2018, 12:18 (8 years ago) parent077b7e5e869896
388 files changed+3024−1286
doc/languages-frameworks/haskell.section.md+1−1 doc/meta.xml+4−4 doc/stdenv.xml+37 lib/systems/examples.nix+4 lib/systems/parse.nix+13−10 maintainers/maintainer-list.nix+10 maintainers/scripts/update.nix+19−34 maintainers/scripts/update.py+79 nixos/doc/manual/configuration/adding-custom-packages.xml+1−1 nixos/doc/manual/release-notes/rl-1903.xml+3−1 nixos/modules/installer/cd-dvd/iso-image.nix+3−1 nixos/modules/misc/ids.nix+2 nixos/modules/module-list.nix+3 nixos/modules/programs/nm-applet.nix+14 nixos/modules/programs/sway-beta.nix+13−2 nixos/modules/services/databases/cockroachdb.nix+222 nixos/modules/services/editors/emacs.xml+1−1 nixos/modules/services/misc/bees.nix+123 nixos/modules/services/networking/chrony.nix+3−2 nixos/modules/services/networking/dhcpcd.nix+1−1 nixos/modules/services/search/kibana.nix+4−1 nixos/tests/bees.nix+55 nixos/tests/cockroachdb.nix+126 pkgs/applications/audio/faust/faust1.nix+1−1 pkgs/applications/audio/faust/faust2.nix+1−1 pkgs/applications/audio/lash/default.nix+1−1 pkgs/applications/audio/lingot/default.nix+1−1 pkgs/applications/audio/mi2ly/default.nix+1−1 pkgs/applications/audio/mi2ly/default.upstream+1−1 pkgs/applications/audio/mimms/default.nix+1−1 pkgs/applications/audio/normalize/default.nix+1−1 pkgs/applications/audio/sonata/default.nix+1−1 pkgs/applications/audio/whipper/default.nix+8−5 pkgs/applications/audio/whipper/paths.patch−73 pkgs/applications/editors/ed/default.nix+1−1 pkgs/applications/editors/emacs-modes/bbdb/3.nix+2−2 pkgs/applications/editors/emacs-modes/color-theme/default.nix+1−1 pkgs/applications/editors/emacs-modes/emms/default.nix+2−2 pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix+3−7 pkgs/applications/editors/emacs-modes/let-alist/default.nix+2−2 pkgs/applications/editors/emacs/25.nix+1−1 pkgs/applications/editors/emacs/default.nix+1−1 pkgs/applications/editors/emacs/macport.nix+1−1 pkgs/applications/editors/leafpad/default.nix+1−1 pkgs/applications/editors/moe/default.nix+1−1 pkgs/applications/editors/textadept/default.nix+1−1 pkgs/applications/editors/zile/default.nix+1−1 pkgs/applications/graphics/pqiv/default.nix+2−2 pkgs/applications/misc/aminal/default.nix+2−2 pkgs/applications/misc/devilspie2/default.nix+1−1 pkgs/applications/misc/eaglemode/default.nix+1−1 pkgs/applications/misc/gksu/default.nix+1−1 pkgs/applications/misc/gtk2fontsel/default.nix+1−1 pkgs/applications/misc/gv/default.nix+1−1 pkgs/applications/misc/hello/default.nix+1−1 pkgs/applications/misc/rofi/default.nix+1−1 pkgs/applications/misc/xlog/default.nix+2−2 pkgs/applications/networking/browsers/firefox-bin/default.nix+1−1 pkgs/applications/networking/browsers/firefox-bin/update.nix+3−1 pkgs/applications/networking/browsers/firefox/update.nix+2 pkgs/applications/networking/esniper/default.nix+1−1 pkgs/applications/networking/instant-messengers/freetalk/default.nix+1−1 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+233−233 pkgs/applications/networking/mailreaders/thunderbird/default.nix+3−3 pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2 pkgs/applications/office/mendeley/default.nix+1−1 pkgs/applications/office/mendeley/update.nix+2−1 pkgs/applications/science/electronics/archimedes/default.nix+1−1 pkgs/applications/science/math/maxima/default.nix+1−1 pkgs/applications/science/math/pspp/default.nix+1−1 pkgs/applications/science/math/sage/env-locations.nix+1−1 pkgs/applications/science/math/sage/sage-env.nix+2 pkgs/applications/science/math/sage/sagenb.nix+2−1 pkgs/applications/science/math/scilab-bin/default.nix+33−2 pkgs/applications/science/misc/motu-client/default.nix+2−2 pkgs/applications/version-management/arch/default.nix+1−1 pkgs/applications/version-management/git-and-tools/git-secrets/default.nix+14−22 pkgs/applications/version-management/rcs/default.nix+1−1 pkgs/applications/window-managers/dwm/dwm-status.nix+10−4 pkgs/applications/window-managers/ratpoison/default.nix+1−1 pkgs/applications/window-managers/tabbed/default.nix+3−3 pkgs/data/documentation/std-man-pages/default.nix+1−1 pkgs/data/fonts/freefont-ttf/default.nix+1−1 pkgs/data/machine-learning/mnist/default.nix+45 pkgs/data/misc/miscfiles/default.nix+1−1 pkgs/desktops/deepin/update.nix+2−1 pkgs/desktops/gnome-2/desktop/mail-notification/default.nix+1−1 pkgs/desktops/gnome-3/update.nix+12−7 pkgs/development/compilers/fpc/default.upstream+1−1 pkgs/development/compilers/gcc/4.8/default.nix+2−2 pkgs/development/compilers/gcc/4.9/default.nix+2−2 pkgs/development/compilers/gcc/5/default.nix+2−2 pkgs/development/compilers/gcc/6/default.nix+2−2 pkgs/development/compilers/gcc/7/default.nix+2−2 pkgs/development/compilers/gcc/8/default.nix+2−2 pkgs/development/compilers/gcc/snapshot/default.nix+2−2 pkgs/development/compilers/gcl/2.6.13-pre.nix+1−1 pkgs/development/compilers/ghc/8.4.4.nix+5−1 pkgs/development/compilers/gprolog/default.nix+1−1 pkgs/development/compilers/manticore/default.nix+3−3 pkgs/development/compilers/mit-scheme/default.nix+1−1 pkgs/development/compilers/smlnj/bootstrap.nix+3−3 pkgs/development/compilers/smlnj/default.nix+24−23 pkgs/development/coq-modules/math-classes/default.nix+3−3 pkgs/development/guile-modules/guile-gnome/default.nix+1−1 pkgs/development/guile-modules/guile-lib/default.nix+1−1 pkgs/development/guile-modules/guile-opengl/default.nix+1−1 pkgs/development/guile-modules/guile-sdl/default.nix+1−1 pkgs/development/interpreters/gnu-apl/default.nix+1−1 pkgs/development/interpreters/guile/1.8.nix+2−2 pkgs/development/interpreters/guile/2.0.nix+3−3 pkgs/development/interpreters/guile/default.nix+1−1 pkgs/development/interpreters/lush/default.upstream+1−1 pkgs/development/interpreters/regina/default.upstream+1−1 pkgs/development/libraries/acl/default.nix+1−1 pkgs/development/libraries/attr/default.nix+1−1 pkgs/development/libraries/ccrtp/1.8.nix+1−1 pkgs/development/libraries/ccrtp/default.nix+1−1 pkgs/development/libraries/commoncpp2/default.nix+1−1 pkgs/development/libraries/gcc/libstdc++/5.nix+1−1 pkgs/development/libraries/gdbm/default.nix+1−1 pkgs/development/libraries/geoclue/default.nix+23−26 pkgs/development/libraries/gettext/default.nix+1−1 pkgs/development/libraries/glibc/common.nix+1−1 pkgs/development/libraries/glpk/default.nix+1−1 pkgs/development/libraries/gnu-config/default.nix+3−3 pkgs/development/libraries/gnutls-kdh/generic.nix+1−1 pkgs/development/libraries/gnutls/generic.nix+1−1 pkgs/development/libraries/gsasl/default.nix+1−1 pkgs/development/libraries/gsignond/default.nix+3−4 pkgs/development/libraries/gsignond/plugins/lastfm.nix+1−1 pkgs/development/libraries/gsignond/plugins/mail.nix+5−5 pkgs/development/libraries/gsignond/plugins/oauth.nix+1−1 pkgs/development/libraries/gsignond/plugins/sasl.nix+1−1 pkgs/development/libraries/gsignond/wrapper.nix+2 pkgs/development/libraries/gsl/default.nix+2−2 pkgs/development/libraries/gsl/gsl-1_16.nix+3−3 pkgs/development/libraries/gss/default.nix+1−1 pkgs/development/libraries/hyperscan/default.nix+69 pkgs/development/libraries/judy/default.nix+1−1 pkgs/development/libraries/libbfd/default.nix+1−1 pkgs/development/libraries/libcdio/default.nix+1−1 pkgs/development/libraries/libchop/default.nix+2−2 pkgs/development/libraries/libe-book/default.upstream+1−1 pkgs/development/libraries/libgksu/default.nix+1−1 pkgs/development/libraries/libiberty/default.nix+1−1 pkgs/development/libraries/libiconv/default.nix+1−1 pkgs/development/libraries/libidn/default.nix+1−1 pkgs/development/libraries/libmicrohttpd/default.nix+1−1 pkgs/development/libraries/libmwaw/default.upstream+1−1 pkgs/development/libraries/libnih/default.nix+1−1 pkgs/development/libraries/libodfgen/default.upstream+1−1 pkgs/development/libraries/libopcodes/default.nix+1−1 pkgs/development/libraries/librevenge/default.upstream+1−1 pkgs/development/libraries/libsignon-glib/default.nix+4−6 pkgs/development/libraries/libsigsegv/default.nix+1−1 pkgs/development/libraries/libtasn1/default.nix+1−1 pkgs/development/libraries/libunistring/default.nix+1−1 pkgs/development/libraries/libunwind/default.nix+1−1 pkgs/development/libraries/libxmi/default.nix+1−1 pkgs/development/libraries/lightning/default.nix+1−1 pkgs/development/libraries/ncurses/default.nix+1−1 pkgs/development/libraries/opencascade/default.nix+3−3 pkgs/development/libraries/opencv/3.x.nix+23−10 pkgs/development/libraries/opencv/4.x.nix+307 pkgs/development/libraries/osip/default.nix+1−1 pkgs/development/libraries/png++/default.nix+1−1 pkgs/development/libraries/pth/default.nix+1−1 pkgs/development/libraries/qt-5/5.6/default.nix+1−1 pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch+30 pkgs/development/libraries/qt-5/5.9/default.nix+1−1 pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch+30 pkgs/development/libraries/readline/6.2.nix+1−1 pkgs/development/libraries/readline/6.3.nix+1−1 pkgs/development/libraries/readline/7.0.nix+1−1 pkgs/development/libraries/safefile/default.nix+1 pkgs/development/libraries/science/math/or-tools/default.nix+11−20 pkgs/development/libraries/tinyxml/2.6.2.nix+1−1 pkgs/development/libraries/tsocks/default.nix+1 pkgs/development/libraries/ucommon/default.nix+1−1 pkgs/development/libraries/vcdimager/default.nix+1−1 pkgs/development/misc/avr/libc/default.nix+2−2 pkgs/development/misc/qmk_firmware/default.nix+12−1 pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix+7 pkgs/development/ocaml-modules/bisect_ppx/default.nix+24 pkgs/development/ocaml-modules/opti/default.nix+18 pkgs/development/python-modules/docutils/default.nix+9−4 pkgs/development/python-modules/effect/default.nix+3−5 pkgs/development/python-modules/mmpython/default.nix+1−1 pkgs/development/python-modules/ntfy/default.nix−39 pkgs/development/python-modules/pycdio/default.nix+1−1 pkgs/development/python-modules/ruamel_yaml/default.nix+2−2 pkgs/development/python-modules/sybil/default.nix+8−1 pkgs/development/ruby-modules/solargraph/Gemfile.lock+8−10 pkgs/development/ruby-modules/solargraph/default.nix+3−3 pkgs/development/ruby-modules/solargraph/gemset.nix+11−19 pkgs/development/tools/analysis/radare2/default.nix+7−7 pkgs/development/tools/build-managers/gnumake/4.2/default.nix+1−1 pkgs/development/tools/build-managers/gup/default.nix+1 pkgs/development/tools/build-managers/mill/default.nix+40 pkgs/development/tools/build-managers/sbt/default.nix+2−2 pkgs/development/tools/gnulib/default.nix+2−2 pkgs/development/tools/guile/g-wrap/default.nix+1−1 pkgs/development/tools/java/fastjar/default.nix+2−2 pkgs/development/tools/jq/default.nix+1−1 pkgs/development/tools/misc/autoconf-archive/default.nix+1−1 pkgs/development/tools/misc/autoconf/2.13.nix+1−1 pkgs/development/tools/misc/autoconf/2.64.nix+1−1 pkgs/development/tools/misc/autoconf/default.nix+1−1 pkgs/development/tools/misc/autogen/default.nix+1−1 pkgs/development/tools/misc/automake/automake-1.11.x.nix+2−2 pkgs/development/tools/misc/automake/automake-1.16.x.nix+1−1 pkgs/development/tools/misc/avrdude/default.nix+1−1 pkgs/development/tools/misc/binutils/default.nix+1−1 pkgs/development/tools/misc/cflow/default.nix+1−1 pkgs/development/tools/misc/complexity/default.nix+1−1 pkgs/development/tools/misc/cppi/default.nix+1−1 pkgs/development/tools/misc/ddd/default.nix+1−1 pkgs/development/tools/misc/dejagnu/default.nix+2−2 pkgs/development/tools/misc/gdb/default.nix+1−1 pkgs/development/tools/misc/gengetopt/default.nix+1−1 pkgs/development/tools/misc/global/default.nix+1−1 pkgs/development/tools/misc/gnum4/default.nix+1−1 pkgs/development/tools/misc/gperf/3.0.x.nix+1−1 pkgs/development/tools/misc/gperf/default.nix+1−1 pkgs/development/tools/misc/help2man/default.nix+1−1 pkgs/development/tools/misc/kibana/default.nix+11−4 pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch+19 pkgs/development/tools/misc/libtool/default.nix+1−1 pkgs/development/tools/misc/libtool/libtool2.nix+1−1 pkgs/development/tools/misc/texi2html/default.nix+1−1 pkgs/development/tools/misc/texinfo/common.nix+1−1 pkgs/development/tools/misc/uisp/default.nix+1−1 pkgs/development/tools/parsing/bison/2.x.nix+1−1 pkgs/development/tools/parsing/bison/3.x.nix+1−1 pkgs/development/tools/pyre/default.nix+11−15 pkgs/development/tools/quilt/default.nix+1−1 pkgs/development/tools/rust/rustup/default.nix+4−4 pkgs/development/tools/sunxi-tools/default.nix+4−4 pkgs/development/web/nodejs/nodejs.nix+1−1 pkgs/development/web/nodejs/update.nix+3−1 pkgs/games/ball-and-paddle/default.nix+1−1 pkgs/games/crack-attack/default.nix+1−1 pkgs/games/cuyo/default.nix+1−1 pkgs/games/gltron/default.nix+1−1 pkgs/games/gnuchess/default.upstream+1−1 pkgs/games/gnugo/default.nix+1−1 pkgs/games/gtypist/default.nix+1−1 pkgs/games/liquidwar/5.nix+1−1 pkgs/games/liquidwar/default.nix+1−1 pkgs/games/minecraft/default.nix+7−2 pkgs/games/quantumminigolf/default.upstream+1−1 pkgs/games/soi/default.nix+1−1 pkgs/games/tinyfugue/default.nix+1−1 pkgs/games/xboard/default.nix+4−3 pkgs/games/xboard/default.upstream+1−1 pkgs/misc/logging/beats/6.x.nix+9−2 pkgs/misc/vscode-extensions/default.nix+2 pkgs/misc/vscode-extensions/vscode-utils.nix+6−6 pkgs/misc/vscode-extensions/wakatime/default.nix+30 pkgs/os-specific/linux/apparmor/default.nix−5 pkgs/os-specific/linux/conspy/default.upstream+1−1 pkgs/os-specific/linux/dmidecode/default.nix+1−1 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.18.nix−18 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-libre.nix+2−2 pkgs/os-specific/linux/kmod/darwin.patch+123 pkgs/os-specific/linux/kmod/default.nix+6−4 pkgs/os-specific/linux/lm-sensors/default.nix+9−15 pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch−62 pkgs/os-specific/linux/nvidia-x11/default.nix+1 pkgs/os-specific/linux/nvidia-x11/generic.nix+2 pkgs/os-specific/linux/sysvinit/default.nix+1−1 pkgs/os-specific/linux/tp_smapi/default.nix+1−1 pkgs/os-specific/linux/tp_smapi/update.nix+2−1 pkgs/os-specific/linux/usbutils/default.nix+9−8 pkgs/os-specific/linux/usbutils/fix-paths.patch+16 pkgs/servers/dico/default.nix+1−1 pkgs/servers/dict/dictd-db.nix+3−3 pkgs/servers/http/myserver/default.nix+1−1 pkgs/servers/mail/mailman/default.nix+1−1 pkgs/servers/mail/postfix/default.nix+4−4 pkgs/servers/mail/rspamd/default.nix+23−8 pkgs/servers/mpd/default.nix+2−2 pkgs/servers/p910nd/default.nix+1−1 pkgs/servers/pies/default.nix+1−1 pkgs/servers/quagga/default.nix+1−1 pkgs/servers/search/elasticsearch/default.nix+10−4 pkgs/servers/search/elasticsearch/plugins.nix+4−4 pkgs/servers/shishi/default.nix+1−1 pkgs/servers/sip/sipwitch/default.nix+1−1 pkgs/servers/trezord/default.nix+2−2 pkgs/shells/bash/4.4.nix+1−1 pkgs/shells/rush/default.nix+1−1 pkgs/shells/zsh/antibody/default.nix+5−6 pkgs/shells/zsh/antibody/deps.nix+73−110 pkgs/tools/X11/autocutsel/default.nix+1−1 pkgs/tools/X11/xbindkeys/default.nix+1−1 pkgs/tools/X11/xnee/default.nix+1−1 pkgs/tools/admin/aws-google-auth/default.nix+62 pkgs/tools/archivers/atool/default.nix+1−1 pkgs/tools/archivers/cpio/default.nix+1−1 pkgs/tools/archivers/gnutar/default.nix+1−1 pkgs/tools/archivers/sharutils/default.nix+1−1 pkgs/tools/backup/duplicity/default.nix+2−2 pkgs/tools/backup/duply/default.nix+2−2 pkgs/tools/backup/store-backup/default.nix+2−2 pkgs/tools/cd-dvd/xorriso/default.nix+1−1 pkgs/tools/compression/lzip/default.nix+1−1 pkgs/tools/filesystems/bees/bees-service-wrapper+223 pkgs/tools/filesystems/bees/default.nix+69 pkgs/tools/filesystems/davfs2/default.nix+1−1 pkgs/tools/filesystems/nixpart/0.4/parted.nix+1−1 pkgs/tools/graphics/asymptote/default.upstream+1−1 pkgs/tools/graphics/barcode/default.nix+2−2 pkgs/tools/graphics/dmtx-utils/default.upstream+1−1 pkgs/tools/graphics/fim/default.nix+1−1 pkgs/tools/graphics/icoutils/default.nix+1−1 pkgs/tools/graphics/oxipng/default.nix+3−3 pkgs/tools/graphics/plotutils/default.nix+1−1 pkgs/tools/graphics/scanbd/default.nix+1−1 pkgs/tools/inputmethods/m17n-db/default.nix+2−2 pkgs/tools/inputmethods/m17n-lib/default.nix+2−2 pkgs/tools/inputmethods/m17n-lib/otf.nix+2−2 pkgs/tools/misc/bc/default.nix+1−1 pkgs/tools/misc/coreutils/default.nix+1−1 pkgs/tools/misc/datamash/default.nix+1−1 pkgs/tools/misc/fileschanged/default.nix+1−1 pkgs/tools/misc/findutils/default.nix+1−1 pkgs/tools/misc/grub/2.0x.nix+1−1 pkgs/tools/misc/grub/trusted.nix+1−1 pkgs/tools/misc/idutils/default.nix+1−1 pkgs/tools/misc/logstash/default.nix+2−2 pkgs/tools/misc/ntfy/default.nix+37 pkgs/tools/misc/parallel/default.nix+1−1 pkgs/tools/misc/parted/default.nix+1−1 pkgs/tools/misc/recutils/default.nix+1−1 pkgs/tools/misc/renameutils/default.nix+1−1 pkgs/tools/misc/screen/default.nix+1−1 pkgs/tools/misc/stow/default.nix+1−1 pkgs/tools/misc/systrayhelper/default.nix+4−4 pkgs/tools/misc/systrayhelper/deps.nix+7−7 pkgs/tools/misc/time/default.nix+1−1 pkgs/tools/misc/uucp/default.nix+1−1 pkgs/tools/misc/vdirsyncer/default.nix+17−2 pkgs/tools/misc/yubikey-manager/default.nix+7−5 pkgs/tools/networking/dropbear/default.nix+1−1 pkgs/tools/networking/flvstreamer/default.nix+1−1 pkgs/tools/networking/gandi-cli/default.nix+9−10 pkgs/tools/networking/inetutils/default.nix+1−1 pkgs/tools/networking/jwhois/default.nix+1−1 pkgs/tools/networking/mailutils/default.nix+1−1 pkgs/tools/networking/network-manager/applet.nix+1−1 pkgs/tools/networking/wget/default.nix+1−1 pkgs/tools/package-management/nix-pin/default.nix+1 pkgs/tools/package-management/nix-update-source/default.nix+2−1 pkgs/tools/security/gnu-pw-mgr/default.nix+1−1 pkgs/tools/security/monkeysphere/default.nix+4−2 pkgs/tools/security/oath-toolkit/default.nix+1−1 pkgs/tools/system/acct/default.nix+1−1 pkgs/tools/system/ddrescue/default.nix+1−1 pkgs/tools/system/fdisk/default.nix+2−2 pkgs/tools/system/freeipmi/default.nix+2−2 pkgs/tools/system/mcron/default.nix+1−1 pkgs/tools/system/s-tui/default.nix+2−2 pkgs/tools/system/which/default.nix+1−1 pkgs/tools/text/diffutils/default.nix+1−1 pkgs/tools/text/enscript/default.nix+1−1 pkgs/tools/text/gawk/default.nix+1−1 pkgs/tools/text/gnugrep/default.nix+1−1 pkgs/tools/text/gnupatch/default.nix+1−1 pkgs/tools/text/gnused/422.nix+1−1 pkgs/tools/text/gnused/default.nix+1−1 pkgs/tools/text/groff/default.nix+1−1 pkgs/tools/text/numdiff/default.nix+1−1 pkgs/tools/text/poedit/default.nix+1−1 pkgs/tools/text/recode/default.nix+1−1 pkgs/tools/text/source-highlight/default.nix+1−1 pkgs/tools/text/wdiff/default.nix+1−1 pkgs/tools/typesetting/lout/default.nix+4−4 pkgs/tools/typesetting/tex/auctex/default.nix+1−1 pkgs/top-level/all-packages.nix+27−18 pkgs/top-level/coq-packages.nix+3−1 pkgs/top-level/ocaml-packages.nix+5 pkgs/top-level/python-packages.nix+5−2
doc/languages-frameworks/haskell.section.md+1−1
@@ -935,7 +935,7 @@ The implementation can be found in the
935935[integer-gmp](http://hackage.haskell.org/package/integer-gmp) package.
936936
937937A potential problem with this is that GMP is licensed under the
938−[GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html),
938+[GNU Lesser General Public License (LGPL)](https://www.gnu.org/copyleft/lesser.html),
939939a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5,
940940you may distribute a program that is designed to be compiled and dynamically
941941linked with the library under the terms of your choice (i.e., commercially) but
doc/meta.xml+4−4
@@ -14,7 +14,7 @@ meta = with stdenv.lib; {
1414 GNU Hello is a program that prints "Hello, world!" when you run it.
1515 It is fully customizable.
1616 '';
17− homepage = http://www.gnu.org/software/hello/manual/;
17+ homepage = https://www.gnu.org/software/hello/manual/;
1818 license = licenses.gpl3Plus;
1919 maintainers = [ maintainers.eelco ];
2020 platforms = platforms.all;
@@ -35,7 +35,7 @@ $ nix-env -qa hello --json
3535 "hello": {
3636 "meta": {
3737 "description": "A program that produces a familiar, friendly greeting",
38− "homepage": "http://www.gnu.org/software/hello/manual/",
38+ "homepage": "https://www.gnu.org/software/hello/manual/",
3939 "license": {
4040 "fullName": "GNU General Public License version 3 or later",
4141 "shortName": "GPLv3+",
@@ -135,7 +135,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
135135 <listitem>
136136 <para>
137137 The package’s homepage. Example:
138− <literal>http://www.gnu.org/software/hello/manual/</literal>
138+ <literal>https://www.gnu.org/software/hello/manual/</literal>
139139 </para>
140140 </listitem>
141141 </varlistentry>
@@ -146,7 +146,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
146146 <listitem>
147147 <para>
148148 The page where a link to the current version can be found. Example:
149− <literal>http://ftp.gnu.org/gnu/hello/</literal>
149+ <literal>https://ftp.gnu.org/gnu/hello/</literal>
150150 </para>
151151 </listitem>
152152 </varlistentry>
doc/stdenv.xml+37
@@ -671,6 +671,43 @@ passthru = {
671671 </para>
672672 </listitem>
673673 </varlistentry>
674+ <varlistentry>
675+ <term>
676+ <varname>passthru.updateScript</varname>
677+ </term>
678+ <listitem>
679+ <para>
680+ A script to be run by <filename>maintainers/scripts/update.nix</filename> when
681+ the package is matched. It needs to be an executable file, either on the file
682+ system:
683+<programlisting>
684+passthru.updateScript = ./update.sh;
685+</programlisting>
686+ or inside the expression itself:
687+<programlisting>
688+passthru.updateScript = writeScript "update-zoom-us" ''
689+ #!/usr/bin/env nix-shell
690+ #!nix-shell -i bash -p curl pcre common-updater-scripts
691+
692+ set -eu -o pipefail
693+
694+ version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
695+ update-source-version zoom-us "$version"
696+'';
697+</programlisting>
698+ The attribute can also contain a list, a script followed by arguments to be passed to it:
699+<programlisting>
700+passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
701+</programlisting>
702+ Note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that.
703+ </para>
704+
705+ <para>
706+ For information about how to run the updates, execute
707+ <cmdsynopsis><command>nix-shell</command> <arg>maintainers/scripts/update.nix</arg></cmdsynopsis>.
708+ </para>
709+ </listitem>
710+ </varlistentry>
674711 </variablelist>
675712 </section>
676713 <section xml:id="sec-stdenv-phases">
lib/systems/examples.nix+4
@@ -110,6 +110,10 @@ rec {
110110 config = "arm-none-eabi";
111111 libc = "newlib";
112112 };
113+ armhf-embedded = {
114+ config = "arm-none-eabihf";
115+ libc = "newlib";
116+ };
113117
114118 aarch64-embedded = {
115119 config = "aarch64-none-elf";
lib/systems/parse.nix+13−10
@@ -209,8 +209,15 @@ rec {
209209 abis = setTypes types.openAbi {
210210 cygnus = {};
211211 msvc = {};
212− eabi = {};
213− elf = {};
212+
213+ # Note: eabi is specific to ARM and PowerPC.
214+ # On PowerPC, this corresponds to PPCEABI.
215+ # On ARM, this corresponds to ARMEABI.
216+ eabi = { float = "soft"; };
217+ eabihf = { float = "hard"; };
218+
219+ # Other architectures should use ELF in embedded situations.
220+ elf = {};
214221
215222 androideabi = {};
216223 android = {
@@ -272,10 +279,8 @@ rec {
272279 "2" = # We only do 2-part hacks for things Nix already supports
273280 if elemAt l 1 == "cygwin"
274281 then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
275− else if (elemAt l 1 == "eabi")
276− then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
277− else if (elemAt l 1 == "elf")
278− then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
282+ else if (elemAt l 1) == "elf"
283+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
279284 else { cpu = elemAt l 0; kernel = elemAt l 1; };
280285 "3" = # Awkwards hacks, beware!
281286 if elemAt l 1 == "apple"
@@ -286,10 +291,8 @@ rec {
286291 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
287292 else if hasPrefix "netbsd" (elemAt l 2)
288293 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
289− else if (elemAt l 2 == "eabi")
290− then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
291− else if (elemAt l 2 == "elf")
292− then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
294+ else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
295+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
293296 else throw "Target specification with 3 components is ambiguous";
294297 "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
295298 }.${toString (length l)}
maintainers/maintainer-list.nix+10
@@ -2052,6 +2052,11 @@
20522052 github = "jluttine";
20532053 name = "Jaakko Luttinen";
20542054 };
2055+ jmagnusj = {
2056+ email = "jmagnusj@gmail.com";
2057+ github = "magnusjonsson";
2058+ name = "Johan Magnus Jonsson";
2059+ };
20552060 jmettes = {
20562061 email = "jonathan@jmettes.com";
20572062 github = "jmettes";
@@ -3856,6 +3861,11 @@
38563861 github = "sboosali";
38573862 name = "Sam Boosalis";
38583863 };
3864+ scalavision = {
3865+ email = "scalavision@gmail.com";
3866+ github = "scalavision";
3867+ name = "Tom Sorlie";
3868+ };
38593869 schmitthenner = {
38603870 email = "development@schmitthenner.eu";
38613871 github = "fkz";
maintainers/scripts/update.nix+19−34
@@ -1,6 +1,8 @@
11{ package ? null
22, maintainer ? null
33, path ? null
4+, max-workers ? null
5+, keep-going ? null
46}:
57
68# TODO: add assert statements
@@ -105,27 +107,24 @@ let
105107 % nix-shell maintainers/scripts/update.nix --argstr path gnome3
106108
107109 to run update script for all package under an attribute path.
108− '';
109110
110− runUpdateScript = package: ''
111− echo -ne " - ${package.name}: UPDATING ..."\\r
112− ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log
113− CODE=$?
114− if [ "$CODE" != "0" ]; then
115− echo " - ${package.name}: ERROR "
116− echo ""
117− echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
118− echo ""
119− cat ${(builtins.parseDrvName package.name).name}.log
120− echo ""
121− echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
122− exit $CODE
123− else
124− rm ${(builtins.parseDrvName package.name).name}.log
125− fi
126− echo " - ${package.name}: DONE. "
111+ You can also add
112+
113+ --argstr max-workers 8
114+
115+ to increase the number of jobs in parallel, or
116+
117+ --argstr keep-going true
118+
119+ to continue running when a single update fails.
127120 '';
128121
122+ packageData = package: {
123+ name = package.name;
124+ pname = (builtins.parseDrvName package.name).name;
125+ updateScript = pkgs.lib.toList package.updateScript;
126+ };
127+
129128in pkgs.stdenv.mkDerivation {
130129 name = "nixpkgs-update-script";
131130 buildCommand = ''
@@ -139,21 +138,7 @@ in pkgs.stdenv.mkDerivation {
139138 exit 1
140139 '';
141140 shellHook = ''
142− echo ""
143− echo "Going to be running update for following packages:"
144− echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}"
145− echo ""
146− read -n1 -r -p "Press space to continue..." confirm
147− if [ "$confirm" = "" ]; then
148− echo ""
149− echo "Running update for:"
150− ${builtins.concatStringsSep "\n" (map runUpdateScript packages)}
151− echo ""
152− echo "Packages updated!"
153− exit 0
154− else
155− echo "Aborting!"
156− exit 1
157− fi
141+ unset shellHook # do not contaminate nested shells
142+ exec ${pkgs.python3.interpreter} ${./update.py} ${pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages))}${pkgs.lib.optionalString (max-workers != null) " --max-workers=${max-workers}"}${pkgs.lib.optionalString (keep-going == "true") " --keep-going"}
158143 '';
159144}
maintainers/scripts/update.pynew file+79
@@ -0,0 +1,79 @@
1+import argparse
2+import concurrent.futures
3+import json
4+import os
5+import subprocess
6+import sys
7+
8+updates = {}
9+
10+def eprint(*args, **kwargs):
11+ print(*args, file=sys.stderr, **kwargs)
12+
13+def run_update_script(package):
14+ eprint(f" - {package['name']}: UPDATING ...")
15+
16+ subprocess.run(package['updateScript'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
17+
18+
19+def main(max_workers, keep_going, packages):
20+ with open(sys.argv[1]) as f:
21+ packages = json.load(f)
22+
23+ eprint()
24+ eprint('Going to be running update for following packages:')
25+ for package in packages:
26+ eprint(f" - {package['name']}")
27+ eprint()
28+
29+ confirm = input('Press Enter key to continue...')
30+ if confirm == '':
31+ eprint()
32+ eprint('Running update for:')
33+
34+ with concurrent.futures.ProcessPoolExecutor(max_workers=max_workers) as executor:
35+ for package in packages:
36+ updates[executor.submit(run_update_script, package)] = package
37+
38+ for future in concurrent.futures.as_completed(updates):
39+ package = updates[future]
40+
41+ try:
42+ future.result()
43+ eprint(f" - {package['name']}: DONE.")
44+ except subprocess.CalledProcessError as e:
45+ eprint(f" - {package['name']}: ERROR")
46+ eprint()
47+ eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
48+ eprint()
49+ eprint(e.stdout.decode('utf-8'))
50+ with open(f"{package['pname']}.log", 'wb') as f:
51+ f.write(e.stdout)
52+ eprint()
53+ eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
54+
55+ if not keep_going:
56+ sys.exit(1)
57+
58+ eprint()
59+ eprint('Packages updated!')
60+ sys.exit()
61+ else:
62+ eprint('Aborting!')
63+ sys.exit(130)
64+
65+parser = argparse.ArgumentParser(description='Update packages')
66+parser.add_argument('--max-workers', '-j', dest='max_workers', type=int, help='Number of updates to run concurrently', nargs='?', default=4)
67+parser.add_argument('--keep-going', '-k', dest='keep_going', action='store_true', help='Do not stop after first failure')
68+parser.add_argument('packages', help='JSON file containing the list of package names and their update scripts')
69+
70+if __name__ == '__main__':
71+ args = parser.parse_args()
72+
73+ try:
74+ main(args.max_workers, args.keep_going, args.packages)
75+ except (KeyboardInterrupt, SystemExit) as e:
76+ for update in updates:
77+ update.cancel()
78+
79+ sys.exit(e.code if isinstance(e, SystemExit) else 130)
nixos/doc/manual/configuration/adding-custom-packages.xml+1−1
@@ -31,7 +31,7 @@ $ cd nixpkgs
3131 <para>
3232 The second possibility is to add the package outside of the Nixpkgs tree. For
3333 instance, here is how you specify a build of the
34− <link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
34+ <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link>
3535 package directly in <filename>configuration.nix</filename>:
3636<programlisting>
3737<xref linkend="opt-environment.systemPackages"/> =
nixos/doc/manual/release-notes/rl-1903.xml+3−1
@@ -39,7 +39,9 @@
3939
4040 <itemizedlist>
4141 <listitem>
42− <para />
42+ <para>
43+ <literal>./programs/nm-applet.nix</literal>
44+ </para>
4345 </listitem>
4446 </itemizedlist>
4547 </section>
nixos/modules/installer/cd-dvd/iso-image.nix+3−1
@@ -339,7 +339,9 @@ let
339339 echo "Image size: $image_size"
340340 truncate --size=$image_size "$out"
341341 ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
342− mcopy -bpsvm -i "$out" ./* ::
342+ mcopy -psvm -i "$out" ./* ::
343+ # Verify the FAT partition.
344+ ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
343345 ''; # */
344346
345347 targetArch = if pkgs.stdenv.isi686 then
nixos/modules/misc/ids.nix+2
@@ -337,6 +337,7 @@
337337 alerta = 310;
338338 minetest = 311;
339339 rss2email = 312;
340+ cockroachdb = 313;
340341
341342 # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
342343
@@ -634,6 +635,7 @@
634635 alerta = 310;
635636 minetest = 311;
636637 rss2email = 312;
638+ cockroachdb = 313;
637639
638640 # When adding a gid, make sure it doesn't match an existing
639641 # uid. Users and groups with the same name should have equal
nixos/modules/module-list.nix+3
@@ -106,6 +106,7 @@
106106 ./programs/mininet.nix
107107 ./programs/mtr.nix
108108 ./programs/nano.nix
109+ ./programs/nm-applet.nix
109110 ./programs/npm.nix
110111 ./programs/oblogout.nix
111112 ./programs/plotinus.nix
@@ -212,6 +213,7 @@
212213 ./services/databases/aerospike.nix
213214 ./services/databases/cassandra.nix
214215 ./services/databases/clickhouse.nix
216+ ./services/databases/cockroachdb.nix
215217 ./services/databases/couchdb.nix
216218 ./services/databases/firebird.nix
217219 ./services/databases/foundationdb.nix
@@ -339,6 +341,7 @@
339341 ./services/misc/apache-kafka.nix
340342 ./services/misc/autofs.nix
341343 ./services/misc/autorandr.nix
344+ ./services/misc/bees.nix
342345 ./services/misc/bepasty.nix
343346 ./services/misc/canto-daemon.nix
344347 ./services/misc/calibre-server.nix
nixos/modules/programs/nm-applet.nixnew file+14
@@ -0,0 +1,14 @@
1+{ config, lib, pkgs, ... }:
2+
3+{
4+ options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet";
5+
6+ config = lib.mkIf config.programs.nm-applet.enable {
7+ systemd.user.services.nm-applet = {
8+ description = "Network manager applet";
9+ wantedBy = [ "graphical-session.target" ];
10+ partOf = [ "graphical-session.target" ];
11+ serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
12+ };
13+ };
14+}
nixos/modules/programs/sway-beta.nix+13−2
@@ -7,8 +7,19 @@ let
77 swayPackage = cfg.package;
88
99 swayWrapped = pkgs.writeShellScriptBin "sway" ''
10− ${cfg.extraSessionCommands}
11− exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway "$@"
10+ set -o errexit
11+
12+ if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
13+ export _SWAY_WRAPPER_ALREADY_EXECUTED=1
14+ ${cfg.extraSessionCommands}
15+ fi
16+
17+ if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
18+ export DBUS_SESSION_BUS_ADDRESS
19+ exec ${swayPackage}/bin/sway "$@"
20+ else
21+ exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@"
22+ fi
1223 '';
1324 swayJoined = pkgs.symlinkJoin {
1425 name = "sway-joined";
nixos/modules/services/databases/cockroachdb.nixnew file+222
@@ -0,0 +1,222 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.cockroachdb;
7+ crdb = cfg.package;
8+
9+ escape = builtins.replaceStrings ["%"] ["%%"];
10+ ifNotNull = v: s: optionalString (!isNull v) s;
11+
12+ startupCommand = lib.concatStringsSep " "
13+ [ # Basic startup
14+ "${crdb}/bin/cockroach start"
15+ "--logtostderr"
16+ "--store=${cfg.dataDir}"
17+ (ifNotNull cfg.locality "--locality='${cfg.locality}'")
18+
19+ # WebUI settings
20+ "--http-addr='${cfg.http.address}:${toString cfg.http.port}'"
21+
22+ # Cluster listen address
23+ "--listen-addr='${cfg.listen.address}:${toString cfg.listen.port}'"
24+
25+ # Cluster configuration
26+ (ifNotNull cfg.join "--join=${cfg.join}")
27+
28+ # Cache and memory settings. Must be escaped.
29+ "--cache='${escape cfg.cache}'"
30+ "--max-sql-memory='${escape cfg.maxSqlMemory}'"
31+
32+ # Certificate/security settings.
33+ (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}")
34+ ];
35+
36+ addressOption = descr: defaultPort: {
37+ address = mkOption {
38+ type = types.str;
39+ default = "localhost";
40+ description = "Address to bind to for ${descr}";
41+ };
42+
43+ port = mkOption {
44+ type = types.int;
45+ default = defaultPort;
46+ description = "Port to bind to for ${descr}";
47+ };
48+ };
49+in
50+
51+{
52+ options = {
53+ services.cockroachdb = {
54+ enable = mkEnableOption "CockroachDB Server";
55+
56+ listen = addressOption "intra-cluster communication" 26257;
57+
58+ http = addressOption "http-based Admin UI" 8080;
59+
60+ locality = mkOption {
61+ type = types.nullOr types.str;
62+ default = null;
63+ description = ''
64+ An ordered, comma-separated list of key-value pairs that describe the
65+ topography of the machine. Topography might include country,
66+ datacenter or rack designations. Data is automatically replicated to
67+ maximize diversities of each tier. The order of tiers is used to
68+ determine the priority of the diversity, so the more inclusive
69+ localities like country should come before less inclusive localities
70+ like datacenter. The tiers and order must be the same on all nodes.
71+ Including more tiers is better than including fewer. For example:
72+
73+ country=us,region=us-west,datacenter=us-west-1b,rack=12
74+ country=ca,region=ca-east,datacenter=ca-east-2,rack=4
75+
76+ planet=earth,province=manitoba,colo=secondary,power=3
77+ '';
78+ };
79+
80+ join = mkOption {
81+ type = types.nullOr types.str;
82+ default = null;
83+ description = "The addresses for connecting the node to a cluster.";
84+ };
85+
86+ dataDir = mkOption {
87+ type = types.path;
88+ default = "/var/lib/cockroachdb";
89+ description = "Location where CockroachDB stores its table files";
90+ };
91+
92+ insecure = mkOption {
93+ type = types.bool;
94+ default = false;
95+ description = "Run in insecure mode.";
96+ };
97+
98+ certsDir = mkOption {
99+ type = types.nullOr types.path;
100+ default = null;
101+ description = "The path to the certificate directory.";
102+ };
103+
104+ user = mkOption {
105+ type = types.str;
106+ default = "cockroachdb";
107+ description = "User account under which CockroachDB runs";
108+ };
109+
110+ group = mkOption {
111+ type = types.str;
112+ default = "cockroachdb";
113+ description = "User account under which CockroachDB runs";
114+ };
115+
116+ openPorts = mkOption {
117+ type = types.bool;
118+ default = false;
119+ description = "Open firewall ports for cluster communication by default";
120+ };
121+
122+ cache = mkOption {
123+ type = types.str;
124+ default = "25%";
125+ description = ''
126+ The total size for caches.
127+
128+ This can be a percentage, expressed with a fraction sign or as a
129+ decimal-point number, or any bytes-based unit. For example, "25%",
130+ "0.25" both represent 25% of the available system memory. The values
131+ "1000000000" and "1GB" both represent 1 gigabyte of memory.
132+ '';
133+ };
134+
135+ maxSqlMemory = mkOption {
136+ type = types.str;
137+ default = "25%";
138+ description = ''
139+ The maximum in-memory storage capacity available to store temporary
140+ data for SQL queries.
141+
142+ This can be a percentage, expressed with a fraction sign or as a
143+ decimal-point number, or any bytes-based unit. For example, "25%",
144+ "0.25" both represent 25% of the available system memory. The values
145+ "1000000000" and "1GB" both represent 1 gigabyte of memory.
146+ '';
147+ };
148+
149+ package = mkOption {
150+ type = types.package;
151+ default = pkgs.cockroachdb;
152+ defaultText = "pkgs.cockroachdb";
153+ description = ''
154+ The CockroachDB derivation to use for running the service.
155+
156+ This would primarily be useful to enable Enterprise Edition features
157+ in your own custom CockroachDB build (Nixpkgs CockroachDB binaries
158+ only contain open source features and open source code).
159+ '';
160+ };
161+ };
162+ };
163+
164+ config = mkIf config.services.cockroachdb.enable {
165+ assertions = [
166+ { assertion = !cfg.insecure -> !(isNull cfg.certsDir);
167+ message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)";
168+ }
169+ ];
170+
171+ environment.systemPackages = [ crdb ];
172+
173+ users.users = optionalAttrs (cfg.user == "cockroachdb") (singleton
174+ { name = "cockroachdb";
175+ description = "CockroachDB Server User";
176+ uid = config.ids.uids.cockroachdb;
177+ group = cfg.group;
178+ });
179+
180+ users.groups = optionalAttrs (cfg.group == "cockroachdb") (singleton
181+ { name = "cockroachdb";
182+ gid = config.ids.gids.cockroachdb;
183+ });
184+
185+ networking.firewall.allowedTCPPorts = lib.optionals cfg.openPorts
186+ [ cfg.http.port cfg.listen.port ];
187+
188+ systemd.services.cockroachdb =
189+ { description = "CockroachDB Server";
190+ documentation = [ "man:cockroach(1)" "https://www.cockroachlabs.com" ];
191+
192+ after = [ "network.target" "time-sync.target" ];
193+ requires = [ "time-sync.target" ];
194+ wantedBy = [ "multi-user.target" ];
195+
196+ unitConfig.RequiresMountsFor = "${cfg.dataDir}";
197+
198+ preStart = ''
199+ if ! test -e ${cfg.dataDir}; then
200+ mkdir -m 0700 -p ${cfg.dataDir}
201+ chown -R ${cfg.user} ${cfg.dataDir}
202+ fi
203+ '';
204+
205+ serviceConfig =
206+ { ExecStart = startupCommand;
207+ Type = "notify";
208+ User = cfg.user;
209+ PermissionsStartOnly = true;
210+
211+ Restart = "always";
212+ TimeoutStopSec="60";
213+ RestartSec="10";
214+ StandardOutput="syslog";
215+ StandardError="syslog";
216+ SyslogIdentifier="cockroach";
217+ };
218+ };
219+ };
220+
221+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
222+}
nixos/modules/services/editors/emacs.xml+1−1
@@ -11,7 +11,7 @@
1111 Rodney Lorrimar @rvl
1212 -->
1313 <para>
14− <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link> is an
14+ <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
1515 extensible, customizable, self-documenting real-time display editor — and
1616 more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
1717 programming language with extensions to support text editing.
nixos/modules/services/misc/bees.nixnew file+123
@@ -0,0 +1,123 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+
7+ cfg = config.services.beesd;
8+
9+ logLevels = { emerg = 0; alert = 1; crit = 2; err = 3; warning = 4; notice = 5; info = 6; debug = 7; };
10+
11+ fsOptions = with types; {
12+ options.spec = mkOption {
13+ type = str;
14+ description = ''
15+ Description of how to identify the filesystem to be duplicated by this
16+ instance of bees. Note that deduplication crosses subvolumes; one must
17+ not configure multiple instances for subvolumes of the same filesystem
18+ (or block devices which are part of the same filesystem), but only for
19+ completely independent btrfs filesystems.
20+ </para>
21+ <para>
22+ This must be in a format usable by findmnt; that could be a key=value
23+ pair, or a bare path to a mount point.
24+ '';
25+ example = "LABEL=MyBulkDataDrive";
26+ };
27+ options.hashTableSizeMB = mkOption {
28+ type = types.addCheck types.int (n: mod n 16 == 0);
29+ default = 1024; # 1GB; default from upstream beesd script
30+ description = ''
31+ Hash table size in MB; must be a multiple of 16.
32+ </para>
33+ <para>
34+ A larger ratio of index size to storage size means smaller blocks of
35+ duplicate content are recognized.
36+ </para>
37+ <para>
38+ If you have 1TB of data, a 4GB hash table (which is to say, a value of
39+ 4096) will permit 4KB extents (the smallest possible size) to be
40+ recognized, whereas a value of 1024 -- creating a 1GB hash table --
41+ will recognize only aligned duplicate blocks of 16KB.
42+ '';
43+ };
44+ options.verbosity = mkOption {
45+ type = types.enum (attrNames logLevels ++ attrValues logLevels);
46+ apply = v: if isString v then logLevels.${v} else v;
47+ default = "info";
48+ description = "Log verbosity (syslog keyword/level).";
49+ };
50+ options.workDir = mkOption {
51+ type = str;
52+ default = ".beeshome";
53+ description = ''
54+ Name (relative to the root of the filesystem) of the subvolume where
55+ the hash table will be stored.
56+ '';
57+ };
58+ options.extraOptions = mkOption {
59+ type = listOf str;
60+ default = [];
61+ description = ''
62+ Extra command-line options passed to the daemon. See upstream bees documentation.
63+ '';
64+ example = literalExample ''
65+ [ "--thread-count" "4" ]
66+ '';
67+ };
68+ };
69+
70+in {
71+
72+ options.services.beesd = {
73+ filesystems = mkOption {
74+ type = with types; attrsOf (submodule fsOptions);
75+ description = "BTRFS filesystems to run block-level deduplication on.";
76+ default = { };
77+ example = literalExample ''
78+ {
79+ root = {
80+ spec = "LABEL=root";
81+ hashTableSizeMB = 2048;
82+ verbosity = "crit";
83+ extraOptions = [ "--loadavg-target" "5.0" ];
84+ };
85+ }
86+ '';
87+ };
88+ };
89+ config = {
90+ systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" {
91+ description = "Block-level BTRFS deduplication for %i";
92+ after = [ "sysinit.target" ];
93+
94+ serviceConfig = let
95+ configOpts = [
96+ fs.spec
97+ "verbosity=${toString fs.verbosity}"
98+ "idxSizeMB=${toString fs.hashTableSizeMB}"
99+ "workDir=${fs.workDir}"
100+ ];
101+ configOptsStr = escapeShellArgs configOpts;
102+ in {
103+ # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in
104+ ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
105+ ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
106+ CPUAccounting = true;
107+ CPUWeight = 12;
108+ IOSchedulingClass = "idle";
109+ IOSchedulingPriority = 7;
110+ IOWeight = 10;
111+ KillMode = "control-group";
112+ KillSignal = "SIGTERM";
113+ MemoryAccounting = true;
114+ Nice = 19;
115+ Restart = "on-abnormal";
116+ StartupCPUWeight = 25;
117+ StartupIOWeight = 25;
118+ SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper"
119+ };
120+ wantedBy = ["multi-user.target"];
121+ }) cfg.filesystems;
122+ };
123+}
nixos/modules/services/networking/chrony.nix+3−2
@@ -12,7 +12,7 @@ let
1212 ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
1313
1414 ${optionalString
15− cfg.initstepslew.enabled
15+ (cfg.initstepslew.enabled && (cfg.servers != []))
1616 "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
1717 }
1818
@@ -113,6 +113,7 @@ in
113113 chown chrony:chrony ${stateDir} ${keyFile}
114114 '';
115115
116+ unitConfig.ConditionCapability = "CAP_SYS_TIME";
116117 serviceConfig =
117118 { Type = "forking";
118119 ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
@@ -121,8 +122,8 @@ in
121122 ProtectSystem = "full";
122123 PrivateTmp = "yes";
123124
124− ConditionCapability = "CAP_SYS_TIME";
125125 };
126+
126127 };
127128 };
128129}
nixos/modules/services/networking/dhcpcd.nix+1−1
@@ -71,7 +71,7 @@ let
7171 # anything ever again ("couldn't resolve ..., giving up on
7272 # it"), so we silently lose time synchronisation. This also
7373 # applies to openntpd.
74− ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service || true
74+ ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service chronyd.service || true
7575 fi
7676
7777 ${cfg.runHook}
nixos/modules/services/search/kibana.nix+4−1
@@ -149,7 +149,10 @@ in {
149149 after = [ "network.target" "elasticsearch.service" ];
150150 environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; };
151151 serviceConfig = {
152− ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
152+ ExecStart =
153+ "${cfg.package}/bin/kibana" +
154+ " --config ${cfgFile}" +
155+ " --path.data ${cfg.dataDir}";
153156 User = "kibana";
154157 WorkingDirectory = cfg.dataDir;
155158 };
nixos/tests/bees.nixnew file+55
@@ -0,0 +1,55 @@
1+import ./make-test.nix ({ lib, ... }:
2+{
3+ name = "bees";
4+
5+ machine = { config, pkgs, ... }: {
6+ boot.initrd.postDeviceCommands = ''
7+ ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux1 /dev/vdb
8+ ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc
9+ '';
10+ virtualisation.emptyDiskImages = [ 4096 4096 ];
11+ fileSystems = lib.mkVMOverride {
12+ "/aux1" = { # filesystem configured to be deduplicated
13+ device = "/dev/disk/by-label/aux1";
14+ fsType = "btrfs";
15+ };
16+ "/aux2" = { # filesystem not configured to be deduplicated
17+ device = "/dev/disk/by-label/aux2";
18+ fsType = "btrfs";
19+ };
20+ };
21+ services.beesd.filesystems = {
22+ aux1 = {
23+ spec = "LABEL=aux1";
24+ hashTableSizeMB = 16;
25+ verbosity = "debug";
26+ };
27+ };
28+ };
29+
30+ testScript =
31+ let
32+ withRetry = content: maxTests: sleepTime: ''
33+ max_tests=${lib.escapeShellArg maxTests}; sleep_time=${lib.escapeShellArg sleepTime}; for ((i=0; i<max_tests; i++)); do ${content} && exit 0; sleep "$sleep_time"; done; exit 1;
34+ '';
35+ someContentIsShared = loc: ''[[ $(btrfs fi du -s --raw ${lib.escapeShellArg loc}/dedup-me-{1,2} | awk 'BEGIN { count=0; } NR>1 && $3 == 0 { count++ } END { print count }') -eq 0 ]]'';
36+ in ''
37+ # shut down the instance started by systemd at boot, so we can test our test procedure
38+ $machine->succeed("systemctl stop beesd\@aux1.service");
39+
40+ $machine->succeed("dd if=/dev/urandom of=/aux1/dedup-me-1 bs=1M count=8");
41+ $machine->succeed("cp --reflink=never /aux1/dedup-me-1 /aux1/dedup-me-2");
42+ $machine->succeed("cp --reflink=never /aux1/* /aux2/");
43+ $machine->succeed("sync");
44+ $machine->fail(q(${someContentIsShared "/aux1"}));
45+ $machine->fail(q(${someContentIsShared "/aux2"}));
46+ $machine->succeed("systemctl start beesd\@aux1.service");
47+
48+ # assert that "Set Shared" column is nonzero
49+ $machine->succeed(q(${withRetry (someContentIsShared "/aux1") 20 2}));
50+ $machine->fail(q(${someContentIsShared "/aux2"}));
51+
52+ # assert that 16MB hash table size requested was honored
53+ $machine->succeed(q([[ $(stat -c %s /aux1/.beeshome/beeshash.dat) = $(( 16 * 1024 * 1024)) ]]))
54+ '';
55+})
nixos/tests/cockroachdb.nixnew file+126
@@ -0,0 +1,126 @@
1+# This performs a full 'end-to-end' test of a multi-node CockroachDB cluster
2+# using the built-in 'cockroach workload' command, to simulate a semi-realistic
3+# test load. It generally takes anywhere from 3-5 minutes to run and 1-2GB of
4+# RAM (though each of 3 workers gets 1GB allocated)
5+#
6+# CockroachDB requires synchronized system clocks within a small error window
7+# (~500ms by default) on each node in order to maintain a multi-node cluster.
8+# Cluster joins that are outside this window will fail, and nodes that skew
9+# outside the window after joining will promptly get kicked out.
10+#
11+# To accomodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm'
12+# driver inside a guest. This driver allows the host machine to pass its clock
13+# through to the guest as a hardware clock that appears as a Precision Time
14+# Protocol (PTP) Clock device, generally /dev/ptp0. PTP devices can be measured
15+# and used as hardware reference clocks (similar to an on-board GPS clock) by
16+# NTP software. In our case, we use Chrony to synchronize to the reference
17+# clock.
18+#
19+# This test is currently NOT enabled as a continuously-checked NixOS test.
20+# Ideally, this test would be run by Hydra and Borg on all relevant changes,
21+# except:
22+#
23+# - Not every build machine is compatible with the ptp_kvm driver.
24+# Virtualized EC2 instances, for example, do not support loading the ptp_kvm
25+# driver into guests. However, bare metal builders (e.g. Packet) do seem to
26+# work just fine. In practice, this means x86_64-linux builds would fail
27+# randomly, depending on which build machine got the job. (This is probably
28+# worth some investigation; I imagine it's based on ptp_kvm's usage of paravirt
29+# support which may not be available in 'nested' environments.)
30+#
31+# - ptp_kvm is not supported on aarch64, otherwise it seems likely Cockroach
32+# could be tested there, as well. This seems to be due to the usage of
33+# the TSC in ptp_kvm, which isn't supported (easily) on AArch64. (And:
34+# testing stuff, not just making sure it builds, is important to ensure
35+# aarch64 support remains viable.)
36+#
37+# For future developers who are reading this message, are daring and would want
38+# to fix this, some options are:
39+#
40+# - Just test a single node cluster instead (boring and less thorough).
41+# - Move all CI to bare metal packet builders, and we can at least do x86_64-linux.
42+# - Get virtualized clocking working in aarch64, somehow.
43+# - Add a 4th node that acts as an NTP service and uses no PTP clocks for
44+# references, at the client level. This bloats the node and memory
45+# requirements, but would probably allow both aarch64/x86_64 to work.
46+#
47+
48+let
49+
50+ # Creates a node. If 'joinNode' parameter, a string containing an IP address,
51+ # is non-null, then the CockroachDB server will attempt to join/connect to
52+ # the cluster node specified at that address.
53+ makeNode = locality: myAddr: joinNode:
54+ { nodes, pkgs, lib, config, ... }:
55+
56+ {
57+ # Bank/TPC-C benchmarks take some memory to complete
58+ virtualisation.memorySize = 1024;
59+
60+ # Install the KVM PTP "Virtualized Clock" driver. This allows a /dev/ptp0
61+ # device to appear as a reference clock, synchronized to the host clock.
62+ # Because CockroachDB *requires* a time-synchronization mechanism for
63+ # the system time in a cluster scenario, this is necessary to work.
64+ boot.kernelModules = [ "ptp_kvm" ];
65+
66+ # Enable and configure Chrony, using the given virtualized clock passed
67+ # through by KVM.
68+ services.chrony.enable = true;
69+ services.chrony.servers = lib.mkForce [ ];
70+ services.chrony.extraConfig = ''
71+ refclock PHC /dev/ptp0 poll 2 prefer require refid KVM
72+ makestep 0.1 3
73+ '';
74+
75+ # Enable CockroachDB. In order to ensure that Chrony has performed its
76+ # first synchronization at boot-time (which may take ~10 seconds) before
77+ # starting CockroachDB, we block the ExecStartPre directive using the
78+ # 'waitsync' command. This ensures Cockroach doesn't have its system time
79+ # leap forward out of nowhere during startup/execution.
80+ #
81+ # Note that the default threshold for NTP-based skew in CockroachDB is
82+ # ~500ms by default, so making sure it's started *after* accurate time
83+ # synchronization is extremely important.
84+ services.cockroachdb.enable = true;
85+ services.cockroachdb.insecure = true;
86+ services.cockroachdb.openPorts = true;
87+ services.cockroachdb.locality = locality;
88+ services.cockroachdb.listen.address = myAddr;
89+ services.cockroachdb.join = lib.mkIf (joinNode != null) joinNode;
90+
91+ # Hold startup until Chrony has performed its first measurement (which
92+ # will probably result in a full timeskip, thanks to makestep)
93+ systemd.services.cockroachdb.preStart = ''
94+ ${pkgs.chrony}/bin/chronyc waitsync
95+ '';
96+ };
97+
98+in import ./make-test.nix ({ pkgs, ...} : {
99+ name = "cockroachdb";
100+ meta.maintainers = with pkgs.stdenv.lib.maintainers;
101+ [ thoughtpolice ];
102+
103+ nodes = rec {
104+ node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null;
105+ node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1";
106+ node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1";
107+ };
108+
109+ # NOTE: All the nodes must start in order and you must NOT use startAll, because
110+ # there's otherwise no way to guarantee that node1 will start before the others try
111+ # to join it.
112+ testScript = ''
113+ $node1->start;
114+ $node1->waitForUnit("cockroachdb");
115+
116+ $node2->start;
117+ $node2->waitForUnit("cockroachdb");
118+
119+ $node3->start;
120+ $node3->waitForUnit("cockroachdb");
121+
122+ $node1->mustSucceed("cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1");
123+ $node1->mustSucceed("cockroach workload init bank 'postgresql://root\@192.168.1.1:26257?sslmode=disable'");
124+ $node1->mustSucceed("cockroach workload run bank --duration=1m 'postgresql://root\@192.168.1.1:26257?sslmode=disable'");
125+ '';
126+})
pkgs/applications/audio/faust/faust1.nix+1−1
@@ -18,7 +18,7 @@ let
1818
1919 meta = with stdenv.lib; {
2020 homepage = http://faust.grame.fr/;
21− downloadPage = http://sourceforge.net/projects/faudiostream/files/;
21+ downloadPage = https://sourceforge.net/projects/faudiostream/files/;
2222 license = licenses.gpl2;
2323 platforms = platforms.linux;
2424 maintainers = with maintainers; [ magnetophon pmahoney ];
pkgs/applications/audio/faust/faust2.nix+1−1
@@ -27,7 +27,7 @@ let
2727
2828 meta = with stdenv.lib; {
2929 homepage = http://faust.grame.fr/;
30− downloadPage = http://sourceforge.net/projects/faudiostream/files/;
30+ downloadPage = https://sourceforge.net/projects/faudiostream/files/;
3131 license = licenses.gpl2;
3232 platforms = platforms.linux;
3333 maintainers = with maintainers; [ magnetophon pmahoney ];
pkgs/applications/audio/lash/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 longDescription = ''
3131 Session management system for GNU/Linux audio applications.
3232 '';
33− homepage = http://www.nongnu.org/lash;
33+ homepage = https://www.nongnu.org/lash;
3434 license = licenses.gpl2Plus;
3535 platforms = platforms.linux;
3636 maintainers = [ maintainers.goibhniu ];
pkgs/applications/audio/lingot/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717
1818 meta = {
1919 description = "Not a Guitar-Only tuner";
20− homepage = http://www.nongnu.org/lingot/;
20+ homepage = https://www.nongnu.org/lingot/;
2121 license = stdenv.lib.licenses.gpl2Plus;
2222 platforms = with stdenv.lib.platforms; linux;
2323 maintainers = with stdenv.lib.maintainers; [viric];
pkgs/applications/audio/mi2ly/default.nix+1−1
@@ -6,7 +6,7 @@ let
66 version="0.12";
77 name="${baseName}-${version}";
88 hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
9− url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
9+ url="https://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
1010 sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
1111 };
1212 buildInputs = [
pkgs/applications/audio/mi2ly/default.upstream+1−1
@@ -1,3 +1,3 @@
1−url http://download.savannah.gnu.org/releases/mi2ly/
1+url https://download.savannah.gnu.org/releases/mi2ly/
22ensure_choice
33version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1'
pkgs/applications/audio/mimms/default.nix+1−1
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
55 version = "3.2";
66
77 src = fetchurl {
8− url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
8+ url = "https://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
99 sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
1010 };
1111
pkgs/applications/audio/normalize/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 buildInputs = [ libmad ];
1313
1414 meta = with stdenv.lib; {
15− homepage = http://normalize.nongnu.org/;
15+ homepage = https://www.nongnu.org/normalize/;
1616 description = "Audio file normalizer";
1717 license = licenses.gpl2;
1818 platforms = platforms.unix;
pkgs/applications/audio/sonata/default.nix+1−1
@@ -61,7 +61,7 @@ in buildPythonApplication rec {
6161 - Commandline control
6262 - Available in 24 languages
6363 '';
64− homepage = http://www.nongnu.org/sonata/;
64+ homepage = https://www.nongnu.org/sonata/;
6565 license = stdenv.lib.licenses.gpl3;
6666 platforms = stdenv.lib.platforms.linux;
6767 maintainers = [ stdenv.lib.maintainers.rvl ];
pkgs/applications/audio/whipper/default.nix+8−5
@@ -3,17 +3,17 @@
33
44python2.pkgs.buildPythonApplication rec {
55 name = "whipper-${version}";
6− version = "0.7.0";
6+ version = "0.7.2";
77
88 src = fetchFromGitHub {
99 owner = "whipper-team";
1010 repo = "whipper";
1111 rev = "v${version}";
12− sha256 = "04m8s0s9dcnly9l6id8vv99n9kbjrjid79bss52ay9yvwng0frmj";
12+ sha256 = "17cn11c6c62pfhhp6vcslxpanb0czh2xbxq1g6wd7bpmgw38yd8v";
1313 };
1414
1515 pythonPath = with python2.pkgs; [
16− pygobject2 musicbrainzngs urllib3 chardet
16+ pygobject3 musicbrainzngs urllib3 chardet
1717 pycdio setuptools mutagen CDDB
1818 requests
1919 ];
@@ -25,11 +25,14 @@ python2.pkgs.buildPythonApplication rec {
2525 patches = [
2626 (substituteAll {
2727 src = ./paths.patch;
28− inherit cdrdao cdparanoia utillinux flac sox;
29− accurateripChecksum = accuraterip-checksum;
28+ inherit cdparanoia;
3029 })
3130 ];
3231
32+ makeWrapperArgs = [
33+ "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]}"
34+ ];
35+
3336 # some tests require internet access
3437 # https://github.com/JoeLametta/whipper/issues/291
3538 doCheck = false;
pkgs/applications/audio/whipper/paths.patch−73
@@ -1,16 +1,3 @@
1−--- a/whipper/program/arc.py
2−+++ b/whipper/program/arc.py
3−@@ -3,8 +3,8 @@
4− import logging
5− logger = logging.getLogger(__name__)
6−
7−-ARB = 'accuraterip-checksum'
8−-FLAC = 'flac'
9−+ARB = '@accurateripChecksum@/bin/accuraterip-checksum'
10−+FLAC = '@flac@/bin/flac'
11−
12−
13− def _execute(cmd, **redirects):
141--- a/whipper/program/cdparanoia.py
152+++ b/whipper/program/cdparanoia.py
163@@ -280,10 +280,10 @@
@@ -43,63 +30,3 @@
4330+ self.command = ['@cdparanoia@/bin/cdparanoia', '-A']
4431 if device:
4532 self.command += ['-d', device]
46−
47−--- a/whipper/program/cdrdao.py
48−+++ b/whipper/program/cdrdao.py
49−@@ -9,7 +9,7 @@
50− import logging
51− logger = logging.getLogger(__name__)
52−
53−-CDRDAO = 'cdrdao'
54−+CDRDAO = '@cdrdao@/bin/cdrdao'
55−
56−
57− def read_toc(device, fast_toc=False):
58−--- a/whipper/program/sox.py
59−+++ b/whipper/program/sox.py
60−@@ -4,7 +4,7 @@
61− import logging
62− logger = logging.getLogger(__name__)
63−
64−-SOX = 'sox'
65−+SOX = '@sox@/bin/sox'
66−
67−
68− def peak_level(track_path):
69−--- a/whipper/program/soxi.py
70−+++ b/whipper/program/soxi.py
71−@@ -6,7 +6,7 @@
72− import logging
73− logger = logging.getLogger(__name__)
74−
75−-SOXI = 'soxi'
76−+SOXI = '@sox@/bin/soxi'
77−
78−
79− class AudioLengthTask(ctask.PopenTask):
80−--- a/whipper/program/utils.py
81−+++ b/whipper/program/utils.py
82−@@ -9,7 +9,7 @@
83− Eject the given device.
84− """
85− logger.debug("ejecting device %s", device)
86−- os.system('eject %s' % device)
87−+ os.system('@utillinux@/bin/eject %s' % device)
88−
89−
90− def load_device(device):
91−@@ -17,7 +17,7 @@
92− Load the given device.
93− """
94− logger.debug("loading (eject -t) device %s", device)
95−- os.system('eject -t %s' % device)
96−+ os.system('@utillinux@/bin/eject -t %s' % device)
97−
98−
99− def unmount_device(device):
100−@@ -32,4 +32,4 @@
101− proc = open('/proc/mounts').read()
102− if device in proc:
103− print 'Device %s is mounted, unmounting' % device
104−- os.system('umount %s' % device)
105−+ os.system('@utillinux@/bin/umount %s' % device)
pkgs/applications/editors/ed/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
3030
3131 license = stdenv.lib.licenses.gpl3Plus;
3232
33− homepage = http://www.gnu.org/software/ed/;
33+ homepage = https://www.gnu.org/software/ed/;
3434
3535 maintainers = [ ];
3636 platforms = stdenv.lib.platforms.unix;
pkgs/applications/editors/emacs-modes/bbdb/3.nix+2−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 name = "bbdb-3.1.2";
55
66 src = fetchurl {
7− url = "http://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
7+ url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
88 sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05";
99 };
1010
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 '';
1919
2020 meta = {
21− homepage = http://savannah.nongnu.org/projects/bbdb/;
21+ homepage = https://savannah.nongnu.org/projects/bbdb/;
2222 description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
2323 license = "GPL";
2424 };
pkgs/applications/editors/emacs-modes/color-theme/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 meta = {
2020 description = "Emacs-lisp mode for skinning your Emacs";
21− homepage = http://www.nongnu.org/color-theme;
21+ homepage = https://www.nongnu.org/color-theme;
2222 license = stdenv.lib.licenses.gpl2Plus;
2323
2424 platforms = stdenv.lib.platforms.all;
pkgs/applications/editors/emacs-modes/emms/default.nix+2−2
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88
99 src = fetchurl {
1010 # These guys don't use ftp.gnu.org...
11− url = "http://www.gnu.org/software/emms/download/${name}.tar.gz";
11+ url = "https://www.gnu.org/software/emms/download/${name}.tar.gz";
1212 sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav";
1313 };
1414
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
6262 support, with no effort from your side.
6363 '';
6464
65− homepage = http://www.gnu.org/software/emms/;
65+ homepage = https://www.gnu.org/software/emms/;
6666
6767 license = stdenv.lib.licenses.gpl3Plus;
6868
pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix+3−7
@@ -1,7 +1,7 @@
1−{ fetchurl, lib, melpaBuild }:
1+{ fetchurl, lib, melpaBuild, writeText }:
22
33melpaBuild {
4− pname = "font-lock-plus";
4+ pname = "font-lock+";
55 version = "20180101.25";
66
77 src = fetchurl {
@@ -10,11 +10,7 @@ melpaBuild {
1010 name = "font-lock+.el";
1111 };
1212
13− recipe = fetchurl {
14− url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
15− sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
16− name = "font-lock-plus";
17− };
13+ recipe = writeText "recipe" "(font-lock+ :fetcher github :repo \"\")";
1814
1915 meta = {
2016 homepage = "https://melpa.org/#/font-lock+";
pkgs/applications/editors/emacs-modes/let-alist/default.nix+2−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 name = "let-alist-1.0.3";
55
66 src = fetchurl {
7− url = "http://elpa.gnu.org/packages/let-alist-1.0.3.el";
7+ url = "https://elpa.gnu.org/packages/let-alist-1.0.3.el";
88 sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx";
99 };
1010
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 '';
2020
2121 meta = {
22− homepage = http://elpa.gnu.org/packages/let-alist.html;
22+ homepage = https://elpa.gnu.org/packages/let-alist.html;
2323 description = "Easily let-bind values of an assoc-list by their names";
2424 license = stdenv.lib.licenses.gpl3Plus;
2525 };
pkgs/applications/editors/emacs/25.nix+1−1
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
114114
115115 meta = with stdenv.lib; {
116116 description = "The extensible, customizable GNU text editor";
117− homepage = http://www.gnu.org/software/emacs/;
117+ homepage = https://www.gnu.org/software/emacs/;
118118 license = licenses.gpl3Plus;
119119 maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
120120 platforms = platforms.all;
pkgs/applications/editors/emacs/default.nix+1−1
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
119119
120120 meta = with stdenv.lib; {
121121 description = "The extensible, customizable GNU text editor";
122− homepage = http://www.gnu.org/software/emacs/;
122+ homepage = https://www.gnu.org/software/emacs/;
123123 license = licenses.gpl3Plus;
124124 maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
125125 platforms = platforms.all;
pkgs/applications/editors/emacs/macport.nix+1−1
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
7676
7777 meta = with stdenv.lib; {
7878 description = "The extensible, customizable text editor";
79− homepage = http://www.gnu.org/software/emacs/;
79+ homepage = https://www.gnu.org/software/emacs/;
8080 license = licenses.gpl3Plus;
8181 maintainers = with maintainers; [ jwiegley matthewbauer ];
8282 platforms = platforms.darwin;
pkgs/applications/editors/leafpad/default.nix+1−1
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 version = "0.8.18.1";
55 name = "leafpad-${version}";
66 src = fetchurl {
7− url = "http://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
7+ url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
88 sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
99 };
1010
pkgs/applications/editors/moe/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 completion, directory browser, duplicate removal from prompt histories,
3434 delimiter matching, text conversion from/to UTF-8, romanization, etc.
3535 '';
36− homepage = http://www.gnu.org/software/moe/;
36+ homepage = https://www.gnu.org/software/moe/;
3737 license = licenses.gpl2Plus;
3838 maintainers = with maintainers; [ AndersonTorres ];
3939 platforms = platforms.unix;
pkgs/applications/editors/textadept/default.nix+1−1
@@ -64,7 +64,7 @@ let
6464 gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip;
6565 lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip;
6666
67− scintilla_url = "http://prdownloads.sourceforge.net/scintilla/" + scintilla_tgz;
67+ scintilla_url = "mirror://sourceforge/scintilla/" + scintilla_tgz;
6868 lua_url = "http://www.lua.org/ftp/" + lua_tgz;
6969 lpeg_url = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz;
7070 lfs_url = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip;
pkgs/applications/editors/zile/default.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 compiles to about 130Kb.
4646 '';
4747
48− homepage = http://www.gnu.org/software/zile/;
48+ homepage = https://www.gnu.org/software/zile/;
4949
5050 license = licenses.gpl3Plus;
5151
pkgs/applications/graphics/pqiv/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation (rec {
66 name = "pqiv-${version}";
7− version = "2.10.4";
7+ version = "2.11";
88
99 src = fetchFromGitHub {
1010 owner = "phillipberndt";
1111 repo = "pqiv";
1212 rev = version;
13− sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9";
13+ sha256 = "06cwm28b7j1skwp21s5snmj1pqh3xh6y2i5v4w3pz0b8k3053h9i";
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/aminal/default.nix+2−2
@@ -12,7 +12,7 @@
1212
1313buildGoPackage rec {
1414 name = "aminal-${version}";
15− version = "0.7.4";
15+ version = "0.7.8";
1616
1717 goPackagePath = "github.com/liamg/aminal";
1818
@@ -36,7 +36,7 @@ buildGoPackage rec {
3636 owner = "liamg";
3737 repo = "aminal";
3838 rev = "v${version}";
39− sha256 = "0wnzxjlv98pi3gy4hp3d19pwpa4kf1h5rqy03s9bcqdbpb1v1b7v";
39+ sha256 = "02gamvvs56w4zwqdvalbsgb2gbh0398gl7qk36pgyqkcgj3bcwv8";
4040 };
4141
4242 preBuild = ''
pkgs/applications/misc/devilspie2/default.nix+1−1
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
55 version = "0.43";
66
77 src = fetchurl {
8− url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
8+ url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
99 sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc";
1010 };
1111
pkgs/applications/misc/eaglemode/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
1818 # I use 'yes y' to skip a build error linking with xineLib,
1919 # because xine stopped exporting "_x_vo_new_port"
20− # http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
20+ # https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
2121 buildPhase = ''
2222 export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
2323 perl make.pl build
pkgs/applications/misc/gksu/default.nix+1−1
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646 programs that need to ask a user's password to run another program
4747 as another user.
4848 '';
49− homepage = http://www.nongnu.org/gksu/;
49+ homepage = https://www.nongnu.org/gksu/;
5050 license = stdenv.lib.licenses.gpl2;
5151 maintainers = [ stdenv.lib.maintainers.romildo ];
5252 platforms = stdenv.lib.platforms.linux;
pkgs/applications/misc/gtk2fontsel/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 Trivial, but useful nonetheless.
2222 '';
2323 homepage = http://gtk2fontsel.sourceforge.net/;
24− downloadPage = http://sourceforge.net/projects/gtk2fontsel/;
24+ downloadPage = https://sourceforge.net/projects/gtk2fontsel/;
2525 license = licenses.gpl2;
2626 maintainers = [ maintainers.prikhi ];
2727 platforms = platforms.linux;
pkgs/applications/misc/gv/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
3232 doCheck = true;
3333
3434 meta = {
35− homepage = http://www.gnu.org/software/gv/;
35+ homepage = https://www.gnu.org/software/gv/;
3636 description = "PostScript/PDF document viewer";
3737
3838 longDescription = ''
pkgs/applications/misc/hello/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 GNU Hello is a program that prints "Hello, world!" when you run it.
1818 It is fully customizable.
1919 '';
20− homepage = http://www.gnu.org/software/hello/manual/;
20+ homepage = https://www.gnu.org/software/hello/manual/;
2121 license = licenses.gpl3Plus;
2222 maintainers = [ maintainers.eelco ];
2323 platforms = platforms.all;
pkgs/applications/misc/rofi/default.nix+1−1
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
3737 homepage = https://davedavenport.github.io/rofi;
3838 license = licenses.mit;
3939 maintainers = with maintainers; [ mbakke garbas ma27 ];
40− platforms = with platforms; unix;
40+ platforms = with platforms; linux;
4141 };
4242}
pkgs/applications/misc/xlog/default.nix+2−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 version = "2.0.15";
55
66 src = fetchurl {
7− url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz";
7+ url = "https://download.savannah.gnu.org/releases/xlog/${name}.tar.gz";
88 sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j";
99 };
1010
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 location in latitude and longitude and distance and heading in kilometers or miles,
2121 both for short and long path.
2222 '';
23− homepage = http://www.nongnu.org/xlog;
23+ homepage = https://www.nongnu.org/xlog;
2424 maintainers = [ maintainers.mafo ];
2525 license = licenses.gpl3;
2626 platforms = platforms.unix;
pkgs/applications/networking/browsers/firefox-bin/default.nix+1−1
@@ -191,7 +191,7 @@ stdenv.mkDerivation {
191191 # update with:
192192 # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
193193 passthru.updateScript = import ./update.nix {
194− inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
194+ inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
195195 baseUrl =
196196 if channel == "devedition"
197197 then "http://archive.mozilla.org/pub/devedition/releases/"
pkgs/applications/networking/browsers/firefox-bin/update.nix+3−1
@@ -1,4 +1,5 @@
1−{ name
1+{ stdenv
2+, name
23, channel
34, writeScript
45, xidel
@@ -17,6 +18,7 @@ let
1718 channel != "release";
1819
1920in writeScript "update-${name}" ''
21+ #!${stdenv.shell}
2022 PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
2123 set -eux
2224 pushd ${basePath}
pkgs/applications/networking/browsers/firefox/update.nix+2
@@ -1,4 +1,5 @@
11{ writeScript
2+, stdenv
23, lib
34, xidel
45, common-updater-scripts
@@ -13,6 +14,7 @@
1314}:
1415
1516writeScript "update-${attrPath}" ''
17+ #!${stdenv.shell}
1618 PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]}
1719
1820 url=${baseUrl}
pkgs/applications/networking/esniper/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 buildInputs = [ openssl curl ];
1212
1313 # Add support for CURL_CA_BUNDLE variable.
14− # Fix <http://sourceforge.net/p/esniper/bugs/648/>.
14+ # Fix <https://sourceforge.net/p/esniper/bugs/648/>.
1515 patches = [ ./find-ca-bundle.patch ];
1616
1717 postInstall = ''
pkgs/applications/networking/instant-messengers/freetalk/default.nix+1−1
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
3131 license = licenses.gpl3Plus ;
3232 maintainers = with maintainers; [ raskin ];
3333 platforms = platforms.linux;
34− downloadPage = "http://www.gnu.org/software/freetalk/";
34+ downloadPage = "https://www.gnu.org/software/freetalk/";
3535 };
3636}
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+233−233
@@ -1,585 +1,585 @@
11{
2− version = "60.3.1";
2+ version = "60.3.2";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ar/thunderbird-60.3.1.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ar/thunderbird-60.3.2.tar.bz2";
55 locale = "ar";
66 arch = "linux-x86_64";
7− sha512 = "57b092a02666d2ca2d2b13b04bc00114b7e14b8b23b82f0af53f0d53485a8db117eea3408affcebff6431133bf337f07ecc111cdd8c5f50b4a93594ad07c0a29";
7+ sha512 = "c051155472deab805e0e689d45ab82a952aecd19f91b2373cdfab3925a6b9fdebcd9a147c06e6ff491e1d1374cb03e2091220187801ab7f07f9d787c4fc4c269";
88 }
9− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ast/thunderbird-60.3.1.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ast/thunderbird-60.3.2.tar.bz2";
1010 locale = "ast";
1111 arch = "linux-x86_64";
12− sha512 = "a0635e9006beec03cc5a6fb298cfc1f4bfce342bb537f1834d02f452e82285ac5853ea520c1275140ea812c742fcf19d5f6e662b7eba58bcf7e80d796236ca39";
12+ sha512 = "099d5a43e4e037f33f9ae4f89c1958d9e7016cc5f5673eed74d3c37bde6590fc2e47bb832784561bcf9c4ed53decbde51372a83019e3c72bf09745b95aeaf74a";
1313 }
14− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/be/thunderbird-60.3.1.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/be/thunderbird-60.3.2.tar.bz2";
1515 locale = "be";
1616 arch = "linux-x86_64";
17− sha512 = "f2860e9508278895198d87b54ac2984d961221fa0bac20dba505d01d762ea7041127323c67cd2288d2372f37d82e0870c6a832ff4113fe914927a377e22ced99";
17+ sha512 = "7e55877c3f75d9907e5cca8f7f423edc79d1bb072f96acf227fffe37375528dd5c40bf8b3d39151ac79ff510ad3e50f1940ea4df32a6cbb32a0afb085640aaba";
1818 }
19− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/bg/thunderbird-60.3.1.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/bg/thunderbird-60.3.2.tar.bz2";
2020 locale = "bg";
2121 arch = "linux-x86_64";
22− sha512 = "1d0070daf743b1c9e2b0a3471ff4f8bfd992279a422bb58daf6b7f96a6238adf654bfdf74d8414e758af2f033703a73cb0e1f71c0c72e0b7e61e62b6180ea185";
22+ sha512 = "6230c26a960e962db8a0c4f8302df3ae471aa6b663bd7819da1b3ccd1b2f6db1fa207936502f7b8cf2eb47032efca7e6d0e1275223007758588df290ba9a9ac8";
2323 }
24− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/br/thunderbird-60.3.1.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/br/thunderbird-60.3.2.tar.bz2";
2525 locale = "br";
2626 arch = "linux-x86_64";
27− sha512 = "f2bb792417855409c993a2d2e9ae627b800ef3dfc7a78fd82f3af400c2c4c964757662659a32b039e20e0330b7f16b502d011a104798c2dcc47235a8c561b9a3";
27+ sha512 = "8005b6b605d8a863a4b2b312a0126ffcd09a25072d11731eaab9f096f5e0b22e4fc8142d86d39505c48b6f73f96cf2d6ac4c2158d148338cbfa8c587b238063a";
2828 }
29− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ca/thunderbird-60.3.1.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ca/thunderbird-60.3.2.tar.bz2";
3030 locale = "ca";
3131 arch = "linux-x86_64";
32− sha512 = "e5ae4dbe02b38042ed64f399ea531203fd04d6358b70ddb2c67d29ccea45019a4226ea1719692ea48120c30af240d4d5470e4f64f09239dbfff2607569ad9bb7";
32+ sha512 = "98be5d8e71110d4de311e15c448b71cceec37fce5b50b689ecdad0322c093a7e7d96caab9919a83b48af784bf4da7269274125cd5d351870dcb775c0453237ce";
3333 }
34− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/cs/thunderbird-60.3.1.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/cs/thunderbird-60.3.2.tar.bz2";
3535 locale = "cs";
3636 arch = "linux-x86_64";
37− sha512 = "b0f1440db8a329103f873a57988bc6fa66e36336752b7c215a952079f77182d91c6fdacc7815f74c18a4fe7c8a648e7aaf58cbb2fdabfda5b76daac81a602559";
37+ sha512 = "35863fc6513dec41b256150a7a9c3bb9e45cc72ae869da422b8550986148c8de0de14d985a5bba50af030263c0480a709d2a9755aac73b7e60e40939db7f9f31";
3838 }
39− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/cy/thunderbird-60.3.1.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/cy/thunderbird-60.3.2.tar.bz2";
4040 locale = "cy";
4141 arch = "linux-x86_64";
42− sha512 = "191f2113ffce94d1ebff5619aa84caea262f424217bf17882189f40f772704aa07ce4ac232292742493d1b1be564558907a418c0104be656ec1441bcaee7ebe0";
42+ sha512 = "3e3813449095eea1c7715d98d9198c63001b46b1aae463c6cfa1622b3808659d8a71d3cbac4264fa0fdb6264c1de738a2c79503b0629e062e949616ba0208f7c";
4343 }
44− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/da/thunderbird-60.3.1.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/da/thunderbird-60.3.2.tar.bz2";
4545 locale = "da";
4646 arch = "linux-x86_64";
47− sha512 = "54611a769b3f06860a3d61519b992dc5e4605b13d8d7069031155a23b590230c003dde720dbaf161f6dee87d96df057f01d55e195ec34bb4fb55f1423b166ee2";
47+ sha512 = "dc51279ead50553ef8e8345635925b45dd8be63fdd99e3aa1499d2cc2996d084931c00b7b942935d00914c78f56b8bef13a7545d6bbf47a51a16ab26a30132cf";
4848 }
49− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/de/thunderbird-60.3.1.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/de/thunderbird-60.3.2.tar.bz2";
5050 locale = "de";
5151 arch = "linux-x86_64";
52− sha512 = "d1ea83e5402e68a93800491e091daf7bd9951be2de8e3c4e786061c57fe850cdd12bba4a35a24e4df44432a2124dc3b8c5732271a9a1c71f7fe2deebbfe94d88";
52+ sha512 = "117a1c2a930c8c5a3c5a96dd6e28e7e167fb6cbe06f607211aeb1af427b47bc3b75d0431ea38ddf3812f5899d690f9c7a6dc8341c124249836bd0ab0da3147c1";
5353 }
54− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/dsb/thunderbird-60.3.1.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/dsb/thunderbird-60.3.2.tar.bz2";
5555 locale = "dsb";
5656 arch = "linux-x86_64";
57− sha512 = "5f1d459902e2ed9eb6cfa10a0ea05068bda0eb3146e5bb9b20ca2c93d85521ff465d596e9348421dda839ebd0e55c480e277ae66ba10236533f9aba7c3c317cb";
57+ sha512 = "a717e0d4e57b354c4eb331f01de97267d0616fdf9a47dc8e51acadc4966ee21323a97c59b902e2b315079174acfb896c658cb07ee62f6f04959116961837d92f";
5858 }
59− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/el/thunderbird-60.3.1.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/el/thunderbird-60.3.2.tar.bz2";
6060 locale = "el";
6161 arch = "linux-x86_64";
62− sha512 = "5f1702a2b78373f0cb408363621bbfaa377f1ca38eb17bc6dfbac582115a795c2d22220725378f67b49f8f7554a37a5af5f0a18f7584e54c7f62128fba3dec33";
62+ sha512 = "4e4d0df91c563cf21c83617529751cfe26ddd6d0c3952fffd5ef03d40d622da9dc84e1dc861239cbfb345d87a99e2fbe0afe4fd7975bb589201bef8d70da092e";
6363 }
64− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/en-GB/thunderbird-60.3.1.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/en-GB/thunderbird-60.3.2.tar.bz2";
6565 locale = "en-GB";
6666 arch = "linux-x86_64";
67− sha512 = "754d330a04178aa68c15c6212a04dcd5547af820f82b55d7d36910b5c85fc3d28310fe24864dcf7e4ab21838589350a752dc220c9409307ea6059d3e9adc02f3";
67+ sha512 = "6a7c42efe472950daa603462de76b57bfcf97810e4c4a2fa38f07aeff8a6729939ddd35b7348deab357c723c6a20b71d25da3e2fa05502ebac1d74fb9c6498c0";
6868 }
69− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/en-US/thunderbird-60.3.1.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/en-US/thunderbird-60.3.2.tar.bz2";
7070 locale = "en-US";
7171 arch = "linux-x86_64";
72− sha512 = "3f8dd135299243996182ab9b8f38e5f7d6d486468b1afbeb52d481d8ad943cb9fec899cd56002ecb5f55f7b22e3184c4a5d114f55734b8e39debbe4ac4060b68";
72+ sha512 = "6c549e9cb1a4de1f73b26332c933cb96da841f75afc54511e3d6ed459b3f1439e7febe72337e8b24d825a8fa82b1b1520248c8551bfd8446812abedd3df516b6";
7373 }
74− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/es-AR/thunderbird-60.3.1.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/es-AR/thunderbird-60.3.2.tar.bz2";
7575 locale = "es-AR";
7676 arch = "linux-x86_64";
77− sha512 = "cbe6bbd993f84e583b3d399ac45626384969d6823ef21da84034f3bb3b26b1f86e4ba65a1bee73438ca75d8aeb9f61a75f1b8747b23f1ed5059796d7ec14adac";
77+ sha512 = "4465e400726d550d06fd36e8baf3c96445123f2b8c78c1d5c701d9175038878d52e304adb1cd5a6fee3be274605448916a8512b9fbda452852aaf63c8aeca242";
7878 }
79− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/es-ES/thunderbird-60.3.1.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/es-ES/thunderbird-60.3.2.tar.bz2";
8080 locale = "es-ES";
8181 arch = "linux-x86_64";
82− sha512 = "3c7c4b4cd9cfc2d867ed895adbcef4e1af487b5fe6bad6c5931ce055f2fa656de9b51d1008cfa9a342f7b8360ee6d39529d4e81dc773721157bd42841cde2d95";
82+ sha512 = "4629ac510525f6af9f287bad685f696f130607eaab020bfec8bb46c2b816b7b8a3df1d0cf45e98446e13b8d219add30b751935ba5d08d5fd426da9346f9292de";
8383 }
84− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/et/thunderbird-60.3.1.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/et/thunderbird-60.3.2.tar.bz2";
8585 locale = "et";
8686 arch = "linux-x86_64";
87− sha512 = "ba2b2a7970a87d41c85aa5fea1cebed55755356fed7a82a08b0945e6311b410df25511e4886e6c066f43b31774fbd35fc65c10b155bab2aac5eb1918cdec8e3c";
87+ sha512 = "fbb8b9e90ab0e3160e8b48ad788ec31ebc2c82b2839f64deb2d28c2377debb666bd94a7b081748f11d9eaa10af026693a25d9ac121754d8e2c333330984f97cb";
8888 }
89− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/eu/thunderbird-60.3.1.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/eu/thunderbird-60.3.2.tar.bz2";
9090 locale = "eu";
9191 arch = "linux-x86_64";
92− sha512 = "3398a2c1a2fed97b8e17822d7b6048af686b67f91d2b096f1e0d58dc5d29c2eac60aed39b62b80788634c3996adb0bcb93cb07e5bfe7eb2d2a88e58e1cdfe8fb";
92+ sha512 = "8c2e3da06c2ce5768e23d2a0e29e186d31be925c9fd2e7479978ee8a190113d753c80ca059126b1d28bc828f732c517ba6f28647402be5284948fbe7939ea98a";
9393 }
94− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/fi/thunderbird-60.3.1.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fi/thunderbird-60.3.2.tar.bz2";
9595 locale = "fi";
9696 arch = "linux-x86_64";
97− sha512 = "e7be730f994829e55a51754b569b8148cfc871fbf6dc28962f3d23400ed68105d813ead1612974f5f27148a57bfe099e4fd63ed4111eb877485314111fc046ea";
97+ sha512 = "05c7516c48e1574055ef56575e7c7f0315bf307dddee786758b5c49fc8acb41462fad1064fb1255d4b8c2f714da7ebd6070d4d5248c6078bfc587457b51b0f2e";
9898 }
99− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/fr/thunderbird-60.3.1.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fr/thunderbird-60.3.2.tar.bz2";
100100 locale = "fr";
101101 arch = "linux-x86_64";
102− sha512 = "710a1da3b50dd50d01f29685c6bbb6a39849a5d0daf1c98c2722c5f823b501b9679f53ed72a0335143582e10d01605d57e474936278063254f01f41cc211d92d";
102+ sha512 = "5a11368521eeff68cacf8ed353b12d9d17f134871739e0c1d25a6103e4c8b917b19179978940075905e5dbac51cc13ff8bdae6185222ceb6eaa5fdd3dfab16ef";
103103 }
104− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/fy-NL/thunderbird-60.3.1.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fy-NL/thunderbird-60.3.2.tar.bz2";
105105 locale = "fy-NL";
106106 arch = "linux-x86_64";
107− sha512 = "dd08b6a9e99b2f639139bd8b2f83406229dc8470a66381bd625a15f17093f7996777d35c05bf8cfae930c1379e547236197f73620750a99c27cc2adf0b7688c4";
107+ sha512 = "003561a27b2ff7b484fe0ddf37fc539055ca8e302f0daea64c1932c0a9e2fb3a66809cef707ec3feb2dfbea5e57cb1d8aa957d4584a33f0465d252398dcad512";
108108 }
109− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ga-IE/thunderbird-60.3.1.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ga-IE/thunderbird-60.3.2.tar.bz2";
110110 locale = "ga-IE";
111111 arch = "linux-x86_64";
112− sha512 = "ef38f8713a7e792d7ccc62e360954c29675ce208e51c06dc3679869487059e5d768f803e751fd008c369a2e438f5c54d95f4b48d042deeb88b0c6e7c84bab213";
112+ sha512 = "17db64205a0d56a90c61ab63326986054a3b162bacc01a5ae5cbfc5c6015b47a64886663418b10f1da779556b5730411bae6515e903af96c1d2f0bc51399067d";
113113 }
114− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/gd/thunderbird-60.3.1.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/gd/thunderbird-60.3.2.tar.bz2";
115115 locale = "gd";
116116 arch = "linux-x86_64";
117− sha512 = "9ea6406dbdca47e031af25139707707b9bc56957180ac73682b55c324980c6df0dc8b0ec4618cb175dfd489d7941f8f61f71551c9d221383698eaa6b300826e0";
117+ sha512 = "9c09193e9a24b7a34a5e247cb9bac9b1913a4bd7549a396a4c723c83de716b3e7d055588c926d6bb08e7b6a223515764b8ba51f6d013229f40da848a401f3b01";
118118 }
119− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/gl/thunderbird-60.3.1.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/gl/thunderbird-60.3.2.tar.bz2";
120120 locale = "gl";
121121 arch = "linux-x86_64";
122− sha512 = "6ed22b1fe889a1b8109c180c90e35acabe3ce904a0d57824fdfc83f703814635123aa2fcc2f8a6edf50a33111698537ee284911a7eb3ce7f1dc8ec77819ee61f";
122+ sha512 = "a303ff6bd6fe3659ef2d09aa58cd911b7b8148ea5c925b82ca7a68f3b16534e13149e03f6fb15c5f93242d6e61d4e1448a1ff27b146de9adf586f01d8d32dfbc";
123123 }
124− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/he/thunderbird-60.3.1.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/he/thunderbird-60.3.2.tar.bz2";
125125 locale = "he";
126126 arch = "linux-x86_64";
127− sha512 = "08c9923c10248b3b6e0c33b75dde8de66377404c979924c29ce602798ddec564fdb3e978a1345d9f2f734768301a262f8ce309bf002f7c7cf9434087e2439266";
127+ sha512 = "ea72e43f7b1de708de898dd8351cf4837f97c1a28a71648cbfb76986bb2a87cdb747437e8b9358577685c38c9f5ec80e9982442521065a8c0e412e19cfdccdb9";
128128 }
129− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hr/thunderbird-60.3.1.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hr/thunderbird-60.3.2.tar.bz2";
130130 locale = "hr";
131131 arch = "linux-x86_64";
132− sha512 = "95cb5f4d35174dffbf341d2d8986ae0b5248ca7e447aebb13d27915ac7968dc1454ee8fdad201b0de7fa6b9af0cd632c951a2aa9d43fc5f6aa6f7f205ec42cb4";
132+ sha512 = "a48ac47c5c04fcdc532e983559fbd2967539250d242f84f2599883c068c67e9c72d73b6355f7f6756d80ed9a54bff5a36929928398acd080e04675b552bcffec";
133133 }
134− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hsb/thunderbird-60.3.1.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hsb/thunderbird-60.3.2.tar.bz2";
135135 locale = "hsb";
136136 arch = "linux-x86_64";
137− sha512 = "903be2c67851f112092a09110b7abde2d05d1964e8c573962709b902a5335be3eda0f2c687e6cad67d42339e58559d633768d5b203ad482c1de6f31ba3b13a94";
137+ sha512 = "cef96f079261d53092d2fb7e8f93f72caebb3aaff910264188e8b3532de1ec4fa0f43ed45a60f80bc9ba5eac69cd17f2a415b70700d7bfd6ed8c873f2fadfdd8";
138138 }
139− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hu/thunderbird-60.3.1.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hu/thunderbird-60.3.2.tar.bz2";
140140 locale = "hu";
141141 arch = "linux-x86_64";
142− sha512 = "83a65776921962cc84f6c932e471d8a1532aeaae6edf95a9d8f68e301ad4383d0cfdb35469a51393c45628e89142c63af3886d1bfb31cb37eef188a07f96f352";
142+ sha512 = "45245ae609216cb307e07b33ebc531c900e51634a6eba57bffcdbb4e0d72dd7466e399d0f5fff42a06973c3f2fde61d5e59a608985a513786819dde443cd2e3d";
143143 }
144− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hy-AM/thunderbird-60.3.1.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hy-AM/thunderbird-60.3.2.tar.bz2";
145145 locale = "hy-AM";
146146 arch = "linux-x86_64";
147− sha512 = "42469e3b613321906f2573706a523af032e93abea2e579b1e768d75898a504c4ab5280d7f9ec1a2e25257ca4fd877d53092fd85813d59c6dc4e5eca058aad6b4";
147+ sha512 = "d9b56f551997ba6d2413ce6847ab6af4bcf9d633bef2fea7a0fa8e8bf37fd87ce497134a7f58c31d647f781d07977be58449485c13212eff2996e3ebd34a3be7";
148148 }
149− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/id/thunderbird-60.3.1.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/id/thunderbird-60.3.2.tar.bz2";
150150 locale = "id";
151151 arch = "linux-x86_64";
152− sha512 = "008e9b2949f55a400209440e6eefc6144b71f76589ce18c022e2fdfb203d75f97a93ec3f06a9810a72e0b5b0566d2403b16baee25a46dbaf77eaf36a1ad0bbf2";
152+ sha512 = "8d09a5e23191f454b628c3bbd1b95045b201dce34ce5ee78e35d4e03ab3e2f686a1be2683332d1fde5bccbffec1e878c851bbebe019b8e62634f64eae344e2df";
153153 }
154− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/is/thunderbird-60.3.1.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/is/thunderbird-60.3.2.tar.bz2";
155155 locale = "is";
156156 arch = "linux-x86_64";
157− sha512 = "130432feebe93be2c2d87febbf3a45be16c118a980d3fbb20a8d0fa42ea1898e70f60d758ce407df461ef6984a2e55d67594e50edcc4b9445468bb1ef5421889";
157+ sha512 = "bd38c11eeecc90df111917e8d6d4c68882c24b40b1c7171f366c795dcaf4709fcd47aa1d81d76c7db549b054b3705330ce389bd8445dd48350c8cd3a22bdd9e0";
158158 }
159− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/it/thunderbird-60.3.1.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/it/thunderbird-60.3.2.tar.bz2";
160160 locale = "it";
161161 arch = "linux-x86_64";
162− sha512 = "1887f49727e3116bfecba4b084fe550b1b9b82f90b620ada9baa81825ab200489dbedab2f465cb52a0e22eb130069bc639eb54ab48b6e708c264bbc5bc076fbb";
162+ sha512 = "ad3fef3fc1414a98e7c24abd31b0fa0796e326c141ec5896b29feac7c3955c807ebdf01e7d099f37b31e32f3267cf8052ee8d4f324ef974ccbce38f13ae432d1";
163163 }
164− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ja/thunderbird-60.3.1.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ja/thunderbird-60.3.2.tar.bz2";
165165 locale = "ja";
166166 arch = "linux-x86_64";
167− sha512 = "c60a6e44368387f424c9881702dcb4f3dcfe439bcef92a5e6791c7619f3fb71a36a83e6ec2142cfa556e36b0582070f1aee9973261afc1fdae55a6d5f5b808d9";
167+ sha512 = "880df6180766953da20c8917da020750431b5463879aa1803a6a4b9437a650f918a69e75804c267c1cfcc959a18edae1936f5059fa165cb9a5721937b3aa68af";
168168 }
169− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/kab/thunderbird-60.3.1.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/kab/thunderbird-60.3.2.tar.bz2";
170170 locale = "kab";
171171 arch = "linux-x86_64";
172− sha512 = "1db688c67904b1f930133c5e711390d2fa1498e48db450f3ca41e6b039fd7cce4b68298ecfe5a47c20eda9ae0464ab9fe8d0907b28a59bb3fd95a7d895c02665";
172+ sha512 = "285a5054b19e155905f0a29478b4cbb3694499d798ec009dcf4c3cf5d44510c5468d6119fcfd5d2e4ca4e4d1abd83ddc1d9fbdfc68499534e42040e2b8a27463";
173173 }
174− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/kk/thunderbird-60.3.1.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/kk/thunderbird-60.3.2.tar.bz2";
175175 locale = "kk";
176176 arch = "linux-x86_64";
177− sha512 = "e24f8f451e39bf945e51dc9afc4f40f3e5239616cb838e977ab74151f64dc07c246dcded50976a721261a01d9de0d55b802077de18f7682bbd892c2282f7969d";
177+ sha512 = "fe77320d7228c623bab6eed15466bb31b64955dd885728728000e03ebd368c666b825bfce8a5ae9b9f17e74a519d74ae26c636e8451fa3df91a7b5b5e2ff3d05";
178178 }
179− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ko/thunderbird-60.3.1.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ko/thunderbird-60.3.2.tar.bz2";
180180 locale = "ko";
181181 arch = "linux-x86_64";
182− sha512 = "52296e8ba959fd82b29b8cd7eb57812955d2078fc7b8aeccab80b8a4d917a6459072a2a317feee41bf649c1806797767a85fcf81af656eb51dee70352b57ec17";
182+ sha512 = "f3cbb3fe94d44f4c4334041ff53983829c783ba1cb23bdf73d07a35f3b59dbff8c4a584f159441b142e1ceae3e768e4b20316a870033603db8987bf4f1b04d53";
183183 }
184− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/lt/thunderbird-60.3.1.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/lt/thunderbird-60.3.2.tar.bz2";
185185 locale = "lt";
186186 arch = "linux-x86_64";
187− sha512 = "b5a1a8ce67d441e0d919e808a9f7b0e9dedbcdd7af105a372f071430ad1426847087b53ab2b7bb455d161216287e2c0a7e2639d80a0161f7a92a8e87337deb8d";
187+ sha512 = "977aeda9dfaa83b1abf844d40199382f5ab8be2466064b4258fe46b6821b333db027c2f45355c6655a7173ca369e5329b269bb456ab964ec38e3e5a878cb8054";
188188 }
189− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ms/thunderbird-60.3.1.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ms/thunderbird-60.3.2.tar.bz2";
190190 locale = "ms";
191191 arch = "linux-x86_64";
192− sha512 = "8ebbee14a1c2b540baac19f6b154e74e3c39a3178b1ea32b55f35edaf2cf41f4e6096be3075b54c37f8b01e7e424dbc2f9d6b3fd04afd366ed854684e276f302";
192+ sha512 = "f5e4ec77934a66ee22d8d8bc2d0c238d020a0843da562ac6ad344818ab0ed32497ca00eaf96c252392d3923151ecbe9f7a0c90d3dee7e558bbe75da278547549";
193193 }
194− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/nb-NO/thunderbird-60.3.1.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nb-NO/thunderbird-60.3.2.tar.bz2";
195195 locale = "nb-NO";
196196 arch = "linux-x86_64";
197− sha512 = "8e9ae2aa4572e247ecf9d1715d0733bdf7123dc1fab7804a2dfb4f27aac589aecfa86824597e1efa218dfec4807730a697e36a813008b0b208c9181ae20592dc";
197+ sha512 = "4d3723af7503ef508ea269f44185eefb33894a989461a22a742cfd369d0a2d93d6c3bce61711ce2a5de868b3d7f7c612a8a596718609068950b32d1bca7f1c55";
198198 }
199− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/nl/thunderbird-60.3.1.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nl/thunderbird-60.3.2.tar.bz2";
200200 locale = "nl";
201201 arch = "linux-x86_64";
202− sha512 = "a910555ed33fe721de624b591fa0a4aa769e8c8e3d78253eca907e0ad2f4ebe541e2b72ca3434d79aee9a59dde219c5b24d5b406f0dbafa0b1a8f080cd3f6e9d";
202+ sha512 = "0a95e88ecaa1b3af514bdfcaab648f3cba9b280e5eb4c9efb371309cdaf0dd1215cd74d2d3af203e0547c1bab4b2480c4a3e9f81e2d1c301322497aa990af281";
203203 }
204− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/nn-NO/thunderbird-60.3.1.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nn-NO/thunderbird-60.3.2.tar.bz2";
205205 locale = "nn-NO";
206206 arch = "linux-x86_64";
207− sha512 = "9fb084d5ddaf22cd282b3ba001b39d926ef49a03c9ceb5624cf11bc637af5dbe3ad90d0282f6b90f794010f69104e5bb126ff5c8aafd7cbed82cae0834563e20";
207+ sha512 = "d4c112319b8df0e377cdca82b33f55b0e949d3b2f2cdc3bfc5b5eb0c0a0e98470452b231e8c82f2cf303f1e75b512c5097f5988bf10efc57cb2362f7711dfae2";
208208 }
209− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/pl/thunderbird-60.3.1.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pl/thunderbird-60.3.2.tar.bz2";
210210 locale = "pl";
211211 arch = "linux-x86_64";
212− sha512 = "c5c4590b177775b559acd89d3aa2c4555fa4c8c564ed426cad567b68e2508560d6a8bf55c9b3665819be3ce9b42ef94b795082f18e27559d6f1087a51c26bd5d";
212+ sha512 = "94829eaf23916a0ff5273b38594a9a10ba9b178c0103deffcef0eb2015e4a2c51dba341644252b86430f18f4a2e526307f45ae5515f6d47832b74438dc798ea9";
213213 }
214− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/pt-BR/thunderbird-60.3.1.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pt-BR/thunderbird-60.3.2.tar.bz2";
215215 locale = "pt-BR";
216216 arch = "linux-x86_64";
217− sha512 = "4d66d1774fea6fcf2c81bebb5035b4544ae6795077c8d12cfddd05257149a56ae91b280a28488483ddaa444533b253297f7e6d9c2314111db8013e0f8f0c234a";
217+ sha512 = "55148505771d65796766e6ce0b46ae9787dffda5a3176f249092f9f446fa5cb9d7dffbca0774865bfe000e79cb8b9e7704e4f095117172b3a2b8fc661b4e21d7";
218218 }
219− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/pt-PT/thunderbird-60.3.1.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pt-PT/thunderbird-60.3.2.tar.bz2";
220220 locale = "pt-PT";
221221 arch = "linux-x86_64";
222− sha512 = "1e24124c69e5c8b0293ea79c499329b0075fa795d87e8ebc78f322859bfb6e76f977daaaf1cb187bcff5239767fd55dd5e53884a785cc60bbf4c1180543c8c5b";
222+ sha512 = "9d7c6f004afec887f06e7b08c344727dd8310390511f454e18a93ef618830bb68df5ef60129659a31c33ef6b57d3c0e7693ccb5d4c9452eed1ef1404c6f83956";
223223 }
224− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/rm/thunderbird-60.3.1.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/rm/thunderbird-60.3.2.tar.bz2";
225225 locale = "rm";
226226 arch = "linux-x86_64";
227− sha512 = "f2f6174e337010075ab78b88f9de1fb10d213fe1329ac185a64bde7c2efd9f5ad6a0151a42e0745694bb1f426246fba34cea5627316e17fa41bdc292ad692fc1";
227+ sha512 = "f7dc1d5981d98f38c13c840e71b542dd3aad096d8dea8add79ebf756129a0a83316eb42b9018d47ab694c190384658cfb243dc96d4522a84a7f35ce82e79fa00";
228228 }
229− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ro/thunderbird-60.3.1.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ro/thunderbird-60.3.2.tar.bz2";
230230 locale = "ro";
231231 arch = "linux-x86_64";
232− sha512 = "25daf13a075591ef46295b44c0977c8e159612862953e7c22a053a3958b765b8a5693e8aef691590031285605101024142a42922faafdf9c0c998554e154dd74";
232+ sha512 = "97f7f674e4a858ee9c03bf1661071c6d0990b5018de9f69ac46a98c82db53c67d2589d91ec9db2c1f6361a700d47779f6f4015214d8010da490fd69fbe065764";
233233 }
234− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ru/thunderbird-60.3.1.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ru/thunderbird-60.3.2.tar.bz2";
235235 locale = "ru";
236236 arch = "linux-x86_64";
237− sha512 = "a187abec0708338f7a0f593a2054fc20f4f018d1e2ceead6778c616450a2cb3fd2f959f4c7e6018ecefd07a984828efa2da3f91b34104dd62fbf5a5a97310082";
237+ sha512 = "de481909f670659bbb3c227aa97780ceb54683b5ce47135e480fb95f89663b2fd9ce176d7507913f31417f66fbe8d4f8af08481bbfbac6468f7ebdc5b0bdcfa8";
238238 }
239− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/si/thunderbird-60.3.1.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/si/thunderbird-60.3.2.tar.bz2";
240240 locale = "si";
241241 arch = "linux-x86_64";
242− sha512 = "076c69137e6d4067f553efde45d1676b386277c904f452ee1880a52ead9cc40a1bceab33a895886c32a203dc8aa6d2735b5f81b21b969ccccfd2d5e75a2db289";
242+ sha512 = "07ebf67fa8673dc7bfcf5563591e4ef5c4736e3844b31a4e6662098d15dc05a437e3d5eab544cd09c010628a20f15ead8185e149560e0526dc1379f0a9202f56";
243243 }
244− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sk/thunderbird-60.3.1.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sk/thunderbird-60.3.2.tar.bz2";
245245 locale = "sk";
246246 arch = "linux-x86_64";
247− sha512 = "669bf299926fb9f4b0201c9fbbb593eebe127ff64d9c3cd12f79aa56b2e9d8a9b68c34e8ee42b9cc1287972c1a3d28c080945c1f17f4fbf672bc90c1f86425e1";
247+ sha512 = "deb6291ba941743956603f6a91c0a19a2c56960bc91869ca7201f7a3eccfc630300987ce5b7bba51856bc16cbad2e34cd7ee645a22d692c12e8b4f66553c6a1a";
248248 }
249− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sl/thunderbird-60.3.1.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sl/thunderbird-60.3.2.tar.bz2";
250250 locale = "sl";
251251 arch = "linux-x86_64";
252− sha512 = "0d22ef11e347caa3e03b4a83c19dc1a230be3ed2e561ce84284b752abc7d64720e2d68d2fbdec19da73cdc13c5e90983179197e512f7db4f52c341539b8c1329";
252+ sha512 = "b07617d113b7c3ac75cd4b3f8fbd098bbbf5cc2b8f06317da410ce534a93013671519c9e0698809add4c14fe131b6273dafdbdb8a8ed56922a68978cd20a094f";
253253 }
254− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sq/thunderbird-60.3.1.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sq/thunderbird-60.3.2.tar.bz2";
255255 locale = "sq";
256256 arch = "linux-x86_64";
257− sha512 = "ac5e98dc1660efc255bc07a545e47f2141a8468e8bb911ad1b42143e5e048a82d5771f32718983ab80695b357b3b2d08897cf98f791f466edfa57d75579920c0";
257+ sha512 = "b22bdf2bf3b8cb3c1a5e63360652ac34bcc63499a02a8a5af7e2c6987b310d5d4a18495b17c2f7ce9f509be08b8b5ea1beefc241958d75c4c6be26bc5a02532d";
258258 }
259− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sr/thunderbird-60.3.1.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sr/thunderbird-60.3.2.tar.bz2";
260260 locale = "sr";
261261 arch = "linux-x86_64";
262− sha512 = "2215af6e62448949dbb89cc66a52c9f83eabf1074ad8cff437953123d53ad403537b5655509bcdbbdf239da32e5b9d689b02cd625e225ce74a0c22f07318ba1f";
262+ sha512 = "5d5139a8f9405b4ced928bb9241c0a4b3502421c8329b2da4d582022c2f57b7c599b48428ceb6601799448ad40d52270429891b7a637f9a913b47ef15a3d296c";
263263 }
264− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sv-SE/thunderbird-60.3.1.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sv-SE/thunderbird-60.3.2.tar.bz2";
265265 locale = "sv-SE";
266266 arch = "linux-x86_64";
267− sha512 = "c72db6a8ed31e7348df9a0fc3931c5b1520f7bc03ea47e92eab343acd58c3fb4574beb91fc932733bc52e670451a04a88262e6e29ad7c0dacbcb37da522537b6";
267+ sha512 = "2b8d2962846a7a0ef0c8f77cfb51e26da417de7a808bccc97ae3087dde1f4f0d38f770a3e14c26f5081af6c57dbd175ef81ff82992430bcc5fdfba2c2948c9ba";
268268 }
269− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/tr/thunderbird-60.3.1.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/tr/thunderbird-60.3.2.tar.bz2";
270270 locale = "tr";
271271 arch = "linux-x86_64";
272− sha512 = "249d2320607100ec397556619872b701dea16142ee3ca0599fd17d66e5581d4753326a0aa9e2fff4b38c9a91ab8e923abeb0115cd8ad9e82cc871116d670cd4e";
272+ sha512 = "e37b98fca81ceb022d95e6b23260a22ae0dde8f48753c6dcab96a3aadc8a68c852c2c6e105ee7da8733402561435357b0d70524aac419604a13964894a88671c";
273273 }
274− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/uk/thunderbird-60.3.1.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/uk/thunderbird-60.3.2.tar.bz2";
275275 locale = "uk";
276276 arch = "linux-x86_64";
277− sha512 = "439d7018c6a6cb3544ec26fdf6bb93d6be2a7a4a6a19d6d5de40e7bcaf0281e42af6fbad23d4640959fae84ea4bf487c19fe07bb50334cd593a20c7c5db999e9";
277+ sha512 = "9d1f38ed783b36f4312ce701dc8da3bf9facbff9874b08bf5730995a2fec3a060cd55aa395919b03ae12fd9f941e5f2fd329e5d836e1f722bfea97387e07be92";
278278 }
279− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/vi/thunderbird-60.3.1.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/vi/thunderbird-60.3.2.tar.bz2";
280280 locale = "vi";
281281 arch = "linux-x86_64";
282− sha512 = "0f7e6cc139cba5223fb75b0fff6b60e26d2783e6a78f22f3d8d1ec518f950856ecdef9b2aa31346aadbadcc08ee9b9a251e2fbdc5bc9655395fa2015530de050";
282+ sha512 = "e70d087dcdfc0e5f6791b1c5e1483ffe6891b64792823b400d79fd9ed8bba10e5c21cb14a11cc2e020d8c91ef5f82455793595dc7143956d0d1a99f673125253";
283283 }
284− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/zh-CN/thunderbird-60.3.1.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/zh-CN/thunderbird-60.3.2.tar.bz2";
285285 locale = "zh-CN";
286286 arch = "linux-x86_64";
287− sha512 = "3280a8085855b25b88e485581d3f275873c4c01f1ea9608d98b01553a0dacfa7226d405d055028b2a45daf6316004b12ccd8637deeffb30724540df1ee480773";
287+ sha512 = "28c4d992ce79d3f62984a1a0c009a742709c4d5dc1be3e9e05da6b4e232e269b04f548b67b1e0af85c51f7f4470cb3bb9a79d5bb2ab5c55f27806bbd27f5611d";
288288 }
289− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/zh-TW/thunderbird-60.3.1.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/zh-TW/thunderbird-60.3.2.tar.bz2";
290290 locale = "zh-TW";
291291 arch = "linux-x86_64";
292− sha512 = "194cd71fd722d2f8f47ada2fcb02c018cace495d6d72c7eacfff38c6e5f30b7749dad41f2e28af8e935703c4033fcd5f7264ff828240008bb17a86e6894fedd8";
292+ sha512 = "444524e9be27bc5a37d06cf7f9496d75ae524a27c97577066cf6bfcb2923369cf11a949d8712433345f04fd2ed7423c45497a51a50c058b7910216d9f0986350";
293293 }
294− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ar/thunderbird-60.3.1.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ar/thunderbird-60.3.2.tar.bz2";
295295 locale = "ar";
296296 arch = "linux-i686";
297− sha512 = "56a8a07096fb29db87dc2633aff725612ff8255991674c590dfff51970778bb6b118a2f025097bb139086cfb949d0f53b1a6b1e9670c4b3cb0fc9ecfe35f6065";
297+ sha512 = "5e147d4087d5b3f92f3f62e4f889bf1a38851f038ecaf9957bdc9ba8a7c52905ef74788a6879285836bf780177ea785b0ff65074eead4a1ba2442ad2466ef82b";
298298 }
299− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ast/thunderbird-60.3.1.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ast/thunderbird-60.3.2.tar.bz2";
300300 locale = "ast";
301301 arch = "linux-i686";
302− sha512 = "9475397f31e227e6a83b9572b82d7067fc633fde9a271fa68be5922f860346abb2bc879b14f489b54c3e518cd2d917b5e5ea2a03da3ab554607356cb7236f4b9";
302+ sha512 = "29066ad291416e4cb1e778effb807b3427d74285ca5edc4ae84c27e39e4b033eaa665ca22ebd603b7d1f7347e6d21874c1be6b00df56e6a4c93aa60fdf613b07";
303303 }
304− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/be/thunderbird-60.3.1.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/be/thunderbird-60.3.2.tar.bz2";
305305 locale = "be";
306306 arch = "linux-i686";
307− sha512 = "488cf4396202882d4499b0bf6a3c5fe636fd162c767c5344ccb033ad57c90f544fb1e4daf348f08863c990eed0a07bb543c8b9f648786535a3db2887e77a6823";
307+ sha512 = "535a84a7943a1da9117829e9cc9aa0f1fef1e3eda0ee61d356a4f2e10dbf2a61da899fef2d0b858674a4e54f574bb0aa5db628b5dab52fccf2a0eca06b9695cf";
308308 }
309− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/bg/thunderbird-60.3.1.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/bg/thunderbird-60.3.2.tar.bz2";
310310 locale = "bg";
311311 arch = "linux-i686";
312− sha512 = "62bd4387ede66078250b1a462ddd487c97addd044b8c04858de922b60b88823880869f7eee0cf618b51ef1de956007d4fc9a6ce05ffae209284104cec4557bb1";
312+ sha512 = "83c925fc5164146c24447835229cd1abe4d9eb89adababa68057d90906ee6b1fa51549311dfae934eb1faf36f5d10118a1d4cb7338019dd41a6d563fcfafafa7";
313313 }
314− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/br/thunderbird-60.3.1.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/br/thunderbird-60.3.2.tar.bz2";
315315 locale = "br";
316316 arch = "linux-i686";
317− sha512 = "39fd9e5b42000c9b1e37f7a0bdf03681a3372166cf90750495f7e2a0e10f45465b3eb7d68454022634ffa8dd7a280d0ba98fee9367fa6058223fb87c06349e75";
317+ sha512 = "b9c0e4cd14a3c745f506c303e2cad6357890f7b9dda91de43d4bddf5bf45c0247120f6c824189721512536e3cfed4b3a1d32a1767b2cac64f20349f158c10acc";
318318 }
319− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ca/thunderbird-60.3.1.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ca/thunderbird-60.3.2.tar.bz2";
320320 locale = "ca";
321321 arch = "linux-i686";
322− sha512 = "9cde54a64916448a776de3c197851576c5d9e395bc90da1f18abc0f5f1bb27d267bfcda33cde51fb06c80277caf35a7b9f1fad6853f8d053d95abb8ed2e95f5f";
322+ sha512 = "5d45160609b49ef060d7d6a92c5ca24b4dd6f02397103cd66a76796ac72c2ce8f9be6445b09489d8aa96ef0156ec31a734e7091d0134176593a488905370d81a";
323323 }
324− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/cs/thunderbird-60.3.1.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/cs/thunderbird-60.3.2.tar.bz2";
325325 locale = "cs";
326326 arch = "linux-i686";
327− sha512 = "1b5b8633a6502e731e9d187b0c3977db8338c3aac9d4b07c12468b143a11488c5c4b46b898f3ced8637b16abeacde0c0482b74d0c67c04bb4e1e40bce66d8151";
327+ sha512 = "659431aa61b6221543bb7e59b7b5361ac2011ffad65ece1046df3869b54c1cd39fda0998108f9c72f1dc4f5151496962b73e31ba1d3a2bf9bd6bd3186f7ed0a9";
328328 }
329− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/cy/thunderbird-60.3.1.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/cy/thunderbird-60.3.2.tar.bz2";
330330 locale = "cy";
331331 arch = "linux-i686";
332− sha512 = "a4636852813f271fe7ded7665d386d34120f664e5e2c18bd923efb4f3ff4cc273fa6ce952b243a2e25840f96baa4ac28979201d6f9a99ce8ce2bd18be41f1f82";
332+ sha512 = "4a488557f0f64d4d4a4aa33ab385754f89bd1d1f2d7d39b64e75ef8a6a2d2f55bacfe9fcdad7901e44f9f2c69acb76d595ae379dbd3dee07bdf299a4dfa08a3a";
333333 }
334− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/da/thunderbird-60.3.1.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/da/thunderbird-60.3.2.tar.bz2";
335335 locale = "da";
336336 arch = "linux-i686";
337− sha512 = "fb4b302ac628b6b84ee8c537ec533200421c0fa4ce5af2efbc92e1f62e23761f5a64e11ed004ebbada8c0f31a4576d8a006571470896470547622aefb27af4dd";
337+ sha512 = "39b46247bc1f83c1f2d3470421411cc931beef1087089110aaffa4b604c102048771069c833db85a3c3b070b9586e45a6eeeaeb5b3fe9ee1e77daf5e6e7aaf0e";
338338 }
339− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/de/thunderbird-60.3.1.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/de/thunderbird-60.3.2.tar.bz2";
340340 locale = "de";
341341 arch = "linux-i686";
342− sha512 = "76a213f0ee3fc1611d88d82639bdd3a90fb0cae0ef9c938087da3cc14c2802c6ab2bb5c73eb27e370fa45dcf25c075c27c86fc1b8f38b32aeaf76b796269293e";
342+ sha512 = "fd29518af52080217b38733f5babac66e7dfb17742b67be2ad962c541ac31e27bb162303474acb3c320a4a33c1e589c4f826b66b16df2296647e499051b540d4";
343343 }
344− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/dsb/thunderbird-60.3.1.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/dsb/thunderbird-60.3.2.tar.bz2";
345345 locale = "dsb";
346346 arch = "linux-i686";
347− sha512 = "34e0fdc2179d4edd61044eb43f9fb4653e3a34e424ca68e549f430dd2398c6e8890b1ab5dc1aa08a1f93ce5e73774eb465e75ac13c6ec56ffe25de5e41b308bd";
347+ sha512 = "4f0c47c2757a5ef641f1618a7276a9a171cd681c517db130886a1569c7e00542be05fab2062fce21b5c3f8df60e3c521b25292f7bfe1c437b7c1a779c9165510";
348348 }
349− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/el/thunderbird-60.3.1.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/el/thunderbird-60.3.2.tar.bz2";
350350 locale = "el";
351351 arch = "linux-i686";
352− sha512 = "c09cb6653d9bace2767c25fd7a2d8a0100c36a5f029e2950872a13cd2f2cdc56f4e4c5a53af36d1667cd23a0ed405e529d470b0405a0f615c4a1e78e08cc6c90";
352+ sha512 = "fb6f80d1a7a8e465fc49e38d986bdcbfd962b3c99c45629ac188e58ff3cc63cc97da4529fb67566705ed3c4e682598e0089e826d015b0dddcf60d359faece400";
353353 }
354− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/en-GB/thunderbird-60.3.1.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/en-GB/thunderbird-60.3.2.tar.bz2";
355355 locale = "en-GB";
356356 arch = "linux-i686";
357− sha512 = "df3b0c6e90fb683d7b67db078c4052be3066072032a99e9b1ec2bd1bc9f5f7a95952788c754efbfce9c5ca89a43d6b59953a3c5283eaef134457b79f7fa0c538";
357+ sha512 = "7e2301e76e4be208256bcec9237c39b30cf49075c46d27a243005c39289e1ae26a1ee41a294c8d5389279b21749fda4f490c2fd1b3ee4b8bd9f1170f2efffcec";
358358 }
359− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/en-US/thunderbird-60.3.1.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/en-US/thunderbird-60.3.2.tar.bz2";
360360 locale = "en-US";
361361 arch = "linux-i686";
362− sha512 = "18794d71c1d904caa1959feeaeceee38c86bca0faa84438ac1e1355879ae832fd509d2124a6d9ecbac7242eef334793357caed871713a139511ae77107168933";
362+ sha512 = "0132ce8050a45246919e5fe538b84eb158cbf40401d487ffb7bf72d04a2bc3371d7606523dc6776dc3b6dd4c1930d56f6b47197385cf580d7b51c926c69eae99";
363363 }
364− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/es-AR/thunderbird-60.3.1.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/es-AR/thunderbird-60.3.2.tar.bz2";
365365 locale = "es-AR";
366366 arch = "linux-i686";
367− sha512 = "69825a80a98ecaed860c5f31c63928f215736fd9eefeadd7be1d88659c17afa58d7975f0ceec26040a21ca048da7b06154a44798069092c0a4e2e6816e847aba";
367+ sha512 = "bccb7704f8bd0f09054e48c54bd4ebeb4718667aaf46c55a7cca3e351181e09760fdcbca4e1e1948746b74f2c7ae46cf0d565f4a9c00430225e6f2c2849ea459";
368368 }
369− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/es-ES/thunderbird-60.3.1.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/es-ES/thunderbird-60.3.2.tar.bz2";
370370 locale = "es-ES";
371371 arch = "linux-i686";
372− sha512 = "673b4d55bf3691cf972a1f1369486cd205d7c6e8bc91cd826050fa28dd6c313f872aca399191305320289962f93495ea6316ae2f2b29313d8b61c175ae0640cb";
372+ sha512 = "81359edf957802660c0f92f8894a9087acb2ee6b08906de1fbf4be2145911c30b6de27b11b66ee8b7ad8cafeb09e00f336649537829f82cb7f204c834b1e585f";
373373 }
374− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/et/thunderbird-60.3.1.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/et/thunderbird-60.3.2.tar.bz2";
375375 locale = "et";
376376 arch = "linux-i686";
377− sha512 = "1dd9ac5e292fdec230189de90fe5ca923351b98a95d72d302bbc2c838e48cda46bc2e8e4ac2f08d2356b7a596dc2210fb9f24c15319fbb519b29dab78e29f2c1";
377+ sha512 = "4039a1680551f03a17225cb8b2cb9e0fbf554ce3956e89700655cf010483c61e7b29070aba4a0fb7395b93838f9fab6542fb006b9c14f0a013b6eb587329d7c8";
378378 }
379− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/eu/thunderbird-60.3.1.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/eu/thunderbird-60.3.2.tar.bz2";
380380 locale = "eu";
381381 arch = "linux-i686";
382− sha512 = "acfa8190d55223752cd3c65fa87bff86b7f1f38d86365bba23190c4f16519feb8acc37e1a47497e69279a312e57d39a5830ba8d9c4391a1503024f125ab72b18";
382+ sha512 = "d7a5c40069541615ff8479a8eb48d5a199d9bf9f834661af833b65d68fce93d8b433fd45e0175bf29c8322a402136f8b4b174b7c85329659bfaaaa3430bab574";
383383 }
384− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/fi/thunderbird-60.3.1.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fi/thunderbird-60.3.2.tar.bz2";
385385 locale = "fi";
386386 arch = "linux-i686";
387− sha512 = "8a95970bd4fb56ff80324a743f02e9dfa21df698f761096ee5d425663e87590ca8d38ab62ccc97298f4d935f4713ded1e0acf01afbcea1d378ed2c065cee637d";
387+ sha512 = "10c1d2e0a3d3d0dd2bc6166e4dd3ffc273f97e7b7a03d5148a8475411357eba8733ef33380cb79d813b65fe128e2bc07ac2eef30139e3d6c69af77003cee8950";
388388 }
389− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/fr/thunderbird-60.3.1.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fr/thunderbird-60.3.2.tar.bz2";
390390 locale = "fr";
391391 arch = "linux-i686";
392− sha512 = "51111b8da2823523bdce77d9807535e09b54f1ca7e1621f3447c9e4bf44522a176263a843875a3f55602b7b53d60ae00fd5a59f22fb3119a792064ebb9ace209";
392+ sha512 = "31b8463352704d1ac6640a07bd0131f683f4baa2faed799f91de956a083f184539186f0a1bd061c0e1793cc97f22a32b275c5e60994cce93f441181f2120ceaf";
393393 }
394− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/fy-NL/thunderbird-60.3.1.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fy-NL/thunderbird-60.3.2.tar.bz2";
395395 locale = "fy-NL";
396396 arch = "linux-i686";
397− sha512 = "144cf86e32fdad0f4eed95b461de9dc0713c3bc70ccd77c1db94ea53762bffe7a5254f3f898228347e7b1d26df0055dc04b0192d3b1a3653a8109ff8f4f712c1";
397+ sha512 = "80831dcef438c2737d38df2822223632030d62efd84361925f06caa7a108cc966848184403d8422a8a1c43fd1df52a77dc4b561dd2733de73d2c8aa0e0d5978e";
398398 }
399− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ga-IE/thunderbird-60.3.1.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ga-IE/thunderbird-60.3.2.tar.bz2";
400400 locale = "ga-IE";
401401 arch = "linux-i686";
402− sha512 = "7f411ee0f9b518dcf122eff2eb0b70fc1c7a71d2ccddb73482a17c9508f084ff0df6aa6d9a1555c576b0fbd32c9d65e106b8f98c7d603907c7a7189de034bbca";
402+ sha512 = "7ceb9363d331fe9a0c3ed4b052cce765e2ef735b8a869ba3a08e83ed5195d073c1f4d9ca4578140b195cf25e3ae8771da8e061efb3e14bf5e9d875362babb713";
403403 }
404− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/gd/thunderbird-60.3.1.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/gd/thunderbird-60.3.2.tar.bz2";
405405 locale = "gd";
406406 arch = "linux-i686";
407− sha512 = "116e72b7f9759576077d3d11b9913b78dc6356e98995f0ee1ce152d04da9d0d5db6d32218a8e3a9403ee64405c95413fda8f86c6fef85336f799324179896fb2";
407+ sha512 = "292a67e214ab6392e7c6eb80a576fa130b9c22620c8c2ae5ae5eecddecb823526f39a0f16d7df3c4cb80b35325b907708083fd45efb845d40ab89bc3cf5d0374";
408408 }
409− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/gl/thunderbird-60.3.1.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/gl/thunderbird-60.3.2.tar.bz2";
410410 locale = "gl";
411411 arch = "linux-i686";
412− sha512 = "1d06ad862128b2ecb38b885c868c153b78a2246cdc635a066634f8b1a9e08fcff83d30806f9906b8f2a5a929e702be51ebec7fec54f7b80d4544f20cd2ab84b6";
412+ sha512 = "df9f2a24a70facdaaa8c1b3831994fa2f5f14df92cc85dfdafa4fd4a28e7f331ae220ae08a4938755738f01e5f6fa1bbd62a558780a5444afe07e201d6c34f5c";
413413 }
414− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/he/thunderbird-60.3.1.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/he/thunderbird-60.3.2.tar.bz2";
415415 locale = "he";
416416 arch = "linux-i686";
417− sha512 = "6858b78aa38171194ee1821f7266924301859921591d84ab057a52ffaced7665adaaeb1ba536f9f0a7b8cd79ccc253631ff1a3d205c43c2c08d161e520ce7a60";
417+ sha512 = "f1f527e5ec325fe9df177b172061dbfd205c307ea275f732b31ab460801dc49a18cd41625caca0c118f62d2642e4494e961b85b3058e2909445203d7b69ce6c1";
418418 }
419− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hr/thunderbird-60.3.1.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hr/thunderbird-60.3.2.tar.bz2";
420420 locale = "hr";
421421 arch = "linux-i686";
422− sha512 = "eb3f16f0000ea85e420c8bc60abe7b509ba0d125b8f95fdfc67d4c0fcf87b6c0db86a0297e8ee2e7fcb419951fcb0ba42a7e59005742145ae6067be5e85f6e93";
422+ sha512 = "dd5b62e71c708db2dfbaa59bf860b4dcff951607277605193ff084943f4ba7be9f458310a2a3c047d4e29b7ba432bfce1ee2dcb5217c460d90816b17c2232824";
423423 }
424− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hsb/thunderbird-60.3.1.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hsb/thunderbird-60.3.2.tar.bz2";
425425 locale = "hsb";
426426 arch = "linux-i686";
427− sha512 = "55ee75a0158ef072c1698cefa5b6725da36e9286c6da004ceb58f2aec109609f7ca9937d8825b92ae2731ef156e562249093fd551064388bc73905fc9ad2545f";
427+ sha512 = "30374f1750facbd5d96e9b38aa2f237a7424e278df6e8ceaa622d119866b10859b594622438c8299d92bdb6baee2ddd7e45498e6fbdb13a0b0d8bf2304454501";
428428 }
429− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hu/thunderbird-60.3.1.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hu/thunderbird-60.3.2.tar.bz2";
430430 locale = "hu";
431431 arch = "linux-i686";
432− sha512 = "6b9fee4d7747af8b6d39654fcbd0c14e7762a1ab4fb7e7e133598fded0295020b39009e028ffb3d8db502811bd5ca9889abf5004cb01ff995bf9c13b871e11bc";
432+ sha512 = "7a1a955704d4fe5220f039a6fca68f87995f654a59f51df832970607809db76f1cf480df90893ffa88fe87c5cabfa0733ff307393e22c78318c379db963cb26e";
433433 }
434− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hy-AM/thunderbird-60.3.1.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hy-AM/thunderbird-60.3.2.tar.bz2";
435435 locale = "hy-AM";
436436 arch = "linux-i686";
437− sha512 = "e0aa3adb175fd1562e6292526f6512d5f6a9e6584d521aae3c97cc0143946a49e41e1914e9ba6d87f29409ab8b17f84cac9bd4a815e29f7c9ece1729d302881c";
437+ sha512 = "8393a86a9217a4c387cc92b4c61ea552c7115549dba0ee02afac065757fcae4f79b67ef8fdd1559b942f674f6804bba7804d54696ffa71338de42bca7f12cf83";
438438 }
439− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/id/thunderbird-60.3.1.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/id/thunderbird-60.3.2.tar.bz2";
440440 locale = "id";
441441 arch = "linux-i686";
442− sha512 = "7839db4bb937e699688d1e2fd387cbfb25a0402529b183f09897535341324f4d92e774c3bf517ba3a51c86f74854508b5bd6a5560bc153bf3720ea8191c119ca";
442+ sha512 = "fafd7a26288b951d179657f99c72581e4bb5299e8db775b7a086f3481f700dde031137e2cc7370e308c943a0a874c5985c6b9e36c7af1b60c4553779a4653d85";
443443 }
444− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/is/thunderbird-60.3.1.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/is/thunderbird-60.3.2.tar.bz2";
445445 locale = "is";
446446 arch = "linux-i686";
447− sha512 = "29b069bcad1cc668f65a3749a1d87b6582ad32400905bf446f8ccb86cf42100d7034bdb4c0d22a66b8f5ccf95659a5ee4c058f7c5a5ee2222dd0a93cd6236a9d";
447+ sha512 = "3aa276ee0ee8f2613ec7ef1543ba5938658fdd5c1ea24b42d39c5fff4f016325daaa701f89c65a32f04c85fd066f3bef75dd0d5d28ffdeb29618fc16435f046d";
448448 }
449− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/it/thunderbird-60.3.1.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/it/thunderbird-60.3.2.tar.bz2";
450450 locale = "it";
451451 arch = "linux-i686";
452− sha512 = "fdc47d3462cc3db49a8208423c19b0d74b65eeefaad2eca873eb194cc8c9691adfba7e87bbbc7c4a472423eff91ff8e21d78fafef18a4e841e922c72eb53d78b";
452+ sha512 = "696b5bd5c93fa5a174b04f2501e46c6334cbbdba43073015962e7ae17cbf577f0e64d016b7f892513a3a07b6867e8419cb16fc82b915d09695d5a84f3d904bad";
453453 }
454− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ja/thunderbird-60.3.1.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ja/thunderbird-60.3.2.tar.bz2";
455455 locale = "ja";
456456 arch = "linux-i686";
457− sha512 = "068a15c6913a556c1c9d0deeb96c75087f68e62c0dd2eef3445c4460e08c314d457f799e82f96dfe00fabf9ce4cf7a7c379d08e7a7ebb2969c39ae87082bdef4";
457+ sha512 = "588e5c6dfbb40cf355d62f000b5561c6a2a4e0b5c43c7dd2136fab11ee4763cd9cbea89e958f3959aae0570c694aa067d77ed7cca818147cf51a28efb304ab72";
458458 }
459− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/kab/thunderbird-60.3.1.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/kab/thunderbird-60.3.2.tar.bz2";
460460 locale = "kab";
461461 arch = "linux-i686";
462− sha512 = "d11ef24a47ff39eab178ad448ea2d1457978b31dbe5ab0da2b87011d351d92ba54245891a1c6be3ed7424ea9f5743093e1cd6eeaadfe016405ad53252b7d5590";
462+ sha512 = "aa58f8a4309ca122d8517042c9a8c8a92b90087001ae4552de6b660bae082565ae1d80aacd3e506f8582a145132a482fb8c22eab033d7afd4a3959653d00f1d4";
463463 }
464− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/kk/thunderbird-60.3.1.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/kk/thunderbird-60.3.2.tar.bz2";
465465 locale = "kk";
466466 arch = "linux-i686";
467− sha512 = "e4bb916f3e04136b470d46b04d7d2ba4c3d9d703dc8fda44e7611ec51af06af4bf73ab30f4d4b578560a27a34adb6950534d0554573a21210bf825f2aec4ea73";
467+ sha512 = "6081c78fe6febdc6c1c0ef2d102755760c9b137d117c0ad5b8adbf1a50769c3198a703abbb5a826ddd723cb128d535d2f075359e7300d763d8e0a769e3bd5897";
468468 }
469− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ko/thunderbird-60.3.1.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ko/thunderbird-60.3.2.tar.bz2";
470470 locale = "ko";
471471 arch = "linux-i686";
472− sha512 = "9453426d6bb088af4bc4e0e2eea7dd163d434fbb7a29993b82faea9e79a11aca95214aefbac6278a44b90356eaca050ba081dccbb0e57bf5eadfddb992251ee4";
472+ sha512 = "980b2fe49c2f705296ff9036e6714f2039a81ca8c591dd8a0567ba2171196f188be647a3aab1bab25fd48c7f3a02b75307f0a35edb36c534785d51c207fd7203";
473473 }
474− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/lt/thunderbird-60.3.1.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/lt/thunderbird-60.3.2.tar.bz2";
475475 locale = "lt";
476476 arch = "linux-i686";
477− sha512 = "a0a3580444318c1bae14d8123cb215c37c32ef4e7f0db87e118054c34d7c3fb9b4d3659241379a23360680ddef6bbaec9fd3a514790efd6cd5f43d58de2fab30";
477+ sha512 = "e3b37725dcc8f97f36c7e57450b911ba4547b2f34720f27cd89b7f2be92bcc0ee20f1e3426e623a53125013b447ea90df138da53c68de535620f548c955915f0";
478478 }
479− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ms/thunderbird-60.3.1.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ms/thunderbird-60.3.2.tar.bz2";
480480 locale = "ms";
481481 arch = "linux-i686";
482− sha512 = "8295bef9738e4808fe0e72fdc27f772f493ef8ec0ba1ee66923a51e45088152bf61ef0dc1539af7de6e6c637dae1b9ea70ea89912e621a27083550f7abb47c70";
482+ sha512 = "a27ab9c7c524f7dbeb6dde32f36c4cd0f3fe20026e90793bf6fb6396f9a7816aee99c48574224c72be8aba5922dd3d7a21b6c05cbbf8caf1e7b956af50018f2e";
483483 }
484− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/nb-NO/thunderbird-60.3.1.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nb-NO/thunderbird-60.3.2.tar.bz2";
485485 locale = "nb-NO";
486486 arch = "linux-i686";
487− sha512 = "3311340af28fe81452c27c704420a9e30ca9c1ff1dc3b7ce2a49210e83149c0fdea1014f546109704f14cd467963624f8634568df7764085a88e078a58cf8af4";
487+ sha512 = "45135f0d62b03919b754b2b95329dd4a60ad7a2ad1ed4fdff5f174df5d1391111c9f3acd1a0b4ee71b340327b06180619fe84740b43fa8d6fa5d70ea6bcba0da";
488488 }
489− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/nl/thunderbird-60.3.1.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nl/thunderbird-60.3.2.tar.bz2";
490490 locale = "nl";
491491 arch = "linux-i686";
492− sha512 = "7b6ebfa8c12da1e73769f74ea15fbd339e0886783bf4a51fb1c612d7d7372cddd0abdfe654760880c4bdbee6930349b6290c3d52d886915445110449cdef8d6f";
492+ sha512 = "be4fd59d184fd161aa2afa1d2a13a11e54adad4329991b588d373a206b5f2e41bd03d51c1270d6bfc6c84a83c520cd3859eea8f5dbe71b0d2fbfe4bdac2a862e";
493493 }
494− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/nn-NO/thunderbird-60.3.1.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nn-NO/thunderbird-60.3.2.tar.bz2";
495495 locale = "nn-NO";
496496 arch = "linux-i686";
497− sha512 = "d89fabc6c2bf7b64eeca36b4b0b20e64e8e317764c24c9b4cf9430c54635e81ddf66879a3bd1748c295d3b52c523b63d4871823d98e86e1be68c953e0639fe6e";
497+ sha512 = "896c6bfef19af9dc5cf48829869d47a7fcc2daeb9ce2f0a86a959fd6d656b6d721b024830f03230b9bf35a300b21dcb603d5e7aacb36666c33ff80bf5babf1a0";
498498 }
499− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/pl/thunderbird-60.3.1.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pl/thunderbird-60.3.2.tar.bz2";
500500 locale = "pl";
501501 arch = "linux-i686";
502− sha512 = "5ee0bf77ccbf7f57fd4b4c7cc71befa785590d68c67141e135ef5f399e73a7e3cf2b5256f9420963c63b27a680168308772b313fea8a29c6aa322b8eaa46f059";
502+ sha512 = "fb5f412f4bee2af9fed61f310306b883e78b4d64934643cfa0418b69a54e29f746b427e97f58aa94031bf1428d959e3c7e7605dc98c3658163f34217e87ed051";
503503 }
504− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/pt-BR/thunderbird-60.3.1.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pt-BR/thunderbird-60.3.2.tar.bz2";
505505 locale = "pt-BR";
506506 arch = "linux-i686";
507− sha512 = "2243bfd560aff648ffe73cc9e7c6218bf6a1dc81e9970a097742a37aef6becdb93e5226d7340d7b69ee7a7a74785f7c06d93d0da726869ad339a715c265dbd5e";
507+ sha512 = "d1cfa631a3491f1015b8182ef5beb8046cebb0d2a0f541a31dfaac88b2f54586c8a6ad15a23ad17aac0c1ff9ec3b5a214002f0aa46dea37698093ca9f71ad288";
508508 }
509− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/pt-PT/thunderbird-60.3.1.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pt-PT/thunderbird-60.3.2.tar.bz2";
510510 locale = "pt-PT";
511511 arch = "linux-i686";
512− sha512 = "06a4caf81f561fd943050bfbb36b2f9190790f407aaecd8f20a3dcaca82bd037edd70622ace1dcf41fa4be1109ad9e80fd40332e45034895dc3fec148fd334aa";
512+ sha512 = "5d63808463b829f6bffea85d0c07119ba8d33f09f39fd7494f84d12dcf205286df6e87ff1dbbeac8a6961403060f0f23b148c2ebe0329e47ec8dbab3b94267c6";
513513 }
514− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/rm/thunderbird-60.3.1.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/rm/thunderbird-60.3.2.tar.bz2";
515515 locale = "rm";
516516 arch = "linux-i686";
517− sha512 = "4664931159370d114a50f075d7fd0cec7fa0bb3e91b96d7778b206ed5e748bbe71a9f30ec1a3a7a41849b524b409e024346c5c5344d18b5eb94aa939b86f59e2";
517+ sha512 = "b8c0b360b47ab9d43fa2ec3fa0fde1cacc8cc7d2f47e43eda2b4f973991d2df247520d0a10972777ce78d87887e0ace82844aec5955d122cef3119328367c862";
518518 }
519− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ro/thunderbird-60.3.1.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ro/thunderbird-60.3.2.tar.bz2";
520520 locale = "ro";
521521 arch = "linux-i686";
522− sha512 = "f0b19356c5917e16edeb8f120b0765f948010198a1bb8fa45e4bf7965553677f01920cf34b816d0dc3ba9190a11b6fb72ee33f0239e2e5974c60bd2929924a7b";
522+ sha512 = "3a696c7bcf2ee63ca797579d5a196659cc00ebba9ccbd7f41450aa5f8352260cd7cece56b43722ff09dafeafa2e11e76bd51f6863a7badd15f550ef1e38c6ce5";
523523 }
524− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ru/thunderbird-60.3.1.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ru/thunderbird-60.3.2.tar.bz2";
525525 locale = "ru";
526526 arch = "linux-i686";
527− sha512 = "b79517c780485098ae0aa91d275e8f314b8914a1a84400646963e0a23bd9179fe9dd3b63b80e45cc102296364bed639ab45841932d0bf93142e38850764125e7";
527+ sha512 = "897df974fdda8f9c68091a15ddaaf36261b4d68183c3f09442fff486c2a86249e24744187cf85cfcd3217f54340a7c51f14ecc618373101ecd264ae767a387e2";
528528 }
529− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/si/thunderbird-60.3.1.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/si/thunderbird-60.3.2.tar.bz2";
530530 locale = "si";
531531 arch = "linux-i686";
532− sha512 = "d7a4a804c0122a902d513e6bbde37fb75b35a6a49300992aa81f6590becff6315d757c095f35505dce48b1e4d6b4963f7484f636c0d87d5ecf0cdfc1b9f44464";
532+ sha512 = "35b16423c41886f28a9aab9e9b5ebcc811ac03424a89b9e6f7ca494f8cc43a1c51668854d9c479fde8f977306290cf0b5bd2eb4c0c60fc98fc6522333624890e";
533533 }
534− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sk/thunderbird-60.3.1.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sk/thunderbird-60.3.2.tar.bz2";
535535 locale = "sk";
536536 arch = "linux-i686";
537− sha512 = "f50653801aff3f8596cfcdaf53755b5557e69aa237a76bd5598bc349839616a18b2a7703ce79094b6719d7e544f66a114b5d61ac9ef65f20c4f10a2e7b2cbe45";
537+ sha512 = "5e4855121d4d36dc639a85986d5ccef62c7eff28008d7d2c5150becd75ebe6f95a5ae54a280e35e50c5f2cbc27665a709e1fdc55860d17b893b2fc2e48d0e56b";
538538 }
539− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sl/thunderbird-60.3.1.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sl/thunderbird-60.3.2.tar.bz2";
540540 locale = "sl";
541541 arch = "linux-i686";
542− sha512 = "d98731420605736ec5ba1df75a38b8a44ebe2a29c307fb7e63f51db0b2f8d2fab0bde2c8e4d9778bba82545f04f42a80bff1659cf49f3a1db5ad5418cfe9c34f";
542+ sha512 = "93ca3fb5eec8edeb050d8c293446f44c975f5b206de5ceac7cf9a7feb3699c90c1e85848fb22108ec757960d6a686d68ffba61644b20d1e0c8ffd0a126dadd17";
543543 }
544− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sq/thunderbird-60.3.1.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sq/thunderbird-60.3.2.tar.bz2";
545545 locale = "sq";
546546 arch = "linux-i686";
547− sha512 = "8973e874151efb48343dec2c192e98015740d160dff902d1c07f6f1a5e770344ed07260bb4986892615f31b5c06f56a59406def6d7af20cab04edcba2e5b6003";
547+ sha512 = "891a6a103eb05b84af59c76cee7742d5ad04aa51beb955a7023852879e2853b5ac2b79af2dd45f87cefbcd176ab7d6bda9773f9af8e624435ac228d0c04ce298";
548548 }
549− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sr/thunderbird-60.3.1.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sr/thunderbird-60.3.2.tar.bz2";
550550 locale = "sr";
551551 arch = "linux-i686";
552− sha512 = "354706cac183b91067d55d49b16f525aef6c5abbedb729d321e615d8e29c05976ec8e33c905600584bf2e64ba8fb27472fe14a9390e2188fb2b236df0cf7d39e";
552+ sha512 = "14d84a42a89b84d2aeca1e4b4f2b2ecb30dd5e940ccb77a7b6337df88d0c73e4cfdaae0c6fdc055e6cbe213ad4652361c3b5f37680e09506da354bcc492cc155";
553553 }
554− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sv-SE/thunderbird-60.3.1.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sv-SE/thunderbird-60.3.2.tar.bz2";
555555 locale = "sv-SE";
556556 arch = "linux-i686";
557− sha512 = "8714ecbaf368d5c405224163bc1f0047b498770167dc6ffd53cc1bb0828228cd48933a5ff7e5116634e1c50218d08d27fa667942878a19fa2f0a4398ab0fa458";
557+ sha512 = "4a51fbca27bb37b556fd3aaaca45ba0f18129089da8d69d796ea6c13fcf8e65138db7d3f87d355777ce325c7f0e7b7b643d7a0c6067f71ca63e1c37c052d34ca";
558558 }
559− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/tr/thunderbird-60.3.1.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/tr/thunderbird-60.3.2.tar.bz2";
560560 locale = "tr";
561561 arch = "linux-i686";
562− sha512 = "e8e62fdc8704f91754be9a97f288d113577039bbca1ed69c01e577cc8813e4302f9cd1842f38a91cb8d9899a7a9317b59e931e65f492e619b6b6c2a736117366";
562+ sha512 = "332deb7803f935e67bc3d3e8ff55255f5ac8a6a7f128fef924c78aeb8b4023f0f562b9957dbdf84ba25c4b65a55028a8b341a0764ec4aced8fb127b05c083029";
563563 }
564− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/uk/thunderbird-60.3.1.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/uk/thunderbird-60.3.2.tar.bz2";
565565 locale = "uk";
566566 arch = "linux-i686";
567− sha512 = "d948efc3e6bd4c9392fed77f52e77998f5b1a202945a6e4bd3b3bcc8332925c6d8de5d48c9737401e94ac701ee7d9e334819fd3718b600914650ee57bef5a5bc";
567+ sha512 = "0c96360839e9e72848b1574c389cd29d71e3225cfaca7292c83f9835c4c9d59cb324b390acb00666861f7a060eedc233ac84dc475536e9b206af75e9fa4edf49";
568568 }
569− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/vi/thunderbird-60.3.1.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/vi/thunderbird-60.3.2.tar.bz2";
570570 locale = "vi";
571571 arch = "linux-i686";
572− sha512 = "929f5c94418de4df462356e0321088482e1e7ece9fe1838123c12f7649c2762e53d20de75bb77f77bc54add23985653ba77b63502b19912b6bc82f2b0ef1dfa0";
572+ sha512 = "b0421b6a3ee1dd95d3282c69d618eadf8f1fb69f72d61bec63fa82544d387780b2f80b2531c48c853fcfb4e9a50d14a79b145d3fe3f9ca0919582876385d63af";
573573 }
574− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/zh-CN/thunderbird-60.3.1.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/zh-CN/thunderbird-60.3.2.tar.bz2";
575575 locale = "zh-CN";
576576 arch = "linux-i686";
577− sha512 = "b746273c7ad7651521d6072f211351c3b585d25ebd48027be3b93a3ce0e09abdaae2a63e97eca013dba046dbadf97f5d4a38fd08bf4a9304c7622881367af73a";
577+ sha512 = "22197ee9de592ea02894cf3cffda12267a4999b3fba31a6f90c621aec502834753f09834ed80901f156a385f7af6c1ff4a3d6558a47b2e489f153d1d727d0bd6";
578578 }
579− { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/zh-TW/thunderbird-60.3.1.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/zh-TW/thunderbird-60.3.2.tar.bz2";
580580 locale = "zh-TW";
581581 arch = "linux-i686";
582− sha512 = "9251b5688967e87f521bc283b0000194eb98c2ce157aa8befe624146d5dcbf4e7237944d3ae8c0045a0667172fd68616e179fb3ecf6e0f848f7e15a6a2b21f00";
582+ sha512 = "8e7e3d7063ef9b5e56f000cfada185ad31951b3ccf7dd9f84455fde7490e3cafef934f0b3501b70d7746464aa5b41180f6f9eeecc7b580d07823bf2ec97d11e8";
583583 }
584584 ];
585585}
pkgs/applications/networking/mailreaders/thunderbird/default.nix+3−3
@@ -24,11 +24,11 @@ let
2424 gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
2525in stdenv.mkDerivation rec {
2626 name = "thunderbird-${version}";
27− version = "60.3.1";
27+ version = "60.3.2";
2828
2929 src = fetchurl {
3030 url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
31− sha512 = "266m4kwxiwh1zi60z4gcs54k4w903aximafngmmqaa5nkxnsxh6sp62j1mazdh52g40pzdy9sqb8zkcjsm7dp937kpcl2lvw778lanm";
31+ sha512 = "27hdv1c0jgwk6lkkdfy1rx7r29s2girikbbrriwr9v1gvmf7j3vgdldk7wqijjcp185dbp714wh3n5kp1p9f3sa8mf7z6321xby0mf7";
3232 };
3333
3434 # from firefox, but without sound libraries
@@ -202,6 +202,6 @@ in stdenv.mkDerivation rec {
202202 passthru.updateScript = import ./../../browsers/firefox/update.nix {
203203 attrPath = "thunderbird";
204204 baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
205− inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
205+ inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
206206 };
207207}
pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2
@@ -10,13 +10,13 @@ with stdenv.lib;
1010
1111stdenv.mkDerivation rec {
1212 name = "qbittorrent-${version}";
13− version = "4.1.3";
13+ version = "4.1.4";
1414
1515 src = fetchFromGitHub {
1616 owner = "qbittorrent";
1717 repo = "qbittorrent";
1818 rev = "release-${version}";
19− sha256 = "1hpcn1x4z3vdjscw035d18vqhfs7c6yv002akgmbgdf9jl3vfrsl";
19+ sha256 = "1hclyahgzj775h1fnv2rck9cw3r2yp2r6p1q263mj890n32gf3hp";
2020 };
2121
2222 # NOTE: 2018-05-31: CMake is working but it is not officially supported
pkgs/applications/office/mendeley/default.nix+1−1
@@ -131,7 +131,7 @@ stdenv.mkDerivation {
131131 dontStrip = true;
132132 dontPatchElf = true;
133133
134− updateScript = import ./update.nix { inherit writeScript; };
134+ updateScript = import ./update.nix { inherit stdenv writeScript; };
135135
136136 meta = with stdenv.lib; {
137137 homepage = http://www.mendeley.com;
pkgs/applications/office/mendeley/update.nix+2−1
@@ -1,6 +1,7 @@
1−{ writeScript }:
1+{ stdenv, writeScript }:
22
33writeScript "update-mendeley" ''
4+ #!${stdenv.shell}
45 function follow() {
56 local URL=$1
67 while true; do
pkgs/applications/science/electronics/archimedes/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 meta = {
1212 description = "GNU package for semiconductor device simulations";
13− homepage = http://www.gnu.org/software/archimedes;
13+ homepage = https://www.gnu.org/software/archimedes;
1414 license = stdenv.lib.licenses.gpl2Plus;
1515 platforms = with stdenv.lib.platforms; linux;
1616 };
pkgs/applications/science/math/maxima/default.nix+1−1
@@ -77,7 +77,7 @@ stdenv.mkDerivation ({
7777
7878 # Failures in the regression test suite won't abort the build process. We run
7979 # the suite only so that potential errors show up in the build log. See also:
80− # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
80+ # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
8181 doCheck = true;
8282
8383 enableParallelBuilding = true;
pkgs/applications/science/math/pspp/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 '';
3131
3232 meta = {
33− homepage = http://www.gnu.org/software/pspp/;
33+ homepage = https://www.gnu.org/software/pspp/;
3434 description = "A free replacement for SPSS, a program for statistical analysis of sampled data";
3535 license = stdenv.lib.licenses.gpl3Plus;
3636
pkgs/applications/science/math/sage/env-locations.nix+1−1
@@ -39,7 +39,7 @@ writeTextFile rec {
3939 export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
4040 export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
4141 export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
42− export JMOL_DIR="${jmol}"
42+ export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar
4343 export JSMOL_DIR="${jmol}/share/jsmol"
4444 export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
4545 export THREEJS_DIR="${three}/lib/node_modules/three"
pkgs/applications/science/math/sage/sage-env.nix+2
@@ -44,6 +44,7 @@
4444, zlib
4545, gsl
4646, ntl
47+, jdk
4748}:
4849
4950# This generates a `sage-env` shell file that will be sourced by sage on startup.
@@ -91,6 +92,7 @@ let
9192 lcalc
9293 rubiks
9394 flintqs
95+ jdk # only needed for `jmol` which may be replaced in the future
9496 ]
9597 ));
9698in
pkgs/applications/science/math/sage/sagenb.nix+2−1
@@ -55,6 +55,7 @@ buildPythonPackage rec {
5555
5656 # let sagenb use mathjax
5757 postInstall = ''
58− ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/mathjax"
58+ mkdir -p "$out/${python.sitePackages}/sagenb/data"
59+ ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/sagenb/data/mathjax"
5960 '';
6061}
pkgs/applications/science/math/scilab-bin/default.nix+33−2
@@ -61,9 +61,40 @@ stdenv.mkDerivation rec {
6161 installPhase = ''
6262 mkdir -p "$out/opt/scilab-${ver}"
6363 cp -r . "$out/opt/scilab-${ver}/"
64+
65+ # Create bin/ dir
6466 mkdir "$out/bin"
65− ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab-${ver}"
66− ln -s "scilab-${ver}" "$out/bin/scilab-${majorVer}"
67+
68+ # Creating executable symlinks
69+ ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab"
70+ ln -s "$out/opt/scilab-${ver}/bin/scilab-cli" "$out/bin/scilab-cli"
71+ ln -s "$out/opt/scilab-${ver}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli"
72+
73+ # Creating desktop config dir
74+ mkdir -p "$out/share/applications"
75+
76+ # Moving desktop config files
77+ mv $out/opt/scilab-${ver}/share/applications/*.desktop $out/share/applications
78+
79+ # Fixing Exec paths and launching each app with a terminal
80+ sed -i -e "s|Exec=|Exec=$out/opt/scilab-${ver}/bin/|g" \
81+ -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop
82+
83+ # Moving icons to the appropriate locations
84+ for path in $out/opt/scilab-${ver}/share/icons/hicolor/*/*/*
85+ do
86+ newpath=$(echo $path | sed 's|/opt/scilab-${ver}||g')
87+ filename=$(echo $path | sed 's|.*/||g')
88+ dir=$(echo $newpath | sed "s|$filename||g")
89+ mkdir -p $dir
90+ mv $path $newpath
91+ done
92+
93+ # Removing emptied folders
94+ rm -rf $out/opt/scilab-${ver}/share/{applications,icons}
95+
96+ # Moving other share/ folders
97+ mv $out/opt/scilab-${ver}/share/{appdata,locale,mime} $out/share
6798 '';
6899
69100 meta = {
pkgs/applications/science/misc/motu-client/default.nix+2−2
@@ -12,10 +12,10 @@ python27Packages.buildPythonApplication rec {
1212 homepage = https://github.com/quiet-oceans/motuclient-setuptools;
1313 description = "CLI to query oceanographic data to Motu servers";
1414 longDescription = ''
15− Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
15+ Access data from (motu)[https://sourceforge.net/projects/cls-motu/] servers.
1616 This is a refactored fork of the original release in order to simplify integration,
1717 deployment and packaging. Upstream code can be found at
18− http://sourceforge.net/projects/cls-motu/ .
18+ https://sourceforge.net/projects/cls-motu/ .
1919 '';
2020 license = licenses.lgpl3Plus;
2121 maintainers = [ maintainers.lsix ];
pkgs/applications/version-management/arch/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 meta = {
2626 description = "GNU Arch (aka. `tla'), a distributed revision control system";
27− homepage = http://www.gnu.org/software/gnu-arch/;
27+ homepage = https://www.gnu.org/software/gnu-arch/;
2828 license = "GPL";
2929 };
3030}
pkgs/applications/version-management/git-and-tools/git-secrets/default.nix+14−22
@@ -1,40 +1,32 @@
1−{ stdenv, lib, fetchFromGitHub, makeWrapper, git }:
1+{ stdenv, fetchFromGitHub, makeWrapper, git, coreutils }:
22
3−let
3+stdenv.mkDerivation rec {
4+ name = "git-secrets-${version}";
45 version = "1.2.1";
5− repo = "git-secrets";
6−
7−in stdenv.mkDerivation {
8− name = "${repo}-${version}";
96
107 src = fetchFromGitHub {
11− inherit repo;
128 owner = "awslabs";
9+ repo = "git-secrets";
1310 rev = "${version}";
1411 sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
1512 };
1613
17− buildInputs = [ makeWrapper git];
14+ nativeBuildInputs = [ makeWrapper ];
15+
16+ dontBuild = true;
1817
19− # buildPhase = ''
20− # make man # TODO: need rst2man.py
21− # '';
22−
2318 installPhase = ''
24− install -D git-secrets $out/bin/git-secrets
19+ install -m755 -Dt $out/bin git-secrets
20+ install -m444 -Dt $out/share/man/man1 git-secrets.1
2521
2622 wrapProgram $out/bin/git-secrets \
27− --prefix PATH : "${lib.makeBinPath [ git ]}"
28−
29− # TODO: see above note on rst2man.py
30− # mkdir $out/share
31− # cp -r man $out/share
23+ --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}"
3224 '';
3325
34− meta = {
35− description = "Prevents you from committing passwords and other sensitive information to a git repository";
26+ meta = with stdenv.lib; {
27+ description = "Prevents you from committing secrets and credentials into git repositories";
3628 homepage = https://github.com/awslabs/git-secrets;
37− license = stdenv.lib.licenses.asl20;
38− platforms = stdenv.lib.platforms.all;
29+ license = licenses.asl20;
30+ platforms = platforms.all;
3931 };
4032}
pkgs/applications/version-management/rcs/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 NIX_CFLAGS_COMPILE = [ "-std=c99" ];
1616
1717 meta = {
18− homepage = http://www.gnu.org/software/rcs/;
18+ homepage = https://www.gnu.org/software/rcs/;
1919 description = "Revision control system";
2020 longDescription =
2121 '' The GNU Revision Control System (RCS) manages multiple revisions of
pkgs/applications/window-managers/dwm/dwm-status.nix+10−4
@@ -1,15 +1,21 @@
11{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
2−, enableAlsaUtils ? true, alsaUtils }:
2+, enableAlsaUtils ? true, alsaUtils, bash, coreutils }:
3+
4+let
5+ binPath = stdenv.lib.makeBinPath [
6+ alsaUtils bash coreutils
7+ ];
8+in
39
410rustPlatform.buildRustPackage rec {
511 name = "dwm-status-${version}";
6− version = "1.4.0";
12+ version = "1.4.1";
713
814 src = fetchFromGitHub {
915 owner = "Gerschtli";
1016 repo = "dwm-status";
1117 rev = version;
12− sha256 = "1v9ksv8hdxhpm7vs71p9s1y3gnahczza0w4wyrk2fsc6x2kwlh6x";
18+ sha256 = "054lwgqpx3kbrnlsqbnd8fxsawvw3nl702pf56c7dcm4sfws15nl";
1319 };
1420
1521 nativeBuildInputs = [ makeWrapper pkgconfig ];
@@ -19,7 +25,7 @@ rustPlatform.buildRustPackage rec {
1925
2026 postInstall = lib.optionalString enableAlsaUtils ''
2127 wrapProgram $out/bin/dwm-status \
22− --prefix "PATH" : "${alsaUtils}/bin"
28+ --prefix "PATH" : "${binPath}"
2329 '';
2430
2531 meta = with stdenv.lib; {
pkgs/applications/window-managers/ratpoison/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 '';
3434
3535 meta = with stdenv.lib; {
36− homepage = http://www.nongnu.org/ratpoison/;
36+ homepage = https://www.nongnu.org/ratpoison/;
3737 description = "Simple mouse-free tiling window manager";
3838 license = licenses.gpl2Plus;
3939
pkgs/applications/window-managers/tabbed/default.nix+3−3
@@ -3,12 +3,12 @@
33with stdenv.lib;
44
55stdenv.mkDerivation rec {
6− name = "tabbed-20160425";
6+ name = "tabbed-20180310";
77
88 src = fetchgit {
99 url = https://git.suckless.org/tabbed;
10− rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164";
11− sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri";
10+ rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3";
11+ sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss";
1212 };
1313
1414 inherit patches;
pkgs/data/documentation/std-man-pages/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 meta = {
1919 description = "C++ STD manual pages";
20− homepage = http://gcc.gnu.org/;
20+ homepage = https://gcc.gnu.org/;
2121 license = "GPL/LGPL";
2222 platforms = stdenv.lib.platforms.unix;
2323 };
pkgs/data/fonts/freefont-ttf/default.nix+1−1
@@ -19,7 +19,7 @@ fetchzip rec {
1919 (PostScript Type0, TrueType, OpenType...) fonts covering the ISO
2020 10646/Unicode UCS (Universal Character Set).
2121 '';
22− homepage = http://www.gnu.org/software/freefont/;
22+ homepage = https://www.gnu.org/software/freefont/;
2323 license = stdenv.lib.licenses.gpl3Plus;
2424 platforms = stdenv.lib.platforms.all;
2525 maintainers = [];
pkgs/data/machine-learning/mnist/default.nixnew file+45
@@ -0,0 +1,45 @@
1+{ stdenvNoCC, fetchurl }:
2+let
3+ srcs = {
4+ train-images = fetchurl {
5+ url = "http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz";
6+ sha256 = "029na81z5a1c9l1a8472dgshami6f2iixs3m2ji6ym6cffzwl3s4";
7+ };
8+ train-labels = fetchurl {
9+ url = "http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz";
10+ sha256 = "0p152200wwx0w65sqb65grb3v8ncjp230aykmvbbx2sm19556lim";
11+ };
12+ test-images = fetchurl {
13+ url = "http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz";
14+ sha256 = "1rn4vfigaxn2ms24bf4jwzzflgp3hvz0gksvb8j7j70w19xjqhld";
15+ };
16+ test-labels = fetchurl {
17+ url = "http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz";
18+ sha256 = "1imf0i194ndjxzxdx87zlgn728xx3p1qhq1ssbmnvv005vwn1bpp";
19+ };
20+ };
21+in
22+ stdenvNoCC.mkDerivation rec {
23+ name = "mnist-${version}";
24+ version = "2018-11-16";
25+ installPhase = ''
26+ mkdir -p $out
27+ ln -s "${srcs.train-images}" "$out/${srcs.train-images.name}"
28+ ln -s "${srcs.train-labels}" "$out/${srcs.train-labels.name}"
29+ ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}"
30+ ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}"
31+ '';
32+ phases = [ "installPhase" ];
33+ meta = with stdenvNoCC.lib; {
34+ description = "A large database of handwritten digits";
35+ longDescription = ''
36+ The MNIST database (Modified National Institute of Standards and
37+ Technology database) is a large database of handwritten digits that is
38+ commonly used for training various image processing systems.
39+ '';
40+ homepage = http://yann.lecun.com/exdb/mnist/index.html;
41+ license = licenses.cc-by-sa-30;
42+ platforms = platforms.all;
43+ maintainers = with maintainers; [ cmcdragonkai ];
44+ };
45+ }
pkgs/data/misc/miscfiles/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 meta = with stdenv.lib; {
12− homepage = http://www.gnu.org/software/miscfiles/;
12+ homepage = https://www.gnu.org/software/miscfiles/;
1313 license = licenses.gpl2Plus;
1414 description = "Collection of files not of crucial importance for sysadmins";
1515 maintainers = with maintainers; [ pSub ];
pkgs/desktops/deepin/update.nix+2−1
@@ -1,4 +1,4 @@
1−{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
1+{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
22{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }:
33
44let
@@ -9,6 +9,7 @@ let
99in
1010
1111writeScript "update-${packageName}" ''
12+ #!${stdenv.shell}
1213 set -o errexit
1314 set -x
1415
pkgs/desktops/gnome-2/desktop/mail-notification/default.nix+1−1
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646
4747 meta = with stdenv.lib; {
4848 description = "Tray status icon, which notifies us when new email arrives";
49− homepage = http://www.nongnu.org/mailnotify/;
49+ homepage = https://www.nongnu.org/mailnotify/;
5050 license = with licenses; [ gpl3 ];
5151 platforms = platforms.unix;
5252 maintainers = [ maintainers.eleanor ];
pkgs/desktops/gnome-3/update.nix+12−7
@@ -1,11 +1,16 @@
1−{ lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }:
1+{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }:
22{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }:
33
44let
55 python = python3.withPackages (p: [ p.requests ]);
6−in writeScript "update-${packageName}" ''
7− set -o errexit
8− PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]}
9− latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable")
10− update-source-version "${attrPath}" "$latest_tag"
11−''
6+ updateScript = writeScript "gnome-update-script" ''
7+ #!${stdenv.shell}
8+ set -o errexit
9+ package_name="$1"
10+ attr_path="$2"
11+ version_policy="$3"
12+ PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]}
13+ latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable")
14+ update-source-version "$attr_path" "$latest_tag"
15+ '';
16+in [ updateScript packageName attrPath versionPolicy ]
pkgs/development/compilers/fpc/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/freepascal/files/Source/
1+url https://sourceforge.net/projects/freepascal/files/Source/
22SF_version_dir
33version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$'
44SF_redirect
pkgs/development/compilers/gcc/4.8/default.nix+2−2
@@ -335,7 +335,7 @@ stdenv.mkDerivation ({
335335 then "install-strip"
336336 else "install";
337337
338− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
338+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
339339 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
340340
341341 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -397,7 +397,7 @@ stdenv.mkDerivation ({
397397 inherit (stdenv) is64bit;
398398
399399 meta = {
400− homepage = http://gcc.gnu.org/;
400+ homepage = https://gcc.gnu.org/;
401401 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
402402 description = "GNU Compiler Collection, version ${version}"
403403 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcc/4.9/default.nix+2−2
@@ -348,7 +348,7 @@ stdenv.mkDerivation ({
348348 then "install-strip"
349349 else "install";
350350
351− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
351+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
352352 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
353353
354354 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -409,7 +409,7 @@ stdenv.mkDerivation ({
409409 inherit (stdenv) is64bit;
410410
411411 meta = {
412− homepage = http://gcc.gnu.org/;
412+ homepage = https://gcc.gnu.org/;
413413 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
414414 description = "GNU Compiler Collection, version ${version}"
415415 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcc/5/default.nix+2−2
@@ -353,7 +353,7 @@ stdenv.mkDerivation ({
353353 then "install-strip"
354354 else "install";
355355
356− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
356+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
357357 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
358358
359359 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -414,7 +414,7 @@ stdenv.mkDerivation ({
414414 inherit (stdenv) is64bit;
415415
416416 meta = {
417− homepage = http://gcc.gnu.org/;
417+ homepage = https://gcc.gnu.org/;
418418 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
419419 description = "GNU Compiler Collection, version ${version}"
420420 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcc/6/default.nix+2−2
@@ -355,7 +355,7 @@ stdenv.mkDerivation ({
355355 then "install-strip"
356356 else "install";
357357
358− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
358+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
359359 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
360360
361361 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -416,7 +416,7 @@ stdenv.mkDerivation ({
416416 inherit (stdenv) is64bit;
417417
418418 meta = {
419− homepage = http://gcc.gnu.org/;
419+ homepage = https://gcc.gnu.org/;
420420 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
421421 description = "GNU Compiler Collection, version ${version}"
422422 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcc/7/default.nix+2−2
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
319319 then "install-strip"
320320 else "install";
321321
322− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
322+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
323323 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
324324
325325 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -367,7 +367,7 @@ stdenv.mkDerivation ({
367367 inherit (stdenv) is64bit;
368368
369369 meta = {
370− homepage = http://gcc.gnu.org/;
370+ homepage = https://gcc.gnu.org/;
371371 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
372372 description = "GNU Compiler Collection, version ${version}"
373373 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcc/8/default.nix+2−2
@@ -304,7 +304,7 @@ stdenv.mkDerivation ({
304304 then "install-strip"
305305 else "install";
306306
307− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
307+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
308308 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
309309
310310 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -345,7 +345,7 @@ stdenv.mkDerivation ({
345345 inherit (stdenv) is64bit;
346346
347347 meta = {
348− homepage = http://gcc.gnu.org/;
348+ homepage = https://gcc.gnu.org/;
349349 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
350350 description = "GNU Compiler Collection, version ${version}"
351351 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcc/snapshot/default.nix+2−2
@@ -269,7 +269,7 @@ stdenv.mkDerivation ({
269269 then "install-strip"
270270 else "install";
271271
272− # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
272+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
273273 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
274274
275275 # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -317,7 +317,7 @@ stdenv.mkDerivation ({
317317 inherit (stdenv) is64bit;
318318
319319 meta = {
320− homepage = http://gcc.gnu.org/;
320+ homepage = https://gcc.gnu.org/;
321321 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
322322 description = "GNU Compiler Collection, version ${version}"
323323 + (if stripped then "" else " (with debugging info)");
pkgs/development/compilers/gcl/2.6.13-pre.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 src = fetchgit {
1515 sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88";
16− url = "http://git.savannah.gnu.org/r/gcl.git";
16+ url = "https://git.savannah.gnu.org/r/gcl.git";
1717 rev = "refs/tags/Version_2_6_13pre50";
1818 };
1919
pkgs/development/compilers/ghc/8.4.4.nix+5−1
@@ -109,7 +109,11 @@ stdenv.mkDerivation (rec {
109109 name = "D4388.diff";
110110 sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
111111 })
112− ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
112+ ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
113+ ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
114+ url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a";
115+ sha256 = "1czx12qcl088vjn7mqxvyja4b2ia2n09c28br8c777fd0xk069pm";
116+ });
113117
114118 postPatch = "patchShebangs .";
115119
pkgs/development/compilers/gprolog/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 doCheck = true;
3535
3636 meta = {
37− homepage = http://www.gnu.org/software/gprolog/;
37+ homepage = https://www.gnu.org/software/gprolog/;
3838 description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
3939 license = stdenv.lib.licenses.lgpl3Plus;
4040
pkgs/development/compilers/manticore/default.nix+3−3
@@ -1,15 +1,15 @@
11{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
22
33let
4− rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2";
4+ rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
55in stdenv.mkDerivation rec {
66 name = "manticore-${version}";
7− version = "2017.08.22";
7+ version = "2018.09.29";
88
99 src = fetchFromGitHub {
1010 owner = "ManticoreProject";
1111 repo = "manticore";
12− sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73";
12+ sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn";
1313 inherit rev;
1414 };
1515
pkgs/development/compilers/mit-scheme/default.nix+1−1
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
7979 development cycle.
8080 '';
8181
82− homepage = http://www.gnu.org/software/mit-scheme/;
82+ homepage = https://www.gnu.org/software/mit-scheme/;
8383
8484 license = licenses.gpl2Plus;
8585
pkgs/development/compilers/smlnj/bootstrap.nix+3−3
@@ -3,11 +3,11 @@
33stdenv.mkDerivation rec {
44 name = "smlnj-bootstrap-${version}";
55
6− version = "110.80";
6+ version = "110.84";
77
88 src = fetchurl {
99 url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg";
10− sha256 = "1709xpgmxa6v73h77y7vn9wf5vlfdk75p61w28nzgfdsdc8f8l65";
10+ sha256 = "17fpnlxcfwx2ysg6y9c5wwx6s3jca981nb0pawfcg6xg9wcapyfz";
1111 };
1212
1313 buildInputs = [ cpio rsync makeWrapper ];
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
4040 platforms = stdenv.lib.platforms.darwin;
4141 maintainers = [ stdenv.lib.maintainers.jwiegley ];
4242 };
43−}
43+}
pkgs/development/compilers/smlnj/default.nix+24−23
@@ -1,31 +1,32 @@
11{ stdenv, fetchurl, darwin }:
22let
3− version = "110.79";
3+ version = "110.84";
44 baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
55
66 sources = map fetchurl [
7− { url = "${baseurl}/config.tgz"; sha256 = "1siahy5sxz20bdy88s7zjj6gn55np1h54dalmg0nwzqq1rc048xb"; }
8− { url = "${baseurl}/cm.tgz"; sha256 = "174g71hvk1wfdmrg1mbx3p5j04ywnbbjapnnr9sgjd99pqqqsmdz"; }
9− { url = "${baseurl}/compiler.tgz"; sha256 = "001wi97ghj3mym4bk73gzzzrh7584hd79jn08cnq1wssdcfpn4mw"; }
10− { url = "${baseurl}/runtime.tgz"; sha256 = "0lavdzg25nbdzdyyf6wm304k0gsbb5bng2nlcx8gcfl743vl13r0"; }
11− { url = "${baseurl}/system.tgz"; sha256 = "00j34m5n8m30p51kajd0sxamy7gpwxaxrlgw5agxh0wi83vqfaki"; }
12− { url = "${baseurl}/MLRISC.tgz"; sha256 = "19q3gp7yfby4n8z6jn9m9q8g0a9kvb13arj8f2j0x9jnh3y2is78"; }
13− { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "0frkc23zh9h1c2lvkidh92lsp56liyb3hyv17503nchmkxrlsi09"; }
14− { url = "${baseurl}/old-basis.tgz"; sha256 = "1ka7w4nvkmaf86dkdzgbwiw8kay6gxhcyx4q17m33wdzsjbq56lh"; }
15− { url = "${baseurl}/ckit.tgz"; sha256 = "1z8xf5pqwayqd8j6xhfhqs4axkb4dx7vdqi2a7gq3zbx2fd3s7pw"; }
16− { url = "${baseurl}/nlffi.tgz"; sha256 = "1544m7ildyd0d60wfy2hl700jnslpxqb7brgh8p0bmkvhhvvc96v"; }
17− { url = "${baseurl}/cml.tgz"; sha256 = "11blq65zlsbh6iwq502jww1z4iyk9pf2iv3d437cgnpb3sn9mx72"; }
18− { url = "${baseurl}/eXene.tgz"; sha256 = "14yl8a5xwms1m9bvfwfiz6rhg49225l52lqqq9sbxbf57615n9yg"; }
19− { url = "${baseurl}/ml-lpt.tgz"; sha256 = "118s7v2f73ym91ymvnmswjxm2pw5n4q1d4hvbs1cmm43dv28pw7m"; }
20− { url = "${baseurl}/ml-lex.tgz"; sha256 = "0lf5ir12v8j6n11mblrl00jgm583ak077vgbabc1dfmz47rd566b"; }
21− { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0dmifbbq1wxkxf479jv61nsy79sr78ad9fq6561rvgi4h12lzh7k"; }
22− { url = "${baseurl}/ml-burg.tgz"; sha256 = "1b5z18azik1kpaafi1vjgaf181yv32h88zm3z5fqxs96pwb86h1d"; }
23− { url = "${baseurl}/pgraph.tgz"; sha256 = "15g06hl7zn98qas3b6r6lrl75g9d1galqxdyai7d5z9q5lq71j2v"; }
24− { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0jwilcv2ycfpcy3cgs8ndaj16yqm8m2q63sipcigfycacpyqfsiw"; }
25− { url = "${baseurl}/heap2asm.tgz"; sha256 = "0wylsw1dkls9l86j226ilfb50mfk4h4zz4r9zdj104a1mqvvbgfk"; }
26− { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1xr89r1nhzg53hk0v0fk1livphwpgmzh1dgjqxl4w8dx9qhk9yf0"; }
27− { url = "${baseurl}/doc.tgz"; sha256 = "1fz4l3019n1rkrww98w59cdhlrz9jg635hmdq59xryc0j78y4ga1"; }
28− { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0nka4dhklhilrsw4byr5vixiap28zp67ai0vjkwhqh03amkcr8zq"; }
7+ { url = "${baseurl}/config.tgz"; sha256 = "0cpqrvixqwf64fa94wzwf59p0lnnmwxgkwm3qwhf28l2fv5d640q"; }
8+ { url = "${baseurl}/cm.tgz"; sha256 = "0qq6kdi8xqi3w1rsmi4rgjdbjr9m4crizb1ma5xg51x8h42ccmbh"; }
9+ { url = "${baseurl}/compiler.tgz"; sha256 = "11zfdwr7a10ylzvap2j0c1py11zi500hfnmhd5lvy9spwzray8vd"; }
10+ { url = "${baseurl}/runtime.tgz"; sha256 = "0v2dv0hh0gxnzzxz8vzqn5avxh7mynaj4g9kkbv4gcnxxaylpksz"; }
11+ { url = "${baseurl}/system.tgz"; sha256 = "0612a6qls202l6wbckcd6dklh7nb75fk4c4qmbs9h2h0j3kisszl"; }
12+ { url = "${baseurl}/MLRISC.tgz"; sha256 = "0wnhvy677p2f7pxlk8mmk3gi605nawy1zzn2cf4619wg04v54g6s"; }
13+ { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1pg9y0lcp18fc91y45yb2lysnrzml00xdhcilkc1cx17am394mik"; }
14+ { url = "${baseurl}/old-basis.tgz"; sha256 = "14zdkzfri4a7mj7zck2c43aqkg0y7kppp2nkbihg069g4ifgw5fg"; }
15+ { url = "${baseurl}/ckit.tgz"; sha256 = "0dlccmnchs38www0a3ibrjxipf8xi03d7pgriynjqdyjjgik89by"; }
16+ { url = "${baseurl}/nlffi.tgz"; sha256 = "0c9z2fq8d7ln4flzc5pkfym9rkjhjymjm60v1avh1c337lmai5lb"; }
17+ { url = "${baseurl}/cml.tgz"; sha256 = "16jn5fn8khxnjj0kwjzavx2ms3kv16zy35wamh8k51nv8v3i0qam"; }
18+ { url = "${baseurl}/eXene.tgz"; sha256 = "1701l155aiprzxh5p5whb9qbg368cqq0bzdwkwsxgrrllfhwdq9z"; }
19+ { url = "${baseurl}/ml-lpt.tgz"; sha256 = "19dk9yqq6f5ayqlf7p95aakc4swj6x1j8m0ka2slzzb9g93f2q1g"; }
20+ { url = "${baseurl}/ml-lex.tgz"; sha256 = "0w20w17rd67n6zgxzwq89k9ywc78l3ydxcax0pniwzv6m5d08znc"; }
21+ { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1fdxhy4f2dgs19p20vg7yysi9gxp6hc1ggs97k4zq448y2ssxsyg"; }
22+ { url = "${baseurl}/ml-burg.tgz"; sha256 = "066r0zy5rc60y8kzh2c06hy1b217lh6qffvxlwz8w1w86yqkgsk2"; }
23+ { url = "${baseurl}/pgraph.tgz"; sha256 = "1jy1g9xiv14jj9svb5wgbdm520qbdhamfmxlf31xnh552gg18bxa"; }
24+ { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0nkawi2mdmsw24a1pkwp2brixrvxyqgxzsylp7w7ak35p20l5igc"; }
25+ { url = "${baseurl}/heap2asm.tgz"; sha256 = "159y8c8xnim7p4pyynjirqhwi73lkrq0fksk8wnpcdh5clmwacrx"; }
26+ { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; }
27+ { url = "${baseurl}/doc.tgz"; sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; }
28+ { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; }
29+ { url = "${baseurl}/asdl.tgz"; sha256 = "13jvdgv63h4s8p9q563hyisbz464y88y2flvwyxvi1n11lh15rwb"; }
2930 ];
3031in stdenv.mkDerivation {
3132 name = "smlnj-${version}";
pkgs/development/coq-modules/math-classes/default.nix+3−3
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44
55 name = "coq${coq.coq-version}-math-classes-${version}";
6− version = "1.0.7";
6+ version = "8.8.1";
77
88 src = fetchFromGitHub {
9− owner = "math-classes";
9+ owner = "coq-community";
1010 repo = "math-classes";
1111 rev = version;
12− sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi";
12+ sha256 = "05vlrrwnlfhd7l3xwn4zwpnkwvziw84zpd9775c6ffb83z48ri1r";
1313 };
1414
1515 buildInputs = [ coq bignums ];
pkgs/development/guile-modules/guile-gnome/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 guile-gnome a comprehensive environment for developing modern
3434 applications.
3535 '';
36− homepage = "http://www.gnu.org/software/guile-gnome/";
36+ homepage = "https://www.gnu.org/software/guile-gnome/";
3737 license = licenses.gpl2Plus;
3838 maintainers = with maintainers; [ vyp ];
3939 platforms = platforms.linux;
pkgs/development/guile-modules/guile-lib/default.nix+1−1
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
3737 modules into a coherent library. Think "a down-scaled, limited-scope CPAN
3838 for Guile".
3939 '';
40− homepage = "http://www.nongnu.org/guile-lib/";
40+ homepage = "https://www.nongnu.org/guile-lib/";
4141 license = licenses.gpl3Plus;
4242 maintainers = with maintainers; [ vyp ];
4343 platforms = platforms.gnu ++ platforms.linux;
pkgs/development/guile-modules/guile-opengl/default.nix+1−1
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515
1616 meta = with stdenv.lib; {
1717 description = "Guile bindings for the OpenGL graphics API";
18− homepage = "http://gnu.org/s/guile-opengl";
18+ homepage = "https://www.gnu.org/software/guile-opengl/";
1919 license = licenses.gpl3Plus;
2020 maintainers = with maintainers; [ vyp ];
2121 platforms = platforms.linux;
pkgs/development/guile-modules/guile-sdl/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 meta = with stdenv.lib; {
2929 description = "Guile bindings for SDL";
30− homepage = "http://gnu.org/s/guile-sdl";
30+ homepage = "https://www.gnu.org/software/guile-sdl/";
3131 license = licenses.gpl3Plus;
3232 maintainers = with maintainers; [ vyp ];
3333 platforms = platforms.linux;
pkgs/development/interpreters/gnu-apl/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 meta = with stdenv.lib; {
2828 description = "Free interpreter for the APL programming language";
29− homepage = http://www.gnu.org/software/apl/;
29+ homepage = https://www.gnu.org/software/apl/;
3030 license = licenses.gpl3Plus;
3131 maintainers = [ maintainers.kovirobi ];
3232 platforms = with platforms; linux ++ darwin;
pkgs/development/interpreters/guile/1.8.nix+2−2
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
5858 # One test fails.
5959 # ERROR: file: "libtest-asmobs", message: "file not found"
6060 # This is fixed here:
61− # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
61+ # <https://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
6262 doCheck = false;
6363 doInstallCheck = doCheck;
6464
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666
6767 meta = {
6868 description = "Embeddable Scheme implementation";
69− homepage = http://www.gnu.org/software/guile/;
69+ homepage = https://www.gnu.org/software/guile/;
7070 license = stdenv.lib.licenses.lgpl2Plus;
7171 maintainers = [ stdenv.lib.maintainers.ludo ];
7272 platforms = stdenv.lib.platforms.unix;
pkgs/development/interpreters/guile/2.0.nix+3−3
@@ -41,7 +41,7 @@
4141 patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
4242 (fetchpatch {
4343 # Fixes stability issues with 00-repl-server.test
44− url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
44+ url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
4545 sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
4646 })
4747 ./riscv.patch
@@ -94,7 +94,7 @@
9494
9595 meta = {
9696 description = "Embeddable Scheme implementation";
97− homepage = http://www.gnu.org/software/guile/;
97+ homepage = https://www.gnu.org/software/guile/;
9898 license = stdenv.lib.licenses.lgpl3Plus;
9999 maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
100100 platforms = stdenv.lib.platforms.all;
@@ -114,7 +114,7 @@
114114//
115115
116116(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
117− # Work around <http://bugs.gnu.org/14201>.
117+ # Work around <https://bugs.gnu.org/14201>.
118118 SHELL = "/bin/sh";
119119 CONFIG_SHELL = "/bin/sh";
120120})
pkgs/development/interpreters/guile/default.nix+1−1
@@ -90,7 +90,7 @@
9090
9191 meta = {
9292 description = "Embeddable Scheme implementation";
93− homepage = http://www.gnu.org/software/guile/;
93+ homepage = https://www.gnu.org/software/guile/;
9494 license = stdenv.lib.licenses.lgpl3Plus;
9595 maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
9696 platforms = stdenv.lib.platforms.all;
pkgs/development/interpreters/lush/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/lush/files/lush2/
1+url https://sourceforge.net/projects/lush/files/lush2/
22version_link '[.]tar[.]gz/download$'
33SF_redirect
44minimize_overwrite
pkgs/development/interpreters/regina/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/regina-rexx/files/regina-rexx/
1+url https://sourceforge.net/projects/regina-rexx/files/regina-rexx/
22SF_version_dir
33SF_version_tarball
44SF_redirect
pkgs/development/libraries/acl/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 installTargets = [ "install" "install-lib" "install-dev" ];
2828
2929 meta = with stdenv.lib; {
30− homepage = "http://savannah.nongnu.org/projects/acl";
30+ homepage = "https://savannah.nongnu.org/projects/acl";
3131 description = "Library and tools for manipulating access control lists";
3232 platforms = platforms.linux;
3333 license = licenses.gpl2Plus;
pkgs/development/libraries/attr/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 '';
2626
2727 meta = with stdenv.lib; {
28− homepage = "http://savannah.nongnu.org/projects/attr/";
28+ homepage = "https://savannah.nongnu.org/projects/attr/";
2929 description = "Library and tools for manipulating extended attributes";
3030 platforms = platforms.linux;
3131 license = licenses.gpl2Plus;
pkgs/development/libraries/ccrtp/1.8.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515
1616 meta = {
1717 description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
18− homepage = http://www.gnu.org/software/ccrtp/;
18+ homepage = https://www.gnu.org/software/ccrtp/;
1919 license = stdenv.lib.licenses.gpl2;
2020 maintainers = [ stdenv.lib.maintainers.marcweber ];
2121 platforms = stdenv.lib.platforms.linux;
pkgs/development/libraries/ccrtp/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 meta = {
2121 description = "An implementation of the IETF real-time transport protocol (RTP)";
22− homepage = http://www.gnu.org/software/ccrtp/;
22+ homepage = https://www.gnu.org/software/ccrtp/;
2323 license = stdenv.lib.licenses.gpl2;
2424 maintainers = with stdenv.lib.maintainers; [ marcweber ];
2525 platforms = stdenv.lib.platforms.linux;
pkgs/development/libraries/commoncpp2/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 to build native threading applications for Microsoft Windows.
3131 '';
3232
33− homepage = http://www.gnu.org/software/commoncpp/;
33+ homepage = https://www.gnu.org/software/commoncpp/;
3434 license = stdenv.lib.licenses.gpl2Plus;
3535 maintainers = [ stdenv.lib.maintainers.marcweber ];
3636 platforms = with stdenv.lib.platforms; linux;
pkgs/development/libraries/gcc/libstdc++/5.nix+1−1
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
108108 '';
109109
110110 meta = with stdenv.lib; {
111− homepage = http://gcc.gnu.org/;
111+ homepage = https://gcc.gnu.org/;
112112 license = licenses.lgpl3Plus;
113113 description = "GNU Compiler Collection, version ${version} -- C++ standard library";
114114 platforms = platforms.linux;
pkgs/development/libraries/gdbm/default.nix+1−1
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060 package also provides traditional dbm and ndbm interfaces.
6161 '';
6262
63− homepage = http://www.gnu.org/software/gdbm/;
63+ homepage = https://www.gnu.org/software/gdbm/;
6464 license = licenses.gpl3Plus;
6565 platforms = platforms.all;
6666 maintainers = [ maintainers.vrthra ];
pkgs/development/libraries/geoclue/default.nix+23−26
@@ -1,5 +1,5 @@
1−{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
2−, modemmanager, avahi, glib-networking, wrapGAppsHook, gobject-introspection
1+{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
2+, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala
33, withDemoAgent ? false
44}:
55
@@ -7,17 +7,20 @@ with stdenv.lib;
77
88stdenv.mkDerivation rec {
99 name = "geoclue-${version}";
10− version = "2.4.12";
11−
12− src = fetchurl {
13− url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05";
10+ version = "2.5.1";
11+
12+ src = fetchFromGitLab {
13+ domain = "gitlab.freedesktop.org";
14+ owner = "geoclue";
15+ repo = "geoclue";
16+ rev = version;
17+ sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
1518 };
1619
1720 outputs = [ "out" "dev" "devdoc" ];
1821
1922 nativeBuildInputs = [
20− pkgconfig intltool wrapGAppsHook gobject-introspection
23+ pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobjectIntrospection
2124 # devdoc
2225 gtk-doc docbook_xsl docbook_xml_dtd_412
2326 ];
@@ -30,27 +33,21 @@ stdenv.mkDerivation rec {
3033
3134 propagatedBuildInputs = [ glib glib-networking ];
3235
33− # Whitelist elementary's agent
34− patches = [
35− (fetchpatch {
36− url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch";
37− sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4";
38− })
39− ];
40−
41− configureFlags = [
42− "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
43− "--enable-introspection"
44− "--enable-gtk-doc"
45− "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
36+ mesonFlags = [
37+ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
38+ "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
4639 ] ++ optionals stdenv.isDarwin [
47− "--disable-silent-rules"
48− "--disable-3g-source"
49− "--disable-cdma-source"
50− "--disable-modem-gps-source"
51− "--disable-nmea-source"
40+ "-D3g-source=false"
41+ "-Dcdma-source=false"
42+ "-Dmodem-gps-source=false"
43+ "-Dnmea-source=false"
5244 ];
5345
46+ postPatch = ''
47+ chmod +x demo/install-file.py
48+ patchShebangs demo/install-file.py
49+ '';
50+
5451 meta = with stdenv.lib; {
5552 description = "Geolocation framework and some data providers";
5653 homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home;
pkgs/development/libraries/gettext/default.nix+1−1
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
7575 GNU packages produce multi-lingual messages.
7676 '';
7777
78− homepage = http://www.gnu.org/software/gettext/;
78+ homepage = https://www.gnu.org/software/gettext/;
7979
8080 maintainers = with maintainers; [ zimbatm vrthra ];
8181 license = licenses.gpl2Plus;
pkgs/development/libraries/glibc/common.nix+1−1
@@ -187,7 +187,7 @@ stdenv.mkDerivation ({
187187 doCheck = false; # fails
188188
189189 meta = {
190− homepage = http://www.gnu.org/software/libc/;
190+ homepage = https://www.gnu.org/software/libc/;
191191 description = "The GNU C Library";
192192
193193 longDescription =
pkgs/development/libraries/glpk/default.nix+1−1
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
5959 programming language and organized in the form of a library.
6060 '';
6161
62− homepage = http://www.gnu.org/software/glpk/;
62+ homepage = https://www.gnu.org/software/glpk/;
6363 license = stdenv.lib.licenses.gpl3Plus;
6464
6565 maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
pkgs/development/libraries/gnu-config/default.nix+3−3
@@ -5,11 +5,11 @@ let
55
66 # Don't use fetchgit as this is needed during Aarch64 bootstrapping
77 configGuess = fetchurl {
8− url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
8+ url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
99 sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
1010 };
1111 configSub = fetchurl {
12− url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
12+ url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
1313 sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
1414 };
1515in
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 meta = with stdenv.lib; {
2727 description = "Attempt to guess a canonical system name";
28− homepage = http://savannah.gnu.org/projects/config;
28+ homepage = https://savannah.gnu.org/projects/config;
2929 license = licenses.gpl3;
3030 # In addition to GPLv3:
3131 # As a special exception to the GNU General Public License, if you
pkgs/development/libraries/gnutls-kdh/generic.nix+1−1
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
4747 [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
4848
4949 # Build of the Guile bindings is not parallel-safe. See
50− # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
50+ # <https://github.com/arpa2/gnutls-kdh/commit/330995a920037b6030ec0282b51dde3f8b493cad>
5151 # for the actual fix. Also an apparent race in the generation of
5252 # systemkey-args.h.
5353 enableParallelBuilding = false;
pkgs/development/libraries/gnutls/generic.nix+1−1
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
8282 tampering, or message forgery."
8383 '';
8484
85− homepage = http://www.gnu.org/software/gnutls/;
85+ homepage = https://www.gnu.org/software/gnutls/;
8686 license = licenses.lgpl21Plus;
8787 maintainers = with maintainers; [ eelco wkennington fpletz ];
8888 platforms = platforms.all;
pkgs/development/libraries/gsasl/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 (e.g. IMAP, SMTP, etc.) to authenticate peers.
2525 '';
2626
27− homepage = http://www.gnu.org/software/gsasl/;
27+ homepage = https://www.gnu.org/software/gsasl/;
2828 license = stdenv.lib.licenses.gpl3Plus;
2929
3030 maintainers = with stdenv.lib.maintainers; [ shlevy ];
pkgs/development/libraries/gsignond/default.nix+3−4
@@ -6,16 +6,15 @@
66let
77unwrapped = stdenv.mkDerivation rec {
88 pname = "gsignond";
9− version = "unstable-2018-10-04";
10−
9+ version = "1.2.0";
1110
1211 outputs = [ "out" "dev" "devdoc" ];
1312
1413 src = fetchFromGitLab {
1514 owner = "accounts-sso";
1615 repo = pname;
17− rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
18− sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
16+ rev = version;
17+ sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
1918 };
2019
2120 nativeBuildInputs = [
pkgs/development/libraries/gsignond/plugins/lastfm.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
3030
3131 meta = with stdenv.lib; {
32− description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials.";
32+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
3333 homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
3434 license = licenses.lgpl21Plus;
3535 maintainers = with maintainers; [ worldofpeace ];
pkgs/development/libraries/gsignond/plugins/mail.nix+5−5
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
22
33stdenv.mkDerivation rec {
4− name = "gsignond-plugin-mail-${version}";
5− version = "2018-10-04";
4+ pname = "gsignond-plugin-mail";
5+ version = "0.3.0";
66
77 src = fetchFromGitLab {
88 owner = "accounts-sso";
99 repo = "gsignond-plugin-mail";
10− rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
11− sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
10+ rev = version;
11+ sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
1212 };
1313
1414 nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
2828
2929 meta = with stdenv.lib; {
30− description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials.";
30+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
3131 homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
3232 license = licenses.lgpl21Plus;
3333 maintainers = with maintainers; [ worldofpeace ];
pkgs/development/libraries/gsignond/plugins/oauth.nix+1−1
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
4040
4141 meta = with stdenv.lib; {
42− description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols.";
42+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
4343 homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
4444 license = licenses.lgpl21Plus;
4545 maintainers = with maintainers; [ worldofpeace ];
pkgs/development/libraries/gsignond/plugins/sasl.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
3737
3838 meta = with stdenv.lib; {
39− description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol.";
39+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
4040 homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
4141 license = licenses.lgpl21Plus;
4242 maintainers = with maintainers; [ worldofpeace ];
pkgs/development/libraries/gsignond/wrapper.nix+2
@@ -20,4 +20,6 @@ symlinkJoin {
2020 substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
2121 --replace ${gsignond} $out
2222 '';
23+
24+ inherit (gsignond) meta;
2325}
pkgs/development/libraries/gsl/default.nix+2−2
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 patches = [
1212 # ToDo: there might be more impurities than FMA support check
13− ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
13+ ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
1414 ];
1515
1616 # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 meta = {
2020 description = "The GNU Scientific Library, a large numerical library";
21− homepage = http://www.gnu.org/software/gsl/;
21+ homepage = https://www.gnu.org/software/gsl/;
2222 license = stdenv.lib.licenses.gpl3Plus;
2323
2424 longDescription = ''
pkgs/development/libraries/gsl/gsl-1_16.nix+3−3
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
1010
1111 patches = [
1212 # ToDo: there might be more impurities than FMA support check
13− ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
13+ ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
1414 (fetchpatch {
1515 name = "bug-39055.patch";
16− url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
16+ url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
1717 sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
1818 })
1919 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 meta = {
2424 description = "The GNU Scientific Library, a large numerical library";
25− homepage = http://www.gnu.org/software/gsl/;
25+ homepage = https://www.gnu.org/software/gsl/;
2626 license = stdenv.lib.licenses.gpl3Plus;
2727
2828 longDescription = ''
pkgs/development/libraries/gss/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 '';
2727
2828 meta = with stdenv.lib; {
29− homepage = http://www.gnu.org/software/gss/;
29+ homepage = https://www.gnu.org/software/gss/;
3030 description = "Generic Security Service";
3131 license = licenses.gpl3Plus;
3232 maintainers = with maintainers; [ bjg wkennington ];
pkgs/development/libraries/hyperscan/default.nixnew file+69
@@ -0,0 +1,69 @@
1+{ lib, stdenv, fetchFromGitHub, cmake, ragel, python27
2+, boost
3+}:
4+
5+# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
6+# pcap used only in examples, pkgconfig used only to check for pcre
7+# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
8+# I not see any reason (for now) to backport 8.41.
9+
10+stdenv.mkDerivation rec {
11+ name = "${pname}-${version}";
12+ pname = "hyperscan";
13+ version = "5.0.0";
14+
15+ src = fetchFromGitHub {
16+ owner = "intel";
17+ repo = "hyperscan";
18+ sha256 = "017dxg0n3gn9i4j27rcvpnp4rkqgycqni6x5d15dqpidl7zg7059";
19+ rev = "v${version}";
20+ };
21+
22+ outputs = [ "out" "dev" ];
23+
24+ buildInputs = [ boost ];
25+ nativeBuildInputs = [ cmake ragel python27 ];
26+
27+ cmakeFlags = [
28+ "-DFAT_RUNTIME=ON"
29+ "-DBUILD_AVX512=ON"
30+ "-DBUILD_STATIC_AND_SHARED=ON"
31+ ];
32+
33+ prePatch = ''
34+ sed -i '/examples/d' CMakeLists.txt
35+ '';
36+
37+ postInstall = ''
38+ mkdir -p $dev/lib
39+ mv $out/lib/*.a $dev/lib/
40+ ln -sf $out/lib/libhs.so $dev/lib/
41+ ln -sf $out/lib/libhs_runtime.so $dev/lib/
42+ '';
43+
44+ postFixup = ''
45+ sed -i "s,$out/include,$dev/include," $dev/lib/pkgconfig/libhs.pc
46+ sed -i "s,$out/lib,$dev/lib," $dev/lib/pkgconfig/libhs.pc
47+ '';
48+
49+ meta = {
50+ description = "High-performance multiple regex matching library";
51+ longDescription = ''
52+ Hyperscan is a high-performance multiple regex matching library.
53+ It follows the regular expression syntax of the commonly-used
54+ libpcre library, but is a standalone library with its own C API.
55+
56+ Hyperscan uses hybrid automata techniques to allow simultaneous
57+ matching of large numbers (up to tens of thousands) of regular
58+ expressions and for the matching of regular expressions across
59+ streams of data.
60+
61+ Hyperscan is typically used in a DPI library stack.
62+ '';
63+
64+ homepage = https://www.hyperscan.io/;
65+ maintainers = with lib.maintainers; [ avnik ];
66+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
67+ license = lib.licenses.bsd3;
68+ };
69+}
pkgs/development/libraries/judy/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 };
1010
1111 # gcc 4.8 optimisations break judy.
12− # http://sourceforge.net/p/judy/mailman/message/31995144/
12+ # https://sourceforge.net/p/judy/mailman/message/31995144/
1313 preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
1414 configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
1515 '';
pkgs/development/libraries/libbfd/default.nix+1−1
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 It is associated with GNU Binutils, and elsewhere often distributed with
5252 it.
5353 '';
54− homepage = http://www.gnu.org/software/binutils/;
54+ homepage = https://www.gnu.org/software/binutils/;
5555 license = licenses.gpl3Plus;
5656 maintainers = with maintainers; [ ericson2314 ];
5757 platforms = platforms.unix;
pkgs/development/libraries/libcdio/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 ISO-9660 filesystems (libiso9660), as well as utility
2727 programs such as an audio CD player and an extractor.
2828 '';
29− homepage = http://www.gnu.org/software/libcdio/;
29+ homepage = https://www.gnu.org/software/libcdio/;
3030 license = licenses.gpl2Plus;
3131 platforms = platforms.linux ++ platforms.darwin;
3232 };
pkgs/development/libraries/libchop/default.nix+2−2
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 patches = [ ./gets-undeclared.patch ./size_t.patch ];
1515
1616 nativeBuildInputs = [ pkgconfig gperf ];
17−
17+
1818 buildInputs =
1919 [ zlib bzip2 lzo
2020 libgcrypt
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 line. It is written in C and has Guile (Scheme) bindings.
4848 '';
4949
50− homepage = http://nongnu.org/libchop/;
50+ homepage = https://www.nongnu.org/libchop/;
5151 license = licenses.gpl3Plus;
5252 maintainers = with maintainers; [ ];
5353 platforms = platforms.gnu ++ platforms.linux;
pkgs/development/libraries/libe-book/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/libebook/files/
1+url https://sourceforge.net/projects/libebook/files/
22SF_version_dir libe-book-
33version_link '[.]tar.xz/download$'
44SF_redirect
pkgs/development/libraries/libgksu/default.nix+1−1
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
7979 user. It provides X authentication facilities for running
8080 programs in an X session.
8181 '';
82− homepage = http://www.nongnu.org/gksu/;
82+ homepage = https://www.nongnu.org/gksu/;
8383 license = stdenv.lib.licenses.lgpl2;
8484 maintainers = [ stdenv.lib.maintainers.romildo ];
8585 platforms = stdenv.lib.platforms.linux;
pkgs/development/libraries/libiberty/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 '';
2020
2121 meta = with stdenv.lib; {
22− homepage = http://gcc.gnu.org/;
22+ homepage = https://gcc.gnu.org/;
2323 license = licenses.lgpl2;
2424 description = "Collection of subroutines used by various GNU programs";
2525 maintainers = with maintainers; [ abbradar ericson2314 ];
pkgs/development/libraries/libiconv/default.nix+1−1
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646 applications.
4747 '';
4848
49− homepage = http://www.gnu.org/software/libiconv/;
49+ homepage = https://www.gnu.org/software/libiconv/;
5050 license = lib.licenses.lgpl2Plus;
5151
5252 maintainers = [ ];
pkgs/development/libraries/libidn/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 doCheck = false; # fails
2121
2222 meta = {
23− homepage = http://www.gnu.org/software/libidn/;
23+ homepage = https://www.gnu.org/software/libidn/;
2424 description = "Library for internationalized domain names";
2525
2626 longDescription = ''
pkgs/development/libraries/libmicrohttpd/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 license = licenses.lgpl2Plus;
3333
34− homepage = http://www.gnu.org/software/libmicrohttpd/;
34+ homepage = https://www.gnu.org/software/libmicrohttpd/;
3535
3636 maintainers = with maintainers; [ eelco vrthra fpletz ];
3737 platforms = platforms.unix;
pkgs/development/libraries/libmwaw/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/libmwaw/files/libmwaw/
1+url https://sourceforge.net/projects/libmwaw/files/libmwaw/
22SF_version_dir libmwaw-
33version_link '[.]tar.xz/download$'
44SF_redirect
pkgs/development/libraries/libnih/default.nix+1−1
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
66 name = "libnih-${version}";
77
88 src = fetchurl {
9− url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
9+ url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
1010 sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
1111 };
1212
pkgs/development/libraries/libodfgen/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/libwpd/files/libodfgen/
1+url https://sourceforge.net/projects/libwpd/files/libodfgen/
22SF_version_dir libodfgen-
33version_link '[.]tar.xz/download$'
44SF_redirect
pkgs/development/libraries/libopcodes/default.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636
3737 meta = with stdenv.lib; {
3838 description = "A library from binutils for manipulating machine code";
39− homepage = http://www.gnu.org/software/binutils/;
39+ homepage = https://www.gnu.org/software/binutils/;
4040 license = licenses.gpl3Plus;
4141 maintainers = with maintainers; [ ericson2314 ];
4242 platforms = platforms.unix;
pkgs/development/libraries/librevenge/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/libwpd/files/librevenge/
1+url https://sourceforge.net/projects/libwpd/files/librevenge/
22SF_version_dir librevenge-
33version_link '[.]tar.xz/download$'
44SF_redirect
pkgs/development/libraries/libsignon-glib/default.nix+4−6
@@ -2,15 +2,15 @@
22
33stdenv.mkDerivation rec {
44 pname = "libsignon-glib";
5− version = "unstable-2018-10-24";
5+ version = "2.1";
66
77 outputs = [ "out" "dev" "devdoc" "py" ];
88
99 src = fetchgit {
1010 url = "https://gitlab.com/accounts-sso/${pname}";
11− rev = "3639a2e90447e4640a03a44972560afe8f61aa48";
11+ rev = "refs/tags/${version}";
12+ sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0";
1213 fetchSubmodules = true;
13− sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
1414 };
1515
1616 nativeBuildInputs = [
@@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
4343 '';
4444
4545 meta = with stdenv.lib; {
46− description = ''
47− A library for managing single signon credentials which can be used from GLib applications
48− '';
46+ description = "A library for managing single signon credentials which can be used from GLib applications";
4947 homepage = https://gitlab.com/accounts-sso/libsignon-glib;
5048 license = licenses.lgpl21;
5149 maintainers = with maintainers; [ worldofpeace ];
pkgs/development/libraries/libsigsegv/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 doCheck = true; # not cross;
1616
1717 meta = {
18− homepage = http://www.gnu.org/software/libsigsegv/;
18+ homepage = https://www.gnu.org/software/libsigsegv/;
1919 description = "Library to handle page faults in user mode";
2020
2121 longDescription = ''
pkgs/development/libraries/libtasn1/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 doCheck = true;
1717
1818 meta = with stdenv.lib; {
19− homepage = http://www.gnu.org/software/libtasn1/;
19+ homepage = https://www.gnu.org/software/libtasn1/;
2020 description = "An ASN.1 library";
2121 longDescription = ''
2222 Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
pkgs/development/libraries/libunistring/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 enableParallelBuilding = false;
3535
3636 meta = {
37− homepage = http://www.gnu.org/software/libunistring/;
37+ homepage = https://www.gnu.org/software/libunistring/;
3838
3939 description = "Unicode string library";
4040
pkgs/development/libraries/libunwind/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 doCheck = false; # fails
3030
3131 meta = with stdenv.lib; {
32− homepage = http://www.nongnu.org/libunwind;
32+ homepage = https://www.nongnu.org/libunwind;
3333 description = "A portable and efficient API to determine the call-chain of a program";
3434 maintainers = with maintainers; [ orivej ];
3535 platforms = platforms.linux;
pkgs/development/libraries/libxmi/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 meta = {
1515 description = "Library for rasterizing 2-D vector graphics";
16− homepage = http://www.gnu.org/software/libxmi/;
16+ homepage = https://www.gnu.org/software/libxmi/;
1717 license = stdenv.lib.licenses.gpl2Plus;
1818 platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
1919 maintainers = [ ];
pkgs/development/libraries/lightning/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 doCheck = true;
1717
1818 meta = {
19− homepage = http://www.gnu.org/software/lightning/;
19+ homepage = https://www.gnu.org/software/lightning/;
2020 description = "Run-time code generation library";
2121 longDescription = ''
2222 GNU lightning is a library that generates assembly language code
pkgs/development/libraries/ncurses/default.nix+1−1
@@ -159,7 +159,7 @@ stdenv.mkDerivation rec {
159159 ported to OS/2 Warp!
160160 '';
161161
162− homepage = http://www.gnu.org/software/ncurses/;
162+ homepage = https://www.gnu.org/software/ncurses/;
163163
164164 license = lib.licenses.mit;
165165 platforms = lib.platforms.all;
pkgs/development/libraries/opencascade/default.nix+3−3
@@ -2,10 +2,10 @@
22ftgl, freetype}:
33
44stdenv.mkDerivation rec {
5− name = "opencascade-oce-0.17.2";
5+ name = "opencascade-oce-0.18.3";
66 src = fetchurl {
7− url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz;
8− sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd";
7+ url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz;
8+ sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5";
99 };
1010
1111 buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
pkgs/development/libraries/opencv/3.x.nix+23−10
@@ -1,5 +1,5 @@
11{ lib, stdenv
2−, fetchurl, fetchFromGitHub
2+, fetchurl, fetchFromGitHub, fetchpatch
33, cmake, pkgconfig, unzip, zlib, pcre, hdf5
44, glog, boost, google-gflags, protobuf
55, config
@@ -31,29 +31,31 @@
3131, enableDC1394 ? false, libdc1394
3232, enableDocs ? false, doxygen, graphviz-nox
3333
34−, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
34+, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
3535}:
3636
3737let
38− version = "3.4.3";
38+ version = "3.4.4";
3939
4040 src = fetchFromGitHub {
4141 owner = "opencv";
4242 repo = "opencv";
4343 rev = version;
44− sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
44+ sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr";
4545 };
4646
4747 contribSrc = fetchFromGitHub {
4848 owner = "opencv";
4949 repo = "opencv_contrib";
5050 rev = version;
51− sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
51+ sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib";
5252 };
5353
5454 # Contrib must be built in order to enable Tesseract support:
5555 buildContrib = enableContrib || enableTesseract;
5656
57+ useSystemProtobuf = ! stdenv.isDarwin;
58+
5759 # See opencv/3rdparty/ippicv/ippicv.cmake
5860 ippicv = {
5961 src = fetchFromGitHub {
@@ -145,6 +147,13 @@ stdenv.mkDerivation rec {
145147 cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
146148 '';
147149
150+ patches =
151+ # https://github.com/opencv/opencv/pull/13254
152+ lib.optional enablePython (fetchpatch {
153+ url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
154+ sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
155+ });
156+
148157 # This prevents cmake from using libraries in impure paths (which
149158 # causes build failure on non NixOS)
150159 # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
@@ -171,7 +180,8 @@ stdenv.mkDerivation rec {
171180 '';
172181
173182 buildInputs =
174− [ zlib pcre hdf5 glog boost google-gflags protobuf ]
183+ [ zlib pcre hdf5 glog boost google-gflags ]
184+ ++ lib.optional useSystemProtobuf protobuf
175185 ++ lib.optional enablePython pythonPackages.python
176186 ++ lib.optional enableGtk2 gtk2
177187 ++ lib.optional enableGtk3 gtk3
@@ -197,7 +207,7 @@ stdenv.mkDerivation rec {
197207 ++ lib.optionals enableTesseract [ tesseract leptonica ]
198208 ++ lib.optional enableTbb tbb
199209 ++ lib.optional enableCuda cudatoolkit
200− ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
210+ ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
201211 ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
202212
203213 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -211,8 +221,8 @@ stdenv.mkDerivation rec {
211221
212222 cmakeFlags = [
213223 "-DWITH_OPENMP=ON"
214− "-DBUILD_PROTOBUF=OFF"
215− "-DPROTOBUF_UPDATE_FILES=ON"
224+ "-DBUILD_PROTOBUF=${printEnabled (!useSystemProtobuf)}"
225+ "-DPROTOBUF_UPDATE_FILES=${printEnabled useSystemProtobuf}"
216226 "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
217227 "-DBUILD_TESTS=OFF"
218228 "-DBUILD_PERF_TESTS=OFF"
@@ -234,6 +244,8 @@ stdenv.mkDerivation rec {
234244 ] ++ lib.optionals stdenv.isDarwin [
235245 "-DWITH_OPENCL=OFF"
236246 "-DWITH_LAPACK=OFF"
247+ ] ++ lib.optionals enablePython [
248+ "-DOPENCV_SKIP_PYTHON_LOADER=ON"
237249 ];
238250
239251 enableParallelBuilding = true;
@@ -254,7 +266,8 @@ stdenv.mkDerivation rec {
254266 # ${exec_prefix}. This causes linker errors in downstream packages so we strip
255267 # of $out after the ${exec_prefix} prefix:
256268 postInstall = ''
257− sed -i "s|\''${exec_prefix}/$out|\''${exec_prefix}|" "$out/lib/pkgconfig/opencv.pc"
269+ sed -i "s|{exec_prefix}/$out|{exec_prefix}|" \
270+ "$out/lib/pkgconfig/opencv.pc"
258271 '';
259272
260273 hardeningDisable = [ "bindnow" "relro" ];
pkgs/development/libraries/opencv/4.x.nixnew file+307
@@ -0,0 +1,307 @@
1+{ lib, stdenv
2+, fetchurl, fetchFromGitHub, fetchpatch
3+, cmake, pkgconfig, unzip, zlib, pcre, hdf5
4+, glog, boost, google-gflags, protobuf
5+, config
6+
7+, enableJPEG ? true, libjpeg
8+, enablePNG ? true, libpng
9+, enableTIFF ? true, libtiff
10+, enableWebP ? true, libwebp
11+, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
12+, enableJPEG2K ? true, jasper
13+, enableEigen ? true, eigen
14+, enableOpenblas ? true, openblas
15+, enableContrib ? true
16+
17+, enableCuda ? (config.cudaSupport or false), cudatoolkit
18+
19+, enableUnfree ? false
20+, enableIpp ? false
21+, enablePython ? false, pythonPackages
22+, enableGtk2 ? false, gtk2
23+, enableGtk3 ? false, gtk3
24+, enableVtk ? false, vtk
25+, enableFfmpeg ? false, ffmpeg
26+, enableGStreamer ? false, gst_all_1
27+, enableTesseract ? false, tesseract, leptonica
28+, enableTbb ? false, tbb
29+, enableOvis ? false, ogre
30+, enableGPhoto2 ? false, libgphoto2
31+, enableDC1394 ? false, libdc1394
32+, enableDocs ? false, doxygen, graphviz-nox
33+
34+, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
35+}:
36+
37+let
38+ version = "4.0.0";
39+
40+ src = fetchFromGitHub {
41+ owner = "opencv";
42+ repo = "opencv";
43+ rev = version;
44+ sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50";
45+ };
46+
47+ contribSrc = fetchFromGitHub {
48+ owner = "opencv";
49+ repo = "opencv_contrib";
50+ rev = version;
51+ sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
52+ };
53+
54+ # Contrib must be built in order to enable Tesseract support:
55+ buildContrib = enableContrib || enableTesseract || enableOvis;
56+
57+ # See opencv/3rdparty/ippicv/ippicv.cmake
58+ ippicv = {
59+ src = fetchFromGitHub {
60+ owner = "opencv";
61+ repo = "opencv_3rdparty";
62+ rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4";
63+ sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp";
64+ } + "/ippicv";
65+ files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in
66+ if stdenv.hostPlatform.system == "x86_64-linux" then
67+ { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
68+ else if stdenv.hostPlatform.system == "i686-linux" then
69+ { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; }
70+ else if stdenv.hostPlatform.system == "x86_64-darwin" then
71+ { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
72+ else
73+ throw "ICV is not available for this platform (or not yet supported by this package)";
74+ dst = ".cache/ippicv";
75+ };
76+
77+ # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake
78+ vgg = {
79+ src = fetchFromGitHub {
80+ owner = "opencv";
81+ repo = "opencv_3rdparty";
82+ rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
83+ sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
84+ };
85+ files = {
86+ "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179";
87+ "vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225";
88+ "vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5";
89+ "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75";
90+ };
91+ dst = ".cache/xfeatures2d/vgg";
92+ };
93+
94+ # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
95+ boostdesc = {
96+ src = fetchFromGitHub {
97+ owner = "opencv";
98+ repo = "opencv_3rdparty";
99+ rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
100+ sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
101+ };
102+ files = {
103+ "boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f";
104+ "boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191";
105+ "boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e";
106+ "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f";
107+ "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b";
108+ "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea";
109+ "boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052";
110+ };
111+ dst = ".cache/xfeatures2d/boostdesc";
112+ };
113+
114+ # See opencv_contrib/modules/face/CMakeLists.txt
115+ face = {
116+ src = fetchFromGitHub {
117+ owner = "opencv";
118+ repo = "opencv_3rdparty";
119+ rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12";
120+ sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v";
121+ };
122+ files = {
123+ "face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05";
124+ };
125+ dst = ".cache/data";
126+ };
127+
128+ # See opencv/modules/gapi/cmake/DownloadADE.cmake
129+ ade = rec {
130+ src = fetchurl {
131+ url = "https://github.com/opencv/ade/archive/${name}";
132+ sha256 = "1r85vdkvcka7bcxk69pd0ai4hld4iakpj4xl0xbinx3p9pv5a4l8";
133+ };
134+ name = "v0.1.1d.zip";
135+ md5 = "37479d90e3a5d47f132f512b22cbe206";
136+ dst = ".cache/ade";
137+ };
138+
139+ # See opencv/cmake/OpenCVDownload.cmake
140+ installExtraFiles = extra : with lib; ''
141+ mkdir -p "${extra.dst}"
142+ '' + concatStrings (flip mapAttrsToList extra.files (name : md5 : ''
143+ ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
144+ ''));
145+ installExtraFile = extra: ''
146+ mkdir -p "${extra.dst}"
147+ ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}"
148+ '';
149+
150+ opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
151+
152+ printEnabled = enabled : if enabled then "ON" else "OFF";
153+in
154+
155+stdenv.mkDerivation rec {
156+ name = "opencv-${version}";
157+ inherit version src;
158+
159+ postUnpack = lib.optionalString buildContrib ''
160+ cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
161+ '';
162+
163+ patches =
164+ # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
165+ # PR: https://github.com/opencv/opencv_contrib/pull/1913
166+ lib.optional buildContrib (fetchpatch {
167+ url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
168+ sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
169+ stripLen = 2;
170+ extraPrefix = "opencv_contrib/";
171+ }) ++
172+ # https://github.com/opencv/opencv/pull/13254
173+ lib.optional enablePython (fetchpatch {
174+ url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
175+ sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
176+ });
177+
178+ # This prevents cmake from using libraries in impure paths (which
179+ # causes build failure on non NixOS)
180+ # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
181+ # what appears to be some stray headers in dnn/misc/tensorflow
182+ # in contrib when generating the Python bindings:
183+ postPatch = ''
184+ sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
185+ sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
186+ '';
187+
188+ preConfigure =
189+ installExtraFile ade +
190+ lib.optionalString enableIpp (installExtraFiles ippicv) + (
191+ lib.optionalString buildContrib ''
192+ cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
193+
194+ ${installExtraFiles vgg}
195+ ${installExtraFiles boostdesc}
196+ ${installExtraFiles face}
197+ '');
198+
199+ postConfigure = ''
200+ [ -e modules/core/version_string.inc ]
201+ echo '"(build info elided)"' > modules/core/version_string.inc
202+ '';
203+
204+ buildInputs =
205+ [ zlib pcre hdf5 glog boost google-gflags protobuf ]
206+ ++ lib.optional enablePython pythonPackages.python
207+ ++ lib.optional enableGtk2 gtk2
208+ ++ lib.optional enableGtk3 gtk3
209+ ++ lib.optional enableVtk vtk
210+ ++ lib.optional enableJPEG libjpeg
211+ ++ lib.optional enablePNG libpng
212+ ++ lib.optional enableTIFF libtiff
213+ ++ lib.optional enableWebP libwebp
214+ ++ lib.optionals enableEXR [ openexr ilmbase ]
215+ ++ lib.optional enableJPEG2K jasper
216+ ++ lib.optional enableFfmpeg ffmpeg
217+ ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
218+ [ VideoDecodeAcceleration bzip2 ]
219+ ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
220+ ++ lib.optional enableOvis ogre
221+ ++ lib.optional enableGPhoto2 libgphoto2
222+ ++ lib.optional enableDC1394 libdc1394
223+ ++ lib.optional enableEigen eigen
224+ ++ lib.optional enableOpenblas openblas
225+ # There is seemingly no compile-time flag for Tesseract. It's
226+ # simply enabled automatically if contrib is built, and it detects
227+ # tesseract & leptonica.
228+ ++ lib.optionals enableTesseract [ tesseract leptonica ]
229+ ++ lib.optional enableTbb tbb
230+ ++ lib.optional enableCuda cudatoolkit
231+ ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
232+ ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
233+
234+ propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
235+
236+ nativeBuildInputs = [ cmake pkgconfig unzip ];
237+
238+ NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
239+
240+ # Configure can't find the library without this.
241+ OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
242+
243+ cmakeFlags = [
244+ "-DOPENCV_GENERATE_PKGCONFIG=ON"
245+ "-DWITH_OPENMP=ON"
246+ "-DBUILD_PROTOBUF=OFF"
247+ "-DPROTOBUF_UPDATE_FILES=ON"
248+ "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
249+ "-DBUILD_TESTS=OFF"
250+ "-DBUILD_PERF_TESTS=OFF"
251+ "-DBUILD_DOCS=${printEnabled enableDocs}"
252+ (opencvFlag "IPP" enableIpp)
253+ (opencvFlag "TIFF" enableTIFF)
254+ (opencvFlag "JASPER" enableJPEG2K)
255+ (opencvFlag "WEBP" enableWebP)
256+ (opencvFlag "JPEG" enableJPEG)
257+ (opencvFlag "PNG" enablePNG)
258+ (opencvFlag "OPENEXR" enableEXR)
259+ (opencvFlag "CUDA" enableCuda)
260+ (opencvFlag "CUBLAS" enableCuda)
261+ (opencvFlag "TBB" enableTbb)
262+ ] ++ lib.optionals enableCuda [
263+ "-DCUDA_FAST_MATH=ON"
264+ "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
265+ "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
266+ ] ++ lib.optionals stdenv.isDarwin [
267+ "-DWITH_OPENCL=OFF"
268+ "-DWITH_LAPACK=OFF"
269+ ] ++ lib.optionals enablePython [
270+ "-DOPENCV_SKIP_PYTHON_LOADER=ON"
271+ ];
272+
273+ enableParallelBuilding = true;
274+
275+ postBuild = lib.optionalString enableDocs ''
276+ make doxygen
277+ '';
278+
279+ # By default $out/lib/pkgconfig/opencv4.pc looks something like this:
280+ #
281+ # prefix=/nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0
282+ # exec_prefix=${prefix}
283+ # libdir=${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib
284+ # includedir_old=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4/opencv
285+ # includedir_new=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4
286+ # ...
287+ # Libs: -L${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib ...
288+ # Note that ${exec_prefix} is set to $out but that $out is also appended to
289+ # ${exec_prefix}. This causes linker errors in downstream packages so we strip
290+ # of $out after the ${exec_prefix} and ${prefix} prefixes:
291+ postInstall = ''
292+ sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
293+ "$out/lib/pkgconfig/opencv4.pc"
294+ '';
295+
296+ hardeningDisable = [ "bindnow" "relro" ];
297+
298+ passthru = lib.optionalAttrs enablePython { pythonPath = []; };
299+
300+ meta = with stdenv.lib; {
301+ description = "Open Computer Vision Library with more than 500 algorithms";
302+ homepage = https://opencv.org/;
303+ license = with licenses; if enableUnfree then unfree else bsd3;
304+ maintainers = with maintainers; [mdaiter basvandijk];
305+ platforms = with platforms; linux ++ darwin;
306+ };
307+}
pkgs/development/libraries/osip/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99
1010 meta = {
1111 license = stdenv.lib.licenses.lgpl21Plus;
12− homepage = http://www.gnu.org/software/osip/;
12+ homepage = https://www.gnu.org/software/osip/;
1313 description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
1414 maintainers = with stdenv.lib.maintainers; [ raskin ];
1515 platforms = stdenv.lib.platforms.linux;
pkgs/development/libraries/png++/default.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 enableParallelBuilding = true;
3737
3838 meta = with stdenv.lib; {
39− homepage = http://www.nongnu.org/pngpp/;
39+ homepage = https://www.nongnu.org/pngpp/;
4040 description = "C++ wrapper for libpng library";
4141 license = licenses.bsd3;
4242 platforms = platforms.unix;
pkgs/development/libraries/pth/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 meta = with stdenv.lib; {
1616 description = "The GNU Portable Threads library";
17− homepage = http://www.gnu.org/software/pth;
17+ homepage = https://www.gnu.org/software/pth;
1818 license = licenses.lgpl21Plus;
1919 platforms = platforms.all;
2020 };
pkgs/development/libraries/qt-5/5.6/default.nix+1−1
@@ -46,7 +46,7 @@ let
4646 srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
4747
4848 patches = {
49− qtbase = [ ./qtbase.patch ];
49+ qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ];
5050 qtdeclarative = [ ./qtdeclarative.patch ];
5151 qtscript = [ ./qtscript.patch ];
5252 qtserialport = [ ./qtserialport.patch ];
pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patchnew file+30
@@ -0,0 +1,30 @@
1+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
2+index 0bbc871..3673634 100644
3+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
4++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
5+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
6+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
7+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
8+
9+- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
10++ set(imported_location \"${PLUGIN_LOCATION}\")
11+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
12+ set_target_properties(Qt5::${Plugin} PROPERTIES
13+ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
14+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
15+index 5baf0fd..3583745 100644
16+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
17++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
18+@@ -2,10 +2,10 @@
19+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
20+
21+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
22+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
23++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
24+ !!ENDIF
25+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
26+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
27++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
28+ !!ENDIF
29+
30+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
pkgs/development/libraries/qt-5/5.9/default.nix+1−1
@@ -38,7 +38,7 @@ let
3838 srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
3939
4040 patches = {
41− qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
41+ qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
4242 qtdeclarative = [ ./qtdeclarative.patch ];
4343 qtscript = [ ./qtscript.patch ];
4444 qtserialport = [ ./qtserialport.patch ];
pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patchnew file+30
@@ -0,0 +1,30 @@
1+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
2+index 0bbc871..3673634 100644
3+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
4++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
5+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
6+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
7+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
8+
9+- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
10++ set(imported_location \"${PLUGIN_LOCATION}\")
11+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
12+ set_target_properties(Qt5::${Plugin} PROPERTIES
13+ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
14+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
15+index 5baf0fd..3583745 100644
16+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
17++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
18+@@ -2,10 +2,10 @@
19+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
20+
21+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
22+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
23++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
24+ !!ENDIF
25+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
26+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
27++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
28+ !!ENDIF
29+
30+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
pkgs/development/libraries/readline/6.2.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
4545 desire its capabilities.
4646 '';
4747
48− homepage = http://savannah.gnu.org/projects/readline/;
48+ homepage = https://savannah.gnu.org/projects/readline/;
4949
5050 license = stdenv.lib.licenses.gpl3Plus;
5151
pkgs/development/libraries/readline/6.3.nix+1−1
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 desire its capabilities.
5757 '';
5858
59− homepage = http://savannah.gnu.org/projects/readline/;
59+ homepage = https://savannah.gnu.org/projects/readline/;
6060
6161 license = licenses.gpl3Plus;
6262
pkgs/development/libraries/readline/7.0.nix+1−1
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454 desire its capabilities.
5555 '';
5656
57− homepage = http://savannah.gnu.org/projects/readline/;
57+ homepage = https://savannah.gnu.org/projects/readline/;
5858
5959 license = licenses.gpl3Plus;
6060
pkgs/development/libraries/safefile/default.nix+1
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 passthru = {
1515 updateScript = ''
16+ #!${stdenv.shell}
1617 cd ${toString ./.}
1718 ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix
1819 '';
pkgs/development/libraries/science/math/or-tools/default.nix+11−20
@@ -1,15 +1,15 @@
11{ stdenv, fetchFromGitHub, cmake, google-gflags, which
2−, lsb-release, glog, protobuf, cbc, zlib }:
2+, lsb-release, glog, protobuf, cbc, zlib, python3 }:
33
44stdenv.mkDerivation rec {
55 name = "or-tools-${version}";
6− version = "v6.9.1";
6+ version = "v6.10";
77
88 src = fetchFromGitHub {
99 owner = "google";
1010 repo = "or-tools";
1111 rev = version;
12− sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
12+ sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
1313 };
1414
1515 # The original build system uses cmake which does things like pull
@@ -25,32 +25,23 @@ stdenv.mkDerivation rec {
2525 EOF
2626 '';
2727
28− buildPhase = ''
29− make cc
30− '';
28+ makeFlags = [ "prefix=${placeholder "out"}" ];
29+ buildFlags = [ "cc" ];
3130
32− installPhase = ''
33− make install_cc prefix=$out
34− '';
31+ checkTarget = "test_cc";
32+ doCheck = true;
3533
36− patches = [
37− # In "expected" way of compilation, the glog package is compiled
38− # with gflags support which then makes gflags header transitively
39− # included through glog. However in nixpkgs we don't compile glog
40− # with gflags so we have to include it ourselves. Upstream should
41− # always include gflags to support both ways I think.
42− #
43− # Upstream ticket: https://github.com/google/or-tools/issues/902
44− ./gflags-include.patch
45− ];
34+ installTargets = [ "install_cc" ];
4635
4736 nativeBuildInputs = [
48− cmake lsb-release which zlib
37+ cmake lsb-release which zlib python3
4938 ];
5039 propagatedBuildInputs = [
5140 google-gflags glog protobuf cbc
5241 ];
5342
43+ enableParallelBuilding = true;
44+
5445 meta = with stdenv.lib; {
5546 homepage = https://github.com/google/or-tools;
5647 license = licenses.asl20;
pkgs/development/libraries/tinyxml/2.6.2.nix+1−1
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 # add pkgconfig file
1616 ./2.6.2-add-pkgconfig.patch
1717
18− # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
18+ # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
1919 ./2.6.2-entity.patch
2020
2121 # Use CC, CXX, and LD from environment
pkgs/development/libraries/tsocks/default.nix+1
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
3131 license = stdenv.lib.licenses.gpl2;
3232 maintainers = with maintainers; [ edwtjo phreedom ];
3333 platforms = platforms.unix;
34+ broken = stdenv.hostPlatform.isDarwin;
3435 };
3536}
pkgs/development/libraries/ucommon/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 meta = {
3434 description = "C++ library to facilitate using C++ design patterns";
35− homepage = http://www.gnu.org/software/commoncpp/;
35+ homepage = https://www.gnu.org/software/commoncpp/;
3636 license = stdenv.lib.licenses.lgpl3Plus;
3737
3838 maintainers = with stdenv.lib.maintainers; [ ];
pkgs/development/libraries/vcdimager/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 propagatedBuildInputs = [ libcdio ];
1818
1919 meta = with lib; {
20− homepage = http://www.gnu.org/software/vcdimager/;
20+ homepage = https://www.gnu.org/software/vcdimager/;
2121 description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
2222 platforms = platforms.unix;
2323 license = licenses.gpl2;
pkgs/development/misc/avr/libc/default.nix+2−2
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 name = "avr-libc-${version}";
88
99 src = fetchurl {
10− url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
10+ url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
1111 sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
1212 };
1313
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323
2424 meta = with stdenv.lib; {
2525 description = "a C runtime library for AVR microcontrollers";
26− homepage = http://savannah.nongnu.org/projects/avr-libc/;
26+ homepage = https://savannah.nongnu.org/projects/avr-libc/;
2727 license = licenses.bsd3;
2828 platforms = [ "avr-none" ];
2929 maintainers = with maintainers; [ mguentner ];
pkgs/development/misc/qmk_firmware/default.nix+12−1
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub
22, avrgcc, avrbinutils
3−, gcc-arm-embedded, binutils-arm-embedded
3+, gcc-arm-embedded, gcc-armhf-embedded
44, teensy-loader-cli, dfu-programmer, dfu-util }:
55
66let version = "0.6.144";
@@ -14,12 +14,23 @@ in stdenv.mkDerivation {
1414 sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn";
1515 fetchSubmodules = true;
1616 };
17+ postPatch = ''
18+ substituteInPlace tmk_core/arm_atsam.mk \
19+ --replace arm-none-eabi arm-none-eabihf
20+ rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk
21+ '';
1722 buildFlags = "all:default";
23+ doCheck = true;
24+ checkTarget = "test:all";
25+ installPhase = ''
26+ mkdir $out
27+ '';
1828 NIX_CFLAGS_COMPILE = "-Wno-error";
1929 nativeBuildInputs = [
2030 avrgcc
2131 avrbinutils
2232 gcc-arm-embedded
33+ gcc-armhf-embedded
2334 teensy-loader-cli
2435 dfu-programmer
2536 dfu-util
pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nixnew file+7
@@ -0,0 +1,7 @@
1+{ buildDunePackage, bisect_ppx, ocamlbuild }:
2+
3+buildDunePackage rec {
4+ inherit (bisect_ppx) version src meta;
5+ pname = "bisect_ppx-ocamlbuild";
6+ propagatedBuildInputs = [ ocamlbuild ];
7+}
pkgs/development/ocaml-modules/bisect_ppx/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }:
2+
3+buildDunePackage rec {
4+ pname = "bisect_ppx";
5+ version = "1.4.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "aantron";
9+ repo = "bisect_ppx";
10+ rev = version;
11+ sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h";
12+ };
13+
14+ buildInputs = [
15+ ocaml-migrate-parsetree
16+ ppx_tools_versioned
17+ ];
18+
19+ meta = {
20+ description = "Code coverage for OCaml";
21+ license = stdenv.lib.licenses.mpl20;
22+ homepage = https://github.com/aantron/bisect_ppx;
23+ };
24+}
pkgs/development/ocaml-modules/opti/default.nixnew file+18
@@ -0,0 +1,18 @@
1+{ stdenv, fetchurl, buildDunePackage }:
2+
3+buildDunePackage rec {
4+ pname = "opti";
5+ version = "1.0.3";
6+
7+ src = fetchurl {
8+ url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz";
9+ sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e";
10+ };
11+
12+ meta = with stdenv.lib; {
13+ description = "DSL to generate fast incremental C code from declarative specifications";
14+ license = licenses.bsd3;
15+ maintainers = [ maintainers.jmagnusj ];
16+ homepage = https://github.com/magnusjonsson/opti;
17+ };
18+}
pkgs/development/python-modules/docutils/default.nix+9−4
@@ -1,4 +1,5 @@
1−{ lib
1+{ stdenv
2+, lib
23, fetchurl
34, buildPythonPackage
45, isPy3k
@@ -14,9 +15,13 @@ buildPythonPackage rec {
1415 sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
1516 };
1617
17− checkPhase = ''
18− LANG="en_US.UTF-8" ${python.interpreter} ${if isPy3k then "test3/alltests.py" else "test/alltests.py"}
19− '';
18+ # Only Darwin needs LANG, but we could set it in general.
19+ # It's done here conditionally to prevent mass-rebuilds.
20+ checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" '' + (if isPy3k then ''
21+ ${python.interpreter} test3/alltests.py
22+ '' else ''
23+ ${python.interpreter} test/alltests.py
24+ '');
2025
2126 # Create symlinks lacking a ".py" suffix, many programs depend on these names
2227 postFixup = ''
pkgs/development/python-modules/effect/default.nix+3−5
@@ -8,12 +8,12 @@
88, testtools
99}:
1010buildPythonPackage rec {
11− version = "0.11.0";
11+ version = "0.12.0";
1212 pname = "effect";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6";
16+ sha256 = "0s8zsncq4l0ar2b4dijf8yzrk13x2swr1w2nb30s1p5jd6r24czl";
1717 };
1818 checkInputs = [
1919 pytest
@@ -24,10 +24,8 @@ buildPythonPackage rec {
2424 attrs
2525 ];
2626 checkPhase = ''
27− pytest .
27+ pytest
2828 '';
29− # Tests fails on python3.7 https://github.com/python-effect/effect/issues/78
30− doCheck = !isPy37;
3129 meta = with lib; {
3230 description = "Pure effects for Python";
3331 homepage = https://github.com/python-effect/effect;
pkgs/development/python-modules/mmpython/default.nix+1−1
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 pname = "mmpython";
1111
1212 src = fetchurl {
13− url = http://sourceforge.net/projects/mmpython/files/latest/download;
13+ url = https://sourceforge.net/projects/mmpython/files/latest/download;
1414 sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy";
1515 name = "${pname}-${version}.tar.gz";
1616 };
pkgs/development/python-modules/ntfy/default.nixdeleted−39
@@ -1,39 +0,0 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchFromGitHub
4−, appdirs
5−, ruamel_yaml
6−, requests
7−, emoji
8−, sleekxmpp
9−, mock
10−, psutil
11−, python
12−# , dbus-python
13−}:
14−
15−buildPythonPackage rec {
16− version = "2.6.0";
17− pname = "ntfy";
18−
19− src = fetchFromGitHub {
20− owner = "dschep";
21− repo = "ntfy";
22− rev = "v${version}";
23− sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1";
24− };
25−
26− propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ];
27−
28− checkPhase = ''
29− HOME=$(mktemp -d) ${python.interpreter} setup.py test
30− '';
31−
32− meta = with stdenv.lib; {
33− description = "A utility for sending notifications, on demand and when commands finish";
34− homepage = http://ntfy.rtfd.org/;
35− license = licenses.gpl3;
36− maintainers = with maintainers; [ kamilchm ];
37− };
38−
39−}
pkgs/development/python-modules/pycdio/default.nix+1−1
@@ -35,7 +35,7 @@ buildPythonPackage rec {
3535 '';
3636
3737 meta = with stdenv.lib; {
38− homepage = http://www.gnu.org/software/libcdio/;
38+ homepage = https://www.gnu.org/software/libcdio/;
3939 description = "Wrapper around libcdio (CD Input and Control library)";
4040 maintainers = with maintainers; [ rycee ];
4141 license = licenses.gpl3Plus;
pkgs/development/python-modules/ruamel_yaml/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "ruamel.yaml";
12− version = "0.15.35";
12+ version = "0.15.80";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0xggyfaj6vprggahf7cq8kp9j79rb7hn8ndk3bxj2sxvwhhliiwd";
16+ sha256 = "1rhlshff9csjwn64x11b9a7gbxccs1vd7rdiqwlhifjxax8k682g";
1717 };
1818
1919 # Tests cannot load the module to test
pkgs/development/python-modules/sybil/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonApplication, fetchPypi
1+{ stdenv, buildPythonApplication, fetchPypi, fetchpatch
22, pytest, nose }:
33
44buildPythonApplication rec {
@@ -10,6 +10,13 @@ buildPythonApplication rec {
1010 sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8";
1111 };
1212
13+ patches = [
14+ (fetchpatch {
15+ url = https://github.com/cjw296/sybil/commit/6461d8156cfb68bd073ec613a5a516916e97e549.patch;
16+ sha256 = "0aqny0i7l6g6d7vr025b90zz8wzszqdbmi05mp67dxw5xqjqvxj2";
17+ })
18+ ];
19+
1320 checkInputs = [ pytest nose ];
1421
1522 checkPhase = ''
pkgs/development/ruby-modules/solargraph/Gemfile.lock+8−10
@@ -2,7 +2,6 @@ GEM
22 remote: https://rubygems.org/
33 specs:
44 ast (2.4.0)
5− coderay (1.1.2)
65 eventmachine (1.2.7)
76 htmlentities (4.3.4)
87 jaro_winkler (1.5.1)
@@ -11,34 +10,33 @@ GEM
1110 nokogiri (1.8.5)
1211 mini_portile2 (~> 2.3.0)
1312 parallel (1.12.1)
14− parser (2.5.1.2)
13+ parser (2.5.3.0)
1514 ast (~> 2.4.0)
1615 powerpack (0.1.2)
1716 rainbow (3.0.0)
1817 reverse_markdown (1.1.0)
1918 nokogiri
20− rubocop (0.59.2)
19+ rubocop (0.60.0)
2120 jaro_winkler (~> 1.5.1)
2221 parallel (~> 1.10)
2322 parser (>= 2.5, != 2.5.1.1)
2423 powerpack (~> 0.1)
2524 rainbow (>= 2.2.2, < 4.0)
2625 ruby-progressbar (~> 1.7)
27− unicode-display_width (~> 1.0, >= 1.0.1)
26+ unicode-display_width (~> 1.4.0)
2827 ruby-progressbar (1.10.0)
29− solargraph (0.28.2)
30− coderay (~> 1.1)
28+ solargraph (0.29.1)
3129 eventmachine (~> 1.2, >= 1.2.5)
3230 htmlentities (~> 4.3, >= 4.3.4)
3331 kramdown (~> 1.16)
34− parser (~> 2.4)
32+ parser (~> 2.3)
3533 reverse_markdown (~> 1.0, >= 1.0.5)
3634 rubocop (~> 0.52)
3735 thor (~> 0.19, >= 0.19.4)
3836 tilt (~> 2.0)
3937 yard (~> 0.9)
40− thor (0.20.0)
41− tilt (2.0.8)
38+ thor (0.20.3)
39+ tilt (2.0.9)
4240 unicode-display_width (1.4.0)
4341 yard (0.9.16)
4442
@@ -49,4 +47,4 @@ DEPENDENCIES
4947 solargraph!
5048
5149BUNDLED WITH
52− 1.16.3
50+ 1.17.1
pkgs/development/ruby-modules/solargraph/default.nix+3−3
@@ -7,9 +7,9 @@ bundlerApp rec {
77
88 meta = with lib; {
99 description = "IDE tools for the Ruby language";
10− homepage = http://www.github.com/castwide/solargraph;
11− license = licenses.mit;
10+ homepage = http://www.github.com/castwide/solargraph;
11+ license = licenses.mit;
1212 maintainers = with maintainers; [ worldofpeace ];
13− platforms = platforms.unix;
13+ platforms = platforms.unix;
1414 };
1515}
pkgs/development/ruby-modules/solargraph/gemset.nix+11−19
@@ -7,14 +7,6 @@
77 };
88 version = "2.4.0";
99 };
10− coderay = {
11− source = {
12− remotes = ["https://rubygems.org"];
13− sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
14− type = "gem";
15− };
16− version = "1.1.2";
17− };
1810 eventmachine = {
1911 source = {
2012 remotes = ["https://rubygems.org"];
@@ -76,10 +68,10 @@
7668 dependencies = ["ast"];
7769 source = {
7870 remotes = ["https://rubygems.org"];
79− sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k";
71+ sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
8072 type = "gem";
8173 };
82− version = "2.5.1.2";
74+ version = "2.5.3.0";
8375 };
8476 powerpack = {
8577 source = {
@@ -110,10 +102,10 @@
110102 dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
111103 source = {
112104 remotes = ["https://rubygems.org"];
113− sha256 = "0110r4yqi6nn97bp2myah76plv6a7daxnm9k04k64n1y4zpqm256";
105+ sha256 = "1ivk049z3mp12nc6v1wn35bsq1g7nz1i2r4xwzqf0v25hm2v7n1i";
114106 type = "gem";
115107 };
116− version = "0.59.2";
108+ version = "0.60.0";
117109 };
118110 ruby-progressbar = {
119111 source = {
@@ -124,29 +116,29 @@
124116 version = "1.10.0";
125117 };
126118 solargraph = {
127− dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
119+ dependencies = ["eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
128120 source = {
129121 remotes = ["https://rubygems.org"];
130− sha256 = "0xvxifq5871fh2c34hjvsqn38nw4s63d599vbs5mlrrvdl3c5s01";
122+ sha256 = "12sy1rdz2fk3aba43701qp1250xm8w26rlizypd6h5rnmmqm5q54";
131123 type = "gem";
132124 };
133− version = "0.28.2";
125+ version = "0.29.1";
134126 };
135127 thor = {
136128 source = {
137129 remotes = ["https://rubygems.org"];
138− sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
130+ sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
139131 type = "gem";
140132 };
141− version = "0.20.0";
133+ version = "0.20.3";
142134 };
143135 tilt = {
144136 source = {
145137 remotes = ["https://rubygems.org"];
146− sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
138+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
147139 type = "gem";
148140 };
149− version = "2.0.8";
141+ version = "2.0.9";
150142 };
151143 unicode-display_width = {
152144 source = {
pkgs/development/tools/analysis/radare2/default.nix+7−7
@@ -90,17 +90,17 @@ in {
9090 #<generated>
9191 # DO NOT EDIT! Automatically generated by ./update.py
9292 radare2 = generic {
93− version_commit = "20222";
94− gittap = "3.1.0";
95− gittip = "c033496ebc7034e52a84be9cdb2d2dfad6a4cfac";
96− rev = "3.1.0";
97− version = "3.1.0";
98− sha256 = "0ggqda8433n7p4yivn7l0807i5wwf0vww2p8v90ri66nasbzvl16";
93+ version_commit = "20285";
94+ gittap = "3.1.1";
95+ gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
96+ rev = "3.1.1";
97+ version = "3.1.1";
98+ sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
9999 cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
100100 cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
101101 };
102102 r2-for-cutter = generic {
103− version_commit = "20222";
103+ version_commit = "20285";
104104 gittap = "2.9.0-310-gcb62c376b";
105105 gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
106106 rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
pkgs/development/tools/build-managers/gnumake/4.2/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
3232 outputs = [ "out" "man" "info" ];
3333
3434 meta = with stdenv.lib; {
35− homepage = http://www.gnu.org/software/make/;
35+ homepage = https://www.gnu.org/software/make/;
3636 description = "A tool to control the generation of non-source files from sources";
3737 license = licenses.gpl3Plus;
3838
pkgs/development/tools/build-managers/gup/default.nix+1
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
1616 cp -r python/bin $out/bin
1717 '';
1818 passthru.updateScript = ''
19+ #!${stdenv.shell}
1920 set -e
2021 echo
2122 cd ${toString ./.}
pkgs/development/tools/build-managers/mill/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ stdenv, fetchurl, jre, makeWrapper }:
2+
3+stdenv.mkDerivation rec {
4+ name = "mill-${version}";
5+ version = "0.3.5";
6+
7+ src = fetchurl {
8+ url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
9+ sha256 = "19ka81f6vjr85gd8cadn0fv0i0qcdspx2skslfksklxdxs2gasf8";
10+ };
11+
12+ nativeBuildInputs = [ makeWrapper ];
13+
14+ unpackPhase = "true";
15+ dontConfigure = true;
16+ dontBuild = true;
17+
18+ installPhase = ''
19+ runHook preInstall
20+ install -Dm555 "$src" "$out/bin/.mill-wrapped"
21+ # can't use wrapProgram because it sets --argv0
22+ makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
23+ runHook postInstall
24+ '';
25+
26+ meta = with stdenv.lib; {
27+ homepage = https://www.lihaoyi.com/mill;
28+ license = licenses.mit;
29+ description = "A build tool for Scala, Java and more";
30+ longDescription = ''
31+ Mill is a build tool borrowing ideas from modern tools like Bazel, to let you build
32+ your projects in a way that's simple, fast, and predictable. Mill has built in
33+ support for the Scala programming language, and can serve as a replacement for
34+ SBT, but can also be extended to support any other language or platform via
35+ modules (written in Java or Scala) or through an external subprocesses.
36+ '';
37+ maintainers = with maintainers; [ scalavision ];
38+ platforms = stdenv.lib.platforms.all;
39+ };
40+}
pkgs/development/tools/build-managers/sbt/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 name = "sbt-${version}";
5− version = "1.2.6";
5+ version = "1.2.7";
66
77 src = fetchurl {
88 urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
1111 "https://cocl.us/sbt-${version}.tgz"
1212 ];
13− sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
13+ sha256 = "10g7a1j2knbqmnbpvfhy1rqdg2pflmasz879ax59pv3mvgccn996";
1414 };
1515
1616 patchPhase = ''
pkgs/development/tools/gnulib/default.nix+2−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
44 name = "gnulib-20180226";
55
66 src = fetchgit {
7− url = "http://git.savannah.gnu.org/r/gnulib.git";
7+ url = "https://git.savannah.gnu.org/r/gnulib.git";
88 rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
99 sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
1010 };
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 '';
2020
2121 meta = {
22− homepage = http://www.gnu.org/software/gnulib/;
22+ homepage = https://www.gnu.org/software/gnulib/;
2323 description = "Central location for code to be shared among GNU packages";
2424 license = stdenv.lib.licenses.gpl3Plus;
2525 platforms = stdenv.lib.platforms.unix;
pkgs/development/tools/guile/g-wrap/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 inter-language calls. It currently only supports generating Guile
2828 wrappers for C functions.
2929 '';
30− homepage = "http://www.nongnu.org/g-wrap/";
30+ homepage = "https://www.nongnu.org/g-wrap/";
3131 license = licenses.lgpl2Plus;
3232 maintainers = with maintainers; [ vyp ];
3333 platforms = platforms.linux;
pkgs/development/tools/java/fastjar/default.nix+2−2
@@ -5,7 +5,7 @@ let version = "0.98"; in
55 name = "fastjar-${version}";
66
77 src = fetchurl {
8− url = "http://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
8+ url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
99 sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
1010 };
1111
@@ -22,7 +22,7 @@ let version = "0.98"; in
2222 the stock `jar' program running without a JIT.
2323 '';
2424
25− homepage = http://savannah.nongnu.org/projects/fastjar/;
25+ homepage = https://savannah.nongnu.org/projects/fastjar/;
2626
2727 license = stdenv.lib.licenses.gpl2Plus;
2828 platforms = stdenv.lib.platforms.linux;
pkgs/development/tools/jq/default.nix+1−1
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
66
77 src = fetchurl {
88 url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
9− sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn";
9+ sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x";
1010 };
1111
1212 outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
pkgs/development/tools/misc/autoconf-archive/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 meta = with stdenv.lib; {
1515 description = "Archive of autoconf m4 macros";
16− homepage = http://www.gnu.org/software/autoconf-archive/;
16+ homepage = https://www.gnu.org/software/autoconf-archive/;
1717 license = licenses.gpl3;
1818 platforms = platforms.unix;
1919 };
pkgs/development/tools/misc/autoconf/2.13.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13'';
2121
2222 meta = {
23− homepage = http://www.gnu.org/software/autoconf/;
23+ homepage = https://www.gnu.org/software/autoconf/;
2424 description = "Part of the GNU Build System";
2525 branch = "2.13";
2626
pkgs/development/tools/misc/autoconf/2.64.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 doInstallCheck = false; # fails
3232
3333 meta = {
34− homepage = http://www.gnu.org/software/autoconf/;
34+ homepage = https://www.gnu.org/software/autoconf/;
3535 description = "Part of the GNU Build System";
3636
3737 longDescription = ''
pkgs/development/tools/misc/autoconf/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 doInstallCheck = false; # fails
3333
3434 meta = {
35− homepage = http://www.gnu.org/software/autoconf/;
35+ homepage = https://www.gnu.org/software/autoconf/;
3636 description = "Part of the GNU Build System";
3737
3838 longDescription = ''
pkgs/development/tools/misc/autogen/default.nix+1−1
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 meta = with stdenv.lib; {
5252 description = "Automated text and program generation tool";
5353 license = with licenses; [ gpl3Plus lgpl3Plus ];
54− homepage = http://www.gnu.org/software/autogen/;
54+ homepage = https://www.gnu.org/software/autogen/;
5555 platforms = platforms.all;
5656 maintainers = [ ];
5757 };
pkgs/development/tools/misc/automake/automake-1.11.x.nix+2−2
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
55
66 # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
77 # available upstream; see
8− # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
8+ # <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
99 builder = ./builder.sh;
1010
1111 setupHook = ./setup-hook.sh;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 meta = {
3535 branch = "1.11";
36− homepage = http://www.gnu.org/software/automake/;
36+ homepage = https://www.gnu.org/software/automake/;
3737 description = "GNU standard-compliant makefile generator";
3838
3939 longDescription = ''
pkgs/development/tools/misc/automake/automake-1.16.x.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 meta = {
3030 branch = "1.15";
31− homepage = http://www.gnu.org/software/automake/;
31+ homepage = https://www.gnu.org/software/automake/;
3232 description = "GNU standard-compliant makefile generator";
3333 license = stdenv.lib.licenses.gpl2Plus;
3434
pkgs/development/tools/misc/avrdude/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 download/upload/manipulate the ROM and EEPROM contents of AVR
2626 microcontrollers using the in-system programming technique (ISP).
2727 '';
28− homepage = http://www.nongnu.org/avrdude/;
28+ homepage = https://www.nongnu.org/avrdude/;
2929 license = licenses.gpl2Plus;
3030 platforms = with platforms; linux ++ darwin;
3131 maintainers = [ maintainers.bjornfor ];
pkgs/development/tools/misc/binutils/default.nix+1−1
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
150150 They also include the BFD (Binary File Descriptor) library,
151151 `gprof', `nm', `strip', etc.
152152 '';
153− homepage = http://www.gnu.org/software/binutils/;
153+ homepage = https://www.gnu.org/software/binutils/;
154154 license = licenses.gpl3Plus;
155155 maintainers = with maintainers; [ ericson2314 ];
156156 platforms = platforms.unix;
pkgs/development/tools/misc/cflow/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141
4242 license = licenses.gpl3Plus;
4343
44− homepage = http://www.gnu.org/software/cflow/;
44+ homepage = https://www.gnu.org/software/cflow/;
4545
4646 maintainers = [ maintainers.vrthra ];
4747
pkgs/development/tools/misc/complexity/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 license = stdenv.lib.licenses.gpl3Plus;
2626
27− homepage = http://www.gnu.org/software/complexity/;
27+ homepage = https://www.gnu.org/software/complexity/;
2828
2929 platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
3030 maintainers = [ ];
pkgs/development/tools/misc/cppi/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 doCheck = true;
1212
1313 meta = {
14− homepage = http://savannah.gnu.org/projects/cppi/;
14+ homepage = https://savannah.gnu.org/projects/cppi/;
1515
1616 description = "A C preprocessor directive indenter";
1717
pkgs/development/tools/misc/ddd/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 patches = [ ./gcc44.patch ];
1313
1414 meta = {
15− homepage = http://www.gnu.org/software/ddd;
15+ homepage = https://www.gnu.org/software/ddd;
1616 description = "Graphical front-end for command-line debuggers";
1717 license = stdenv.lib.licenses.gpl2;
1818 platforms = stdenv.lib.platforms.linux;
pkgs/development/tools/misc/dejagnu/default.nix+2−2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 # details.
1919
2020 # The test-suite needs to have a non-empty stdin:
21− # http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
21+ # https://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
2222 checkPhase = ''
2323 # Provide `runtest' with a log name, otherwise it tries to run
2424 # `whoami', which fails when in a chroot.
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 Tool command language.
4545 '';
4646
47− homepage = http://www.gnu.org/software/dejagnu/;
47+ homepage = https://www.gnu.org/software/dejagnu/;
4848 license = licenses.gpl2Plus;
4949
5050 platforms = platforms.unix;
pkgs/development/tools/misc/gdb/default.nix+1−1
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
8888 program was doing at the moment it crashed.
8989 '';
9090
91− homepage = http://www.gnu.org/software/gdb/;
91+ homepage = https://www.gnu.org/software/gdb/;
9292
9393 license = stdenv.lib.licenses.gpl3Plus;
9494
pkgs/development/tools/misc/gengetopt/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 fills a struct
2424 '';
2525
26− homepage = http://www.gnu.org/software/gengetopt/;
26+ homepage = https://www.gnu.org/software/gengetopt/;
2727
2828 license = stdenv.lib.licenses.gpl3Plus;
2929
pkgs/development/tools/misc/global/default.nix+1−1
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 independence of any editor. It runs on a UNIX (POSIX) compatible
5252 operating system like GNU and BSD.
5353 '';
54− homepage = http://www.gnu.org/software/global/;
54+ homepage = https://www.gnu.org/software/global/;
5555 license = licenses.gpl3Plus;
5656 maintainers = with maintainers; [ pSub peterhoeg ];
5757 platforms = platforms.unix;
pkgs/development/tools/misc/gnum4/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin stdenv.secure-format-patch;
1717
1818 meta = {
19− homepage = http://www.gnu.org/software/m4/;
19+ homepage = https://www.gnu.org/software/m4/;
2020 description = "GNU M4, a macro processor";
2121
2222 longDescription = ''
pkgs/development/tools/misc/gperf/3.0.x.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 license = stdenv.lib.licenses.gpl3Plus;
2929
30− homepage = http://www.gnu.org/software/gperf/;
30+ homepage = https://www.gnu.org/software/gperf/;
3131 platforms = stdenv.lib.platforms.unix;
3232 };
3333}
pkgs/development/tools/misc/gperf/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 license = stdenv.lib.licenses.gpl3Plus;
2929
30− homepage = http://www.gnu.org/software/gperf/;
30+ homepage = https://www.gnu.org/software/gperf/;
3131 platforms = stdenv.lib.platforms.unix;
3232 };
3333}
pkgs/development/tools/misc/help2man/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 ‘--version’ output of other commands.
3939 '';
4040
41− homepage = http://www.gnu.org/software/help2man/;
41+ homepage = https://www.gnu.org/software/help2man/;
4242
4343 license = licenses.gpl3Plus;
4444 platforms = platforms.all;
pkgs/development/tools/misc/kibana/default.nix+11−4
@@ -18,12 +18,12 @@ let
1818 shas =
1919 if enableUnfree
2020 then {
21− "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
22− "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
21+ "x86_64-linux" = "0lip4bj3jazv83gydw99dnp03cb0fd1p4z3lvpjbisgmqffbbg5v";
22+ "x86_64-darwin" = "0hjdnqagcwbjhpcfyr6w0zmy4sjnx4fyp79czb0vp7dig5arnwm3";
2323 }
2424 else {
25− "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
26− "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
25+ "x86_64-linux" = "1jybn4q7pz61iijzl85d948szlacfcbldn2nhhsb6063xwvf30sa";
26+ "x86_64-darwin" = "1bl1h6hgp9l5cjq6pzj2x855wjaka8hbs0fn2c03lbzsc991dppr";
2727 };
2828
2929 # For the correct phantomjs version see:
@@ -47,6 +47,13 @@ in stdenv.mkDerivation rec {
4747 sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
4848 };
4949
50+ patches = [
51+ # Kibana specifies it specifically needs nodejs 8.11.4 but nodejs in nixpkgs is at 8.12.0.
52+ # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just
53+ # disable the version check.
54+ ./disable-nodejs-version-check.patch
55+ ];
56+
5057 buildInputs = [ makeWrapper ];
5158
5259 installPhase = ''
pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patchnew file+19
@@ -0,0 +1,19 @@
1+diff -Naur a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js
2+--- a/src/setup_node_env/node_version_validator.js 2018-11-16 03:28:42.000000000 +0100
3++++ b/src/setup_node_env/node_version_validator.js 2018-12-01 12:19:48.238337176 +0100
4+@@ -26,7 +26,7 @@
5+ var currentVersion = process && process.version || null;
6+ var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
7+ var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
8+-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion;
9++var isVersionValid = !!currentVersion && !!requiredVersion;
10+
11+ // Validates current the NodeJS version compatibility when Kibana starts.
12+ if (!isVersionValid) {
13+@@ -35,4 +35,4 @@
14+ // Actions to apply when validation fails: error report + exit.
15+ console.error(errorMessage);
16+ process.exit(1);
17+-}
18+\ No newline at end of file
19++}
pkgs/development/tools/misc/libtool/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 documentation for details.
2929 '';
3030
31− homepage = http://www.gnu.org/software/libtool/;
31+ homepage = https://www.gnu.org/software/libtool/;
3232
3333 license = stdenv.lib.licenses.gpl2Plus;
3434 platforms = stdenv.lib.platforms.unix;
pkgs/development/tools/misc/libtool/libtool2.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 documentation for details.
4141 '';
4242
43− homepage = http://www.gnu.org/software/libtool/;
43+ homepage = https://www.gnu.org/software/libtool/;
4444
4545 license = stdenv.lib.licenses.gpl2Plus;
4646
pkgs/development/tools/misc/texi2html/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 meta = {
1414 description = "Perl script which converts Texinfo source files to HTML output";
15− homepage = http://www.nongnu.org/texi2html/;
15+ homepage = https://www.nongnu.org/texi2html/;
1616 license = stdenv.lib.licenses.gpl2;
1717 maintainers = [stdenv.lib.maintainers.marcweber];
1818 platforms = stdenv.lib.platforms.unix;
pkgs/development/tools/misc/texinfo/common.nix+1−1
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 && !stdenv.isSunOS; # flaky
4343
4444 meta = {
45− homepage = http://www.gnu.org/software/texinfo/;
45+ homepage = https://www.gnu.org/software/texinfo/;
4646 description = "The GNU documentation system";
4747 license = licenses.gpl3Plus;
4848 platforms = platforms.all;
pkgs/development/tools/misc/uisp/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 meta = {
1414 description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
1515 license = stdenv.lib.licenses.gpl2;
16− homepage = http://savannah.nongnu.org/projects/uisp;
16+ homepage = https://savannah.nongnu.org/projects/uisp;
1717 platforms = stdenv.lib.platforms.linux;
1818 };
1919}
pkgs/development/tools/parsing/bison/2.x.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 # M4 = "${m4}/bin/m4";
1919
2020 meta = {
21− homepage = http://www.gnu.org/software/bison/;
21+ homepage = https://www.gnu.org/software/bison/;
2222 description = "Yacc-compatible parser generator";
2323 license = stdenv.lib.licenses.gpl3Plus;
2424
pkgs/development/tools/parsing/bison/3.x.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 doInstallCheck = false; # fails
1818
1919 meta = {
20− homepage = http://www.gnu.org/software/bison/;
20+ homepage = https://www.gnu.org/software/bison/;
2121 description = "Yacc-compatible parser generator";
2222 license = stdenv.lib.licenses.gpl3Plus;
2323
pkgs/development/tools/pyre/default.nix+11−15
@@ -3,12 +3,12 @@
33let
44 # Manually set version - the setup script requires
55 # hg and git + keeping the .git directory around.
6− pyre-version = "0.0.17"; # also change typeshed revision below with $pyre-src/.typeshed-version
6+ pyre-version = "0.0.18"; # also change typeshed revision below with $pyre-src/.typeshed-version
77 pyre-src = fetchFromGitHub {
88 owner = "facebook";
99 repo = "pyre-check";
1010 rev = "v${pyre-version}";
11− sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis";
11+ sha256 = "1sy1lk9j3hq20dabfkr9s4r7prrcndrs345a5iqz6yzvakr4r74d";
1212 };
1313 versionFile = writeScript "version.ml" ''
1414 cat > "./version.ml" <<EOF
@@ -21,6 +21,7 @@ let
2121 let log_version_banner () =
2222 Log.info "Running as pid: %d" (Pid.to_int (Unix.getpid ()));
2323 Log.info "Version: %s" (version ());
24+ Log.info "Build info: %s" (build_info ())
2425 EOF
2526 '';
2627 pyre-bin = stdenv.mkDerivation {
@@ -28,8 +29,6 @@ let
2829
2930 src = pyre-src;
3031
31− nativeBuildInputs = [ makeWrapper ];
32−
3332 buildInputs = with ocamlPackages; [
3433 ocaml
3534 findlib
@@ -45,32 +44,29 @@ let
4544 # python36Packages.python36Full # TODO
4645 ];
4746
48− buildPhase = ''
47+ preBuild = ''
4948 # build requires HOME to be set
50− export HOME=.
49+ export HOME=$TMPDIR
5150
5251 # "external" because https://github.com/facebook/pyre-check/pull/8/files
5352 sed "s/%VERSION%/external/" dune.in > dune
5453
55− cp ${versionFile} ./scripts/generate-version-number.sh
54+ ln -sf ${versionFile} ./scripts/generate-version-number.sh
5655
5756 mkdir $(pwd)/build
5857 export OCAMLFIND_DESTDIR=$(pwd)/build
5958 export OCAMLPATH=$OCAMLPATH:$(pwd)/build
60−
61− make release
6259 '';
6360
64− checkPhase = ''
65− make test
66− # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
67− '';
61+ buildFlags = [ "release" ];
62+
63+ doCheck = true;
64+ # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
6865
6966 # Note that we're not installing the typeshed yet.
7067 # Improvement for a future version.
7168 installPhase = ''
72− mkdir -p $out/bin
73− cp ./_build/default/main.exe $out/bin/pyre.bin
69+ install -D ./_build/default/main.exe $out/bin/pyre.bin
7470 '';
7571
7672 meta = with stdenv.lib; {
pkgs/development/tools/quilt/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 '';
1818
1919 meta = {
20− homepage = http://savannah.nongnu.org/projects/quilt;
20+ homepage = https://savannah.nongnu.org/projects/quilt;
2121 description = "Easily manage large numbers of patches";
2222
2323 longDescription = ''
pkgs/development/tools/rust/rustup/default.nix+4−4
@@ -4,16 +4,16 @@
44
55rustPlatform.buildRustPackage rec {
66 name = "rustup-${version}";
7− version = "1.13.0";
7+ version = "1.15.0";
88
99 src = fetchFromGitHub {
10− owner = "rust-lang-nursery";
10+ owner = "rust-lang";
1111 repo = "rustup.rs";
1212 rev = version;
13− sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn";
13+ sha256 = "12d8z53vixrrbhvadw8fgifik0xi3hyfj1s75my8lcqwmij91gkn";
1414 };
1515
16− cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a";
16+ cargoSha256 = "0syp53s285ixshp6yswly0mwkcl0y2ddj5hc110irqsrvwgss32r";
1717
1818 nativeBuildInputs = [ pkgconfig ];
1919
pkgs/development/tools/sunxi-tools/default.nix+4−4
@@ -1,13 +1,13 @@
11{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }:
22
33stdenv.mkDerivation {
4− name = "sunxi-tools-20171130";
4+ name = "sunxi-tools-20181113";
55
66 src = fetchFromGitHub {
77 owner = "linux-sunxi";
88 repo = "sunxi-tools";
9− rev = "5c1971040c6c44caefb98e371bfca9e18d511da9";
10− sha256 = "0qzm515i3dfn82a6sf7372080zb02d365z52bh0b1q711r4dvjgp";
9+ rev = "6d598a0ed714201380e78130213500be6512942b";
10+ sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 installTargets = [ "install-tools" "install-misc" ];
2121
2222 meta = with stdenv.lib; {
23− description = "Tools for Allwinner A10 devices";
23+ description = "Tools for Allwinner SoC devices";
2424 homepage = http://linux-sunxi.org/;
2525 license = licenses.gpl2Plus;
2626 platforms = platforms.linux;
pkgs/development/web/nodejs/nodejs.nix+1−1
@@ -101,7 +101,7 @@ in
101101 '';
102102
103103 passthru.updateScript = import ./update.nix {
104− inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
104+ inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
105105 inherit (stdenv) lib;
106106 majorVersion = with stdenv.lib; elemAt (splitString "." version) 0;
107107 };
pkgs/development/web/nodejs/update.nix+3−1
@@ -1,4 +1,5 @@
1−{ lib
1+{ stdenv
2+, lib
23, writeScript
34, coreutils
45, curl
@@ -11,6 +12,7 @@
1112}:
1213
1314writeScript "update-nodejs" ''
15+ #!${stdenv.shell}
1416 PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]}
1517
1618 HOME=`mktemp -d`
pkgs/games/ball-and-paddle/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 license = stdenv.lib.licenses.gpl3Plus;
3535
36− homepage = http://www.gnu.org/software/ballandpaddle/;
36+ homepage = https://www.gnu.org/software/ballandpaddle/;
3737
3838 maintainers = [ ];
3939
pkgs/games/crack-attack/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323
2424 meta = {
2525 description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!";
26− homepage = http://www.nongnu.org/crack-attack/;
26+ homepage = https://www.nongnu.org/crack-attack/;
2727 license = stdenv.lib.licenses.gpl2;
2828 platforms = stdenv.lib.platforms.linux;
2929 maintainers = [ stdenv.lib.maintainers.piotr ];
pkgs/games/cuyo/default.nix+1−1
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
55 version = "2.1.0";
66
77 src = fetchurl {
8− url = http://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz;
8+ url = https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz;
99 sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c";
1010 };
1111
pkgs/games/gltron/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 patches = [ ./gentoo-prototypes.patch ];
1111
1212 postPatch = ''
13− # Fix http://sourceforge.net/p/gltron/bugs/15
13+ # Fix https://sourceforge.net/p/gltron/bugs/15
1414 sed -i /__USE_MISC/d lua/src/lib/liolib.c
1515 '';
1616
pkgs/games/gnuchess/default.upstream+1−1
@@ -1 +1 @@
1−url http://ftp.gnu.org/gnu/chess/
1+url https://ftp.gnu.org/gnu/chess/
pkgs/games/gnugo/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 meta = {
1515 description = "GNU Go - A computer go player";
16− homepage = http://www.gnu.org/software/gnugo/;
16+ homepage = https://www.gnu.org/software/gnugo/;
1717 license = stdenv.lib.licenses.gpl3;
1818 platforms = stdenv.lib.platforms.unix;
1919 };
pkgs/games/gtypist/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 '';
1919
2020 meta = with stdenv.lib; {
21− homepage = http://www.gnu.org/software/gtypist;
21+ homepage = https://www.gnu.org/software/gtypist;
2222 description = "Universal typing tutor";
2323 license = licenses.gpl3Plus;
2424 platforms = platforms.linux ++ platforms.darwin;
pkgs/games/liquidwar/5.nix+1−1
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
33 version = "5.6.4";
44 name = "liquidwar5-${version}";
55 src = fetchurl {
6− url = "http://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
6+ url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
77 sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
88 };
99
pkgs/games/liquidwar/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434
3535 meta = with stdenv.lib; {
3636 description = "Quick tactics game";
37− homepage = http://www.gnu.org/software/liquidwar6/;
37+ homepage = https://www.gnu.org/software/liquidwar6/;
3838 maintainers = [ maintainers.raskin ];
3939 license = licenses.gpl3Plus;
4040 platforms = platforms.linux;
pkgs/games/minecraft/default.nix+7−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeDesktopItem, makeWrapper
2−, jdk, jre, libpulseaudio
2+, jdk, jre, libpulseaudio, libXxf86vm
33}:
44
55let
@@ -13,6 +13,11 @@ let
1313 categories = "Game;";
1414 };
1515
16+ libPath = stdenv.lib.makeLibraryPath [
17+ libpulseaudio
18+ libXxf86vm # Needed only for versions <1.13
19+ ];
20+
1621in stdenv.mkDerivation {
1722 name = "minecraft-2015-07-24";
1823
@@ -30,7 +35,7 @@ in stdenv.mkDerivation {
3035
3136 makeWrapper ${jre}/bin/java $out/bin/minecraft \
3237 --add-flags "-jar $out/share/minecraft/minecraft.jar" \
33− --suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]}
38+ --suffix LD_LIBRARY_PATH : ${libPath}
3439
3540 cp $src $out/share/minecraft/minecraft.jar
3641 cp -r ${desktopItem}/share/applications $out/share
pkgs/games/quantumminigolf/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/quantumminigolf/files/quantumminigolf/
1+url https://sourceforge.net/projects/quantumminigolf/files/quantumminigolf/
22SF_version_dir
33version_link '[.]tar[.][^.]+/download$'
44SF_redirect
pkgs/games/soi/default.nix+1−1
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
2323 maintainers = with maintainers; [ raskin ];
2424 platforms = platforms.linux;
2525 license = licenses.free;
26− downloadPage = http://sourceforge.net/projects/soi/files/;
26+ downloadPage = https://sourceforge.net/projects/soi/files/;
2727 };
2828}
pkgs/games/tinyfugue/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 with any type of text MUD.
3232 '';
3333 license = licenses.gpl2;
34− platforms = ncurses.meta.platforms;
34+ platforms = platforms.linux;
3535 maintainers = [ maintainers.KibaFox ];
3636 };
3737}
pkgs/games/xboard/default.nix+4−3
@@ -9,12 +9,12 @@ let
99 version="4.9.1";
1010 name="${baseName}-${version}";
1111 hash="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
12− url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz";
12+ url="https://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz";
1313 sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
1414 };
1515 buildInputs = [
16− libX11 xproto libXt libXaw libSM libICE libXmu
17− libXext gnuchess texinfo libXpm pkgconfig librsvg
16+ libX11 xproto libXt libXaw libSM libICE libXmu
17+ libXext gnuchess texinfo libXpm pkgconfig librsvg
1818 cairo pango gtk2
1919 ];
2020in
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
2727 meta = {
2828 inherit (s) version;
2929 description = ''GUI for chess engines'';
30+ homepage = https://www.gnu.org/software/xboard/;
3031 maintainers = [stdenv.lib.maintainers.raskin];
3132 platforms = stdenv.lib.platforms.unix;
3233 license = stdenv.lib.licenses.gpl3Plus;
pkgs/games/xboard/default.upstream+1−1
@@ -1 +1 @@
1−url http://ftp.gnu.org/gnu/xboard/
1+url https://ftp.gnu.org/gnu/xboard/
pkgs/misc/logging/beats/6.x.nix+9−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap }:
1+{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
22
33let beat = package : extraArgs : buildGoPackage (rec {
44 name = "${package}-${version}";
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
88 owner = "elastic";
99 repo = "beats";
1010 rev = "v${version}";
11− sha256 = "0ymg6y6v0mdhs1rs11fn33xdp3r6v85563z0f4p7s22j1kd3nd6r";
11+ sha256 = "1qnrq9bhk7csgcxycb8c7975lq0p7cxw29i6sji777zv4hn7442m";
1212 };
1313
1414 goPackagePath = "github.com/elastic/beats";
@@ -39,4 +39,11 @@ in {
3939 PostgreSQL, Redis or Thrift and correlate the messages into transactions.
4040 '';
4141 };
42+ journalbeat6 = beat "journalbeat" {
43+ meta.description = ''
44+ Journalbeat is an open source data collector to read and forward
45+ journal entries from Linuxes with systemd.
46+ '';
47+ buildInputs = [ systemd.dev ];
48+ };
4249}
pkgs/misc/vscode-extensions/default.nix+2
@@ -26,4 +26,6 @@ rec {
2626 ms-vscode.cpptools = callPackage ./cpptools {};
2727
2828 ms-python.python = callPackage ./python {};
29+
30+ WakaTime.vscode-wakatime = callPackage ./wakatime {};
2931}
pkgs/misc/vscode-extensions/vscode-utils.nix+6−6
@@ -65,10 +65,10 @@ let
6565 "sha256"
6666 ];
6767
68− mktplcExtRefToExtDrv = ext:
69− buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // {
70− mktplcRef = ext;
71− });
68+ mktplcExtRefToExtDrv = ext:
69+ buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // {
70+ mktplcRef = ext;
71+ });
7272
7373 extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;
7474 extensionsFromVscodeMarketplace = mktplcExtRefList:
@@ -77,7 +77,7 @@ let
7777in
7878
7979{
80− inherit fetchVsixFromVscodeMarketplace buildVscodeExtension
80+ inherit fetchVsixFromVscodeMarketplace buildVscodeExtension
8181 buildVscodeMarketplaceExtension extensionFromVscodeMarketplace
8282 extensionsFromVscodeMarketplace;
83−}
83+}
pkgs/misc/vscode-extensions/wakatime/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, wakatime, vscode-utils }:
2+
3+let
4+ inherit (vscode-utils) buildVscodeMarketplaceExtension;
5+in
6+ buildVscodeMarketplaceExtension {
7+ mktplcRef = {
8+ name = "vscode-wakatime";
9+ publisher = "WakaTime";
10+ version = "1.2.3";
11+ sha256 = "1n7bxkwgpip11k6d7zc3ifp9zb6p7f27f4x4g584wisrnfnqj1bp";
12+ };
13+
14+ postPatch = ''
15+ mkdir -p out/wakatime-master
16+
17+ cp -rt out/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
18+ '';
19+
20+ meta = with stdenv.lib; {
21+ description = ''
22+ Visual Studio Code plugin for automatic time tracking and metrics generated
23+ from your programming activity
24+ '';
25+ license = licenses.bsd3;
26+ maintainers = with maintainers; [
27+ eadwu
28+ ];
29+ };
30+ }
pkgs/os-specific/linux/apparmor/default.nix−5
@@ -37,11 +37,6 @@ let
3737 '';
3838
3939 patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
40− (fetchpatch {
41− url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
42− name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";
43− sha256 = "0pj1bzifghxwxlc39j8hyy17dkjr9fk64kkj94ayymyprz4i4nac";
44− })
4540 (fetchpatch {
4641 url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
4742 name = "0003-Added-missing-typedef-definitions-on-parser.patch";
pkgs/os-specific/linux/conspy/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/conspy/files/
1+url https://sourceforge.net/projects/conspy/files/
22version_link 'conspy-[-0-9.]+/$'
33version_link '[-0-9.]+[.]tar[.][a-z0-9]+/download$'
44SF_redirect
pkgs/os-specific/linux/dmidecode/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 makeFlags = "prefix=$(out)";
1212
1313 meta = with stdenv.lib; {
14− homepage = http://www.nongnu.org/dmidecode/;
14+ homepage = https://www.nongnu.org/dmidecode/;
1515 description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard";
1616 license = licenses.gpl2Plus;
1717 platforms = platforms.linux;
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.14.84";
6+ version = "4.14.85";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "0653fg6p0wg81i4mj8n4lghn8h8jx3pkbyp6sm22p2b1rwpgj893";
16+ sha256 = "1kpgdwf8rcw913dfgj9c6wcvc4z54m756s2fplczm86v2gs186g4";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.18.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
2−
3−with stdenv.lib;
4−
5−buildLinux (args // rec {
6− version = "4.18.20";
7−
8− # modDirVersion needs to be x.y.z, will automatically add .0 if needed
9− modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
10−
11− # branchVersion needs to be x.y
12− extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
13−
14− src = fetchurl {
15− url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "0lzn2w8zagqk3sp6jsp155xggm1c277xjh8m0nvddvdp1yg33b38";
17− };
18−} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.19.5";
6+ version = "4.19.6";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "0xggarlff54l9zxm5qr14nzd514xxg8i1akyxzlb0znfkk19x0wc";
16+ sha256 = "1hq9iyx2k6ff6yxsgkd4xvk5al3jw5nxk49zq72w04b2nsz62kk4";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.4.165";
4+ version = "4.4.166";
55 extraMeta.branch = "4.4";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "19zmigb1avq63n0cbvsqaw9ygddwx13mrvl80p92abw7ns26b2va";
9+ sha256 = "0nj1wvsf1c843hp9ww68gpwsjdviax67dpffafsq78ask7yyy45z";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.9.141";
4+ version = "4.9.142";
55 extraMeta.branch = "4.9";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "09mc5sxzzxmks20vslimaaaw0aamjcc3lvpyjydmr78s25q5zfsp";
9+ sha256 = "01n4v0gpf8xyz8hzc70mhjha7kanz9pv248ypsmab7zpzgd7wjil";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-libre.nix+2−2
@@ -1,8 +1,8 @@
11{ stdenv, lib, fetchsvn, linux
22, scripts ? fetchsvn {
33 url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
4− rev = "15295";
5− sha256 = "03kqbjy7w9zg6ry86h9sxa33z0rblznhba109lwmjwy0wx7yk1cs";
4+ rev = "15715";
5+ sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
66 }
77, ...
88}:
pkgs/os-specific/linux/kmod/darwin.patchnew file+123
@@ -0,0 +1,123 @@
1+diff --git a/Makefile.am b/Makefile.am
2+index 194e111..0a095b5 100644
3+--- a/Makefile.am
4++++ b/Makefile.am
5+@@ -80,8 +80,7 @@ EXTRA_DIST += libkmod/README \
6+ libkmod/COPYING testsuite/COPYING tools/COPYING COPYING
7+
8+ libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
9+- -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
10+- -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
11++ -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE)
12+ libkmod_libkmod_la_DEPENDENCIES = \
13+ shared/libshared.la \
14+ ${top_srcdir}/libkmod/libkmod.sym
15+@@ -91,8 +90,7 @@ libkmod_libkmod_la_LIBADD = \
16+
17+ noinst_LTLIBRARIES += libkmod/libkmod-internal.la
18+ libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
19+-libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
20+- -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
21++libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS)
22+ libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES)
23+ libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
24+
25+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
26+index 889f264..6f0a285 100644
27+--- a/libkmod/libkmod-module.c
28++++ b/libkmod/libkmod-module.c
29+@@ -787,7 +787,11 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod,
30+ flags &= KMOD_REMOVE_FORCE;
31+ flags |= KMOD_REMOVE_NOWAIT;
32+
33++#if defined(__linux__)
34+ err = delete_module(mod->name, flags);
35++#else
36++ err = -1;
37++#endif
38+ if (err != 0) {
39+ err = -errno;
40+ ERR(mod->ctx, "could not remove '%s': %m\n", mod->name);
41+@@ -879,7 +883,11 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
42+ }
43+ size = kmod_file_get_size(mod->file);
44+
45++#if defined(__linux__)
46+ err = init_module(mem, size, args);
47++#else
48++ err = -1;
49++#endif
50+ init_finished:
51+ if (err < 0) {
52+ err = -errno;
53+diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
54+index 429ffbd..17a3b9c 100644
55+--- a/libkmod/libkmod-signature.c
56++++ b/libkmod/libkmod-signature.c
57+@@ -17,7 +17,10 @@
58+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
59+ */
60+
61++#if defined(__linux__)
62+ #include <endian.h>
63++#endif
64++
65+ #include <inttypes.h>
66+ #include <stdio.h>
67+ #include <stdlib.h>
68+diff --git a/shared/macro.h b/shared/macro.h
69+index 4fc5405..b5a2702 100644
70+--- a/shared/macro.h
71++++ b/shared/macro.h
72+@@ -71,3 +71,7 @@
73+ #endif
74+
75+ #define UNIQ __COUNTER__
76++
77++ #if !defined(__linux__)
78++#define program_invocation_short_name getprogname()
79++#endif
80+diff --git a/shared/missing.h b/shared/missing.h
81+index 4c0d136..ad8ec0f 100644
82+--- a/shared/missing.h
83++++ b/shared/missing.h
84+@@ -45,6 +45,9 @@ static inline int finit_module(int fd, const char *uargs, int flags)
85+ #endif
86+
87+ #if !HAVE_DECL_BE32TOH
88++
89++#if defined(__linux__)
90++
91+ #include <endian.h>
92+ #include <byteswap.h>
93+ #if __BYTE_ORDER == __LITTLE_ENDIAN
94+@@ -52,4 +55,16 @@ static inline int finit_module(int fd, const char *uargs, int flags)
95+ #else
96+ #define be32toh(x) (x)
97+ #endif
98++
99++#elif defined(__APPLE__)
100++
101++#include <libkern/OSByteOrder.h>
102++#define be32toh(x) OSSwapBigToHostInt32(x)
103++
104++#else
105++
106++#error No be32toh known for platform
107++
108++#endif
109++
110+ #endif
111+diff --git a/shared/util.c b/shared/util.c
112+index fd2028d..ecb0141 100644
113+--- a/shared/util.c
114++++ b/shared/util.c
115+@@ -367,7 +367,7 @@ char *path_make_absolute_cwd(const char *p)
116+ if (path_is_absolute(p))
117+ return strdup(p);
118+
119+- cwd = get_current_dir_name();
120++ cwd = getcwd(NULL, 0);
121+ if (!cwd)
122+ return NULL;
123+
pkgs/os-specific/linux/kmod/default.nix+6−4
@@ -1,4 +1,5 @@
1−{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }:
1+{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig
2+, libxslt, xz, elf-header }:
23
34let
45 systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];
@@ -14,7 +15,7 @@ in stdenv.mkDerivation rec {
1415 };
1516
1617 nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
17− buildInputs = [ xz ];
18+ buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header;
1819
1920 configureFlags = [
2021 "--sysconfdir=/etc"
@@ -22,7 +23,8 @@ in stdenv.mkDerivation rec {
2223 "--with-modulesdirs=${modulesDirs}"
2324 ];
2425
25− patches = [ ./module-dir.patch ];
26+ patches = [ ./module-dir.patch ]
27+ ++ lib.optional stdenv.isDarwin ./darwin.patch;
2628
2729 postInstall = ''
2830 for prog in rmmod insmod lsmod modinfo modprobe depmod; do
@@ -37,6 +39,6 @@ in stdenv.mkDerivation rec {
3739 homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/;
3840 description = "Tools for loading and managing Linux kernel modules";
3941 license = licenses.lgpl21;
40− platforms = platforms.linux;
42+ platforms = platforms.unix;
4143 };
4244}
pkgs/os-specific/linux/lm-sensors/default.nix+9−15
@@ -1,28 +1,22 @@
1−{ sensord ? false,
2− stdenv, fetchurl, bison, flex, which, perl,
3− rrdtool ? null
1+{ stdenv, fetchzip, bison, flex, which, perl
2+, sensord ? false, rrdtool ? null
43}:
54
65assert sensord -> rrdtool != null;
76
87stdenv.mkDerivation rec {
98 name = "lm-sensors-${version}";
10− version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash
9+ version = "3.5.0";
1110
12− src = fetchurl {
13− urls = [
14− # "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" # dead
15− # https://github.com/lm-sensors/lm-sensors/releases/... # only generated tarballs
16− "https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
17− ];
18− sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0";
11+ src = fetchzip {
12+ url = "https://github.com/lm-sensors/lm-sensors/archive/V${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
13+ sha256 = "1mdrnb9r01z1xfdm6dpkywvf9yy9a4yzb59paih9sijwmigv19fj";
1914 };
2015
21− buildInputs = [ bison flex which perl ]
16+ nativeBuildInputs = [ bison flex which ];
17+ buildInputs = [ perl ]
2218 ++ stdenv.lib.optional sensord rrdtool;
2319
24− patches = [ ./musl-fix-includes.patch ];
25−
2620 preBuild = ''
2721 makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc
2822 ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})
@@ -31,7 +25,7 @@ stdenv.mkDerivation rec {
3125 meta = with stdenv.lib; {
3226 homepage = https://hwmon.wiki.kernel.org/lm_sensors;
3327 description = "Tools for reading hardware sensors";
34− license = with licenses; [ gpl2 lgpl21 ];
28+ license = with licenses; [ gpl2Plus lgpl21Plus ];
3529 platforms = platforms.linux;
3630 };
3731}
pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patchdeleted−62
@@ -1,62 +0,0 @@
1−--- lm_sensors-3.3.4.orig/prog/dump/isadump.c
2−+++ lm_sensors-3.3.4/prog/dump/isadump.c
3−@@ -36,13 +36,7 @@
4− #include "util.h"
5− #include "superio.h"
6−
7−-
8−-/* To keep glibc2 happy */
9−-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
10− #include <sys/io.h>
11−-#else
12−-#include <asm/io.h>
13−-#endif
14−
15− #ifdef __powerpc__
16− unsigned long isa_io_base = 0; /* XXX for now */
17−--- lm_sensors-3.3.4.orig/prog/dump/isaset.c
18−+++ lm_sensors-3.3.4/prog/dump/isaset.c
19−@@ -32,13 +32,7 @@
20− #include <string.h>
21− #include "util.h"
22−
23−-
24−-/* To keep glibc2 happy */
25−-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
26− #include <sys/io.h>
27−-#else
28−-#include <asm/io.h>
29−-#endif
30−
31− #ifdef __powerpc__
32− unsigned long isa_io_base = 0; /* XXX for now */
33−--- lm_sensors-3.3.4.orig/prog/dump/superio.c
34−+++ lm_sensors-3.3.4/prog/dump/superio.c
35−@@ -20,12 +20,7 @@
36− */
37−
38− #include <stdlib.h>
39−-
40−-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
41− #include <sys/io.h>
42−-#else
43−-#include <asm/io.h>
44−-#endif
45−
46− #include "superio.h"
47−
48−--- lm_sensors-3.3.4.orig/prog/dump/util.c
49−+++ lm_sensors-3.3.4/prog/dump/util.c
50−@@ -11,12 +11,7 @@
51− #include <stdio.h>
52− #include "util.h"
53−
54−-/* To keep glibc2 happy */
55−-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
56− #include <sys/io.h>
57−-#else
58−-#include <asm/io.h>
59−-#endif
60−
61− /* Return 1 if we should continue, 0 if we should abort */
62− int user_ack(int def)
pkgs/os-specific/linux/nvidia-x11/default.nix+1
@@ -75,5 +75,6 @@ rec {
7575 '';
7676 in applyPatches [ "fix-typos" ];
7777 patches = maybePatch_drm_legacy;
78+ broken = stdenv.lib.versionAtLeast kernel.version "4.18";
7879 };
7980}
pkgs/os-specific/linux/nvidia-x11/generic.nix+2
@@ -10,6 +10,7 @@
1010
1111, prePatch ? ""
1212, patches ? []
13+, broken ? false
1314}:
1415
1516{ stdenv, callPackage, pkgsi686Linux, fetchurl
@@ -91,6 +92,7 @@ let
9192 platforms = [ "i686-linux" "x86_64-linux" ];
9293 maintainers = [ maintainers.vcunat ];
9394 priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
95+ inherit broken;
9496 };
9597 };
9698
pkgs/os-specific/linux/sysvinit/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
3737 '';
3838
3939 meta = {
40− homepage = http://www.nongnu.org/sysvinit/;
40+ homepage = https://www.nongnu.org/sysvinit/;
4141 description = "Utilities related to booting and shutdown";
4242 platforms = stdenv.lib.platforms.linux;
4343 license = stdenv.lib.licenses.gpl2Plus;
pkgs/os-specific/linux/tp_smapi/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 enableParallelBuilding = true;
3535
3636 passthru.updateScript = import ./update.nix {
37− inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts;
37+ inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts;
3838 };
3939
4040 meta = {
pkgs/os-specific/linux/tp_smapi/update.nix+2−1
@@ -1,6 +1,7 @@
1−{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }:
1+{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }:
22
33writeScript "update-tp_smapi" ''
4+#!${stdenv.shell}
45PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]}
56
67tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags`
pkgs/os-specific/linux/usbutils/default.nix+9−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libusb1, hwdata }:
1+{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata }:
22
33stdenv.mkDerivation rec {
44 name = "usbutils-010";
@@ -8,14 +8,15 @@ stdenv.mkDerivation rec {
88 sha256 = "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ libusb1 ];
11+ patches = [
12+ (substituteAll {
13+ src = ./fix-paths.patch;
14+ inherit hwdata;
15+ })
16+ ];
1317
14− postInstall =
15− ''
16− substituteInPlace $out/bin/lsusb.py \
17− --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids
18− '';
18+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
19+ buildInputs = [ libusb1 ];
1920
2021 meta = with stdenv.lib; {
2122 homepage = http://www.linux-usb.org/;
pkgs/os-specific/linux/usbutils/fix-paths.patchnew file+16
@@ -0,0 +1,16 @@
1+--- a/Makefile.am
2++++ b/Makefile.am
3+@@ -51,11 +51,11 @@
4+ usbreset.c
5+
6+ lsusb.py: $(srcdir)/lsusb.py.in
7+- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
8++ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@
9+ chmod 755 $@
10+
11+ lsusb.8: $(srcdir)/lsusb.8.in
12+- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
13++ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@
14+
15+ usb-devices.1: $(srcdir)/usb-devices.1.in
16+ sed 's|VERSION|$(VERSION)|g' $< >$@
pkgs/servers/dico/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 meta = with stdenv.lib; {
2626 description = "Flexible dictionary server and client implementing RFC 2229";
27− homepage = http://www.gnu.org/software/dico/;
27+ homepage = https://www.gnu.org/software/dico/;
2828 license = licenses.gpl3Plus;
2929 maintainers = with maintainers; [ lovek323 ];
3030 platforms = platforms.linux;
pkgs/servers/dict/dictd-db.nix+3−3
@@ -29,15 +29,15 @@ let
2929 };
3030in rec {
3131 deu2eng = makeDictdDBFreedict (fetchurl {
32− url = http://prdownloads.sourceforge.net/freedict/deu-eng.tar.gz;
32+ url = mirror://sourceforge/freedict/deu-eng.tar.gz;
3333 sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb";
3434 }) "deu-eng" "de_DE";
3535 eng2deu = makeDictdDBFreedict (fetchurl {
36− url = http://prdownloads.sourceforge.net/freedict/eng-deu.tar.gz;
36+ url = mirror://sourceforge/freedict/eng-deu.tar.gz;
3737 sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r";
3838 }) "eng-deu" "en_EN";
3939 nld2eng = makeDictdDBFreedict (fetchurl {
40− url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz;
40+ url = mirror://sourceforge/freedict/nld-eng.tar.gz;
4141 sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";
4242 }) "nld-eng" "nl_NL";
4343 eng2nld = makeDictdDBFreedict (fetchurl {
pkgs/servers/http/myserver/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 built-in features. Share your files in minutes!
4141 '';
4242
43− homepage = http://www.gnu.org/software/myserver/;
43+ homepage = https://www.gnu.org/software/myserver/;
4444
4545 license = lib.licenses.gpl3Plus;
4646
pkgs/servers/mail/mailman/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 makeFlags = [ "DIRSETGID=:" ];
2525
2626 meta = {
27− homepage = http://www.gnu.org/software/mailman/;
27+ homepage = https://www.gnu.org/software/mailman/;
2828 description = "Free software for managing electronic mail discussion and e-newsletter lists";
2929 license = stdenv.lib.licenses.gpl2Plus;
3030 platforms = stdenv.lib.platforms.linux;
pkgs/servers/mail/postfix/default.nix+4−4
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
2−, coreutils, findutils, gnugrep, gawk, icu, pcre
2+, coreutils, findutils, gnugrep, gawk, icu, pcre, m4
33, withLDAP ? true, openldap
44, withPgSQL ? false, postgresql
55, withMySQL ? false, mysql
@@ -25,14 +25,14 @@ in stdenv.mkDerivation rec {
2525
2626 name = "postfix-${version}";
2727
28− version = "3.3.1";
28+ version = "3.3.2";
2929
3030 src = fetchurl {
3131 url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
32− sha256 = "0fvymsklp32njsv0ngc1f45j01kcy61r5in99g5palibwkd19xal";
32+ sha256 = "0nxkszdgs6fs86j6w1lf3vhxvjh1hw2jmrii5icqx9a9xqgg74rw";
3333 };
3434
35− nativeBuildInputs = [ makeWrapper ];
35+ nativeBuildInputs = [ makeWrapper m4 ];
3636 buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
3737 ++ lib.optional withPgSQL postgresql
3838 ++ lib.optional withMySQL mysql.connector-c
pkgs/servers/mail/rspamd/default.nix+23−8
@@ -1,22 +1,34 @@
1−{ stdenv, fetchFromGitHub, cmake, perl
2−, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu, libfann }:
1+{ stdenv, lib, fetchFromGitHub, cmake, perl
2+, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
3+, hyperscan, libfann, gd, jemalloc, openblas
4+, withFann ? true
5+, withGd ? false
6+, withBlas ? true
7+, withHyperscan ? stdenv.isx86_64
8+}:
9+
10+assert withHyperscan -> stdenv.isx86_64;
311
412let libmagic = file; # libmagic provided by file package ATM
513in
614
715stdenv.mkDerivation rec {
816 name = "rspamd-${version}";
9− version = "1.8.1";
17+ version = "1.8.2";
1018
1119 src = fetchFromGitHub {
12− owner = "vstakhov";
20+ owner = "rspamd";
1321 repo = "rspamd";
1422 rev = version;
15− sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld";
23+ sha256 = "0al4d8h3ssxcx191d4crywz7dsp61lklc9m5z36a90a8w97v76bv";
1624 };
1725
1826 nativeBuildInputs = [ cmake pkgconfig perl ];
19− buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann ];
27+ buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ]
28+ ++ lib.optional withFann libfann
29+ ++ lib.optional withGd gd
30+ ++ lib.optional withHyperscan hyperscan
31+ ++ lib.optional withBlas openblas;
2032
2133 cmakeFlags = [
2234 "-DDEBIAN_BUILD=ON"
@@ -24,10 +36,13 @@ stdenv.mkDerivation rec {
2436 "-DDBDIR=/var/lib/rspamd"
2537 "-DLOGDIR=/var/log/rspamd"
2638 "-DLOCAL_CONFDIR=/etc/rspamd"
27− ];
39+ "-DENABLE_JEMALLOC=ON"
40+ ] ++ lib.optional withFann "-DENABLE_FANN=ON"
41+ ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
42+ ++ lib.optional withGd "-DENABLE_GD=ON";
2843
2944 meta = with stdenv.lib; {
30− homepage = https://github.com/vstakhov/rspamd;
45+ homepage = https://rspamd.com;
3146 license = licenses.asl20;
3247 description = "Advanced spam filtering system";
3348 maintainers = with maintainers; [ avnik fpletz ];
pkgs/servers/mpd/default.nix+2−2
@@ -36,7 +36,7 @@ let
3636 opt = stdenv.lib.optional;
3737 mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
3838 major = "0.20";
39− minor = "21";
39+ minor = "23";
4040
4141in stdenv.mkDerivation rec {
4242 name = "mpd-${version}";
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
4646 owner = "MusicPlayerDaemon";
4747 repo = "MPD";
4848 rev = "v${version}";
49− sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3";
49+ sha256 = "1z1pdgiddimnmck0ardrpxkvgk1wn9zxri5wfv5ppasbb7kfm350";
5050 };
5151
5252 patches = [ ./x86.patch ];
pkgs/servers/p910nd/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 this protocol and the syntax is lp=remotehost%9100 in /etc/printcap.
3838 '';
3939 homepage = http://p910nd.sourceforge.net/;
40− downloadPage = http://sourceforge.net/projects/p910nd/;
40+ downloadPage = https://sourceforge.net/projects/p910nd/;
4141 license = licenses.gpl2;
4242 platforms = platforms.linux;
4343 };
pkgs/servers/pies/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040
4141 license = stdenv.lib.licenses.gpl3Plus;
4242
43− homepage = http://www.gnu.org/software/pies/;
43+ homepage = https://www.gnu.org/software/pies/;
4444
4545 platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
4646 maintainers = [ ];
pkgs/servers/quagga/default.nix+1−1
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
6565 It is more than a routed replacement, it can be used as a Route Server and
6666 a Route Reflector.
6767 '';
68− homepage = http://www.nongnu.org/quagga/;
68+ homepage = https://www.nongnu.org/quagga/;
6969 license = licenses.gpl2;
7070 platforms = platforms.unix;
7171 maintainers = with maintainers; [ tavyc ];
pkgs/servers/search/elasticsearch/default.nix+10−4
@@ -19,14 +19,20 @@ stdenv.mkDerivation (rec {
1919 url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
2020 sha256 =
2121 if enableUnfree
22− then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh"
23− else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4";
22+ then "096i8xiy7mfwlslym9mkjb2f5vqdcqhk65583526rcybqxc2zkqp"
23+ else "0j3q02c4rw8272w07hm64sk5ssmj4gj8s3qigsbrq5pgf8b03fvs";
2424 };
2525
2626 patches = [ ./es-home-6.x.patch ];
2727
2828 postPatch = ''
29− sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
29+ substituteInPlace bin/elasticsearch-env --replace \
30+ "ES_CLASSPATH=\"\$ES_HOME/lib/\*\"" \
31+ "ES_CLASSPATH=\"$out/lib/*\""
32+
33+ substituteInPlace bin/elasticsearch-cli --replace \
34+ "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"" \
35+ "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\""
3036 '';
3137
3238 buildInputs = [ makeWrapper jre_headless utillinux ]
@@ -58,7 +64,7 @@ stdenv.mkDerivation (rec {
5864 nativeBuildInputs = [ autoPatchelfHook ];
5965 runtimeDependencies = [ zlib ];
6066 postFixup = ''
61− for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
67+ for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
6268 echo "patching $exe..."
6369 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
6470 done
pkgs/servers/search/elasticsearch/plugins.nix+4−4
@@ -27,7 +27,7 @@ in {
2727 version = "${elk6Version}";
2828 src = fetchurl {
2929 url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip";
30− sha256 = "1m4z05wixjrq4nlbdjyhvprkrwxjym8aba18scmzfn25fhbjgvkz";
30+ sha256 = "0299ldqwjn1gn44yyjiqjrxvs6mlclhzl1dbn6xlgg1a2lkaal4v";
3131 };
3232 meta = with stdenv.lib; {
3333 homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen;
@@ -42,7 +42,7 @@ in {
4242 version = "${elk6Version}";
4343 src = pkgs.fetchurl {
4444 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip";
45− sha256 = "1i7ksy69132sr84h51lamgq967yz3a3dw0b54nckxpqwad9pcpj0";
45+ sha256 = "1mg9knbc4r21kaiqnmkd8nzf2i23w5zxqnxyz484q0l2jf4hlkq1";
4646 };
4747 meta = with stdenv.lib; {
4848 homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2;
@@ -54,10 +54,10 @@ in {
5454 search_guard = esPlugin rec {
5555 name = "elastic-search-guard-${version}";
5656 pluginName = "search-guard";
57− version = "${elk6Version}-22.3";
57+ version = "${elk6Version}-23.2";
5858 src = fetchurl rec {
5959 url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip";
60− sha256 = "1r71h4h9bmxak1mq5gpm19xq5ji1gry1kp3sjmm8azy4ykdqdncx";
60+ sha256 = "05310wyxzhylxr0dfgzr10pb0pak30ry8r97g49n6iqj8dw3csnb";
6161 };
6262 meta = with stdenv.lib; {
6363 homepage = https://github.com/floragunncom/search-guard;
pkgs/servers/shishi/default.nix+1−1
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
7272 '';
7373
7474 meta = {
75− homepage = http://www.gnu.org/software/shishi/;
75+ homepage = https://www.gnu.org/software/shishi/;
7676 description = "An implementation of the Kerberos 5 network security system";
7777 license = licenses.gpl3Plus;
7878 maintainers = with maintainers; [ bjg lovek323 wkennington ];
pkgs/servers/sip/sipwitch/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 meta = {
2121 description = "Secure peer-to-peer VoIP server that uses the SIP protocol";
22− homepage = http://www.gnu.org/software/sipwitch/;
22+ homepage = https://www.gnu.org/software/sipwitch/;
2323 license = stdenv.lib.licenses.gpl3Plus;
2424 maintainers = with stdenv.lib.maintainers; [ ];
2525 platforms = with stdenv.lib.platforms; linux;
pkgs/servers/trezord/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "trezord-go-${version}";
5− version = "2.0.24";
5+ version = "2.0.25";
66
77 # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
88 hardeningDisable = [ "fortify" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
1313 owner = "trezor";
1414 repo = "trezord-go";
1515 rev = "v${version}";
16− sha256 = "1fl2d57qqrrwl995w4b2d57rvl2cxxy6afjmcp648hhb3dnmp7c3";
16+ sha256 = "151szgfbikijpwqrvqj43kw38kbbgx2g1khlbj6l4925qba7fycd";
1717 };
1818
1919 meta = with stdenv.lib; {
pkgs/shells/bash/4.4.nix+1−1
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
106106 '';
107107
108108 meta = with stdenv.lib; {
109− homepage = http://www.gnu.org/software/bash/;
109+ homepage = https://www.gnu.org/software/bash/;
110110 description =
111111 "GNU Bourne-Again Shell, the de facto standard shell on Linux" +
112112 (if interactive then " (for interactive use)" else "");
pkgs/shells/rush/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 sftp-server or scp, that lack this ability.
3232 '';
3333
34− homepage = http://www.gnu.org/software/rush/;
34+ homepage = https://www.gnu.org/software/rush/;
3535 license = stdenv.lib.licenses.gpl3Plus;
3636
3737 maintainers = [ stdenv.lib.maintainers.bjg ];
pkgs/shells/zsh/antibody/default.nix+5−6
@@ -2,24 +2,23 @@
22
33buildGoPackage rec {
44 name = "antibody-${version}";
5− version = "4.0.0";
6− rev = "v${version}";
5+ version = "4.0.2";
76
87 goPackagePath = "github.com/getantibody/antibody";
98
109 src = fetchFromGitHub {
11− inherit rev;
1210 owner = "getantibody";
1311 repo = "antibody";
14− sha256 = "0iq3dfwwh39hmk8qmhrfgkn8pcabxf67c03s7vh18n7w9aay4jfz";
12+ rev = "v${version}";
13+ sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv";
1514 };
1615
1716 goDeps = ./deps.nix;
1817
1918 meta = with lib; {
2019 description = "The fastest shell plugin manager";
21− homepage = https://github.com/getantibody/antibody;
22− license = licenses.mit;
20+ homepage = https://github.com/getantibody/antibody;
21+ license = licenses.mit;
2322 maintainers = with maintainers; [ worldofpeace ];
2423 };
2524}
pkgs/shells/zsh/antibody/deps.nix+73−110
@@ -1,110 +1,73 @@
1−[
2− {
3− goPackagePath = "github.com/alecthomas/kingpin";
4− fetch = {
5− type = "git";
6− url = "https://github.com/alecthomas/kingpin";
7− rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
8− sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
9− };
10− }
11− {
12− goPackagePath = "github.com/alecthomas/template";
13− fetch = {
14− type = "git";
15− url = "https://github.com/alecthomas/template";
16− rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
17− sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
18− };
19− }
20− {
21− goPackagePath = "github.com/alecthomas/units";
22− fetch = {
23− type = "git";
24− url = "https://github.com/alecthomas/units";
25− rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
26− sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
27− };
28− }
29− {
30− goPackagePath = "github.com/caarlos0/gohome";
31− fetch = {
32− type = "git";
33− url = "https://github.com/caarlos0/gohome";
34− rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
35− sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
36− };
37− }
38− {
39− goPackagePath = "github.com/davecgh/go-spew";
40− fetch = {
41− type = "git";
42− url = "https://github.com/davecgh/go-spew";
43− rev = "346938d642f2ec3594ed81d874461961cd0faa76";
44− sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
45− };
46− }
47− {
48− goPackagePath = "github.com/getantibody/folder";
49− fetch = {
50− type = "git";
51− url = "https://github.com/getantibody/folder";
52− rev = "479aa91767d47bc27599e6ebc7fd07945dd38132";
53− sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
54− };
55− }
56− {
57− goPackagePath = "github.com/pmezard/go-difflib";
58− fetch = {
59− type = "git";
60− url = "https://github.com/pmezard/go-difflib";
61− rev = "792786c7400a136282c1664665ae0a8db921c6c2";
62− sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
63− };
64− }
65− {
66− goPackagePath = "github.com/stretchr/testify";
67− fetch = {
68− type = "git";
69− url = "https://github.com/stretchr/testify";
70− rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
71− sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
72− };
73− }
74− {
75− goPackagePath = "golang.org/x/crypto";
76− fetch = {
77− type = "git";
78− url = "https://go.googlesource.com/crypto";
79− rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
80− sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
81− };
82− }
83− {
84− goPackagePath = "golang.org/x/net";
85− fetch = {
86− type = "git";
87− url = "https://go.googlesource.com/net";
88− rev = "2491c5de3490fced2f6cff376127c667efeed857";
89− sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
90− };
91− }
92− {
93− goPackagePath = "golang.org/x/sync";
94− fetch = {
95− type = "git";
96− url = "https://go.googlesource.com/sync";
97− rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
98− sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
99− };
100− }
101− {
102− goPackagePath = "golang.org/x/sys";
103− fetch = {
104− type = "git";
105− url = "https://go.googlesource.com/sys";
106− rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
107− sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
108− };
109− }
110−]
1+[{
2+ goPackagePath = "github.com/getantibody/folder";
3+ fetch = {
4+ type = "git";
5+ url = "https://github.com/getantibody/folder";
6+ rev = "479aa91767d47bc27599e6ebc7fd07945dd38132";
7+ sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
8+ };
9+}{
10+ goPackagePath = "github.com/alecthomas/units";
11+ fetch = {
12+ type = "git";
13+ url = "https://github.com/alecthomas/units";
14+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
15+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
16+ };
17+}{
18+ goPackagePath = "github.com/alecthomas/template";
19+ fetch = {
20+ type = "git";
21+ url = "https://github.com/alecthomas/template";
22+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
23+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
24+ };
25+}{
26+ goPackagePath = "github.com/caarlos0/gohome";
27+ fetch = {
28+ type = "git";
29+ url = "https://github.com/caarlos0/gohome";
30+ rev = "75f08ebc60b144c5c3178115baedce176fdcfe99";
31+ sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz";
32+ };
33+}{
34+ goPackagePath = "github.com/alecthomas/kingpin";
35+ fetch = {
36+ type = "git";
37+ url = "https://github.com/alecthomas/kingpin";
38+ rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
39+ sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
40+ };
41+}{
42+ goPackagePath = "golang.org/x/sync";
43+ fetch = {
44+ type = "git";
45+ url = "https://go.googlesource.com/sync";
46+ rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
47+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
48+ };
49+}{
50+ goPackagePath = "golang.org/x/crypto";
51+ fetch = {
52+ type = "git";
53+ url = "https://go.googlesource.com/crypto";
54+ rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
55+ sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
56+ };
57+}{
58+ goPackagePath = "golang.org/x/sys";
59+ fetch = {
60+ type = "git";
61+ url = "https://go.googlesource.com/sys";
62+ rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
63+ sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
64+ };
65+}{
66+ goPackagePath = "golang.org/x/net";
67+ fetch = {
68+ type = "git";
69+ url = "https://go.googlesource.com/net";
70+ rev = "2491c5de3490fced2f6cff376127c667efeed857";
71+ sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
72+ };
73+}]
pkgs/tools/X11/autocutsel/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 meta = {
1919 inherit version;
20− homepage = http://www.nongnu.org/autocutsel/;
20+ homepage = https://www.nongnu.org/autocutsel/;
2121 description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
2222 license = stdenv.lib.licenses.gpl2Plus;
2323 platforms = with stdenv.lib.platforms; all;
pkgs/tools/X11/xbindkeys/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 buildInputs = [ libX11 guile ];
1313
1414 meta = {
15− homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html;
15+ homepage = https://www.nongnu.org/xbindkeys/xbindkeys.html;
1616 description = "Launch shell commands with your keyboard or your mouse under X Window";
1717 license = stdenv.lib.licenses.gpl2Plus;
1818 maintainers = with stdenv.lib.maintainers; [viric];
pkgs/tools/X11/xnee/default.nix+1−1
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747
4848 license = stdenv.lib.licenses.gpl3Plus;
4949
50− homepage = http://www.gnu.org/software/xnee/;
50+ homepage = https://www.gnu.org/software/xnee/;
5151
5252 maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
5353 platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
pkgs/tools/admin/aws-google-auth/default.nixnew file+62
@@ -0,0 +1,62 @@
1+{ lib
2+, buildPythonApplication
3+, fetchFromGitHub
4+, beautifulsoup4
5+, boto3
6+, configparser
7+, keyring
8+, keyrings-alt
9+, lxml
10+, pillow
11+, requests
12+, six
13+, tabulate
14+, tzlocal
15+, nose
16+, mock
17+, withU2F ? false, python-u2flib-host
18+}:
19+
20+buildPythonApplication rec {
21+ pname = "aws-google-auth";
22+ version = "0.0.29";
23+
24+ # Pypi doesn't ship the tests, so we fetch directly from GitHub
25+ # https://github.com/cevoaustralia/aws-google-auth/issues/120
26+ src = fetchFromGitHub {
27+ owner = "cevoaustralia";
28+ repo = "aws-google-auth";
29+ rev = version;
30+ sha256 = "06dalrwjy1sbc5wvj5ip4h999izlb0j5g6b6f3l5znnsm0vfvfia";
31+ };
32+
33+ propagatedBuildInputs = [
34+ beautifulsoup4
35+ boto3
36+ configparser
37+ keyring
38+ keyrings-alt
39+ lxml
40+ pillow
41+ requests
42+ six
43+ tabulate
44+ tzlocal
45+ ] ++ lib.optional withU2F python-u2flib-host;
46+
47+ checkInputs = [
48+ mock
49+ nose
50+ ];
51+
52+ preCheck = ''
53+ export HOME=$TMPDIR
54+ '';
55+
56+ meta = with lib; {
57+ description = "Acquire AWS STS (temporary) credentials via Google Apps SAML Single Sign On";
58+ homepage = https://github.com/cevoaustralia/aws-google-auth;
59+ maintainers = [ maintainers.marsam ];
60+ license = licenses.mit;
61+ };
62+}
pkgs/tools/archivers/atool/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 configureScript = "${bash}/bin/bash configure";
1212
1313 meta = {
14− homepage = http://www.nongnu.org/atool;
14+ homepage = https://www.nongnu.org/atool;
1515 description = "Archive command line helper";
1616 platforms = stdenv.lib.platforms.unix;
1717 license = stdenv.lib.licenses.gpl3;
pkgs/tools/archivers/cpio/default.nix+1−1
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
3232 enableParallelBuilding = true;
3333
3434 meta = with stdenv.lib; {
35− homepage = http://www.gnu.org/software/cpio/;
35+ homepage = https://www.gnu.org/software/cpio/;
3636 description = "A program to create or extract from cpio archives";
3737 license = licenses.gpl3;
3838 platforms = platforms.all;
pkgs/tools/archivers/gnutar/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 doInstallCheck = false; # fails
4141
4242 meta = {
43− homepage = http://www.gnu.org/software/tar/;
43+ homepage = https://www.gnu.org/software/tar/;
4444 description = "GNU implementation of the `tar' archiver";
4545
4646 longDescription = ''
pkgs/tools/archivers/sharutils/default.nix+1−1
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060 by a copy of the shell. unshar may also process files containing
6161 concatenated shell archives.
6262 '';
63− homepage = http://www.gnu.org/software/sharutils/;
63+ homepage = https://www.gnu.org/software/sharutils/;
6464 license = licenses.gpl3Plus;
6565 maintainers = [ maintainers.ndowens ];
6666 platforms = platforms.all;
pkgs/tools/backup/duplicity/default.nix+2−2
@@ -5,7 +5,7 @@ python2Packages.buildPythonApplication rec {
55 version = "0.7.18.2";
66
77 src = fetchurl {
8− url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
8+ url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
99 sha256 = "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2";
1010 };
1111
@@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec {
3535
3636 meta = with stdenv.lib; {
3737 description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
38− homepage = http://www.nongnu.org/duplicity;
38+ homepage = https://www.nongnu.org/duplicity;
3939 license = licenses.gpl2Plus;
4040 maintainers = with maintainers; [ peti ];
4141 platforms = platforms.unix;
pkgs/tools/backup/duply/default.nix+2−2
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
2828 description = "Shell front end for the duplicity backup tool";
2929 longDescription = ''
3030 Duply is a shell front end for the duplicity backup tool
31− http://duplicity.nongnu.org/. It greatly simplifies it's usage by
31+ https://www.nongnu.org/duplicity. It greatly simplifies its usage by
3232 implementing backup job profiles, batch commands and more. Who says
3333 secure backups on non-trusted spaces are no child's play?
3434 '';
35− homepage = http://duply.net/;
35+ homepage = https://duply.net/;
3636 license = licenses.gpl2;
3737 maintainers = [ maintainers.bjornfor ];
3838 platforms = stdenv.lib.platforms.unix;
pkgs/tools/backup/store-backup/default.nix+2−2
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 buildInputs = [ perl makeWrapper ];
2424
2525 src = fetchurl {
26− url = "http://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";
26+ url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";
2727 sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78";
2828 };
2929
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
103103
104104 meta = {
105105 description = "A backup suite that stores files on other disks";
106− homepage = http://savannah.nongnu.org/projects/storebackup;
106+ homepage = https://savannah.nongnu.org/projects/storebackup;
107107 license = stdenv.lib.licenses.gpl3Plus;
108108 maintainers = [stdenv.lib.maintainers.marcweber];
109109 platforms = stdenv.lib.platforms.linux;
pkgs/tools/cd-dvd/xorriso/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 license = licenses.gpl3Plus;
3030
31− homepage = http://www.gnu.org/software/xorriso/;
31+ homepage = https://www.gnu.org/software/xorriso/;
3232
3333 maintainers = [ maintainers.vrthra ];
3434 platforms = platforms.unix;
pkgs/tools/compression/lzip/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 enableParallelBuilding = true;
2525
2626 meta = {
27− homepage = http://www.nongnu.org/lzip/lzip.html;
27+ homepage = https://www.nongnu.org/lzip/lzip.html;
2828 description = "A lossless data compressor based on the LZMA algorithm";
2929 license = stdenv.lib.licenses.gpl3Plus;
3030 platforms = stdenv.lib.platforms.all;
pkgs/tools/filesystems/bees/bees-service-wrappernew file+223
@@ -0,0 +1,223 @@
1+#!@bash@/bin/bash
2+PATH=@bash@/bin:@coreutils@/bin:@utillinux@/bin:@btrfsProgs@/bin:$PATH
3+beesd_bin=@bees@/lib/bees/bees
4+# PLEASE KEEP NIX-ISMS ABOVE THIS LINE TO EASE UPSTREAM MERGE
5+#!/usr/bin/env bash
6+
7+shopt -s extglob
8+
9+# Upstream wrapper requires UUID to be used for configuration.
10+
11+# However, when declaratively describing a host, we may not know its UUID, and
12+# shouldn't need to persist something that will differ between hosts built from
13+# the same configuration template.
14+
15+# Thus, for using bees from NixOS, we have our own wrapper, which supports not
16+# just UUID but any specification permitted by findmnt
17+
18+[[ $bees_debug ]] && { PS4=':${BASH_SOURCE##*/}:$LINENO+'; set -x; }
19+
20+usage() {
21+ cat >&2 <<EOF
22+Usage: ${BASH_SOURCE##*/} run|cleanup config-name|fsSpec [idxSizeMB=...] [verbosity=...] [workDir=...] [-- daemon-options...]
23+
24+ fsSpec should be in a format recognized by findmnt. Alternately,
25+ "config-name" may refer to a file that exists in ${bees_config_dir:-/etc/bees}
26+ with a .conf extension; if that file does not specify UUID, findmnt will be
27+ used in addition.
28+
29+ Note that while config files may presently use shell arithmetic, use of this
30+ functionality is not encouraged going forward: Setting ''idxSizeMB=4096'' is
31+ preferred over ''DB_SIZE=$((1024*1024*1024*4))'' or ''DB_SIZE=$(( AL16M * 256 ))'',
32+ although both of these are presently supported.
33+
34+ If fsSpec contains a /, it assumed to be a mount point to be looked up by
35+ findmnt, not a config file name.
36+
37+ daemon-options are passed directly through to the daemon on startup, as
38+ documented at https://github.com/Zygo/bees/blob/master/docs/options.md.
39+EOF
40+ exit 1
41+}
42+
43+die() { echo "$*" >&2; exit 1; }
44+
45+allConfigNames=( blockdev fsSpec home idxSize idxSizeMB mntDir runDir status verbosity workDir )
46+
47+# Alternate names for configuration values; "bees_" will always be prepended
48+declare -A altConfigNames=(
49+ # from original bees wrapper
50+ [BEESHOME]=home
51+ [BEESSTATUS]=status
52+ [MNT_DIR]=mntDir
53+ [UUID]=uuid
54+ [WORK_DIR]=runDir
55+ [DB_SIZE]=idxSize
56+)
57+
58+# legacy bees config files can be arbitrary shell scripts, so we need to actually evaluate them
59+sandboxedConfigFileEval() {
60+ bash_exe=$(type -P bash) || exit
61+ PATH=/var/empty ENV='' BASH_ENV='' AL128K="$((128*1024))" AL16M="$((16*1024*1024))" "$bash_exe" -r ${bees_debug+-x} \
62+ -c 'eval "$(</dev/stdin)" >&2; for var; do [[ ${!var} ]] && printf "%q=%s\\0" "$var" "${!var}"; done' \
63+ "${!altConfigNames[@]}" "${allConfigNames[@]}" \
64+ <"$1"
65+}
66+
67+readConfigFileIfExists() {
68+ local line
69+ [[ -s $1 ]] || return 1
70+ while IFS= read -r -d '' line; do
71+ line=${line%%+([[:space:]])"#"*}
72+ [[ $line ]] || continue
73+ [[ $line = *=* ]] || {
74+ printf 'WARNING: Config file line not recognized: %q\n' "$line" >&2
75+ continue
76+ }
77+ set_option "$line"
78+ done < <(sandboxedConfigFileEval "$1")
79+}
80+
81+set_option() {
82+ local k v
83+ k="${1%%=*}" v="${1#*=}"
84+ [[ ${altConfigNames[$k]} ]] && k=${altConfigNames[$k]}
85+ printf -v "bees_$k" %s "$v"
86+}
87+
88+uuid_re='^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$'
89+
90+# Shared code for setting configuration used by other operations.
91+#
92+# Reads from global associative array "opts" containing options passed in as
93+# key=value pairs on the command line, looks for config-file overrides, and
94+# sets individual global variables.
95+_setup() {
96+ declare fstype
97+ bees_fsSpec=$1; shift
98+
99+ # Look for file-based configuration, additional to honoring configuration on the command line
100+ bees_config_dir="${bees_config_dir:-/etc/bees}"
101+ if [[ $bees_fsSpec =~ $uuid_re ]]; then
102+ bees_uuid=$bees_fsSpec
103+ # If our spec looks like a bare UUID, and no config file exists in the new
104+ # format, fall back to legacy config file search mechanism (grep; ewww).
105+ if ! readConfigFileIfExists "$bees_config_dir/UUID=$bees_fsSpec.conf"; then
106+ # Legacy approach to finding a config file: Grep for a *.conf file
107+ # containing the UUID within its text. Permitting spaces around the "="
108+ # appears to be a bug, but is retained for compatibility with the
109+ # original upstream script.
110+ allConfFiles=( "$bees_config_dir"/*.conf )
111+ if (( ${#allConfFiles[@]} )); then
112+ # in read or readarray with -d '', the NUL terminating the empty string is used as delimiter character.
113+ readarray -d '' -t matchingConfFiles < <(grep -E -l -Z "^[^#]*UUID[[:space:]]*=[[:space:]]*" "${allConfFiles[@]}")
114+ else
115+ matchingConfFiles=( )
116+ fi
117+ if (( ${#matchingConfFiles[@]} == 1 )); then
118+ # Exactly one configuration file exists in our target directory with a reference to the UUID given.
119+ bees_config_file=${matchingConfFiles[0]}
120+ readConfigFileIfExists "$bees_config_file"
121+ echo "NOTE: Please consider renaming $bees_config_file to $bees_config_dir/UUID=$bees_fsSpec" >&2
122+ echo " ...and passing UUID=$bees_fsSpec on startup." >&2
123+ elif (( ${#matchingConfFiles[@]} > 1 )); then
124+ # The legacy wrapper would silently use the first file and ignore
125+ # others, but... no.
126+ echo "ERROR: Passed a bare UUID, but multiple configuration files match it:" >&2
127+ printf ' - %q\n' "${matchingConfFiles[@]}" >&2
128+ die "Unable to continue."
129+ fi
130+ fi
131+ else
132+ # For a non-UUID fsSpec that is not a path, look only for a config file
133+ # exactly matching its text.
134+ #
135+ # (Passing a mount point as a fsSpec is only supported with the new
136+ # wrapper; all key=value pairs can be passed on the command line in this
137+ # mode, so config file support is not needed).
138+ [[ $bees_fsSpec = */* ]] || readConfigFileIfExists "$bees_config_dir/$bees_fsSpec.conf"
139+ fi
140+
141+ [[ $bees_uuid ]] || {
142+ # if bees_uuid is not in our .conf file, look it up with findmnt
143+ read -r bees_uuid fstype < <(findmnt -n -o uuid,fstype "$bees_fsSpec") && [[ $fstype ]] || exit
144+ [[ $fstype = btrfs ]] || die "Device type is $fstype, not btrfs"
145+ }
146+
147+ [[ $bees_uuid = */* ]] || readConfigFileIfExists "$bees_config_dir/UUID=$bees_uuid.conf"
148+
149+ # Honor any values read from config files above; otherwise, set defaults.
150+ bees_workDir="${bees_workDir:-.beeshome}"
151+ bees_runDir="${bees_runDir:-/run/bees}"
152+ bees_mntDir="${bees_mntDir:-$bees_runDir/mnt/$bees_uuid}"
153+ bees_home="${bees_home:-$bees_mntDir/$bees_workDir}"
154+ bees_status="${bees_status:-${bees_runDir}/$bees_uuid.status}"
155+ bees_verbosity="${bees_verbosity:-6}"
156+ bees_idxSizeMB="${bees_idxSizeMB:-1024}"
157+ bees_idxSize=${bees_idxSize:-"$(( bees_idxSizeMB * 1024 * 1024 ))"}
158+ bees_blockdev=${bees_blockdev:-"/dev/disk/by-uuid/$bees_uuid"}
159+
160+ [[ -b $bees_blockdev ]] || die "Block device $bees_blockdev missing"
161+ (( bees_idxSize % (16 * 1024 * 1024) == 0 )) || die "DB size must be divisible by 16MB"
162+}
163+
164+do_run() {
165+ local db old_db_size
166+
167+ _setup "$1"; shift
168+ mkdir -p -- "$bees_mntDir" || exit
169+
170+ # subvol id 5 is reserved for the root subvolume of a btrfs filesystem.
171+ mountpoint -q "$bees_mntDir" || mount -osubvolid=5 -- "$bees_blockdev" "$bees_mntDir" || exit
172+ if [[ -d $bees_home ]]; then
173+ btrfs subvolume show "$bees_home" >/dev/null 2>&1 || die "$bees_home exists but is not a subvolume"
174+ else
175+ btrfs subvolume create "$bees_home" || exit
176+ sync # workaround for Zygo/bees#93
177+ fi
178+ db=$bees_home/beeshash.dat
179+ touch -- "$db"
180+
181+ old_db_size=$(stat -c %s -- "$db")
182+ new_db_size=$bees_idxSize
183+
184+ if (( old_db_size != new_db_size )); then
185+ rm -f -- "$bees_home"/beescrawl."$bees_uuid".dat
186+ truncate -s "$new_db_size" -- "$db" || exit
187+ fi
188+ chmod 700 -- "$bees_home"
189+
190+ # BEESSTATUS and BEESHOME are the only variables handled by the legacy
191+ # wrapper for which getenv() is called in C code.
192+ BEESSTATUS=$bees_status BEESHOME=$bees_home exec "${beesd_bin:-/lib/bees/bees}" \
193+ --verbose "$bees_verbosity" \
194+ "$@" "$bees_mntDir" || exit
195+}
196+
197+do_cleanup() {
198+ _setup "$1"; shift
199+ mountpoint -q "$bees_mntDir" && umount -l -- "$bees_mntDir" || exit
200+}
201+
202+(( $# >= 2 )) || usage
203+declare -f "do_$1" >/dev/null 2>&1 || usage
204+mode=$1; shift # must be a do_* function; currently "run" or "cleanup"
205+
206+declare -a args=( "$1" ); shift # pass first argument (config-name|fsSpec) through literally
207+
208+# parse other arguments as key=value pairs, or pass them through literally if they do not match that form.
209+# similarly, any option after "--" will be passed through literally.
210+while (( $# )); do
211+ if [[ $1 = *=* ]]; then
212+ set_option "$1"
213+ elif [[ $1 = -- ]]; then
214+ shift
215+ args+=( "$@" )
216+ break
217+ else
218+ args+=( "$1" )
219+ fi
220+ shift
221+done
222+
223+"do_$mode" "${args[@]}"
pkgs/tools/filesystems/bees/default.nixnew file+69
@@ -0,0 +1,69 @@
1+{ stdenv, runCommand, makeWrapper, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }:
2+
3+let
4+
5+ version = "0.6.1";
6+ sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
7+
8+ bees = stdenv.mkDerivation rec {
9+ name = "bees-${version}";
10+ inherit version;
11+
12+ src = fetchFromGitHub {
13+ owner = "Zygo";
14+ repo = "bees";
15+ rev = "v${version}";
16+ inherit sha256;
17+ };
18+
19+ buildInputs = [
20+ btrfs-progs # for btrfs/ioctl.h
21+ utillinux # for uuid.h
22+ ];
23+
24+ nativeBuildInputs = [
25+ pythonPackages.markdown # documentation build
26+ ];
27+
28+ preBuild = ''
29+ git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; }
30+ export -f git
31+ '';
32+
33+ postBuild = ''
34+ unset -f git
35+ '';
36+
37+ buildFlags = [
38+ "ETC_PREFIX=/var/run/bees/configs"
39+ ];
40+
41+ makeFlags = [
42+ "SHELL=bash"
43+ "PREFIX=$(out)"
44+ "ETC_PREFIX=$(out)/etc"
45+ "BEES_VERSION=${version}"
46+ "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system"
47+ ];
48+
49+ meta = with stdenv.lib; {
50+ homepage = "https://github.com/Zygo/bees";
51+ description = "Block-oriented BTRFS deduplication service";
52+ license = licenses.gpl3;
53+ platforms = platforms.linux;
54+ maintainers = with maintainers; [ chaduffy ];
55+ longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ";
56+ };
57+ };
58+
59+in
60+
61+runCommand "bees-service-${version}" {
62+ inherit bash bees coreutils utillinux;
63+ btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
64+} ''
65+ mkdir -p -- "$out/bin"
66+ substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
67+ chmod +x "$out"/bin/bees-service-wrapper
68+ ln -s ${bees}/bin/beesd "$out"/bin/beesd
69+''
pkgs/tools/filesystems/davfs2/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"];
1818
1919 meta = {
20− homepage = http://savannah.nongnu.org/projects/davfs2;
20+ homepage = https://savannah.nongnu.org/projects/davfs2;
2121 description = "Mount WebDAV shares like a typical filesystem";
2222 license = stdenv.lib.licenses.gpl3Plus;
2323
pkgs/tools/filesystems/nixpart/0.4/parted.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 which also serves as a sample implementation and script backend.
3838 '';
3939
40− homepage = http://www.gnu.org/software/parted/;
40+ homepage = https://www.gnu.org/software/parted/;
4141 license = stdenv.lib.licenses.gpl3Plus;
4242
4343 maintainers = [
pkgs/tools/graphics/asymptote/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/asymptote/files/
1+url https://sourceforge.net/projects/asymptote/files/
22SF_version_dir
33version_link 'src[.]tgz/download$'
44SF_redirect
pkgs/tools/graphics/barcode/default.nix+2−2
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
1515 description = "GNU barcode generator";
1616 maintainers = with maintainers; [ raskin ];
1717 platforms = platforms.linux; # Maybe other non-darwin Unix
18− downloadPage = "http://ftp.gnu.org/gnu/barcode/";
18+ downloadPage = "https://ftp.gnu.org/gnu/barcode/";
1919 updateWalker = true;
20− homepage = http://ftp.gnu.org/gnu/barcode/;
20+ homepage = https://www.gnu.org/software/barcode/;
2121 license = licenses.gpl3;
2222 };
2323}
pkgs/tools/graphics/dmtx-utils/default.upstream+1−1
@@ -1,4 +1,4 @@
1−url http://sourceforge.net/projects/libdmtx/files/libdmtx/
1+url https://sourceforge.net/projects/libdmtx/files/libdmtx/
22SF_version_dir
33version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$'
44SF_redirect
pkgs/tools/graphics/fim/default.nix+1−1
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 to be a highly customizable and scriptable for users who are comfortable
4545 with software like the VIM text editor or the Mutt mail user agent.
4646 '';
47− homepage = http://www.nongnu.org/fbi-improved/;
47+ homepage = https://www.nongnu.org/fbi-improved/;
4848 license = licenses.gpl2Plus;
4949 platforms = platforms.linux;
5050 maintainers = with maintainers; [ primeos ];
pkgs/tools/graphics/icoutils/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 '';
2525
2626 meta = {
27− homepage = http://www.nongnu.org/icoutils/;
27+ homepage = https://www.nongnu.org/icoutils/;
2828 description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
2929 license = stdenv.lib.licenses.gpl3Plus;
3030 platforms = with stdenv.lib.platforms; linux ++ darwin;
pkgs/tools/graphics/oxipng/default.nix+3−3
@@ -1,17 +1,17 @@
11{ stdenv, fetchFromGitHub, rustPlatform }:
22
33rustPlatform.buildRustPackage rec {
4− version = "2.1.6";
4+ version = "2.1.8";
55 name = "oxipng-${version}";
66
77 src = fetchFromGitHub {
88 owner = "shssoichiro";
99 repo = "oxipng";
1010 rev = "v${version}";
11− sha256 = "0n3v2dxybfkf07hb4p2hbhhkwx907b85wzj8wa4whwil89igyrdm";
11+ sha256 = "18ld65vm58s6x918g6bhfkrg7lw2lca8daidv88ff14wm5khjvik";
1212 };
1313
14− cargoSha256 = "1ycacwhwbn27i81jpp55m1446b9a50knlqv0kzkjcv8yf27213y9";
14+ cargoSha256 = "034i8hgi0zgv085bimlja1hl3nd096rqpi167pw6rda5aj18c625";
1515
1616 meta = with stdenv.lib; {
1717 homepage = https://github.com/shssoichiro/oxipng;
pkgs/tools/graphics/plotutils/default.nix+1−1
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 graphics.
5050 '';
5151
52− homepage = http://www.gnu.org/software/plotutils/;
52+ homepage = https://www.gnu.org/software/plotutils/;
5353
5454 license = stdenv.lib.licenses.gpl2Plus;
5555 maintainers = [ stdenv.lib.maintainers.marcweber ];
pkgs/tools/graphics/scanbd/default.nix+1−1
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 scanbuttond project.
5050 '';
5151 homepage = http://scanbd.sourceforge.net/;
52− downloadPage = http://sourceforge.net/projects/scanbd/;
52+ downloadPage = https://sourceforge.net/projects/scanbd/;
5353 license = licenses.gpl2Plus;
5454 platforms = platforms.linux;
5555 };
pkgs/tools/inputmethods/m17n-db/default.nix+2−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 name = "m17n-db-1.8.0";
55
66 src = fetchurl {
7− url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
7+ url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
88 sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5";
99 };
1010
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 ;
1616
1717 meta = {
18− homepage = http://www.nongnu.org/m17n/;
18+ homepage = https://www.nongnu.org/m17n/;
1919 description = "Multilingual text processing library (database)";
2020 license = stdenv.lib.licenses.lgpl21Plus;
2121 platforms = stdenv.lib.platforms.linux;
pkgs/tools/inputmethods/m17n-lib/default.nix+2−2
@@ -3,14 +3,14 @@ stdenv.mkDerivation rec {
33 name = "m17n-lib-1.8.0";
44
55 src = fetchurl {
6− url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
6+ url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
77 sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
88 };
99
1010 buildInputs = [ m17n_db ];
1111
1212 meta = {
13− homepage = http://www.nongnu.org/m17n/;
13+ homepage = https://www.nongnu.org/m17n/;
1414 description = "Multilingual text processing library (runtime)";
1515 license = stdenv.lib.licenses.lgpl21Plus;
1616 platforms = stdenv.lib.platforms.linux;
pkgs/tools/inputmethods/m17n-lib/otf.nix+2−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 name = "libotf-0.9.16";
55
66 src = fetchurl {
7− url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
7+ url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
88 sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8";
99 };
1010
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 '';
2020
2121 meta = {
22− homepage = http://www.nongnu.org/m17n/;
22+ homepage = https://www.nongnu.org/m17n/;
2323 description = "Multilingual text processing library (libotf)";
2424 license = stdenv.lib.licenses.lgpl21Plus;
2525 platforms = stdenv.lib.platforms.linux;
pkgs/tools/misc/bc/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 meta = {
3434 description = "GNU software calculator";
35− homepage = http://www.gnu.org/software/bc/;
35+ homepage = https://www.gnu.org/software/bc/;
3636 license = stdenv.lib.licenses.gpl3;
3737 platforms = stdenv.lib.platforms.all;
3838 };
pkgs/tools/misc/coreutils/default.nix+1−1
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
9797 '';
9898
9999 meta = {
100− homepage = http://www.gnu.org/software/coreutils/;
100+ homepage = https://www.gnu.org/software/coreutils/;
101101 description = "The basic file, shell and text manipulation utilities of the GNU operating system";
102102
103103 longDescription = ''
pkgs/tools/misc/datamash/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 meta = with stdenv.lib; {
1313 description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files";
14− homepage = http://www.gnu.org/software/datamash/;
14+ homepage = https://www.gnu.org/software/datamash/;
1515 license = licenses.gpl3Plus;
1616 platforms = platforms.all;
1717 maintainers = with maintainers; [ pSub vrthra ];
pkgs/tools/misc/fileschanged/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 doCheck = true;
1616
1717 meta = {
18− homepage = http://www.nongnu.org/fileschanged/;
18+ homepage = https://www.nongnu.org/fileschanged/;
1919 description = "A command-line utility that reports when files have been altered";
2020 license = stdenv.lib.licenses.gpl3Plus;
2121
pkgs/tools/misc/findutils/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 enableParallelBuilding = true;
4141
4242 meta = {
43− homepage = http://www.gnu.org/software/findutils/;
43+ homepage = https://www.gnu.org/software/findutils/;
4444 description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
4545
4646 longDescription = ''
pkgs/tools/misc/grub/2.0x.nix+1−1
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
121121 operating system (e.g., GNU).
122122 '';
123123
124− homepage = http://www.gnu.org/software/grub/;
124+ homepage = https://www.gnu.org/software/grub/;
125125
126126 license = licenses.gpl3Plus;
127127
pkgs/tools/misc/grub/trusted.nix+1−1
@@ -21,7 +21,7 @@ let
2121
2222 po_src = fetchurl {
2323 name = "grub-2.02-beta2.tar.gz";
24− url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
24+ url = "https://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
2525 sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
2626
2727 };
pkgs/tools/misc/idutils/default.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 contents of certain character strings.
4646 '';
4747
48− homepage = http://www.gnu.org/software/idutils/;
48+ homepage = https://www.gnu.org/software/idutils/;
4949 license = stdenv.lib.licenses.gpl3Plus;
5050
5151 maintainers = [ ];
pkgs/tools/misc/logstash/default.nix+2−2
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
1717 sha256 =
1818 if enableUnfree
19− then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr"
20− else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w";
19+ then "01mkb9fr63m3ilp4cbbjccid5m8yc7iqhnli12ynfabsf7302fdz"
20+ else "0r60183yyywabinsv9pkd8sx0wq68h740xi3172fypjfdcqs0g9c";
2121 };
2222
2323 dontBuild = true;
pkgs/tools/misc/ntfy/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ stdenv, pythonPackages, fetchFromGitHub }:
2+
3+pythonPackages.buildPythonApplication rec {
4+ pname = "ntfy";
5+ version = "2.7.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "dschep";
9+ repo = "ntfy";
10+ rev = "v${version}";
11+ sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
12+ };
13+
14+ checkInputs = with pythonPackages; [
15+ mock
16+ ];
17+
18+ propagatedBuildInputs = with pythonPackages; [
19+ requests ruamel_yaml appdirs
20+ sleekxmpp dns
21+ emoji
22+ psutil
23+ matrix-client
24+ dbus-python
25+ ];
26+
27+ checkPhase = ''
28+ HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test
29+ '';
30+
31+ meta = with stdenv.lib; {
32+ description = "A utility for sending notifications, on demand and when commands finish";
33+ homepage = http://ntfy.rtfd.org/;
34+ license = licenses.gpl3;
35+ maintainers = with maintainers; [ jfrankenau kamilchm ];
36+ };
37+}
pkgs/tools/misc/parallel/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 it possible to use output from GNU Parallel as input for other
3838 programs.
3939 '';
40− homepage = http://www.gnu.org/software/parallel/;
40+ homepage = https://www.gnu.org/software/parallel/;
4141 license = licenses.gpl3Plus;
4242 platforms = platforms.all;
4343 maintainers = with maintainers; [ pSub vrthra ];
pkgs/tools/misc/parted/default.nix+1−1
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
5858 which also serves as a sample implementation and script backend.
5959 '';
6060
61− homepage = http://www.gnu.org/software/parted/;
61+ homepage = https://www.gnu.org/software/parted/;
6262 license = stdenv.lib.licenses.gpl3Plus;
6363
6464 maintainers = [
pkgs/tools/misc/recutils/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 number of named fields.
3131 '';
3232
33− homepage = http://www.gnu.org/software/recutils/;
33+ homepage = https://www.gnu.org/software/recutils/;
3434
3535 license = stdenv.lib.licenses.gpl3Plus;
3636
pkgs/tools/misc/renameutils/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 nativeBuildInputs = [ readline ];
1414
1515 meta = {
16− homepage = http://www.nongnu.org/renameutils/;
16+ homepage = https://www.nongnu.org/renameutils/;
1717 description = "A set of programs to make renaming of files faster";
1818 platforms = stdenv.lib.platforms.unix;
1919 license = stdenv.lib.licenses.gpl2Plus;
pkgs/tools/misc/screen/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 doCheck = true;
3636
3737 meta = with stdenv.lib; {
38− homepage = http://www.gnu.org/software/screen/;
38+ homepage = https://www.gnu.org/software/screen/;
3939 description = "A window manager that multiplexes a physical terminal";
4040 license = licenses.gpl2Plus;
4141
pkgs/tools/misc/stow/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 '';
3030
3131 license = stdenv.lib.licenses.gpl3Plus;
32− homepage = http://www.gnu.org/software/stow/;
32+ homepage = https://www.gnu.org/software/stow/;
3333
3434 maintainers = with stdenv.lib.maintainers; [ the-kenny jgeerds ];
3535 platforms = stdenv.lib.platforms.all;
pkgs/tools/misc/systrayhelper/default.nix+4−4
@@ -2,16 +2,16 @@
22
33buildGoPackage rec {
44 name = "systrayhelper-${version}";
5− version = "0.0.3";
6− rev = "0953942245566bf358ba937af840947100380e15";
5+ version = "0.0.4";
6+ rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9";
77
88 goPackagePath = "github.com/ssbc/systrayhelper";
99
1010 src = fetchFromGitHub {
11− inherit rev;
11+ rev = "v${version}";
1212 owner = "ssbc";
1313 repo = "systrayhelper";
14− sha256 = "12xmzcw94in4m1hl4hbfdsbvkkaqrljgb67b95m1qwkkjak3q9g6";
14+ sha256 = "1iq643brha5q6w2v1hz5l3d1z0pqzqr43gpwih4cnx3m5br0wg2k";
1515 };
1616
1717 goDeps = ./deps.nix;
pkgs/tools/misc/systrayhelper/deps.nix+7−7
@@ -59,8 +59,8 @@
5959 fetch = {
6060 type = "git";
6161 url = "https://github.com/getlantern/systray";
62− rev = "3fd1443dac5c8297999189fe28d5836b2b075b66";
63− sha256 = "1sb11n27zy8xmq0lvrpqikb53425jvwl5617cp201va6iwk1hgnh";
62+ rev = "e31397f8c6928d98a8a9a7e80087aebcf0090beb";
63+ sha256 = "0ahb6qjd2c43nbbg0ssm76ilbzs9dq43a89f7fj6c029nympjmqn";
6464 };
6565 }
6666 {
@@ -86,8 +86,8 @@
8686 fetch = {
8787 type = "git";
8888 url = "https://github.com/pkg/errors";
89− rev = "c059e472caf75dbe73903f6521a20abac245b17f";
90− sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi";
89+ rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
90+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
9191 };
9292 }
9393 {
@@ -95,8 +95,8 @@
9595 fetch = {
9696 type = "git";
9797 url = "https://go.googlesource.com/sys";
98− rev = "d0be0721c37eeb5299f245a996a483160fc36940";
99− sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
98+ rev = "8e24a49d80f82323e1c4db1b5da3e0f31171a151";
99+ sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724";
100100 };
101101 }
102−]
102+]
pkgs/tools/misc/time/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 '';
2828
2929 license = stdenv.lib.licenses.gpl3Plus;
30− homepage = http://www.gnu.org/software/time/;
30+ homepage = https://www.gnu.org/software/time/;
3131 platforms = stdenv.lib.platforms.unix;
3232 };
3333}
pkgs/tools/misc/uucp/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 just found one of the finest UUCP implementations available.
2828 '';
2929
30− homepage = http://www.gnu.org/software/uucp/uucp.html;
30+ homepage = https://www.gnu.org/software/uucp/uucp.html;
3131
3232 license = stdenv.lib.licenses.gpl2Plus;
3333
pkgs/tools/misc/vdirsyncer/default.nix+17−2
@@ -1,4 +1,4 @@
1−{ stdenv, python3Packages, glibcLocales, rustPlatform, pkgconfig, openssl }:
1+{ stdenv, python3Packages, fetchpatch, glibcLocales, rustPlatform, pkgconfig, openssl, Security }:
22
33# Packaging documentation at:
44# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
@@ -16,7 +16,7 @@ let
1616 inherit src;
1717 sourceRoot = name + "/rust";
1818 cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q";
19− buildInputs = [ pkgconfig openssl ];
19+ buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
2020 };
2121in pythonPackages.buildPythonApplication rec {
2222 inherit version pname src native;
@@ -35,6 +35,21 @@ in pythonPackages.buildPythonApplication rec {
3535
3636 checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ];
3737
38+ patches = [
39+ (fetchpatch {
40+ url = https://github.com/pimutils/vdirsyncer/commit/80a42e4c6c18ca4db737bc6700c50a3866832bbb.patch;
41+ sha256 = "1vrhn0ma3y08w6f5abhl3r5rq30g60h1bp3wmyszw909hyvyzp5l";
42+ })
43+ (fetchpatch {
44+ url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch;
45+ sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
46+ })
47+ (fetchpatch {
48+ url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch;
49+ sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80";
50+ })
51+ ];
52+
3853 postPatch = ''
3954 sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
4055 '';
pkgs/tools/misc/yubikey-manager/default.nix+7−5
@@ -2,11 +2,11 @@
22 yubikey-personalization, libu2f-host, libusb1 }:
33
44pythonPackages.buildPythonPackage rec {
5− name = "yubikey-manager-1.0.0";
5+ name = "yubikey-manager-1.0.1";
66
77 srcs = fetchurl {
88 url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz";
9− sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd";
9+ sha256 = "0i7w1f89hqlw7g800fjhbb6yvq9wjmj5d7w7p6v8bkyvk645v48z";
1010 };
1111
1212 propagatedBuildInputs =
@@ -26,12 +26,13 @@ pythonPackages.buildPythonPackage rec {
2626 ];
2727
2828 makeWrapperArgs = [
29− "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib"
29+ "--prefix" "LD_LIBRARY_PATH" ":"
30+ (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ])
3031 ];
3132
3233 postInstall = ''
33− mkdir -p $out/etc/bash_completion.d
34− _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true
34+ mkdir -p $out/share/bash-completion/completions
35+ _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :
3536 '';
3637
3738 # See https://github.com/NixOS/nixpkgs/issues/29169
@@ -40,6 +41,7 @@ pythonPackages.buildPythonPackage rec {
4041 meta = with lib; {
4142 homepage = https://developers.yubico.com/yubikey-manager;
4243 description = "Command line tool for configuring any YubiKey over all USB transports.";
44+
4345 license = licenses.bsd2;
4446 platforms = platforms.unix;
4547 maintainers = with maintainers; [ benley ];
pkgs/tools/networking/dropbear/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\"";
1919
20− # http://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
20+ # https://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
2121 preConfigure = ''
2222 makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib
2323 '';
pkgs/tools/networking/flvstreamer/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 license = stdenv.lib.licenses.gpl2Plus;
3333
34− homepage = http://savannah.nongnu.org/projects/flvstreamer;
34+ homepage = https://savannah.nongnu.org/projects/flvstreamer;
3535
3636 maintainers = [ stdenv.lib.maintainers.thammers ];
3737 platforms = with stdenv.lib.platforms; linux ++ darwin;
pkgs/tools/networking/gandi-cli/default.nix+9−10
@@ -1,17 +1,16 @@
1−{ stdenv, pythonPackages, fetchFromGitHub }:
1+{ stdenv, python3Packages, fetchFromGitHub }:
22
3−with pythonPackages;
3+with python3Packages;
44
5−buildPythonPackage rec {
6− namePrefix = "";
7− name = "gandi-cli-${version}";
8− version = "0.19";
5+buildPythonApplication rec {
6+ pname = "gandi-cli";
7+ version = "1.3";
98
109 src = fetchFromGitHub {
11− sha256 = "0xbf97p75zl6sjxqcgmaa4p5rax2h6ixn8srwdr4rsx2zz9dpwgp";
12− rev = version;
13− repo = "gandi.cli";
1410 owner = "Gandi";
11+ repo = "gandi.cli";
12+ rev = version;
13+ sha256 = "07i1y88j5awsw7qadk7gnmax8mi7vgh1nflnc8j54z53fjyamlcs";
1514 };
1615
1716 propagatedBuildInputs = [ click ipy pyyaml requests ];
@@ -22,6 +21,6 @@ buildPythonPackage rec {
2221 description = "Command-line interface to the public Gandi.net API";
2322 homepage = http://cli.gandi.net/;
2423 license = licenses.gpl3Plus;
24+ maintainers = with maintainers; [ ckampka ];
2525 };
2626}
27−
pkgs/tools/networking/inetutils/default.nix+1−1
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 traceroute, uucpd, and whois.
4040 '';
4141
42− homepage = http://www.gnu.org/software/inetutils/;
42+ homepage = https://www.gnu.org/software/inetutils/;
4343 license = licenses.gpl3Plus;
4444
4545 maintainers = with maintainers; [ matthewbauer ];
pkgs/tools/networking/jwhois/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919
2020 meta = {
2121 description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
22− homepage = http://www.gnu.org/software/jwhois/;
22+ homepage = https://www.gnu.org/software/jwhois/;
2323 license = stdenv.lib.licenses.gpl3;
2424 platforms = stdenv.lib.platforms.unix;
2525 };
pkgs/tools/networking/mailutils/default.nix+1−1
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
118118
119119 maintainers = with maintainers; [ orivej vrthra ];
120120
121− homepage = http://www.gnu.org/software/mailutils/;
121+ homepage = https://www.gnu.org/software/mailutils/;
122122
123123 # Some of the dependencies fail to build on {cyg,dar}win.
124124 platforms = platforms.gnu ++ platforms.linux;
pkgs/tools/networking/network-manager/applet.nix+1−1
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
2828 gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
2929 polkit isocodes mobile-broadband-provider-info libgudev
3030 modemmanager jansson glib-networking
31− libappindicator-gtk3
31+ libappindicator-gtk3 gnome3.defaultIconTheme
3232 ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
3333
3434 nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
pkgs/tools/networking/wget/default.nix+1−1
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
5353
5454 license = licenses.gpl3Plus;
5555
56− homepage = http://www.gnu.org/software/wget/;
56+ homepage = https://www.gnu.org/software/wget/;
5757
5858 maintainers = with maintainers; [ fpletz ];
5959 platforms = platforms.all;
pkgs/tools/package-management/nix-pin/default.nix+1
@@ -26,6 +26,7 @@ let self = stdenv.mkDerivation rec {
2626 let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in
2727 { inherit (impl) augmentedPkgs pins callPackage; };
2828 updateScript = ''
29+ #!${stdenv.shell}
2930 set -e
3031 echo
3132 cd ${toString ./.}
pkgs/tools/package-management/nix-update-source/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
1+{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
22python3Packages.buildPythonApplication rec {
33 version = "0.6.3";
44 name = "nix-update-source-${version}";
@@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec {
2828 overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; });
2929 };
3030 updateScript = ''
31+ #!${stdenv.shell}
3132 set -e
3233 echo
3334 cd ${toString ./.}
pkgs/tools/security/gnu-pw-mgr/default.nix+1−1
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 name = "gnu-pw-mgr-${version}";
55 version = "2.4.2";
66 src = fetchurl {
7− url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
7+ url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
88 sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
99 };
1010
pkgs/tools/security/monkeysphere/default.nix+4−2
@@ -31,8 +31,10 @@ stdenv.mkDerivation rec {
3131 DESTDIR=$(out)
3232 '';
3333
34− # Not all checks pass yet (NixOS specific problems) and the tests "drain"
35− # entropy (apparently GnuPG still uses /dev/random).
34+ # The tests "drain" entropy (GnuPG still uses /dev/random) and they don't run
35+ # inside of the sandbox, because nixbld isn't allowed to login via SSH
36+ # (/etc/passwd: "nixbld:x:1000:100:Nix build user:/build:/noshell",
37+ # sshd: "User nixbld not allowed because shell /noshell does not exist").
3638 doCheck = false;
3739 preCheck = ''
3840 patchShebangs tests/
pkgs/tools/security/oath-toolkit/default.nix+1−1
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333
3434 meta = with stdenv.lib; {
3535 description = "Components for building one-time password authentication systems";
36− homepage = http://www.nongnu.org/oath-toolkit/;
36+ homepage = https://www.nongnu.org/oath-toolkit/;
3737 platforms = with platforms; linux ++ darwin;
3838 };
3939}
pkgs/tools/system/acct/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 license = licenses.gpl3Plus;
2424
25− homepage = http://www.gnu.org/software/acct/;
25+ homepage = https://www.gnu.org/software/acct/;
2626
2727 maintainers = with maintainers; [ pSub ];
2828 platforms = platforms.linux;
pkgs/tools/system/ddrescue/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 second and successive copies.
4242 '';
4343
44− homepage = http://www.gnu.org/software/ddrescue/ddrescue.html;
44+ homepage = https://www.gnu.org/software/ddrescue/ddrescue.html;
4545
4646 license = licenses.gpl3Plus;
4747
pkgs/tools/system/fdisk/default.nix+2−2
@@ -1,7 +1,7 @@
11{ fetchurl, stdenv, parted, libuuid, gettext, guile }:
22
33stdenv.mkDerivation rec {
4− name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
4+ name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
55
66 src = fetchurl {
77 url = "mirror://gnu/fdisk/${name}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 license = stdenv.lib.licenses.gpl3Plus;
2424
25− homepage = http://www.gnu.org/software/fdisk/;
25+ homepage = https://www.gnu.org/software/fdisk/;
2626
2727 platforms = stdenv.lib.platforms.linux;
2828 };
pkgs/tools/system/freeipmi/default.nix+2−2
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
3030 info.
3131 '';
3232
33− homepage = http://www.gnu.org/software/freeipmi/;
34− downloadPage = "http://www.gnu.org/software/freeipmi/download.html";
33+ homepage = https://www.gnu.org/software/freeipmi/;
34+ downloadPage = "https://www.gnu.org/software/freeipmi/download.html";
3535
3636 license = stdenv.lib.licenses.gpl3Plus;
3737
pkgs/tools/system/mcron/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 when jobs should be run. Mcron was written by Dale Mellor.
3131 '';
3232
33− homepage = http://www.gnu.org/software/mcron/;
33+ homepage = https://www.gnu.org/software/mcron/;
3434
3535 license = stdenv.lib.licenses.gpl3Plus;
3636 platforms = stdenv.lib.platforms.unix;
pkgs/tools/system/s-tui/default.nix+2−2
@@ -3,11 +3,11 @@
33pythonPackages.buildPythonPackage rec {
44 name = "${pname}-${version}";
55 pname = "s-tui";
6− version = "0.8.2";
6+ version = "0.8.3";
77
88 src = pythonPackages.fetchPypi {
99 inherit pname version;
10− sha256 = "18bn0bpnrljx11gj95m2x5hlsnb8jkivlm6b1xx035ldgj1svgzh";
10+ sha256 = "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m";
1111 };
1212
1313 propagatedBuildInputs = with pythonPackages; [
pkgs/tools/system/which/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 meta = with stdenv.lib; {
12− homepage = http://ftp.gnu.org/gnu/which/;
12+ homepage = https://www.gnu.org/software/which/;
1313 platforms = platforms.all;
1414 license = licenses.gpl3;
1515 };
pkgs/tools/text/diffutils/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";
2222
2323 meta = with stdenv.lib; {
24− homepage = http://www.gnu.org/software/diffutils/diffutils.html;
24+ homepage = https://www.gnu.org/software/diffutils/diffutils.html;
2525 description = "Commands for showing the differences between files (diff, cmp, etc.)";
2626 license = licenses.gpl3;
2727 platforms = platforms.unix;
pkgs/tools/text/enscript/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535
3636 license = stdenv.lib.licenses.gpl3Plus;
3737
38− homepage = http://www.gnu.org/software/enscript/;
38+ homepage = https://www.gnu.org/software/enscript/;
3939
4040 maintainers = [ ];
4141 platforms = stdenv.lib.platforms.all;
pkgs/tools/text/gawk/default.nix+1−1
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 };
5656
5757 meta = with stdenv.lib; {
58− homepage = http://www.gnu.org/software/gawk/;
58+ homepage = https://www.gnu.org/software/gawk/;
5959 description = "GNU implementation of the Awk programming language";
6060
6161 longDescription = ''
pkgs/tools/text/gnugrep/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
4141 '';
4242
4343 meta = with stdenv.lib; {
44− homepage = http://www.gnu.org/software/grep/;
44+ homepage = https://www.gnu.org/software/grep/;
4545 description = "GNU implementation of the Unix grep command";
4646
4747 longDescription = ''
pkgs/tools/text/gnupatch/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 more original files, producing patched versions.
4242 '';
4343
44− homepage = http://savannah.gnu.org/projects/patch;
44+ homepage = https://savannah.gnu.org/projects/patch;
4545
4646 license = stdenv.lib.licenses.gpl3Plus;
4747
pkgs/tools/text/gnused/422.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 outputs = [ "out" "info" ];
1414
1515 meta = {
16− homepage = http://www.gnu.org/software/sed/;
16+ homepage = https://www.gnu.org/software/sed/;
1717 description = "GNU sed, a batch stream editor";
1818
1919 longDescription = ''
pkgs/tools/text/gnused/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
1919
2020 meta = {
21− homepage = http://www.gnu.org/software/sed/;
21+ homepage = https://www.gnu.org/software/sed/;
2222 description = "GNU sed, a batch stream editor";
2323
2424 longDescription = ''
pkgs/tools/text/groff/default.nix+1−1
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
107107 '';
108108
109109 meta = with stdenv.lib; {
110− homepage = http://www.gnu.org/software/groff/;
110+ homepage = https://www.gnu.org/software/groff/;
111111 description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
112112 license = licenses.gpl3Plus;
113113 platforms = platforms.all;
pkgs/tools/text/numdiff/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 line by line and field by field, ignoring small numeric differences
1616 or/and different numeric formats
1717 '';
18− homepage = http://www.nongnu.org/numdiff/;
18+ homepage = https://www.nongnu.org/numdiff/;
1919 license = licenses.gpl3Plus;
2020 maintainers = with maintainers; [ ndowens ];
2121 platforms = platforms.gnu ++ platforms.linux;
pkgs/tools/text/poedit/default.nix+1−1
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 name = "poedit-1.5.7";
55
66 src = fetchurl {
7− url = "http://prdownloads.sourceforge.net/poedit/${name}.tar.gz";
7+ url = "mirror://sourceforge/poedit/${name}.tar.gz";
88 sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4";
99 };
1010
pkgs/tools/text/recode/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 '';
2929
3030 meta = {
31− homepage = http://www.gnu.org/software/recode/;
31+ homepage = https://www.gnu.org/software/recode/;
3232 description = "Converts files between various character sets and usages";
3333 platforms = stdenv.lib.platforms.unix;
3434 license = stdenv.lib.licenses.gpl2Plus;
pkgs/tools/text/source-highlight/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020
2121 meta = {
2222 description = "Source code renderer with syntax highlighting";
23− homepage = http://www.gnu.org/software/src-highlite/;
23+ homepage = https://www.gnu.org/software/src-highlite/;
2424 license = stdenv.lib.licenses.gpl3Plus;
2525 platforms = with stdenv.lib.platforms; linux ++ darwin;
2626 longDescription =
pkgs/tools/text/wdiff/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 checkInputs = [ which ];
1414
1515 meta = {
16− homepage = http://www.gnu.org/software/wdiff/;
16+ homepage = https://www.gnu.org/software/wdiff/;
1717 description = "Comparing files on a word by word basis";
1818 license = stdenv.lib.licenses.gpl3Plus;
1919 maintainers = [ stdenv.lib.maintainers.eelco ];
pkgs/tools/typesetting/lout/default.nix+4−4
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 "mirror://savannah/lout/${name}.tar.gz" # new!
1010 "mirror://sourceforge/lout/${name}.tar.gz" # to be phased out
1111 # XXX: We could add the CTAN mirrors
12− # (see http://www.ctan.org/tex-archive/support/lout/).
12+ # (see https://www.ctan.org/tex-archive/support/lout/).
1313 ];
1414 sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix";
1515 };
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
4040 went back to the beginning.
4141 '';
4242
43− # Author's page: http://www.cs.usyd.edu.au/~jeff/
44− # Wiki: http://lout.wiki.sourceforge.net/
45− homepage = http://savannah.nongnu.org/projects/lout/;
43+ # Author's page: http://jeffreykingston.id.au/lout/
44+ # Wiki: https://sourceforge.net/p/lout/wiki/
45+ homepage = https://savannah.nongnu.org/projects/lout/;
4646
4747 license = stdenv.lib.licenses.gpl3Plus;
4848
pkgs/tools/typesetting/tex/auctex/default.nix+1−1
@@ -30,7 +30,7 @@ let auctex = stdenv.mkDerivation ( rec {
3030
3131 meta = {
3232 description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
33− homepage = http://www.gnu.org/software/auctex;
33+ homepage = https://www.gnu.org/software/auctex;
3434 platforms = stdenv.lib.platforms.unix;
3535 license = stdenv.lib.licenses.gpl3;
3636 };
pkgs/top-level/all-packages.nix+27−18
@@ -294,8 +294,8 @@ with pkgs;
294294 ... # For hash agility
295295 }@args: fetchzip ({
296296 inherit name;
297− url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
298− meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/";
297+ url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
298+ meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/";
299299 } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; };
300300
301301 # gitlab example
@@ -611,6 +611,8 @@ with pkgs;
611611
612612 aws-env = callPackage ../tools/admin/aws-env { };
613613
614+ aws-google-auth = pythonPackages.callPackage ../tools/admin/aws-google-auth { };
615+
614616 aws-okta = callPackage ../tools/security/aws-okta { };
615617
616618 aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };
@@ -919,7 +921,8 @@ with pkgs;
919921 filebeat6
920922 heartbeat6
921923 metricbeat6
922− packetbeat6;
924+ packetbeat6
925+ journalbeat6;
923926
924927 filebeat = filebeat6;
925928 heartbeat = heartbeat6;
@@ -2453,7 +2456,7 @@ with pkgs;
24532456
24542457 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
24552458 elk5Version = "5.6.9";
2456− elk6Version = "6.3.2";
2459+ elk6Version = "6.5.1";
24572460
24582461 elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
24592462 elasticsearch6 = callPackage ../servers/search/elasticsearch { };
@@ -4487,7 +4490,7 @@ with pkgs;
44874490 # ntfsprogs are merged into ntfs-3g
44884491 ntfsprogs = pkgs.ntfs3g;
44894492
4490− ntfy = pythonPackages.ntfy;
4493+ ntfy = callPackage ../tools/misc/ntfy {};
44914494
44924495 ntopng = callPackage ../tools/networking/ntopng { };
44934496
@@ -8920,6 +8923,8 @@ with pkgs;
89208923 scons = sconsPackages.scons_3_0_1;
89218924 scons_2_5_1 = sconsPackages.scons_2_5_1;
89228925
8926+ mill = callPackage ../development/tools/build-managers/mill { };
8927+
89238928 sbt = callPackage ../development/tools/build-managers/sbt { };
89248929 sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
89258930 simpleBuildTool = sbt;
@@ -10194,6 +10199,8 @@ with pkgs;
1019410199
1019510200 hyena = callPackage ../development/libraries/hyena { mono = mono4; };
1019610201
10202+ hyperscan = callPackage ../development/libraries/hyperscan { };
10203+
1019710204 icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({
1019810205 nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
1019910206 } //
@@ -11684,6 +11691,7 @@ with pkgs;
1168411691
1168511692 opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
1168611693 enableCuda = config.cudaSupport or false;
11694+ inherit (darwin) cf-private;
1168711695 inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
1168811696 };
1168911697
@@ -11691,6 +11699,12 @@ with pkgs;
1169111699 enableCuda = false;
1169211700 };
1169311701
11702+ opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
11703+ enableCuda = config.cudaSupport or false;
11704+ inherit (darwin) cf-private;
11705+ inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
11706+ };
11707+
1169411708 openexr = callPackage ../development/libraries/openexr { };
1169511709
1169611710 openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
@@ -14372,16 +14386,6 @@ with pkgs;
1437214386 ];
1437314387 };
1437414388
14375− linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix {
14376− kernelPatches =
14377− [ kernelPatches.bridge_stp_helper
14378− # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
14379− # when adding a new linux version
14380− # kernelPatches.cpu-cgroup-v2."4.11"
14381− kernelPatches.modinst_arg_list_too_long
14382− ];
14383− };
14384−
1438514389 linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix {
1438614390 kernelPatches =
1438714391 [ kernelPatches.bridge_stp_helper
@@ -14577,7 +14581,6 @@ with pkgs;
1457714581 linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
1457814582 linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
1457914583 linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
14580− linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18);
1458114584 linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
1458214585 # Don't forget to update linuxPackages_latest!
1458314586
@@ -15429,6 +15432,8 @@ with pkgs;
1542915432
1543015433 medio = callPackage ../data/fonts/medio { };
1543115434
15435+ mnist = callPackage ../data/machine-learning/mnist { };
15436+
1543215437 mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
1543315438
1543415439 monoid = callPackage ../data/fonts/monoid { };
@@ -19494,7 +19499,9 @@ with pkgs;
1949419499
1949519500 vcv-rack = callPackage ../applications/audio/vcv-rack { };
1949619501
19497− vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
19502+ vdirsyncer = callPackage ../tools/misc/vdirsyncer {
19503+ inherit (darwin.apple_sdk.frameworks) Security;
19504+ };
1949819505
1949919506 vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
1950019507
@@ -21925,6 +21932,8 @@ with pkgs;
2192521932
2192621933 beep = callPackage ../misc/beep { };
2192721934
21935+ bees = callPackage ../tools/filesystems/bees { };
21936+
2192821937 blackbird = callPackage ../misc/themes/blackbird { };
2192921938
2193021939 bootil = callPackage ../development/libraries/bootil { };
@@ -23014,7 +23023,7 @@ with pkgs;
2301423023 avrgcc = pkgsCross.avr.buildPackages.gcc;
2301523024 avrbinutils = pkgsCross.avr.buildPackages.binutils;
2301623025 gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
23017− binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
23026+ gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc;
2301823027 };
2301923028
2302023029 newlib = callPackage ../development/misc/newlib { };
pkgs/top-level/coq-packages.nix+3−1
@@ -88,7 +88,9 @@ in rec {
8888 coqPackages_8_7 = mkCoqPackages coq_8_7;
8989 coqPackages_8_8 = mkCoqPackages coq_8_8;
9090 coqPackages_8_9 = mkCoqPackages coq_8_9;
91− coqPackages = coqPackages_8_8;
91+ coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
92+ coqPackages_8_8
93+ );
9294 coq = coqPackages.coq;
9395
9496}
pkgs/top-level/ocaml-packages.nix+5
@@ -131,6 +131,9 @@ let
131131
132132 bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { };
133133
134+ bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { };
135+ bisect_ppx-ocamlbuild = callPackage ../development/ocaml-modules/bisect_ppx-ocamlbuild { };
136+
134137 ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
135138
136139 cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
@@ -552,6 +555,8 @@ let
552555
553556 opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { };
554557
558+ opti = callPackage ../development/ocaml-modules/opti { };
559+
555560 otfm = callPackage ../development/ocaml-modules/otfm { };
556561
557562 otr = callPackage ../development/ocaml-modules/otr { };
pkgs/top-level/python-packages.nix+5−2
@@ -1327,6 +1327,11 @@ in {
13271327 pythonPackages = self;
13281328 });
13291329
1330+ opencv4 = toPythonModule (pkgs.opencv4.override {
1331+ enablePython = true;
1332+ pythonPackages = self;
1333+ });
1334+
13301335 openidc-client = callPackage ../development/python-modules/openidc-client {};
13311336
13321337 idna = callPackage ../development/python-modules/idna { };
@@ -3126,8 +3131,6 @@ in {
31263131
31273132 emoji = callPackage ../development/python-modules/emoji { };
31283133
3129− ntfy = callPackage ../development/python-modules/ntfy { };
3130−
31313134 ntplib = callPackage ../development/python-modules/ntplib { };
31323135
31333136 numba = callPackage ../development/python-modules/numba { };