git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit51ef7c3e497ec09d4bc6b67c7e47e61c308454aa authorFrederik Rietdijk <fridh@fridh.nl> dateThu 5 Dec 2019, 09:14 (7 years ago) parent30fae281451a52
237 files changed+2472−1167
.github/CONTRIBUTING.md+2−3 doc/builders/trivial-builders.xml+17−4 maintainers/maintainer-list.nix+6 nixos/doc/manual/release-notes/rl-2003.xml+6 nixos/lib/test-driver/test-driver.py+73−35 nixos/modules/services/hardware/upower.nix+181 nixos/modules/services/networking/dnschain.nix+2 nixos/modules/services/networking/dnscrypt-wrapper.nix+3 nixos/modules/services/networking/fakeroute.nix+2 nixos/modules/services/networking/monero.nix+7−5 nixos/modules/services/networking/namecoind.nix+2 nixos/modules/services/networking/pdns-recursor.nix+2 nixos/modules/services/networking/privoxy.nix+2 nixos/modules/services/networking/searx.nix+2 nixos/modules/services/torrent/magnetico.nix+2 nixos/modules/services/web-apps/wordpress.nix+1−1 nixos/modules/services/web-servers/nginx/vhost-options.nix+1 nixos/modules/services/x11/compton.nix+2 nixos/modules/services/x11/unclutter.nix+3 nixos/modules/services/x11/urxvtd.nix+2 nixos/modules/tasks/filesystems/zfs.nix+64−2 nixos/tests/all-tests.nix+1 nixos/tests/gocd-agent.nix+16−8 nixos/tests/gocd-server.nix+13−13 nixos/tests/gvisor.nix+49 nixos/tests/i3wm.nix+31−20 nixos/tests/ldap.nix+111−101 nixos/tests/moinmoin.nix+12−8 nixos/tests/openldap.nix+6−4 nixos/tests/pam-oath-login.nix+47−63 nixos/tests/tiddlywiki.nix+41−39 pkgs/applications/audio/cantata/default.nix+1−1 pkgs/applications/audio/easytag/default.nix+1−1 pkgs/applications/audio/opus-tools/default.nix+1−1 pkgs/applications/audio/opusfile/default.nix+1−1 pkgs/applications/audio/snd/default.nix+1−1 pkgs/applications/blockchains/bitcoin-abc.nix+4−4 pkgs/applications/blockchains/bitcoin.nix+5−5 pkgs/applications/editors/emacs-modes/elpa-packages.nix+3 pkgs/applications/editors/flpsed/default.nix+1−1 pkgs/applications/editors/kdevelop5/kdev-php.nix+2−2 pkgs/applications/editors/kdevelop5/kdev-python.nix+2−2 pkgs/applications/editors/kdevelop5/kdevelop.nix+2−2 pkgs/applications/editors/yi/wrapper.nix+1−1 pkgs/applications/graphics/akira/default.nix+76 pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch+88 pkgs/applications/graphics/drawio/default.nix+2−2 pkgs/applications/graphics/gimp/default.nix+2 pkgs/applications/graphics/mcomix/default.nix+1−1 pkgs/applications/graphics/sxiv/default.nix+1−1 pkgs/applications/misc/electron-cash/default.nix+7−7 pkgs/applications/misc/hugo/default.nix+8−8 pkgs/applications/misc/nnn/default.nix+2−2 pkgs/applications/misc/vifm/default.nix+21−6 pkgs/applications/misc/workrave/default.nix+1−2 pkgs/applications/misc/xdgmenumaker/default.nix+24−14 pkgs/applications/networking/cluster/kubeval/default.nix+13−13 pkgs/applications/networking/cluster/kubeval/deps.nix−174 pkgs/applications/networking/cluster/terraform-providers/data.nix+93−93 pkgs/applications/networking/instant-messengers/zoom-us/default.nix+2−2 pkgs/applications/networking/mailreaders/imapfilter.nix+1−1 pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+1−1 pkgs/applications/office/libreoffice/default.nix+14−1 pkgs/applications/office/libreoffice/still.nix+14−1 pkgs/applications/office/scribus/unstable.nix+14−1 pkgs/applications/science/astronomy/gildas/default.nix+3−3 pkgs/applications/science/logic/symbiyosys/default.nix+3−1 pkgs/applications/science/math/sage/sage-tests.nix+1−1 pkgs/applications/science/misc/vite/default.nix+1−1 pkgs/applications/version-management/gitlab/data.json+3−3 pkgs/applications/version-management/gitlab/gitaly/deps.nix+18 pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix+18 pkgs/applications/video/mkvtoolnix/default.nix+1−1 pkgs/applications/video/mpv/default.nix+1−1 pkgs/applications/virtualization/gvisor/containerd-shim.nix+36 pkgs/applications/virtualization/gvisor/default.nix+101 pkgs/build-support/agda/default.nix−2 pkgs/build-support/trivial-builders.nix+25−4 pkgs/build-support/vm/windows/default.nix+1−2 pkgs/data/fonts/cantarell-fonts/default.nix+1−1 pkgs/desktops/deepin/dbus-factory/default.nix+1−1 pkgs/desktops/deepin/dde-api/default.nix+1−1 pkgs/desktops/deepin/dde-calendar/default.nix+1−1 pkgs/desktops/deepin/dde-control-center/default.nix+1−1 pkgs/desktops/deepin/dde-daemon/default.nix+1−1 pkgs/desktops/deepin/dde-dock/default.nix+1−1 pkgs/desktops/deepin/dde-file-manager/default.nix+1−1 pkgs/desktops/deepin/dde-launcher/default.nix+1−1 pkgs/desktops/deepin/dde-network-utils/default.nix+1−1 pkgs/desktops/deepin/dde-polkit-agent/default.nix+1−1 pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix+1−1 pkgs/desktops/deepin/dde-session-ui/default.nix+1−1 pkgs/desktops/deepin/deepin-anything/default.nix+1−1 pkgs/desktops/deepin/deepin-calculator/default.nix+1−1 pkgs/desktops/deepin/deepin-desktop-base/default.nix+1−1 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+1−1 pkgs/desktops/deepin/deepin-gettext-tools/default.nix+1−1 pkgs/desktops/deepin/deepin-gtk-theme/default.nix+1−1 pkgs/desktops/deepin/deepin-icon-theme/default.nix+1−1 pkgs/desktops/deepin/deepin-image-viewer/default.nix+1−1 pkgs/desktops/deepin/deepin-menu/default.nix+1−1 pkgs/desktops/deepin/deepin-movie-reborn/default.nix+1−1 pkgs/desktops/deepin/deepin-screenshot/default.nix+1−1 pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix+1−1 pkgs/desktops/deepin/deepin-sound-theme/default.nix+1−1 pkgs/desktops/deepin/deepin-terminal/default.nix+1−1 pkgs/desktops/deepin/deepin-turbo/default.nix+1−1 pkgs/desktops/deepin/deepin-wallpapers/default.nix+1−1 pkgs/desktops/deepin/disomaster/default.nix+1−1 pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix+1−1 pkgs/desktops/deepin/dtkcore/default.nix+1−1 pkgs/desktops/deepin/dtkwidget/default.nix+1−1 pkgs/desktops/deepin/dtkwm/default.nix+1−1 pkgs/desktops/deepin/go-dbus-factory/default.nix+1−1 pkgs/desktops/deepin/go-dbus-generator/default.nix+1−1 pkgs/desktops/deepin/go-gir-generator/default.nix+1−1 pkgs/desktops/deepin/go-lib/default.nix+1−1 pkgs/desktops/deepin/qcef/default.nix+1−1 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix+1−1 pkgs/desktops/deepin/qt5integration/default.nix+1−1 pkgs/desktops/deepin/udisks2-qt5/default.nix+1−1 pkgs/desktops/pantheon/apps/appcenter/default.nix+2−2 pkgs/development/compilers/ghc/8.4.4.nix+1−1 pkgs/development/compilers/ghc/8.6.5.nix+1−1 pkgs/development/compilers/ghc/8.8.1.nix+1−1 pkgs/development/compilers/ghc/head.nix+1−1 pkgs/development/compilers/manticore/default.nix+3−3 pkgs/development/compilers/orc/default.nix+1−1 pkgs/development/compilers/rgbds/default.nix+2−2 pkgs/development/compilers/smlnj/default.nix+42−26 pkgs/development/compilers/smlnj/heap2exec.diff+9 pkgs/development/interpreters/php/default.nix+19−6 pkgs/development/interpreters/racket/default.nix+1−1 pkgs/development/libraries/agda/Agda-Sheaves/default.nix+1−1 pkgs/development/libraries/agda/TotalParserCombinators/default.nix+1−1 pkgs/development/libraries/agda/agda-base/default.nix+1−1 pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix+1−1 pkgs/development/libraries/agda/agda-prelude/default.nix+1−1 pkgs/development/libraries/agda/agda-stdlib/default.nix+1−1 pkgs/development/libraries/agda/bitvector/default.nix+1−1 pkgs/development/libraries/agda/categories/default.nix+1−1 pkgs/development/libraries/agda/pretty/default.nix+1−1 pkgs/development/libraries/enet/default.nix+1−1 pkgs/development/libraries/ffmpeg-full/default.nix+1−1 pkgs/development/libraries/ffmpeg/generic.nix+1−1 pkgs/development/libraries/ffms/default.nix+1−1 pkgs/development/libraries/giflib/default.nix+1−1 pkgs/development/libraries/glm/default.nix+1−1 pkgs/development/libraries/gloox/default.nix+1−1 pkgs/development/libraries/gpgme/default.nix+1−1 pkgs/development/libraries/grpc/default.nix+9−1 pkgs/development/libraries/gtkspell/3.nix+1−1 pkgs/development/libraries/hunspell/default.nix+1−1 pkgs/development/libraries/libaal/default.nix+1−1 pkgs/development/libraries/libao/default.nix+1−1 pkgs/development/libraries/libgpg-error/default.nix+1−1 pkgs/development/libraries/libid3tag/default.nix+1−1 pkgs/development/libraries/libmpeg2/default.nix+1−1 pkgs/development/libraries/libpng/12.nix+1−1 pkgs/development/libraries/libpng/default.nix+1−1 pkgs/development/libraries/mimalloc/default.nix+16−12 pkgs/development/libraries/oniguruma/default.nix+1−1 pkgs/development/libraries/protobuf/3.11.nix+2−2 pkgs/development/libraries/protolock/default.nix+3−3 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+21−20 pkgs/development/libraries/science/math/QuadProgpp/default.nix+1−1 pkgs/development/libraries/science/math/or-tools/default.nix+1−1 pkgs/development/libraries/slang/default.nix+1−1 pkgs/development/libraries/sphinxbase/default.nix+1−1 pkgs/development/ocaml-modules/metrics/default.nix+27 pkgs/development/ocaml-modules/metrics/lwt.nix+14 pkgs/development/ocaml-modules/metrics/unix.nix+19 pkgs/development/python-modules/chainer/default.nix+21−10 pkgs/development/python-modules/django/2_2.nix+2−2 pkgs/development/python-modules/flask-httpauth/default.nix+20 pkgs/development/python-modules/gpapi/default.nix+6−1 pkgs/development/python-modules/gplaycli/default.nix+2−2 pkgs/development/python-modules/livestreamer/default.nix+1−1 pkgs/development/python-modules/pytest-bdd/default.nix+39 pkgs/development/tools/analysis/nix-linter/default.nix+45 pkgs/development/tools/build-managers/bazel/default.nix+14−9 pkgs/development/tools/build-managers/bazel/strict_action_env.patch+13 pkgs/development/tools/conftest/default.nix+3−5 pkgs/development/tools/doctl/default.nix+3−3 pkgs/development/tools/profiling/EZTrace/default.nix+1−1 pkgs/development/tools/vagrant/default.nix+2−2 pkgs/development/tools/vagrant/gemset.nix+91−90 pkgs/development/web/nodejs/v13.nix+2−2 pkgs/games/extremetuxracer/default.nix+1−1 pkgs/games/super-tux-kart/default.nix+1−1 pkgs/games/tibia/default.nix+1−1 pkgs/misc/drivers/xboxdrv/default.nix+1−1 pkgs/misc/emulators/hatari/default.nix+1−1 pkgs/misc/emulators/ppsspp/default.nix+1−1 pkgs/misc/vim-plugins/generated.nix+122−89 pkgs/misc/vim-plugins/vim-plugin-names+3 pkgs/os-specific/linux/audit/default.nix+1−1 pkgs/os-specific/linux/bpftrace/default.nix+2−2 pkgs/os-specific/linux/hdparm/default.nix+1−1 pkgs/os-specific/linux/iwd/default.nix+2−2 pkgs/os-specific/linux/libaio/default.nix+1−1 pkgs/os-specific/linux/pktgen/default.nix+1−3 pkgs/os-specific/linux/upower/default.nix+2 pkgs/servers/dns/knot-resolver/default.nix+2−2 pkgs/servers/mautrix-whatsapp/0001-Add-missing-go-dependencies-to-go.sum.patch+46 pkgs/servers/mautrix-whatsapp/default.nix+7−5 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix+9−3 pkgs/servers/mpd/default.nix+1−1 pkgs/servers/sql/postgresql/ext/tds_fdw.nix+2−2 pkgs/servers/xmpp/ejabberd/default.nix+4−4 pkgs/tools/X11/xnee/default.nix+1−1 pkgs/tools/admin/eksctl/default.nix+3−3 pkgs/tools/audio/mpdris2/default.nix+36−12 pkgs/tools/backup/hpe-ltfs/default.nix+30 pkgs/tools/graphics/gifsicle/default.nix+1−1 pkgs/tools/misc/cloc/default.nix+1−1 pkgs/tools/misc/ffsend/default.nix+4−4 pkgs/tools/misc/fzf/default.nix+4−3 pkgs/tools/misc/licensor/default.nix+3−3 pkgs/tools/misc/rlwrap/default.nix+1−1 pkgs/tools/misc/starship/default.nix+9−4 pkgs/tools/misc/youtube-dl/default.nix+1−1 pkgs/tools/networking/babeld/default.nix+1−1 pkgs/tools/networking/connman/connman-notify/default.nix+17−21 pkgs/tools/networking/croc/default.nix+3−3 pkgs/tools/networking/pmacct/default.nix+62 pkgs/tools/package-management/cargo-deb/default.nix+3−3 pkgs/tools/package-management/cargo-edit/default.nix+13−3 pkgs/tools/package-management/cargo-edit/no_upgrade_index_in_tests.patch+123 pkgs/tools/package-management/pacman/default.nix+6−6 pkgs/tools/security/pius/default.nix+1−1 pkgs/tools/security/stoken/default.nix+1−1 pkgs/tools/typesetting/tex/texlive/bin.nix+1−1 pkgs/top-level/all-packages.nix+48−6 pkgs/top-level/ocaml-packages.nix+6 pkgs/top-level/php-packages.nix+14−4 pkgs/top-level/python-packages.nix+4
.github/CONTRIBUTING.md+2−3
@@ -6,9 +6,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
66## Opening issues
77
88* Make sure you have a [GitHub account](https://github.com/signup/free)
9−* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist.
10− * Clearly describe the issue including steps to reproduce when it is a bug.
11− * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision).
9+* Make sure there is no open issue on the topic
10+* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template
1211
1312## Submitting changes
1413
doc/builders/trivial-builders.xml+17−4
@@ -7,7 +7,7 @@
77 Nixpkgs provides a couple of functions that help with building derivations. The most important one, <function>stdenv.mkDerivation</function>, has already been documented above. The following functions wrap <function>stdenv.mkDerivation</function>, making it easier to use in certain cases.
88 </para>
99 <variablelist>
10− <varlistentry>
10+ <varlistentry xml:id="trivial-builder-runCommand">
1111 <term>
1212 <literal>runCommand</literal>
1313 </term>
@@ -40,7 +40,7 @@
4040</programlisting>
4141 </listitem>
4242 </varlistentry>
43− <varlistentry>
43+ <varlistentry xml:id="trivial-builder-runCommandCC">
4444 <term>
4545 <literal>runCommandCC</literal>
4646 </term>
@@ -50,7 +50,20 @@
5050 </para>
5151 </listitem>
5252 </varlistentry>
53− <varlistentry>
53+ <varlistentry xml:id="trivial-builder-runCommandLocal">
54+ <term>
55+ <literal>runCommandLocal</literal>
56+ </term>
57+ <listitem>
58+ <para>
59+ Variant of <literal>runCommand</literal> that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (&lt;1s execution time). It saves on the network roundrip and can speed up a build.
60+ </para>
61+ <note><para>
62+ This sets <link xlink:href="https://nixos.org/nix/manual/#adv-attr-allowSubstitutes"><literal>allowSubstitutes</literal> to <literal>false</literal></link>, so only use <literal>runCommandLocal</literal> if you are certain the user will always have a builder for the <literal>system</literal> of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the <literal>system</literal> is usually the same as <literal>builtins.currentSystem</literal>.
63+ </para></note>
64+ </listitem>
65+ </varlistentry>
66+ <varlistentry xml:id="trivial-builder-writeText">
5467 <term>
5568 <literal>writeTextFile</literal>, <literal>writeText</literal>, <literal>writeTextDir</literal>, <literal>writeScript</literal>, <literal>writeScriptBin</literal>
5669 </term>
@@ -63,7 +76,7 @@
6376 </para>
6477 </listitem>
6578 </varlistentry>
66− <varlistentry>
79+ <varlistentry xml:id="trivial-builder-symlinkJoin">
6780 <term>
6881 <literal>symlinkJoin</literal>
6982 </term>
maintainers/maintainer-list.nix+6
@@ -3225,6 +3225,12 @@
32253225 githubId = 2195834;
32263226 name = "Jaakko Luttinen";
32273227 };
3228+ jm2dev = {
3229+ email = "jomarcar@gmail.com";
3230+ github = "jm2dev";
3231+ githubId = 474643;
3232+ name = "José Miguel Martínez Carrasco";
3233+ };
32283234 jmagnusj = {
32293235 email = "jmagnusj@gmail.com";
32303236 github = "magnusjonsson";
nixos/doc/manual/release-notes/rl-2003.xml+6
@@ -77,6 +77,12 @@
7777 be set if the hostname of the node should be non default.
7878 </para>
7979 </listitem>
80+ <listitem>
81+ <para>
82+ UPower's configuration is now managed by NixOS and can be customized
83+ via <option>services.upower</option>.
84+ </para>
85+ </listitem>
8086 </itemizedlist>
8187
8288 </section>
nixos/lib/test-driver/test-driver.py+73−35
@@ -312,8 +312,13 @@ class Machine:
312312 self.monitor.send(message)
313313 return self.wait_for_monitor_prompt()
314314
315− def wait_for_unit(self, unit: str, user: Optional[str] = None) -> bool:
316− while True:
315+ def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
316+ """Wait for a systemd unit to get into "active" state.
317+ Throws exceptions on "failed" and "inactive" states as well as
318+ after timing out.
319+ """
320+
321+ def check_active(_: Any) -> bool:
317322 info = self.get_unit_info(unit, user)
318323 state = info["ActiveState"]
319324 if state == "failed":
@@ -329,8 +334,10 @@ class Machine:
329334 'unit "{}" is inactive and there ' "are no pending jobs"
330335 ).format(unit)
331336 )
332− if state == "active":
333− return True
337+
338+ return state == "active"
339+
340+ retry(check_active)
334341
335342 def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
336343 status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)
@@ -421,18 +428,34 @@ class Machine:
421428 )
422429
423430 def wait_until_succeeds(self, command: str) -> str:
431+ """Wait until a command returns success and return its output.
432+ Throws an exception on timeout.
433+ """
434+ output = ""
435+
436+ def check_success(_: Any) -> bool:
437+ nonlocal output
438+ status, output = self.execute(command)
439+ return status == 0
440+
424441 with self.nested("waiting for success: {}".format(command)):
425− while True:
426− status, output = self.execute(command)
427− if status == 0:
428− return output
442+ retry(check_success)
443+ return output
429444
430445 def wait_until_fails(self, command: str) -> str:
446+ """Wait until a command returns failure.
447+ Throws an exception on timeout.
448+ """
449+ output = ""
450+
451+ def check_failure(_: Any) -> bool:
452+ nonlocal output
453+ status, output = self.execute(command)
454+ return status != 0
455+
431456 with self.nested("waiting for failure: {}".format(command)):
432− while True:
433− status, output = self.execute(command)
434− if status != 0:
435− return output
457+ retry(check_failure)
458+ return output
436459
437460 def wait_for_shutdown(self) -> None:
438461 if not self.booted:
@@ -453,25 +476,38 @@ class Machine:
453476 )
454477 return output
455478
456− def wait_until_tty_matches(self, tty: str, regexp: str) -> bool:
479+ def wait_until_tty_matches(self, tty: str, regexp: str) -> None:
480+ """Wait until the visible output on the chosen TTY matches regular
481+ expression. Throws an exception on timeout.
482+ """
457483 matcher = re.compile(regexp)
484+
485+ def tty_matches(last: bool) -> bool:
486+ text = self.get_tty_text(tty)
487+ if last:
488+ self.log(
489+ f"Last chance to match /{regexp}/ on TTY{tty}, "
490+ f"which currently contains: {text}"
491+ )
492+ return len(matcher.findall(text)) > 0
493+
458494 with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
459− while True:
460− text = self.get_tty_text(tty)
461− if len(matcher.findall(text)) > 0:
462− return True
495+ retry(tty_matches)
463496
464497 def send_chars(self, chars: List[str]) -> None:
465498 with self.nested("sending keys ‘{}‘".format(chars)):
466499 for char in chars:
467500 self.send_key(char)
468501
469− def wait_for_file(self, filename: str) -> bool:
502+ def wait_for_file(self, filename: str) -> None:
503+ """Waits until the file exists in machine's file system."""
504+
505+ def check_file(_: Any) -> bool:
506+ status, _ = self.execute("test -e {}".format(filename))
507+ return status == 0
508+
470509 with self.nested("waiting for file ‘{}‘".format(filename)):
471− while True:
472− status, _ = self.execute("test -e {}".format(filename))
473− if status == 0:
474− return True
510+ retry(check_file)
475511
476512 def wait_for_open_port(self, port: int) -> None:
477513 def port_is_open(_: Any) -> bool:
@@ -494,8 +530,8 @@ class Machine:
494530 def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
495531 return self.systemctl("stop {}".format(jobname), user)
496532
497− def wait_for_job(self, jobname: str) -> bool:
498− return self.wait_for_unit(jobname)
533+ def wait_for_job(self, jobname: str) -> None:
534+ self.wait_for_unit(jobname)
499535
500536 def connect(self) -> None:
501537 if self.connected:
@@ -700,18 +736,20 @@ class Machine:
700736 """Wait until it is possible to connect to the X server. Note that
701737 testing the existence of /tmp/.X11-unix/X0 is insufficient.
702738 """
739+
740+ def check_x(_: Any) -> bool:
741+ cmd = (
742+ "journalctl -b SYSLOG_IDENTIFIER=systemd | "
743+ + 'grep "Reached target Current graphical"'
744+ )
745+ status, _ = self.execute(cmd)
746+ if status != 0:
747+ return False
748+ status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
749+ return status == 0
750+
703751 with self.nested("waiting for the X11 server"):
704− while True:
705− cmd = (
706− "journalctl -b SYSLOG_IDENTIFIER=systemd | "
707− + 'grep "Reached target Current graphical"'
708− )
709− status, _ = self.execute(cmd)
710− if status != 0:
711− continue
712− status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
713− if status == 0:
714− return
752+ retry(check_x)
715753
716754 def get_window_names(self) -> List[str]:
717755 return self.succeed(
nixos/modules/services/hardware/upower.nix+181
@@ -37,6 +37,172 @@ in
3737 '';
3838 };
3939
40+ enableWattsUpPro = mkOption {
41+ type = types.bool;
42+ default = false;
43+ description = ''
44+ Enable the Watts Up Pro device.
45+
46+ The Watts Up Pro contains a generic FTDI USB device without a specific
47+ vendor and product ID. When we probe for WUP devices, we can cause
48+ the user to get a perplexing "Device or resource busy" error when
49+ attempting to use their non-WUP device.
50+
51+ The generic FTDI device is known to also be used on:
52+
53+ <itemizedlist>
54+ <listitem><para>Sparkfun FT232 breakout board</para></listitem>
55+ <listitem><para>Parallax Propeller</para></listitem>
56+ </itemizedlist>
57+ '';
58+ };
59+
60+ noPollBatteries = mkOption {
61+ type = types.bool;
62+ default = false;
63+ description = ''
64+ Don't poll the kernel for battery level changes.
65+
66+ Some hardware will send us battery level changes through
67+ events, rather than us having to poll for it. This option
68+ allows disabling polling for hardware that sends out events.
69+ '';
70+ };
71+
72+ ignoreLid = mkOption {
73+ type = types.bool;
74+ default = false;
75+ description = ''
76+ Do we ignore the lid state
77+
78+ Some laptops are broken. The lid state is either inverted, or stuck
79+ on or off. We can't do much to fix these problems, but this is a way
80+ for users to make the laptop panel vanish, a state that might be used
81+ by a couple of user-space daemons. On Linux systems, see also
82+ logind.conf(5).
83+ '';
84+ };
85+
86+ usePercentageForPolicy = mkOption {
87+ type = types.bool;
88+ default = true;
89+ description = ''
90+ Policy for warnings and action based on battery levels
91+
92+ Whether battery percentage based policy should be used. The default
93+ is to use the percentage, which
94+ should work around broken firmwares. It is also more reliable than
95+ the time left (frantically saving all your files is going to use more
96+ battery than letting it rest for example).
97+ '';
98+ };
99+
100+ percentageLow = mkOption {
101+ type = types.ints.unsigned;
102+ default = 10;
103+ description = ''
104+ When <literal>usePercentageForPolicy</literal> is
105+ <literal>true</literal>, the levels at which UPower will consider the
106+ battery low.
107+
108+ This will also be used for batteries which don't have time information
109+ such as that of peripherals.
110+
111+ If any value (of <literal>percentageLow</literal>,
112+ <literal>percentageCritical</literal> and
113+ <literal>percentageAction</literal>) is invalid, or not in descending
114+ order, the defaults will be used.
115+ '';
116+ };
117+
118+ percentageCritical = mkOption {
119+ type = types.ints.unsigned;
120+ default = 3;
121+ description = ''
122+ When <literal>usePercentageForPolicy</literal> is
123+ <literal>true</literal>, the levels at which UPower will consider the
124+ battery critical.
125+
126+ This will also be used for batteries which don't have time information
127+ such as that of peripherals.
128+
129+ If any value (of <literal>percentageLow</literal>,
130+ <literal>percentageCritical</literal> and
131+ <literal>percentageAction</literal>) is invalid, or not in descending
132+ order, the defaults will be used.
133+ '';
134+ };
135+
136+ percentageAction = mkOption {
137+ type = types.ints.unsigned;
138+ default = 2;
139+ description = ''
140+ When <literal>usePercentageForPolicy</literal> is
141+ <literal>true</literal>, the levels at which UPower will take action
142+ for the critical battery level.
143+
144+ This will also be used for batteries which don't have time information
145+ such as that of peripherals.
146+
147+ If any value (of <literal>percentageLow</literal>,
148+ <literal>percentageCritical</literal> and
149+ <literal>percentageAction</literal>) is invalid, or not in descending
150+ order, the defaults will be used.
151+ '';
152+ };
153+
154+ timeLow = mkOption {
155+ type = types.ints.unsigned;
156+ default = 1200;
157+ description = ''
158+ When <literal>usePercentageForPolicy</literal> is
159+ <literal>false</literal>, the time remaining at which UPower will
160+ consider the battery low.
161+
162+ If any value (of <literal>timeLow</literal>,
163+ <literal>timeCritical</literal> and <literal>timeAction</literal>) is
164+ invalid, or not in descending order, the defaults will be used.
165+ '';
166+ };
167+
168+ timeCritical = mkOption {
169+ type = types.ints.unsigned;
170+ default = 300;
171+ description = ''
172+ When <literal>usePercentageForPolicy</literal> is
173+ <literal>false</literal>, the time remaining at which UPower will
174+ consider the battery critical.
175+
176+ If any value (of <literal>timeLow</literal>,
177+ <literal>timeCritical</literal> and <literal>timeAction</literal>) is
178+ invalid, or not in descending order, the defaults will be used.
179+ '';
180+ };
181+
182+ timeAction = mkOption {
183+ type = types.ints.unsigned;
184+ default = 120;
185+ description = ''
186+ When <literal>usePercentageForPolicy</literal> is
187+ <literal>false</literal>, the time remaining at which UPower will
188+ take action for the critical battery level.
189+
190+ If any value (of <literal>timeLow</literal>,
191+ <literal>timeCritical</literal> and <literal>timeAction</literal>) is
192+ invalid, or not in descending order, the defaults will be used.
193+ '';
194+ };
195+
196+ criticalPowerAction = mkOption {
197+ type = types.enum [ "PowerOff" "Hibernate" "HybridSleep" ];
198+ default = "HybridSleep";
199+ description = ''
200+ The action to take when <literal>timeAction</literal> or
201+ <literal>percentageAction</literal> has been reached for the batteries
202+ (UPS or laptop batteries) supplying the computer
203+ '';
204+ };
205+
40206 };
41207
42208 };
@@ -54,6 +220,21 @@ in
54220
55221 systemd.packages = [ cfg.package ];
56222
223+ environment.etc."UPower/UPower.conf".text = generators.toINI {} {
224+ UPower = {
225+ EnableWattsUpPro = cfg.enableWattsUpPro;
226+ NoPollBatteries = cfg.noPollBatteries;
227+ IgnoreLid = cfg.ignoreLid;
228+ UsePercentageForPolicy = cfg.usePercentageForPolicy;
229+ PercentageLow = cfg.percentageLow;
230+ PercentageCritical = cfg.percentageCritical;
231+ PercentageAction = cfg.percentageAction;
232+ TimeLow = cfg.timeLow;
233+ TimeCritical = cfg.timeCritical;
234+ TimeAction = cfg.timeAction;
235+ CriticalPowerAction = cfg.criticalPowerAction;
236+ };
237+ };
57238 };
58239
59240}
nixos/modules/services/networking/dnschain.nix+2
@@ -180,4 +180,6 @@ in
180180
181181 };
182182
183+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
184+
183185}
nixos/modules/services/networking/dnscrypt-wrapper.nix+3
@@ -197,4 +197,7 @@ in {
197197 };
198198
199199 };
200+
201+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
202+
200203}
nixos/modules/services/networking/fakeroute.nix+2
@@ -60,4 +60,6 @@ in
6060
6161 };
6262
63+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
64+
6365}
nixos/modules/services/networking/monero.nix+7−5
@@ -224,15 +224,17 @@ in
224224 };
225225 };
226226
227− assertions = singleton {
228− assertion = cfg.mining.enable -> cfg.mining.address != "";
229− message = ''
227+ assertions = singleton {
228+ assertion = cfg.mining.enable -> cfg.mining.address != "";
229+ message = ''
230230 You need a Monero address to receive mining rewards:
231231 specify one using option monero.mining.address.
232− '';
233− };
232+ '';
233+ };
234234
235235 };
236236
237+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
238+
237239}
238240
nixos/modules/services/networking/namecoind.nix+2
@@ -201,4 +201,6 @@ in
201201
202202 };
203203
204+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
205+
204206}
nixos/modules/services/networking/pdns-recursor.nix+2
@@ -219,4 +219,6 @@ in {
219219 "To change extra Recursor settings use services.pdns-recursor.settings instead.")
220220 ];
221221
222+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
223+
222224}
nixos/modules/services/networking/privoxy.nix+2
@@ -109,4 +109,6 @@ in
109109
110110 };
111111
112+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
113+
112114}
nixos/modules/services/networking/searx.nix+2
@@ -75,4 +75,6 @@ in
7575
7676 };
7777
78+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
79+
7880}
nixos/modules/services/torrent/magnetico.nix+2
@@ -213,4 +213,6 @@ in {
213213
214214 };
215215
216+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
217+
216218}
nixos/modules/services/web-apps/wordpress.nix+1−1
@@ -127,7 +127,7 @@ let
127127 <note><para>These themes need to be packaged before use, see example.</para></note>
128128 '';
129129 example = ''
130− # For shits and giggles, let's package the responsive theme
130+ # Let's package the responsive theme
131131 responsiveTheme = pkgs.stdenv.mkDerivation {
132132 name = "responsive-theme";
133133 # Download the theme from the wordpress site
nixos/modules/services/web-servers/nginx/vhost-options.nix+1
@@ -207,6 +207,7 @@ with lib;
207207 default = null;
208208 description = ''
209209 Basic Auth password file for a vhost.
210+ Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>
210211 '';
211212 };
212213
nixos/modules/services/x11/compton.nix+2
@@ -284,4 +284,6 @@ in {
284284 environment.systemPackages = [ pkgs.compton ];
285285 };
286286
287+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
288+
287289}
nixos/modules/services/x11/unclutter.nix+3
@@ -71,4 +71,7 @@ in {
7171 serviceConfig.Restart = "always";
7272 };
7373 };
74+
75+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
76+
7477}
nixos/modules/services/x11/urxvtd.nix+2
@@ -45,4 +45,6 @@ in {
4545 environment.variables.RXVT_SOCKET = "/run/user/$(id -u)/urxvtd-socket";
4646 };
4747
48+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
49+
4850}
nixos/modules/tasks/filesystems/zfs.nix+64−2
@@ -12,6 +12,7 @@ let
1212 cfgSnapFlags = cfgSnapshots.flags;
1313 cfgScrub = config.services.zfs.autoScrub;
1414 cfgTrim = config.services.zfs.trim;
15+ cfgZED = config.services.zfs.zed;
1516
1617 inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
1718 inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
@@ -87,6 +88,17 @@ let
8788 }
8889 '';
8990
91+ zedConf = generators.toKeyValue {
92+ mkKeyValue = generators.mkKeyValueDefault {
93+ mkValueString = v:
94+ if isInt v then toString v
95+ else if isString v then "\"${v}\""
96+ else if true == v then "1"
97+ else if false == v then "0"
98+ else if isList v then "\"" + (concatStringsSep " " v) + "\""
99+ else err "this value is" (toString v);
100+ } "=";
101+ } cfgZED.settings;
90102in
91103
92104{
@@ -312,6 +324,32 @@ in
312324 '';
313325 };
314326 };
327+
328+ services.zfs.zed.settings = mkOption {
329+ type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
330+ example = literalExample ''
331+ {
332+ ZED_DEBUG_LOG = "/tmp/zed.debug.log";
333+
334+ ZED_EMAIL_ADDR = [ "root" ];
335+ ZED_EMAIL_PROG = "mail";
336+ ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@";
337+
338+ ZED_NOTIFY_INTERVAL_SECS = 3600;
339+ ZED_NOTIFY_VERBOSE = false;
340+
341+ ZED_USE_ENCLOSURE_LEDS = true;
342+ ZED_SCRUB_AFTER_RESILVER = false;
343+ }
344+ '';
345+ description = ''
346+ ZFS Event Daemon /etc/zfs/zed.d/zed.rc content
347+
348+ See
349+ <citerefentry><refentrytitle>zed</refentrytitle><manvolnum>8</manvolnum></citerefentry>
350+ for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables
351+ '';
352+ };
315353 };
316354
317355 ###### implementation
@@ -389,8 +427,32 @@ in
389427 zfsSupport = true;
390428 };
391429
392− environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/";
393− environment.etc."zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
430+ services.zfs.zed.settings = {
431+ ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
432+ };
433+
434+ environment.etc = genAttrs
435+ (map
436+ (file: "zfs/zed.d/${file}")
437+ [
438+ "all-syslog.sh"
439+ "pool_import-led.sh"
440+ "resilver_finish-start-scrub.sh"
441+ "statechange-led.sh"
442+ "vdev_attach-led.sh"
443+ "zed-functions.sh"
444+ "data-notify.sh"
445+ "resilver_finish-notify.sh"
446+ "scrub_finish-notify.sh"
447+ "statechange-notify.sh"
448+ "vdev_clear-led.sh"
449+ ]
450+ )
451+ (file: { source = "${packages.zfsUser}/etc/${file}"; })
452+ // {
453+ "zfs/zed.d/zed.rc".text = zedConf;
454+ "zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
455+ };
394456
395457 system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
396458 environment.systemPackages = [ packages.zfsUser ]
nixos/tests/all-tests.nix+1
@@ -103,6 +103,7 @@ in
103103 grafana = handleTest ./grafana.nix {};
104104 graphite = handleTest ./graphite.nix {};
105105 graylog = handleTest ./graylog.nix {};
106+ gvisor = handleTest ./gvisor.nix {};
106107 hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
107108 hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
108109 handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
nixos/tests/gocd-agent.nix+16−8
@@ -9,14 +9,18 @@ let
99 header = "Accept: application/vnd.go.cd.v2+json";
1010in
1111
12−import ./make-test.nix ({ pkgs, ...} : {
12+import ./make-test-python.nix ({ pkgs, ...} : {
1313 name = "gocd-agent";
1414 meta = with pkgs.stdenv.lib.maintainers; {
1515 maintainers = [ grahamc swarren83 ];
16+
17+ # gocd agent needs to register with the autoregister key created on first server startup,
18+ # but NixOS module doesn't seem to allow to pass during runtime currently
19+ broken = true;
1620 };
1721
1822 nodes = {
19− gocd_agent =
23+ agent =
2024 { ... }:
2125 {
2226 virtualisation.memorySize = 2046;
@@ -30,11 +34,15 @@ import ./make-test.nix ({ pkgs, ...} : {
3034 };
3135
3236 testScript = ''
33− startAll;
34− $gocd_agent->waitForUnit("gocd-server");
35− $gocd_agent->waitForOpenPort("8153");
36− $gocd_agent->waitForUnit("gocd-agent");
37− $gocd_agent->waitUntilSucceeds("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid");
38− $gocd_agent->succeed("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle");
37+ start_all()
38+ agent.wait_for_unit("gocd-server")
39+ agent.wait_for_open_port("8153")
40+ agent.wait_for_unit("gocd-agent")
41+ agent.wait_until_succeeds(
42+ "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid"
43+ )
44+ agent.succeed(
45+ "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle"
46+ )
3947 '';
4048})
nixos/tests/gocd-server.nix+13−13
@@ -2,7 +2,7 @@
22# 1. GoCD server starts
33# 2. GoCD server responds
44
5−import ./make-test.nix ({ pkgs, ...} :
5+import ./make-test-python.nix ({ pkgs, ...} :
66
77{
88 name = "gocd-server";
@@ -10,19 +10,19 @@ import ./make-test.nix ({ pkgs, ...} :
1010 maintainers = [ swarren83 ];
1111 };
1212
13−nodes = {
14− gocd_server =
15− { ... }:
16− {
17− virtualisation.memorySize = 2046;
18− services.gocd-server.enable = true;
19− };
20−};
13+ nodes = {
14+ server =
15+ { ... }:
16+ {
17+ virtualisation.memorySize = 2046;
18+ services.gocd-server.enable = true;
19+ };
20+ };
2121
2222 testScript = ''
23− $gocd_server->start;
24− $gocd_server->waitForUnit("gocd-server");
25− $gocd_server->waitForOpenPort("8153");
26− $gocd_server->waitUntilSucceeds("curl -s -f localhost:8153/go");
23+ server.start()
24+ server.wait_for_unit("gocd-server")
25+ server.wait_for_open_port(8153)
26+ server.wait_until_succeeds("curl -s -f localhost:8153/go")
2727 '';
2828})
nixos/tests/gvisor.nixnew file+49
@@ -0,0 +1,49 @@
1+# This test runs a container through gvisor and checks if simple container starts
2+
3+import ./make-test-python.nix ({ pkgs, ...} : {
4+ name = "gvisor";
5+ meta = with pkgs.stdenv.lib.maintainers; {
6+ maintainers = [ andrew-d ];
7+ };
8+
9+ nodes = {
10+ gvisor =
11+ { pkgs, ... }:
12+ {
13+ virtualisation.docker = {
14+ enable = true;
15+ extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
16+ };
17+
18+ networking = {
19+ dhcpcd.enable = false;
20+ defaultGateway = "192.168.1.1";
21+ interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
22+ { address = "192.168.1.2"; prefixLength = 24; }
23+ ];
24+ };
25+ };
26+ };
27+
28+ testScript = ''
29+ start_all()
30+
31+ gvisor.wait_for_unit("network.target")
32+ gvisor.wait_for_unit("sockets.target")
33+
34+ # Start by verifying that gvisor itself works
35+ output = gvisor.succeed(
36+ "${pkgs.gvisor}/bin/runsc -alsologtostderr do ${pkgs.coreutils}/bin/echo hello world"
37+ )
38+ assert output.strip() == "hello world"
39+
40+ # Also test the Docker runtime
41+ gvisor.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
42+ gvisor.succeed(
43+ "docker run -d --name=sleeping --runtime=runsc -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
44+ )
45+ gvisor.succeed("docker ps | grep sleeping")
46+ gvisor.succeed("docker stop sleeping")
47+ '';
48+})
49+
nixos/tests/i3wm.nix+31−20
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, ...} : {
1+import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "i3wm";
33 meta = with pkgs.stdenv.lib.maintainers; {
44 maintainers = [ aszlig ];
@@ -12,24 +12,35 @@ import ./make-test.nix ({ pkgs, ...} : {
1212 };
1313
1414 testScript = { ... }: ''
15− $machine->waitForX;
16− $machine->waitForFile("/home/alice/.Xauthority");
17− $machine->succeed("xauth merge ~alice/.Xauthority");
18− $machine->waitForWindow(qr/first configuration/);
19− $machine->sleep(2);
20− $machine->screenshot("started");
21− $machine->sendKeys("ret");
22− $machine->sleep(2);
23− $machine->sendKeys("alt");
24− $machine->sleep(2);
25− $machine->screenshot("configured");
26− $machine->sendKeys("ret");
27− # make sure the config file is created before we continue
28− $machine->waitForFile("/home/alice/.config/i3/config");
29− $machine->sleep(2);
30− $machine->sendKeys("alt-ret");
31− $machine->waitForWindow(qr/alice.*machine/);
32− $machine->sleep(2);
33− $machine->screenshot("terminal");
15+ with subtest("ensure x starts"):
16+ machine.wait_for_x()
17+ machine.wait_for_file("/home/alice/.Xauthority")
18+ machine.succeed("xauth merge ~alice/.Xauthority")
19+
20+ with subtest("ensure we get first configuration window"):
21+ machine.wait_for_window(r".*?first configuration.*?")
22+ machine.sleep(2)
23+ machine.screenshot("started")
24+
25+ with subtest("ensure we generate and save a config"):
26+ # press return to indicate we want to gen a new config
27+ machine.send_key("\n")
28+ machine.sleep(2)
29+ machine.screenshot("preconfig")
30+ # press alt then return to indicate we want to use alt as our Mod key
31+ machine.send_key("alt")
32+ machine.send_key("\n")
33+ machine.sleep(2)
34+ # make sure the config file is created before we continue
35+ machine.wait_for_file("/home/alice/.config/i3/config")
36+ machine.screenshot("postconfig")
37+ machine.sleep(2)
38+
39+ with subtest("ensure we can open a new terminal"):
40+ machine.send_key("alt-ret")
41+ machine.sleep(2)
42+ machine.wait_for_window(r"alice.*?machine")
43+ machine.sleep(2)
44+ machine.screenshot("terminal")
3445 '';
3546})
nixos/tests/ldap.nix+111−101
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, lib, ...} :
1+import ./make-test-python.nix ({ pkgs, lib, ...} :
22
33let
44 unlines = lib.concatStringsSep "\n";
@@ -288,108 +288,118 @@ in
288288
289289 client1 = mkClient true; # use nss_pam_ldapd
290290 client2 = mkClient false; # use nss_ldap and pam_ldap
291−
292291 };
293292
294293 testScript = ''
295− $server->start;
296− $server->waitForUnit("default.target");
297−
298− subtest "slapd", sub {
299− subtest "auth as database admin with SASL and check a POSIX account", sub {
300− $server->succeed(join ' ', 'test',
301− '"$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL',
302− '-b \'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}\' ',
303− '-s base uidNumber |',
304− 'sed -ne \'s/^uidNumber: \\(.*\\)/\\1/p\' ',
305− ')" -eq ${toString ldapUserId}');
306− };
307− subtest "auth as database admin with password and check a POSIX account", sub {
308− $server->succeed(join ' ', 'test',
309− '"$(ldapsearch -LLL -H ldap://server',
310− '-D \'cn=admin,${dbSuffix}\' -w \'${dbAdminPwd}\' ',
311− '-b \'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}\' ',
312− '-s base uidNumber |',
313− 'sed -ne \'s/^uidNumber: \\(.*\\)/\\1/p\' ',
314− ')" -eq ${toString ldapUserId}');
315− };
316− };
317−
318− $client1->start;
319− $client1->waitForUnit("default.target");
320−
321− subtest "password", sub {
322− subtest "su with password to a POSIX account", sub {
323− $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
324− 'spawn su "${ldapUser}"',
325− 'expect "Password:"',
326− 'send "${ldapUserPwd}\n"',
327− 'expect "*"',
328− 'send "whoami\n"',
329− 'expect -ex "${ldapUser}" {exit}',
330− 'exit 1' . "'");
331− };
332− subtest "change password of a POSIX account as root", sub {
333− $client1->succeed("chpasswd <<<'${ldapUser}:new-password'");
334− $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
335− 'spawn su "${ldapUser}"',
336− 'expect "Password:"',
337− 'send "new-password\n"',
338− 'expect "*"',
339− 'send "whoami\n"',
340− 'expect -ex "${ldapUser}" {exit}',
341− 'exit 1' . "'");
342− $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
343− };
344− subtest "change password of a POSIX account from itself", sub {
345− $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
346− $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
347− 'spawn su --login ${ldapUser} -c passwd',
348− 'expect "Password: "',
349− 'send "${ldapUserPwd}\n"',
350− 'expect "(current) UNIX password: "',
351− 'send "${ldapUserPwd}\n"',
352− 'expect "New password: "',
353− 'send "new-password\n"',
354− 'expect "Retype new password: "',
355− 'send "new-password\n"',
356− 'expect "passwd: password updated successfully" {exit}',
357− 'exit 1' . "'");
358− $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
359− 'spawn su "${ldapUser}"',
360− 'expect "Password:"',
361− 'send "${ldapUserPwd}\n"',
362− 'expect "su: Authentication failure" {exit}',
363− 'exit 1' . "'");
364− $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
365− 'spawn su "${ldapUser}"',
366− 'expect "Password:"',
367− 'send "new-password\n"',
368− 'expect "*"',
369− 'send "whoami\n"',
370− 'expect -ex "${ldapUser}" {exit}',
371− 'exit 1' . "'");
372− $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
373− };
374− };
375−
376− $client2->start;
377− $client2->waitForUnit("default.target");
378−
379− subtest "NSS", sub {
380− $client1->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
381− $client1->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
382− $client1->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
383− $client1->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
384− $client2->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
385− $client2->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
386− $client2->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
387− $client2->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
388− };
389−
390− subtest "PAM", sub {
391− $client1->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
392− $client2->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
393− };
294+ def expect_script(*commands):
295+ script = ";".join(commands)
296+ return f"${pkgs.expect}/bin/expect -c '{script}'"
297+
298+
299+ server.start()
300+ server.wait_for_unit("default.target")
301+
302+ with subtest("slapd: auth as database admin with SASL and check a POSIX account"):
303+ server.succeed(
304+ 'test "$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL '
305+ + "-b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' "
306+ + "-s base uidNumber | "
307+ + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}"
308+ )
309+
310+ with subtest("slapd: auth as database admin with password and check a POSIX account"):
311+ server.succeed(
312+ "test \"$(ldapsearch -LLL -H ldap://server -D 'cn=admin,${dbSuffix}' "
313+ + "-w '${dbAdminPwd}' -b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' "
314+ + "-s base uidNumber | "
315+ + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}"
316+ )
317+
318+ client1.start()
319+ client1.wait_for_unit("default.target")
320+
321+ with subtest("password: su with password to a POSIX account"):
322+ client1.succeed(
323+ expect_script(
324+ 'spawn su "${ldapUser}"',
325+ 'expect "Password:"',
326+ 'send "${ldapUserPwd}\n"',
327+ 'expect "*"',
328+ 'send "whoami\n"',
329+ 'expect -ex "${ldapUser}" {exit}',
330+ "exit 1",
331+ )
332+ )
333+
334+ with subtest("password: change password of a POSIX account as root"):
335+ client1.succeed(
336+ "chpasswd <<<'${ldapUser}:new-password'",
337+ expect_script(
338+ 'spawn su "${ldapUser}"',
339+ 'expect "Password:"',
340+ 'send "new-password\n"',
341+ 'expect "*"',
342+ 'send "whoami\n"',
343+ 'expect -ex "${ldapUser}" {exit}',
344+ "exit 1",
345+ ),
346+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}'",
347+ )
348+
349+ with subtest("password: change password of a POSIX account from itself"):
350+ client1.succeed(
351+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}' ",
352+ expect_script(
353+ "spawn su --login ${ldapUser} -c passwd",
354+ 'expect "Password: "',
355+ 'send "${ldapUserPwd}\n"',
356+ 'expect "(current) UNIX password: "',
357+ 'send "${ldapUserPwd}\n"',
358+ 'expect "New password: "',
359+ 'send "new-password\n"',
360+ 'expect "Retype new password: "',
361+ 'send "new-password\n"',
362+ 'expect "passwd: password updated successfully" {exit}',
363+ "exit 1",
364+ ),
365+ expect_script(
366+ 'spawn su "${ldapUser}"',
367+ 'expect "Password:"',
368+ 'send "${ldapUserPwd}\n"',
369+ 'expect "su: Authentication failure" {exit}',
370+ "exit 1",
371+ ),
372+ expect_script(
373+ 'spawn su "${ldapUser}"',
374+ 'expect "Password:"',
375+ 'send "new-password\n"',
376+ 'expect "*"',
377+ 'send "whoami\n"',
378+ 'expect -ex "${ldapUser}" {exit}',
379+ "exit 1",
380+ ),
381+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}'",
382+ )
383+
384+ client2.start()
385+ client2.wait_for_unit("default.target")
386+
387+ with subtest("NSS"):
388+ client1.succeed(
389+ "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}",
390+ "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'",
391+ "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}",
392+ "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'",
393+ "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}",
394+ "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'",
395+ "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}",
396+ "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'",
397+ )
398+
399+ with subtest("PAM"):
400+ client1.succeed(
401+ "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true",
402+ "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true",
403+ )
394404 '';
395405})
nixos/tests/moinmoin.nix+12−8
@@ -1,6 +1,6 @@
1−import ./make-test.nix ({ pkgs, lib, ... }: {
1+import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "moinmoin";
3− meta.maintainers = [ ]; # waiting for https://github.com/NixOS/nixpkgs/pull/65397
3+ meta.maintainers = with lib.maintainers; [ mmilata ];
44
55 machine =
66 { ... }:
@@ -13,12 +13,16 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
1313 };
1414
1515 testScript = ''
16− startAll;
16+ start_all()
1717
18− $machine->waitForUnit('moin-ExampleWiki.service');
19− $machine->waitForUnit('nginx.service');
20− $machine->waitForFile('/run/moin/ExampleWiki/gunicorn.sock');
21− $machine->succeed('curl -L http://localhost/') =~ /If you have just installed/ or die;
22− $machine->succeed('moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1') =~ /status success/ or die;
18+ machine.wait_for_unit("moin-ExampleWiki.service")
19+ machine.wait_for_unit("nginx.service")
20+ machine.wait_for_file("/run/moin/ExampleWiki/gunicorn.sock")
21+
22+ assert "If you have just installed" in machine.succeed("curl -L http://localhost/")
23+
24+ assert "status success" in machine.succeed(
25+ "moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1"
26+ )
2327 '';
2428})
nixos/tests/openldap.nix+6−4
@@ -1,4 +1,4 @@
1−import ./make-test.nix {
1+import ./make-test-python.nix {
22 name = "openldap";
33
44 machine = { pkgs, ... }: {
@@ -24,8 +24,10 @@ import ./make-test.nix {
2424 };
2525
2626 testScript = ''
27− $machine->waitForUnit('openldap.service');
28− $machine->succeed('systemctl status openldap.service');
29− $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
27+ machine.wait_for_unit("openldap.service")
28+ machine.succeed(
29+ "systemctl status openldap.service",
30+ 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"',
31+ )
3032 '';
3133}
nixos/tests/pam-oath-login.nix+47−63
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ ... }:
1+import ./make-test-python.nix ({ ... }:
22
33let
44 oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
@@ -55,70 +55,54 @@ in
5555 };
5656 };
5757
58− testScript =
59− ''
60− $machine->waitForUnit('multi-user.target');
61− $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
62− $machine->screenshot("postboot");
63−
64−
65− subtest "Invalid password", sub {
66− $machine->fail("pgrep -f 'agetty.*tty2'");
67− $machine->sendKeys("alt-f2");
68− $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
69− $machine->waitForUnit('getty@tty2.service');
70− $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
71−
72− $machine->waitUntilTTYMatches(2, "login: ");
73− $machine->sendChars("alice\n");
74− $machine->waitUntilTTYMatches(2, "login: alice");
75− $machine->waitUntilSucceeds("pgrep login");
76−
77− $machine->waitUntilTTYMatches(2, "One-time password");
78− $machine->sendChars("${oathSnakeOilPassword1}\n");
79− $machine->waitUntilTTYMatches(2, "Password: ");
80− $machine->sendChars("blorg\n");
81− $machine->waitUntilTTYMatches(2, "Login incorrect");
82− };
58+ testScript = ''
59+ def switch_to_tty(tty_number):
60+ machine.fail(f"pgrep -f 'agetty.*tty{tty_number}'")
61+ machine.send_key(f"alt-f{tty_number}")
62+ machine.wait_until_succeeds(f"[ $(fgconsole) = {tty_number} ]")
63+ machine.wait_for_unit(f"getty@tty{tty_number}.service")
64+ machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{tty_number}'")
8365
84− subtest "Invalid oath token", sub {
85− $machine->fail("pgrep -f 'agetty.*tty3'");
86− $machine->sendKeys("alt-f3");
87− $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]");
88− $machine->waitForUnit('getty@tty3.service');
89− $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'");
90−
91− $machine->waitUntilTTYMatches(3, "login: ");
92− $machine->sendChars("alice\n");
93− $machine->waitUntilTTYMatches(3, "login: alice");
94− $machine->waitUntilSucceeds("pgrep login");
95− $machine->waitUntilTTYMatches(3, "One-time password");
96− $machine->sendChars("000000\n");
97− $machine->waitUntilTTYMatches(3, "Login incorrect");
98− $machine->waitUntilTTYMatches(3, "login:");
99− };
10066
101− subtest "Happy path (both passwords are mandatory to get us in)", sub {
102− $machine->fail("pgrep -f 'agetty.*tty4'");
103− $machine->sendKeys("alt-f4");
104− $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]");
105− $machine->waitForUnit('getty@tty4.service');
106− $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'");
107−
108− $machine->waitUntilTTYMatches(4, "login: ");
109− $machine->sendChars("alice\n");
110− $machine->waitUntilTTYMatches(4, "login: alice");
111− $machine->waitUntilSucceeds("pgrep login");
112− $machine->waitUntilTTYMatches(4, "One-time password");
113− $machine->sendChars("${oathSnakeOilPassword2}\n");
114− $machine->waitUntilTTYMatches(4, "Password: ");
115− $machine->sendChars("${alicePassword}\n");
116−
117− $machine->waitUntilSucceeds("pgrep -u alice bash");
118− $machine->sendChars("touch done4\n");
119− $machine->waitForFile("/home/alice/done4");
120− };
67+ def enter_user_alice(tty_number):
68+ machine.wait_until_tty_matches(tty_number, "login: ")
69+ machine.send_chars("alice\n")
70+ machine.wait_until_tty_matches(tty_number, "login: alice")
71+ machine.wait_until_succeeds("pgrep login")
72+ machine.wait_until_tty_matches(tty_number, "One-time password")
12173
122− '';
12374
75+ machine.wait_for_unit("multi-user.target")
76+ machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
77+ machine.screenshot("postboot")
78+
79+ with subtest("Invalid password"):
80+ switch_to_tty(2)
81+ enter_user_alice(2)
82+
83+ machine.send_chars("${oathSnakeOilPassword1}\n")
84+ machine.wait_until_tty_matches(2, "Password: ")
85+ machine.send_chars("blorg\n")
86+ machine.wait_until_tty_matches(2, "Login incorrect")
87+
88+ with subtest("Invalid oath token"):
89+ switch_to_tty(3)
90+ enter_user_alice(3)
91+
92+ machine.send_chars("000000\n")
93+ machine.wait_until_tty_matches(3, "Login incorrect")
94+ machine.wait_until_tty_matches(3, "login:")
95+
96+ with subtest("Happy path: Both passwords are mandatory to get us in"):
97+ switch_to_tty(4)
98+ enter_user_alice(4)
99+
100+ machine.send_chars("${oathSnakeOilPassword2}\n")
101+ machine.wait_until_tty_matches(4, "Password: ")
102+ machine.send_chars("${alicePassword}\n")
103+
104+ machine.wait_until_succeeds("pgrep -u alice bash")
105+ machine.send_chars("touch done4\n")
106+ machine.wait_for_file("/home/alice/done4")
107+ '';
124108})
nixos/tests/tiddlywiki.nix+41−39
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ ... }: {
1+import ./make-test-python.nix ({ ... }: {
22 name = "tiddlywiki";
33 nodes = {
44 default = {
@@ -20,48 +20,50 @@ import ./make-test.nix ({ ... }: {
2020 };
2121 };
2222
23− testScript = ''
24− startAll;
23+ testScript =
24+ ''
25+ start_all()
2526
26− subtest "by default works without configuration", sub {
27− $default->waitForUnit("tiddlywiki.service");
28− };
29−
30− subtest "by default available on port 8080 without auth", sub {
31− $default->waitForUnit("tiddlywiki.service");
32− $default->waitForOpenPort(8080);
33− $default->succeed("curl --fail 127.0.0.1:8080");
34− };
35−
36− subtest "by default creates empty wiki", sub {
37− $default->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info");
38− };
27+ with subtest("by default works without configuration"):
28+ default.wait_for_unit("tiddlywiki.service")
3929
40− subtest "configured on port 3000 with basic auth", sub {
41− $configured->waitForUnit("tiddlywiki.service");
42− $configured->waitForOpenPort(3000);
43− $configured->fail("curl --fail 127.0.0.1:3000");
44− $configured->succeed("curl --fail 127.0.0.1:3000 --user somelogin:somesecret");
45− };
30+ with subtest("by default available on port 8080 without auth"):
31+ default.wait_for_unit("tiddlywiki.service")
32+ default.wait_for_open_port(8080)
33+ # we output to /dev/null here to avoid a python UTF-8 decode error
34+ # but the check will still fail if the service doesn't respond
35+ default.succeed("curl --fail -o /dev/null 127.0.0.1:8080")
4636
47− subtest "configured with different wikifolder", sub {
48− $configured->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info");
49− };
37+ with subtest("by default creates empty wiki"):
38+ default.succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info")
5039
51− subtest "restart preserves changes", sub {
52− # given running wiki
53− $default->waitForUnit("tiddlywiki.service");
54− # with some changes
55− $default->succeed("curl --fail --request PUT --header 'X-Requested-With:TiddlyWiki' --data '{ \"title\": \"title\", \"text\": \"content\" }' --url 127.0.0.1:8080/recipes/default/tiddlers/somepage ");
56− $default->succeed("sleep 2"); # server syncs to filesystem on timer
40+ with subtest("configured on port 3000 with basic auth"):
41+ configured.wait_for_unit("tiddlywiki.service")
42+ configured.wait_for_open_port(3000)
43+ configured.fail("curl --fail -o /dev/null 127.0.0.1:3000")
44+ configured.succeed(
45+ "curl --fail -o /dev/null 127.0.0.1:3000 --user somelogin:somesecret"
46+ )
47+
48+ with subtest("restart preserves changes"):
49+ # given running wiki
50+ default.wait_for_unit("tiddlywiki.service")
51+ # with some changes
52+ default.succeed(
53+ 'curl --fail --request PUT --header \'X-Requested-With:TiddlyWiki\' \
54+ --data \'{ "title": "title", "text": "content" }\' \
55+ --url 127.0.0.1:8080/recipes/default/tiddlers/somepage '
56+ )
57+ default.succeed("sleep 2")
5758
58− # when wiki is cycled
59− $default->systemctl("restart tiddlywiki.service");
60− $default->waitForUnit("tiddlywiki.service");
61− $default->waitForOpenPort(8080);
59+ # when wiki is cycled
60+ default.systemctl("restart tiddlywiki.service")
61+ default.wait_for_unit("tiddlywiki.service")
62+ default.wait_for_open_port(8080)
6263
63− # the change is preserved
64− $default->succeed("curl --fail 127.0.0.1:8080/recipes/default/tiddlers/somepage");
65− };
66− '';
64+ # the change is preserved
65+ default.succeed(
66+ "curl --fail -o /dev/null 127.0.0.1:8080/recipes/default/tiddlers/somepage"
67+ )
68+ '';
6769})
pkgs/applications/audio/cantata/default.nix+1−1
@@ -80,7 +80,7 @@ in mkDerivation {
8080 homepage = https://github.com/cdrummond/cantata;
8181 description = "A graphical client for MPD";
8282 license = licenses.gpl3;
83− maintainers = with maintainers; [ fuuzetsu peterhoeg ];
83+ maintainers = with maintainers; [ peterhoeg ];
8484 # Technically Cantata can run on Windows so if someone wants to
8585 # bother figuring that one out, be my guest.
8686 platforms = platforms.linux;
pkgs/applications/audio/easytag/default.nix+1−1
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
3535 description = "View and edit tags for various audio files";
3636 homepage = https://wiki.gnome.org/Apps/EasyTAG;
3737 license = licenses.gpl2Plus;
38− maintainers = with maintainers; [ fuuzetsu ];
38+ maintainers = with maintainers; [ ];
3939 platforms = platforms.linux;
4040 };
4141}
pkgs/applications/audio/opus-tools/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 description = "Tools to work with opus encoded audio streams";
1515 homepage = http://www.opus-codec.org/;
1616 license = stdenv.lib.licenses.bsd2;
17− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
17+ maintainers = with stdenv.lib.maintainers; [ ];
1818 platforms = with stdenv.lib.platforms; unix;
1919 };
2020}
pkgs/applications/audio/opusfile/default.nix+1−1
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
1818 homepage = http://www.opus-codec.org/;
1919 license = licenses.bsd3;
2020 platforms = platforms.linux ++ platforms.darwin;
21− maintainers = with maintainers; [ fuuzetsu ];
21+ maintainers = with maintainers; [ ];
2222 };
2323}
pkgs/applications/audio/snd/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 homepage = http://ccrma.stanford.edu/software/snd;
2424 platforms = stdenv.lib.platforms.linux;
2525 license = stdenv.lib.licenses.free;
26− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
26+ maintainers = with stdenv.lib.maintainers; [ ];
2727 };
2828
2929
pkgs/applications/blockchains/bitcoin-abc.nix+4−4
@@ -1,19 +1,19 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
1+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
22, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
33, withGui }:
44
55with stdenv.lib;
66
7−stdenv.mkDerivation rec {
7+mkDerivation rec {
88
99 name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
10− version = "0.20.6";
10+ version = "0.20.7";
1111
1212 src = fetchFromGitHub {
1313 owner = "bitcoin-ABC";
1414 repo = "bitcoin-abc";
1515 rev = "v${version}";
16− sha256 = "1a65pykdjkiic67fcs8cg2qrvzzrqifa93r1bzza3gdyfdvgv3ww";
16+ sha256 = "1d17ry9906zmwj2n3mh77b6rqmdg0dgm7b7ybh8d7q2ml0196ilj";
1717 };
1818
1919 patches = [ ./fix-bitcoin-qt-build.patch ];
pkgs/applications/blockchains/bitcoin.nix+5−5
@@ -1,24 +1,24 @@
11{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
2−, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, protobuf, python3, qrencode, libevent
2+, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
33, withGui }:
44
55with stdenv.lib;
66stdenv.mkDerivation rec{
7− name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
8− version = "0.18.1";
7+ pname = if withGui then "bitcoin" else "bitcoind";
8+ version = "0.19.0.1";
99
1010 src = fetchurl {
1111 urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
1212 "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
1313 ];
14− sha256 = "5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96";
14+ sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284";
1515 };
1616
1717 nativeBuildInputs =
1818 [ pkgconfig autoreconfHook ]
1919 ++ optional withGui wrapQtAppsHook;
2020 buildInputs = [ openssl db48 boost zlib zeromq
21− miniupnpc protobuf libevent]
21+ miniupnpc libevent]
2222 ++ optionals stdenv.isLinux [ utillinux ]
2323 ++ optionals withGui [ qtbase qttools qrencode ];
2424
pkgs/applications/editors/emacs-modes/elpa-packages.nix+3
@@ -40,6 +40,9 @@ self: let
4040 cl-lib = null; # builtin
4141 tle = null; # builtin
4242 advice = null; # builtin
43+ seq = if lib.versionAtLeast self.emacs.version "27"
44+ then null
45+ else super.seq;
4346 };
4447
4548 elpaPackages = super // overrides;
pkgs/applications/editors/flpsed/default.nix+1−1
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
2222 homepage = http://flpsed.org/flpsed.html;
2323 license = licenses.gpl3;
2424 platforms = platforms.linux;
25− maintainers = with maintainers; [ fuuzetsu ];
25+ maintainers = with maintainers; [ ];
2626 };
2727}
pkgs/applications/editors/kdevelop5/kdev-php.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "kdev-php";
5− version = "5.4.4";
5+ version = "5.4.5";
66
77 src = fetchurl {
88 url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
9− sha256 = "1q80vh2b4bmpa3sh94b6jsa5ymqr6hcn76mr2lyw30h2ppy5hm5l";
9+ sha256 = "12j0l2k6ii9ajp90lil3apk0xsz56cb549ighabik73a1w3c6ib6";
1010 };
1111
1212 nativeBuildInputs = [ cmake extra-cmake-modules ];
pkgs/applications/editors/kdevelop5/kdev-python.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "kdev-python";
5− version = "5.4.4";
5+ version = "5.4.5";
66
77 src = fetchurl {
88 url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
9− sha256 = "04ig8vmn85z15mlngha4ybynjlmv9g9dn48y58wqrkif2ssliq7m";
9+ sha256 = "1iq4lxbl8gq4qvydyz34ild4izw21cp22adlz9dc054v0wis331j";
1010 };
1111
1212 cmakeFlags = [
pkgs/applications/editors/kdevelop5/kdevelop.nix+2−2
@@ -10,11 +10,11 @@
1010
1111mkDerivation rec {
1212 pname = "kdevelop";
13− version = "5.4.4";
13+ version = "5.4.5";
1414
1515 src = fetchurl {
1616 url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
17− sha256 = "1cangz3ghz39sxxggp2p7kqy2ncgs0r3i19c341b5xbkcxw2y20h";
17+ sha256 = "08vhbg9ql0402bw3y3xw1kdxhig9sv3ss8g0h4477vy3z17m1h4j";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/applications/editors/yi/wrapper.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 description = "Allows Yi to find libraries and the compiler easily";
2828 # This wrapper and wrapper only is under PD
2929 license = licenses.publicDomain;
30− maintainers = with maintainers; [ fuuzetsu ];
30+ maintainers = with maintainers; [ ];
3131 };
3232
3333}
pkgs/applications/graphics/akira/default.nixnew file+76
@@ -0,0 +1,76 @@
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, appstream-glib
5+, desktop-file-utils
6+, meson
7+, ninja
8+, pantheon
9+, pkgconfig
10+, python3
11+, vala
12+, vala-lint
13+, wrapGAppsHook
14+, cairo
15+, glib
16+, goocanvas2
17+, gtk3
18+, gtksourceview3
19+, json-glib
20+, libarchive
21+, libgee
22+, libxml2 }:
23+
24+stdenv.mkDerivation rec {
25+ pname = "akira";
26+ version = "2019-10-12";
27+
28+ src = fetchFromGitHub {
29+ owner = "akiraux";
30+ repo = "Akira";
31+ rev = "cab952dee4591b6bde34d670c1f853f5a3ff6b19";
32+ sha256 = "1fp3a79hkh6xwwqqdrx4zqq2zhsm236c6fhhl5f2nmi108yxz04q";
33+ };
34+
35+ nativeBuildInputs = [
36+ appstream-glib
37+ desktop-file-utils
38+ meson
39+ ninja
40+ pkgconfig
41+ python3
42+ vala
43+ vala-lint
44+ wrapGAppsHook
45+ ];
46+
47+ buildInputs = [
48+ cairo
49+ glib
50+ goocanvas2
51+ pantheon.granite
52+ gtk3
53+ gtksourceview3
54+ json-glib
55+ libarchive
56+ libgee
57+ libxml2
58+ ];
59+
60+ mesonFlags = [ "-Dprofile=default" ];
61+
62+ patches = [ ./fix-build-with-vala-0-44-or-later.patch ];
63+
64+ postPatch = ''
65+ chmod +x build-aux/meson/post_install.py
66+ patchShebangs build-aux/meson/post_install.py
67+ '';
68+
69+ meta = with lib; {
70+ description = "Native Linux Design application built in Vala and GTK";
71+ homepage = "https://github.com/akiraux/Akira";
72+ license = licenses.gpl3;
73+ maintainers = with maintainers; [ filalex77 ] ++ pantheon.maintainers;
74+ platforms = platforms.linux;
75+ };
76+}
pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patchnew file+88
@@ -0,0 +1,88 @@
1+From bcda8fd53f6f232db0b6411269ba108af551629f Mon Sep 17 00:00:00 2001
2+From: Alberto Fanjul <albertofanjul@gmail.com>
3+Date: Tue, 9 Apr 2019 09:45:36 +0200
4+Subject: [PATCH] Build on vala >= 0.44.2
5+
6+---
7+ src/FileFormat/JsonObject.vala | 2 +-
8+ src/FileFormat/JsonObjectArray.vala | 2 +-
9+ src/FileFormat/ZipArchiveHandler.vala | 18 +++++++++++++++++-
10+ 3 files changed, 19 insertions(+), 3 deletions(-)
11+
12+diff --git a/src/FileFormat/JsonObject.vala b/src/FileFormat/JsonObject.vala
13+index 7bfe46f..805fbad 100644
14+--- a/src/FileFormat/JsonObject.vala
15++++ b/src/FileFormat/JsonObject.vala
16+@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObject : GLib.Object {
17+
18+ private ObjectClass obj_class;
19+
20+- public JsonObject.from_object (Json.Object object) {
21++ protected JsonObject.from_object (Json.Object object) {
22+ Object (object: object);
23+ }
24+
25+diff --git a/src/FileFormat/JsonObjectArray.vala b/src/FileFormat/JsonObjectArray.vala
26+index 4f6e573..d0a7dad 100644
27+--- a/src/FileFormat/JsonObjectArray.vala
28++++ b/src/FileFormat/JsonObjectArray.vala
29+@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObjectArray : Object {
30+ *
31+ * Your JsonObject implementation should have it's own list of items
32+ */
33+- public JsonObjectArray (Json.Object object, string property_name) {
34++ protected JsonObjectArray (Json.Object object, string property_name) {
35+ Object (object: object, property_name: property_name);
36+ }
37+
38+diff --git a/src/FileFormat/ZipArchiveHandler.vala b/src/FileFormat/ZipArchiveHandler.vala
39+index ca60dd0..5d65aa2 100644
40+--- a/src/FileFormat/ZipArchiveHandler.vala
41++++ b/src/FileFormat/ZipArchiveHandler.vala
42+@@ -262,11 +262,17 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
43+ continue;
44+ }
45+
46++ Posix.off_t offset;
47++#if VALA_0_42
48++ uint8[] buffer;
49++ while (archive.read_data_block (out buffer, out offset) == Archive.Result.OK) {
50++ if (extractor.write_data_block (buffer, offset) != Archive.Result.OK) {
51++#else
52+ void* buffer = null;
53+ size_t buffer_length;
54+- Posix.off_t offset;
55+ while (archive.read_data_block (out buffer, out buffer_length, out offset) == Archive.Result.OK) {
56+ if (extractor.write_data_block (buffer, buffer_length, offset) != Archive.Result.OK) {
57++#endif
58+ break;
59+ }
60+ }
61+@@ -316,9 +322,15 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
62+ // Add an entry to the archive
63+ Archive.Entry entry = new Archive.Entry ();
64+ entry.set_pathname (initial_folder.get_relative_path (current_file));
65++#if VALA_0_42
66++ entry.set_size ((Archive.int64_t) file_info.get_size ());
67++ entry.set_filetype (Archive.FileType.IFREG);
68++ entry.set_perm (Archive.FileType.IFREG);
69++#else
70+ entry.set_size (file_info.get_size ());
71+ entry.set_filetype ((uint) Posix.S_IFREG);
72+ entry.set_perm (0644);
73++#endif
74+
75+ if (archive.write_header (entry) != Archive.Result.OK) {
76+ critical ("Error writing '%s': %s (%d)", current_file.get_path (), archive.error_string (), archive.errno ());
77+@@ -333,7 +345,11 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
78+ break;
79+ }
80+
81++#if VALA_0_42
82++ archive.write_data (buffer[0:bytes_read]);
83++#else
84+ archive.write_data (buffer, bytes_read);
85++#endif
86+ }
87+ }
88+ }
pkgs/applications/graphics/drawio/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "drawio";
14− version = "12.2.2";
14+ version = "12.3.2";
1515
1616 src = fetchurl {
1717 url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
18− sha256 = "04h11gdy78py9zrs3v6y0hhhc2n1h4s0ymbvf6qn4vv4r3r9vbaw";
18+ sha256 = "1hh4616dbq0fqldlph7vyl8vkibwc3xpcv9r1m2v949kn84yi2j3";
1919 };
2020
2121 nativeBuildInputs = [
pkgs/applications/graphics/gimp/default.nix+2
@@ -157,6 +157,8 @@ in stdenv.mkDerivation rec {
157157 "--without-webkit" # old version is required
158158 "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
159159 "--with-icc-directory=/run/current-system/sw/share/color/icc"
160+ # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
161+ "--libdir=\${exec_prefix}/lib"
160162 ];
161163
162164 # on Darwin,
pkgs/applications/graphics/mcomix/default.nix+1−1
@@ -27,7 +27,7 @@ python27Packages.buildPythonApplication rec {
2727 '';
2828 homepage = http://mcomix.sourceforge.net/;
2929 license = stdenv.lib.licenses.gpl2;
30− maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
30+ maintainers = with stdenv.lib.maintainers; [ AndersonTorres ];
3131 };
3232}
3333# TODO:
pkgs/applications/graphics/sxiv/default.nix+1−1
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
3333 homepage = https://github.com/muennich/sxiv;
3434 license = stdenv.lib.licenses.gpl2Plus;
3535 platforms = stdenv.lib.platforms.linux;
36− maintainers = with maintainers; [ jfrankenau fuuzetsu ];
36+ maintainers = with maintainers; [ jfrankenau ];
3737 };
3838}
pkgs/applications/misc/electron-cash/default.nix+7−7
@@ -1,14 +1,14 @@
1−{ lib, fetchurl, python3Packages, qtbase, wrapQtAppsHook }:
1+{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "electron-cash";
5− version = "4.0.10";
5+ version = "4.0.11";
66
7− src = fetchurl {
8− url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
9− # Verified using official SHA-1 and signature from
10− # https://github.com/fyookball/keys-n-hashes
11− sha256 = "48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5";
7+ src = fetchFromGitHub {
8+ owner = "Electron-Cash";
9+ repo = "Electron-Cash";
10+ rev = version;
11+ sha256 = "1k4zbaj0g8bgk1l5vrb835a8bqfay2707bcb4ql2vx4igcwpb680";
1212 };
1313
1414 propagatedBuildInputs = with python3Packages; [
pkgs/applications/misc/hugo/default.nix+8−8
@@ -2,18 +2,18 @@
22
33buildGoModule rec {
44 pname = "hugo";
5− version = "0.60.0";
5+ version = "0.60.1";
66
77 goPackagePath = "github.com/gohugoio/hugo";
88
99 src = fetchFromGitHub {
10− owner = "gohugoio";
11− repo = pname;
12− rev = "v${version}";
13− sha256 = "0g8rq79xp7c9p31xc0anfjyz7xp8n7qzv3vmvg2nmzl7nayg88aa";
10+ owner = "gohugoio";
11+ repo = pname;
12+ rev = "v${version}";
13+ sha256 = "0l8n87y5zrs09s693rqvqwz0233wlr4jwib7r36ilss1qgm7x6n5";
1414 };
1515
16− modSha256 = "12h1ik1hgs4lkmk699wpa34rnycnm03qyr2vp1y5lywz1h93by20";
16+ modSha256 = "1an4plbx06fzz2iqzgs08r6vsjpkl5lbqck5jqmv6fv7b7psf7iw";
1717
1818 buildFlags = "-tags extended";
1919
@@ -21,8 +21,8 @@ buildGoModule rec {
2121
2222 meta = with stdenv.lib; {
2323 description = "A fast and modern static website engine.";
24− homepage = https://gohugo.io;
24+ homepage = "https://gohugo.io";
2525 license = licenses.asl20;
26− maintainers = with maintainers; [ schneefux ];
26+ maintainers = with maintainers; [ schneefux filalex77 ];
2727 };
2828}
pkgs/applications/misc/nnn/default.nix+2−2
@@ -4,13 +4,13 @@ with stdenv.lib;
44
55stdenv.mkDerivation rec {
66 pname = "nnn";
7− version = "2.7";
7+ version = "2.8.1";
88
99 src = fetchFromGitHub {
1010 owner = "jarun";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "19kiikjblkq3bx2j6h3f2d467p2v582albqr7nbrm9c1yg4qx38z";
13+ sha256 = "0h7j0wcpwwd2fibggr1nwkqpvhv2i1qnk54c4x6hixx31yidy2l0";
1414 };
1515
1616 configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
pkgs/applications/misc/vifm/default.nix+21−6
@@ -1,11 +1,15 @@
1−{ stdenv, fetchurl
1+{ stdenv, fetchurl, makeWrapper
22, pkgconfig
33, ncurses, libX11
44, utillinux, file, which, groff
5+
6+ # adds support for handling removable media (vifm-media). Linux only!
7+, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null
58}:
69
7−stdenv.mkDerivation rec {
8− pname = "vifm";
10+let isFullPackage = mediaSupport;
11+in stdenv.mkDerivation rec {
12+ pname = if isFullPackage then "vifm-full" else "vifm";
913 version = "0.10.1";
1014
1115 src = fetchurl {
@@ -13,13 +17,24 @@ stdenv.mkDerivation rec {
1317 sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r";
1418 };
1519
16− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkgconfig makeWrapper ];
1721 buildInputs = [ ncurses libX11 utillinux file which groff ];
1822
23+ postFixup = let
24+ path = lib.makeBinPath
25+ [ udisks2
26+ (python3.withPackages (p: [p.dbus-python]))
27+ ];
28+
29+ wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}";
30+ in ''
31+ ${if mediaSupport then wrapVifmMedia else ""}
32+ '';
33+
1934 meta = with stdenv.lib; {
20− description = "A vi-like file manager";
35+ description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}'';
2136 maintainers = with maintainers; [ raskin ];
22− platforms = platforms.unix;
37+ platforms = if mediaSupport then platforms.linux else platforms.unix;
2338 license = licenses.gpl2;
2439 downloadPage = "https://vifm.info/downloads.shtml";
2540 homepage = https://vifm.info/;
pkgs/applications/misc/workrave/default.nix+1−2
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
99 pname = "workrave";
1010 version = "1.10.31";
1111
12− src = let
13− in fetchFromGitHub {
12+ src = fetchFromGitHub {
1413 sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
1514 rev = with stdenv.lib;
1615 "v" + concatStringsSep "_" (splitVersion version);
pkgs/applications/misc/xdgmenumaker/default.nix+24−14
@@ -1,33 +1,43 @@
1−{ stdenv, fetchFromGitHub, txt2tags, python2Packages }:
1+{ stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
22
3−stdenv.mkDerivation rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "xdgmenumaker";
55 version = "1.5";
66
77 src = fetchFromGitHub {
88 owner = "gapan";
9− repo = "xdgmenumaker";
9+ repo = pname;
1010 rev = version;
1111 sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif";
1212 };
1313
14+ format = "other";
15+
16+ strictDeps = false;
17+
1418 nativeBuildInputs = [
19+ gobject-introspection
1520 txt2tags
16− python2Packages.wrapPython
21+ wrapGAppsHook
22+ ];
23+
24+ buildInputs = [
25+ glib
26+ ];
27+
28+ pythonPath = with python3Packages; [
29+ pyxdg
30+ pygobject3
31+ ];
32+
33+ makeFlags = [
34+ "PREFIX=${placeholder "out"}"
1735 ];
1836
19− pythonPath = [
20− python2Packages.pyxdg
21− python2Packages.pygtk
37+ installFlags = [
38+ "DESTDIR="
2239 ];
2340
24− installPhase = ''
25− make install PREFIX=$out DESTDIR=
26− wrapProgram "$out/bin/xdgmenumaker" \
27− --prefix XDG_DATA_DIRS : "$out/share"
28− wrapPythonPrograms
29− '';
30−
3141 meta = with stdenv.lib; {
3242 description = "Command line tool that generates XDG menus for several window managers";
3343 homepage = https://github.com/gapan/xdgmenumaker;
pkgs/applications/networking/cluster/kubeval/default.nix+13−13
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, buildGoPackage, makeWrapper }:
1+{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
22
33let
44
@@ -7,10 +7,10 @@ let
77 schema = stdenv.mkDerivation {
88 name = "kubeval-schema";
99 src = fetchFromGitHub {
10− owner = "garethr";
10+ owner = "instrumenta";
1111 repo = "kubernetes-json-schema";
12− rev = "c7672fd48e1421f0060dd54b6620baa2ab7224ba";
13− sha256 = "0picr3wvjx4qv158jy4f60pl225rm4mh0l97pf8nqi9h9x4x888p";
12+ rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699";
13+ sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr";
1414 };
1515
1616 installPhase = ''
@@ -21,26 +21,26 @@ let
2121
2222in
2323
24−buildGoPackage rec {
24+buildGoModule rec {
2525 pname = "kubeval";
26− version = "0.7.3";
26+ version = "0.14.0";
2727
28− goPackagePath = "github.com/garethr/kubeval";
2928 src = fetchFromGitHub {
30− owner = "garethr";
29+ owner = "instrumenta";
3130 repo = "kubeval";
32− rev = version;
33− sha256 = "042v4mc5p80vmk56wp6aw89yiibjnfqn79c0zcd6y179br4gpfnb";
31+ rev = "${version}";
32+ sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv";
3433 };
35− goDeps = ./deps.nix;
3634
3735 buildInputs = [ makeWrapper ];
3836
39− postFixup = "wrapProgram $bin/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}";
37+ modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
38+
39+ postFixup = "wrapProgram $out/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}/kubernetes-json-schema/master";
4040
4141 meta = with lib; {
4242 description = "Validate your Kubernetes configuration files";
43− homepage = https://github.com/garethr/kubeval;
43+ homepage = https://github.com/instrumenta/kubeval;
4444 license = licenses.asl20;
4545 maintainers = with maintainers; [ nicknovitski ];
4646 platforms = platforms.all;
pkgs/applications/networking/cluster/kubeval/deps.nixdeleted−174
@@ -1,174 +0,0 @@
1−# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
2−[
3− {
4− goPackagePath = "github.com/fatih/color";
5− fetch = {
6− type = "git";
7− url = "https://github.com/fatih/color";
8− rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
9− sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
10− };
11− }
12− {
13− goPackagePath = "github.com/fsnotify/fsnotify";
14− fetch = {
15− type = "git";
16− url = "https://github.com/fsnotify/fsnotify";
17− rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
18− sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
19− };
20− }
21− {
22− goPackagePath = "github.com/hashicorp/go-multierror";
23− fetch = {
24− type = "git";
25− url = "https://github.com/hashicorp/go-multierror";
26− rev = "b7773ae218740a7be65057fc60b366a49b538a44";
27− sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
28− };
29− }
30− {
31− goPackagePath = "github.com/hashicorp/hcl";
32− fetch = {
33− type = "git";
34− url = "https://github.com/hashicorp/hcl";
35− rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
36− sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
37− };
38− }
39− {
40− goPackagePath = "github.com/magiconair/properties";
41− fetch = {
42− type = "git";
43− url = "https://github.com/magiconair/properties";
44− rev = "c2353362d570a7bfa228149c62842019201cfb71";
45− sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
46− };
47− }
48− {
49− goPackagePath = "github.com/mitchellh/mapstructure";
50− fetch = {
51− type = "git";
52− url = "https://github.com/mitchellh/mapstructure";
53− rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
54− sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
55− };
56− }
57− {
58− goPackagePath = "github.com/pelletier/go-toml";
59− fetch = {
60− type = "git";
61− url = "https://github.com/pelletier/go-toml";
62− rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
63− sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
64− };
65− }
66− {
67− goPackagePath = "github.com/spf13/afero";
68− fetch = {
69− type = "git";
70− url = "https://github.com/spf13/afero";
71− rev = "787d034dfe70e44075ccc060d346146ef53270ad";
72− sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
73− };
74− }
75− {
76− goPackagePath = "github.com/spf13/cast";
77− fetch = {
78− type = "git";
79− url = "https://github.com/spf13/cast";
80− rev = "8965335b8c7107321228e3e3702cab9832751bac";
81− sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
82− };
83− }
84− {
85− goPackagePath = "github.com/spf13/cobra";
86− fetch = {
87− type = "git";
88− url = "https://github.com/spf13/cobra";
89− rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
90− sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
91− };
92− }
93− {
94− goPackagePath = "github.com/spf13/jwalterweatherman";
95− fetch = {
96− type = "git";
97− url = "https://github.com/spf13/jwalterweatherman";
98− rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
99− sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
100− };
101− }
102− {
103− goPackagePath = "github.com/spf13/pflag";
104− fetch = {
105− type = "git";
106− url = "https://github.com/spf13/pflag";
107− rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
108− sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
109− };
110− }
111− {
112− goPackagePath = "github.com/spf13/viper";
113− fetch = {
114− type = "git";
115− url = "https://github.com/spf13/viper";
116− rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
117− sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
118− };
119− }
120− {
121− goPackagePath = "github.com/xeipuuv/gojsonpointer";
122− fetch = {
123− type = "git";
124− url = "https://github.com/xeipuuv/gojsonpointer";
125− rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
126− sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
127− };
128− }
129− {
130− goPackagePath = "github.com/xeipuuv/gojsonreference";
131− fetch = {
132− type = "git";
133− url = "https://github.com/xeipuuv/gojsonreference";
134− rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
135− sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
136− };
137− }
138− {
139− goPackagePath = "github.com/xeipuuv/gojsonschema";
140− fetch = {
141− type = "git";
142− url = "https://github.com/xeipuuv/gojsonschema";
143− rev = "9ff6d6c47f3f5de55acc6f464d6e3719b02818ae";
144− sha256 = "0rpkya4lnpv9g33bs0z3vd5dlnadkyq1lg7114nbd73vm878s6sw";
145− };
146− }
147− {
148− goPackagePath = "golang.org/x/sys";
149− fetch = {
150− type = "git";
151− url = "https://go.googlesource.com/sys";
152− rev = "2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15";
153− sha256 = "1a6x6n1fk5k013w5r4b0bxws1d2fh0s69mbzpi1vkyfpcxabwjhj";
154− };
155− }
156− {
157− goPackagePath = "golang.org/x/text";
158− fetch = {
159− type = "git";
160− url = "https://go.googlesource.com/text";
161− rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
162− sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
163− };
164− }
165− {
166− goPackagePath = "gopkg.in/yaml.v2";
167− fetch = {
168− type = "git";
169− url = "https://gopkg.in/yaml.v2";
170− rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
171− sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
172− };
173− }
174−]
pkgs/applications/networking/cluster/terraform-providers/data.nix+93−93
@@ -12,9 +12,9 @@
1212 {
1313 owner = "terraform-providers";
1414 repo = "terraform-provider-alicloud";
15− rev = "v1.60.0";
16− version = "1.60.0";
17− sha256 = "14k96ccjrjiqfrdrj9kd090ms1p15z71qv60gm05bhffviyplmgw";
15+ rev = "v1.63.0";
16+ version = "1.63.0";
17+ sha256 = "0353zsga4ic7rsgnk243v202l4hpy0xlzp95fnbmrz7p5wy2k8js";
1818 };
1919 archive =
2020 {
@@ -44,25 +44,25 @@
4444 {
4545 owner = "terraform-providers";
4646 repo = "terraform-provider-aws";
47− rev = "v2.34.0";
48− version = "2.34.0";
49− sha256 = "1kmy6hn1d3padfnix17ibmrm1339q4li0740dlfgjlxjv179bv34";
47+ rev = "v2.41.0";
48+ version = "2.41.0";
49+ sha256 = "0i9bh78ihmxj7hjbqzkkj7k6lvr3xdakf8qv0bfckcinwpzwzbxa";
5050 };
5151 azuread =
5252 {
5353 owner = "terraform-providers";
5454 repo = "terraform-provider-azuread";
55− rev = "v0.6.0";
56− version = "0.6.0";
57− sha256 = "1s3k2plka1lzfij4vhr30vc549zysa6v8j5mphra7fjxy236v40j";
55+ rev = "v0.7.0";
56+ version = "0.7.0";
57+ sha256 = "1a7w31dvjz5498445ia4m5gd1js3k7ghz6qqfq51f2n86iafs0xq";
5858 };
5959 azurerm =
6060 {
6161 owner = "terraform-providers";
6262 repo = "terraform-provider-azurerm";
63− rev = "v1.36.1";
64− version = "1.36.1";
65− sha256 = "1mnbmbfsnc859j6ahcph80z0v1jl82dnbjqmqg2q0kiappz2g2lm";
63+ rev = "v1.37.0";
64+ version = "1.37.0";
65+ sha256 = "0n0582v8g3np8glyxnpnayps014jxclzrglcxf35wszfz9mspryg";
6666 };
6767 azurestack =
6868 {
@@ -76,9 +76,9 @@
7676 {
7777 owner = "terraform-providers";
7878 repo = "terraform-provider-bigip";
79− rev = "v1.0.0";
80− version = "1.0.0";
81− sha256 = "0dz5dfv3glx7898a9bi9vi3g0ghyi96pc45brrj41and5835jvdc";
79+ rev = "v1.1.0";
80+ version = "1.1.0";
81+ sha256 = "15fmxr1c39xx6ix38nigf8izrqzlmjjr6hvlkf7yhb5z7485nvsg";
8282 };
8383 bitbucket =
8484 {
@@ -108,9 +108,9 @@
108108 {
109109 owner = "terraform-providers";
110110 repo = "terraform-provider-circonus";
111− rev = "v0.2.0";
112− version = "0.2.0";
113− sha256 = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45";
111+ rev = "v0.4.0";
112+ version = "0.4.0";
113+ sha256 = "0iz7v7gfjgbca47vjnvcv9159kgladkad7cmjw2hpncrn2jjinwg";
114114 };
115115 clc =
116116 {
@@ -124,17 +124,17 @@
124124 {
125125 owner = "terraform-providers";
126126 repo = "terraform-provider-cloudflare";
127− rev = "v2.0.1";
128− version = "2.0.1";
129− sha256 = "18cxyxgv6x5s1xsd5l460hnl1xdvrvkwb36lhvk3dgziaw2xxr81";
127+ rev = "v2.1.0";
128+ version = "2.1.0";
129+ sha256 = "1ll06p4fz88mr4a51rqgvxykivx9xina6507mflyxaic59xlkdz4";
130130 };
131131 cloudscale =
132132 {
133133 owner = "terraform-providers";
134134 repo = "terraform-provider-cloudscale";
135− rev = "v2.0.0";
136− version = "2.0.0";
137− sha256 = "145hj4pbi5zrkgamicy3m1n3380fpd2ndd6ym7mwd65d95g39vwb";
135+ rev = "v2.1.0";
136+ version = "2.1.0";
137+ sha256 = "12vxzhpsivvq343mqkmnwklvnv6dc9h2ah0ixla9svdwjp91xfcd";
138138 };
139139 cloudstack =
140140 {
@@ -172,9 +172,9 @@
172172 {
173173 owner = "terraform-providers";
174174 repo = "terraform-provider-digitalocean";
175− rev = "v1.10.0";
176− version = "1.10.0";
177− sha256 = "1c53g32mk41lvq4ikfj04m89nhzrdk8d6h35aq3z07yyqp6ap2a0";
175+ rev = "v1.11.0";
176+ version = "1.11.0";
177+ sha256 = "0s8z0zsfibclx0431fcqbi9yqkhwj4w0rz780z1dwv50xpgnmzql";
178178 };
179179 dme =
180180 {
@@ -204,9 +204,9 @@
204204 {
205205 owner = "terraform-providers";
206206 repo = "terraform-provider-docker";
207− rev = "v2.5.0";
208− version = "2.5.0";
209− sha256 = "1nril7qy1nm1dq19vg6mm0zc0sgkjrm1s39n7p9gxf4s4j78ig1n";
207+ rev = "v2.6.0";
208+ version = "2.6.0";
209+ sha256 = "12qq7m75yxfczik78klqaimrzhp70m2vk5q0h3v8b2dwvvynj0dg";
210210 };
211211 dyn =
212212 {
@@ -252,25 +252,25 @@
252252 {
253253 owner = "terraform-providers";
254254 repo = "terraform-provider-gitlab";
255− rev = "v2.3.0";
256− version = "2.3.0";
257− sha256 = "012pbgfdmwyq8y8ddrhyf14jc6s7v24f1w3mrpi6mp4glqc5yfqx";
255+ rev = "v2.4.0";
256+ version = "2.4.0";
257+ sha256 = "0409n8miva205wkx968ggzmz0y121s99iybsjlkx0gja20x68yxx";
258258 };
259259 google =
260260 {
261261 owner = "terraform-providers";
262262 repo = "terraform-provider-google";
263− rev = "v2.19.0";
264− version = "2.19.0";
265− sha256 = "00pqkysic3x8iygcxb232dwbpmy5ldf7fdfi6ldiv3g6gbvlcaf7";
263+ rev = "v2.20.0";
264+ version = "2.20.0";
265+ sha256 = "1b19hql244lv74gxdwgqh9955d3zkwj7riaq6kj5ylbj44spcpjy";
266266 };
267267 google-beta =
268268 {
269269 owner = "terraform-providers";
270270 repo = "terraform-provider-google-beta";
271− rev = "v2.19.0";
272− version = "2.19.0";
273− sha256 = "03im9h7r2vyx4y9qnc3l0hsvcqy7rai5dlkmj1za3npm98vpx2d7";
271+ rev = "v2.20.0";
272+ version = "2.20.0";
273+ sha256 = "0zkhyn17kji6yyl5582g5vhqj3rcbin73ym6vn6f0m7sf5yaplky";
274274 };
275275 grafana =
276276 {
@@ -284,17 +284,17 @@
284284 {
285285 owner = "terraform-providers";
286286 repo = "terraform-provider-hcloud";
287− rev = "v1.14.0";
288− version = "1.14.0";
289− sha256 = "13zxrjx4im25g7m45z95d3py85nzs2k8r9grilxshr6x95bxk2f0";
287+ rev = "v1.15.0";
288+ version = "1.15.0";
289+ sha256 = "0l554mf6s248j0453b4r5pafshcvhn2smk4pp23y9kq5g1xd0xmd";
290290 };
291291 hedvig =
292292 {
293293 owner = "terraform-providers";
294294 repo = "terraform-provider-hedvig";
295− rev = "v1.0.4";
296− version = "1.0.4";
297− sha256 = "0y6brzznxp8khdfbnpmnbjqf140411z0pvnp88p8mj2kmbk7kkjd";
295+ rev = "v1.0.5";
296+ version = "1.0.5";
297+ sha256 = "0dic4kqjwi3s8pss1pmgixnr7xi503gl5i7pcx66fam5y5ar92v5";
298298 };
299299 helm =
300300 {
@@ -324,9 +324,9 @@
324324 {
325325 owner = "terraform-providers";
326326 repo = "terraform-provider-huaweicloud";
327− rev = "v1.9.0";
328− version = "1.9.0";
329− sha256 = "06blhsbv5pxlb1m07qanrq5qmbai33dlk89ghzscrqwnvv1nnszr";
327+ rev = "v1.10.0";
328+ version = "1.10.0";
329+ sha256 = "0aa83y0bzfldijd4jbmhqppc13jdqaax83p75kffwaxw1rmxrana";
330330 };
331331 icinga2 =
332332 {
@@ -340,9 +340,9 @@
340340 {
341341 owner = "terraform-providers";
342342 repo = "terraform-provider-ignition";
343− rev = "v1.1.0";
344− version = "1.1.0";
345− sha256 = "0vpjbb70wnlrvw7z2zc92fbisgjk49ivdmv10ahyqlgvc23js5va";
343+ rev = "v1.2.0";
344+ version = "1.2.0";
345+ sha256 = "0dg5xak02rv7h9z07kjqxf55al188ligzq3m6711rlh62zam2cjc";
346346 };
347347 influxdb =
348348 {
@@ -356,9 +356,9 @@
356356 {
357357 owner = "terraform-providers";
358358 repo = "terraform-provider-kubernetes";
359− rev = "v1.9.0";
360− version = "1.9.0";
361− sha256 = "1ai8w853k4pgr43g9dwdsimw0g0c6vg6vg2f20d9ch7bx8ii4nhf";
359+ rev = "v1.10.0";
360+ version = "1.10.0";
361+ sha256 = "04hd9n9jm72fi81cmdz0yf374fg52r8yinsxy0ag29rd3r2l1k81";
362362 };
363363 librato =
364364 {
@@ -372,9 +372,9 @@
372372 {
373373 owner = "terraform-providers";
374374 repo = "terraform-provider-linode";
375− rev = "v1.8.0";
376− version = "1.8.0";
377− sha256 = "1jgh2ij58a5mr6ns604cfpvfvr19qr0q51j57gvchz53iv683m9q";
375+ rev = "v1.9.1";
376+ version = "1.9.1";
377+ sha256 = "10f7nij91fhgf1808r6rv3l13nz7p37mcln5p3nfvhsxskss3vxn";
378378 };
379379 local =
380380 {
@@ -412,9 +412,9 @@
412412 {
413413 owner = "terraform-providers";
414414 repo = "terraform-provider-mysql";
415− rev = "v1.8.0";
416− version = "1.8.0";
417− sha256 = "1llcg2mp6jbj386liinly62pgy934v0c2g5z976n0xwfdiybyhwx";
415+ rev = "v1.9.0";
416+ version = "1.9.0";
417+ sha256 = "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g";
418418 };
419419 netlify =
420420 {
@@ -428,9 +428,9 @@
428428 {
429429 owner = "terraform-providers";
430430 repo = "terraform-provider-newrelic";
431− rev = "v1.5.2";
432− version = "1.5.2";
433− sha256 = "1q2vlpzxz04xhmf2wi5pc501454qwzh59kdhfhs8yjg1d1489jng";
431+ rev = "v1.8.0";
432+ version = "1.8.0";
433+ sha256 = "16fdif6hshdb1aswv22k590rcr3f6b3a9gmg8vc4lbyi6l2dfabd";
434434 };
435435 nomad =
436436 {
@@ -444,17 +444,17 @@
444444 {
445445 owner = "terraform-providers";
446446 repo = "terraform-provider-ns1";
447− rev = "v1.6.0";
448− version = "1.6.0";
449− sha256 = "1v075wc48pq9kp9rp4kanlfshnxgan9h914nqalq90xgzyl2gf3v";
447+ rev = "v1.6.1";
448+ version = "1.6.1";
449+ sha256 = "0zyn165h42p640k1q85x3n8fw1fs9j72z9lnfa8pas89jy2fmi8b";
450450 };
451451 nsxt =
452452 {
453453 owner = "terraform-providers";
454454 repo = "terraform-provider-nsxt";
455− rev = "v1.1.1";
456− version = "1.1.1";
457− sha256 = "19bbycify25bshpyq65qjxnl72b6wmwwwdb7hxl94hhbgx2c9z29";
455+ rev = "v1.1.2";
456+ version = "1.1.2";
457+ sha256 = "1hnxivad7371j363sp3460mfzl5alb3dhxsbp0qwfl5mzvriwrbl";
458458 };
459459 null =
460460 {
@@ -476,9 +476,9 @@
476476 {
477477 owner = "terraform-providers";
478478 repo = "terraform-provider-oci";
479− rev = "v3.50.0-rc1";
480− version = "3.50.0-rc1";
481− sha256 = "0nzz62zyx5xf2qlvjcbsqnafdhmq194yhyipcab1n2ckji8zb03z";
479+ rev = "v3.54.0-rc1";
480+ version = "3.54.0-rc1";
481+ sha256 = "14mfkjjpq4sfw0j4w1mnh37x9kwn76rs1y6cjqq9zb8fnhva6gax";
482482 };
483483 oneandone =
484484 {
@@ -508,17 +508,17 @@
508508 {
509509 owner = "terraform-providers";
510510 repo = "terraform-provider-opentelekomcloud";
511− rev = "v1.13.1";
512− version = "1.13.1";
513− sha256 = "1mxbfskxf9zwm55r3s6fhk634pnyk0sx5pgwk3kmw4sgjv88i1ny";
511+ rev = "v1.14.0";
512+ version = "1.14.0";
513+ sha256 = "1mjb6br8iy76q417lmg04xnv4hkgi2fgdn3qnr3nvlwnnccp230k";
514514 };
515515 opsgenie =
516516 {
517517 owner = "terraform-providers";
518518 repo = "terraform-provider-opsgenie";
519− rev = "v0.2.4";
520− version = "0.2.4";
521− sha256 = "1kgvbx39v6f3hszwrqjsaq3wvwzkxf4gwwfix2m6bprfr5q5vn0d";
519+ rev = "v0.2.5";
520+ version = "0.2.5";
521+ sha256 = "0brjqnlnxqss285n2g1z006bibbdh5v47g75l5kyhyhhchavccma";
522522 };
523523 oraclepaas =
524524 {
@@ -540,9 +540,9 @@
540540 {
541541 owner = "terraform-providers";
542542 repo = "terraform-provider-packet";
543− rev = "v2.6.1";
544− version = "2.6.1";
545− sha256 = "198lkw5b4xfyf82yzym66fna7j0wl3hzvkdr9b9q7f0nffx47xri";
543+ rev = "v2.7.1";
544+ version = "2.7.1";
545+ sha256 = "1hmja9c8ab66yr814psz1zsa4y0nbmd5rcnp3qxdgizp45yrvz3i";
546546 };
547547 pagerduty =
548548 {
@@ -556,9 +556,9 @@
556556 {
557557 owner = "terraform-providers";
558558 repo = "terraform-provider-panos";
559− rev = "v1.6.0";
560− version = "1.6.0";
561− sha256 = "0qszdyrj84c8i195y45cnanzmkn8ypi1gi5a03pf3gsf2fdcj9gq";
559+ rev = "v1.6.1";
560+ version = "1.6.1";
561+ sha256 = "06hwi426x7ipmn4dbg5dyv9z84sxaa8q1jlcd2l264n9s2y3xhiq";
562562 };
563563 postgresql =
564564 {
@@ -700,9 +700,9 @@
700700 {
701701 owner = "terraform-providers";
702702 repo = "terraform-provider-tencentcloud";
703− rev = "v1.22.0";
704− version = "1.22.0";
705− sha256 = "0lamj77n9b5m80201wim0zcjgdcbihcaq27z49himh2qi5j8lxiz";
703+ rev = "v1.25.2";
704+ version = "1.25.2";
705+ sha256 = "1pf4l9rvkarl4vhf51np4kdqcgs4jhsr5gw7vs6rn8gv97lb40kw";
706706 };
707707 terraform =
708708 {
@@ -756,9 +756,9 @@
756756 {
757757 owner = "terraform-providers";
758758 repo = "terraform-provider-vault";
759− rev = "v2.5.0";
760− version = "2.5.0";
761− sha256 = "0h3q2zifjgm05kvdans88dl8wx9hr21c1s64fmfs4an07gkg8947";
759+ rev = "v2.6.0";
760+ version = "2.6.0";
761+ sha256 = "0sw1swy2j9n3ji48sxmj093zzlq7sdmp8ixmz488ps3m4jjyfk6k";
762762 };
763763 vcd =
764764 {
@@ -780,9 +780,9 @@
780780 {
781781 owner = "terraform-providers";
782782 repo = "terraform-provider-yandex";
783− rev = "v0.23.0";
784− version = "0.23.0";
785− sha256 = "0vv8lp834q8i7fam2s8pvs7slfwlf8m4g080i9cij5z2lgipja32";
783+ rev = "v0.24.0";
784+ version = "0.24.0";
785+ sha256 = "0a9isivn3ni0d1id8ww97xbcwrxc0c4pn1m1q21cipqs6mwksq9m";
786786 };
787787 segment =
788788 {
pkgs/applications/networking/instant-messengers/zoom-us/default.nix+2−2
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
1414let
1515 inherit (stdenv.lib) concatStringsSep makeBinPath optional;
1616
17− version = "3.0.317369.1110";
17+ version = "3.5.330166.1202";
1818 srcs = {
1919 x86_64-linux = fetchurl {
2020 url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
21− sha256 = "0r4wp9qb1739xwr24kglc4sj8qaxwr4nh5p1igi3x6f1f8gczia7";
21+ sha256 = "1fjirl4hmxvy4kp3b0n97mn8sz355ik10297qx6hcr0fhn2v0nig";
2222 };
2323 };
2424
pkgs/applications/networking/mailreaders/imapfilter.nix+1−1
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
1919 description = "Mail filtering utility";
2020 license = stdenv.lib.licenses.mit;
2121 platforms = stdenv.lib.platforms.unix;
22− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
22+ maintainers = with stdenv.lib.maintainers; [ ];
2323 };
2424}
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+1−1
@@ -185,7 +185,7 @@ stdenv.mkDerivation {
185185 free = false;
186186 url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
187187 };
188− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
188+ maintainers = with stdenv.lib.maintainers; [ ];
189189 platforms = platforms.linux;
190190 };
191191}
pkgs/applications/office/libreoffice/default.nix+14−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
1+{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
22, IOCompress, zlib, libjpeg, expat, freetype, libwpd
33, libxml2, db, curl, fontconfig, libsndfile, neon
44, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
@@ -73,6 +73,19 @@ in stdenv.mkDerivation rec {
7373
7474 patches = [
7575 ./xdg-open-brief.patch
76+
77+ # Poppler-0.82 compatibility
78+ # https://gerrit.libreoffice.org/81545
79+ (fetchpatch {
80+ url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
81+ sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
82+ })
83+ # Poppler-0.83 compatibility
84+ # https://gerrit.libreoffice.org/84384
85+ (fetchpatch {
86+ url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
87+ sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
88+ })
7689 ];
7790
7891 tarballPath = "external/tarballs";
pkgs/applications/office/libreoffice/still.nix+14−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
1+{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
22, IOCompress, zlib, libjpeg, expat, freetype, libwpd
33, libxml2, db, curl, fontconfig, libsndfile, neon
44, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
@@ -73,6 +73,19 @@ in stdenv.mkDerivation rec {
7373
7474 patches = [
7575 ./xdg-open-brief.patch
76+
77+ # Poppler-0.82 compatibility
78+ # https://gerrit.libreoffice.org/81545
79+ (fetchpatch {
80+ url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
81+ sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
82+ })
83+ # Poppler-0.83 compatibility
84+ # https://gerrit.libreoffice.org/84384
85+ (fetchpatch {
86+ url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
87+ sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
88+ })
7689 ];
7790
7891 tarballPath = "external/tarballs";
pkgs/applications/office/scribus/unstable.nix+14−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
1+{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
22boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
33podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }:
44
@@ -14,6 +14,19 @@ mkDerivation rec {
1414 sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E=";
1515 };
1616
17+ patches = [
18+ # fix build with Poppler 0.82
19+ (fetchpatch {
20+ url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
21+ sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
22+ })
23+ # fix build with Poppler 0.83
24+ (fetchpatch {
25+ url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
26+ sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
27+ })
28+ ];
29+
1730 enableParallelBuilding = true;
1831
1932 nativeBuildInputs = [ pkgconfig cmake ];
pkgs/applications/science/astronomy/gildas/default.nix+3−3
@@ -7,8 +7,8 @@ let
77in
88
99stdenv.mkDerivation rec {
10− srcVersion = "oct19a";
11− version = "20191001_a";
10+ srcVersion = "dec19a";
11+ version = "20191201_a";
1212 pname = "gildas";
1313
1414 src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 # source code of the previous release to a different directory
1717 urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
1818 "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
19− sha256 = "0h6g16ra7v8x15j21z5hnb3midwm0asc7bjm9gs5v5sw66vn3wc1";
19+ sha256 = "0kwq5gzgzx5hkbabwvbrw2958pqz4m2s501k5cbllgxh4sqp86b1";
2020 };
2121
2222 enableParallelBuilding = true;
pkgs/applications/science/logic/symbiyosys/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
1+{ stdenv, fetchFromGitHub, yosys, bash, python3, yices }:
22
33stdenv.mkDerivation {
44 pname = "symbiyosys";
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
1313
1414 buildInputs = [ python3 yosys ];
1515
16+ propagatedBuildInputs = [ yices ];
17+
1618 buildPhase = "true";
1719 installPhase = ''
1820 mkdir -p $out/bin $out/share/yosys/python3
pkgs/applications/science/math/sage/sage-tests.nix+1−1
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
5656 export GLIBC_TUNABLES=glibc.malloc.arena_max=4
5757
5858 echo "Running sage tests with arguments ${timeSpecifier} ${patienceSpecifier} ${testArgs}"
59− "sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs}
59+ "sage" -t --timeout=0 --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs}
6060 '';
6161}
pkgs/applications/science/misc/vite/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
3838
3939 homepage = http://vite.gforge.inria.fr/;
4040 license = stdenv.lib.licenses.cecill20;
41− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
41+ maintainers = with stdenv.lib.maintainers; [ ];
4242 platforms = stdenv.lib.platforms.linux;
4343 };
4444}
pkgs/applications/version-management/gitlab/data.json+3−3
@@ -1,9 +1,9 @@
11{
2− "version": "12.5.2",
3− "repo_hash": "18mviak37rkpj92m0hzh79rjbfsk8p91r5zzjp7y3y4qjnsf2a8p",
2+ "version": "12.5.3",
3+ "repo_hash": "1q76yhg4ygs9w5hb8hbv1908d5pfqzr8idmjp06pa4dw5qqqkv97",
44 "owner": "gitlab-org",
55 "repo": "gitlab",
6− "rev": "v12.5.2-ee",
6+ "rev": "v12.5.3-ee",
77 "passthru": {
88 "GITALY_SERVER_VERSION": "1.72.1",
99 "GITLAB_PAGES_VERSION": "1.12.0",
pkgs/applications/version-management/gitlab/gitaly/deps.nix+18
@@ -306,6 +306,15 @@
306306 sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
307307 };
308308 }
309+ {
310+ goPackagePath = "github.com/golang/lint";
311+ fetch = {
312+ type = "git";
313+ url = "https://github.com/golang/lint";
314+ rev = "06c8688daad7";
315+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
316+ };
317+ }
309318 {
310319 goPackagePath = "github.com/golang/mock";
311320 fetch = {
@@ -540,6 +549,15 @@
540549 sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
541550 };
542551 }
552+ {
553+ goPackagePath = "github.com/kisielk/gotool";
554+ fetch = {
555+ type = "git";
556+ url = "https://github.com/kisielk/gotool";
557+ rev = "v1.0.0";
558+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
559+ };
560+ }
543561 {
544562 goPackagePath = "github.com/klauspost/compress";
545563 fetch = {
pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix+18
@@ -162,6 +162,15 @@
162162 sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
163163 };
164164 }
165+ {
166+ goPackagePath = "github.com/golang/lint";
167+ fetch = {
168+ type = "git";
169+ url = "https://github.com/golang/lint";
170+ rev = "06c8688daad7";
171+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
172+ };
173+ }
165174 {
166175 goPackagePath = "github.com/golang/mock";
167176 fetch = {
@@ -252,6 +261,15 @@
252261 sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
253262 };
254263 }
264+ {
265+ goPackagePath = "github.com/kisielk/gotool";
266+ fetch = {
267+ type = "git";
268+ url = "https://github.com/kisielk/gotool";
269+ rev = "v1.0.0";
270+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
271+ };
272+ }
255273 {
256274 goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
257275 fetch = {
pkgs/applications/video/mkvtoolnix/default.nix+1−1
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
6161 description = "Cross-platform tools for Matroska";
6262 homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
6363 license = licenses.gpl2;
64− maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ];
64+ maintainers = with maintainers; [ codyopel rnhmjoj ];
6565 platforms = platforms.linux
6666 ++ optionals (!withGUI) platforms.darwin;
6767 };
pkgs/applications/video/mpv/default.nix+1−1
@@ -235,7 +235,7 @@ in stdenv.mkDerivation rec {
235235 description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
236236 homepage = https://mpv.io;
237237 license = licenses.gpl2Plus;
238− maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ivan ];
238+ maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ];
239239 platforms = platforms.darwin ++ platforms.linux;
240240
241241 longDescription = ''
pkgs/applications/virtualization/gvisor/containerd-shim.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
2+
3+buildGoModule rec {
4+ name = "gvisor-containerd-shim-${version}";
5+ version = "2019-10-09";
6+
7+ src = fetchFromGitHub {
8+ owner = "google";
9+ repo = "gvisor-containerd-shim";
10+ rev = "f299b553afdd8455a0057862004061ea12e660f5";
11+ sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm";
12+ };
13+
14+ modSha256 = "1jdhgbrn59ahnabwnig99i21f6kimmqx9f3dg10ffwfs3dx0gzlg";
15+
16+ buildPhase = ''
17+ make
18+ '';
19+
20+ doCheck = true;
21+ checkPhase = ''
22+ make test
23+ '';
24+
25+ installPhase = ''
26+ make install DESTDIR="$out"
27+ '';
28+
29+ meta = with lib; {
30+ description = "containerd shim for gVisor";
31+ homepage = https://github.com/google/gvisor-containerd-shim;
32+ license = licenses.asl20;
33+ maintainers = with maintainers; [ andrew-d ];
34+ platforms = [ "x86_64-linux" ];
35+ };
36+}
pkgs/applications/virtualization/gvisor/default.nixnew file+101
@@ -0,0 +1,101 @@
1+{ stdenv
2+, buildBazelPackage
3+, fetchFromGitHub
4+, cacert
5+, git
6+, glibcLocales
7+, go
8+, iproute
9+, iptables
10+, makeWrapper
11+, procps
12+, python3
13+}:
14+
15+let
16+ preBuild = ''
17+ patchShebangs .
18+
19+ # Tell rules_go to use the Go binary found in the PATH
20+ sed -E -i \
21+ -e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \
22+ WORKSPACE
23+
24+ # The gazelle Go tooling needs CA certs
25+ export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
26+
27+ # If we don't reset our GOPATH, the rules_go stdlib builder tries to
28+ # install something into it. Ideally that wouldn't happen, but for now we
29+ # can also get around it by unsetting GOPATH entirely, since rules_go
30+ # doesn't need it.
31+ export GOPATH=
32+ '';
33+
34+in buildBazelPackage rec {
35+ name = "gvisor-${version}";
36+ version = "2019-11-14";
37+
38+ src = fetchFromGitHub {
39+ owner = "google";
40+ repo = "gvisor";
41+ rev = "release-20191114.0";
42+ sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1";
43+ };
44+
45+ nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ];
46+
47+ bazelTarget = "//runsc:runsc";
48+
49+ # gvisor uses the Starlark implementation of rules_cc, not the built-in one,
50+ # so we shouldn't delete it from our dependencies.
51+ removeRulesCC = false;
52+
53+ fetchAttrs = {
54+ inherit preBuild;
55+
56+ preInstall = ''
57+ # Remove the go_sdk (it's just a copy of the go derivation) and all
58+ # references to it from the marker files. Bazel does not need to download
59+ # this sdk because we have patched the WORKSPACE file to point to the one
60+ # currently present in PATH. Without removing the go_sdk from the marker
61+ # file, the hash of it will change anytime the Go derivation changes and
62+ # that would lead to impurities in the marker files which would result in
63+ # a different sha256 for the fetch phase.
64+ rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
65+
66+ # Remove the gazelle tools, they contain go binaries that are built
67+ # non-deterministically. As long as the gazelle version matches the tools
68+ # should be equivalent.
69+ rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker}
70+
71+ # Remove the gazelle repository cache
72+ chmod -R +w $bazelOut/external/bazel_gazelle_go_repository_cache
73+ rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker}
74+
75+ # Remove log file(s)
76+ rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
77+ '';
78+
79+ sha256 = "122qk6iv8hd7g2a84y9aqqhij4r0m47vpxzbqhhh6k5livc73qd6";
80+ };
81+
82+ buildAttrs = {
83+ inherit preBuild;
84+
85+ installPhase = ''
86+ install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc
87+
88+ # Needed for the 'runsc do' subcomand
89+ wrapProgram $out/bin/runsc \
90+ --prefix PATH : ${stdenv.lib.makeBinPath [ iproute iptables procps ]}
91+ '';
92+ };
93+
94+ meta = with stdenv.lib; {
95+ description = "Container Runtime Sandbox";
96+ homepage = https://github.com/google/gvisor;
97+ license = licenses.asl20;
98+ maintainers = with maintainers; [ andrew-d ];
99+ platforms = [ "x86_64-linux" ];
100+ };
101+}
pkgs/build-support/agda/default.nix−2
@@ -1,6 +1,4 @@
11# Builder for Agda packages. Mostly inspired by the cabal builder.
2−#
3−# Contact: stdenv.lib.maintainers.fuuzetsu
42
53{ stdenv, Agda, glibcLocales
64, writeShellScriptBin
pkgs/build-support/trivial-builders.nix+25−4
@@ -2,11 +2,16 @@
22
33let
44
5− runCommand' = stdenv: name: env: buildCommand:
5+ runCommand' = runLocal: stdenv: name: env: buildCommand:
66 stdenv.mkDerivation ({
77 inherit name buildCommand;
88 passAsFile = [ "buildCommand" ];
9− } // env);
9+ }
10+ // (lib.optionalAttrs runLocal {
11+ preferLocalBuild = true;
12+ allowSubstitutes = false;
13+ })
14+ // env);
1015
1116in
1217
@@ -21,11 +26,27 @@ rec {
2126 * runCommand "name" {envVariable = true;} ''echo hello > $out''
2227 * runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
2328 * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
29+ *
30+ * The `*Local` variants force a derivation to be built locally,
31+ * it is not substituted.
32+ *
33+ * This is intended for very cheap commands (<1s execution time).
34+ * It saves on the network roundrip and can speed up a build.
35+ *
36+ * It is the same as adding the special fields
37+ * `preferLocalBuild = true;`
38+ * `allowSubstitutes = false;`
39+ * to a derivation’s attributes.
2440 */
2541 runCommand = runCommandNoCC;
26− runCommandNoCC = runCommand' stdenvNoCC;
27− runCommandCC = runCommand' stdenv;
42+ runCommandLocal = runCommandNoCCLocal;
43+
44+ runCommandNoCC = runCommand' false stdenvNoCC;
45+ runCommandNoCCLocal = runCommand' true stdenvNoCC;
2846
47+ runCommandCC = runCommand' false stdenv;
48+ # `runCommandCCLocal` left out on purpose.
49+ # We shouldn’t force the user to have a cc in scope.
2950
3051 /* Writes a text file to the nix store.
3152 * The contents of text is added to the file in the store.
pkgs/build-support/vm/windows/default.nix+1−2
@@ -20,8 +20,7 @@ let
2020 '';
2121
2222in {
23− runInWindowsVM = drv: let
24− in pkgs.lib.overrideDerivation drv (attrs: let
23+ runInWindowsVM = drv: pkgs.lib.overrideDerivation drv (attrs: let
2524 bootstrap = bootstrapper attrs.windowsImage;
2625 in {
2726 requiredSystemFeatures = [ "kvm" ];
pkgs/data/fonts/cantarell-fonts/default.nix+1−1
@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec {
3333 description = "Default typeface used in the user interface of GNOME since version 3.0";
3434 platforms = stdenv.lib.platforms.all;
3535 license = stdenv.lib.licenses.ofl;
36− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
36+ maintainers = with stdenv.lib.maintainers; [ ];
3737 };
3838}
pkgs/desktops/deepin/dbus-factory/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 sed -i -e 's:/share/gocode:/share/go:' Makefile
2424 '';
2525
26− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
26+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
2727
2828 meta = with stdenv.lib; {
2929 description = "Generates static DBus bindings for Golang and QML at build-time";
pkgs/desktops/deepin/dde-api/default.nix+1−1
@@ -113,7 +113,7 @@ buildGoPackage rec {
113113 searchHardCodedPaths $out # debugging
114114 '';
115115
116− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
116+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
117117
118118 meta = with stdenv.lib; {
119119 description = "Go-lang bindings for dde-daemon";
pkgs/desktops/deepin/dde-calendar/default.nix+1−1
@@ -37,7 +37,7 @@ mkDerivation rec {
3737 -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
3838 '';
3939
40− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
40+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4141
4242 meta = with stdenv.lib; {
4343 description = "Calendar for Deepin Desktop Environment";
pkgs/desktops/deepin/dde-control-center/default.nix+1−1
@@ -99,7 +99,7 @@ mkDerivation rec {
9999 searchHardCodedPaths $out
100100 '';
101101
102− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
102+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
103103
104104 meta = with stdenv.lib; {
105105 description = "Control panel of Deepin Desktop Environment";
pkgs/desktops/deepin/dde-daemon/default.nix+1−1
@@ -121,7 +121,7 @@ buildGoPackage rec {
121121 searchHardCodedPaths $out # debugging
122122 '';
123123
124− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
124+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
125125
126126 meta = with stdenv.lib; {
127127 description = "Daemon for handling Deepin Desktop Environment session settings";
pkgs/desktops/deepin/dde-dock/default.nix+1−1
@@ -68,7 +68,7 @@ unwrapped = mkDerivation rec {
6868 searchHardCodedPaths $out
6969 '';
7070
71− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
71+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
7272
7373 meta = with stdenv.lib; {
7474 description = "Dock for Deepin Desktop Environment";
pkgs/desktops/deepin/dde-file-manager/default.nix+1−1
@@ -240,7 +240,7 @@ mkDerivation rec {
240240 searchHardCodedPaths $out
241241 '';
242242
243− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
243+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
244244
245245 meta = with stdenv.lib; {
246246 description = "File manager and desktop module for Deepin Desktop Environment";
pkgs/desktops/deepin/dde-launcher/default.nix+1−1
@@ -63,7 +63,7 @@ mkDerivation rec {
6363 searchHardCodedPaths $out
6464 '';
6565
66− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
66+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
6767
6868 meta = with stdenv.lib; {
6969 description = "Deepin Desktop Environment launcher module";
pkgs/desktops/deepin/dde-network-utils/default.nix+1−1
@@ -41,7 +41,7 @@ mkDerivation rec {
4141 searchHardCodedPaths $out # for debugging
4242 '';
4343
44− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
44+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4545
4646 meta = with stdenv.lib; {
4747 description = "Deepin network utils";
pkgs/desktops/deepin/dde-polkit-agent/default.nix+1−1
@@ -38,7 +38,7 @@ mkDerivation rec {
3838 searchHardCodedPaths $out
3939 '';
4040
41− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
41+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4242
4343 meta = with stdenv.lib; {
4444 description = "PolicyKit agent for Deepin Desktop Environment";
pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 enableParallelBuilding = true;
2828
29− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
29+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3030
3131 meta = with stdenv.lib; {
3232 description = "Qt DBus interface library for Deepin software";
pkgs/desktops/deepin/dde-session-ui/default.nix+1−1
@@ -113,7 +113,7 @@ mkDerivation rec {
113113 searchHardCodedPaths $out # debugging
114114 '';
115115
116− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
116+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
117117
118118 meta = with stdenv.lib; {
119119 description = "Deepin desktop-environment - Session UI module";
pkgs/desktops/deepin/deepin-anything/default.nix+1−1
@@ -51,7 +51,7 @@ mkDerivation rec {
5151 searchHardCodedPaths $modsrc # for debugging
5252 '';
5353
54− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
54+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
5555
5656 meta = with stdenv.lib; {
5757 description = "Deepin file search tool";
pkgs/desktops/deepin/deepin-calculator/default.nix+1−1
@@ -36,7 +36,7 @@ mkDerivation rec {
3636 searchHardCodedPaths $out # debugging
3737 '';
3838
39− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
39+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4040
4141 meta = with stdenv.lib; {
4242 description = "Easy to use calculator for Deepin Desktop Environment";
pkgs/desktops/deepin/deepin-desktop-base/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
4141 '';
4242
43− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
43+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4444
4545 meta = with stdenv.lib; {
4646 description = "Base assets and definitions for Deepin Desktop Environment";
pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+1−1
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 searchHardCodedPaths $out
5757 '';
5858
59− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
59+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
6060
6161 meta = with stdenv.lib; {
6262 description = "GSettings deepin desktop-wide schemas";
pkgs/desktops/deepin/deepin-gettext-tools/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
3636 '';
3737
38− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
38+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3939
4040 meta = with stdenv.lib; {
4141 description = "Deepin Internationalization utilities";
pkgs/desktops/deepin/deepin-gtk-theme/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 makeFlags = [ "PREFIX=${placeholder "out"}" ];
1717
18− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
18+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
1919
2020 meta = with stdenv.lib; {
2121 description = "Deepin GTK Theme";
pkgs/desktops/deepin/deepin-icon-theme/default.nix+1−1
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
4040 '';
4141
42− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
42+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4343
4444 meta = with stdenv.lib; {
4545 description = "Icons for the Deepin Desktop Environment";
pkgs/desktops/deepin/deepin-image-viewer/default.nix+1−1
@@ -41,7 +41,7 @@ mkDerivation rec {
4141 -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
4242 '';
4343
44− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
44+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4545
4646 meta = with stdenv.lib; {
4747 description = "Image Viewer for Deepin Desktop Environment";
pkgs/desktops/deepin/deepin-menu/default.nix+1−1
@@ -34,7 +34,7 @@ mkDerivation rec {
3434
3535 enableParallelBuilding = true;
3636
37− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
37+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3838
3939 meta = with stdenv.lib; {
4040 description = "Deepin menu service";
pkgs/desktops/deepin/deepin-movie-reborn/default.nix+1−1
@@ -58,7 +58,7 @@ mkDerivation rec {
5858 --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie"
5959 '';
6060
61− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
61+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
6262
6363 meta = with stdenv.lib; {
6464 description = "Deepin movie player";
pkgs/desktops/deepin/deepin-screenshot/default.nix+1−1
@@ -48,7 +48,7 @@ mkDerivation rec {
4848 searchHardCodedPaths $out
4949 '';
5050
51− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
51+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
5252
5353 meta = with stdenv.lib; {
5454 description = "Easy-to-use screenshot tool for Deepin Desktop Environment";
pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix+1−1
@@ -25,7 +25,7 @@ mkDerivation rec {
2525
2626 enableParallelBuilding = true;
2727
28− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
28+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
2929
3030 meta = with stdenv.lib; {
3131 description = "Pop-up shortcut viewer for Deepin applications";
pkgs/desktops/deepin/deepin-sound-theme/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 makeFlags = [ "PREFIX=${placeholder "out"}" ];
1515
16− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
16+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
1717
1818 meta = with stdenv.lib; {
1919 description = "Deepin sound theme";
pkgs/desktops/deepin/deepin-terminal/default.nix+1−1
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
6161 "-DVERSION=${version}"
6262 ];
6363
64− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
64+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
6565
6666 meta = with stdenv.lib; {
6767 description = "Default terminal emulator for Deepin";
pkgs/desktops/deepin/deepin-turbo/default.nix+1−1
@@ -31,7 +31,7 @@ mkDerivation rec {
3131 searchHardCodedPaths $out # for debugging
3232 '';
3333
34− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
34+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3535
3636 meta = with stdenv.lib; {
3737 description = "A daemon that helps to launch applications faster";
pkgs/desktops/deepin/deepin-wallpapers/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
3434 '';
3535
36− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
36+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3737
3838 meta = with stdenv.lib; {
3939 description = "Wallpapers for Deepin Desktop Environment";
pkgs/desktops/deepin/disomaster/default.nix+1−1
@@ -29,7 +29,7 @@ mkDerivation rec {
2929 libdisomaster/libdisomaster.pro
3030 '';
3131
32− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
32+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3333
3434 meta = with stdenv.lib; {
3535 description = "A libisoburn wrapper for Qt";
pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
3131 '';
3232
33− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
33+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3434
3535 meta = with stdenv.lib; {
3636 description = "GNOME keyring extension for dde-polkit-agent";
pkgs/desktops/deepin/dtkcore/default.nix+1−1
@@ -43,7 +43,7 @@ mkDerivation rec {
4343
4444 enableParallelBuilding = true;
4545
46− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
46+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4747
4848 meta = with stdenv.lib; {
4949 description = "Deepin tool kit core library";
pkgs/desktops/deepin/dtkwidget/default.nix+1−1
@@ -40,7 +40,7 @@ mkDerivation rec {
4040
4141 enableParallelBuilding = true;
4242
43− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
43+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4444
4545 meta = with stdenv.lib; {
4646 description = "Deepin graphical user interface library";
pkgs/desktops/deepin/dtkwm/default.nix+1−1
@@ -37,7 +37,7 @@ mkDerivation rec {
3737 "LIB_INSTALL_DIR=${outRef}/lib"
3838 ];
3939
40− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
40+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4141
4242 meta = with stdenv.lib; {
4343 description = "Deepin graphical user interface library";
pkgs/desktops/deepin/go-dbus-factory/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sed -i -e 's:/share/gocode:/share/go:' Makefile
1818 '';
1919
20− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
20+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
2121
2222 meta = with stdenv.lib; {
2323 description = "GoLang DBus factory for the Deepin Desktop Environment";
pkgs/desktops/deepin/go-dbus-generator/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 "GOCACHE=$(TMPDIR)/go-cache"
2222 ];
2323
24− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
24+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
2525
2626 meta = with stdenv.lib; {
2727 description = "Convert dbus interfaces to go-lang or qml wrapper code";
pkgs/desktops/deepin/go-gir-generator/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 "GOCACHE=$(TMPDIR)/go-cache"
3232 ];
3333
34− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
34+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3535
3636 meta = with stdenv.lib; {
3737 description = "Generate static golang bindings for GObject";
pkgs/desktops/deepin/go-lib/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 rm -r $out/share/go/src/pkg.deepin.io/lib/debian
2828 '';
2929
30− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
30+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3131
3232 meta = with stdenv.lib; {
3333 description = "Go bindings for Deepin Desktop Environment development";
pkgs/desktops/deepin/qcef/default.nix+1−1
@@ -90,7 +90,7 @@ mkDerivation rec {
9090 searchHardCodedPaths $out
9191 '';
9292
93− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
93+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
9494
9595 meta = with stdenv.lib; {
9696 description = "Qt5 binding of Chromium Embedded Framework";
pkgs/desktops/deepin/qt5dxcb-plugin/default.nix+1−1
@@ -43,7 +43,7 @@ mkDerivation rec {
4343
4444 enableParallelBuilding = true;
4545
46− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
46+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4747
4848 meta = with stdenv.lib; {
4949 description = "Qt platform theme integration plugin for DDE";
pkgs/desktops/deepin/qt5integration/default.nix+1−1
@@ -40,7 +40,7 @@ mkDerivation rec {
4040
4141 enableParallelBuilding = true;
4242
43− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
43+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
4444
4545 meta = with stdenv.lib; {
4646 description = "Qt platform theme integration plugins for DDE";
pkgs/desktops/deepin/udisks2-qt5/default.nix+1−1
@@ -28,7 +28,7 @@ mkDerivation rec {
2828 searchHardCodedPaths $out
2929 '';
3030
31− passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
31+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
3232
3333 meta = with stdenv.lib; {
3434 description = "UDisks2 D-Bus interfaces binding for Qt5";
pkgs/desktops/pantheon/apps/appcenter/default.nix+2−2
@@ -28,13 +28,13 @@
2828
2929stdenv.mkDerivation rec {
3030 pname = "appcenter";
31− version = "3.2.0";
31+ version = "3.2.1";
3232
3333 src = fetchFromGitHub {
3434 owner = "elementary";
3535 repo = pname;
3636 rev = version;
37− sha256 = "0xsxm0qgmnljd4s8m6xajzsjp9skpsa8wwlwqmc5yx34diad7zag";
37+ sha256 = "18l0kbm778728rksifslnaw2arnpr92sk24nw26k1zvs4prz5i7j";
3838 };
3939
4040 passthru = {
pkgs/development/compilers/ghc/8.4.4.nix+1−1
@@ -126,7 +126,7 @@ stdenv.mkDerivation (rec {
126126 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
127127 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
128128 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
129− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
129+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
130130 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
131131 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
132132 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/8.6.5.nix+1−1
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
125125 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
126126 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
127127 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
128− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
128+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
129129 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
130130 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
131131 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/8.8.1.nix+1−1
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
110110 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
111111 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
112112 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
113− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
113+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
114114 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
115115 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
116116 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/head.nix+1−1
@@ -117,7 +117,7 @@ stdenv.mkDerivation (rec {
117117 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
118118 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
119119 # and more generally have a faster linker.
120− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
120+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
121121 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
122122 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
123123 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/manticore/default.nix+3−3
@@ -1,15 +1,15 @@
11{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
22
33let
4− rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83";
4+ rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d";
55in stdenv.mkDerivation {
66 pname = "manticore";
7− version = "2019.09.20";
7+ version = "2019.12.03";
88
99 src = fetchFromGitHub {
1010 owner = "ManticoreProject";
1111 repo = "manticore";
12− sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz";
12+ sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2";
1313 inherit rev;
1414 };
1515
pkgs/development/compilers/orc/default.nix+1−1
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
2626 # under the 3-clause BSD license. The rest is 2-clause BSD license.
2727 license = with licenses; [ bsd3 bsd2 ];
2828 platforms = platforms.unix;
29− maintainers = [ maintainers.fuuzetsu ];
29+ maintainers = [ ];
3030 };
3131}
pkgs/development/compilers/rgbds/default.nix+2−2
@@ -6,12 +6,12 @@
66
77stdenv.mkDerivation rec {
88 pname = "rgbds";
9− version = "0.3.8";
9+ version = "0.3.9";
1010 src = fetchFromGitHub {
1111 owner = "rednex";
1212 repo = "rgbds";
1313 rev = "v${version}";
14− sha256 = "0db37z886026svhj6qnc3wk56sndbnz1vi41gn2k3bl6ppbnjlpk";
14+ sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv";
1515 };
1616 nativeBuildInputs = [ bison flex pkg-config libpng ];
1717 installFlags = "PREFIX=\${out}";
pkgs/development/compilers/smlnj/default.nix+42−26
@@ -1,32 +1,47 @@
11{ stdenv, fetchurl }:
22let
3− version = "110.91";
3+ version = "110.95";
44 baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
55
6+ isArch64 = stdenv.system == "x86_64-linux";
7+
8+ arch = if isArch64
9+ then "64"
10+ else "32";
11+
12+ boot32 = { url = "${baseurl}/boot.x86-unix.tgz";
13+ sha256 = "07bcrvjphyin1ygjbymcqhd1mbfk4hff82wmxcllh77lr28l5dxf"; };
14+ boot64 = { url = "${baseurl}/boot.amd64-unix.tgz";
15+ sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; };
16+
17+ bootBinary = if isArch64
18+ then boot64
19+ else boot32;
20+
621 sources = map fetchurl [
7− { url = "${baseurl}/config.tgz"; sha256 = "00vbg2kpwgkf272m697p5hd35pawficbrifchn7dnd519wpdx436"; }
8− { url = "${baseurl}/cm.tgz"; sha256 = "0wxb0s2fwh7lbb3z2pfvmvhk5v0gm75kchkv7gg9f895ahyvm6yd"; }
9− { url = "${baseurl}/compiler.tgz"; sha256 = "0iq06ycivy562i59vvbma9zi575zw1djhdfkcy0bn7m9kfzzbgkh"; }
10− { url = "${baseurl}/runtime.tgz"; sha256 = "0km8p4vmy3m38xv0rl8d3mh2nlk2mvx010npm34gs374bmmzc7z9"; }
11− { url = "${baseurl}/system.tgz"; sha256 = "16d5vs1rn7ly6jxjm08222cj0sry73pr57xpc9d6k286b1v0910b"; }
12− { url = "${baseurl}/MLRISC.tgz"; sha256 = "1c9sw8zm90ykas5nwbhk2wic7sxkjrylb610x37v46m5ips1wlma"; }
13− { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "09ka20ym7ahrpj4r6vc5phflc8y57dj09qvwk8ambfwb2p2274sw"; }
14− { url = "${baseurl}/old-basis.tgz"; sha256 = "1bhq9fv6p8diz489h9571g0xrsi8yx7h6gh9410255klxjrw964h"; }
15− { url = "${baseurl}/ckit.tgz"; sha256 = "1lq9ljai0shc6hszx5v6bqmkz16a3f295mfg7q622apzgzark3vd"; }
16− { url = "${baseurl}/nlffi.tgz"; sha256 = "1xjmlwiclgckj73z5hz3hnqlavp3ax9sfvgc0rvj3xpy3i3n6axj"; }
17− { url = "${baseurl}/cml.tgz"; sha256 = "1sjzipxnvr9dgcg16bllfk3b46ac9f8h353nh1ccykwwq4whi9bf"; }
18− { url = "${baseurl}/eXene.tgz"; sha256 = "04clbchrlqx5v35gkbydbfnpl720i4nqijkshiwn0v592n4xfdf4"; }
19− { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0max073nzwv7vx13caj7zmlhslvxlgg8rj52278g7f6fqcrwp5cf"; }
20− { url = "${baseurl}/ml-lex.tgz"; sha256 = "0x2mbg45l71049sgvvkl6bnqc5svz70vh1m1rbf3xk41z5bapcgr"; }
21− { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0a1pbwpw1y6d1xn9yjarqpmybrxqwp5snp28by36745h1jvb1p1b"; }
22− { url = "${baseurl}/ml-burg.tgz"; sha256 = "119mq5jrbkn9vf9fgb0wyz483hf26al9hwb91xpmlmfx5qqnfzik"; }
23− { url = "${baseurl}/pgraph.tgz"; sha256 = "1s7jmh3q88rz29bk02y3gzdqrgvk484j5ji8bn7s6fc78m50nqp8"; }
24− { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1gzf1pbmw2cn5w6f5qfdm3d6n6069n1nnzz6z4v7mr07x54c6mdv"; }
25− { url = "${baseurl}/heap2asm.tgz"; sha256 = "09cgj568a9x017awysjdx35mlp5zkdmc2fs67fvnm5ifl7ivfs8j"; }
26− { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1g4xhcxychs9q25x7a5lvqfamq52c5ljlx84bc5cazvpkhixyg04"; }
27− { url = "${baseurl}/doc.tgz"; sha256 = "1l0x91dscizk2pyj1lw595r84h1h0shxh0x5hva891717a1hfa51"; }
28− { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0f6x4nfhrgm1z4dx862df2yaffdh1sd6zx2lyb2vph5mhp7x9n58"; }
29− { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
22+ bootBinary
23+ { url = "${baseurl}/config.tgz"; sha256 = "09srqxkxl86iaz6l6dz83c1apsac0pxpfq6b74i6l0nfl261jibw"; }
24+ { url = "${baseurl}/cm.tgz"; sha256 = "0gh8inrb07z597axw8qipwyx52m8nac5d5r0rvgzvdnnjg9nr9zy"; }
25+ { url = "${baseurl}/compiler.tgz"; sha256 = "1kk6jwzyc261l5nii3n8rwccmgvcj1mg5fgycfsfsiyyy1v8xfx7"; }
26+ { url = "${baseurl}/runtime.tgz"; sha256 = "17i069h5cv411sgzx3ynlf4v3wlrxiba9bwy1b0x0cyhs879kppc"; }
27+ { url = "${baseurl}/system.tgz"; sha256 = "0s8ij3wfxpjrmrwxrgrirfxjj8vkda6l32j88al5q1ic3ncwc58s"; }
28+ { url = "${baseurl}/MLRISC.tgz"; sha256 = "1v2d3gjxrcgc95x5glqcw0nfp13aapkcw03fyi70m3k1yc61izmz"; }
29+ { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "04i11ki8v9s7yz3lg6b0djhi03zzkzav0b5cr81ypxlkmf4hh6bp"; }
30+ { url = "${baseurl}/old-basis.tgz"; sha256 = "1ryqpy0n7c9gd995ndmjvaci74f95nr8n1jjgm28yd1sn7hnavhi"; }
31+ { url = "${baseurl}/ckit.tgz"; sha256 = "18mcs3j8c5gq9cmck7r175am60blaznqmhzyir622yfc8fpw1map"; }
32+ { url = "${baseurl}/nlffi.tgz"; sha256 = "16mrl5aqbgsgljxa3z8kj5max9drddml34bq7rn1i78594jfvkwk"; }
33+ { url = "${baseurl}/cml.tgz"; sha256 = "00x784nv1pi6534k3vva26i9qx84cvw242vgwbs5020zkm6gvrmn"; }
34+ { url = "${baseurl}/eXene.tgz"; sha256 = "143825h36v6z77kwvrvpszgwnhmjs3yldb18i9z4lwkqfb4kn7f7"; }
35+ { url = "${baseurl}/ml-lpt.tgz"; sha256 = "17ly9h9ry8r94dx6lkas6w2cxknwkpma4z9pj8rgzmd3w6qm7j1z"; }
36+ { url = "${baseurl}/ml-lex.tgz"; sha256 = "1ja3l2kiq17754c58mwdiqi25f7ax0cji2wk0vq4872iwwxc22px"; }
37+ { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1m48nkwvw87yg39sjihlw8na5m34bzz3d4zpfbjaj2f75fkjy3jf"; }
38+ { url = "${baseurl}/ml-burg.tgz"; sha256 = "13nbvbah7bn8gjm4gi41m412vpl69wd6d3x3wzbb6xpia9vm4z4j"; }
39+ { url = "${baseurl}/pgraph.tgz"; sha256 = "1aizkl8avz01kx221xy5z7a1a1b5xqn2hrk66wr8d0iav2nh5c98"; }
40+ { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1c80xgck9sb2rm554nfg4f5mpjkdbrwkcx88pj120056225l10vx"; }
41+ { url = "${baseurl}/heap2asm.tgz"; sha256 = "1n68drd7as5dy20ccfvgd9cmnhfpfvz7g3f0gc8kpaqaz3vpy36g"; }
42+ { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1b6svh2kk5211rq73fdwx3sf80d2rshf0dmkkrq5mw4852nzqz3p"; }
43+ { url = "${baseurl}/doc.tgz"; sha256 = "021yzhy9maypq4ahz0d0qpr601spndg583fn9mapv6rl42kwhjq6"; }
44+ { url = "${baseurl}/asdl.tgz"; sha256 = "0nqavqcbidwnphbbwjrxhpy8glbyad51wy0cpqimbsw3sgns0zkd"; }
3045 ];
3146in stdenv.mkDerivation {
3247 pname = "smlnj";
@@ -37,6 +52,7 @@ in stdenv.mkDerivation {
3752 patchPhase = ''
3853 sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
3954 echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
55+ patch --verbose config/_heap2exec ${./heap2exec.diff}
4056 '';
4157
4258 unpackPhase = ''
@@ -50,7 +66,7 @@ in stdenv.mkDerivation {
5066 '';
5167
5268 buildPhase = ''
53− ./config/install.sh
69+ ./config/install.sh -default ${arch}
5470 '';
5571
5672 installPhase = ''
@@ -67,7 +83,7 @@ in stdenv.mkDerivation {
6783 description = "Standard ML of New Jersey, a compiler";
6884 homepage = http://smlnj.org;
6985 license = licenses.bsd3;
70− platforms = [ "i686-linux" ];
86+ platforms = [ "x86_64-linux" "i686-linux" ];
7187 maintainers = with maintainers; [ thoughtpolice ];
7288 };
7389}
pkgs/development/compilers/smlnj/heap2exec.diffnew file+9
@@ -0,0 +1,9 @@
1+@@ -35,7 +35,7 @@
2+ BIN_DIR=${SMLNJ_HOME}/bin
3+ fi
4+
5+-ARCH_N_OPSYS=`"$BIN_DIR/.arch-n-opsys $SIZE_OPT"`
6++ARCH_N_OPSYS=`$BIN_DIR/.arch-n-opsys $SIZE_OPT`
7+ if [ "$?" != "0" ]; then
8+ die "unable to determine architecture/operating system"
9+ fi
pkgs/development/interpreters/php/default.nix+19−6
@@ -4,7 +4,7 @@
44, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
55, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
66, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
7−, libzip, valgrind
7+, libzip, valgrind, oniguruma
88}:
99
1010with lib;
@@ -78,6 +78,7 @@ let
7878 buildInputs = [ ]
7979 ++ optional (versionOlder version "7.3") pcre
8080 ++ optional (versionAtLeast version "7.3") pcre2
81+ ++ optional (versionAtLeast version "7.4") oniguruma
8182 ++ optional withSystemd systemd
8283 ++ optionals imapSupport [ uwimap openssl pam ]
8384 ++ optionals curlSupport [ curl openssl ]
@@ -114,7 +115,8 @@ let
114115 "--with-config-file-scan-dir=/etc/php.d"
115116 ]
116117 ++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
117− ++ optional (versionAtLeast version "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
118+ ++ optional (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
119+ ++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
118120 ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
119121 ++ optional withSystemd "--with-fpm-systemd"
120122 ++ optionals imapSupport [
@@ -133,10 +135,11 @@ let
133135 ++ optional mhashSupport "--with-mhash"
134136 ++ optional curlSupport "--with-curl=${curl.dev}"
135137 ++ optional zlibSupport "--with-zlib=${zlib.dev}"
136− ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
138+ ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
137139 ++ optional (!libxml2Support) [
138140 "--disable-dom"
139141 "--disable-libxml"
142+ (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
140143 "--disable-simplexml"
141144 "--disable-xml"
142145 "--disable-xmlreader"
@@ -156,7 +159,12 @@ let
156159 ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
157160 ++ optional bcmathSupport "--enable-bcmath"
158161 # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
159− ++ optionals gdSupport [
162+ ++ optionals (gdSupport && versionAtLeast version "7.4") [
163+ "--enable-gd"
164+ "--with-jpeg=${libjpeg.dev}"
165+ "--with-freetype=${freetype.dev}"
166+ "--enable-gd-jis-conv"
167+ ] ++ optionals (gdSupport && versionOlder version "7.4") [
160168 "--with-gd"
161169 "--with-freetype-dir=${freetype.dev}"
162170 "--with-png-dir=${libpng.dev}"
@@ -173,7 +181,7 @@ let
173181 ++ optional xslSupport "--with-xsl=${libxslt.dev}"
174182 ++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
175183 ++ optional bz2Support "--with-bz2=${bzip2.dev}"
176− ++ optional zipSupport "--enable-zip"
184+ ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
177185 ++ optional ftpSupport "--enable-ftp"
178186 ++ optional fpmSupport "--enable-fpm"
179187 ++ optional ztsSupport "--enable-maintainer-zts"
@@ -181,7 +189,7 @@ let
181189 ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
182190 ++ optional tidySupport "--with-tidy=${html-tidy}"
183191 ++ optional argon2Support "--with-password-argon2=${libargon2}"
184− ++ optional libzipSupport "--with-libzip=${libzip.dev}"
192+ ++ optional (libzipSupport && (versionOlder version "7.4")) "--with-libzip=${libzip.dev}"
185193 ++ optional phpdbgSupport "--enable-phpdbg"
186194 ++ optional (!phpdbgSupport) "--disable-phpdbg"
187195 ++ optional (!cgiSupport) "--disable-cgi"
@@ -268,4 +276,9 @@ in {
268276 # https://bugs.php.net/bug.php?id=76826
269277 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
270278 };
279+
280+ php74 = generic {
281+ version = "7.4.0";
282+ sha256 = "1h01bahvcm9kgm5jqhm2j9k9d4q4rpfkkpqk00c47rirdblnn85z";
283+ };
271284}
pkgs/development/interpreters/racket/default.nix+1−1
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454 inherit sha256;
5555 }
5656 )) {
57− inherit ;name = "${pname}-${version}";
57+ name = "${pname}-${version}";
5858 sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
5959 };
6060
pkgs/development/libraries/agda/Agda-Sheaves/default.nix+1−1
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
1818 description = "Sheaves in Agda";
1919 license = stdenv.lib.licenses.cc-by-40;
2020 platforms = stdenv.lib.platforms.unix;
21− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
21+ maintainers = with stdenv.lib.maintainers; [ ];
2222 broken = true; # replaced by constructive-sheaf-semantics
2323 };
2424})
pkgs/development/libraries/agda/TotalParserCombinators/default.nix+1−1
@@ -20,7 +20,7 @@ agda.mkDerivation (self: rec {
2020 description = "A monadic parser combinator library which guarantees termination of parsing";
2121 license = stdenv.lib.licenses.mit;
2222 platforms = stdenv.lib.platforms.unix;
23− maintainers = with maintainers; [ fuuzetsu ];
23+ maintainers = with maintainers; [ ];
2424 broken = true;
2525 };
2626})
pkgs/development/libraries/agda/agda-base/default.nix+1−1
@@ -17,7 +17,7 @@ agda.mkDerivation (self: rec {
1717 description = "Base library for HoTT in Agda";
1818 license = stdenv.lib.licenses.bsd3;
1919 platforms = stdenv.lib.platforms.unix;
20− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
20+ maintainers = with stdenv.lib.maintainers; [ ];
2121 broken = true; # largely replaced by HoTT-Agda
2222 };
2323})
pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix+1−1
@@ -22,6 +22,6 @@ agda.mkDerivation (self: rec {
2222 description = "Agda standard library developed at Iowa";
2323 license = stdenv.lib.licenses.free;
2424 platforms = stdenv.lib.platforms.unix;
25− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
25+ maintainers = with stdenv.lib.maintainers; [ ];
2626 };
2727})
pkgs/development/libraries/agda/agda-prelude/default.nix+1−1
@@ -18,6 +18,6 @@ agda.mkDerivation (self: rec {
1818 description = "Programming library for Agda";
1919 license = stdenv.lib.licenses.mit;
2020 platforms = stdenv.lib.platforms.unix;
21− maintainers = with maintainers; [ fuuzetsu mudri ];
21+ maintainers = with maintainers; [ mudri ];
2222 };
2323})
pkgs/development/libraries/agda/agda-stdlib/default.nix+1−1
@@ -24,6 +24,6 @@ agda.mkDerivation (self: rec {
2424 license = stdenv.lib.licenses.mit;
2525 platforms = stdenv.lib.platforms.unix;
2626 broken = stdenv.isDarwin;
27− maintainers = with maintainers; [ jwiegley fuuzetsu mudri ];
27+ maintainers = with maintainers; [ jwiegley mudri ];
2828 };
2929})
pkgs/development/libraries/agda/bitvector/default.nix+1−1
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
1818 description = "Sequences of bits and common operations on them";
1919 license = stdenv.lib.licenses.bsd3;
2020 platforms = stdenv.lib.platforms.unix;
21− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
21+ maintainers = with stdenv.lib.maintainers; [ ];
2222 broken = true;
2323 };
2424})
pkgs/development/libraries/agda/categories/default.nix+1−1
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
1818 description = "Categories parametrized by morphism equality, in Agda";
1919 license = stdenv.lib.licenses.bsd3;
2020 platforms = stdenv.lib.platforms.unix;
21− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
21+ maintainers = with stdenv.lib.maintainers; [ ];
2222 broken = true; # doesn't work due to new agdastdlib, see #9471
2323 };
2424})
pkgs/development/libraries/agda/pretty/default.nix+1−1
@@ -20,7 +20,7 @@ agda.mkDerivation (self: rec {
2020 description = "Correct-by-Construction Pretty-Printing";
2121 license = stdenv.lib.licenses.mit;
2222 platforms = stdenv.lib.platforms.unix;
23− maintainers = with maintainers; [ fuuzetsu ];
23+ maintainers = with maintainers; [ ];
2424 broken = true; # 2018-04-11
2525 };
2626})
pkgs/development/libraries/enet/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 homepage = http://enet.bespin.org/;
1313 description = "Simple and robust network communication layer on top of UDP";
1414 license = stdenv.lib.licenses.mit;
15− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
15+ maintainers = with stdenv.lib.maintainers; [ ];
1616 platforms = stdenv.lib.platforms.unix;
1717 };
1818}
pkgs/development/libraries/ffmpeg-full/default.nix+1−1
@@ -466,6 +466,6 @@ stdenv.mkDerivation rec {
466466 licenses.lgpl21Plus
467467 );
468468 platforms = platforms.all;
469− maintainers = with maintainers; [ codyopel fuuzetsu ];
469+ maintainers = with maintainers; [ codyopel ];
470470 };
471471}
pkgs/development/libraries/ffmpeg/generic.nix+1−1
@@ -218,7 +218,7 @@ stdenv.mkDerivation rec {
218218 '';
219219 license = licenses.gpl3;
220220 platforms = platforms.all;
221− maintainers = with maintainers; [ codyopel fuuzetsu ];
221+ maintainers = with maintainers; [ codyopel ];
222222 inherit branch;
223223 };
224224}
pkgs/development/libraries/ffms/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 homepage = https://github.com/FFMS/ffms2/;
2828 description = "Libav/ffmpeg based source library for easy frame accurate access";
2929 license = licenses.mit;
30− maintainers = with maintainers; [ fuuzetsu ];
30+ maintainers = with maintainers; [ ];
3131 platforms = platforms.unix;
3232 };
3333}
pkgs/development/libraries/giflib/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 description = "A library for reading and writing gif images";
2828 platforms = stdenv.lib.platforms.unix;
2929 license = stdenv.lib.licenses.mit;
30− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
30+ maintainers = with stdenv.lib.maintainers; [ ];
3131 branch = "5.2";
3232 };
3333}
pkgs/development/libraries/glm/default.nix+1−1
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646 homepage = http://glm.g-truc.net/;
4747 license = licenses.mit;
4848 platforms = platforms.unix;
49− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
49+ maintainers = with stdenv.lib.maintainers; [ ];
5050 };
5151}
5252
pkgs/development/libraries/gloox/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
3131 description = "A portable high-level Jabber/XMPP library for C++";
3232 homepage = http://camaya.net/gloox;
3333 license = licenses.gpl3;
34− maintainers = with maintainers; [ fuuzetsu ];
34+ maintainers = with maintainers; [ ];
3535 platforms = platforms.unix;
3636 };
3737}
pkgs/development/libraries/gpgme/default.nix+1−1
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
6969 '';
7070 license = with licenses; [ lgpl21Plus gpl3Plus ];
7171 platforms = platforms.unix;
72− maintainers = with maintainers; [ fuuzetsu primeos ];
72+ maintainers = with maintainers; [ primeos ];
7373 };
7474}
pkgs/development/libraries/grpc/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
1+{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
22
33stdenv.mkDerivation rec {
44 version = "1.25.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
1010 sha256 = "02nbmbk1xpibjzvbhi8xpazmwry46ki24vks1sh2p0aqwy4hv6yb";
1111 fetchSubmodules = true;
1212 };
13+ patches = [
14+ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
15+ (fetchpatch {
16+ url = "https://github.com/grpc/grpc/commit/ffb8a278389c8e3403b23a9897b65a7390c34645.patch";
17+ sha256 = "1lc12a3gccg9wxqhnwgldlj3zmlm6lxg8dssvvj1x7hf655kw3w3";
18+ })
19+ ];
20+
1321 nativeBuildInputs = [ cmake pkgconfig ];
1422 buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
1523
pkgs/development/libraries/gtkspell/3.nix+1−1
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
2525 description = "Word-processor-style highlighting GtkTextView widget";
2626 license = licenses.gpl2Plus;
2727 platforms = platforms.unix;
28− maintainers = with maintainers; [ fuuzetsu ];
28+ maintainers = with maintainers; [ ];
2929 };
3030}
pkgs/development/libraries/hunspell/default.nix+1−1
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
5151 '';
5252 platforms = platforms.all;
5353 license = with licenses; [ gpl2 lgpl21 mpl11 ];
54− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
54+ maintainers = with stdenv.lib.maintainers; [ ];
5555 };
5656}
pkgs/development/libraries/libaal/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 homepage = http://www.namesys.com/;
2222 description = "Support library for Reiser4";
2323 license = stdenv.lib.licenses.gpl2;
24− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
24+ maintainers = with stdenv.lib.maintainers; [ ];
2525 platforms = with stdenv.lib.platforms; linux;
2626 };
2727}
pkgs/development/libraries/libao/default.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 '';
3737 homepage = https://xiph.org/ao/;
3838 license = licenses.gpl2;
39− maintainers = with maintainers; [ fuuzetsu ];
39+ maintainers = with maintainers; [ ];
4040 platforms = with platforms; unix;
4141 };
4242}
pkgs/development/libraries/libgpg-error/default.nix+1−1
@@ -78,6 +78,6 @@ in stdenv.mkDerivation (rec {
7878
7979 license = licenses.lgpl2Plus;
8080 platforms = platforms.all;
81− maintainers = [ maintainers.fuuzetsu maintainers.vrthra ];
81+ maintainers = [ maintainers.vrthra ];
8282 };
8383} // genPosixLockObjOnlyAttrs)
pkgs/development/libraries/libid3tag/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 description = "ID3 tag manipulation library";
3939 homepage = http://mad.sourceforge.net/;
4040 license = licenses.gpl2;
41− maintainers = [ maintainers.fuuzetsu ];
41+ maintainers = [ ];
4242 platforms = platforms.unix;
4343 };
4444}
pkgs/development/libraries/libmpeg2/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 homepage = http://libmpeg2.sourceforge.net/;
1717 description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
1818 license = stdenv.lib.licenses.gpl2;
19− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
19+ maintainers = with stdenv.lib.maintainers; [ ];
2020 platforms = with stdenv.lib.platforms; unix;
2121 };
2222}
pkgs/development/libraries/libpng/12.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 description = "The official reference implementation for the PNG file format";
2525 homepage = http://www.libpng.org/pub/png/libpng.html;
2626 license = licenses.libpng;
27− maintainers = [ maintainers.fuuzetsu ];
27+ maintainers = [ ];
2828 branch = "1.2";
2929 platforms = platforms.unix;
3030 };
pkgs/development/libraries/libpng/default.nix+1−1
@@ -34,6 +34,6 @@ in stdenv.mkDerivation rec {
3434 homepage = http://www.libpng.org/pub/png/libpng.html;
3535 license = licenses.libpng2;
3636 platforms = platforms.all;
37− maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
37+ maintainers = [ maintainers.vcunat ];
3838 };
3939}
pkgs/development/libraries/mimalloc/default.nix+16−12
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake
1+{ stdenv, fetchFromGitHub, cmake, ninja
22, secureBuild ? true
33}:
44
@@ -6,32 +6,36 @@ let
66 soext = stdenv.hostPlatform.extensions.sharedLibrary;
77in
88stdenv.mkDerivation rec {
9− name = "mimalloc-${version}";
9+ pname = "mimalloc";
1010 version = "1.1.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "microsoft";
14− repo = "mimalloc";
14+ repo = pname;
1515 rev = "refs/tags/v${version}";
1616 sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
1717 };
1818
19− nativeBuildInputs = [ cmake ];
19+ nativeBuildInputs = [ cmake ninja ];
2020 enableParallelBuilding = true;
21−
2221 cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
2322
2423 postInstall = ''
24+ # first, install headers, that's easy
2525 mkdir -p $dev
2626 mv $out/lib/*/include $dev/include
2727
28− rm -f $out/lib/libmimalloc*${soext} # weird duplicate
29−
30− mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
31− mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a
32− mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o
33−
34− rm -rf $out/lib/mimalloc-*
28+ # move everything else into place
29+ mv $out/lib/mimalloc-1.0/libmimalloc*${soext}.1.0 $out/lib/libmimalloc${soext}
30+ mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a
31+ mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o
32+
33+ # remote duplicate dir. FIXME: try to fix the .cmake file distribution
34+ # so we can re-use it for dependencies...
35+ rm -rf $out/lib/mimalloc-1.0
36+ '' + stdenv.lib.optionalString secureBuild ''
37+ # fix a broken symlink for the -secure alias
38+ ln -sfv $out/lib/libmimalloc.so $out/lib/libmimalloc-secure.so
3539 '';
3640
3741 outputs = [ "out" "dev" ];
pkgs/development/libraries/oniguruma/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 homepage = https://github.com/kkos/oniguruma;
1818 description = "Regular expressions library";
1919 license = licenses.bsd2;
20− maintainers = with maintainers; [ fuuzetsu ];
20+ maintainers = with maintainers; [ ];
2121 platforms = platforms.unix;
2222 };
2323}
pkgs/development/libraries/protobuf/3.11.nix+2−2
@@ -1,6 +1,6 @@
11{ callPackage, ... }:
22
33callPackage ./generic-v3.nix {
4− version = "3.11.0";
5− sha256 = "1b0kf02aw1yvpwdax3865057dzrlrdc7dgam05znwq8id5q76ckr";
4+ version = "3.11.1";
5+ sha256 = "1mq8dp94mlp72ri27bgvc2i370r8kfig87wfai7vxjdnh3vng0y1";
66}
pkgs/development/libraries/protolock/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "protolock";
5− version = "0.14.1";
5+ version = "0.15.0";
66
77 src = fetchFromGitHub {
88 owner = "nilslice";
99 repo = "protolock";
1010 rev = "v${version}";
11− sha256 = "0assk7hp9s3m7zm5i1v0pggz00a54yf2w3y0b8mlq5v51y2h8h2z";
11+ sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw";
1212 };
1313
14− modSha256 = "079hbv0f8k5lljrb1cr9568wq8sb9yry9smgbrji19yavd9fzcmh";
14+ modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg";
1515
1616 postInstall = ''
1717 rm $out/bin/plugin*
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+21−20
@@ -5,11 +5,11 @@ Subject: [PATCH 01/12] qtbase-mkspecs-mac
55
66---
77 mkspecs/common/mac.conf | 2 +-
8− mkspecs/features/mac/default_post.prf | 201 --------------------------
9− mkspecs/features/mac/default_pre.prf | 58 --------
10− mkspecs/features/mac/sdk.mk | 25 ----
11− mkspecs/features/mac/sdk.prf | 61 --------
12− 5 files changed, 1 insertion(+), 346 deletions(-)
8+ mkspecs/features/mac/default_post.prf | 202 ----------------------------------
9+ mkspecs/features/mac/default_pre.prf | 58 ----------
10+ mkspecs/features/mac/sdk.mk | 25 -----
11+ mkspecs/features/mac/sdk.prf | 61 ----------
12+ 5 files changed, 1 insertion(+), 347 deletions(-)
1313
1414diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
1515index b77494ec9b..470c38e772 100644
@@ -25,10 +25,10 @@ index b77494ec9b..470c38e772 100644
2525
2626 QMAKE_LFLAGS_REL_RPATH =
2727diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
28−index 26bd3e2e98..b80ec1e801 100644
28+index 993f4d56a9..b80ec1e801 100644
2929--- a/mkspecs/features/mac/default_post.prf
3030+++ b/mkspecs/features/mac/default_post.prf
31−@@ -68,207 +68,6 @@ qt {
31+@@ -68,208 +68,6 @@ qt {
3232 }
3333 }
3434
@@ -61,21 +61,22 @@ index 26bd3e2e98..b80ec1e801 100644
6161- qmake_pkginfo_typeinfo.value = "????"
6262- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo
6363-
64−- !isEmpty(VERSION) {
65−- l = $$split(VERSION, '.') 0 0 # make sure there are at least three
66−- VER_MAJ = $$member(l, 0, 0)
67−- VER_MIN = $$member(l, 1, 1)
68−- VER_PAT = $$member(l, 2, 2)
69−- unset(l)
64+- bundle_version = $$VERSION
65+- isEmpty(bundle_version): bundle_version = 1.0.0
7066-
71−- qmake_full_version.name = QMAKE_FULL_VERSION
72−- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
73−- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
67+- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three
68+- VER_MAJ = $$member(l, 0, 0)
69+- VER_MIN = $$member(l, 1, 1)
70+- VER_PAT = $$member(l, 2, 2)
71+- unset(l)
7472-
75−- qmake_short_version.name = QMAKE_SHORT_VERSION
76−- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
77−- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
78−- }
73+- qmake_full_version.name = QMAKE_FULL_VERSION
74+- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
75+- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
76+-
77+- qmake_short_version.name = QMAKE_SHORT_VERSION
78+- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
79+- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
7980-
8081- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
8182- debug_information_format.name = DEBUG_INFORMATION_FORMAT
pkgs/development/libraries/science/math/QuadProgpp/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 A C++ library for Quadratic Programming which implements the
2222 Goldfarb-Idnani active-set dual method.
2323 '';
24− maintainers = with maintainers; [ fuuzetsu ];
24+ maintainers = with maintainers; [ ];
2525 platforms = with platforms; linux;
2626 };
2727}
pkgs/development/libraries/science/math/or-tools/default.nix+1−1
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
6969 description = ''
7070 Google's software suite for combinatorial optimization.
7171 '';
72− maintainers = with maintainers; [ fuuzetsu ];
72+ maintainers = with maintainers; [ ];
7373 platforms = with platforms; linux;
7474 };
7575}
pkgs/development/libraries/slang/default.nix+1−1
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 description = "A multi-platform programmer's library designed to allow a developer to create robust software";
4545 homepage = http://www.jedsoft.org/slang/;
4646 license = licenses.gpl2Plus;
47− maintainers = with maintainers; [ fuuzetsu ];
47+ maintainers = with maintainers; [ ];
4848 platforms = platforms.unix;
4949 };
5050}
pkgs/development/libraries/sphinxbase/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation (rec {
2323 homepage = http://cmusphinx.sourceforge.net;
2424 license = stdenv.lib.licenses.bsd2;
2525 platforms = stdenv.lib.platforms.unix;
26− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
26+ maintainers = with stdenv.lib.maintainers; [ ];
2727 };
2828
2929} // (stdenv.lib.optionalAttrs multipleOutputs {
pkgs/development/ocaml-modules/metrics/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib, fetchurl, buildDunePackage, alcotest, fmt }:
2+
3+buildDunePackage rec {
4+ pname = "metrics";
5+ version = "0.1.0";
6+
7+ minimumOCamlVersion = "4.04";
8+
9+ src = fetchurl {
10+ url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
11+ sha256 = "0jy88anrx3rh19046rrbrjmx922zvz3wlqkk8asilqv9pbvpnp1a";
12+ };
13+
14+ propagatedBuildInputs = [ fmt ];
15+
16+ checkInputs = lib.optional doCheck alcotest;
17+
18+ doCheck = true;
19+
20+ meta = {
21+ description = "Metrics infrastructure for OCaml";
22+ homepage = "https://github.com/mirage/metrics";
23+ license = lib.licenses.isc;
24+ maintainers = [ lib.maintainers.vbgl ];
25+ };
26+
27+}
pkgs/development/ocaml-modules/metrics/lwt.nixnew file+14
@@ -0,0 +1,14 @@
1+{ buildDunePackage, ocaml_lwt, metrics }:
2+
3+buildDunePackage {
4+ pname = "metrics-lwt";
5+
6+ inherit (metrics) version src;
7+
8+ propagatedBuildInputs = [ ocaml_lwt metrics ];
9+
10+ meta = metrics.meta // {
11+ description = "Lwt backend for the Metrics library";
12+ };
13+
14+}
pkgs/development/ocaml-modules/metrics/unix.nixnew file+19
@@ -0,0 +1,19 @@
1+{ lib, buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
2+
3+buildDunePackage rec {
4+
5+ pname = "metrics-unix";
6+
7+ inherit (metrics) version src;
8+
9+ propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
10+
11+ checkInputs = lib.optional doCheck metrics-lwt;
12+
13+ doCheck = true;
14+
15+ meta = metrics.meta // {
16+ description = "Unix backend for the Metrics library";
17+ };
18+
19+}
pkgs/development/python-modules/chainer/default.nix+21−10
@@ -1,18 +1,26 @@
1−{ stdenv, lib
2−, buildPythonPackage, fetchPypi, isPy3k
3−, filelock, protobuf, numpy, pytest, mock
1+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
2+, filelock, protobuf, numpy, pytest, mock, typing-extensions
43, cupy, cudaSupport ? false
54}:
65
76buildPythonPackage rec {
87 pname = "chainer";
9− version = "6.4.0";
8+ version = "6.5.0";
9+ disabled = !isPy3k; # python2.7 abandoned upstream
1010
11− src = fetchPypi {
12− inherit pname version;
13− sha256 = "dacbcaa361cebdfbf6f212d138570333611b8f5de553093b1752c578b022a774";
11+ # no tests in Pypi tarball
12+ src = fetchFromGitHub {
13+ owner = "chainer";
14+ repo = "chainer";
15+ rev = "v${version}";
16+ sha256 = "0ha9fbl6sa3fbnsz3y1pg335iiskdbxw838m5j06zgzy156zna1x";
1417 };
1518
19+ # remove on 7.0 or 6.6 release
20+ postPatch = ''
21+ sed -i '/typing/d' setup.py
22+ '';
23+
1624 checkInputs = [
1725 pytest
1826 mock
@@ -22,12 +30,15 @@ buildPythonPackage rec {
2230 filelock
2331 protobuf
2432 numpy
33+ typing-extensions
2534 ] ++ lib.optionals cudaSupport [ cupy ];
2635
27− # In python3, test was failed...
28− doCheck = !isPy3k;
36+ # avoid gpu tests
37+ checkPhase = ''
38+ pytest tests/chainer_tests/utils_tests -k 'not gpu and not cupy'
39+ '';
2940
30− meta = with stdenv.lib; {
41+ meta = with lib; {
3142 description = "A flexible framework of neural networks for deep learning";
3243 homepage = https://chainer.org/;
3344 license = licenses.mit;
pkgs/development/python-modules/django/2_2.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "Django";
9− version = "2.2.7";
9+ version = "2.2.8";
1010
1111 disabled = !isPy3k;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86";
15+ sha256 = "183wmqgkspb9vk1dc42h5s2h31gjpw68vv6ywbvpljvakiplzbd4";
1616 };
1717
1818 patches = stdenv.lib.optional withGdal
pkgs/development/python-modules/flask-httpauth/default.nixnew file+20
@@ -0,0 +1,20 @@
1+{ lib, buildPythonPackage, fetchPypi, flask }:
2+
3+buildPythonPackage rec {
4+ pname = "Flask-HTTPAuth";
5+ version = "3.3.0";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1fb1kr1iw6inkwfv160rpjx54vv1q9b90psdyyghyy1f6dhvgy3f";
10+ };
11+
12+ propagatedBuildInputs = [ flask ];
13+
14+ meta = with lib; {
15+ description = "Extension that provides HTTP authentication for Flask routes";
16+ homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth";
17+ license = licenses.mit;
18+ maintainers = with maintainers; [ geistesk ];
19+ };
20+}
pkgs/development/python-modules/gpapi/default.nix+6−1
@@ -1,8 +1,13 @@
1−{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }:
1+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
2+, requests
3+, protobuf
4+, pycryptodome
5+}:
26
37buildPythonPackage rec {
48 version = "0.4.4";
59 pname = "gpapi";
10+ disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3
611
712 src = fetchPypi {
813 inherit version pname;
pkgs/development/python-modules/gplaycli/default.nix+2−2
@@ -4,13 +4,13 @@
44
55buildPythonPackage rec {
66 pname = "gplaycli";
7− version = "3.25";
7+ version = "3.26";
88
99 src = fetchFromGitHub {
1010 owner = "matlink";
1111 repo = "gplaycli";
1212 rev = version;
13− sha256 = "1rygx5cg4b1vwpkiaq6jcpbc1ly7cspslv3sy7x8n8ba61ryq6h4";
13+ sha256 = "188237d40q35dp5xs7hg4ybhvsyxi0bsqx5dk4ws9007n596in5f";
1414 };
1515
1616 disabled = !isPy3k;
pkgs/development/python-modules/livestreamer/default.nix+1−1
@@ -37,7 +37,7 @@ buildPythonPackage rec {
3737 services and pipes them into a video player of choice.
3838 '';
3939 license = licenses.bsd2;
40− maintainers = with maintainers; [ fuuzetsu ];
40+ maintainers = with maintainers; [ ];
4141 };
4242
4343}
pkgs/development/python-modules/pytest-bdd/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ stdenv, buildPythonPackage, fetchFromGitHub
2+, execnet
3+, glob2
4+, Mako
5+, mock
6+, parse
7+, parse-type
8+, py
9+, pytest
10+, six
11+}:
12+
13+buildPythonPackage rec {
14+ pname = "pytest-bdd";
15+ version = "3.2.1";
16+
17+ # tests are not included in pypi tarball
18+ src = fetchFromGitHub {
19+ owner = "pytest-dev";
20+ repo = pname;
21+ rev = version;
22+ sha256 = "02y28l5h1m9grj54p681qvv7nrhd7ly9jkqdchyw4p0lnmcmnsrd";
23+ };
24+
25+ propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ];
26+
27+ # Tests require extra dependencies
28+ checkInputs = [ execnet mock pytest ];
29+ checkPhase = ''
30+ pytest
31+ '';
32+
33+ meta = with stdenv.lib; {
34+ description = "BDD library for the py.test runner";
35+ homepage = https://github.com/pytest-dev/pytest-bdd;
36+ license = licenses.mit;
37+ maintainers = with maintainers; [ jm2dev ];
38+ };
39+}
pkgs/development/tools/analysis/nix-linter/default.nixnew file+45
@@ -0,0 +1,45 @@
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, parallel-io
5+, fixplate
6+, pandoc
7+, tasty
8+, tasty-hunit
9+, tasty-th
10+, streamly
11+, mtl
12+, path-io
13+, path
14+, pretty-terminal
15+, text
16+, base
17+, aeson
18+, cmdargs
19+, containers
20+, hnix
21+, bytestring
22+}:
23+
24+mkDerivation rec {
25+ pname = "nix-linter-unstable";
26+ version = "2019-04-26";
27+
28+ src = fetchFromGitHub {
29+ owner = "Synthetica9";
30+ repo = "nix-linter";
31+ rev = "4aaf60195cd2d9f9e2345fbdf4aac48e1451292c";
32+ sha256 = "0c7rcjaxd8z0grwambsw46snv7cg66h3pszw3549z4xz0i60yq87";
33+ };
34+
35+ isLibrary = false;
36+ isExecutable = true;
37+ libraryHaskellDepends = [ parallel-io fixplate pandoc ];
38+ executableHaskellDepends = [ streamly mtl path-io path pretty-terminal text base aeson cmdargs containers hnix bytestring ];
39+ testHaskellDepends = [ tasty tasty-hunit tasty-th ];
40+
41+ description = "Linter for Nix(pkgs), based on hnix";
42+ homepage = "https://github.com/Synthetica9/nix-linter";
43+ license = lib.licenses.bsd3;
44+ maintainers = [ lib.maintainers.marsam ];
45+}
pkgs/development/tools/build-managers/bazel/default.nix+14−9
@@ -19,6 +19,8 @@
1919, enableNixHacks ? false
2020, gcc-unwrapped
2121, autoPatchelfHook
22+, file
23+, substituteAll
2224}:
2325
2426let
@@ -91,7 +93,7 @@ let
9193 # ],
9294 # )
9395 #
94− [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
96+ [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ];
9597
9698 # Java toolchain used for the build and tests
9799 javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
@@ -145,6 +147,17 @@ stdenv.mkDerivation rec {
145147 # This is breaking the build of any C target. This patch removes the last
146148 # argument if it's found to be an empty string.
147149 ./trim-last-argument-to-gcc-if-empty.patch
150+
151+ # --experimental_strict_action_env (which may one day become the default
152+ # see bazelbuild/bazel#2574) hardcodes the default
153+ # action environment to a non hermetic value (e.g. "/usr/local/bin").
154+ # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
155+ # So we are replacing this bazel paths by defaultShellPath,
156+ # improving hermeticity and making it work in nixos.
157+ (substituteAll {
158+ src = ./strict_action_env.patch;
159+ strictActionEnvPatch = defaultShellPath;
160+ })
148161 ] ++ lib.optional enableNixHacks ./nix-hacks.patch;
149162
150163
@@ -390,14 +403,6 @@ stdenv.mkDerivation rec {
390403 -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
391404 -i scripts/bootstrap/compile.sh
392405
393− # --experimental_strict_action_env (which will soon become the
394− # default, see bazelbuild/bazel#2574) hardcodes the default
395− # action environment to a value that on NixOS at least is bogus.
396− # So we hardcode it to something useful.
397− substituteInPlace \
398− src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
399− --replace /bin:/usr/bin ${defaultShellPath}
400−
401406 # This is necessary to avoid:
402407 # "error: no visible @interface for 'NSDictionary' declares the selector
403408 # 'initWithContentsOfURL:error:'"
pkgs/development/tools/build-managers/bazel/strict_action_env.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
2+index a70b5559bc..10bdffe961 100644
3+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
4++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
5+@@ -466,7 +466,7 @@ public class BazelRuleClassProvider {
6+ // Note that --action_env does not propagate to the host config, so it is not a viable
7+ // workaround when a genrule is itself built in the host config (e.g. nested genrules). See
8+ // #8536.
9+- return "/bin:/usr/bin:/usr/local/bin";
10++ return "@strictActionEnvPatch@";
11+ }
12+
13+ String newPath = "";
pkgs/development/tools/conftest/default.nix+3−5
@@ -2,24 +2,22 @@
22
33buildGoModule rec {
44 pname = "conftest";
5− version = "0.14.0";
5+ version = "0.15.0";
66
77 src = fetchFromGitHub {
88 owner = "instrumenta";
99 repo = "conftest";
1010 rev = "v${version}";
11− sha256 = "0fjz6ad8rnznlp1kiyb3c6anhjs6v6acgziw4hmyz0xva4jnspsh";
11+ sha256 = "0lb644fj80r4igxbslbd5pksirnyf6slz4yn0mznyx8i2bd1g4ic";
1212 };
1313
14− modSha256 = "1xwqlqx5794hsi14h5gqg69gjcqcma24ha0fxn0vffqgqs2cz1d1";
14+ modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn";
1515
1616 buildFlagsArray = ''
1717 -ldflags=
1818 -X main.version=${version}
1919 '';
2020
21− subPackages = [ "cmd" ];
22−
2321 meta = with lib; {
2422 description = "Write tests against structured configuration data";
2523 homepage = https://github.com/instrumenta/conftest;
pkgs/development/tools/doctl/default.nix+3−3
@@ -4,8 +4,8 @@ buildGoPackage rec {
44 pname = "doctl";
55 version = "${major}.${minor}.${patch}";
66 major = "1";
7− minor = "31";
8− patch = "2";
7+ minor = "35";
8+ patch = "0";
99 goPackagePath = "github.com/digitalocean/doctl";
1010
1111 excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -21,7 +21,7 @@ buildGoPackage rec {
2121 owner = "digitalocean";
2222 repo = "doctl";
2323 rev = "v${version}";
24− sha256 = "1q71kfjiav8xfw1bb3dziik1d0jr84hl83d3sx3cak0nd9nmakgs";
24+ sha256 = "1blg4xd01vvr8smpii60jlk7rg1cg64115azixw9q022f7cnfiyw";
2525 };
2626
2727 meta = {
pkgs/development/tools/profiling/EZTrace/default.nix+1−1
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 description = "Tool that aims at generating automatically execution trace from HPC programs";
2828 license = stdenv.lib.licenses.cecill-b;
29− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
29+ maintainers = with stdenv.lib.maintainers; [ ];
3030 };
3131}
pkgs/development/tools/vagrant/default.nix+2−2
@@ -4,9 +4,9 @@
44let
55 # NOTE: bumping the version and updating the hash is insufficient;
66 # you must use bundix to generate a new gemset.nix in the Vagrant source.
7− version = "2.2.5";
7+ version = "2.2.6";
88 url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
9− sha256 = "0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1";
9+ sha256 = "0nssq2i4riif0q72h5qp7dlxd4shqcyvm1bx9adppcacb77gpnhv";
1010
1111 deps = bundlerEnv rec {
1212 name = "${pname}-${version}";
pkgs/development/tools/vagrant/gemset.nix+91−90
@@ -10,6 +10,8 @@
1010 version = "1.0.1";
1111 };
1212 builder = {
13+ groups = ["default"];
14+ platforms = [];
1315 source = {
1416 remotes = ["https://rubygems.org"];
1517 sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
@@ -19,6 +21,8 @@
1921 };
2022 childprocess = {
2123 dependencies = ["ffi"];
24+ groups = ["default"];
25+ platforms = [];
2226 source = {
2327 remotes = ["https://rubygems.org"];
2428 sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv";
@@ -36,14 +40,6 @@
3640 };
3741 version = "1.1.5";
3842 };
39− diff-lcs = {
40− source = {
41− remotes = ["https://rubygems.org"];
42− sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
43− type = "gem";
44− };
45− version = "1.3";
46− };
4743 domain_name = {
4844 dependencies = ["unf"];
4945 groups = ["default"];
@@ -56,6 +52,8 @@
5652 version = "0.5.20190701";
5753 };
5854 ed25519 = {
55+ groups = ["default"];
56+ platforms = [];
5957 source = {
6058 remotes = ["https://rubygems.org"];
6159 sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
@@ -63,7 +61,19 @@
6361 };
6462 version = "1.2.4";
6563 };
64+ erubi = {
65+ groups = ["default"];
66+ platforms = [];
67+ source = {
68+ remotes = ["https://rubygems.org"];
69+ sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
70+ type = "gem";
71+ };
72+ version = "1.9.0";
73+ };
6674 erubis = {
75+ groups = ["default"];
76+ platforms = [];
6777 source = {
6878 remotes = ["https://rubygems.org"];
6979 sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
@@ -94,6 +104,8 @@
94104 };
95105 gyoku = {
96106 dependencies = ["builder"];
107+ groups = ["default"];
108+ platforms = [];
97109 source = {
98110 remotes = ["https://rubygems.org"];
99111 sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
@@ -102,6 +114,8 @@
102114 version = "1.3.1";
103115 };
104116 hashicorp-checkpoint = {
117+ groups = ["default"];
118+ platforms = [];
105119 source = {
106120 remotes = ["https://rubygems.org"];
107121 sha256 = "1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd";
@@ -111,6 +125,8 @@
111125 };
112126 http-cookie = {
113127 dependencies = ["domain_name"];
128+ groups = ["default"];
129+ platforms = [];
114130 source = {
115131 remotes = ["https://rubygems.org"];
116132 sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
@@ -119,6 +135,8 @@
119135 version = "1.0.3";
120136 };
121137 httpclient = {
138+ groups = ["default"];
139+ platforms = [];
122140 source = {
123141 remotes = ["https://rubygems.org"];
124142 sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@@ -128,6 +146,8 @@
128146 };
129147 i18n = {
130148 dependencies = ["concurrent-ruby"];
149+ groups = ["default"];
150+ platforms = [];
131151 source = {
132152 remotes = ["https://rubygems.org"];
133153 sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7";
@@ -137,6 +157,8 @@
137157 };
138158 listen = {
139159 dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
160+ groups = ["default"];
161+ platforms = [];
140162 source = {
141163 remotes = ["https://rubygems.org"];
142164 sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
@@ -145,6 +167,8 @@
145167 version = "3.1.5";
146168 };
147169 little-plugger = {
170+ groups = ["default"];
171+ platforms = [];
148172 source = {
149173 remotes = ["https://rubygems.org"];
150174 sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
@@ -153,6 +177,8 @@
153177 version = "1.1.4";
154178 };
155179 log4r = {
180+ groups = ["default"];
181+ platforms = [];
156182 source = {
157183 remotes = ["https://rubygems.org"];
158184 sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv";
@@ -162,6 +188,8 @@
162188 };
163189 logging = {
164190 dependencies = ["little-plugger" "multi_json"];
191+ groups = ["default"];
192+ platforms = [];
165193 source = {
166194 remotes = ["https://rubygems.org"];
167195 sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
@@ -171,33 +199,39 @@
171199 };
172200 mime-types = {
173201 dependencies = ["mime-types-data"];
202+ groups = ["default"];
203+ platforms = [];
174204 source = {
175205 remotes = ["https://rubygems.org"];
176− sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
206+ sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
177207 type = "gem";
178208 };
179− version = "3.2.2";
209+ version = "3.3";
180210 };
181211 mime-types-data = {
182212 groups = ["default"];
183213 platforms = [];
184214 source = {
185215 remotes = ["https://rubygems.org"];
186− sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
216+ sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
187217 type = "gem";
188218 };
189− version = "3.2019.0331";
219+ version = "3.2019.1009";
190220 };
191221 multi_json = {
222+ groups = ["default"];
223+ platforms = [];
192224 source = {
193225 remotes = ["https://rubygems.org"];
194− sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
226+ sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
195227 type = "gem";
196228 };
197− version = "1.13.1";
229+ version = "1.14.1";
198230 };
199231 net-scp = {
200232 dependencies = ["net-ssh"];
233+ groups = ["default"];
234+ platforms = [];
201235 source = {
202236 remotes = ["https://rubygems.org"];
203237 sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
@@ -207,6 +241,8 @@
207241 };
208242 net-sftp = {
209243 dependencies = ["net-ssh"];
244+ groups = ["default"];
245+ platforms = [];
210246 source = {
211247 remotes = ["https://rubygems.org"];
212248 sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
@@ -215,6 +251,8 @@
215251 version = "2.1.2";
216252 };
217253 net-ssh = {
254+ groups = ["default"];
255+ platforms = [];
218256 source = {
219257 remotes = ["https://rubygems.org"];
220258 sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n";
@@ -223,6 +261,8 @@
223261 version = "5.1.0";
224262 };
225263 netrc = {
264+ groups = ["default"];
265+ platforms = [];
226266 source = {
227267 remotes = ["https://rubygems.org"];
228268 sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
@@ -231,6 +271,8 @@
231271 version = "0.11.0";
232272 };
233273 nori = {
274+ groups = ["default"];
275+ platforms = [];
234276 source = {
235277 remotes = ["https://rubygems.org"];
236278 sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
@@ -239,6 +281,8 @@
239281 version = "2.6.0";
240282 };
241283 rb-fsevent = {
284+ groups = ["default"];
285+ platforms = [];
242286 source = {
243287 remotes = ["https://rubygems.org"];
244288 sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
@@ -248,6 +292,8 @@
248292 };
249293 rb-inotify = {
250294 dependencies = ["ffi"];
295+ groups = ["default"];
296+ platforms = [];
251297 source = {
252298 remotes = ["https://rubygems.org"];
253299 sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
@@ -257,6 +303,8 @@
257303 };
258304 rb-kqueue = {
259305 dependencies = ["ffi"];
306+ groups = ["default"];
307+ platforms = [];
260308 source = {
261309 remotes = ["https://rubygems.org"];
262310 sha256 = "14mhzrhs2j43vj36i1qq4z29nd860shrslfik015f4kf1jiaqcrw";
@@ -266,6 +314,8 @@
266314 };
267315 rest-client = {
268316 dependencies = ["http-cookie" "mime-types" "netrc"];
317+ groups = ["default"];
318+ platforms = [];
269319 source = {
270320 remotes = ["https://rubygems.org"];
271321 sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
@@ -273,51 +323,9 @@
273323 };
274324 version = "2.0.2";
275325 };
276− rspec = {
277− dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
278− source = {
279− remotes = ["https://rubygems.org"];
280− sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
281− type = "gem";
282− };
283− version = "3.5.0";
284− };
285− rspec-core = {
286− dependencies = ["rspec-support"];
287− source = {
288− remotes = ["https://rubygems.org"];
289− sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i";
290− type = "gem";
291− };
292− version = "3.5.4";
293− };
294− rspec-expectations = {
295− dependencies = ["diff-lcs" "rspec-support"];
296− source = {
297− remotes = ["https://rubygems.org"];
298− sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
299− type = "gem";
300− };
301− version = "3.5.0";
302− };
303− rspec-mocks = {
304− dependencies = ["diff-lcs" "rspec-support"];
305− source = {
306− remotes = ["https://rubygems.org"];
307− sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
308− type = "gem";
309− };
310− version = "3.5.0";
311− };
312− rspec-support = {
313− source = {
314− remotes = ["https://rubygems.org"];
315− sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
316− type = "gem";
317− };
318− version = "3.5.0";
319− };
320326 ruby_dep = {
327+ groups = ["default"];
328+ platforms = [];
321329 source = {
322330 remotes = ["https://rubygems.org"];
323331 sha256 = "0v0qznxz999lx4vs76mr590r90i0cm5m76wwvgis7sq4y21l308l";
@@ -326,6 +334,8 @@
326334 version = "1.3.1";
327335 };
328336 rubyntlm = {
337+ groups = ["default"];
338+ platforms = [];
329339 source = {
330340 remotes = ["https://rubygems.org"];
331341 sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
@@ -338,21 +348,15 @@
338348 platforms = [];
339349 source = {
340350 remotes = ["https://rubygems.org"];
341− sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
342− type = "gem";
343− };
344− version = "1.2.3";
345− };
346− thor = {
347− source = {
348− remotes = ["https://rubygems.org"];
349− sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
351+ sha256 = "0i5dhyiavmk2yc7xyfwzp3m476f7d9mhigibsw37jqpdq4vmi4cv";
350352 type = "gem";
351353 };
352− version = "0.18.1";
354+ version = "1.2.4";
353355 };
354356 unf = {
355357 dependencies = ["unf_ext"];
358+ groups = ["default"];
359+ platforms = [];
356360 source = {
357361 remotes = ["https://rubygems.org"];
358362 sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -370,27 +374,20 @@
370374 };
371375 version = "0.0.7.6";
372376 };
373− vagrant-spec = {
374− dependencies = ["childprocess" "log4r" "rspec" "thor"];
375− source = {
376− fetchSubmodules = false;
377− rev = "abfc34474d122235d56e4c6b6fb5d3e35bedfa90";
378− sha256 = "08xy2c82lrxkwjlvrbx1v32968a6psni3952y3knriqgygv2kzbn";
379− type = "git";
380− url = "https://github.com/hashicorp/vagrant-spec.git";
381− };
382− version = "0.0.1";
383− };
384377 vagrant_cloud = {
385378 dependencies = ["rest-client"];
379+ groups = ["default"];
380+ platforms = [];
386381 source = {
387382 remotes = ["https://rubygems.org"];
388− sha256 = "0451x3ab869hbycffcq656dm7mmjwmnxcyhv6g7dpdv3acg64783";
383+ sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs";
389384 type = "gem";
390385 };
391− version = "2.0.2";
386+ version = "2.0.3";
392387 };
393388 wdm = {
389+ groups = ["default"];
390+ platforms = [];
394391 source = {
395392 remotes = ["https://rubygems.org"];
396393 sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18";
@@ -399,32 +396,36 @@
399396 version = "0.1.1";
400397 };
401398 winrm = {
402− dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
399+ dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
403400 groups = ["default"];
404401 platforms = [];
405402 source = {
406403 remotes = ["https://rubygems.org"];
407− sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2";
404+ sha256 = "1sl14qdshkmficdsy9z57xmdp5z9riv7jc5lv005n0h04mg7d47b";
408405 type = "gem";
409406 };
410− version = "2.3.2";
407+ version = "2.3.3";
411408 };
412409 winrm-elevated = {
413− dependencies = ["winrm" "winrm-fs"];
410+ dependencies = ["erubi" "winrm" "winrm-fs"];
411+ groups = ["default"];
412+ platforms = [];
414413 source = {
415414 remotes = ["https://rubygems.org"];
416− sha256 = "1saqc3ffh075y6fdkc7iqmn0v3pnidvfw0sh09w9cn6jvpsdxizk";
415+ sha256 = "13d0pjzffbqicg08fsx4dsl6ibsqda5vx5d9f6hsds2z6mdilrab";
417416 type = "gem";
418417 };
419− version = "1.1.1";
418+ version = "1.1.2";
420419 };
421420 winrm-fs = {
422− dependencies = ["erubis" "logging" "rubyzip" "winrm"];
421+ dependencies = ["erubi" "logging" "rubyzip" "winrm"];
422+ groups = ["default"];
423+ platforms = [];
423424 source = {
424425 remotes = ["https://rubygems.org"];
425− sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3";
426+ sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6";
426427 type = "gem";
427428 };
428− version = "1.3.2";
429+ version = "1.3.3";
429430 };
430431}
pkgs/development/web/nodejs/v13.nix+2−2
@@ -5,8 +5,8 @@ let
55in
66 buildNodejs {
77 inherit enableNpm;
8− version = "13.2.0";
9− sha256 = "0r0bbwnp77njhdmby7cs2g6yxfprri684s8h3gqq95ks7vgwgvhx";
8+ version = "13.3.0";
9+ sha256 = "0j36jf0ybq470w91kzg28bcmxlml7ccl4swwklb6x1ibkz697np7";
1010
1111 patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
1212 }
pkgs/games/extremetuxracer/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 '';
3434 license = stdenv.lib.licenses.gpl2Plus;
3535 homepage = https://sourceforge.net/projects/extremetuxracer/;
36− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
36+ maintainers = with stdenv.lib.maintainers; [ ];
3737 platforms = with stdenv.lib.platforms; linux;
3838 };
3939}
pkgs/games/super-tux-kart/default.nix+1−1
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
5151 '';
5252 homepage = https://supertuxkart.net/;
5353 license = licenses.gpl2Plus;
54− maintainers = with maintainers; [ pyrolagus fuuzetsu peterhoeg ];
54+ maintainers = with maintainers; [ pyrolagus peterhoeg ];
5555 platforms = with platforms; linux;
5656 };
5757}
pkgs/games/tibia/default.nix+1−1
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
5252 homepage = http://tibia.com;
5353 license = stdenv.lib.licenses.unfree;
5454 platforms = ["i686-linux"];
55− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
55+ maintainers = with stdenv.lib.maintainers; [ ];
5656 };
5757}
pkgs/misc/drivers/xboxdrv/default.nix+1−1
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
2121 homepage = https://pingus.seul.org/~grumbel/xboxdrv/;
2222 description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace";
2323 license = licenses.gpl3Plus;
24− maintainers = [ maintainers.fuuzetsu ];
24+ maintainers = [ ];
2525 platforms = platforms.linux;
2626 };
2727
pkgs/misc/emulators/hatari/default.nix+1−1
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
1818 description = "Atari ST/STE/TT/Falcon emulator";
1919 license = stdenv.lib.licenses.gpl2Plus;
2020 platforms = stdenv.lib.platforms.linux;
21− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
21+ maintainers = with stdenv.lib.maintainers; [ ];
2222 };
2323}
pkgs/misc/emulators/ppsspp/default.nix+1−1
@@ -39,7 +39,7 @@ mkDerivation rec {
3939 homepage = https://www.ppsspp.org/;
4040 description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++";
4141 license = licenses.gpl2Plus;
42− maintainers = with maintainers; [ fuuzetsu AndersonTorres ];
42+ maintainers = with maintainers; [ AndersonTorres ];
4343 platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
4444 };
4545}
pkgs/misc/vim-plugins/generated.nix+122−89
@@ -61,11 +61,11 @@ let
6161
6262 ale = buildVimPluginFrom2Nix {
6363 pname = "ale";
64− version = "2019-11-27";
64+ version = "2019-12-03";
6565 src = fetchFromGitHub {
6666 owner = "w0rp";
6767 repo = "ale";
68− rev = "d8195e9276c27caabf173a268450a3420b53181a";
68+ rev = "5f84325cd811ec179b7f3642652438c6a45b174d";
6969 sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2";
7070 };
7171 };
@@ -204,23 +204,23 @@ let
204204
205205 calendar-vim = buildVimPluginFrom2Nix {
206206 pname = "calendar-vim";
207− version = "2019-11-29";
207+ version = "2019-12-03";
208208 src = fetchFromGitHub {
209209 owner = "itchyny";
210210 repo = "calendar.vim";
211− rev = "ff2149d6f022ffdd51c1fa5dbf9b653800f2298b";
212− sha256 = "1396p6hvv9dyi91n9y7h5ik4l44xfr9xqhah0mbcg4v7dghrdsdx";
211+ rev = "335e67e32865259c8a1f27a08fd1260a8cb1897b";
212+ sha256 = "1n35sf4v1piww31kqzg88s4xb5gdsxqgjvfmlif16na1kdvyjwd5";
213213 };
214214 };
215215
216216 camelcasemotion = buildVimPluginFrom2Nix {
217217 pname = "camelcasemotion";
218− version = "2019-06-28";
218+ version = "2019-12-02";
219219 src = fetchFromGitHub {
220220 owner = "bkad";
221221 repo = "camelcasemotion";
222− rev = "406368dea50303884aa321d2cdff714e010f951e";
223− sha256 = "0a1grafg05cb9mpk69j2y433ifm27ksy29wzlxlm5798dmb473mw";
222+ rev = "de439d7c06cffd0839a29045a103fe4b44b15cdc";
223+ sha256 = "0yfsb0d9ly8abmc95nqcmr8r8ylif80zdjppib7g1qj1wapdhc69";
224224 };
225225 };
226226
@@ -303,12 +303,12 @@ let
303303
304304 coc-emmet = buildVimPluginFrom2Nix {
305305 pname = "coc-emmet";
306− version = "2019-08-22";
306+ version = "2019-12-03";
307307 src = fetchFromGitHub {
308308 owner = "neoclide";
309309 repo = "coc-emmet";
310− rev = "0fd6e93dcab3507240962a480b42e08e818d1fa9";
311− sha256 = "196cvnynkm34sa90gznp81l2l3wl2sxfishqzwr8xxlk2cdcshxn";
310+ rev = "1e65237f65b94bd5f9376023f557a26c14c9d35a";
311+ sha256 = "16f3gdnprxw939zwdy7lzksj1qwlwfs174vk0nzf1d8yb04a7y2g";
312312 };
313313 };
314314
@@ -435,23 +435,23 @@ let
435435
436436 coc-pairs = buildVimPluginFrom2Nix {
437437 pname = "coc-pairs";
438− version = "2019-09-10";
438+ version = "2019-12-02";
439439 src = fetchFromGitHub {
440440 owner = "neoclide";
441441 repo = "coc-pairs";
442− rev = "26b1be159c2f24d74c6f175e91b6a8fbd3868e9a";
443− sha256 = "16g2wz87l1pskn6ri71sdm1j5r4h8z1vjdg3ksqs6mz9x2vzy2zz";
442+ rev = "97a757cadecabd5a1bf0ed0eb831535d7011ecbd";
443+ sha256 = "0ygsiplb4slw7vf72njiy3cxslflnihr3qfi9i802dc9p02w4sl8";
444444 };
445445 };
446446
447447 coc-prettier = buildVimPluginFrom2Nix {
448448 pname = "coc-prettier";
449− version = "2019-11-28";
449+ version = "2019-11-29";
450450 src = fetchFromGitHub {
451451 owner = "neoclide";
452452 repo = "coc-prettier";
453− rev = "5304a1087e454bb9da7d58e383837f4c3e356e6a";
454− sha256 = "1vbyr1cxckdgxns86aknckhgqzp8x0kkk77y0c8my1qinhrmj8cl";
453+ rev = "f2c5959b0e8a5658017c9dcb57f03d86c3a7c484";
454+ sha256 = "1c2vvjvji5wkmxlm5mi5q4px2x9fslkqsw4vii3kjc7cz2w4fnhk";
455455 };
456456 };
457457
@@ -655,12 +655,12 @@ let
655655
656656 command-t = buildVimPluginFrom2Nix {
657657 pname = "command-t";
658− version = "2019-08-02";
658+ version = "2019-12-01";
659659 src = fetchFromGitHub {
660660 owner = "wincent";
661661 repo = "command-t";
662− rev = "02a22d27e1c4671db32b0ded1fa2bb861c16d14c";
663− sha256 = "0aj9lnrd0v4296c8rwy4bp73dah0lx298yi6ybz3rma2gx9xss6c";
662+ rev = "9bdc2e1585419640129a48c646bbf8459f96951b";
663+ sha256 = "0iim0lhib6fiainyb48ibl2qzgv8cmn9yinmd1k6i2y5y26wlhfy";
664664 fetchSubmodules = true;
665665 };
666666 };
@@ -788,12 +788,12 @@ let
788788
789789 dart-vim-plugin = buildVimPluginFrom2Nix {
790790 pname = "dart-vim-plugin";
791− version = "2019-11-28";
791+ version = "2019-12-02";
792792 src = fetchFromGitHub {
793793 owner = "dart-lang";
794794 repo = "dart-vim-plugin";
795− rev = "1dca4e12299e26bf4277992fd9b8b22bcc2f4e56";
796− sha256 = "11zjcp48c7n13pqmwg1s6fk8i0z2iyv5nmyl642xxdyg0h43v5hf";
795+ rev = "917d0fe8670a5f3fcbd3ac12fbe5c10c8390ebd0";
796+ sha256 = "17fhq8vinmb0fxlyj45d2yyj39wapfy4cb4smmzzvx5hyhz3kj4x";
797797 };
798798 };
799799
@@ -843,12 +843,12 @@ let
843843
844844 denite-nvim = buildVimPluginFrom2Nix {
845845 pname = "denite-nvim";
846− version = "2019-11-27";
846+ version = "2019-12-01";
847847 src = fetchFromGitHub {
848848 owner = "Shougo";
849849 repo = "denite.nvim";
850− rev = "41aa8302dc5ae8b27370bfcbf1124559c2f953de";
851− sha256 = "1bbnz9d8qayrr40kxikcgjv28y109b0ksys9pnb27l9az8sx64bz";
850+ rev = "31591499e27176c04b1605878755a121a0ff6fb6";
851+ sha256 = "0sf0a1wabq2f566nrwyapmz88m2bi2irprj5cyxlmlfypmgd4dhk";
852852 };
853853 };
854854
@@ -899,12 +899,12 @@ let
899899
900900 deoplete-go = buildVimPluginFrom2Nix {
901901 pname = "deoplete-go";
902− version = "2019-11-10";
902+ version = "2019-12-01";
903903 src = fetchFromGitHub {
904904 owner = "zchee";
905905 repo = "deoplete-go";
906− rev = "b82273104b3383ce8fc239243007865f308034ca";
907− sha256 = "1mnx20paalb4aa1h79fp3q99djcj4qkswkdl1qvzkpj1wxdqwxix";
906+ rev = "45ab448ad0bdd19a6f13ce691a5ce3c0c381ee9e";
907+ sha256 = "132wkvh62zhpiv37576k0a8akm90x40dq0sr7rc9q24cq5lym7rx";
908908 fetchSubmodules = true;
909909 };
910910 };
@@ -934,12 +934,12 @@ let
934934
935935 deoplete-lsp = buildVimPluginFrom2Nix {
936936 pname = "deoplete-lsp";
937− version = "2019-11-25";
937+ version = "2019-12-03";
938938 src = fetchFromGitHub {
939939 owner = "Shougo";
940940 repo = "deoplete-lsp";
941− rev = "37a307b1b4e922df0ff2695658602f1c34973db6";
942− sha256 = "10rdk35bljzi705b2760n7f4hlsikaz366a62wsh09npbw63sdzb";
941+ rev = "dbac6111ae250e845070075f63a3d81fd6320815";
942+ sha256 = "1p55jk21l6qd16vh0yh0zilxqz8dpksis1w7ildjwhd5f8b8ach0";
943943 };
944944 };
945945
@@ -978,12 +978,12 @@ let
978978
979979 deoplete-nvim = buildVimPluginFrom2Nix {
980980 pname = "deoplete-nvim";
981− version = "2019-11-26";
981+ version = "2019-12-02";
982982 src = fetchFromGitHub {
983983 owner = "Shougo";
984984 repo = "deoplete.nvim";
985− rev = "41ab306416a951be661622d7b0d174fe74f84f7e";
986− sha256 = "0sa6bzywlnpw4hrgnls0cs90ilykrbf9jblbq811di9d7rvn52zn";
985+ rev = "f478a7b587dc2cb676fa1845d517aa0e7ccb8867";
986+ sha256 = "1wh6s18sn8rpc51zfn8yhz8fzkyz50b9h8k9limrqvlm538c72ys";
987987 };
988988 };
989989
@@ -1609,12 +1609,12 @@ let
16091609
16101610 lh-vim-lib = buildVimPluginFrom2Nix {
16111611 pname = "lh-vim-lib";
1612− version = "2019-11-25";
1612+ version = "2019-12-03";
16131613 src = fetchFromGitHub {
16141614 owner = "LucHermitte";
16151615 repo = "lh-vim-lib";
1616− rev = "a150fd6af763f9ec1d0785f8a3ba350d8f27d908";
1617− sha256 = "0l70gkzv279sv756yng7nq3m1pkw2bvjybl6xvjifm19rx8vmlsg";
1616+ rev = "83a7693d7d078163d7959b279981aa59922452bd";
1617+ sha256 = "1ks32izmibrkrsxnqc2ds961l5f3s06avr2vfp0q7433hbzm68hl";
16181618 };
16191619 };
16201620
@@ -1708,12 +1708,12 @@ let
17081708
17091709 ncm2 = buildVimPluginFrom2Nix {
17101710 pname = "ncm2";
1711− version = "2019-07-29";
1711+ version = "2019-12-03";
17121712 src = fetchFromGitHub {
17131713 owner = "ncm2";
17141714 repo = "ncm2";
1715− rev = "160e2e33d515f67154840844d8304722b679df90";
1716− sha256 = "1jyssh84n3rv8lmmjligf5f6jjzmgjv1gc78fv5x2z79j9cg98jc";
1715+ rev = "a6ab1a4d17a295dae5446382a45c9ea3b2936f1e";
1716+ sha256 = "1abxy7p0b6y2zvi7lmdhgkyl1ws281n3dsfk15lkg9j0sk51j06l";
17171717 };
17181718 };
17191719
@@ -1840,12 +1840,12 @@ let
18401840
18411841 neoformat = buildVimPluginFrom2Nix {
18421842 pname = "neoformat";
1843− version = "2019-11-17";
1843+ version = "2019-12-01";
18441844 src = fetchFromGitHub {
18451845 owner = "sbdchd";
18461846 repo = "neoformat";
1847− rev = "33f7dfb231382998df77cf9fc8cef39778ec9449";
1848− sha256 = "1784p1lbhndpa7nr9771jx6kbmfnfx9bvrrmin9hxskffs8vr1k5";
1847+ rev = "b4f7ad5ebb759f56c598527ab671aecace114ed5";
1848+ sha256 = "0xq0vxq86am6xj4sxsnj131d54fds532pikabzsz2l8gnikb4b2r";
18491849 };
18501850 };
18511851
@@ -2401,12 +2401,12 @@ let
24012401
24022402 semshi = buildVimPluginFrom2Nix {
24032403 pname = "semshi";
2404− version = "2019-11-27";
2404+ version = "2019-12-01";
24052405 src = fetchFromGitHub {
24062406 owner = "numirias";
24072407 repo = "semshi";
2408− rev = "816b8d22adf59260f4355aab31c1cdc99db8f438";
2409− sha256 = "01s46f0gclbz3v73z75zmcy7xh9xvzjn067xiyhbf7m6jlzic0aq";
2408+ rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279";
2409+ sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx";
24102410 };
24112411 };
24122412
@@ -2674,6 +2674,17 @@ let
26742674 };
26752675 };
26762676
2677+ thesaurus_query-vim = buildVimPluginFrom2Nix {
2678+ pname = "thesaurus_query-vim";
2679+ version = "2019-11-09";
2680+ src = fetchFromGitHub {
2681+ owner = "ron89";
2682+ repo = "thesaurus_query.vim";
2683+ rev = "830a20ec77780ebfe8d2a7e8c740ca4abb079f89";
2684+ sha256 = "0kfqpjwashwf084cbz6dmhirk42a4n8d1zj17i086by17nx7qn1g";
2685+ };
2686+ };
2687+
26772688 thumbnail-vim = buildVimPluginFrom2Nix {
26782689 pname = "thumbnail-vim";
26792690 version = "2017-04-24";
@@ -3084,23 +3095,23 @@ let
30843095
30853096 vim-airline = buildVimPluginFrom2Nix {
30863097 pname = "vim-airline";
3087− version = "2019-11-29";
3098+ version = "2019-12-02";
30883099 src = fetchFromGitHub {
30893100 owner = "vim-airline";
30903101 repo = "vim-airline";
3091− rev = "ce932f3825f59258f814d4b66174283875348a95";
3092− sha256 = "0mwvmxy5x03crp7nkbnjl9h6gmjwlhwiw8i62x95nl8yf5zi8gdl";
3102+ rev = "2daef1bcb8b240c303ef34c3348ee1af071963b4";
3103+ sha256 = "1q806acihhv4yshd8pna7gs383yxs7mw2rnqm4c016sqhb20ba1i";
30933104 };
30943105 };
30953106
30963107 vim-airline-themes = buildVimPluginFrom2Nix {
30973108 pname = "vim-airline-themes";
3098− version = "2019-11-27";
3109+ version = "2019-12-02";
30993110 src = fetchFromGitHub {
31003111 owner = "vim-airline";
31013112 repo = "vim-airline-themes";
3102− rev = "f4ba787e9c5455a6a88c6d04e61b189826375763";
3103− sha256 = "1w15r4c7qwlbjjc5mbdcmg4qv4skw9n5qcn543zmiws8hxfqhf6m";
3113+ rev = "fe89bb50a15492c76a9fc55e0cff410f3d5f8b0f";
3114+ sha256 = "01qplr1md3vzwrd7as2dkm8f4qvx4qcpgaw3q9i7s2i4yv80qnn8";
31043115 };
31053116 };
31063117
@@ -3689,12 +3700,12 @@ let
36893700
36903701 vim-fugitive = buildVimPluginFrom2Nix {
36913702 pname = "vim-fugitive";
3692− version = "2019-11-27";
3703+ version = "2019-11-30";
36933704 src = fetchFromGitHub {
36943705 owner = "tpope";
36953706 repo = "vim-fugitive";
3696− rev = "67efbf66e0fcfd25e617d22892a7e9768bfd0f92";
3697− sha256 = "0ga8qi26yfc3k5ynw75ai4a9605s8x2pk9i9vb79hddciwh02ia1";
3707+ rev = "671a85dabaed7e21aa7e435adfdad9b9461cb7d8";
3708+ sha256 = "1k5qhdfnj84m8v3c2hm3ddqrdh2l3fs8hzk36qb83cjil24iz53w";
36983709 };
36993710 };
37003711
@@ -3733,12 +3744,12 @@ let
37333744
37343745 vim-gitgutter = buildVimPluginFrom2Nix {
37353746 pname = "vim-gitgutter";
3736− version = "2019-11-25";
3747+ version = "2019-12-03";
37373748 src = fetchFromGitHub {
37383749 owner = "airblade";
37393750 repo = "vim-gitgutter";
3740− rev = "c31581c25b4896ccb6418137c70a3a3c37326c89";
3741− sha256 = "1drjj5d50s3hsd8sh4cvh8ah785chi5fyzq5cy01vpxf8cfghljg";
3751+ rev = "1c53af9a0d3b622af5a62d69ddfc141c841a28c1";
3752+ sha256 = "0269cjkcx4arq7phyqv80ziafg5p1in5ci7207svixbfdg5hlmfs";
37423753 };
37433754 };
37443755
@@ -3766,12 +3777,12 @@ let
37663777
37673778 vim-go = buildVimPluginFrom2Nix {
37683779 pname = "vim-go";
3769− version = "2019-11-20";
3780+ version = "2019-12-03";
37703781 src = fetchFromGitHub {
37713782 owner = "fatih";
37723783 repo = "vim-go";
3773− rev = "d4a9cc72469927202fadf14600253a35240c993e";
3774− sha256 = "061qzzldh796lagnk1blpkvx5f55rc8h7vgzgffxg9dhc73my5a3";
3784+ rev = "d27aa72b206363ef5a2415c3eddbab6fbbcbd2c1";
3785+ sha256 = "04p30ljbpz51hjf61nc3ixgvbndk9nzhck60bhd79js3s7sd35qn";
37753786 };
37763787 };
37773788
@@ -4337,14 +4348,25 @@ let
43374348 };
43384349 };
43394350
4351+ vim-move = buildVimPluginFrom2Nix {
4352+ pname = "vim-move";
4353+ version = "2019-11-23";
4354+ src = fetchFromGitHub {
4355+ owner = "matze";
4356+ repo = "vim-move";
4357+ rev = "58049562efb0e6e077416d897b760c4dc9bb25c4";
4358+ sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq";
4359+ };
4360+ };
4361+
43404362 vim-mucomplete = buildVimPluginFrom2Nix {
43414363 pname = "vim-mucomplete";
4342− version = "2019-11-17";
4364+ version = "2019-12-01";
43434365 src = fetchFromGitHub {
43444366 owner = "lifepillar";
43454367 repo = "vim-mucomplete";
4346− rev = "8964f852a5990c79c55571aef8d137a5e90c9e7c";
4347− sha256 = "08mixa8frla5djcmka9sard4bzwjcrs3pb68si75mmrv9i9n0pd8";
4368+ rev = "92f0206dae54439bec6503c649263e38167011a9";
4369+ sha256 = "1ygsb16ha7kxns1f1km7j3br9c0ylf8pan5z46bnmixcbvia53gb";
43484370 };
43494371 };
43504372
@@ -4493,12 +4515,12 @@ let
44934515
44944516 vim-pandoc = buildVimPluginFrom2Nix {
44954517 pname = "vim-pandoc";
4496− version = "2019-11-22";
4518+ version = "2019-12-03";
44974519 src = fetchFromGitHub {
44984520 owner = "vim-pandoc";
44994521 repo = "vim-pandoc";
4500− rev = "524d05885d0fdd176d3da06fd2befff9a22353e2";
4501− sha256 = "1ngsqyjcsav3k2dcr4anhdm5ycnlfiwykqx3v15ds3j2prsn9hkd";
4522+ rev = "10d5ac88f4f6e98268b0fe999fd93bbf4cf6d778";
4523+ sha256 = "13i2lhzsvwr7qbq53xjxg1khklsbbisizgvjllap1cmbxbmnxq49";
45024524 };
45034525 };
45044526
@@ -4581,12 +4603,12 @@ let
45814603
45824604 vim-plug = buildVimPluginFrom2Nix {
45834605 pname = "vim-plug";
4584− version = "2019-11-04";
4606+ version = "2019-12-02";
45854607 src = fetchFromGitHub {
45864608 owner = "junegunn";
45874609 repo = "vim-plug";
4588− rev = "68fef9c2fd9d4a21b500cc2249b6711a71c6fb9f";
4589− sha256 = "0azmnxq82frs375k5b9yjdvsjfmzjv92ifqnmniar19d96yh6swa";
4610+ rev = "93b702512d07bcad4c0d47913db587febe8cc054";
4611+ sha256 = "0qfxrs3g45m7z36l6sad4yg6jfq60j9qknmmz4f2g40bs0vm1kdd";
45904612 };
45914613 };
45924614
@@ -4922,12 +4944,12 @@ let
49224944
49234945 vim-snippets = buildVimPluginFrom2Nix {
49244946 pname = "vim-snippets";
4925− version = "2019-11-24";
4947+ version = "2019-12-01";
49264948 src = fetchFromGitHub {
49274949 owner = "honza";
49284950 repo = "vim-snippets";
4929− rev = "c1d1cdce4f34d861cedebc948ef9cdecf633ae0a";
4930− sha256 = "1lnpv54mnn99yz4z4jr3al0bf1jxiz45rpqk8jvv5xz70zmfbrrg";
4951+ rev = "a7a7d4d2dd252b71b904d362ba74572c660da67f";
4952+ sha256 = "0ys0sczmjpc219hv2wwgcrkyiys21vk66i174axm147h33m3cm4f";
49314953 };
49324954 };
49334955
@@ -5008,6 +5030,17 @@ let
50085030 };
50095031 };
50105032
5033+ vim-subversive = buildVimPluginFrom2Nix {
5034+ pname = "vim-subversive";
5035+ version = "2019-07-28";
5036+ src = fetchFromGitHub {
5037+ owner = "svermeulen";
5038+ repo = "vim-subversive";
5039+ rev = "5837cb38f656f120e7a04ae73f749303d78b9191";
5040+ sha256 = "0n04mxdq80xkjgi75n1c2gg2s6am5kns8rj7pz6dvvlqr4vxyrjf";
5041+ };
5042+ };
5043+
50115044 vim-surround = buildVimPluginFrom2Nix {
50125045 pname = "vim-surround";
50135046 version = "2019-11-28";
@@ -5197,12 +5230,12 @@ let
51975230
51985231 vim-tmux-navigator = buildVimPluginFrom2Nix {
51995232 pname = "vim-tmux-navigator";
5200− version = "2019-01-29";
5233+ version = "2019-12-02";
52015234 src = fetchFromGitHub {
52025235 owner = "christoomey";
52035236 repo = "vim-tmux-navigator";
5204− rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42";
5205− sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv";
5237+ rev = "b5ae5805db294a72380f77ee82592cd99246272b";
5238+ sha256 = "0w8fn92k1p99wmhq4dv5w2fb97l0p8ay00qyzydm9lq87w06a939";
52065239 };
52075240 };
52085241
@@ -5296,12 +5329,12 @@ let
52965329
52975330 vim-visual-multi = buildVimPluginFrom2Nix {
52985331 pname = "vim-visual-multi";
5299− version = "2019-11-27";
5332+ version = "2019-11-29";
53005333 src = fetchFromGitHub {
53015334 owner = "mg979";
53025335 repo = "vim-visual-multi";
5303− rev = "fb6895c5c39862e495644e2cc0d300ad00bdeed2";
5304− sha256 = "14mcrwfkwjlqh7r6h2qmcxm8a4c6lldrk549c9bwnrpzmvjw5daw";
5336+ rev = "7c1934f91b33f64836d0e0d27e08481849831266";
5337+ sha256 = "1ga0skivc5p09d29k4gx2gdisalcl9514062ckddphynqn69ghi9";
53055338 };
53065339 };
53075340
@@ -5505,12 +5538,12 @@ let
55055538
55065539 vimtex = buildVimPluginFrom2Nix {
55075540 pname = "vimtex";
5508− version = "2019-11-23";
5541+ version = "2019-12-02";
55095542 src = fetchFromGitHub {
55105543 owner = "lervag";
55115544 repo = "vimtex";
5512− rev = "0647bb8991a490f92de173ca67e9b49a3f1fddcd";
5513− sha256 = "142wh5b2zl3s8jjlc6hnd1z8ysfiz4xllax84f6ddyny72z3di42";
5545+ rev = "02829dee17a3d70889b5a0151a2f747754a0e2c4";
5546+ sha256 = "0kkm18mi1am1ww3lb3xqr9v11s057drkv8wpq0l5vqr550iviail";
55145547 };
55155548 };
55165549
@@ -5648,24 +5681,24 @@ let
56485681
56495682 yats-vim = buildVimPluginFrom2Nix {
56505683 pname = "yats-vim";
5651− version = "2019-11-15";
5684+ version = "2019-11-30";
56525685 src = fetchFromGitHub {
56535686 owner = "HerringtonDarkholme";
56545687 repo = "yats.vim";
5655− rev = "c134c9e7595597684609fe2344076a66bbe82a17";
5656− sha256 = "1g77j1pbnndyyi9s4yiia5bzd20n7x2fj3m9p7k173hv2n9kf93f";
5688+ rev = "e9d8813c02b8bdb81b63aeb576b9eaadf0dd4445";
5689+ sha256 = "1x5950ca4nmsf1129sjd12kcncpv8jf4x80s0y3gwwgr3p7x1m22";
56575690 fetchSubmodules = true;
56585691 };
56595692 };
56605693
56615694 youcompleteme = buildVimPluginFrom2Nix {
56625695 pname = "youcompleteme";
5663− version = "2019-11-23";
5696+ version = "2019-11-30";
56645697 src = fetchFromGitHub {
56655698 owner = "valloric";
56665699 repo = "youcompleteme";
5667− rev = "8099995959e7e533306a2cadd38a2f83d2ea9ed9";
5668− sha256 = "1824jphq8mrswc594p032h459gn51mynfa5k8nnxkjws9c9myc4b";
5700+ rev = "1386c6b3fba94d93576cd344a1cd296c53ad7926";
5701+ sha256 = "0y4ics5msz1lq3pzqspgf5zgzpqkimngvpzk0zpybs6idgxi05jz";
56695702 fetchSubmodules = true;
56705703 };
56715704 };
pkgs/misc/vim-plugins/vim-plugin-names+3
@@ -240,6 +240,7 @@ mattn/calendar-vim as mattn-calendar-vim
240240mattn/emmet-vim
241241mattn/gist-vim
242242mattn/webapi-vim
243+matze/vim-move
243244maximbaz/lightline-ale
244245MaxMEllon/vim-jsx-pretty
245246mbbill/undotree
@@ -355,6 +356,7 @@ rhysd/vim-grammarous
355356rhysd/vim-operator-surround
356357Rip-Rip/clang_complete
357358rodjek/vim-puppet
359+ron89/thesaurus_query.vim
358360roxma/nvim-cm-racer
359361roxma/nvim-completion-manager
360362roxma/nvim-yarp
@@ -400,6 +402,7 @@ slashmili/alchemist.vim
400402sonph/onehalf
401403stefandtw/quickfix-reflector.vim
402404stephpy/vim-yaml
405+svermeulen/vim-subversive
403406t9md/vim-choosewin
404407t9md/vim-smalls
405408takac/vim-hardtime
pkgs/os-specific/linux/audit/default.nix+1−1
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
6161 homepage = https://people.redhat.com/sgrubb/audit/;
6262 license = stdenv.lib.licenses.gpl2;
6363 platforms = stdenv.lib.platforms.linux;
64− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
64+ maintainers = with stdenv.lib.maintainers; [ ];
6565 };
6666}
pkgs/os-specific/linux/bpftrace/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "bpftrace";
8− version = "0.9.2";
8+ version = "0.9.3";
99
1010 src = fetchFromGitHub {
1111 owner = "iovisor";
1212 repo = "bpftrace";
1313 rev = "refs/tags/v${version}";
14− sha256 = "19lblnhx3p0qk8s3qgxrx9wl0d6dgz5dfp4gw6a6cvhhyn78cldm";
14+ sha256 = "1qkfbmksdssmm1qxcvcwdql1pz8cqy233195n9i9q5dhk876f75v";
1515 };
1616
1717 enableParallelBuilding = true;
pkgs/os-specific/linux/hdparm/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 homepage = https://sourceforge.net/projects/hdparm/;
1919 platforms = platforms.linux;
2020 license = licenses.bsd2;
21− maintainers = [ maintainers.fuuzetsu ];
21+ maintainers = [ ];
2222 };
2323
2424}
pkgs/os-specific/linux/iwd/default.nix+2−2
@@ -13,12 +13,12 @@
1313
1414stdenv.mkDerivation rec {
1515 pname = "iwd";
16− version = "1.1";
16+ version = "1.2";
1717
1818 src = fetchgit {
1919 url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
2020 rev = version;
21− sha256 = "1rvsr5i79wpdicghplrxamb4qbkdm5cpgw3mk0rsqzwwj6d6l0vs";
21+ sha256 = "10fwi31ym6hvn0vvh9fy0swzs3mfnpcwg95np4i5ksmw8k0kj0hf";
2222 };
2323
2424 nativeBuildInputs = [
pkgs/os-specific/linux/libaio/default.nix+1−1
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
3333 homepage = http://lse.sourceforge.net/io/aio.html;
3434 platforms = stdenv.lib.platforms.linux;
3535 license = stdenv.lib.licenses.lgpl21;
36− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
36+ maintainers = with stdenv.lib.maintainers; [ ];
3737 };
3838}
pkgs/os-specific/linux/pktgen/default.nix+1−3
@@ -3,9 +3,7 @@
33, gtk2, which, withGtk ? false
44}:
55
6−let
7−
8−in stdenv.mkDerivation rec {
6+stdenv.mkDerivation rec {
97 pname = "pktgen";
108 version = "3.7.2";
119
pkgs/os-specific/linux/upower/default.nix+2
@@ -52,12 +52,14 @@ stdenv.mkDerivation {
5252 "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
5353 "--with-systemdutildir=${placeholder "out"}/lib/systemd"
5454 "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
55+ "--sysconfdir=/etc"
5556 ];
5657
5758 doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
5859
5960 installFlags = [
6061 "historydir=$(TMPDIR)/foo"
62+ "sysconfdir=${placeholder "out"}/etc"
6163 ];
6264
6365 meta = with stdenv.lib; {
pkgs/servers/dns/knot-resolver/default.nix+2−2
@@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: ''
2323
2424unwrapped = stdenv.mkDerivation rec {
2525 pname = "knot-resolver";
26− version = "4.2.2";
26+ version = "4.3.0";
2727
2828 src = fetchurl {
2929 url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
30− sha256 = "03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458";
30+ sha256 = "0ca0f171ae2b2d76830967a5150eb0fa496b48b2a48f41b2be65d3743aaece25";
3131 };
3232
3333 # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
pkgs/servers/mautrix-whatsapp/0001-Add-missing-go-dependencies-to-go.sum.patchnew file+46
@@ -0,0 +1,46 @@
1+From e9b9d97074ab811747792ef86f3d195709b65751 Mon Sep 17 00:00:00 2001
2+From: Maximilian Bosch <maximilian@mbosch.me>
3+Date: Fri, 29 Nov 2019 16:27:15 +0100
4+Subject: [PATCH] Add missing go dependencies to go.sum
5+
6+Generated by running `go build` locally. Otherwise some dependencies are
7+missing when building with `buildGoModule` in Nix as it tries to fetch
8+the packages during compilation and fails with the following error:
9+
10+```
11+verifying maunium.net/go/mautrix-appservice@v0.1.0-alpha.3.0.20191110192030-cd699619a163: maunium.net/go/mautrix-appservice@v0.1.0-alpha.3.0.20191110192030-cd699619a163: Get https://sum.golang.org/lookup/maunium.net/go/mautrix-appservice@v0.1.0-alpha.3.0.20191110192030-cd699619a163: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:44681->[::1]:53: read: connection refused
12+builder for '/nix/store/qxpy80j6y4gl1h6hplsznml1ffrca6az-mautrix-whatsapp-unstable-2019-11-17.drv' failed with exit code 1
13+```
14+---
15+ go.sum | 3 +++
16+ 1 file changed, 3 insertions(+)
17+
18+diff --git a/go.sum b/go.sum
19+index f638f9a..ab7e907 100644
20+--- a/go.sum
21++++ b/go.sum
22+@@ -45,6 +45,7 @@ github.com/tulir/go-whatsapp v0.0.2-0.20190830212741-33ca6ee47cf5 h1:0pUczFGOo4s
23+ github.com/tulir/go-whatsapp v0.0.2-0.20190830212741-33ca6ee47cf5/go.mod h1:u3Hdptbz3iB5y/NEoSKgsp9hBzUlm0A5OrLMVdENAX8=
24+ github.com/tulir/go-whatsapp v0.0.2-0.20190903182221-4e1a838ff3ba h1:exEcedSHn0qEZ1iwNwFF5brEuflhMScjFyyzmxUA+og=
25+ github.com/tulir/go-whatsapp v0.0.2-0.20190903182221-4e1a838ff3ba/go.mod h1:u3Hdptbz3iB5y/NEoSKgsp9hBzUlm0A5OrLMVdENAX8=
26++github.com/tulir/go-whatsapp v0.0.2-0.20191109203156-c477dae1c7e9 h1:WyLOadcpkAvoyaGfUvBgj/mTHetzliBGFioEEtM+Ac8=
27+ github.com/tulir/go-whatsapp v0.0.2-0.20191109203156-c477dae1c7e9/go.mod h1:ustkccVUt0hOuKikjFb6b4Eray6At5djkcKYYu4+Lco=
28+ golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
29+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
30+@@ -73,6 +74,7 @@ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190622085722-6406f15cb8e3 h1:oVabjOi2r
31+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190622085722-6406f15cb8e3/go.mod h1:O+QWJP3H7BZEzIBSrECKpnpRnEKBwaoWVEu/yZwVwxg=
32+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190825132810-9d870654e9d2 h1:0iVxLLAOSBqtJqhIjW9EbblMsaSYoCJRo5mHPZnytUk=
33+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190825132810-9d870654e9d2/go.mod h1:O+QWJP3H7BZEzIBSrECKpnpRnEKBwaoWVEu/yZwVwxg=
34++maunium.net/go/mautrix v0.1.0-alpha.3.0.20191110191816-178ce1f1561d h1:lfEHd6diaoKLdZvVNcmBF9kD667xWw+x7iXlvfpEd00=
35+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20191110191816-178ce1f1561d/go.mod h1:O+QWJP3H7BZEzIBSrECKpnpRnEKBwaoWVEu/yZwVwxg=
36+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190618052224-6e6c9bb47548 h1:ni1nqs+2AOO+g1ND6f2W0pMcb6sIDVqzerXosO+pI2g=
37+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190618052224-6e6c9bb47548/go.mod h1:yVWU0gvIHIXClgyVnShiufiDksFbFrBqHG9lDAYcmGI=
38+@@ -86,4 +88,5 @@ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190830063827-e7dcd7e42e7c h
39+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190830063827-e7dcd7e42e7c/go.mod h1:FJRRpH5+p3wCfEt6u/3kMeu9aGX/pk2PqtvjRDRW74w=
40+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190901152202-40639f5932be h1:sSBx9AGR4iYHRFwljqNwxXFtbY2bKLJHgI9B4whAU8I=
41+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190901152202-40639f5932be/go.mod h1:FJRRpH5+p3wCfEt6u/3kMeu9aGX/pk2PqtvjRDRW74w=
42++maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20191110192030-cd699619a163 h1:+tWThOHlyIW2VITR4A05wuhixu0AH8iZZ/Ha7AwkAys=
43+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20191110192030-cd699619a163/go.mod h1:ST7YYCoHtFC4c7/Iga8W5wwKXyxjwVh4DlsnyIU6rYw=
44+--
45+2.23.0
46+
pkgs/servers/mautrix-whatsapp/default.nix+7−5
@@ -1,17 +1,19 @@
11{ stdenv, buildGoModule, fetchFromGitHub }:
22
33buildGoModule {
4− pname = "mautrix-unstable";
5− version = "2019-09-03";
4+ pname = "mautrix-whatsapp-unstable";
5+ version = "2019-11-17";
66
77 src = fetchFromGitHub {
88 owner = "tulir";
99 repo = "mautrix-whatsapp";
10− rev = "22fb5c125db1a0a3a8be8e8e09e92bb38718e6bf";
11− sha256 = "03wd6mn9jr1hr3qxg1r707ibi1s9511y97bfrmzka4mrsymgamxa";
10+ rev = "0fba1db6aa88a95ff567f44aa9be7ce6ef24787f";
11+ sha256 = "07cgpvicr6n897myx86mlnx7bydsxnf51lnjbv9dl5yyii73f957";
1212 };
1313
14− modSha256 = "14bqxx2hcr8yhcd5hi087pyc1hzqmr13p2fqb3nnsx12j7n07gww";
14+ patches = [ ./0001-Add-missing-go-dependencies-to-go.sum.patch ];
15+
16+ modSha256 = "0y0im3dz5z3rcsmnxkk0l6xqwcyxb0bi9h4arw7zblfy16iw6vrr";
1517
1618 meta = with stdenv.lib; {
1719 homepage = https://github.com/tulir/mautrix-whatsapp;
pkgs/servers/monitoring/prometheus/wireguard-exporter.nix+9−3
@@ -2,19 +2,25 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "wireguard-exporter";
5− version = "3.2.1";
5+ version = "3.2.2";
66
77 src = fetchFromGitHub {
88 owner = "MindFlavor";
99 repo = "prometheus_wireguard_exporter";
1010 rev = version;
11− sha256 = "1hyqvk3sxirm91lasf1z1wkzaql1g52my9a9q42z1h0hq66bc6nk";
11+ sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc";
1212 };
1313
14− cargoSha256 = "0wdyvl58h66xjcnl2kf3f7gnn4nc4vzpl870jc5x0qrkz28jppxz";
14+ cargoSha256 = "1bi9nr1dhyv322pq6fjrhs12h3wdak53mvwkbyim1hmrp62vky4m";
1515
1616 buildInputs = lib.optional stdenv.isDarwin Security;
1717
18+ # Commonly used hack in nixpkgs to allow unstable features on a stable rustc. This is needed
19+ # since `prometheus_exporter_base` uses `#!feature[]` to enable async which
20+ # is actually not needed as `async` is part of rustc 1.39.0-stable. This can be removed
21+ # as soon as https://github.com/MindFlavor/prometheus_exporter_base/pull/15 is merged.
22+ RUSTC_BOOTSTRAP = 1;
23+
1824 meta = with lib; {
1925 description = "A Prometheus exporter for WireGuard, written in Rust.";
2026 license = licenses.mit;
pkgs/servers/mpd/default.nix+1−1
@@ -132,7 +132,7 @@ let
132132 description = "A flexible, powerful daemon for playing music";
133133 homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
134134 license = licenses.gpl2;
135− maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz tobim ];
135+ maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
136136 platforms = platforms.unix;
137137
138138 longDescription = ''
pkgs/servers/sql/postgresql/ext/tds_fdw.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "tds_fdw";
5− version = "1.0.8";
5+ version = "2.0.1";
66
77 buildInputs = [ postgresql freetds ];
88
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 owner = "tds-fdw";
1111 repo = pname;
1212 rev = "refs/tags/v${version}";
13− sha256 = "0dlv1imiy773yplqqpl26xka65bc566k2x81wkrbvwqagnwvcai2";
13+ sha256 = "1zpcrx30bvaf72782hgz2s19i5ndwvi7z87fanl1lnymznrk9lzg";
1414 };
1515
1616 installPhase = ''
pkgs/servers/xmpp/ejabberd/default.nix+4−4
@@ -24,12 +24,12 @@ let
2424 ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
2525
2626in stdenv.mkDerivation rec {
27− version = "19.08";
27+ version = "19.09.1";
2828 pname = "ejabberd";
2929
3030 src = fetchurl {
3131 url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
32− sha256 = "0ivkw31civcznv9k645hvrzn1yc6a4qsrsywjrakniwaaxlsnj8w";
32+ sha256 = "1lj0zahsdg6naq007h8wp5p8ksdfwam3as7wiagvbj9gy8dgdp8q";
3333 };
3434
3535 nativeBuildInputs = [ fakegit ];
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
7676
7777 outputHashMode = "recursive";
7878 outputHashAlgo = "sha256";
79− outputHash = "0h1amqp2x6ir29bdh9x8bm0abj67k81nmkqi8gidwccsa5z94s2c";
79+ outputHash = "097c84qp00dq8x7ngfqcrv9fa0wm0k94grashmi1fxlasgbvxh18";
8080 };
8181
8282 configureFlags =
@@ -115,7 +115,7 @@ in stdenv.mkDerivation rec {
115115 license = licenses.gpl2;
116116 homepage = https://www.ejabberd.im;
117117 platforms = platforms.linux;
118− maintainers = with maintainers; [ sander abbradar ];
118+ maintainers = with maintainers; [ sander abbradar ajs124 ];
119119 broken = withElixir;
120120 };
121121}
pkgs/tools/X11/xnee/default.nix+1−1
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949
5050 homepage = https://www.gnu.org/software/xnee/;
5151
52− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
52+ maintainers = with stdenv.lib.maintainers; [ ];
5353 platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
5454 };
5555}
pkgs/tools/admin/eksctl/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "eksctl";
5− version = "0.10.2";
5+ version = "0.11.0";
66
77 src = fetchFromGitHub {
88 owner = "weaveworks";
99 repo = pname;
1010 rev = version;
11− sha256 = "0j1kzll23rj87nabzjjhxydg95cnxlwbkqp3qivf96bv1xlby75k";
11+ sha256 = "0dh2fa60w5jbxkrn4j4nf6dn4ljcfpl2xf8vx0j49k36dirfp8y3";
1212 };
1313
14− modSha256 = "18n4aimf9diy9w7f2k08cd7xr8jay6pid5mwrc24y2pqkjhgpyp7";
14+ modSha256 = "04ba3dyfwlf0m6kn7yp7qyp3h2qdwp17y1f9pa79y3c6sd2nadk2";
1515
1616 subPackages = [ "cmd/eksctl" ];
1717
pkgs/tools/audio/mpdris2/default.nix+36−12
@@ -1,31 +1,55 @@
1−{ stdenv, fetchurl, autoreconfHook, intltool
2−, pythonPackages
1+{ stdenv
2+, autoreconfHook
3+, fetchFromGitHub
4+, glib
5+, gobject-introspection
6+, intltool
7+, libnotify
8+, python3
9+, wrapGAppsHook
310}:
411
5−stdenv.mkDerivation rec {
12+python3.pkgs.buildPythonApplication rec {
613 pname = "mpDris2";
714 version = "0.8";
15+ format = "other";
16+ strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
817
9− src = fetchurl {
10− url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz";
11− sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn";
18+ src = fetchFromGitHub {
19+ owner = "eonpatapon";
20+ repo = pname;
21+ rev = version;
22+ sha256 = "048b8acsd1b8kcxzd9fsh5p9g2an9c4rznicfcpyrsjz5syv894h";
1223 };
1324
1425 preConfigure = ''
1526 intltoolize -f
1627 '';
1728
18− nativeBuildInputs = [ autoreconfHook ];
19− buildInputs = [ intltool pythonPackages.wrapPython ];
20− propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ];
21− pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ];
22− postInstall = "wrapPythonPrograms";
29+ nativeBuildInputs = [
30+ autoreconfHook
31+ gobject-introspection
32+ intltool
33+ wrapGAppsHook
34+ ];
35+
36+ buildInputs = [
37+ glib
38+ libnotify
39+ ];
40+
41+ propagatedBuildInputs = with python3.pkgs; [
42+ dbus-python
43+ mpd2
44+ mutagen
45+ pygobject3
46+ ];
2347
2448 meta = with stdenv.lib; {
2549 description = "MPRIS 2 support for mpd";
2650 homepage = https://github.com/eonpatapon/mpDris2/;
2751 license = licenses.gpl3;
52+ maintainers = with maintainers; [];
2853 platforms = platforms.unix;
29− maintainers = with maintainers; [ pjones ];
3054 };
3155}
pkgs/tools/backup/hpe-ltfs/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }:
2+
3+stdenv.mkDerivation rec {
4+ version = "3.4.2_Z7550-02501";
5+ pname = "hpe-ltfs";
6+
7+ src = fetchFromGitHub {
8+ rev = version;
9+ owner = "nix-community";
10+ repo = "hpe-ltfs";
11+ sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s";
12+ };
13+
14+ sourceRoot = "source/ltfs";
15+
16+ nativeBuildInputs = [ pkgconfig ];
17+
18+ buildInputs = [
19+ fuse icu libxml2 libuuid
20+ ];
21+
22+ meta = with stdenv.lib; {
23+ description = "HPE's implementation of the open-source tape filesystem standard ltfs";
24+ homepage = https://support.hpe.com/hpesc/public/km/product/1009214665/Product;
25+ license = licenses.lgpl21;
26+ maintainers = [ maintainers.redvers ];
27+ platforms = platforms.linux;
28+ downloadPage = https://github.com/nix-community/hpe-ltfs;
29+ };
30+}
pkgs/tools/graphics/gifsicle/default.nix+1−1
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
2828 homepage = https://www.lcdf.org/gifsicle/;
2929 license = stdenv.lib.licenses.gpl2;
3030 platforms = platforms.all;
31− maintainers = with stdenv.lib.maintainers; [ fuuzetsu zimbatm ];
31+ maintainers = with stdenv.lib.maintainers; [ zimbatm ];
3232 };
3333}
pkgs/tools/misc/cloc/default.nix+1−1
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
2828 homepage = https://github.com/AlDanial/cloc;
2929 license = stdenv.lib.licenses.gpl2;
3030 platforms = stdenv.lib.platforms.all;
31− maintainers = with stdenv.lib.maintainers; [ fuuzetsu rycee ];
31+ maintainers = with stdenv.lib.maintainers; [ rycee ];
3232 };
3333}
pkgs/tools/misc/ffsend/default.nix+4−4
@@ -16,16 +16,16 @@ with rustPlatform;
1616
1717buildRustPackage rec {
1818 pname = "ffsend";
19− version = "0.2.55";
19+ version = "0.2.56";
2020
2121 src = fetchFromGitLab {
2222 owner = "timvisee";
2323 repo = "ffsend";
2424 rev = "v${version}";
25− sha256 = "0z0wa12vnzj07q54nr1zr81vjr1kac60nys26bbi8s6nh46n93wv";
25+ sha256 = "12ymy2f7nd7w4qm1w8kd6p5dk8prnzsmynmh434x0pzh3cg4fhji";
2626 };
2727
28− cargoSha256 = "14brb11nb17dykh37y099bhmk85a7z8fld2pivmywfgvz1x3i141";
28+ cargoSha256 = "08xqvrsyxy131702d6l6klznp6vijik910k65k6sgxqdw6r7ah9a";
2929
3030 nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
3131 buildInputs = [ openssl ]
@@ -55,7 +55,7 @@ buildRustPackage rec {
5555 '';
5656 homepage = https://gitlab.com/timvisee/ffsend;
5757 license = licenses.gpl3;
58− maintainers = [ maintainers.lilyball ];
58+ maintainers = [ maintainers.lilyball maintainers.equirosa];
5959 platforms = platforms.unix;
6060 };
6161}
pkgs/tools/misc/fzf/default.nix+4−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "fzf";
5− version = "0.18.0";
5+ version = "0.19.0";
66
77 src = fetchFromGitHub {
88 owner = "junegunn";
99 repo = pname;
1010 rev = version;
11− sha256 = "0pwpr4fpw56yzzkcabzzgbgwraaxmp7xzzmap7w1xsrkbj7dl2xl";
11+ sha256 = "192ci09yi2hps02skcnbfwyjbf7pl0wb6q2zshb58cid5zgla8bx";
1212 };
1313
14− modSha256 = "0xc4166d74ix5nzjphrq4rgw7qpskz05ymzl77i2qh2nhbdb53p0";
14+ modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143";
1515
1616 outputs = [ "out" "man" ];
1717
@@ -60,6 +60,7 @@ buildGoModule rec {
6060 homepage = "https://github.com/junegunn/fzf";
6161 description = "A command-line fuzzy finder written in Go";
6262 license = licenses.mit;
63+ maintainers = with maintainers; [ filalex77 ];
6364 platforms = platforms.unix;
6465 };
6566}
pkgs/tools/misc/licensor/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "licensor";
5− version = "2.0.0";
5+ version = "2.1.0";
66
77 src = fetchFromGitHub {
88 owner = "raftario";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0bb6q3jpzdygjcs3apl38zzmgkn22ya5wxlqgmlp0cybqbhpi20s";
11+ sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p";
1212 };
1313
14− cargoSha256 = "1cvwyj2043vi5905n5126ikwbs3flfgzqkzjnzha0h8in8p3skv1";
14+ cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139";
1515
1616 meta = with lib; {
1717 description = "Write licenses to stdout";
pkgs/tools/misc/rlwrap/default.nix+1−1
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121 homepage = https://github.com/hanslub42/rlwrap;
2222 license = stdenv.lib.licenses.gpl2Plus;
2323 platforms = stdenv.lib.platforms.unix;
24− maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
24+ maintainers = with stdenv.lib.maintainers; [ ];
2525 };
2626}
pkgs/tools/misc/starship/default.nix+9−4
@@ -2,17 +2,22 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "starship";
5− version = "0.26.5";
5+ version = "0.27.0";
66
77 src = fetchFromGitHub {
88 owner = "starship";
9− repo = "starship";
9+ repo = pname;
1010 rev = "v${version}";
11− sha256 = "0a2jx82cwnxr0751qz2zp3chl0ndxf4wmjnar1y7s63syy9i6s52";
11+ sha256 = "1bps40rzljxihl87hbbdlas5v9lphhsjzgaqz2y0haqwjj1vjpm9";
1212 };
1313
1414 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
1515
16+ postPatch = ''
17+ substituteInPlace src/utils.rs \
18+ --replace "/bin/echo" "echo"
19+ '';
20+
1621 cargoSha256 = "110ajwgdshakcqxfnqi30yy0miikp2qx86flwfkd78jawfll2krp";
1722 checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
1823
@@ -20,7 +25,7 @@ rustPlatform.buildRustPackage rec {
2025 description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
2126 homepage = "https://starship.rs";
2227 license = licenses.isc;
23− maintainers = with maintainers; [ bbigras davidtwco ];
28+ maintainers = with maintainers; [ bbigras davidtwco filalex77 ];
2429 platforms = platforms.all;
2530 };
2631}
pkgs/tools/misc/youtube-dl/default.nix+1−1
@@ -65,6 +65,6 @@ buildPythonPackage rec {
6565 '';
6666 license = licenses.publicDomain;
6767 platforms = with platforms; linux ++ darwin;
68− maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz enzime ];
68+ maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ];
6969 };
7070}
pkgs/tools/networking/babeld/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/;
2020 description = "Loop-avoiding distance-vector routing protocol";
2121 license = stdenv.lib.licenses.mit;
22− maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ];
22+ maintainers = with stdenv.lib.maintainers; [ fpletz ];
2323 platforms = with stdenv.lib.platforms; linux;
2424 };
2525}
pkgs/tools/networking/connman/connman-notify/default.nix+17−21
@@ -1,38 +1,34 @@
1−{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
1+{ stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
22
3−stdenv.mkDerivation {
3+python3Packages.buildPythonApplication {
44 pname = "connman-notify";
5− version = "2014-06-23";
5+ version = "2019-10-05";
66
7− src = fetchFromGitHub {
7+ src = fetchFromGitLab {
88 owner = "wavexx";
99 repo = "connman-notify";
10− rev = "0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d";
11− sha256 = "0lhk417fdg3qxs1marpqp277bdxhwnbyrld9xj224bfk5v7xi4bg";
10+ rev = "24b10a51721b54d932f4cd61ef2756423768c015";
11+ sha256 = "1k5b5y6114yna2cm0cq82xilicran63hrhlklgv7k3p89057xh8j";
1212 };
1313
14− nativeBuildInputs = [ makeWrapper ];
14+ format = "other";
1515
16− buildInputs = [
17− pythonPackages.python
18− pythonPackages.dbus-python
19− pythonPackages.pygobject2
20− pythonPackages.pygtk
21− pythonPackages.notify
22− ];
16+ nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
17+
18+ buildInputs = [ glib ];
19+
20+ pythonPath = with python3Packages; [ dbus-python pygobject3 ];
21+
22+ strictDeps = false;
2323
2424 installPhase = ''
25− mkdir -p $out/bin
26− cp -vai connman-notify $out/bin/
25+ install -D -t $out/bin connman-notify
26+ install -D -t $out/share/doc README.rst
2727 '';
2828
29− preFixup = ''
30− wrapProgram $out/bin/connman-notify --prefix PYTHONPATH : "$PYTHONPATH"
31− '';
32−
3329 meta = with stdenv.lib; {
3430 description = "Desktop notification integration for connman";
35− homepage = https://github.com/wavexx/connman-notify;
31+ homepage = https://gitlab.com/wavexx/connman-notify;
3632 license = licenses.gpl2;
3733 platforms = platforms.linux;
3834 maintainers = [ maintainers.romildo ];
pkgs/tools/networking/croc/default.nix+3−3
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "croc";
5− version = "6.4.1";
5+ version = "6.4.6";
66
77 goPackagePath = "github.com/schollz/croc";
88
@@ -10,7 +10,7 @@ buildGoModule rec {
1010 owner = "schollz";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "0sil1gxml4p4yysm8x6bpv5m0hvw4ss27b4c9wdag06lav0g4am0";
13+ sha256 = "13sgjyrabr34a6sz8lzc21zvv5wc5lkgwbx0ar8afmikkrpdypln";
1414 };
1515
1616 modSha256 = "1w84xqnn9fnkakak6j069app4ybbxpwq79g8qypwvmqg5bhvzywg";
@@ -20,7 +20,7 @@ buildGoModule rec {
2020 description = "Easily and securely send things from one computer to another";
2121 homepage = https://github.com/schollz/croc;
2222 license = licenses.mit;
23− maintainers = with maintainers; [ hugoreeves ];
23+ maintainers = with maintainers; [ hugoreeves equirosa ];
2424
2525 longDescription = ''
2626 Croc is a command line tool written in Go that allows any two computers to
pkgs/tools/networking/pmacct/default.nixnew file+62
@@ -0,0 +1,62 @@
1+{ stdenv
2+, fetchFromGitHub
3+, pkgconfig
4+, autoreconfHook
5+, libtool
6+, libpcap
7+
8+# Optional Dependencies
9+, zlib ? null
10+, withJansson ? true, jansson ? null
11+, withNflog ? true, libnetfilter_log ? null
12+, withSQLite ? true, sqlite ? null
13+, withPgSQL ? true, postgresql ? null
14+, withMysql ? true, libmysqlclient ? null }:
15+
16+assert withJansson -> jansson != null;
17+assert withNflog -> libnetfilter_log != null;
18+assert withSQLite -> sqlite != null;
19+assert withPgSQL -> postgresql != null;
20+assert withMysql -> libmysqlclient != null;
21+
22+let inherit (stdenv.lib) optional; in
23+
24+stdenv.mkDerivation rec {
25+ version = "1.7.3";
26+ pname = "pmacct";
27+
28+ src = fetchFromGitHub {
29+ owner = "pmacct";
30+ repo = pname;
31+ rev = "v${version}";
32+ sha256 = "0j5qmkya67q7jvaddcj00blmaac37bkir1zb3m1xmm95gm5lf2p5";
33+ };
34+
35+ nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
36+ buildInputs = [ libpcap ]
37+ ++ optional withJansson jansson
38+ ++ optional withNflog libnetfilter_log
39+ ++ optional withSQLite sqlite
40+ ++ optional withPgSQL postgresql
41+ ++ optional withMysql [ libmysqlclient zlib ];
42+
43+ configureFlags = [
44+ "--with-pcap-includes=${libpcap}/include"
45+ ] ++ optional withJansson "--enable-jansson"
46+ ++ optional withNflog "--enable-nflog"
47+ ++ optional withSQLite "--enable-sqlite3"
48+ ++ optional withPgSQL "--enable-pgsql"
49+ ++ optional withMysql "--enable-mysql";
50+
51+ meta = with stdenv.lib; {
52+ description = "pmacct is a small set of multi-purpose passive network monitoring tools";
53+ longDescription = ''
54+ pmacct is a small set of multi-purpose passive network monitoring tools
55+ [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
56+ '';
57+ homepage = "http://www.pmacct.net/";
58+ license = licenses.gpl2;
59+ maintainers = with maintainers; [ "0x4A6F" ];
60+ platforms = platforms.unix;
61+ };
62+}
pkgs/tools/package-management/cargo-deb/default.nix+3−3
@@ -2,18 +2,18 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-deb";
5− version = "1.21.1";
5+ version = "1.23.0";
66
77 src = fetchFromGitHub {
88 owner = "mmstick";
99 repo = "cargo-deb";
1010 rev = "v${version}";
11− sha256 = "10b25a0cnrd2bhf38yqc32l06vp6sdlfcpa6n9718yipp7b60cq2";
11+ sha256 = "0jjhbs48f0rprzxnfgav6mjbyvcqnr7xq1qgyjxwd61z8g3m8hx8";
1212 };
1313
1414 buildInputs = with stdenv; lib.optionals isDarwin [ Security ];
1515
16− cargoSha256 = "182ayprs2awmz7lzqkhawrmpfjla3jcj58q8g8c908gchkh05kns";
16+ cargoSha256 = "03z9hq873jfsbssnd3kr5vz9lx9mvhb1navb2glm6kkw1k2zm4d2";
1717
1818 meta = with stdenv.lib; {
1919 description = "Generate Debian packages from information in Cargo.toml";
pkgs/tools/package-management/cargo-edit/default.nix+13−3
@@ -4,21 +4,31 @@
44
55rustPlatform.buildRustPackage rec {
66 pname = "cargo-edit";
7− version = "0.3.3";
7+ version = "0.4.1";
88
99 src = fetchFromGitHub {
1010 owner = "killercup";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "05b64bm9441crw74xlywjg2y3psljk2kf9xsrixaqwbnnahi0mm5";
13+ sha256 = "087l8qdwfnnklw6zyjwflxh7hyhh4r7wala36cc4lrj7lag2xm9n";
1414 };
1515
16− cargoSha256 = "1hjjw3i35vqr6nxsv2m3izq4x8c2a6wvl5c2kjlpg6shy9j2mjaa";
16+ cargoSha256 = "1ih1p9jdwr1ymq2p6ipz6rybi17f3qn65kn4bqkgzx36afvpnd5l";
1717
1818 nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
1919 buildInputs = lib.optional (!stdenv.isDarwin) openssl;
2020 propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
2121
22+ patches = [
23+ # https://github.com/killercup/cargo-edit/pull/362
24+ ./no_upgrade_index_in_tests.patch
25+ ];
26+
27+ # The default `/build` will fail the test (seems) due to permission problem.
28+ preCheck = ''
29+ export TMPDIR="/tmp"
30+ '';
31+
2232 meta = with lib; {
2333 description = "A utility for managing cargo dependencies from the command line";
2434 homepage = https://github.com/killercup/cargo-edit;
pkgs/tools/package-management/cargo-edit/no_upgrade_index_in_tests.patchnew file+123
@@ -0,0 +1,123 @@
1+diff --git a/src/bin/add/main.rs b/src/bin/add/main.rs
2+index 41cde585..848612b3 100644
3+--- a/src/bin/add/main.rs
4++++ b/src/bin/add/main.rs
5+@@ -87,7 +87,7 @@ fn handle_add(args: &Args) -> Result<()> {
6+ let mut manifest = Manifest::open(manifest_path)?;
7+ let deps = &args.parse_dependencies()?;
8+
9+- if !args.offline {
10++ if !args.offline && std::env::var("CARGO_IS_TEST").is_err() {
11+ let url = registry_url(
12+ &find(&manifest_path)?,
13+ args.registry.as_ref().map(String::as_ref),
14+diff --git a/src/bin/upgrade/main.rs b/src/bin/upgrade/main.rs
15+index cf2414da..c066e6f4 100644
16+--- a/src/bin/upgrade/main.rs
17++++ b/src/bin/upgrade/main.rs
18+@@ -409,7 +409,7 @@ fn process(args: Args) -> Result<()> {
19+ ..
20+ } = args;
21+
22+- if !args.offline && !to_lockfile {
23++ if !args.offline && !to_lockfile && std::env::var("CARGO_IS_TEST").is_err() {
24+ let url = registry_url(&find(&manifest_path)?, None)?;
25+ update_registry_index(&url)?;
26+ }
27+@@ -427,7 +427,7 @@ fn process(args: Args) -> Result<()> {
28+
29+ // Update indices for any alternative registries, unless
30+ // we're offline.
31+- if !args.offline {
32++ if !args.offline && std::env::var("CARGO_IS_TEST").is_err() {
33+ for registry_url in existing_dependencies
34+ .0
35+ .values()
36+diff --git a/tests/cargo-add.rs b/tests/cargo-add.rs
37+index fbdbf4e2..612ffa78 100644
38+--- a/tests/cargo-add.rs
39++++ b/tests/cargo-add.rs
40+@@ -1184,6 +1184,7 @@ fn add_prints_message() {
41+ "--vers=0.6.0",
42+ &format!("--manifest-path={}", manifest),
43+ ])
44++ .with_env(&[("CARGO_IS_TEST", "1")])
45+ .succeeds()
46+ .and()
47+ .stdout()
48+@@ -1204,6 +1205,7 @@ fn add_prints_message_with_section() {
49+ "--vers=0.1.0",
50+ &format!("--manifest-path={}", manifest),
51+ ])
52++ .with_env(&[("CARGO_IS_TEST", "1")])
53+ .succeeds()
54+ .and()
55+ .stdout()
56+@@ -1224,6 +1226,7 @@ fn add_prints_message_for_dev_deps() {
57+ "0.8.0",
58+ &format!("--manifest-path={}", manifest),
59+ ])
60++ .with_env(&[("CARGO_IS_TEST", "1")])
61+ .succeeds()
62+ .and()
63+ .stdout()
64+@@ -1244,6 +1247,7 @@ fn add_prints_message_for_build_deps() {
65+ "0.1.0",
66+ &format!("--manifest-path={}", manifest),
67+ ])
68++ .with_env(&[("CARGO_IS_TEST", "1")])
69+ .succeeds()
70+ .and()
71+ .stdout()
72+diff --git a/tests/cargo-upgrade.rs b/tests/cargo-upgrade.rs
73+index b11a88dc..cf117940 100644
74+--- a/tests/cargo-upgrade.rs
75++++ b/tests/cargo-upgrade.rs
76+@@ -385,6 +385,7 @@ fn upgrade_workspace() {
77+
78+ /// Detect if attempting to run against a workspace root and give a helpful warning.
79+ #[test]
80++#[cfg(feature = "test-external-apis")]
81+ fn detect_workspace() {
82+ let (_tmpdir, root_manifest, _workspace_manifests) = copy_workspace_test();
83+
84+@@ -414,6 +415,7 @@ fn invalid_manifest() {
85+ "--manifest-path",
86+ &manifest,
87+ ])
88++ .with_env(&[("CARGO_IS_TEST", "1")])
89+ .fails_with(1)
90+ .and()
91+ .stderr()
92+@@ -442,6 +444,7 @@ fn invalid_root_manifest() {
93+ "--manifest-path",
94+ &manifest,
95+ ])
96++ .with_env(&[("CARGO_IS_TEST", "1")])
97+ .fails_with(1)
98+ .and()
99+ .stderr()
100+@@ -457,6 +460,7 @@ fn unknown_flags() {
101+ "foo",
102+ "--flag",
103+ ])
104++ .with_env(&[("CARGO_IS_TEST", "1")])
105+ .fails_with(1)
106+ .and()
107+ .stderr()
108+@@ -473,6 +477,7 @@ For more information try --help ",
109+
110+ // Verify that an upgraded Cargo.toml matches what we expect.
111+ #[test]
112++#[cfg(feature = "test-external-apis")]
113+ fn upgrade_to_lockfile() {
114+ let (tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.lockfile_source");
115+ fs::copy(
116+@@ -489,6 +494,7 @@ fn upgrade_to_lockfile() {
117+ }
118+
119+ #[test]
120++#[cfg(feature = "test-external-apis")]
121+ fn upgrade_workspace_to_lockfile() {
122+ let (tmpdir, root_manifest, _workspace_manifests) = copy_workspace_test();
123+
pkgs/tools/package-management/pacman/default.nix+6−6
@@ -1,13 +1,13 @@
1−{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
2−zlib, bzip2, lzma, curl, runtimeShell }:
1+{ stdenv, lib, fetchurl, pkgconfig, perl, libarchive, openssl, zlib, bzip2,
2+lzma, curl, runtimeShell }:
33
44stdenv.mkDerivation rec {
55 pname = "pacman";
6− version = "5.1.3";
6+ version = "5.2.1";
77
88 src = fetchurl {
9− url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz";
10− sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
9+ url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.gz";
10+ sha256 = "04pkb8qvkldrayfns8cx4fljl4lyys1dqvlf7b5kkl2z4q3w8c0r";
1111 };
1212
1313 enableParallelBuilding = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
2525
26− nativeBuildInputs = [ autoreconfHook pkgconfig ];
26+ nativeBuildInputs = [ pkgconfig ];
2727 buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
2828
2929 postFixup = ''
pkgs/tools/security/pius/default.nix+1−1
@@ -36,6 +36,6 @@ python3Packages.buildPythonApplication {
3636 license = stdenv.lib.licenses.gpl2;
3737
3838 platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
39− maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ];
39+ maintainers = with stdenv.lib.maintainers; [ kierdavis ];
4040 };
4141}
pkgs/tools/security/stoken/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 description = "Software Token for Linux/UNIX";
3131 homepage = https://github.com/cernekee/stoken;
3232 license = licenses.lgpl21Plus;
33− maintainers = [ maintainers.fuuzetsu ];
33+ maintainers = [ ];
3434 platforms = platforms.all;
3535 };
3636}
pkgs/tools/typesetting/tex/texlive/bin.nix+1−1
@@ -178,7 +178,7 @@ core = stdenv.mkDerivation rec {
178178 '' + cleanBrokenLinks;
179179
180180 # needed for poppler and xpdf
181− CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
181+ CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
182182
183183 setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)
184184 passthru = { inherit version buildInputs; };
pkgs/top-level/all-packages.nix+48−6
@@ -915,6 +915,8 @@ in
915915
916916 glyr = callPackage ../tools/audio/glyr { };
917917
918+ hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
919+
918920 httperf = callPackage ../tools/networking/httperf { };
919921
920922 ili2c = callPackage ../tools/misc/ili2c { };
@@ -5783,6 +5785,8 @@ in
57835785
57845786 pastebinit = callPackage ../tools/misc/pastebinit { };
57855787
5788+ pmacct = callPackage ../tools/networking/pmacct { };
5789+
57865790 polygraph = callPackage ../tools/networking/polygraph { };
57875791
57885792 progress = callPackage ../tools/misc/progress { };
@@ -6938,6 +6942,11 @@ in
69386942
69396943 vifm = callPackage ../applications/misc/vifm { };
69406944
6945+ vifm-full = callPackage ../applications/misc/vifm {
6946+ mediaSupport = true;
6947+ inherit lib udisks2 python3;
6948+ };
6949+
69416950 viking = callPackage ../applications/misc/viking {
69426951 inherit (gnome2) scrollkeeper;
69436952 };
@@ -8730,9 +8739,7 @@ in
87308739 shmig = callPackage ../development/tools/database/shmig { };
87318740
87328741 smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
8733− smlnj = if stdenv.isDarwin
8734− then callPackage ../development/compilers/smlnj { }
8735− else pkgsi686Linux.callPackage ../development/compilers/smlnj { };
8742+ smlnj = callPackage ../development/compilers/smlnj { };
87368743
87378744 solc = callPackage ../development/compilers/solc { };
87388745
@@ -9091,6 +9098,10 @@ in
90919098 php = php73;
90929099 });
90939100
9101+ php74Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
9102+ php = php74;
9103+ });
9104+
90949105 phpPackages-unit = php72Packages-unit;
90959106
90969107 php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
@@ -9101,11 +9112,16 @@ in
91019112 php = php73-unit;
91029113 });
91039114
9115+ php74Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
9116+ php = php74-unit;
9117+ });
9118+
91049119 inherit (callPackages ../development/interpreters/php {
91059120 stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
91069121 })
9107− php72
9108− php73;
9122+ php74
9123+ php73
9124+ php72;
91099125
91109126 php-embed = php73-embed;
91119127
@@ -9119,6 +9135,11 @@ in
91199135 config.php.apxs2 = false;
91209136 };
91219137
9138+ php74-embed = php74.override {
9139+ config.php.embed = true;
9140+ config.php.apxs2 = false;
9141+ };
9142+
91229143 php-unit = php73-unit;
91239144
91249145 php72-unit = php72.override {
@@ -9139,6 +9160,15 @@ in
91399160 config.php.fpm = false;
91409161 };
91419162
9163+ php74-unit = php74.override {
9164+ config.php.embed = true;
9165+ config.php.apxs2 = false;
9166+ config.php.systemd = false;
9167+ config.php.phpdbg = false;
9168+ config.php.cgi = false;
9169+ config.php.fpm = false;
9170+ };
9171+
91429172 picoc = callPackage ../development/interpreters/picoc {};
91439173
91449174 picolisp = callPackage ../development/interpreters/picolisp {};
@@ -17809,6 +17839,8 @@ in
1780917839
1781017840 airwave = callPackage ../applications/audio/airwave { };
1781117841
17842+ akira-unstable = callPackage ../applications/graphics/akira { };
17843+
1781217844 alembic = callPackage ../development/libraries/alembic {};
1781317845
1781417846 alchemy = callPackage ../applications/graphics/alchemy { };
@@ -19180,6 +19212,10 @@ in
1918019212
1918119213 gv = callPackage ../applications/misc/gv { };
1918219214
19215+ gvisor = callPackage ../applications/virtualization/gvisor { };
19216+
19217+ gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };
19218+
1918319219 guvcview = callPackage ../os-specific/linux/guvcview { };
1918419220
1918519221 gxmessage = callPackage ../applications/misc/gxmessage { };
@@ -22333,7 +22369,11 @@ in
2233322369 clightning = callPackage ../applications/blockchains/clightning.nix { };
2233422370
2233522371 bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
22336− bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; };
22372+ bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix {
22373+ boost = boost165;
22374+ mkDerivation = stdenv.mkDerivation;
22375+ withGui = false;
22376+ };
2233722377
2233822378 bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix {
2233922379 inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
@@ -24756,6 +24796,8 @@ in
2475624796 inherit (darwin.apple_sdk.frameworks) Security;
2475724797 };
2475824798
24799+ nix-linter = haskellPackages.callPackage ../development/tools/analysis/nix-linter { };
24800+
2475924801 nix-pin = callPackage ../tools/package-management/nix-pin { };
2476024802
2476124803 nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };
pkgs/top-level/ocaml-packages.nix+6
@@ -464,6 +464,12 @@ let
464464
465465 merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
466466
467+ metrics = callPackage ../development/ocaml-modules/metrics { };
468+
469+ metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
470+
471+ metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { };
472+
467473 mezzo = callPackage ../development/compilers/mezzo { };
468474
469475 minisat = callPackage ../development/ocaml-modules/minisat { };
pkgs/top-level/php-packages.nix+14−4
@@ -14,12 +14,13 @@ let
1414 });
1515
1616 isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
17+ isPhp74 = pkgs.lib.versionAtLeast php.version "7.4";
1718
1819 apcu = buildPecl {
19− version = "5.1.17";
20+ version = "5.1.18";
2021 pname = "apcu";
2122
22− sha256 = "14y7alvj5q17q1b544bxidavkn6i40cjbq2nv1m0k70ai5vv84bb";
23+ sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl";
2324
2425 buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
2526 doCheck = true;
@@ -140,6 +141,8 @@ let
140141 AC_MSG_WARN([Cannot find igbinary.h])
141142 '')
142143 ];
144+
145+ meta.broken = isPhp74; # Build error
143146 };
144147
145148 event = buildPecl {
@@ -259,6 +262,8 @@ let
259262 pname = "pcs";
260263
261264 sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
265+
266+ meta.broken = isPhp74; # Build error
262267 };
263268
264269 pdo_sqlsrv = buildPecl {
@@ -268,6 +273,8 @@ let
268273 sha256 = "02ill1iqffa5fha9iz4y91823scml24ikfk8pn90jyycfwv07x6a";
269274
270275 buildInputs = [ pkgs.unixODBC ];
276+
277+ meta.broken = isPhp74; # Build error
271278 };
272279
273280 php-cs-fixer = mkDerivation rec {
@@ -492,6 +499,7 @@ let
492499 '';
493500 license = licenses.bsd3;
494501 homepage = "https://developers.google.com/protocol-buffers/";
502+ broken = isPhp74; # Build error
495503 };
496504 };
497505
@@ -592,6 +600,8 @@ let
592600 sha256 = "0ial621zxn9zvjh7k1h755sm2lc9aafc389yxksqcxcmm7kqmd0a";
593601
594602 buildInputs = [ pkgs.unixODBC ];
603+
604+ meta.broken = isPhp74; # Build error
595605 };
596606
597607 v8 = buildPecl {
@@ -617,10 +627,10 @@ let
617627 };
618628
619629 xdebug = buildPecl {
620− version = "2.7.1";
630+ version = "2.8.0";
621631 pname = "xdebug";
622632
623− sha256 = "1hr4gy87a3gp682ggwp831xk1fxasil9wan8cxv23q3m752x3sdp";
633+ sha256 = "0r62501fdp63zz81scz2x1pq3qzpjafya96g12j0jx7crdz127fb";
624634
625635 doCheck = true;
626636 checkTarget = "test";
pkgs/top-level/python-packages.nix+4
@@ -1138,6 +1138,8 @@ in {
11381138
11391139 pytesseract = callPackage ../development/python-modules/pytesseract { };
11401140
1141+ pytest-bdd = callPackage ../development/python-modules/pytest-bdd { };
1142+
11411143 pytest-black = callPackage ../development/python-modules/pytest-black { };
11421144
11431145 pytest-click = callPackage ../development/python-modules/pytest-click { };
@@ -3274,6 +3276,8 @@ in {
32743276
32753277 flask_elastic = callPackage ../development/python-modules/flask-elastic { };
32763278
3279+ flask-httpauth = callPackage ../development/python-modules/flask-httpauth { };
3280+
32773281 flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { };
32783282
32793283 flask-limiter = callPackage ../development/python-modules/flask-limiter { };