git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit0a874ff2a6dad9d2693f08a733d58f8077f36916 authorFrederik Rietdijk <fridh@fridh.nl> dateMon 24 Aug 2020, 11:50 (6 years ago) parent91104b5bc00ece
139 files changed+1639−846
.github/CODEOWNERS+1 maintainers/maintainer-list.nix+24 nixos/doc/manual/release-notes/rl-2009.xml+10−1 nixos/lib/eval-config.nix+2−2 nixos/lib/test-driver/test-driver.py+5−2 nixos/modules/services/misc/ssm-agent.nix+4−2 nixos/modules/services/monitoring/prometheus/default.nix+25−2 nixos/modules/virtualisation/docker-preloader.nix−134 nixos/modules/virtualisation/qemu-vm.nix−1 nixos/tests/all-tests.nix+3−3 nixos/tests/common/ec2.nix+36−22 nixos/tests/containers-reloadable.nix+2−2 nixos/tests/cri-o.nix+19 nixos/tests/docker-preloader.nix−27 nixos/tests/ec2.nix+72−68 nixos/tests/gnome3.nix+7−3 nixos/tests/hardened.nix+59−55 nixos/tests/hocker-fetchdocker/default.nix+5−4 nixos/tests/installer.nix+1−1 nixos/tests/openstack-image.nix+37−33 pkgs/applications/blockchains/clightning.nix+2−2 pkgs/applications/gis/gmt/dcw.nix+32 pkgs/applications/gis/gmt/default.nix+73 pkgs/applications/gis/gmt/gshhg.nix+31 pkgs/applications/graphics/write_stylus/default.nix+9−13 pkgs/applications/misc/html5validator/default.nix+25 pkgs/applications/misc/snowsql/default.nix+50 pkgs/applications/misc/super_user_spark/default.nix−32 pkgs/applications/networking/browsers/opera/default.nix+2−2 pkgs/applications/networking/cluster/argo/default.nix+3−3 pkgs/applications/networking/cluster/cni/plugins.nix+1−1 pkgs/applications/networking/cluster/helmfile/default.nix+3−3 pkgs/applications/networking/cluster/ssm-agent/default.nix+40−7 pkgs/applications/networking/instant-messengers/ytalk/default.nix+21 pkgs/applications/networking/nextdns/default.nix+2−2 pkgs/applications/office/espanso/default.nix+3−3 pkgs/applications/science/biology/igv/default.nix+12−10 pkgs/applications/science/electronics/kicad/base.nix+1−1 pkgs/applications/science/electronics/kicad/default.nix+1−1 pkgs/applications/science/electronics/kicad/libraries.nix+4−2 pkgs/applications/science/electronics/kicad/versions.nix+12−12 pkgs/applications/science/electronics/verilator/default.nix+15−8 pkgs/applications/science/logic/isabelle/default.nix+11−11 pkgs/applications/science/logic/mcy/default.nix+3−3 pkgs/applications/science/logic/symbiyosys/default.nix+15−10 pkgs/applications/science/math/qalculate-gtk/default.nix+4 pkgs/applications/version-management/git-and-tools/default.nix+1−1 pkgs/applications/version-management/git-and-tools/fast-export/default.nix+30−6 pkgs/applications/virtualization/conmon/default.nix+1−1 pkgs/applications/virtualization/containerd/default.nix+2−2 pkgs/applications/virtualization/cri-o/default.nix+3 pkgs/applications/virtualization/cri-o/wrapper.nix+1−1 pkgs/applications/virtualization/crun/default.nix+1−1 pkgs/applications/virtualization/podman/default.nix+1−1 pkgs/applications/virtualization/qemu/default.nix+2 pkgs/applications/virtualization/runc/default.nix+1−1 pkgs/data/fonts/clearlyU/default.nix+2−9 pkgs/data/fonts/creep/default.nix+1−5 pkgs/data/fonts/dina/default.nix+2−4 pkgs/data/fonts/envypn-font/default.nix+1−5 pkgs/data/fonts/gohufont/default.nix+2−9 pkgs/data/fonts/profont/default.nix+1−6 pkgs/data/fonts/siji/default.nix+2−4 pkgs/data/fonts/tamsyn/default.nix+1−5 pkgs/data/fonts/tamzen/default.nix+1−5 pkgs/data/fonts/terminus-font/default.nix+2−4 pkgs/data/fonts/tewi/default.nix+1−7 pkgs/data/fonts/ucs-fonts/default.nix+3−5 pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix+3−3 pkgs/data/fonts/uni-vga/default.nix+3−6 pkgs/data/fonts/unifont/default.nix+2−4 pkgs/data/fonts/uw-ttyp0/default.nix+1−3 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+3−3 pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix+5−7 pkgs/desktops/xfce/applications/xfce4-volumed/default.nix−52 pkgs/desktops/xfce/default.nix−4 pkgs/development/compilers/nextpnr/default.nix+3−3 pkgs/development/compilers/yosys/default.nix+3−3 pkgs/development/coq-modules/coqprime/default.nix+6−4 pkgs/development/interpreters/clojure/default.nix+3−2 pkgs/development/interpreters/groovy/default.nix+2−2 pkgs/development/interpreters/guile/2.0.nix+1−1 pkgs/development/libraries/libguestfs/default.nix+2−2 pkgs/development/libraries/oneDNN/default.nix+2−2 pkgs/development/libraries/openxr-loader/default.nix+2−2 pkgs/development/libraries/science/math/magma/default.nix+7−5 pkgs/development/libraries/tk/generic.nix+1−1 pkgs/development/libraries/utf8proc/default.nix+6 pkgs/development/ocaml-modules/containers/data.nix+18 pkgs/development/ocaml-modules/containers/default.nix+6−8 pkgs/development/ocaml-modules/dune-action-plugin/default.nix+19 pkgs/development/ocaml-modules/dune-glob/default.nix+19 pkgs/development/ocaml-modules/dune-private-libs/default.nix+1−1 pkgs/development/ocaml-modules/hidapi/default.nix+27 pkgs/development/ocaml-modules/ocamlgraph/default.nix+14−14 pkgs/development/ocaml-modules/ocamlgraph/destdir.patch−13 pkgs/development/python-modules/awkward1/default.nix+2−2 pkgs/development/python-modules/gspread/default.nix+2−3 pkgs/development/python-modules/pandas/default.nix+4 pkgs/development/python-modules/pelican/default.nix+12−15 pkgs/development/python-modules/sabyenc3/default.nix+22 pkgs/development/python-modules/test-tube/default.nix+46 pkgs/development/python-modules/userpath/default.nix+30 pkgs/development/tools/analysis/tflint/default.nix+2−2 pkgs/development/tools/bazel-kazel/default.nix+2−2 pkgs/development/tools/cloudfoundry-cli/default.nix+11−4 pkgs/development/tools/database/dbmate/default.nix+3−3 pkgs/development/tools/icestorm/default.nix+4−4 pkgs/development/tools/misc/itm-tools/cargo-lock.patch+321 pkgs/development/tools/misc/itm-tools/default.nix+28 pkgs/development/tools/ocaml/dune/2.nix+3−3 pkgs/development/tools/rust/cargo-cache/default.nix+26 pkgs/development/tools/rust/cargo-fuzz/default.nix+3−1 pkgs/development/tools/rust/maturin/default.nix+3−3 pkgs/development/tools/trellis/default.nix+4−4 pkgs/games/tome2/default.nix+1−1 pkgs/misc/hdt/default.nix+27 pkgs/os-specific/linux/lvm2/default.nix+2−2 pkgs/servers/bazarr/default.nix+3−3 pkgs/servers/rippled/default.nix+11−8 pkgs/servers/sabnzbd/default.nix+20−4 pkgs/servers/sql/dolt/default.nix+3−3 pkgs/tools/X11/wmutils-libwm/default.nix+25 pkgs/tools/X11/xpra/default.nix+4−1 pkgs/tools/admin/lego/default.nix+3−3 pkgs/tools/filesystems/fuse-overlayfs/default.nix+1−1 pkgs/tools/graphics/swfdec/default.nix−37 pkgs/tools/misc/mutagen/default.nix+2−2 pkgs/tools/networking/mailutils/default.nix+1−1 pkgs/tools/networking/slirp4netns/default.nix+1−1 pkgs/tools/security/1password-gui/default.nix+2−2 pkgs/tools/security/creddump/default.nix+36 pkgs/tools/security/ibm-sw-tpm2/default.nix+2−2 pkgs/tools/text/miller/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+40−10 pkgs/top-level/coq-packages.nix+1−1 pkgs/top-level/ocaml-packages.nix+9−1 pkgs/top-level/python-packages.nix+6
.github/CODEOWNERS+1
@@ -198,6 +198,7 @@
198198/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq
199199/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq
200200/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq
201+/nixos/tests/cri-o.nix @NixOS/podman @zowoq
201202/nixos/tests/podman.nix @NixOS/podman @zowoq
202203
203204# Blockchains
maintainers/maintainer-list.nix+24
@@ -472,6 +472,12 @@
472472 githubId = 858965;
473473 name = "Andrew Morsillo";
474474 };
475+ andehen = {
476+ email = "git@andehen.net";
477+ github = "andehen";
478+ githubId = 754494;
479+ name = "Anders Asheim Hennum";
480+ };
475481 andersk = {
476482 email = "andersk@mit.edu";
477483 github = "andersk";
@@ -3349,6 +3355,12 @@
33493355 githubId = 131599;
33503356 name = "Martin Weinelt";
33513357 };
3358+ hh = {
3359+ email = "hh@m-labs.hk";
3360+ github = "HarryMakes";
3361+ githubId = 66358631;
3362+ name = "Harry Ho";
3363+ };
33523364 hhm = {
33533365 email = "heehooman+nixpkgs@gmail.com";
33543366 github = "hhm0";
@@ -8547,6 +8559,12 @@
85478559 githubId = 699403;
85488560 name = "Tomas Vestelind";
85498561 };
8562+ tviti = {
8563+ email = "tviti@hawaii.edu";
8564+ github = "tviti";
8565+ githubId = 2251912;
8566+ name = "Taylor Viti";
8567+ };
85508568 tvorog = {
85518569 email = "marszaripov@gmail.com";
85528570 github = "tvorog";
@@ -9438,4 +9456,10 @@
94389456 github = "fzakaria";
94399457 githubId = 605070;
94409458 };
9459+ yevhenshymotiuk = {
9460+ name = "Yevhen Shymotiuk";
9461+ email = "yevhenshymotiuk@gmail.com";
9462+ github = "yevhenshymotiuk";
9463+ githubId = 44244245;
9464+ };
94419465}
nixos/doc/manual/release-notes/rl-2009.xml+10−1
@@ -128,7 +128,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
128128 </listitem>
129129 <listitem>
130130 <para>
131− Two new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>
131+ The new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>
132132 has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities
133133 like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of
134134 the NixOS configuration: since this can be expensive when a large number of packages are installed, the
@@ -195,6 +195,15 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
195195 The NixOS module system now supports freeform modules as a mix between <literal>types.attrsOf</literal> and <literal>types.submodule</literal>. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See <xref linkend='sec-freeform-modules'/> for how to use them.
196196 </para>
197197 </listitem>
198+ <listitem>
199+ <para>
200+ The GRUB module gained support for basic password protection, which
201+ allows to restrict non-default entries in the boot menu to one or more
202+ users. The users and passwords are defined via the option
203+ <option>boot.loader.grub.users</option>.
204+ Note: Password support is only avaiable in GRUB version 2.
205+ </para>
206+ </listitem>
198207 </itemizedlist>
199208 </section>
200209
nixos/lib/eval-config.nix+2−2
@@ -24,11 +24,11 @@
2424 check ? true
2525, prefix ? []
2626, lib ? import ../../lib
27+, extraModules ? let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
28+ in if e == "" then [] else [(import e)]
2729}:
2830
2931let extraArgs_ = extraArgs; pkgs_ = pkgs;
30− extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
31− in if e == "" then [] else [(import e)];
3232in
3333
3434let
nixos/lib/test-driver/test-driver.py+5−2
@@ -424,15 +424,18 @@ class Machine:
424424 output += out
425425 return output
426426
427− def fail(self, *commands: str) -> None:
427+ def fail(self, *commands: str) -> str:
428428 """Execute each command and check that it fails."""
429+ output = ""
429430 for command in commands:
430431 with self.nested("must fail: {}".format(command)):
431− status, output = self.execute(command)
432+ (status, out) = self.execute(command)
432433 if status == 0:
433434 raise Exception(
434435 "command `{}` unexpectedly succeeded".format(command)
435436 )
437+ output += out
438+ return output
436439
437440 def wait_until_succeeds(self, command: str) -> str:
438441 """Wait until a command returns success and return its output.
nixos/modules/services/misc/ssm-agent.nix+4−2
@@ -29,13 +29,15 @@ in {
2929
3030 config = mkIf cfg.enable {
3131 systemd.services.ssm-agent = {
32+ users.extraUsers.ssm-user = {};
33+
3234 inherit (cfg.package.meta) description;
3335 after = [ "network.target" ];
3436 wantedBy = [ "multi-user.target" ];
3537
36− path = [ fake-lsb-release ];
38+ path = [ fake-lsb-release pkgs.coreutils ];
3739 serviceConfig = {
38− ExecStart = "${cfg.package}/bin/agent";
40+ ExecStart = "${cfg.package}/bin/amazon-ssm-agent";
3941 KillMode = "process";
4042 Restart = "on-failure";
4143 RestartSec = "15min";
nixos/modules/services/monitoring/prometheus/default.nix+25−2
@@ -46,7 +46,7 @@ let
4646 cmdlineArgs = cfg.extraFlags ++ [
4747 "--storage.tsdb.path=${workingDir}/data/"
4848 "--config.file=${prometheusYml}"
49− "--web.listen-address=${cfg.listenAddress}"
49+ "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
5050 "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
5151 "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
5252 ] ++
@@ -489,9 +489,17 @@ in {
489489 '';
490490 };
491491
492+ port = mkOption {
493+ type = types.port;
494+ default = 9090;
495+ description = ''
496+ Port to listen on.
497+ '';
498+ };
499+
492500 listenAddress = mkOption {
493501 type = types.str;
494− default = "0.0.0.0:9090";
502+ default = "0.0.0.0";
495503 description = ''
496504 Address to listen on for the web interface, API, and telemetry.
497505 '';
@@ -619,6 +627,21 @@ in {
619627 };
620628
621629 config = mkIf cfg.enable {
630+ assertions = [
631+ ( let
632+ legacy = builtins.match "(.*):(.*)" cfg.listenAddress;
633+ in {
634+ assertion = legacy == null;
635+ message = ''
636+ Do not specify the port for Prometheus to listen on in the
637+ listenAddress option; use the port option instead:
638+ services.prometheus.listenAddress = ${builtins.elemAt legacy 0};
639+ services.prometheus.port = ${builtins.elemAt legacy 1};
640+ '';
641+ }
642+ )
643+ ];
644+
622645 users.groups.prometheus.gid = config.ids.gids.prometheus;
623646 users.users.prometheus = {
624647 description = "Prometheus daemon user";
nixos/modules/virtualisation/docker-preloader.nixdeleted−134
@@ -1,134 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−with builtins;
5−
6−let
7− cfg = config.virtualisation;
8−
9− sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName;
10− hash = drv: head (split "-" (baseNameOf drv.outPath));
11− # The label of an ext4 FS is limited to 16 bytes
12− labelFromImage = image: substring 0 16 (hash image);
13−
14− # The Docker image is loaded and some files from /var/lib/docker/
15− # are written into a qcow image.
16− preload = image: pkgs.vmTools.runInLinuxVM (
17− pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" {
18− buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ];
19− preVM = pkgs.vmTools.createEmptyImage {
20− size = cfg.dockerPreloader.qcowSize;
21− fullName = "docker-deamon-image.qcow2";
22− };
23− }
24− ''
25− mkfs.ext4 /dev/vda
26− e2label /dev/vda ${labelFromImage image}
27− mkdir -p /var/lib/docker
28− mount -t ext4 /dev/vda /var/lib/docker
29−
30− modprobe overlay
31−
32− # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
33− mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
34− cd /sys/fs/cgroup
35− for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
36− mkdir -p $sys
37− if ! mountpoint -q $sys; then
38− if ! mount -n -t cgroup -o $sys cgroup $sys; then
39− rmdir $sys || true
40− fi
41− fi
42− done
43−
44− dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
45−
46− until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
47− printf '.'
48− sleep 1
49− done
50−
51− docker load -i ${image}
52−
53− kill %1
54− find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf
55− '');
56−
57− preloadedImages = map preload cfg.dockerPreloader.images;
58−
59−in
60−
61−{
62− options.virtualisation.dockerPreloader = {
63− images = mkOption {
64− default = [ ];
65− type = types.listOf types.package;
66− description =
67− ''
68− A list of Docker images to preload (in the /var/lib/docker directory).
69− '';
70− };
71− qcowSize = mkOption {
72− default = 1024;
73− type = types.int;
74− description =
75− ''
76− The size (MB) of qcow files.
77− '';
78− };
79− };
80−
81− config = mkIf (cfg.dockerPreloader.images != []) {
82− assertions = [{
83− # If docker.storageDriver is null, Docker choose the storage
84− # driver. So, in this case, we cannot be sure overlay2 is used.
85− assertion = cfg.docker.storageDriver == "overlay2"
86− || cfg.docker.storageDriver == "overlay"
87− || cfg.docker.storageDriver == null;
88− message = "The Docker image Preloader only works with overlay2 storage driver!";
89− }];
90−
91− virtualisation.qemu.options =
92− map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2")
93− preloadedImages;
94−
95−
96− # All attached QCOW files are mounted and their contents are linked
97− # to /var/lib/docker/ in order to make image available.
98− systemd.services.docker-preloader = {
99− description = "Preloaded Docker images";
100− wantedBy = ["docker.service"];
101− after = ["network.target"];
102− path = with pkgs; [ mount rsync jq ];
103− script = ''
104− mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2
105− echo '{}' > /tmp/repositories.json
106−
107− for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do
108− mkdir -p /mnt/docker-images/$i
109−
110− # The ext4 label is limited to 16 bytes
111− mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i
112−
113− find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\
114− -exec ln -s '{}' /var/lib/docker/overlay2/ \;
115− cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/
116−
117− rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/
118−
119− # Accumulate image definitions
120− cp /tmp/repositories.json /tmp/repositories.json.tmp
121− jq -s '.[0] * .[1]' \
122− /tmp/repositories.json.tmp \
123− /mnt/docker-images/$i/image/overlay2/repositories.json \
124− > /tmp/repositories.json
125− done
126−
127− mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json
128− '';
129− serviceConfig = {
130− Type = "oneshot";
131− };
132− };
133− };
134−}
nixos/modules/virtualisation/qemu-vm.nix−1
@@ -264,7 +264,6 @@ in
264264{
265265 imports = [
266266 ../profiles/qemu-guest.nix
267− ./docker-preloader.nix
268267 ];
269268
270269 options = {
nixos/tests/all-tests.nix+3−3
@@ -66,11 +66,13 @@ in
6666 containers-macvlans = handleTest ./containers-macvlans.nix {};
6767 containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};
6868 containers-portforward = handleTest ./containers-portforward.nix {};
69+ containers-reloadable = handleTest ./containers-reloadable.nix {};
6970 containers-restart_networking = handleTest ./containers-restart_networking.nix {};
7071 containers-tmpfs = handleTest ./containers-tmpfs.nix {};
7172 convos = handleTest ./convos.nix {};
7273 corerad = handleTest ./corerad.nix {};
7374 couchdb = handleTest ./couchdb.nix {};
75+ cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
7476 deluge = handleTest ./deluge.nix {};
7577 dhparams = handleTest ./dhparams.nix {};
7678 dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
@@ -79,15 +81,13 @@ in
7981 docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
8082 oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
8183 docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};
82− docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {};
8384 docker-registry = handleTest ./docker-registry.nix {};
8485 docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
8586 docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
8687 documize = handleTest ./documize.nix {};
8788 dokuwiki = handleTest ./dokuwiki.nix {};
8889 dovecot = handleTest ./dovecot.nix {};
89− # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access
90− #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
90+ ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
9191 ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};
9292 ecryptfs = handleTest ./ecryptfs.nix {};
9393 ejabberd = handleTest ./xmpp/ejabberd.nix {};
nixos/tests/common/ec2.nix+36−22
@@ -20,30 +20,44 @@ with pkgs.lib;
2020 in makeTest {
2121 name = "ec2-" + name;
2222 nodes = {};
23− testScript =
24− ''
25− my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine";
26− mkdir $imageDir, 0700;
27− my $diskImage = "$imageDir/machine.qcow2";
28− system("qemu-img create -f qcow2 -o backing_file=${image} $diskImage") == 0 or die;
29− system("qemu-img resize $diskImage 10G") == 0 or die;
23+ testScript = ''
24+ import os
25+ import subprocess
3026
31− # Note: we use net=169.0.0.0/8 rather than
32− # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
33− # confused. (It would get a DHCP lease in the 169.254.*
34− # range, which it would then configure and prompty delete
35− # again when it deletes link-local addresses.) Ideally we'd
36− # turn off the DHCP server, but qemu does not have an option
37− # to do that.
38− my $startCommand = "qemu-kvm -m 1024";
39− $startCommand .= " -device virtio-net-pci,netdev=vlan0";
40− $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
41− $startCommand .= " -drive file=$diskImage,if=virtio,werror=report";
42− $startCommand .= " \$QEMU_OPTS";
27+ image_dir = os.path.join(
28+ os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine"
29+ )
30+ os.makedirs(image_dir, mode=0o700, exist_ok=True)
31+ disk_image = os.path.join(image_dir, "machine.qcow2")
32+ subprocess.check_call(
33+ [
34+ "qemu-img",
35+ "create",
36+ "-f",
37+ "qcow2",
38+ "-o",
39+ "backing_file=${image}",
40+ disk_image,
41+ ]
42+ )
43+ subprocess.check_call(["qemu-img", "resize", disk_image, "10G"])
4344
44− my $machine = createMachine({ startCommand => $startCommand });
45+ # Note: we use net=169.0.0.0/8 rather than
46+ # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
47+ # confused. (It would get a DHCP lease in the 169.254.*
48+ # range, which it would then configure and prompty delete
49+ # again when it deletes link-local addresses.) Ideally we'd
50+ # turn off the DHCP server, but qemu does not have an option
51+ # to do that.
52+ start_command = (
53+ "qemu-kvm -m 1024"
54+ + " -device virtio-net-pci,netdev=vlan0"
55+ + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"
56+ + f" -drive file={disk_image},if=virtio,werror=report"
57+ + " $QEMU_OPTS"
58+ )
4559
46− ${script}
47− '';
60+ machine = create_machine({"startCommand": start_command})
61+ '' + script;
4862 };
4963}
nixos/tests/containers-reloadable.nix+2−2
@@ -9,13 +9,13 @@ let
99 };
1010 };
1111
12− # prevent make-test.nix to change IP
12+ # prevent make-test-python.nix to change IP
1313 networking.interfaces = {
1414 eth1.ipv4.addresses = lib.mkOverride 0 [ ];
1515 };
1616 };
1717in {
18− name = "cotnainers-reloadable";
18+ name = "containers-reloadable";
1919 meta = with pkgs.stdenv.lib.maintainers; {
2020 maintainers = [ danbst ];
2121 };
nixos/tests/cri-o.nixnew file+19
@@ -0,0 +1,19 @@
1+# This test runs CRI-O and verifies via critest
2+import ./make-test-python.nix ({ pkgs, ... }: {
3+ name = "cri-o";
4+ maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members;
5+
6+ nodes = {
7+ crio = {
8+ virtualisation.cri-o.enable = true;
9+ };
10+ };
11+
12+ testScript = ''
13+ start_all()
14+ crio.wait_for_unit("crio.service")
15+ crio.succeed(
16+ "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock"
17+ )
18+ '';
19+})
nixos/tests/docker-preloader.nixdeleted−27
@@ -1,27 +0,0 @@
1−import ./make-test.nix ({ pkgs, ...} : {
2− name = "docker-preloader";
3− meta = with pkgs.stdenv.lib.maintainers; {
4− maintainers = [ lewo ];
5− };
6−
7− nodes = {
8− docker =
9− { pkgs, ... }:
10− {
11− virtualisation.docker.enable = true;
12− virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ];
13−
14− services.openssh.enable = true;
15− services.openssh.permitRootLogin = "yes";
16− services.openssh.extraConfig = "PermitEmptyPasswords yes";
17− users.extraUsers.root.password = "";
18− };
19− };
20− testScript = ''
21− startAll;
22−
23− $docker->waitForUnit("sockets.target");
24− $docker->succeed("docker run nix nix-store --version");
25− $docker->succeed("docker run bash bash --version");
26− '';
27−})
nixos/tests/ec2.nix+72−68
@@ -3,58 +3,58 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77with pkgs.lib;
88
99with import common/ec2.nix { inherit makeTest pkgs; };
1010
1111let
12− imageCfg =
13− (import ../lib/eval-config.nix {
14− inherit system;
15− modules = [
16− ../maintainers/scripts/ec2/amazon-image.nix
17− ../modules/testing/test-instrumentation.nix
18− ../modules/profiles/qemu-guest.nix
19− { ec2.hvm = true;
20−
21− # Hack to make the partition resizing work in QEMU.
22− boot.initrd.postDeviceCommands = mkBefore
23− ''
24− ln -s vda /dev/xvda
25− ln -s vda1 /dev/xvda1
26− '';
27−
28− # Needed by nixos-rebuild due to the lack of network
29− # access. Determined by trial and error.
30− system.extraDependencies =
31− with pkgs; (
32− [
33− # Needed for a nixos-rebuild.
34− busybox
35− stdenv
36− stdenvNoCC
37− mkinitcpio-nfs-utils
38− unionfs-fuse
39− cloud-utils
40− desktop-file-utils
41− texinfo
42− libxslt.bin
43− xorg.lndir
44−
45− # These are used in the configure-from-userdata tests
46− # for EC2. Httpd and valgrind are requested by the
47− # configuration.
48− apacheHttpd apacheHttpd.doc apacheHttpd.man valgrind.doc
49− ]
50− );
51− }
52− ];
53− }).config;
12+ imageCfg = (import ../lib/eval-config.nix {
13+ inherit system;
14+ modules = [
15+ ../maintainers/scripts/ec2/amazon-image.nix
16+ ../modules/testing/test-instrumentation.nix
17+ ../modules/profiles/qemu-guest.nix
18+ {
19+ ec2.hvm = true;
20+
21+ # Hack to make the partition resizing work in QEMU.
22+ boot.initrd.postDeviceCommands = mkBefore ''
23+ ln -s vda /dev/xvda
24+ ln -s vda1 /dev/xvda1
25+ '';
26+
27+ # Needed by nixos-rebuild due to the lack of network
28+ # access. Determined by trial and error.
29+ system.extraDependencies = with pkgs; ( [
30+ # Needed for a nixos-rebuild.
31+ busybox
32+ cloud-utils
33+ desktop-file-utils
34+ libxslt.bin
35+ mkinitcpio-nfs-utils
36+ stdenv
37+ stdenvNoCC
38+ texinfo
39+ unionfs-fuse
40+ xorg.lndir
41+
42+ # These are used in the configure-from-userdata tests
43+ # for EC2. Httpd and valgrind are requested by the
44+ # configuration.
45+ apacheHttpd
46+ apacheHttpd.doc
47+ apacheHttpd.man
48+ valgrind.doc
49+ ]);
50+ }
51+ ];
52+ }).config;
5453 image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd";
5554
5655 sshKeys = import ./ssh-keys.nix pkgs;
5756 snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
57+ snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey;
5858 snakeOilPublicKey = sshKeys.snakeOilPublicKey;
5959
6060in {
@@ -68,43 +68,47 @@ in {
6868 SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey}
6969 '';
7070 script = ''
71− $machine->start;
72− $machine->waitForFile("/etc/ec2-metadata/user-data");
73− $machine->waitForUnit("sshd.service");
71+ machine.start()
72+ machine.wait_for_file("/etc/ec2-metadata/user-data")
73+ machine.wait_for_unit("sshd.service")
7474
75− $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path");
75+ machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path")
7676
7777 # We have no keys configured on the client side yet, so this should fail
78− $machine->fail("ssh -o BatchMode=yes localhost exit");
78+ machine.fail("ssh -o BatchMode=yes localhost exit")
7979
8080 # Let's install our client private key
81− $machine->succeed("mkdir -p ~/.ssh");
81+ machine.succeed("mkdir -p ~/.ssh")
8282
83− $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519");
84− $machine->succeed("chmod 600 ~/.ssh/id_ed25519");
83+ machine.copy_from_host_via_shell(
84+ "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519"
85+ )
86+ machine.succeed("chmod 600 ~/.ssh/id_ed25519")
8587
8688 # We haven't configured the host key yet, so this should still fail
87− $machine->fail("ssh -o BatchMode=yes localhost exit");
89+ machine.fail("ssh -o BatchMode=yes localhost exit")
8890
8991 # Add the host key; ssh should finally succeed
90− $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts");
91− $machine->succeed("ssh -o BatchMode=yes localhost exit");
92+ machine.succeed(
93+ "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"
94+ )
95+ machine.succeed("ssh -o BatchMode=yes localhost exit")
9296
9397 # Test whether the root disk was resized.
94− my $blocks = $machine->succeed("stat -c %b -f /");
95− my $bsize = $machine->succeed("stat -c %S -f /");
96− my $size = $blocks * $bsize;
97− die "wrong free space $size" if $size < 9.7 * 1024 * 1024 * 1024 || $size > 10 * 1024 * 1024 * 1024;
98+ blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":"))
99+ GB = 1024 ** 3
100+ assert 9.7 * GB <= blocks * block_size <= 10 * GB
98101
99102 # Just to make sure resizing is idempotent.
100− $machine->shutdown;
101− $machine->start;
102− $machine->waitForFile("/etc/ec2-metadata/user-data");
103+ machine.shutdown()
104+ machine.start()
105+ machine.wait_for_file("/etc/ec2-metadata/user-data")
103106 '';
104107 };
105108
106109 boot-ec2-config = makeEc2Test {
107110 name = "config-userdata";
111+ meta.broken = true; # amazon-init wants to download from the internet while building the system
108112 inherit image;
109113 sshPublicKey = snakeOilPublicKey;
110114
@@ -133,17 +137,17 @@ in {
133137 }
134138 '';
135139 script = ''
136− $machine->start;
140+ machine.start()
137141
138142 # amazon-init must succeed. if it fails, make the test fail
139− # immediately instead of timing out in waitForFile.
140− $machine->waitForUnit('amazon-init.service');
143+ # immediately instead of timing out in wait_for_file.
144+ machine.wait_for_unit("amazon-init.service")
141145
142− $machine->waitForFile("/etc/testFile");
143− $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
146+ machine.wait_for_file("/etc/testFile")
147+ assert "whoa" in machine.succeed("cat /etc/testFile")
144148
145− $machine->waitForUnit("httpd.service");
146− $machine->succeed("curl http://localhost | grep Valgrind");
149+ machine.wait_for_unit("httpd.service")
150+ assert "Valgrind" in machine.succeed("curl http://localhost")
147151 '';
148152 };
149153}
nixos/tests/gnome3.nix+7−3
@@ -23,6 +23,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
2323 services.xserver.desktopManager.gnome3.enable = true;
2424 services.xserver.desktopManager.gnome3.debug = true;
2525
26+ environment.systemPackages = [
27+ (pkgs.makeAutostartItem {
28+ name = "org.gnome.Terminal";
29+ package = pkgs.gnome3.gnome-terminal;
30+ })
31+ ];
32+
2633 virtualisation.memorySize = 1024;
2734 };
2835
@@ -65,9 +72,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
6572 )
6673
6774 with subtest("Open Gnome Terminal"):
68− machine.succeed(
69− "${gnomeTerminalCommand}"
70− )
7175 # correct output should be (true, '"gnome-terminal-server"')
7276 machine.wait_until_succeeds(
7377 "${wmClass} | grep -q 'gnome-terminal-server'"
nixos/tests/hardened.nix+59−55
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : {
1+import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
22 name = "hardened";
33 meta = with pkgs.stdenv.lib.maintainers; {
44 maintainers = [ joachifm ];
@@ -47,84 +47,88 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : {
4747 };
4848 in
4949 ''
50− $machine->waitForUnit("multi-user.target");
50+ machine.wait_for_unit("multi-user.target")
51+
52+
53+ with subtest("AppArmor profiles are loaded"):
54+ machine.succeed("systemctl status apparmor.service")
5155
52− subtest "apparmor-loaded", sub {
53− $machine->succeed("systemctl status apparmor.service");
54− };
5556
5657 # AppArmor securityfs
57− subtest "apparmor-securityfs", sub {
58− $machine->succeed("mountpoint -q /sys/kernel/security");
59− $machine->succeed("cat /sys/kernel/security/apparmor/profiles");
60− };
58+ with subtest("AppArmor securityfs is mounted"):
59+ machine.succeed("mountpoint -q /sys/kernel/security")
60+ machine.succeed("cat /sys/kernel/security/apparmor/profiles")
61+
6162
6263 # Test loading out-of-tree modules
63− subtest "extra-module-packages", sub {
64− $machine->succeed("grep -Fq wireguard /proc/modules");
65− };
64+ with subtest("Out-of-tree modules can be loaded"):
65+ machine.succeed("grep -Fq wireguard /proc/modules")
66+
6667
6768 # Test hidepid
68− subtest "hidepid", sub {
69− $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
69+ with subtest("hidepid=2 option is applied and works"):
70+ machine.succeed("grep -Fq hidepid=2 /proc/mounts")
7071 # cannot use pgrep -u here, it segfaults when access to process info is denied
71− $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]");
72− $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]");
73− };
72+ machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]")
73+ machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]")
74+
7475
7576 # Test kernel module hardening
76− subtest "lock-modules", sub {
77+ with subtest("No more kernel modules can be loaded"):
7778 # note: this better a be module we normally wouldn't load ...
78− $machine->fail("modprobe dccp");
79− };
79+ machine.fail("modprobe dccp")
80+
8081
8182 # Test userns
82− subtest "userns", sub {
83− $machine->succeed("unshare --user true");
84− $machine->fail("su -l alice -c 'unshare --user true'");
85− };
83+ with subtest("User namespaces are restricted"):
84+ machine.succeed("unshare --user true")
85+ machine.fail("su -l alice -c 'unshare --user true'")
86+
8687
8788 # Test dmesg restriction
88− subtest "dmesg", sub {
89− $machine->fail("su -l alice -c dmesg");
90− };
89+ with subtest("Regular users cannot access dmesg"):
90+ machine.fail("su -l alice -c dmesg")
91+
9192
9293 # Test access to kcore
93− subtest "kcore", sub {
94− $machine->fail("cat /proc/kcore");
95− };
94+ with subtest("Kcore is inaccessible as root"):
95+ machine.fail("cat /proc/kcore")
96+
9697
9798 # Test deferred mount
98− subtest "mount", sub {
99− $machine->fail("mountpoint -q /efi"); # was deferred
100− $machine->execute("mkdir -p /efi");
101− $machine->succeed("mount /dev/disk/by-label/EFISYS /efi");
102− $machine->succeed("mountpoint -q /efi"); # now mounted
103− };
99+ with subtest("Deferred mounts work"):
100+ machine.fail("mountpoint -q /efi") # was deferred
101+ machine.execute("mkdir -p /efi")
102+ machine.succeed("mount /dev/disk/by-label/EFISYS /efi")
103+ machine.succeed("mountpoint -q /efi") # now mounted
104+
104105
105106 # Test Nix dæmon usage
106− subtest "nix-daemon", sub {
107− $machine->fail("su -l nobody -s /bin/sh -c 'nix ping-store'");
108− $machine->succeed("su -l alice -c 'nix ping-store'") =~ "OK";
109− };
107+ with subtest("nix-daemon cannot be used by all users"):
108+ machine.fail("su -l nobody -s /bin/sh -c 'nix ping-store'")
109+ machine.succeed("su -l alice -c 'nix ping-store'")
110+
110111
111112 # Test kernel image protection
112− subtest "kernelimage", sub {
113− $machine->fail("systemctl hibernate");
114− $machine->fail("systemctl kexec");
115− };
113+ with subtest("The kernel image is protected"):
114+ machine.fail("systemctl hibernate")
115+ machine.fail("systemctl kexec")
116116
117− # Test hardened memory allocator
118− sub runMallocTestProg {
119− my ($progName, $errorText) = @_;
120− my $text = "fatal allocator error: " . $errorText;
121− $machine->fail("${hardened-malloc-tests}/bin/" . $progName) =~ $text;
122− };
123117
124− subtest "hardenedmalloc", sub {
125− runMallocTestProg("double_free_large", "invalid free");
126− runMallocTestProg("unaligned_free_small", "invalid unaligned free");
127− runMallocTestProg("write_after_free_small", "detected write after free");
128− };
118+ # Test hardened memory allocator
119+ def runMallocTestProg(prog_name, error_text):
120+ text = "fatal allocator error: " + error_text
121+ if not text in machine.fail(
122+ "${hardened-malloc-tests}/bin/"
123+ + prog_name
124+ + " 2>&1"
125+ ):
126+ raise Exception("Hardened malloc does not work for {}".format(error_text))
127+
128+
129+ with subtest("The hardened memory allocator works"):
130+ runMallocTestProg("double_free_large", "invalid free")
131+ runMallocTestProg("unaligned_free_small", "invalid unaligned free")
132+ runMallocTestProg("write_after_free_small", "detected write after free")
129133 '';
130134})
nixos/tests/hocker-fetchdocker/default.nix+5−4
@@ -1,15 +1,16 @@
1−import ../make-test.nix ({ pkgs, ...} : {
1+import ../make-test-python.nix ({ pkgs, ...} : {
22 name = "test-hocker-fetchdocker";
33 meta = with pkgs.stdenv.lib.maintainers; {
44 maintainers = [ ixmatus ];
5+ broken = true; # tries to download from registry-1.docker.io - how did this ever work?
56 };
67
78 machine = import ./machine.nix;
89
910 testScript = ''
10− startAll;
11+ start_all()
1112
12− $machine->waitForUnit("sockets.target");
13− $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest");
13+ machine.wait_for_unit("sockets.target")
14+ machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest")
1415 '';
1516})
nixos/tests/installer.nix+1−1
@@ -799,7 +799,7 @@ in {
799799 "btrfs subvol create /mnt/badpath/boot",
800800 "btrfs subvol create /mnt/nixos",
801801 "btrfs subvol set-default "
802− + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
802+ + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print $2}') /mnt",
803803 "umount /mnt",
804804 "mount -o defaults LABEL=root /mnt",
805805 "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism
nixos/tests/openstack-image.nix+37−33
@@ -3,30 +3,30 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77with pkgs.lib;
88
99with import common/ec2.nix { inherit makeTest pkgs; };
1010
1111let
12− image =
13− (import ../lib/eval-config.nix {
14− inherit system;
15− modules = [
16− ../maintainers/scripts/openstack/openstack-image.nix
17− ../modules/testing/test-instrumentation.nix
18− ../modules/profiles/qemu-guest.nix
19− {
20− # Needed by nixos-rebuild due to lack of network access.
21− system.extraDependencies = with pkgs; [
22− stdenv
23− ];
24− }
25− ];
26− }).config.system.build.openstackImage + "/nixos.qcow2";
12+ image = (import ../lib/eval-config.nix {
13+ inherit system;
14+ modules = [
15+ ../maintainers/scripts/openstack/openstack-image.nix
16+ ../modules/testing/test-instrumentation.nix
17+ ../modules/profiles/qemu-guest.nix
18+ {
19+ # Needed by nixos-rebuild due to lack of network access.
20+ system.extraDependencies = with pkgs; [
21+ stdenv
22+ ];
23+ }
24+ ];
25+ }).config.system.build.openstackImage + "/nixos.qcow2";
2726
2827 sshKeys = import ./ssh-keys.nix pkgs;
2928 snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
29+ snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey;
3030 snakeOilPublicKey = sshKeys.snakeOilPublicKey;
3131
3232in {
@@ -39,32 +39,36 @@ in {
3939 SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey}
4040 '';
4141 script = ''
42− $machine->start;
43− $machine->waitForFile("/etc/ec2-metadata/user-data");
44− $machine->waitForUnit("sshd.service");
42+ machine.start()
43+ machine.wait_for_file("/etc/ec2-metadata/user-data")
44+ machine.wait_for_unit("sshd.service")
4545
46− $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path");
46+ machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path")
4747
4848 # We have no keys configured on the client side yet, so this should fail
49− $machine->fail("ssh -o BatchMode=yes localhost exit");
49+ machine.fail("ssh -o BatchMode=yes localhost exit")
5050
5151 # Let's install our client private key
52− $machine->succeed("mkdir -p ~/.ssh");
52+ machine.succeed("mkdir -p ~/.ssh")
5353
54− $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519");
55− $machine->succeed("chmod 600 ~/.ssh/id_ed25519");
54+ machine.copy_from_host_via_shell(
55+ "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519"
56+ )
57+ machine.succeed("chmod 600 ~/.ssh/id_ed25519")
5658
5759 # We haven't configured the host key yet, so this should still fail
58− $machine->fail("ssh -o BatchMode=yes localhost exit");
60+ machine.fail("ssh -o BatchMode=yes localhost exit")
5961
6062 # Add the host key; ssh should finally succeed
61− $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts");
62− $machine->succeed("ssh -o BatchMode=yes localhost exit");
63+ machine.succeed(
64+ "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"
65+ )
66+ machine.succeed("ssh -o BatchMode=yes localhost exit")
6367
6468 # Just to make sure resizing is idempotent.
65− $machine->shutdown;
66− $machine->start;
67− $machine->waitForFile("/etc/ec2-metadata/user-data");
69+ machine.shutdown()
70+ machine.start()
71+ machine.wait_for_file("/etc/ec2-metadata/user-data")
6872 '';
6973 };
7074
@@ -86,9 +90,9 @@ in {
8690 }
8791 '';
8892 script = ''
89− $machine->start;
90− $machine->waitForFile("/etc/testFile");
91− $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
93+ machine.start()
94+ machine.wait_for_file("/etc/testFile")
95+ assert "whoa" in machine.succeed("cat /etc/testFile")
9296 '';
9397 };
9498}
pkgs/applications/blockchains/clightning.nix+2−2
@@ -4,11 +4,11 @@
44with stdenv.lib;
55stdenv.mkDerivation rec {
66 pname = "clightning";
7− version = "0.9.0";
7+ version = "0.9.0-1";
88
99 src = fetchurl {
1010 url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
11− sha256 = "11ig5bqxvhx82gq9nl7c5iqaf3x8xbwfx7cf2318pyqdimz4r1v6";
11+ sha256 = "01cwcrqysqsrf96bbbj0grm8j5m46a3acgwy0kzxdx05jdzld9sc";
1212 };
1313
1414 enableParallelBuilding = true;
pkgs/applications/gis/gmt/dcw.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, fetchurl }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "dcw-gmt";
5+ version = "1.1.4";
6+ src = fetchurl {
7+ url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz";
8+ sha256 = "8d47402abcd7f54a0f711365cd022e4eaea7da324edac83611ca035ea443aad3";
9+ };
10+
11+ installPhase = ''
12+ mkdir -p $out/share/dcw-gmt
13+ cp -rv ./* $out/share/dcw-gmt
14+ '';
15+
16+ meta = with stdenv.lib; {
17+ homepage = "https://www.soest.hawaii.edu/pwessel/dcw/";
18+ description = "Vector basemap of the world, for use with GMT";
19+ longDescription = ''
20+ DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap
21+ of the world, available from the Princeton University Digital Map and
22+ Geospatial Information Center. It contains more state boundaries (the
23+ largest 8 countries are now represented) than the original data
24+ source. Information about DCW can be found on Wikipedia
25+ (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is
26+ for use by GMT, the Generic Mapping Tools.
27+ '';
28+ license = licenses.lgpl3Plus;
29+ maintainers = with maintainers; [ tviti ];
30+ };
31+
32+}
pkgs/applications/gis/gmt/default.nixnew file+73
@@ -0,0 +1,73 @@
1+{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo
2+, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt
3+, gshhg-gmt }:
4+
5+/* The onus is on the user to also install:
6+ - ffmpeg for webm or mp4 output
7+ - graphicsmagick for gif output
8+*/
9+
10+stdenv.mkDerivation rec {
11+ pname = "gmt";
12+ version = "6.1.0";
13+ src = fetchurl {
14+ url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz";
15+ sha256 = "0vzxzpvbf1sqma2airsibxvqb9m4sajm7jsfr7rrv6q7924c7ijw";
16+ };
17+
18+ nativeBuildInputs = [ cmake ];
19+
20+ buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ]
21+ ++ (if stdenv.isDarwin then [
22+ Accelerate
23+ CoreGraphics
24+ CoreVideo
25+ ] else [
26+ glibc
27+ fftwSinglePrec
28+ blas
29+ lapack
30+ ]);
31+
32+ propagatedBuildInputs = [ ghostscript ];
33+
34+ cmakeFlags = [
35+ "-DGMT_DOCDIR=share/doc/gmt"
36+ "-DGMT_MANDIR=share/man"
37+ "-DGMT_LIBDIR=lib"
38+ "-DCOPY_GSHHG:BOOL=FALSE"
39+ "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt"
40+ "-DCOPY_DCW:BOOL=FALSE"
41+ "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt"
42+ "-DGDAL_ROOT=${gdal.out}"
43+ "-DNETCDF_ROOT=${netcdf.out}"
44+ "-DPCRE_ROOT=${pcre.out}"
45+ "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE"
46+ "-DGMT_ENABLE_OPENMP:BOOL=TRUE"
47+ "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE"
48+ "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid
49+ ] ++ (with stdenv;
50+ lib.optional (!isDarwin) [
51+ "-DFFTW3_ROOT=${fftwSinglePrec.dev}"
52+ "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so"
53+ "-DBLAS_LIBRARY=${blas}/lib/libblas.so"
54+ ]);
55+
56+ meta = with stdenv.lib; {
57+ homepage = "https://www.generic-mapping-tools.org";
58+ description = "Tools for manipulating geographic and cartesian data sets";
59+ longDescription = ''
60+ GMT is an open-source collection of command-line tools for manipulating
61+ geographic and Cartesian data sets (including filtering, trend fitting,
62+ gridding, projecting, etc.) and producing high-quality illustrations
63+ ranging from simple x–y plots via contour maps to artificially illuminated
64+ surfaces and 3D perspective views. It supports many map projections and
65+ transformations and includes supporting data such as coastlines, rivers,
66+ and political boundaries and optionally country polygons.
67+ '';
68+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
69+ license = licenses.lgpl3Plus;
70+ maintainers = with maintainers; [ tviti ];
71+ };
72+
73+}
pkgs/applications/gis/gmt/gshhg.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, fetchurl }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "gshhg-gmt";
5+ version = "2.3.7";
6+ src = fetchurl {
7+ url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz";
8+ sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f";
9+ };
10+
11+ installPhase = ''
12+ mkdir -p $out/share/gshhg-gmt
13+ cp -rv ./* $out/share/gshhg-gmt
14+ '';
15+
16+ meta = with stdenv.lib; {
17+ homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/";
18+ description = "High-resolution shoreline data set, for use with GMT";
19+ longDescription = ''
20+ GSHHG is a high-resolution shoreline data set amalgamated from two
21+ databases: Global Self-consistent Hierarchical High-resolution Shorelines
22+ (GSHHS) and CIA World Data Bank II (WDBII). GSHHG contains vector
23+ descriptions at five different resolutions of land outlines, lakes,
24+ rivers, and political boundaries. This data is for use by GMT, the Generic
25+ Mapping Tools.
26+ '';
27+ license = licenses.lgpl3Plus;
28+ maintainers = with maintainers; [ tviti ];
29+ };
30+
31+}
pkgs/applications/graphics/write_stylus/default.nix+9−13
@@ -1,29 +1,22 @@
11{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }:
22let
3− # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
4− # license: Free for commercial use
5− desktopIcon = fetchurl {
6− url = "https://www.iconfinder.com/icons/50835/download/png/256";
7− sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
8− };
9−in
10−mkDerivation rec {
11− pname = "write_stylus";
12− version = "300";
13−
143 desktopItem = makeDesktopItem {
154 name = "Write";
165 exec = "Write";
176 comment = "A word processor for handwriting";
18− icon = desktopIcon;
7+ icon = "write_stylus";
198 desktopName = "Write";
209 genericName = "Write";
2110 categories = "Office;Graphics";
2211 };
12+in
13+mkDerivation rec {
14+ pname = "write_stylus";
15+ version = "300";
2316
2417 src = fetchurl {
2518 url = "http://www.styluslabs.com/write/write${version}.tar.gz";
26− sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq";
19+ sha256 = "0h1wf3af7jzp3f3l8mlnshi83d7a4v4y8nfqfai4lmskyicqlz7c";
2720 };
2821
2922 sourceRoot = ".";
@@ -36,8 +29,11 @@ mkDerivation rec {
3629 # symlink the binary to bin/
3730 ln -s $out/Write/Write $out/bin/Write
3831
32+ # Create desktop item
3933 mkdir -p $out/share/applications
4034 ln -s ${desktopItem}/share/applications/* $out/share/applications/
35+ mkdir -p $out/share/icons
36+ ln -s $out/Write/Write144x144.png $out/share/icons/write_stylus.png
4137 '';
4238 preFixup = let
4339 libPath = lib.makeLibraryPath [
pkgs/applications/misc/html5validator/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ buildPythonApplication, fetchFromGitHub, nose, openjdk, lib }:
2+
3+buildPythonApplication rec {
4+ pname = "html5validator";
5+ version = "0.3.3";
6+
7+ src = fetchFromGitHub {
8+ owner = "svenkreiss";
9+ repo = "html5validator";
10+ rev = "v${version}";
11+ sha256 = "130acqi0dsy3midg7hwslykzry6crr4ln6ia0f0avyywkz4bplsv";
12+ };
13+
14+ propagatedBuildInputs = [ openjdk ];
15+
16+ checkInputs = [ nose ];
17+ checkPhase = "PATH=$PATH:$out/bin nosetests";
18+
19+ meta = with lib; {
20+ homepage = "https://github.com/svenkreiss/html5validator";
21+ description = "Command line tool that tests files for HTML5 validity";
22+ license = licenses.mit;
23+ maintainers = [ maintainers.phunehehe ];
24+ };
25+}
pkgs/applications/misc/snowsql/default.nixnew file+50
@@ -0,0 +1,50 @@
1+{ stdenv
2+, fetchurl
3+, rpmextract
4+, patchelf
5+, makeWrapper
6+, openssl
7+}:
8+
9+stdenv.mkDerivation rec {
10+ pname = "snowsql";
11+ version = "1.2.5";
12+
13+ src = fetchurl {
14+ url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowflake-snowsql-1.2.5-1.x86_64.rpm";
15+ sha256 = "c66e2044640197f4a5b5a16b89e8e7c6a816aa539004a0fb016aab185795f2d5";
16+ };
17+
18+ nativeBuildInputs = [ rpmextract makeWrapper ];
19+
20+ libPath =
21+ stdenv.lib.makeLibraryPath
22+ [
23+ openssl
24+ ];
25+
26+ buildCommand = ''
27+ mkdir -p $out/bin/
28+ cd $out
29+ rpmextract $src
30+ rm -R usr/bin
31+ mv usr/* $out
32+ rmdir usr
33+
34+ ${patchelf}/bin/patchelf \
35+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
36+ lib64/snowflake/snowsql/snowsql
37+
38+ makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \
39+ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \
40+
41+ '';
42+
43+ meta = with stdenv.lib; {
44+ description = "Command line client for the Snowflake database";
45+ homepage = "https://www.snowflake.com";
46+ license = licenses.unfree;
47+ maintainers = with maintainers; [ andehen ];
48+ platforms = [ "x86_64-linux" ];
49+ };
50+}
pkgs/applications/misc/super_user_spark/default.nixdeleted−32
@@ -1,32 +0,0 @@
1−{ mkDerivation, fetchgit, aeson, aeson-pretty, base, bytestring, directory
2−, filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative
3−, parsec, process, pureMD5, QuickCheck, shelly, stdenv, text
4−, transformers, unix
5−}:
6−mkDerivation {
7− pname = "super-user-spark";
8− version = "0.3.2.0-dev";
9− src = fetchgit {
10− url = "https://github.com/NorfairKing/super-user-spark";
11− sha256 = "0akyc51bghzkk8j75n0i8v8rrsklidwvljhx3aibxfbkqp33372g";
12− rev = "ab8635682d67842b9e6d909cf3c618014e4157f2";
13− };
14− isLibrary = true;
15− isExecutable = true;
16− libraryHaskellDepends = [
17− aeson aeson-pretty base bytestring directory filepath mtl
18− optparse-applicative parsec process pureMD5 shelly text
19− transformers unix
20− ];
21− executableHaskellDepends = [ base ];
22− testHaskellDepends = [
23− aeson aeson-pretty base bytestring directory filepath hspec
24− hspec-core HUnit mtl optparse-applicative parsec process pureMD5
25− QuickCheck shelly text transformers unix
26− ];
27− jailbreak = true;
28− description = "Configure your dotfile deployment with a DSL";
29− license = stdenv.lib.licenses.mit;
30− homepage = "https://github.com/NorfairKing/super-user-spark";
31− maintainers = [ stdenv.lib.maintainers.badi ];
32−}
pkgs/applications/networking/browsers/opera/default.nix+2−2
@@ -47,11 +47,11 @@ let
4747in stdenv.mkDerivation rec {
4848
4949 pname = "opera";
50− version = "67.0.3575.31";
50+ version = "68.0.3618.63";
5151
5252 src = fetchurl {
5353 url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
54− sha256 = "1ghygin7xf5lwd77s8f6bag339di4alwlkqwjzlq20wzwx4lns4w";
54+ sha256 = "1643043ywz94x2yr7xyw7krfq53iwkr8qxlbydzq6zb2zina7jxd";
5555 };
5656
5757 unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
pkgs/applications/networking/cluster/argo/default.nix+3−3
@@ -19,16 +19,16 @@ let
1919in
2020buildGoModule rec {
2121 pname = "argo";
22− version = "2.9.5";
22+ version = "2.10.0";
2323
2424 src = fetchFromGitHub {
2525 owner = "argoproj";
2626 repo = "argo";
2727 rev = "v${version}";
28− sha256 = "1x44mgvnbn47a33xnhnh9bxxvj1vsr32lvh9bq6w5hpmxb7qbq4f";
28+ sha256 = "19z1v6p59pcl8smywn1b5igqpv9wj48n6500wjxx5ayhc4mg00h2";
2929 };
3030
31− vendorSha256 = "1vqmzz76lcwwnw89n4lyg4jjf7wbdgn9sdzwsgrjwkj8ax7d48cv";
31+ vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz";
3232
3333 doCheck = false;
3434
pkgs/applications/networking/cluster/cni/plugins.nix+1−1
@@ -38,7 +38,7 @@ buildGoModule rec {
3838 "plugins/meta/tuning"
3939 ];
4040
41− passthru.tests.podman = nixosTests.podman;
41+ passthru.tests = { inherit (nixosTests) cri-o podman; };
4242
4343 meta = with lib; {
4444 description = "Some standard networking plugins, maintained by the CNI team";
pkgs/applications/networking/cluster/helmfile/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "helmfile";
5− version = "0.125.5";
5+ version = "0.125.7";
66
77 src = fetchFromGitHub {
88 owner = "roboll";
99 repo = "helmfile";
1010 rev = "v${version}";
11− sha256 = "00c1sppvdnsqay8zk6fz5xz8yw74zv30hq54r4sf1a5rb84nd05h";
11+ sha256 = "1m030gjrd98z4vbj7l927qi55vgr11czrb8wmw56ifkqwfi6h9hi";
1212 };
1313
14− vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz";
14+ vendorSha256 = "0w72nlf26k64cq1hrqycks0pyp18y4wh3h40jpn5qnysi5pb2ndj";
1515
1616 doCheck = false;
1717
pkgs/applications/networking/cluster/ssm-agent/default.nix+40−7
@@ -1,22 +1,56 @@
1−{ stdenv, fetchFromGitHub, buildGoPackage }:
1+{ stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }:
22
33buildGoPackage rec {
44 pname = "amazon-ssm-agent";
5− version = "2.0.633.0";
5+ version = "2.3.1319.0";
66
77 goPackagePath = "github.com/aws/${pname}";
8− subPackages = [ "agent" ];
8+ subPackages = [
9+ "agent"
10+ "agent/framework/processor/executer/outofproc/worker"
11+ "agent/framework/processor/executer/outofproc/worker"
12+ "agent/framework/processor/executer/outofproc/sessionworker"
13+ "agent/session/logging"
14+ "agent/cli-main"
15+ ];
16+
17+ buildInputs = [ makeWrapper ];
918
1019 src = fetchFromGitHub {
11− rev = "v${version}";
20+ rev = version;
1221 owner = "aws";
1322 repo = pname;
14− sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv";
23+ sha256 = "1yiyhj7ckqa32b1rnbwn7zx89rsj00m5imn1xlpsw002ywxsxbnv";
1524 };
1625
1726 preBuild = ''
1827 mv go/src/${goPackagePath}/vendor strange-vendor
1928 mv strange-vendor/src go/src/${goPackagePath}/vendor
29+
30+ cd go/src/${goPackagePath}
31+ echo ${version} > VERSION
32+
33+ substituteInPlace agent/plugins/inventory/gatherers/application/dataProvider.go \
34+ --replace '"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"' ""
35+
36+ go run agent/version/versiongenerator/version-gen.go
37+ substituteInPlace agent/appconfig/constants_unix.go \
38+ --replace /usr/bin/ssm-document-worker $bin/bin/ssm-document-worker \
39+ --replace /usr/bin/ssm-session-worker $bin/bin/ssm-session-worker \
40+ --replace /usr/bin/ssm-session-logger $bin/bin/ssm-session-logger
41+ cd -
42+ '';
43+
44+ postBuild = ''
45+ mv go/bin/agent go/bin/amazon-ssm-agent
46+ mv go/bin/worker go/bin/ssm-document-worker
47+ mv go/bin/sessionworker go/bin/ssm-session-worker
48+ mv go/bin/logging go/bin/ssm-session-logger
49+ mv go/bin/cli-main go/bin/ssm-cli
50+ '';
51+
52+ postInstall = ''
53+ wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin
2054 '';
2155
2256 meta = with stdenv.lib; {
@@ -24,7 +58,6 @@ buildGoPackage rec {
2458 homepage = "https://github.com/aws/amazon-ssm-agent";
2559 license = licenses.asl20;
2660 platforms = platforms.unix;
27− maintainers = with maintainers; [ copumpkin ];
61+ maintainers = with maintainers; [ copumpkin manveru ];
2862 };
2963}
30−
pkgs/applications/networking/instant-messengers/ytalk/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, fetchurl, ncurses }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "ytalk";
5+ version = "3.3.0";
6+
7+ src = fetchurl {
8+ url = "ftp://ftp.ourproject.org/pub/ytalk/${pname}-${version}.tar.gz";
9+ sha256 = "1d3jhnj8rgzxyxjwfa22vh45qwzjvxw1qh8fz6b7nfkj3zvk9jvf";
10+ };
11+
12+ buildInputs = [ ncurses ];
13+
14+ meta = {
15+ homepage = "http://ytalk.ourproject.org";
16+ description = "A terminal based talk client";
17+ platforms = stdenv.lib.platforms.unix;
18+ maintainers = with stdenv.lib.maintainers; [ taeer ];
19+ license = stdenv.lib.licenses.gpl2Plus;
20+ };
21+}
pkgs/applications/networking/nextdns/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "nextdns";
5− version = "1.7.0";
5+ version = "1.7.1";
66
77 src = fetchFromGitHub {
88 owner = "nextdns";
99 repo = "nextdns";
1010 rev = "v${version}";
11− sha256 = "15xw8d6b9rv0lalzfllixm8n89clz9j8ag1gk4r16k7yv5l6xrpd";
11+ sha256 = "001swxmf7ga2g0ri3gsnwvgjcarwdhfg476ymblg34kk9wclidmy";
1212 };
1313
1414 vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj";
pkgs/applications/office/espanso/default.nix+3−3
@@ -14,16 +14,16 @@
1414
1515rustPlatform.buildRustPackage rec {
1616 pname = "espanso";
17− version = "0.6.3";
17+ version = "0.7.0";
1818
1919 src = fetchFromGitHub {
2020 owner = "federico-terzi";
2121 repo = pname;
2222 rev = "v${version}";
23− sha256 = "1x5p7hniapggqd18rx26mjvdf33z7rm7zz5vsqm2siv3mcl19033";
23+ sha256 = "11xdnn1iwpx58s3wvjb6dkgfc6dzsblzb6fngc0np5vx8r2pccpg";
2424 };
2525
26− cargoSha256 = "0liwwdncymjql5dw7rwhhimcr7qdbyvfgmsd0bawvi0ym7m1v408";
26+ cargoSha256 = "1yjpqjfrixscg52yhalybgp734w3sdqg5hxka8ppcvz7lp3w5b1s";
2727
2828 nativeBuildInputs = [
2929 extra-cmake-modules
pkgs/applications/science/biology/igv/default.nix+12−10
@@ -1,32 +1,34 @@
1−{ stdenv, fetchurl, unzip, jre }:
1+{ stdenv, fetchzip, jdk11 }:
22
33stdenv.mkDerivation rec {
44 pname = "igv";
5− version = "2.4.19";
6−
7− src = fetchurl {
8− url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
9− sha256 = "048dgrhxcb854d24kyjkqz12bw04bsv49i5jawb75yzkswwfkb0z";
5+ version = "2.8.9";
6+ src = fetchzip {
7+ url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
8+ sha256 = "1874w1xprv91caz1ymfxilq6inhj36xzx8j9m0mcyp0qfvfvyjp7";
109 };
1110
12− buildInputs = [ unzip jre ];
13−
1411 installPhase = ''
1512 mkdir -pv $out/{share,bin}
1613 cp -Rv * $out/share/
1714
1815 sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh
19− sed -i 's#java#${jre}/bin/java#g' $out/share/igv.sh
16+ sed -i 's#java#${jdk11}/bin/java#g' $out/share/igv.sh
17+
18+ sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools
19+ sed -i 's#java#${jdk11}/bin/java#g' $out/share/igvtools
2020
2121 ln -s $out/share/igv.sh $out/bin/igv
22+ ln -s $out/share/igvtools $out/bin/igvtools
2223
2324 chmod +x $out/bin/igv
25+ chmod +x $out/bin/igvtools
2426 '';
2527
2628 meta = with stdenv.lib; {
2729 homepage = "https://www.broadinstitute.org/igv/";
2830 description = "A visualization tool for interactive exploration of genomic datasets";
29− license = licenses.lgpl21;
31+ license = licenses.mit;
3032 platforms = platforms.unix;
3133 maintainers = [ maintainers.mimame ];
3234 };
pkgs/applications/science/electronics/kicad/base.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 i18n = libraries.i18n;
3333
3434 pname = "kicad-base";
35− version = "${versions.${baseName}.kicadVersion.version}";
35+ version = "${builtins.substring 0 10 versions.${baseName}.kicadVersion.src.rev}";
3636
3737 src = fetchFromGitLab (
3838 {
pkgs/applications/science/electronics/kicad/default.nix+1−1
@@ -9,7 +9,7 @@
99, oceSupport ? false, opencascade
1010, withOCCT ? true, opencascade-occt
1111, ngspiceSupport ? true, libngspice
12−, scriptingSupport ? false, swig, python3
12+, scriptingSupport ? true, swig, python3
1313, debug ? false, valgrind
1414, with3d ? true
1515, withI18n ? true
pkgs/applications/science/electronics/kicad/libraries.nix+4−2
@@ -15,7 +15,9 @@ let
1515 mkLib = name:
1616 stdenv.mkDerivation {
1717 pname = "kicad-${name}";
18− version = "${version}";
18+ # Use the revision instead of `version` (which is an ISO 8601 date)
19+ # to prevent duplicating the library when just the date changed
20+ version = "${builtins.substring 0 10 libSources.${name}.rev}";
1921 src = fetchFromGitHub (
2022 {
2123 owner = "KiCad";
@@ -50,7 +52,7 @@ in
5052 i18n = let name = "i18n"; in
5153 stdenv.mkDerivation {
5254 pname = "kicad-${name}";
53− version = "${version}";
55+ version = "${builtins.substring 0 10 libSources.${name}.rev}";
5456 src = fetchFromGitLab (
5557 {
5658 group = "kicad";
pkgs/applications/science/electronics/kicad/versions.nix+12−12
@@ -27,25 +27,25 @@
2727 };
2828 "kicad-unstable" = {
2929 kicadVersion = {
30− version = "2020-07-21";
30+ version = "2020-08-22";
3131 src = {
32− rev = "9a801d8b72f24e297a7d9d6e8cee2eef6cab2988";
33− sha256 = "0yilmmng7y3rz1bxw2b0s0aqs8hdqr7ach2r45bx8v1f4bih4ka9";
32+ rev = "a2341f0f335b0abb9fc8cb86d19cbe6f9b38fade";
33+ sha256 = "0167yb39f800xarq3khn7sbdkgcx9j2ayhy8c7lhhks6kh7459g0";
3434 };
3535 };
3636 libVersion = {
37− version = "2020-07-21";
37+ version = "2020-08-22";
3838 libSources = {
39− i18n.rev = "a311975d139caf8be9848dd613a9800570adc245";
40− i18n.sha256 = "1bkn2hhwcg8xdpn9yfm9nnqsg02c1nizhpxd4yhpxgifhh4psz1g";
41− symbols.rev = "18572c4c118fe8ef779edf3131eebf2c33c6fa46";
42− symbols.sha256 = "0hqx0aznzrnlbdkpsnl8mbs9bdgiv029d6zjh10nyjzcw27q3hxz";
39+ i18n.rev = "cbbb1efd940094bf0c3168280698b2b059a8c509";
40+ i18n.sha256 = "1q4jakn6m8smnr2mg7jgb520nrb6fag9mdvlcpx3smp3qbxka818";
41+ symbols.rev = "9ca6a5348cdeb88e699582d4ed051ff7303b44d3";
42+ symbols.sha256 = "13w6pb34rhz96rnar25z7kiscy6q1fm8l39hq1bpb8g9yn86ssz4";
4343 templates.rev = "ae16953b81055855bcede4a33305413599d86a15";
4444 templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v";
45− footprints.rev = "4835f80b4a52256aa7a3eb650e6e0fef33a77d0d";
46− footprints.sha256 = "00rc6phxmkry35i0xzry14axvh2akvvkly45s3xxi06vaydaw7i5";
47− packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d";
48− packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
45+ footprints.rev = "f94c2d5d619d16033f69a555b449f59604d97865";
46+ footprints.sha256 = "1g71sk77jvqaf9xvgq6dkyvd9pij2lb4n0bn0dqnwddhwam935db";
47+ packages3d.rev = "f699b0e3c13fe75618086913e39279c85da14cc7";
48+ packages3d.sha256 = "0m5rb5axa946v729z35ga84in76y4zpk32qzi0hwqx957zy72hs9";
4949 };
5050 };
5151 };
pkgs/applications/science/electronics/verilator/default.nix+15−8
@@ -1,22 +1,29 @@
1−{ stdenv, fetchurl, perl, flex, bison }:
1+{ stdenv, fetchurl
2+, perl, flex, bison
3+}:
24
35stdenv.mkDerivation rec {
46 pname = "verilator";
5− version = "4.036";
7+ version = "4.040";
68
79 src = fetchurl {
810 url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
9− sha256 = "1sy02pgq3kvk8548l57hsh08vfbqdg8dghj8mwlybdi8fdjz4z1h";
11+ sha256 = "1qy0wllsmxva3c838spxwmacxx36r3njxwhgp172m4l3829785bf";
1012 };
1113
1214 enableParallelBuilding = true;
13− buildInputs = [ perl flex bison ];
15+ buildInputs = [ perl ];
16+ nativeBuildInputs = [ flex bison ];
1417
15− meta = {
18+ # these tests need some interpreter paths patched early on...
19+ doCheck = false;
20+ checkTarget = "test";
21+
22+ meta = with stdenv.lib; {
1623 description = "Fast and robust (System)Verilog simulator/compiler";
1724 homepage = "https://www.veripool.org/wiki/verilator";
18− license = stdenv.lib.licenses.lgpl3;
19− platforms = stdenv.lib.platforms.unix;
20− maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
25+ license = licenses.lgpl3;
26+ platforms = platforms.unix;
27+ maintainers = with maintainers; [ thoughtpolice ];
2128 };
2229}
pkgs/applications/science/logic/isabelle/default.nix+11−11
@@ -3,18 +3,18 @@
33
44stdenv.mkDerivation rec {
55 pname = "isabelle";
6− version = "2018";
6+ version = "2020";
77
88 dirname = "Isabelle${version}";
99
1010 src = if stdenv.isDarwin
1111 then fetchurl {
12− url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg";
13− sha256 = "0jwnvsf5whklq14ihaxs7b9nbic94mm56nvxljrdbvl6y628j9r5";
12+ url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
13+ sha256 = "1sfr5filsaqj93g5y4p9n8g5652dhr4whj25x4lifdxr2pp560xx";
1414 }
1515 else fetchurl {
1616 url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
17− sha256 = "1928lwrw1v1p9s23kix30ncpqm8djmrnjixj82f3ni2a8sc3hrsp";
17+ sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3";
1818 };
1919
2020 buildInputs = [ perl polyml z3 ]
@@ -42,14 +42,14 @@ stdenv.mkDerivation rec {
4242 ML_SOURCES="\$POLYML_HOME/src"
4343 EOF
4444
45− cat >contrib/jdk/etc/settings <<EOF
45+ cat >contrib/jdk*/etc/settings <<EOF
4646 ISABELLE_JAVA_PLATFORM=${stdenv.system}
4747 ISABELLE_JDK_HOME=${java}
4848 EOF
4949
5050 echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
5151
52− for comp in contrib/jdk contrib/polyml-* contrib/z3-*; do
52+ for comp in contrib/jdk* contrib/polyml-* contrib/z3-*; do
5353 rm -rf $comp/x86*
5454 done
5555 '' + (if ! stdenv.isLinux then "" else ''
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666 bin/isabelle install $out/bin
6767 '';
6868
69− meta = {
69+ meta = with stdenv.lib; {
7070 description = "A generic proof assistant";
7171
7272 longDescription = ''
@@ -74,9 +74,9 @@ stdenv.mkDerivation rec {
7474 to be expressed in a formal language and provides tools for proving those
7575 formulas in a logical calculus.
7676 '';
77− homepage = "http://isabelle.in.tum.de/";
78− license = "LGPL";
79− maintainers = [ stdenv.lib.maintainers.jwiegley ];
80− platforms = stdenv.lib.platforms.linux;
77+ homepage = "https://isabelle.in.tum.de/";
78+ license = licenses.bsd3;
79+ maintainers = [ maintainers.jwiegley ];
80+ platforms = platforms.linux;
8181 };
8282}
pkgs/applications/science/logic/mcy/default.nix+3−3
@@ -7,13 +7,13 @@ let
77in
88stdenv.mkDerivation {
99 pname = "mcy";
10− version = "2020.07.06";
10+ version = "2020.08.03";
1111
1212 src = fetchFromGitHub {
1313 owner = "YosysHQ";
1414 repo = "mcy";
15− rev = "6e8433ed9acbface5e080719110a957d89d849df";
16− sha256 = "1vbzg0rgmf7kp735m6p4msxc51vpsrdwk24ir7z0zxsb8lv53gg7";
15+ rev = "62048e69df13f8e03670424626755ae8ef4c36ff";
16+ sha256 = "15xxgzx1zxzx5kshqyrxnfx33cz6cjzxcdcn6z98jhs9bwyvf96f";
1717 };
1818
1919 buildInputs = [ python ];
pkgs/applications/science/logic/symbiyosys/default.nix+15−10
@@ -1,20 +1,20 @@
11{ stdenv, fetchFromGitHub
22, bash, python3, yosys
3−, yices, boolector, aiger
3+, yices, boolector, z3, aiger
44}:
55
66stdenv.mkDerivation {
77 pname = "symbiyosys";
8− version = "2020.07.03";
8+ version = "2020.08.22";
99
1010 src = fetchFromGitHub {
1111 owner = "YosysHQ";
1212 repo = "SymbiYosys";
13− rev = "06e80194c77f5cc38c6999b1d3047a2d6ca82e15";
14− sha256 = "1hl03qy98pgq24ijyimf9pf7qxp42l7cki66wx48jys4m1s6n8v9";
13+ rev = "33b0bb7d836fe2a73dc7b10587222f2a718beef4";
14+ sha256 = "03rbrbwsji1sqcp2yhgbc0fca04zsryv2g4izjhdzv64nqjzjyhn";
1515 };
1616
17− buildInputs = [ python3 ];
17+ buildInputs = [ ];
1818 patchPhase = ''
1919 patchShebangs .
2020
@@ -26,14 +26,15 @@ stdenv.mkDerivation {
2626 # Fix various executable references
2727 substituteInPlace sbysrc/sby_core.py \
2828 --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \
29− --replace ': "btormc"' ': "${boolector}/bin/btormc"' \
30− --replace ': "yosys"' ': "${yosys}/bin/yosys"' \
31− --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \
32− --replace ': "yosys-abc"' ': "${yosys}/bin/yosys-abc"' \
33− --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \
29+ --replace ', "btormc"' ', "${boolector}/bin/btormc"' \
30+ --replace ', "aigbmc"' ', "${aiger}/bin/aigbmc"'
31+
32+ substituteInPlace sbysrc/sby_core.py \
33+ --replace '##yosys-program-prefix##' '"${yosys}/bin/"'
3434 '';
3535
3636 buildPhase = "true";
37+
3738 installPhase = ''
3839 mkdir -p $out/bin $out/share/yosys/python3
3940
@@ -43,6 +44,10 @@ stdenv.mkDerivation {
4344 chmod +x $out/bin/sby
4445 '';
4546
47+ doCheck = false; # not all provers are yet packaged...
48+ checkInputs = [ python3 yosys boolector yices z3 aiger ];
49+ checkPhase = "make test";
50+
4651 meta = {
4752 description = "Tooling for Yosys-based verification flows";
4853 homepage = "https://symbiyosys.readthedocs.io/";
pkgs/applications/science/math/qalculate-gtk/default.nix+4
@@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 patchPhase = ''
15+ # The gnome-search-provider2.c file generated by gdbus-codegen depends
16+ # on gio-unix-2.0, which is a Requires.private of gtk+-3.0,
17+ # and private dependencies are dropped in our default patched pkg-config.
1518 # https://github.com/Qalculate/qalculate-gtk/pull/178
19+ # https://github.com/NixOS/nixpkgs/issues/292
1620 substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0'
1721
1822 # https://github.com/Qalculate/qalculate-gtk/pull/179
pkgs/applications/version-management/git-and-tools/default.nix+1−1
@@ -98,7 +98,7 @@ let
9898
9999 git-fame = callPackage ./git-fame {};
100100
101− git-fast-export = callPackage ./fast-export { };
101+ git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; };
102102
103103 git-filter-repo = callPackage ./git-filter-repo {
104104 pythonPackages = python3Packages;
pkgs/applications/version-management/git-and-tools/fast-export/default.nix+30−6
@@ -1,13 +1,14 @@
1−{stdenv, fetchgit, mercurial, makeWrapper}:
1+{stdenv, fetchFromGitHub, git, mercurial, makeWrapper}:
22
33stdenv.mkDerivation rec {
44 pname = "fast-export";
5− version = "190107";
5+ version = "200213";
66
7− src = fetchgit {
8− url = "git://repo.or.cz/fast-export.git";
7+ src = fetchFromGitHub {
8+ owner = "frej";
9+ repo = pname;
910 rev = "v${version}";
10− sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14";
11+ sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287";
1112 };
1213
1314 buildInputs = [mercurial.python mercurial makeWrapper];
@@ -27,11 +28,34 @@ stdenv.mkDerivation rec {
2728
2829 for script in $out/bin/*.sh; do
2930 wrapProgram $script \
30− --prefix PATH : "${mercurial.python}/bin":$libexec \
31+ --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \
3132 --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath
3233 done
3334 '';
3435
36+ doInstallCheck = true;
37+ # deliberately not adding git or hg into installCheckInputs - package should
38+ # be able to work without them in runtime env
39+ installCheckPhase = ''
40+ mkdir repo-hg
41+ pushd repo-hg
42+ ${mercurial}/bin/hg init
43+ echo foo > bar
44+ ${mercurial}/bin/hg add bar
45+ ${mercurial}/bin/hg commit --message "baz"
46+ popd
47+
48+ mkdir repo-git
49+ pushd repo-git
50+ ${git}/bin/git init
51+ ${git}/bin/git config core.ignoreCase false # for darwin
52+ $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash
53+ for s in "foo" "bar" "baz" ; do
54+ (${git}/bin/git show | grep $s > /dev/null) && echo $s found
55+ done
56+ popd
57+ '';
58+
3559 meta = with stdenv.lib; {
3660 description = "Import mercurial into git";
3761 homepage = "https://repo.or.cz/w/fast-export.git";
pkgs/applications/virtualization/conmon/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 installFlags = [ "PREFIX=$(out)" ];
2626
27− passthru.tests.podman = nixosTests.podman;
27+ passthru.tests = { inherit (nixosTests) cri-o podman; };
2828
2929 meta = with stdenv.lib; {
3030 homepage = "https://github.com/containers/conmon";
pkgs/applications/virtualization/containerd/default.nix+2−2
@@ -4,7 +4,7 @@ with lib;
44
55buildGoPackage rec {
66 pname = "containerd";
7− version = "1.2.13";
7+ version = "1.4.0";
88 # git commit for the above version's tag
99 commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429";
1010
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 owner = "containerd";
1313 repo = "containerd";
1414 rev = "v${version}";
15− sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
15+ sha256 = "1ajns679ck5yp6vmf39pyshzf8jijw5fcg5biixkj54jhj3bv1sq";
1616 };
1717
1818 goPackagePath = "github.com/containerd/containerd";
pkgs/applications/virtualization/cri-o/default.nix+3
@@ -10,6 +10,7 @@
1010, libselinux
1111, lvm2
1212, pkg-config
13+, nixosTests
1314}:
1415
1516buildGoModule rec {
@@ -57,6 +58,8 @@ buildGoModule rec {
5758 installManPage docs/*.[1-9]
5859 '';
5960
61+ passthru.tests = { inherit (nixosTests) cri-o; };
62+
6063 meta = with stdenv.lib; {
6164 homepage = "https://cri-o.io";
6265 description = ''
pkgs/applications/virtualization/cri-o/wrapper.nix+1−1
@@ -27,7 +27,7 @@ let
2727
2828in runCommand cri-o.name {
2929 name = "${cri-o.pname}-wrapper-${cri-o.version}";
30− inherit (cri-o) pname version;
30+ inherit (cri-o) pname version passthru;
3131
3232 meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ];
3333
pkgs/applications/virtualization/crun/default.nix+1−1
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
6363
6464 doCheck = true;
6565
66− passthru.tests.podman = nixosTests.podman;
66+ passthru.tests = { inherit (nixosTests) podman; };
6767
6868 meta = with lib; {
6969 description = "A fast and lightweight fully featured OCI runtime and C library for running containers";
pkgs/applications/virtualization/podman/default.nix+1−1
@@ -60,7 +60,7 @@ buildGoModule rec {
6060 MANDIR=$man/share/man make install.man-nobuild
6161 '';
6262
63− passthru.tests.podman = nixosTests.podman;
63+ passthru.tests = { inherit (nixosTests) podman; };
6464
6565 meta = with stdenv.lib; {
6666 homepage = "https://podman.io/";
pkgs/applications/virtualization/qemu/default.nix+2
@@ -18,6 +18,7 @@
1818, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
1919, virglSupport ? openGLSupport, virglrenderer
2020, smbdSupport ? false, samba
21+, tpmSupport ? true
2122, hostCpuOnly ? false
2223, hostCpuTargets ? (if hostCpuOnly
2324 then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu"
@@ -127,6 +128,7 @@ stdenv.mkDerivation rec {
127128 ++ optional cephSupport "--enable-rbd"
128129 ++ optional openGLSupport "--enable-opengl"
129130 ++ optional virglSupport "--enable-virglrenderer"
131+ ++ optional tpmSupport "--enable-tpm"
130132 ++ optional smbdSupport "--smbd=${samba}/bin/smbd";
131133
132134 doCheck = false; # tries to access /dev
pkgs/applications/virtualization/runc/default.nix+1−1
@@ -45,7 +45,7 @@ buildGoPackage rec {
4545 installManPage man/*/*.[1-9]
4646 '';
4747
48− passthru.tests.podman = nixosTests.podman;
48+ passthru.tests = { inherit (nixosTests) cri-o podman; };
4949
5050 meta = with lib; {
5151 homepage = "https://github.com/opencontainers/runc";
pkgs/data/fonts/clearlyU/default.nix+2−9
@@ -20,19 +20,12 @@ stdenv.mkDerivation rec {
2020 '';
2121
2222 installPhase = ''
23− # install bdf fonts
23+ # install otb and bdf fonts
2424 fontDir="$out/share/fonts"
25− install -m 644 -D *.bdf -t "$fontDir"
26− mkfontdir "$fontDir"
27−
28− # install otb fonts
29− fontDir="$otb/share/fonts"
30− install -m 644 -D *.otb -t "$fontDir"
25+ install -m 644 -D *.bdf *.otb -t "$fontDir"
3126 mkfontdir "$fontDir"
3227 '';
3328
34− outputs = [ "out" "otb" ];
35−
3629 meta = with stdenv.lib; {
3730 description = "A Unicode font";
3831 license = licenses.mit;
pkgs/data/fonts/creep/default.nix+1−5
@@ -20,14 +20,10 @@ stdenv.mkDerivation rec {
2020 '';
2121
2222 installPhase = ''
23− install -D -m644 creep.bdf "$out/share/fonts/misc/creep.bdf"
23+ install -D -m644 creep.otb creep.bdf -t "$out/share/fonts/misc/"
2424 mkfontdir "$out/share/fonts/misc"
25− install -D -m644 creep.otb "$otb/share/fonts/misc/creep.otb"
26− mkfontdir "$otb/share/fonts/misc"
2725 '';
2826
29− outputs = [ "out" "otb" ];
30−
3127 meta = with stdenv.lib; {
3228 description = "A pretty sweet 4px wide pixel font";
3329 homepage = "https://github.com/romeovs/creep";
pkgs/data/fonts/dina/default.nix+2−4
@@ -41,15 +41,13 @@ stdenv.mkDerivation {
4141 '';
4242
4343 installPhase = ''
44− install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
44+ install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb
4545 install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
46− install -D -m 644 -t "$otb/share/fonts/misc" *.otb
4746 mkfontdir "$out/share/fonts/misc"
4847 mkfontdir "$bdf/share/fonts/misc"
49− mkfontdir "$otb/share/fonts/misc"
5048 '';
5149
52− outputs = [ "out" "bdf" "otb" ];
50+ outputs = [ "out" "bdf" ];
5351
5452 meta = with stdenv.lib; {
5553 description = "A monospace bitmap font aimed at programmers";
pkgs/data/fonts/envypn-font/default.nix+1−5
@@ -25,14 +25,10 @@ stdenv.mkDerivation {
2525 '';
2626
2727 installPhase = ''
28− install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
29− install -D -m 644 -t "$otb/share/fonts/misc" *.otb
28+ install -D -m 644 -t "$out/share/fonts/misc" *.otb *.pcf.gz
3029 mkfontdir "$out/share/fonts/misc"
31− mkfontdir "$otb/share/fonts/misc"
3230 '';
3331
34− outputs = [ "out" "otb" ];
35−
3632 meta = with stdenv.lib; {
3733 description = ''
3834 Readable bitmap font inspired by Envy Code R
pkgs/data/fonts/gohufont/default.nix+2−9
@@ -52,19 +52,12 @@ stdenv.mkDerivation rec {
5252 fontDir="$out/share/consolefonts"
5353 install -D -m 644 -t "$fontDir" psf/*.psf
5454
55− # install the pcf fonts (for xorg applications)
55+ # install the pcf and otb fonts (for X11,GTK applications)
5656 fontDir="$out/share/fonts/misc"
57− install -D -m 644 -t "$fontDir" *.pcf
58− mkfontdir "$fontDir"
59−
60− # install the otb fonts (for gtk applications)
61− fontDir="$otb/share/fonts/misc"
62− install -D -m 644 -t "$fontDir" *.otb
57+ install -D -m 644 -t "$fontDir" *.pcf *.otb
6358 mkfontdir "$fontDir"
6459 '';
6560
66− outputs = [ "out" "otb" ];
67−
6861 meta = with stdenv.lib; {
6962 description = ''
7063 A monospace bitmap font well suited for programming and terminal use
pkgs/data/fonts/profont/default.nix+1−6
@@ -28,15 +28,10 @@ stdenv.mkDerivation {
2828 gzip -n -9 -c "$f" > "$out/share/fonts/misc/$f.gz"
2929 done
3030 install -D -m 644 LICENSE -t "$out/share/doc/$pname"
31+ install -D -m 644 "$srcOtb/profontn.otb" -t $out/share/fonts/misc
3132 mkfontdir "$out/share/fonts/misc"
32−
33− cd $srcOtb
34− install -D -m 644 profontn.otb -t $otb/share/fonts/misc
35− mkfontdir "$otb/share/fonts/misc"
3633 '';
3734
38− outputs = [ "out" "otb" ];
39−
4035 meta = with stdenv.lib; {
4136 homepage = "https://tobiasjung.name/profont/";
4237 description = "A monospaced font created to be a most readable font for programming";
pkgs/data/fonts/siji/default.nix+2−4
@@ -24,15 +24,13 @@ stdenv.mkDerivation rec {
2424 '';
2525
2626 postInstall = ''
27− install -m 644 -D pcf/* -t "$out/share/fonts/misc"
27+ install -m 644 -D *.otb pcf/* -t "$out/share/fonts/misc"
2828 install -m 644 -D bdf/* -t "$bdf/share/fonts/misc"
29− install -m 644 -D *.otb -t "$otb/share/fonts/misc"
3029 mkfontdir "$out/share/fonts/misc"
3130 mkfontdir "$bdf/share/fonts/misc"
32− mkfontdir "$otb/share/fonts/misc"
3331 '';
3432
35− outputs = [ "out" "bdf" "otb" ];
33+ outputs = [ "out" "bdf" ];
3634
3735 meta = with stdenv.lib; {
3836 homepage = "https://github.com/stark/siji";
pkgs/data/fonts/tamsyn/default.nix+1−5
@@ -29,15 +29,11 @@ in stdenv.mkDerivation {
2929 '';
3030
3131 installPhase = ''
32− install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
32+ install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc"
3333 install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
34− install -m 644 -D *.otb -t "$otb/share/fonts/misc"
3534 mkfontdir "$out/share/fonts/misc"
36− mkfontdir "$otb/share/fonts/misc"
3735 '';
3836
39− outputs = [ "out" "otb" ];
40−
4137 meta = with stdenv.lib; {
4238 description = "A monospace bitmap font aimed at programmers";
4339 longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at
pkgs/data/fonts/tamzen/default.nix+1−5
@@ -14,15 +14,11 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ mkfontscale ];
1515
1616 installPhase = ''
17− install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc"
17+ install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"
1818 install -m 644 -D psf/*.psf -t "$out/share/consolefonts"
19− install -m 644 -D otb/*.otb -t "$otb/share/fonts/misc"
2019 mkfontdir "$out/share/fonts/misc"
21− mkfontdir "$otb/share/fonts/misc"
2220 '';
2321
24− outputs = [ "out" "otb" ];
25−
2622 meta = with stdenv.lib; {
2723 description = "Bitmapped programming font based on Tamsyn";
2824 longDescription = ''
pkgs/data/fonts/terminus-font/default.nix+2−4
@@ -35,14 +35,12 @@ stdenv.mkDerivation rec {
3535
3636 postInstall = ''
3737 # install otb fonts (for GTK applications)
38− install -m 644 -D *.otb -t "$otb/share/fonts/misc";
39− mkfontdir "$otb/share/fonts/misc"
38+ install -m 644 -D *.otb -t "$out/share/fonts/misc";
39+ mkfontdir "$out/share/fonts/misc"
4040 '';
4141
4242 installTargets = [ "install" "fontdir" ];
4343
44− outputs = [ "out" "otb" ];
45−
4644 meta = with stdenv.lib; {
4745 description = "A clean fixed width font";
4846 longDescription = ''
pkgs/data/fonts/tewi/default.nix+1−7
@@ -38,16 +38,10 @@ stdenv.mkDerivation rec {
3838
3939 installPhase = ''
4040 fontDir="$out/share/fonts/misc"
41− install -m 644 -D out/* -t "$fontDir"
42− mkfontdir "$fontDir"
43−
44− fontDir="$otb/share/fonts/misc"
45− install -m 644 -D *.otb -t "$fontDir"
41+ install -m 644 -D *.otb out/* -t "$fontDir"
4642 mkfontdir "$fontDir"
4743 '';
4844
49− outputs = [ "out" "otb" ];
50−
5145 meta = with stdenv.lib; {
5246 description = "A nice bitmap font, readable even at small sizes";
5347 longDescription = ''
pkgs/data/fonts/ucs-fonts/default.nix+3−5
@@ -42,16 +42,14 @@ stdenv.mkDerivation {
4242 '';
4343
4444 installPhase = ''
45− install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
46− install -m 644 -D *.bdf -t "$bdf/share/fonts/misc"
47− install -m 644 -D *.otb -t "$otb/share/fonts/misc"
45+ install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc"
46+ install -m 644 -D *.bdf -t "$bdf/share/fonts/misc"
4847
4948 mkfontdir "$out/share/fonts/misc"
5049 mkfontdir "$bdf/share/fonts/misc"
51− mkfontdir "$otb/share/fonts/misc"
5250 '';
5351
54− outputs = [ "out" "bdf" "otb" ];
52+ outputs = [ "out" "bdf" ];
5553
5654 meta = with stdenv.lib; {
5755 homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html";
pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix+3−3
@@ -1,12 +1,12 @@
11{ lib, fetchzip }:
22
33let
4− version = "1.0";
4+ version = "2.0";
55in
66fetchzip {
77 name = "ultimate-oldschool-pc-font-pack-${version}";
8− url = "https://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
9− sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y";
8+ url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_ttf.zip";
9+ sha256 = "0z0fw6ni7iq806y4m83xrfx46r14xxxql09ch2gxjqi062awqyh8";
1010
1111 postFetch= ''
1212 mkdir -p $out/share/fonts/truetype
pkgs/data/fonts/uni-vga/default.nix+3−6
@@ -34,23 +34,20 @@ stdenv.mkDerivation {
3434 '';
3535
3636 installPhase = ''
37− # install pcf (for X11 applications)
38− install -m 644 -D *.pcf.gz -t "$out/share/fonts"
37+ # install pcf and otb (for X11 and GTK applications)
38+ install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts"
3939 mkfontdir "$out/share/fonts"
4040
4141 # install bdf font
4242 install -m 644 -D *.bdf -t "$bdf/share/fonts"
4343 mkfontdir "$bdf/share/fonts"
4444
45− # install otb font (for GTK applications)
46− install -m 644 -D *.otb -t "$otb/share/fonts"
47− mkfontdir "$otb/share/fonts"
4845 '' + optionalString stdenv.isLinux ''
4946 # install psf (for linux virtual terminal)
5047 install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
5148 '';
5249
53− outputs = [ "out" "bdf" "otb" ];
50+ outputs = [ "out" "bdf" ];
5451
5552 meta = {
5653 description = "Unicode VGA font";
pkgs/data/fonts/unifont/default.nix+2−4
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
3030 installPhase =
3131 ''
3232 # install otb fonts
33− install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb"
34− mkfontdir "$otb/share/fonts"
33+ install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb"
34+ mkfontdir "$out/share/fonts"
3535
3636 # install pcf and ttf fonts
3737 install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz
@@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
4141 mkfontscale
4242 '';
4343
44− outputs = [ "out" "otb" ];
45−
4644 meta = with stdenv.lib; {
4745 description = "Unicode font for Base Multilingual Plane";
4846 homepage = "http://unifoundry.com/unifont.html";
pkgs/data/fonts/uw-ttyp0/default.nix+1−3
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
6767 install -m 644 -D psf/*.psf -t "$fontDir"
6868
6969 # install otb fonts
70− fontDir="$otb/share/fonts/X11/misc"
70+ fontDir="$out/share/fonts/X11/misc"
7171 install -m 644 -D otb/*.otb -t "$fontDir"
7272 mkfontdir "$fontDir"
7373 '';
@@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
8080 runHook postConfigure
8181 '';
8282
83− outputs = [ "out" "otb" ];
84−
8583 meta = with stdenv.lib; {
8684 description = "Monospace bitmap screen fonts for X11";
8785 homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/";
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+3−3
@@ -67,13 +67,13 @@ let
6767in
6868stdenv.mkDerivation rec {
6969 pname = "gnome-shell";
70− version = "3.36.4";
70+ version = "3.36.5";
7171
7272 outputs = [ "out" "devdoc" ];
7373
7474 src = fetchurl {
75− url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
76− sha256 = "1nyibrr98ijn65z9ki0k7xzcwcliwy2jqssz0l0jalpbkhnr751d";
75+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
76+ sha256 = "1hj7gmjmy92xndlgw7pzk5m6j2fbzcgfd1pxc32k38gml8qg19d4";
7777 };
7878
7979 patches = [
pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix+5−7
@@ -1,26 +1,24 @@
1−{ stdenv, fetchFromGitLab }:
1+{ stdenv, fetchFromGitLab, glib, gnome3, unzip }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-night-theme-switcher";
5− version = "19";
5+ version = "36";
66
77 src = fetchFromGitLab {
88 owner = "rmnvgr";
99 repo = "nightthemeswitcher-gnome-shell-extension";
1010 rev = "v${version}";
11− sha256 = "1ll0yf1skf51wa10mlrajd1dy459w33kx0i3vhfcx2pdk7mw5a3c";
11+ sha256 = "1c88979qprwb5lj0v7va017w7rdr89a648anhw4k5q135jwyskpz";
1212 };
1313
14− # makefile tries to do install in home directory using
15− # `gnome-extensions install`
16− dontBuild = true;
14+ buildInputs = [ glib gnome3.gnome-shell unzip ];
1715
1816 uuid = "nightthemeswitcher@romainvigier.fr";
1917
2018 installPhase = ''
2119 runHook preInstall
2220 mkdir -p $out/share/gnome-shell/extensions/
23− cp -r src/ $out/share/gnome-shell/extensions/${uuid}
21+ unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid}
2422 runHook postInstall
2523 '';
2624
pkgs/desktops/xfce/applications/xfce4-volumed/default.nixdeleted−52
@@ -1,52 +0,0 @@
1−{ stdenv, fetchurl, pkgconfig, makeWrapper
2−, gstreamer, gtk2, gst-plugins-base, libnotify
3−, keybinder, xfconf, xfce
4−}:
5−
6−let
7− category = "apps";
8−
9− # The usual Gstreamer plugins package has a zillion dependencies
10− # that we don't need for a simple mixer, so build a minimal package.
11− gst_plugins_minimal = gst-plugins-base.override {
12− minimalDeps = true;
13− };
14−
15−in
16−
17−stdenv.mkDerivation rec {
18− pname = "xfce4-volumed";
19− version = "0.1.13";
20−
21− src = fetchurl {
22− url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
23− sha256 = "1aa0a1sbf9yzi7bc78kw044m0xzg1li3y4w9kf20wqv5kfjs7v2c";
24− };
25−
26− buildInputs =
27− [ gstreamer gst_plugins_minimal gtk2
28− keybinder xfconf libnotify
29− ];
30−
31− nativeBuildInputs = [ pkgconfig makeWrapper ];
32−
33− postInstall =
34− ''
35− wrapProgram "$out/bin/xfce4-volumed" \
36− --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
37− '';
38−
39− passthru.updateScript = xfce.updateScript {
40− inherit pname version;
41− attrPath = "xfce.${pname}";
42− versionLister = xfce.archiveLister category pname;
43− };
44−
45− meta = with stdenv.lib; {
46− homepage = "https://www.xfce.org/projects/xfce4-volumed"; # referenced but inactive
47− description = "A volume keys control daemon for the Xfce desktop environment";
48− license = licenses.gpl3;
49− platforms = platforms.linux;
50− maintainers = [ maintainers.abbradar ];
51− };
52−}
pkgs/desktops/xfce/default.nix−4
@@ -88,9 +88,6 @@ lib.makeScope pkgs.newScope (self: with self; {
8888
8989 xfdashboard = callPackage ./applications/xfdashboard {};
9090
91− # TODO: this repo is inactive for many years. Remove?
92− xfce4-volumed = callPackage ./applications/xfce4-volumed { };
93−
9491 xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
9592
9693 xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
@@ -175,7 +172,6 @@ lib.makeScope pkgs.newScope (self: with self; {
175172 xfce4notifyd = xfce4-notifyd;
176173 xfce4taskmanager = xfce4-taskmanager;
177174 xfce4terminal = xfce4-terminal;
178− xfce4volumed = xfce4-volumed;
179175 xfce4volumed_pulse = xfce4-volumed-pulse;
180176 xfce4icontheme = xfce4-icon-theme;
181177 xfwm4themes = xfwm4-themes;
pkgs/development/compilers/nextpnr/default.nix+3−3
@@ -14,14 +14,14 @@ let
1414in
1515with stdenv; mkDerivation rec {
1616 pname = "nextpnr";
17− version = "2020.07.08";
17+ version = "2020.08.22";
1818
1919 srcs = [
2020 (fetchFromGitHub {
2121 owner = "YosysHQ";
2222 repo = "nextpnr";
23− rev = "3cafb16aa634d2bc369077d8d36760d23973a35b";
24− sha256 = "0z6q8f2f97jr037d51h097vck9jspidjn0pb5irlj0xdnb5si0js";
23+ rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508";
24+ sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv";
2525 name = "nextpnr";
2626 })
2727 (fetchFromGitHub {
pkgs/development/compilers/yosys/default.nix+3−3
@@ -16,13 +16,13 @@
1616
1717stdenv.mkDerivation rec {
1818 pname = "yosys";
19− version = "2020.07.07";
19+ version = "2020.08.22";
2020
2121 src = fetchFromGitHub {
2222 owner = "YosysHQ";
2323 repo = "yosys";
24− rev = "000fd08198487cd1d36e65e4470f4b0269c23a2b";
25− sha256 = "01s252vwh4g1f4y99nfrkpf6hgvh9k63nz8hvpmjza5z8x6zf4i1";
24+ rev = "12132b6850747aec99715fdfa3184fe3ebefa015";
25+ sha256 = "1v6x1y2f3r8vi7pnkgx374rrv02xgmg9yg23f61n7d1v2rd6y5cc";
2626 };
2727
2828 enableParallelBuilding = true;
pkgs/development/coq-modules/coqprime/default.nix+6−4
@@ -6,6 +6,10 @@ let
66 version = "8.8";
77 sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
88 };
9+ v_8_10 = {
10+ version = "8.10";
11+ sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
12+ };
913 in
1014 {
1115 "8.7" = {
@@ -14,10 +18,8 @@ let
1418 };
1519 "8.8" = v_8_8;
1620 "8.9" = v_8_8;
17− "8.10" = {
18− version = "8.10";
19− sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
20− };
21+ "8.10" = v_8_10;
22+ "8.11" = v_8_10;
2123 };
2224 param = params.${coq.coq-version};
2325in
pkgs/development/interpreters/clojure/default.nix+3−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "clojure";
5− version = "1.10.1.590";
5+ version = "1.10.1.645";
66
77 src = fetchurl {
88 url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
9− sha256 = "18x8xkxsqwnv3k1mf42ylfv7zzjllm7yiagq16b2gkq62j5sm1k7";
9+ sha256 = "1z6a9an8ls992y4japmzdxay7c5d2z9s2q1xl4g615r23jwpcsf9";
1010 };
1111
1212 nativeBuildInputs = [
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
2323 cp clojure-tools-${version}.jar $out/libexec
2424 cp example-deps.edn $out
2525 cp deps.edn $out
26+ cp clj_exec.clj $out
2627
2728 substituteInPlace clojure --replace PREFIX $out
2829
pkgs/development/interpreters/groovy/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "groovy";
7− version = "3.0.2";
7+ version = "3.0.3";
88
99 src = fetchurl {
1010 url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
11− sha256 = "1ddw3fqrmwh4w6z6xgck4jhmq33rwgbmpjw07g12ri1vgw4xks9w";
11+ sha256 = "0xdm70b61pdj8z3g08az16y9b6cpz5hv7iwvwfyfyxrjdi47h419";
1212 };
1313
1414 buildInputs = [ unzip makeWrapper ];
pkgs/development/interpreters/guile/2.0.nix+1−1
@@ -59,7 +59,7 @@
5959 # "libgcc_s.so.1 must be installed for pthread_cancel to work".
6060
6161 # don't have "libgcc_s.so.1" on darwin
62− LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
62+ LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
6363
6464 configureFlags = [ "--with-libreadline-prefix" ]
6565 ++ stdenv.lib.optionals stdenv.isSunOS [
pkgs/development/libraries/libguestfs/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
22, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
3−, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
3+, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
44, gmp, readline, file, numactl, xen, libapparmor, jansson
55, getopt, perlPackages, ocamlPackages
66, appliance ? null
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [
2323 ncurses cpio gperf jansson
2424 cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
25− systemd fuse yajl libvirt gmp readline file hivex
25+ systemd fuse yajl libvirt gmp readline file hivex db
2626 numactl xen libapparmor getopt perlPackages.ModuleBuild
2727 ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
2828 ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ])
pkgs/development/libraries/oneDNN/default.nix+2−2
@@ -5,13 +5,13 @@
55# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
66stdenv.mkDerivation rec {
77 pname = "oneDNN";
8− version = "1.6";
8+ version = "1.6.1";
99
1010 src = fetchFromGitHub {
1111 owner = "oneapi-src";
1212 repo = "oneDNN";
1313 rev = "v${version}";
14− sha256 = "0w2rgr3zgk7a3cql12dpddyhz2isyqqaks4vm8p45y426pd5m64b";
14+ sha256 = "1rdq2rb4f9xbk2a07fpqgvd9mx1r5gwpm0jr8rra815bzddam8zh";
1515 };
1616
1717 outputs = [ "out" "dev" "doc" ];
pkgs/development/libraries/openxr-loader/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "openxr-loader";
5− version = "1.0.10";
5+ version = "1.0.11";
66
77 src = fetchFromGitHub {
88 owner = "KhronosGroup";
99 repo = "OpenXR-SDK-Source";
1010 rev = "release-${version}";
11− sha256 = "1igxyji2ab3gki1hlndvws1b2868mk1n3c4c3y5z0h3g713zw9ap";
11+ sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5";
1212 };
1313
1414 nativeBuildInputs = [ cmake python3 ];
pkgs/development/libraries/science/math/magma/default.nix+7−5
@@ -1,19 +1,21 @@
1−{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }:
1+{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
22
33with stdenv.lib;
44
5−let version = "2.5.0";
5+let version = "2.5.3";
66
77in stdenv.mkDerivation {
88 pname = "magma";
99 inherit version;
1010 src = fetchurl {
1111 url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
12− sha256 = "0czspk93cv1fy37zyrrc9k306q4yzfxkhy1y4lj937dx8rz5rm2g";
12+ sha256 = "1xjy3irdx0w1zyhvn4x47zni5fwsh6z97xd4yqldz8zrm5lx40n6";
1313 name = "magma-${version}.tar.gz";
1414 };
1515
16− buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ];
16+ nativeBuildInputs = [ gfortran cmake ninja ];
17+
18+ buildInputs = [ cudatoolkit libpthreadstubs lapack blas ];
1719
1820 doCheck = false;
1921
@@ -32,7 +34,7 @@ in stdenv.mkDerivation {
3234 mkdir -p $out/lib/pkgconfig
3335 cp -a ../include/*.h $out/include
3436 #cp -a sparse-iter/include/*.h $out/include
35− cp -a lib/*.a $out/lib
37+ cp -a lib/*.so $out/lib
3638 cat ../lib/pkgconfig/magma.pc.in | \
3739 sed -e s:@INSTALL_PREFIX@:"$out": | \
3840 sed -e s:@CFLAGS@:"-I$out/include": | \
pkgs/development/libraries/tk/generic.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 postInstall = ''
2020 ln -s $out/bin/wish* $out/bin/wish
2121 cp ../{unix,generic}/*.h $out/include
22− ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so
22+ ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary}
2323 ''
2424 + stdenv.lib.optionalString (stdenv.isDarwin) ''
2525 cp ../macosx/*.h $out/include
pkgs/development/libraries/utf8proc/default.nix+6
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
1717 "-DBUILD_SHARED_LIBS=ON"
1818 ];
1919
20+ # the pkg-config file is not created in the cmake installation
21+ # process, so we use the Makefile and install it manually
22+ # see https://github.com/JuliaStrings/utf8proc/issues/198
23+ preConfigure = "make libutf8proc.pc prefix=$out";
24+ postInstall = "install -Dm644 ../libutf8proc.pc -t $out/lib/pkgconfig/";
25+
2026 meta = with stdenv.lib; {
2127 description = "A clean C library for processing UTF-8 Unicode data";
2228 homepage = "https://juliastrings.github.io/utf8proc/";
pkgs/development/ocaml-modules/containers/data.nixnew file+18
@@ -0,0 +1,18 @@
1+{ buildDunePackage, containers
2+, gen, iter, mdx, ounit, qcheck
3+}:
4+
5+buildDunePackage {
6+ pname = "containers-data";
7+
8+ inherit (containers) src version;
9+
10+ doCheck = true;
11+ checkInputs = [ gen iter mdx.bin ounit qcheck ];
12+
13+ propagatedBuildInputs = [ containers ];
14+
15+ meta = containers.meta // {
16+ description = "A set of advanced datatypes for containers";
17+ };
18+}
pkgs/development/ocaml-modules/containers/default.nix+6−8
@@ -1,24 +1,22 @@
11{ lib, fetchFromGitHub, buildDunePackage, ocaml
2−, iter, result, uchar
3−, gen, mdx, ounit, qcheck, uutf
2+, seq
3+, gen, iter, ounit, qcheck, uutf
44}:
55
66buildDunePackage rec {
7− version = "2.7";
7+ version = "3.0";
88 pname = "containers";
99
1010 src = fetchFromGitHub {
1111 owner = "c-cube";
1212 repo = "ocaml-containers";
1313 rev = "v${version}";
14− sha256 = "1nsxfgn1g1vpqihb9gd6gsab0bcm70nf9z84cp441c8wsc57hi6a";
14+ sha256 = "0c75d5csgc68qqbsdz4279nlin111zrjbg4d47k32ska28myvpqn";
1515 };
1616
17− buildInputs = [ iter ];
17+ propagatedBuildInputs = [ seq ];
1818
19− checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ];
20−
21− propagatedBuildInputs = [ result uchar ];
19+ checkInputs = [ gen iter ounit qcheck uutf ];
2220
2321 doCheck = true;
2422
pkgs/development/ocaml-modules/dune-action-plugin/default.nixnew file+19
@@ -0,0 +1,19 @@
1+{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }:
2+
3+buildDunePackage rec {
4+ pname = "dune-action-plugin";
5+ inherit (dune_2) src version;
6+
7+ useDune2 = true;
8+
9+ dontAddPrefix = true;
10+
11+ propagatedBuildInputs = [ dune-glob dune-private-libs ];
12+
13+ meta = with lib; {
14+ inherit (dune_2.meta) homepage;
15+ description = "API for writing dynamic Dune actions";
16+ maintainers = [ maintainers.marsam ];
17+ license = licenses.mit;
18+ };
19+}
pkgs/development/ocaml-modules/dune-glob/default.nixnew file+19
@@ -0,0 +1,19 @@
1+{ lib, buildDunePackage, dune_2, dune-private-libs }:
2+
3+buildDunePackage rec {
4+ pname = "dune-glob";
5+ inherit (dune_2) src version;
6+
7+ useDune2 = true;
8+
9+ dontAddPrefix = true;
10+
11+ propagatedBuildInputs = [ dune-private-libs ];
12+
13+ meta = with lib; {
14+ inherit (dune_2.meta) homepage;
15+ description = "Glob string matching language supported by dune";
16+ maintainers = [ maintainers.marsam ];
17+ license = licenses.mit;
18+ };
19+}
pkgs/development/ocaml-modules/dune-private-libs/default.nix+1−1
@@ -7,7 +7,7 @@ buildDunePackage rec {
77
88 inherit (dune_2) src version;
99
10− minimumOCamlVersion = "4.07";
10+ minimumOCamlVersion = "4.08";
1111
1212 dontAddPrefix = true;
1313
pkgs/development/ocaml-modules/hidapi/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ pkgs, lib, fetchurl, buildDunePackage, pkg-config
2+, bigstring,
3+}:
4+
5+buildDunePackage rec {
6+ pname = "hidapi";
7+ version = "1.1.1";
8+
9+ src = fetchurl {
10+ url = "https://github.com/vbmithr/ocaml-hidapi/releases/download/${version}/${pname}-${version}.tbz";
11+ sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2";
12+ };
13+
14+ minimumOCamlVersion = "4.03";
15+
16+ buildInputs = [ pkgs.hidapi pkg-config ];
17+ propagatedBuildInputs = [ bigstring ];
18+
19+ doCheck = true;
20+
21+ meta = with lib; {
22+ homepage = https://github.com/vbmithr/ocaml-hidapi;
23+ description = "Bindings to Signal11's hidapi library";
24+ license = licenses.isc;
25+ maintainers = [ maintainers.alexfmpe ];
26+ };
27+}
pkgs/development/ocaml-modules/ocamlgraph/default.nix+14−14
@@ -1,4 +1,7 @@
1−{stdenv, fetchurl, ocaml, findlib, lablgtk ? null}:
1+{ stdenv, fetchurl, ocaml, findlib
2+, gtkSupport ? true
3+, lablgtk
4+}:
25
36stdenv.mkDerivation rec {
47 pname = "ocamlgraph";
@@ -9,22 +12,19 @@ stdenv.mkDerivation rec {
912 sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr";
1013 };
1114
12− buildInputs = [ ocaml findlib lablgtk ];
13−
14− patches = ./destdir.patch;
15−
16− postPatch = ''
17− sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
18− sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in
19− ${stdenv.lib.optionalString (lablgtk != null)
20− "sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile"}
21− '';
15+ buildInputs = [ ocaml findlib ]
16+ ++ stdenv.lib.optional gtkSupport lablgtk
17+ ;
2218
2319 createFindlibDestdir = true;
2420
25− buildPhase = ''
26− make all
27− make install-findlib
21+ buildFlags = [ "all" ];
22+ installTargets = [ "install-findlib" ];
23+
24+ postInstall = stdenv.lib.optionalString gtkSupport ''
25+ mkdir -p $out/bin
26+ cp dgraph/dgraph.opt $out/bin/graph-viewer
27+ cp editor/editor.opt $out/bin/graph-editor
2828 '';
2929
3030 meta = {
pkgs/development/ocaml-modules/ocamlgraph/destdir.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff -Naur -x '*~' ocamlgraph-1.8.1/Makefile.in ocamlgraph-1.8.1-new//Makefile.in
2−--- ocamlgraph-1.8.1/Makefile.in 2011-10-17 09:57:03.000000000 -0430
3−+++ ocamlgraph-1.8.1-new//Makefile.in 2011-11-24 13:01:22.626004819 -0430
4−@@ -16,8 +16,8 @@
5− ##########################################################################
6−
7− # Where to install the binaries
8−-DESTDIR =
9− prefix =@prefix@
10−+DESTDIR=$(prefix)
11− exec_prefix=@exec_prefix@
12− datarootdir=@datarootdir@
13− BINDIR =$(DESTDIR)@bindir@
pkgs/development/python-modules/awkward1/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "awkward1";
13− version = "0.2.27";
13+ version = "0.2.33";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c868437aabb2e95efbc522c43d47cac42e1c61904c7ddbebf2f41c6b63bb9c6f";
17+ sha256 = "bf3de210d0a88fb14a97c296f54ed2d5b686a785bb5fd7a31277f22b8daa9513";
1818 };
1919
2020 nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/gspread/default.nix+2−3
@@ -3,6 +3,7 @@
33, fetchPypi
44, requests
55, google_auth
6+, google-auth-oauthlib
67}:
78
89buildPythonPackage rec {
@@ -14,14 +15,12 @@ buildPythonPackage rec {
1415 sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c";
1516 };
1617
17− propagatedBuildInputs = [ requests ];
18+ propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ];
1819
1920 meta = with stdenv.lib; {
2021 description = "Google Spreadsheets client library";
2122 homepage = "https://github.com/burnash/gspread";
2223 license = licenses.mit;
23− # missing multiple google libraries
24− broken = true; # 2020-08-15
2524 };
2625
2726 # No tests included
pkgs/development/python-modules/pandas/default.nix+4
@@ -58,6 +58,10 @@ in buildPythonPackage rec {
5858 xlwt
5959 ];
6060
61+ # doesn't work with -Werror,-Wunused-command-line-argument
62+ # https://github.com/NixOS/nixpkgs/issues/39687
63+ hardeningDisable = optional stdenv.cc.isClang "strictoverflow";
64+
6165 # For OSX, we need to add a dependency on libcxx, which provides
6266 # `complex.h` and other libraries that pandas depends on to build.
6367 postPatch = optionalString isDarwin ''
pkgs/development/python-modules/pelican/default.nix+12−15
@@ -1,18 +1,20 @@
1−{ stdenv, buildPythonPackage, fetchFromGitHub
1+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
22, glibcLocales, git
33, mock, nose, markdown, lxml, typogrify
44, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
5−, blinker, pillow, beautifulsoup4, markupsafe }:
5+, blinker, pillow, beautifulsoup4, markupsafe, pandoc }:
66
77buildPythonPackage rec {
88 pname = "pelican";
9− version = "4.2.0";
9+ version = "4.5.0";
10+
11+ disabled = isPy27;
1012
1113 src = fetchFromGitHub {
1214 owner = "getpelican";
1315 repo = "pelican";
1416 rev = version;
15− sha256 = "0w9nqdw2jmqc6kqwg4rh6irr5k6j7hk8axg6vgd137rs50v62yv5";
17+ sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi";
1618 # Remove unicode file names which leads to different checksums on HFS+
1719 # vs. other filesystems because of unicode normalisation.
1820 extraPostFetch = ''
@@ -24,15 +26,15 @@ buildPythonPackage rec {
2426
2527 # Exclude custom locale test, which files were removed above to fix the source checksum
2628 checkPhase = ''
27− nosetests -sv --exclude=test_custom_locale_generation_works pelican
29+ nosetests -s \
30+ --exclude=test_custom_locale_generation_works \
31+ --exclude=test_log_filter \
32+ pelican
2833 '';
2934
3035 buildInputs = [
3136 glibcLocales
32− # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
33− # again. Compare https://github.com/getpelican/pelican/pull/2252.
34− # Version 4.2.0 is incompatible with our current pandoc version.
35− # pandoc
37+ pandoc
3638 git
3739 mock
3840 markdown
@@ -46,21 +48,16 @@ buildPythonPackage rec {
4648
4749 checkInputs = [
4850 nose
51+ pandoc
4952 ];
5053
5154 postPatch= ''
5255 substituteInPlace pelican/tests/test_pelican.py \
5356 --replace "'git'" "'${git}/bin/git'"
54−
55− # Markdown-3.1 changed footnote separator to colon
56− # https://github.com/getpelican/pelican/issues/2493#issuecomment-491723744
57− sed -i '/test_article_with_footnote/i\
58− @unittest.skip("")' pelican/tests/test_readers.py
5957 '';
6058
6159 LC_ALL="en_US.UTF-8";
6260
63−
6461 # We only want to patch shebangs in /bin, and not those
6562 # of the project scripts that are created by Pelican.
6663 # See https://github.com/NixOS/nixpkgs/issues/30116
pkgs/development/python-modules/sabyenc3/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ lib, fetchPypi, python3Packages }:
2+
3+python3Packages.buildPythonPackage rec {
4+ pname = "sabyenc3";
5+ version = "4.0.0";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "0zfj1k4zij8ph8jwkq4d6i6axym8cil16yijxshqla5163d1031z";
10+ };
11+
12+ # tests are not included in pypi distribution
13+ doCheck = false;
14+
15+ meta = {
16+ description = "yEnc Decoding for Python 3";
17+ homepage = "https://github.com/sabnzbd/sabyenc/";
18+ license = lib.licenses.lgpl3;
19+ maintainers = [ lib.maintainers.lovek323 ];
20+ };
21+
22+}
pkgs/development/python-modules/test-tube/default.nixnew file+46
@@ -0,0 +1,46 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, isPy27
5+, pytestCheckHook
6+, future
7+, imageio
8+, numpy
9+, pandas
10+, pytorch
11+, tensorflow-tensorboard
12+}:
13+
14+buildPythonPackage rec {
15+ pname = "test-tube";
16+ version = "0.7.5";
17+
18+ disabled = isPy27;
19+
20+ src = fetchFromGitHub {
21+ owner = "williamFalcon";
22+ repo = pname;
23+ rev = version;
24+ sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2";
25+ };
26+
27+ checkInputs = [
28+ pytestCheckHook
29+ ];
30+
31+ propagatedBuildInputs = [
32+ future
33+ imageio
34+ numpy
35+ pandas
36+ pytorch
37+ tensorflow-tensorboard
38+ ];
39+
40+ meta = with lib; {
41+ homepage = "https://github.com/williamFalcon/test-tube";
42+ description = "Framework-agnostic library to track and parallelize hyperparameter search in machine learning experiments";
43+ license = licenses.mit;
44+ maintainers = [ maintainers.tbenst ];
45+ };
46+}
pkgs/development/python-modules/userpath/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, click
5+, distro
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "userpath";
10+ version = "1.4.1";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256="0mfjmvx286z1dmnrc7bm65x8gj8qrmkcyagl0vf5ywfq0bm48591";
15+ };
16+
17+ propagatedBuildInputs = [ click distro ];
18+
19+ # test suite is difficult to emulate in sandbox due to shell manipulation
20+ doCheck = false;
21+
22+ pythonImportsCheck = [ "click" "userpath" ];
23+
24+ meta = with lib; {
25+ description = "Cross-platform tool for adding locations to the user PATH";
26+ homepage = "https://github.com/ofek/userpath";
27+ license = [ licenses.asl20 licenses.mit ];
28+ maintainers = with maintainers; [ yevhenshymotiuk ];
29+ };
30+}
pkgs/development/tools/analysis/tflint/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "tflint";
5− version = "0.19.0";
5+ version = "0.19.1";
66
77 src = fetchFromGitHub {
88 owner = "terraform-linters";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "14pgsx136ibaf1mqkwn8ibnn4g6q5xx0r7xbijj521v12m145i8g";
11+ sha256 = "1nj36xxl8zg7wdc36lakzdyr9hk82qwkwrvrw19bqach697y57nf";
1212 };
1313
1414 vendorSha256 = "0bzd58ry5k100mjgvl1mxz7aysm75s4vkilcykrqy1s5sc0h3ng5";
pkgs/development/tools/bazel-kazel/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "bazel-kazel";
5− version = "0.0.11";
5+ version = "0.0.12";
66
77 src = fetchFromGitHub {
88 owner = "kubernetes";
99 repo = "repo-infra";
1010 rev = "v${version}";
11− sha256 = "0fcm7gjsv70qxnwbgy2sgx7clyhlfnkvdxsjgcrkaf5xds8hpys7";
11+ sha256 = "1mnyp116q54xy7flml4cdcsbczhyyqnpyn2pnqrzy49aahbhpn5z";
1212 };
1313
1414 vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf";
pkgs/development/tools/cloudfoundry-cli/default.nix+11−4
@@ -1,8 +1,8 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
1+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }:
22
33buildGoPackage rec {
44 pname = "cloudfoundry-cli";
5− version = "6.51.0";
5+ version = "7.0.1";
66
77 goPackagePath = "code.cloudfoundry.org/cli";
88
@@ -12,7 +12,14 @@ buildGoPackage rec {
1212 owner = "cloudfoundry";
1313 repo = "cli";
1414 rev = "v${version}";
15− sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f";
15+ sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l";
16+ };
17+
18+ # upstream have helpfully moved the bash completion script to a separate
19+ # repo which receives no releases or even tags
20+ bashCompletionScript = fetchurl {
21+ url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7";
22+ sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy";
1623 };
1724
1825 nativeBuildInputs = [ installShellFiles ];
@@ -35,7 +42,7 @@ buildGoPackage rec {
3542
3643 installPhase = ''
3744 install -Dm555 out/cf "$out/bin/cf"
38− installShellCompletion --bash "$src/ci/installers/completion/cf"
45+ installShellCompletion --bash $bashCompletionScript
3946 '';
4047
4148 meta = with stdenv.lib; {
pkgs/development/tools/database/dbmate/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "dbmate";
5− version = "1.9.1";
5+ version = "1.10.0";
66
77 src = fetchFromGitHub {
88 owner = "amacneil";
99 repo = "dbmate";
1010 rev = "v${version}";
11− sha256 = "0s7ymw1r1k1s8kwyg6nxpgak6kh9z3649a0axdfpjnm62v283shd";
11+ sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w";
1212 };
1313
14− vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p";
14+ vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2";
1515
1616 doCheck = false;
1717
pkgs/development/tools/icestorm/default.nix+4−4
@@ -11,7 +11,7 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "icestorm";
14− version = "2020.07.08";
14+ version = "2020.08.19";
1515
1616 passthru = rec {
1717 pythonPkg = if usePyPy then pypy3 else python3;
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
1919 };
2020
2121 src = fetchFromGitHub {
22− owner = "cliffordwolf";
22+ owner = "YosysHQ";
2323 repo = "icestorm";
24− rev = "d12308775684cf43ab923227235b4ad43060015e";
25− sha256 = "18ykv6np8sp7rb7c1cm3ha3qnj280gpkyn476faahb15jh0nbjmw";
24+ rev = "da52117ccd5b4147f64dc7345357ec5439cd7543";
25+ sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k";
2626 };
2727
2828 nativeBuildInputs = [ pkgconfig ];
pkgs/development/tools/misc/itm-tools/cargo-lock.patchnew file+321
@@ -0,0 +1,321 @@
1+diff --git a/Cargo.lock b/Cargo.lock
2+new file mode 100644
3+index 0000000..d9d39e5
4+--- /dev/null
5++++ b/Cargo.lock
6+@@ -0,0 +1,315 @@
7++# This file is automatically @generated by Cargo.
8++# It is not intended for manual editing.
9++[[package]]
10++name = "addr2line"
11++version = "0.12.2"
12++source = "registry+https://github.com/rust-lang/crates.io-index"
13++checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c"
14++dependencies = [
15++ "gimli",
16++]
17++
18++[[package]]
19++name = "adler32"
20++version = "1.1.0"
21++source = "registry+https://github.com/rust-lang/crates.io-index"
22++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
23++
24++[[package]]
25++name = "ansi_term"
26++version = "0.11.0"
27++source = "registry+https://github.com/rust-lang/crates.io-index"
28++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
29++dependencies = [
30++ "winapi",
31++]
32++
33++[[package]]
34++name = "atty"
35++version = "0.2.14"
36++source = "registry+https://github.com/rust-lang/crates.io-index"
37++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
38++dependencies = [
39++ "hermit-abi",
40++ "libc",
41++ "winapi",
42++]
43++
44++[[package]]
45++name = "backtrace"
46++version = "0.3.49"
47++source = "registry+https://github.com/rust-lang/crates.io-index"
48++checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c"
49++dependencies = [
50++ "addr2line",
51++ "cfg-if",
52++ "libc",
53++ "miniz_oxide",
54++ "object",
55++ "rustc-demangle",
56++]
57++
58++[[package]]
59++name = "bitflags"
60++version = "1.2.1"
61++source = "registry+https://github.com/rust-lang/crates.io-index"
62++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
63++
64++[[package]]
65++name = "byteorder"
66++version = "1.3.4"
67++source = "registry+https://github.com/rust-lang/crates.io-index"
68++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
69++
70++[[package]]
71++name = "cfg-if"
72++version = "0.1.10"
73++source = "registry+https://github.com/rust-lang/crates.io-index"
74++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
75++
76++[[package]]
77++name = "clap"
78++version = "2.33.1"
79++source = "registry+https://github.com/rust-lang/crates.io-index"
80++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
81++dependencies = [
82++ "ansi_term",
83++ "atty",
84++ "bitflags",
85++ "strsim",
86++ "textwrap",
87++ "unicode-width",
88++ "vec_map",
89++]
90++
91++[[package]]
92++name = "either"
93++version = "1.5.3"
94++source = "registry+https://github.com/rust-lang/crates.io-index"
95++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
96++
97++[[package]]
98++name = "exitfailure"
99++version = "0.5.1"
100++source = "registry+https://github.com/rust-lang/crates.io-index"
101++checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515"
102++dependencies = [
103++ "failure",
104++]
105++
106++[[package]]
107++name = "failure"
108++version = "0.1.8"
109++source = "registry+https://github.com/rust-lang/crates.io-index"
110++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
111++dependencies = [
112++ "backtrace",
113++ "failure_derive",
114++]
115++
116++[[package]]
117++name = "failure_derive"
118++version = "0.1.8"
119++source = "registry+https://github.com/rust-lang/crates.io-index"
120++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
121++dependencies = [
122++ "proc-macro2",
123++ "quote",
124++ "syn",
125++ "synstructure",
126++]
127++
128++[[package]]
129++name = "gimli"
130++version = "0.21.0"
131++source = "registry+https://github.com/rust-lang/crates.io-index"
132++checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
133++
134++[[package]]
135++name = "hermit-abi"
136++version = "0.1.15"
137++source = "registry+https://github.com/rust-lang/crates.io-index"
138++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
139++dependencies = [
140++ "libc",
141++]
142++
143++[[package]]
144++name = "itm"
145++version = "0.4.0"
146++source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4"
147++dependencies = [
148++ "byteorder",
149++ "either",
150++ "thiserror",
151++]
152++
153++[[package]]
154++name = "itm-tools"
155++version = "0.1.0"
156++dependencies = [
157++ "clap",
158++ "exitfailure",
159++ "failure",
160++ "itm",
161++ "rustc-demangle",
162++ "xmas-elf",
163++]
164++
165++[[package]]
166++name = "libc"
167++version = "0.2.71"
168++source = "registry+https://github.com/rust-lang/crates.io-index"
169++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
170++
171++[[package]]
172++name = "miniz_oxide"
173++version = "0.3.7"
174++source = "registry+https://github.com/rust-lang/crates.io-index"
175++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
176++dependencies = [
177++ "adler32",
178++]
179++
180++[[package]]
181++name = "object"
182++version = "0.20.0"
183++source = "registry+https://github.com/rust-lang/crates.io-index"
184++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
185++
186++[[package]]
187++name = "proc-macro2"
188++version = "1.0.18"
189++source = "registry+https://github.com/rust-lang/crates.io-index"
190++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
191++dependencies = [
192++ "unicode-xid",
193++]
194++
195++[[package]]
196++name = "quote"
197++version = "1.0.7"
198++source = "registry+https://github.com/rust-lang/crates.io-index"
199++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
200++dependencies = [
201++ "proc-macro2",
202++]
203++
204++[[package]]
205++name = "rustc-demangle"
206++version = "0.1.16"
207++source = "registry+https://github.com/rust-lang/crates.io-index"
208++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
209++
210++[[package]]
211++name = "strsim"
212++version = "0.8.0"
213++source = "registry+https://github.com/rust-lang/crates.io-index"
214++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
215++
216++[[package]]
217++name = "syn"
218++version = "1.0.33"
219++source = "registry+https://github.com/rust-lang/crates.io-index"
220++checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
221++dependencies = [
222++ "proc-macro2",
223++ "quote",
224++ "unicode-xid",
225++]
226++
227++[[package]]
228++name = "synstructure"
229++version = "0.12.4"
230++source = "registry+https://github.com/rust-lang/crates.io-index"
231++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
232++dependencies = [
233++ "proc-macro2",
234++ "quote",
235++ "syn",
236++ "unicode-xid",
237++]
238++
239++[[package]]
240++name = "textwrap"
241++version = "0.11.0"
242++source = "registry+https://github.com/rust-lang/crates.io-index"
243++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
244++dependencies = [
245++ "unicode-width",
246++]
247++
248++[[package]]
249++name = "thiserror"
250++version = "1.0.20"
251++source = "registry+https://github.com/rust-lang/crates.io-index"
252++checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
253++dependencies = [
254++ "thiserror-impl",
255++]
256++
257++[[package]]
258++name = "thiserror-impl"
259++version = "1.0.20"
260++source = "registry+https://github.com/rust-lang/crates.io-index"
261++checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
262++dependencies = [
263++ "proc-macro2",
264++ "quote",
265++ "syn",
266++]
267++
268++[[package]]
269++name = "unicode-width"
270++version = "0.1.8"
271++source = "registry+https://github.com/rust-lang/crates.io-index"
272++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
273++
274++[[package]]
275++name = "unicode-xid"
276++version = "0.2.1"
277++source = "registry+https://github.com/rust-lang/crates.io-index"
278++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
279++
280++[[package]]
281++name = "vec_map"
282++version = "0.8.2"
283++source = "registry+https://github.com/rust-lang/crates.io-index"
284++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
285++
286++[[package]]
287++name = "winapi"
288++version = "0.3.9"
289++source = "registry+https://github.com/rust-lang/crates.io-index"
290++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
291++dependencies = [
292++ "winapi-i686-pc-windows-gnu",
293++ "winapi-x86_64-pc-windows-gnu",
294++]
295++
296++[[package]]
297++name = "winapi-i686-pc-windows-gnu"
298++version = "0.4.0"
299++source = "registry+https://github.com/rust-lang/crates.io-index"
300++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
301++
302++[[package]]
303++name = "winapi-x86_64-pc-windows-gnu"
304++version = "0.4.0"
305++source = "registry+https://github.com/rust-lang/crates.io-index"
306++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
307++
308++[[package]]
309++name = "xmas-elf"
310++version = "0.6.2"
311++source = "registry+https://github.com/rust-lang/crates.io-index"
312++checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58"
313++dependencies = [
314++ "zero",
315++]
316++
317++[[package]]
318++name = "zero"
319++version = "0.1.2"
320++source = "registry+https://github.com/rust-lang/crates.io-index"
321++checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5"
pkgs/development/tools/misc/itm-tools/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "itm-tools";
5+ version = "unstable-2019-11-15";
6+
7+ src = fetchFromGitHub {
8+ owner = "japaric";
9+ repo = pname;
10+ rev = "e94155e44019d893ac8e6dab51cc282d344ab700";
11+ sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy";
12+ };
13+
14+ cargoPatches = [ ./cargo-lock.patch ];
15+
16+ cargoSha256 = "0rl2ph5igwjl7rwpwcf6afnxly5av7cd6va6wn82lxm606giyq75";
17+
18+ nativeBuildInputs = [ pkg-config ];
19+
20+ doCheck = false;
21+
22+ meta = with stdenv.lib; {
23+ description = "Tools for analyzing ITM traces";
24+ homepage = "https://github.com/japaric/itm-tools";
25+ license = with licenses; [ asl20 mit ];
26+ maintainers = with maintainers; [ hh sb0 ];
27+ };
28+}
pkgs/development/tools/ocaml/dune/2.nix+3−3
@@ -1,16 +1,16 @@
11{ stdenv, fetchurl, ocaml, findlib }:
22
3−if stdenv.lib.versionOlder ocaml.version "4.07"
3+if stdenv.lib.versionOlder ocaml.version "4.08"
44then throw "dune is not available for OCaml ${ocaml.version}"
55else
66
77stdenv.mkDerivation rec {
88 pname = "dune";
9− version = "2.6.2";
9+ version = "2.7.0";
1010
1111 src = fetchurl {
1212 url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
13− sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg";
13+ sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl";
1414 };
1515
1616 buildInputs = [ ocaml findlib ];
pkgs/development/tools/rust/cargo-cache/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "cargo-cache";
5+ version = "0.5.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "matthiaskrgr";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi";
12+ };
13+
14+ cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw";
15+
16+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
17+
18+ checkFlagsArray = [ "offline_tests" ];
19+
20+ meta = with stdenv.lib; {
21+ description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively";
22+ homepage = "https://github.com/matthiaskrgr/cargo-cache";
23+ license = with licenses; [ asl20 /* or */ mit ];
24+ maintainers = with maintainers; [ filalex77 ];
25+ };
26+}
pkgs/development/tools/rust/cargo-fuzz/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
1+{ stdenv, fetchFromGitHub, rustPlatform }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-fuzz";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr";
1515
16+ doCheck = false;
17+
1618 meta = with stdenv.lib; {
1719 description = "Command line helpers for fuzzing";
1820 homepage = "https://github.com/rust-fuzz/cargo-fuzz";
pkgs/development/tools/rust/maturin/default.nix+3−3
@@ -5,16 +5,16 @@ let
55 inherit (darwin.apple_sdk.frameworks) Security;
66in rustPlatform.buildRustPackage rec {
77 name = "maturin-${version}";
8− version = "0.8.2";
8+ version = "0.8.3";
99
1010 src = fetchFromGitHub {
1111 owner = "PyO3";
1212 repo = "maturin";
1313 rev = "v${version}";
14− sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n";
14+ sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z";
1515 };
1616
17− cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm";
17+ cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
1818
1919 nativeBuildInputs = [ pkgconfig ];
2020
pkgs/development/tools/trellis/default.nix+4−4
@@ -8,18 +8,18 @@ let
88in
99stdenv.mkDerivation rec {
1010 pname = "trellis";
11− version = "2020.06.29";
11+ version = "2020.07.27";
1212
1313 # git describe --tags
1414 realVersion = with stdenv.lib; with builtins;
15− "1.0-176-g${substring 0 7 (elemAt srcs 0).rev}";
15+ "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}";
1616
1717 srcs = [
1818 (fetchFromGitHub {
1919 owner = "SymbiFlow";
2020 repo = "prjtrellis";
21− rev = "f93243b000c52b755c70829768d2ae6bcf7bb91a";
22− sha256 = "0f7xv99bxmidk7byahc821yzy8mln29gknz3w239i9xbwxzc6wc4";
21+ rev = "8c0a6382e11b160ed88d17af8493c12a897617ed";
22+ sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8";
2323 name = "trellis";
2424 })
2525
pkgs/games/tome2/default.nix+1−1
@@ -9,7 +9,7 @@ let
99 name = pname;
1010 exec = "${pname}-x11";
1111 icon = pname;
12− terminal = "False";
12+ terminal = "false";
1313 comment = description;
1414 type = "Application";
1515 categories = "Game;RolePlaying;";
pkgs/misc/hdt/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "hdt";
5+ version = "1.3.3";
6+
7+ src = fetchFromGitHub {
8+ owner = "rdfhdt";
9+ repo = "hdt-cpp";
10+ rev = "v${version}";
11+ sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z";
12+ };
13+
14+ buildInputs = [ zlib serd ];
15+
16+ nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
17+
18+ enableParallelBuilding = true;
19+
20+ meta = with stdenv.lib; {
21+ homepage = "http://www.rdfhdt.org/";
22+ description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns.";
23+ license = licenses.lgpl21;
24+ platforms = platforms.linux;
25+ maintainers = [ maintainers.koslambrou ];
26+ };
27+}
pkgs/os-specific/linux/lvm2/default.nix+2−2
@@ -16,11 +16,11 @@ assert enableDmeventd -> enableCmdlib;
1616
1717stdenv.mkDerivation rec {
1818 pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd";
19− version = "2.03.09";
19+ version = "2.03.10";
2020
2121 src = fetchurl {
2222 url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz";
23− sha256 = "0xdr9qbqw6kja267wmx6ajnfv1nhw056gpxx9v2qmfh3bj6qnfn0";
23+ sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las";
2424 };
2525
2626 nativeBuildInputs = [ pkgconfig ];
pkgs/servers/bazarr/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "bazarr";
5− version = "0.8.4.4";
5+ version = "0.9";
66
77 src = fetchurl {
88 url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
9− sha256 = "09qpy5fyyidi45968qg37cighfh3rgwsi8pfz4fk5fp2v1xq23yg";
9+ sha256 = "106f0gagq81rwykppyfjc7q8ibq3j89lp08hqgbmcv26hxb89rbj";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 cp -r * $out/src
1717
1818 mkdir -p $out/bin
19− makeWrapper "${(python3.withPackages (ps: [ps.lxml])).interpreter}" \
19+ makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \
2020 $out/bin/bazarr \
2121 --add-flags "$out/src/bazarr.py" \
2222 '';
pkgs/servers/rippled/default.nix+11−8
@@ -31,8 +31,8 @@ let
3131
3232 nudb = fetchgit rec {
3333 url = "https://github.com/CPPAlliance/NuDB.git";
34− rev = "2.0.1";
35− sha256 = "10hlp2k7pc0c705f8sk0qw6mjfky0k08cjhh262bbjvp9fbdc7r4";
34+ rev = "2.0.3";
35+ sha256 = "0imd9sh6knydwa3pxa5bbvjs3bmb8650dnsvj04qgns6bynwlqh1";
3636 leaveDotGit = true;
3737 fetchSubmodules = true;
3838 postFetch = "cd $out && git tag ${rev}";
@@ -49,8 +49,8 @@ let
4949
5050 lz4 = fetchgit rec {
5151 url = "https://github.com/lz4/lz4.git";
52− rev = "v1.8.2";
53− sha256 = "1niv553q60hwn95yflzmrqkp1046hrid13h0yr36lm4fjza21h9w";
52+ rev = "v1.9.2";
53+ sha256 = "0322xy2vfhxkb8akas7vwajjgcigq1q8l9f5fnfmavcsd6kmxmgg";
5454 leaveDotGit = true;
5555 fetchSubmodules = false;
5656 postFetch = "cd $out && git tag ${rev}";
@@ -58,8 +58,8 @@ let
5858
5959 libarchive = fetchgit rec {
6060 url = "https://github.com/libarchive/libarchive.git";
61− rev = "v3.3.3";
62− sha256 = "165imgfmizpi4ffpiwfs8gxysn6lw3y1fxj5rga98filkl7hxs31";
61+ rev = "v3.4.3";
62+ sha256 = "00yrzy2129vr4nfhigd91651984sl447dyfjfz26dmzvna5hwzp1";
6363 leaveDotGit = true;
6464 fetchSubmodules = false;
6565 postFetch = "cd $out && git tag ${rev}";
@@ -116,12 +116,12 @@ let
116116 };
117117in stdenv.mkDerivation rec {
118118 pname = "rippled";
119− version = "1.5.0";
119+ version = "1.6.0";
120120
121121 src = fetchgit {
122122 url = "https://github.com/ripple/rippled.git";
123123 rev = version;
124− sha256 = "0nh0x1ygrj3fw558vxbcp0md80qh27yrp3xhdlasrir7h1l2nplv";
124+ sha256 = "176i3dm98zp5jllslpzfhh52bd2lapq9i8r7m45v8sg9icvsmyz7";
125125 leaveDotGit = true;
126126 fetchSubmodules = true;
127127 };
@@ -146,6 +146,9 @@ in stdenv.mkDerivation rec {
146146 git config --global url."file://${google-test}".insteadOf "${google-test.url}"
147147 git config --global url."file://${date}".insteadOf "${date.url}"
148148
149+ substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
150+ substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
151+ substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
149152 substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}"
150153 '';
151154
pkgs/servers/sabnzbd/default.nix+20−4
@@ -1,17 +1,33 @@
1−{stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
1+{ stdenv
2+, fetchFromGitHub
3+, python3
4+, par2cmdline
5+, unzip
6+, unrar
7+, p7zip
8+, makeWrapper
9+}:
210
311let
4− pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]);
12+ pythonEnv = python3.withPackages(ps: with ps; [
13+ chardet
14+ cheetah3
15+ cherrypy
16+ cryptography
17+ configobj
18+ feedparser
19+ sabyenc3
20+ ]);
521 path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
622in stdenv.mkDerivation rec {
7− version = "2.3.9";
23+ version = "3.0.1";
824 pname = "sabnzbd";
925
1026 src = fetchFromGitHub {
1127 owner = pname;
1228 repo = pname;
1329 rev = version;
14− sha256 = "06ln00rqz4xpsqhq0f495893xq1w5dfjawb8dgfyjjfds8627p16";
30+ sha256 = "1zp8cxz56qmai1z6xcscnq85gxhv64dv1s5zqsqdn0zpbxyqqdlr";
1531 };
1632
1733 buildInputs = [ pythonEnv makeWrapper ];
pkgs/servers/sql/dolt/default.nix+3−3
@@ -2,18 +2,18 @@
22
33buildGoModule rec {
44 pname = "dolt";
5− version = "0.18.2";
5+ version = "0.18.3";
66
77 src = fetchFromGitHub {
88 owner = "liquidata-inc";
99 repo = "dolt";
1010 rev = "v${version}";
11− sha256 = "054dy5n9b8ahfwsih4chqg83c5sp8ihc68y79kz4508d42r0zvxz";
11+ sha256 = "0mgawr3nkyna22sqhskvvk7h9c8ivag959liji2qcdfwgfqp0l6z";
1212 };
1313
1414 modRoot = "./go";
1515 subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
16− vendorSha256 = "1dp1asi4iz9j0m8bqiap7m6ph0qf2bi9j2yn6q53539qspc5gkr2";
16+ vendorSha256 = "0rqkqyvf8mjl7b62ng7vzi6as6qw3sg3lzj2mcg1aiw3h7ikr6hw";
1717
1818 doCheck = false;
1919
pkgs/tools/X11/wmutils-libwm/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, fetchFromGitHub, libxcb }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "wmutils-libwm";
5+ version = "1.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "wmutils";
9+ repo = "libwm";
10+ rev = "v${version}";
11+ sha256 = "1lpbqrilhffpzc0b7vnp08jr1wr96lndwc7y0ck8hlbzlvm662l0";
12+ };
13+
14+ buildInputs = [ libxcb ];
15+
16+ installFlags = [ "PREFIX=$(out)" ];
17+
18+ meta = with stdenv.lib; {
19+ description = "A small library for X window manipulation";
20+ homepage = "https://github.com/wmutils/libwm";
21+ license = licenses.isc;
22+ maintainers = with maintainers; [ bhougland ];
23+ platforms = platforms.unix;
24+ };
25+}
pkgs/tools/X11/xpra/default.nix+4−1
@@ -90,9 +90,12 @@ in buildPythonApplication rec {
9090 "--with-vsock"
9191 ];
9292
93+ dontWrapGApps = true;
9394 preFixup = ''
94− gappsWrapperArgs+=(
95+ makeWrapperArgs+=(
96+ "''${gappsWrapperArgs[@]}"
9597 --set XPRA_INSTALL_PREFIX "$out"
98+ --set XPRA_COMMAND "$out/bin/xpra"
9699 --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
97100 --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
98101 )
pkgs/tools/admin/lego/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "lego";
5− version = "3.7.0";
5+ version = "3.8.0";
66
77 src = fetchFromGitHub {
88 owner = "go-acme";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "03824c5nfii7cc6mr1hdkyd4jjy8vpn08lnj4c6pc61s3i6gacc6";
11+ sha256 = "02p7zlrz8fp5bsvhk4jrx5x3gxnl00friay1jihlzyk3s400n9jb";
1212 };
1313
14− vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp";
14+ vendorSha256 = "0jh7qi422i2114198fain9nwwf8yd8vna0p3g0hvginh59svyagc";
1515
1616 doCheck = false;
1717
pkgs/tools/filesystems/fuse-overlayfs/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [ fuse3 ];
1717
18− passthru.tests.podman = nixosTests.podman;
18+ passthru.tests = { inherit (nixosTests) podman; };
1919
2020 meta = with stdenv.lib; {
2121 description = "FUSE implementation for overlayfs";
pkgs/tools/graphics/swfdec/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{stdenv, fetchurl
2−, cairo, pango, glib, liboil, zlib, gstreamer, gst-plugins-base
3−, gst-plugins-good , gtk2, libsoup, alsaLib, pkgconfig
4−}:
5−
6−stdenv.mkDerivation rec {
7− pname = "swfdec";
8− version = "0.8.4";
9−
10− src = fetchurl {
11− url = "http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-${version}.tar.gz";
12− sha256 = "00nqrd0fzf0g76rn80d7h56n6hxv7x1x6k89zj45bj564lzwc3vs";
13− };
14−
15− buildInputs = [
16− cairo glib liboil pango zlib gstreamer gst-plugins-base gst-plugins-good
17− gtk2 libsoup alsaLib pkgconfig
18− ];
19−
20− postInstall = ''
21− mkdir "$out/bin"
22− cp tools/.libs/swfdec-extract "$out/bin"
23− cp tools/.libs/dump "$out/bin/swfdec-dump"
24− cp player/.libs/swfplay "$out/bin/swfplay"
25− '';
26−
27− enableParallelBuilding = true;
28−
29− meta = {
30− inherit version;
31− description = "Decoder/renderer for Macromedia Flash animations";
32− license = stdenv.lib.licenses.lgpl21 ;
33− maintainers = [stdenv.lib.maintainers.raskin];
34− platforms = stdenv.lib.platforms.linux;
35− homepage = "https://swfdec.freedesktop.org/wiki/";
36− };
37−}
pkgs/tools/misc/mutagen/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "mutagen";
5− version = "0.11.6";
5+ version = "0.11.7";
66
77 src = fetchFromGitHub {
88 owner = "mutagen-io";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0gn0ra2fbnggp82h910hz34b2l5fk7f0p9dk7zl50wxrkydfzrk3";
11+ sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy";
1212 };
1313
1414 vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";
pkgs/tools/networking/mailutils/default.nix+1−1
@@ -115,6 +115,6 @@ stdenv.mkDerivation rec {
115115 homepage = "https://www.gnu.org/software/mailutils/";
116116
117117 # Some of the dependencies fail to build on {cyg,dar}win.
118− platforms = platforms.gnu ++ platforms.linux;
118+ platforms = platforms.gnu ++ platforms.unix;
119119 };
120120}
pkgs/tools/networking/slirp4netns/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 enableParallelBuilding = true;
2828
29− passthru.tests.podman = nixosTests.podman;
29+ passthru.tests = { inherit (nixosTests) podman; };
3030
3131 meta = with stdenv.lib; {
3232 homepage = "https://github.com/rootless-containers/slirp4netns";
pkgs/tools/security/1password-gui/default.nix+2−2
@@ -8,11 +8,11 @@
88
99stdenv.mkDerivation rec {
1010 pname = "1password";
11− version = "0.8.0";
11+ version = "0.8.2-1";
1212
1313 src = fetchurl {
1414 url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
15− sha256 = "1r26vyx724h3k6p340bg3lmcxwyvgxj2kqvwczq784583hpq3lq9";
15+ sha256 = "0gxq8xrr20jgp7k0sq5a9k63mz94zb00yvc9jw1zhl2q70ji24sa";
1616 };
1717
1818 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/security/creddump/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ stdenv, fetchFromGitLab, python2, python2Packages }:
2+
3+python2Packages.buildPythonApplication rec {
4+ pname = "creddump";
5+ version = "0.3";
6+
7+ src = fetchFromGitLab {
8+ owner = "kalilinux";
9+ repo = "packages/creddump";
10+ # url-encoding workaround: https://github.com/NixOS/nixpkgs/issues/65796#issuecomment-517829019
11+ rev = "debian%2F${version}-1kali2"; # %2F = urlquote("/")
12+ sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf";
13+ };
14+
15+ # No setup.py is available
16+ dontBuild = true;
17+ doCheck = false;
18+ propagatedBuildInputs = [ python2Packages.pycrypto ];
19+
20+ installPhase = ''
21+ mkdir -p ${placeholder "out"}/bin
22+ cp -r framework ${placeholder "out"}/bin/framework
23+ cp pwdump.py ${placeholder "out"}/bin/pwdump
24+ cp cachedump.py ${placeholder "out"}/bin/cachedump
25+ cp lsadump.py ${placeholder "out"}/bin/lsadump
26+ '';
27+
28+ meta = with stdenv.lib; {
29+ description = "Python tool to extract various credentials and secrets from Windows registry hives";
30+ homepage = "https://gitlab.com/kalilinux/packages/creddump";
31+ license = licenses.gpl3;
32+ platforms = platforms.unix;
33+ maintainers = [ maintainers.fishi0x01 ];
34+ };
35+}
36+
pkgs/tools/security/ibm-sw-tpm2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "ibm-sw-tpm2";
5− version = "1628";
5+ version = "1637";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz";
9− sha256 = "18wywbsdp5sjrapznk2ydbmx0whz513dhybn1lls24xfl7kp9s58";
9+ sha256 = "09z3wbv38dc8wnw1q961s6bcd0kvz2xkjp6dxg4kn914fwzlqfnx";
1010 };
1111
1212 buildInputs = [ openssl ];
pkgs/tools/text/miller/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44 pname = "miller";
55
6− version = "5.8.0";
6+ version = "5.9.0";
77
88 src = fetchFromGitHub {
99 owner = "johnkerl";
1010 repo = "miller";
1111 rev = "v${version}";
12− sha256 = "06y1l730xps196jbnxahmd5alc9ba5m8hakm9sc8hx1q5b9ylfih";
12+ sha256 = "14fi6jlqb980qjcpb90fk85cglskq9b9i2k0216bhpvjmagywgp7";
1313 };
1414
1515 nativeBuildInputs = [ autoreconfHook flex libtool ];
pkgs/top-level/aliases.nix+1
@@ -560,6 +560,7 @@ mapAliases ({
560560 suil-qt5 = suil; # added 2018-05-01
561561 surf-webkit2 = surf; # added 2017-04-02
562562 sup = throw "deprecated in 2019-09-10: abandoned by upstream";
563+ swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
563564 system_config_printer = system-config-printer; # added 2016-01-03
564565 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12
565566 systemd_with_lvm2 = throw "obsolete, enabled by default via the lvm module"; # added 2020-07-12
pkgs/top-level/all-packages.nix+40−10
@@ -196,6 +196,8 @@ in
196196
197197 hobbes = callPackage ../development/tools/hobbes { };
198198
199+ html5validator = python36Packages.callPackage ../applications/misc/html5validator { };
200+
199201 proto-contrib = callPackage ../development/tools/proto-contrib {};
200202
201203 protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
@@ -210,6 +212,8 @@ in
210212
211213 onesixtyone = callPackage ../tools/security/onesixtyone {};
212214
215+ creddump = callPackage ../tools/security/creddump {};
216+
213217 device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {};
214218
215219 diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
@@ -1486,8 +1490,12 @@ in
14861490 '';
14871491 });
14881492
1489− caddy = callPackage ../servers/caddy { };
1490− caddy2 = callPackage ../servers/caddy/v2.nix { };
1493+ caddy = callPackage ../servers/caddy {
1494+ buildGoModule = buildGo114Module;
1495+ };
1496+ caddy2 = callPackage ../servers/caddy/v2.nix {
1497+ buildGoModule = buildGo114Module;
1498+ };
14911499 traefik = callPackage ../servers/traefik { };
14921500
14931501 calamares = libsForQt5.callPackage ../tools/misc/calamares {
@@ -1710,6 +1718,8 @@ in
17101718
17111719 dconf = callPackage ../development/libraries/dconf { };
17121720
1721+ dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { };
1722+
17131723 ddar = callPackage ../tools/backup/ddar { };
17141724
17151725 ddate = callPackage ../tools/misc/ddate { };
@@ -2008,6 +2018,11 @@ in
20082018 variant = "krita";
20092019 };
20102020
2021+ gmt = callPackage ../applications/gis/gmt {
2022+ inherit (darwin.apple_sdk.frameworks)
2023+ Accelerate CoreGraphics CoreVideo;
2024+ };
2025+
20112026 goa = callPackage ../development/tools/goa { };
20122027
20132028 gohai = callPackage ../tools/system/gohai { };
@@ -4549,6 +4564,8 @@ in
45494564
45504565 isync = callPackage ../tools/networking/isync { };
45514566
4567+ itm-tools = callPackage ../development/tools/misc/itm-tools { };
4568+
45524569 ix = callPackage ../tools/misc/ix { };
45534570
45544571 jaaa = callPackage ../applications/audio/jaaa { };
@@ -7066,8 +7083,6 @@ in
70667083
70677084 supertux-editor = callPackage ../applications/editors/supertux-editor { };
70687085
7069− super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { };
7070−
70717086 svgbob = callPackage ../tools/graphics/svgbob { };
70727087
70737088 svgcleaner = callPackage ../tools/graphics/svgcleaner { };
@@ -7135,8 +7150,6 @@ in
71357150
71367151 swec = callPackage ../tools/networking/swec { };
71377152
7138− swfdec = callPackage ../tools/graphics/swfdec {};
7139−
71407153 svnfs = callPackage ../tools/filesystems/svnfs { };
71417154
71427155 svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
@@ -8430,7 +8443,9 @@ in
84308443
84318444 cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
84328445
8433− compcert = callPackage ../development/compilers/compcert { };
8446+ compcert = callPackage ../development/compilers/compcert {
8447+ inherit (coqPackages_8_10) coq;
8448+ };
84348449
84358450 computecpp-unwrapped = callPackage ../development/compilers/computecpp {};
84368451 computecpp = wrapCCWith rec {
@@ -9501,6 +9516,9 @@ in
95019516 inherit (darwin.apple_sdk.frameworks) Security;
95029517 };
95039518 cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { };
9519+ cargo-cache = callPackage ../development/tools/rust/cargo-cache {
9520+ inherit (darwin.apple_sdk.frameworks) Security;
9521+ };
95049522 cargo-crev = callPackage ../development/tools/rust/cargo-crev {
95059523 inherit (darwin.apple_sdk.frameworks) Security;
95069524 };
@@ -12705,6 +12723,8 @@ in
1270512723
1270612724 haxor-news = callPackage ../applications/misc/haxor-news { };
1270712725
12726+ hdt = callPackage ../misc/hdt {};
12727+
1270812728 herqq = libsForQt5.callPackage ../development/libraries/herqq { };
1270912729
1271012730 heyefi = haskellPackages.heyefi;
@@ -22991,7 +23011,9 @@ in
2299123011 # this can be changed to python3 once pyside2 is updated to support the latest python version
2299223012 syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { };
2299323013
22994− inherit (callPackages ../applications/networking/syncthing { })
23014+ inherit (callPackages ../applications/networking/syncthing {
23015+ buildGoModule = buildGo114Module;
23016+ })
2299523017 syncthing
2299623018 syncthing-cli
2299723019 syncthing-discovery
@@ -24034,6 +24056,8 @@ in
2403424056
2403524057 youtube-viewer = perlPackages.WWWYoutubeViewer;
2403624058
24059+ ytalk = callPackage ../applications/networking/instant-messengers/ytalk { };
24060+
2403724061 ytcc = callPackage ../tools/networking/ytcc { };
2403824062
2403924063 zam-plugins = callPackage ../applications/audio/zam-plugins { };
@@ -24541,6 +24565,8 @@ in
2454124565
2454224566 gshogi = python3Packages.callPackage ../games/gshogi {};
2454324567
24568+ gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { };
24569+
2454424570 qtads = qt5.callPackage ../games/qtads { };
2454524571
2454624572 gtetrinet = callPackage ../games/gtetrinet {
@@ -25831,11 +25857,11 @@ in
2583125857 ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { };
2583225858
2583325859 isabelle = callPackage ../applications/science/logic/isabelle {
25834− polyml = stdenv.lib.overrideDerivation polyml57 (attrs: {
25860+ polyml = stdenv.lib.overrideDerivation polyml (attrs: {
2583525861 configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ];
2583625862 });
2583725863
25838− java = if stdenv.isLinux then jre else jdk;
25864+ java = openjdk11;
2583925865 };
2584025866
2584125867 iprover = callPackage ../applications/science/logic/iprover { };
@@ -27234,6 +27260,8 @@ in
2723427260
2723527261 wmutils-core = callPackage ../tools/X11/wmutils-core { };
2723627262
27263+ wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { };
27264+
2723727265 wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
2723827266
2723927267 wordpress = callPackage ../servers/web-apps/wordpress { };
@@ -27423,6 +27451,8 @@ in
2742327451 sequeler = callPackage ../applications/misc/sequeler { };
2742427452
2742527453 sequelpro = callPackage ../applications/misc/sequelpro {};
27454+
27455+ snowsql = callPackage ../applications/misc/snowsql {};
2742627456
2742727457 sidequest = callPackage ../applications/misc/sidequest {};
2742827458
pkgs/top-level/coq-packages.nix+1−1
@@ -130,7 +130,7 @@ in rec {
130130 coqPackages_8_11 = mkCoqPackages coq_8_11;
131131 coqPackages_8_12 = mkCoqPackages coq_8_12;
132132 coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
133− coqPackages_8_9
133+ coqPackages_8_11
134134 );
135135 coq = coqPackages.coq;
136136
pkgs/top-level/ocaml-packages.nix+9−1
@@ -151,6 +151,8 @@ let
151151
152152 containers = callPackage ../development/ocaml-modules/containers { };
153153
154+ containers-data = callPackage ../development/ocaml-modules/containers/data.nix { };
155+
154156 cow = callPackage ../development/ocaml-modules/cow { };
155157
156158 cpdf = callPackage ../development/ocaml-modules/cpdf { };
@@ -218,16 +220,20 @@ let
218220 dune = callPackage ../development/tools/ocaml/dune { };
219221
220222 dune_2 =
221− if lib.versionAtLeast ocaml.version "4.07"
223+ if lib.versionAtLeast ocaml.version "4.08"
222224 then callPackage ../development/tools/ocaml/dune/2.nix { }
223225 else if lib.versionAtLeast ocaml.version "4.02"
224226 then pkgs.dune_2
225227 else throw "dune_2 is not available for OCaml ${ocaml.version}";
226228
229+ dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { };
230+
227231 dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { };
228232
229233 dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { };
230234
235+ dune-glob = callPackage ../development/ocaml-modules/dune-glob { };
236+
231237 dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { };
232238
233239 dune-release = callPackage ../development/tools/ocaml/dune-release {
@@ -312,6 +318,8 @@ let
312318
313319 herelib = callPackage ../development/ocaml-modules/herelib { };
314320
321+ hidapi = callPackage ../development/ocaml-modules/hidapi { };
322+
315323 higlo = callPackage ../development/ocaml-modules/higlo { };
316324
317325 hkdf = callPackage ../development/ocaml-modules/hkdf { };
pkgs/top-level/python-packages.nix+6
@@ -1560,6 +1560,8 @@ in {
15601560
15611561 sabyenc = callPackage ../development/python-modules/sabyenc { };
15621562
1563+ sabyenc3 = callPackage ../development/python-modules/sabyenc3 { };
1564+
15631565 salmon-mail = callPackage ../development/python-modules/salmon-mail { };
15641566
15651567 sanic-auth = callPackage ../development/python-modules/sanic-auth { };
@@ -6735,6 +6737,8 @@ in {
67356737
67366738 terminaltables = callPackage ../development/python-modules/terminaltables { };
67376739
6740+ test-tube = callPackage ../development/python-modules/test-tube { };
6741+
67386742 testpath = callPackage ../development/python-modules/testpath { };
67396743
67406744 testrepository = callPackage ../development/python-modules/testrepository { };
@@ -7822,6 +7826,8 @@ in {
78227826
78237827 rxv = callPackage ../development/python-modules/rxv { };
78247828
7829+ userpath = callPackage ../development/python-modules/userpath { };
7830+
78257831});
78267832
78277833in fix' (extends overrides packages)