aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix46
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/acme.sh/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/awsweeper/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix75
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/chamber/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/lxd/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/oxidized/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/procs/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix170
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/ssmsh/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/admin/trivy/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix47
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/archivers/pax/default.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/archivers/unarj/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/pasystray/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/playerctl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/tts/default.nix123
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/audio/volctl/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/bdsync/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/bup/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/dar/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/dirvish/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/duplicity/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/kopia/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/monolith/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/ori/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/stenc/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/tarsnap/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/wal-e/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix1171
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch63
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch74
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix77
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix39
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix86
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix37
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix44
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/3mux/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/aptly/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/archi/default.nix61
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/autojump/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/autorandr/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/bandwidth/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/broot/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix65
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/chezmoi/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/cht.sh/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/clex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/codebraid/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/colord/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix43
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch52
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch51
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch1153
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch100
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/cp437/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/cutecom/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/ddate/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/debianutils/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/debootstrap/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/diffoscope/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/duf/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/envchain/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/etcher/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/eva/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/execline/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fd/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fet-sh/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/ffsend/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/flashrom/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fortune/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fsmon/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/geekbench/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/gibo/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/goaccess/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/gparted/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/plugins.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/hebcal/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/hyperfine/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/intermodal/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/jdupes/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/kepubify/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/lazydocker/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/licensor/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/lsd/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/mbuffer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/mmv-go/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/mstflint/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/mutagen/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/onefetch/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/ostree/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/page/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/partition-manager/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pastebinit/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pdd/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pg_flame/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pipreqs/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pistol/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/plantuml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/rmlint/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/rmtrash/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/shallot/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/silicon/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/snapper/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/spigot/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/starship/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/staruml/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/tagref/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/tlp/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/tmux/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/toybox/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/tydra/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/ugtrain/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/up/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/up/gomod.patch23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/urjtag/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/vector/default.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/vimv/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/vivid/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/vix/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/websocat/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/woeusb/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/woof/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/wootility/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/wsl-open/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/xfstests/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/yle-dl/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/you-get/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/zoxide/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch48
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch48
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix64
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix112
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix44
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix37
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix57
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/nix/dnadd/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/nix/nar-serve/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/cde/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/go/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/morph/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/generic.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/acsccid/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/aflplusplus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/aws-okta/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/cargo-lock.patch (renamed from infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch)162
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/default.nix10
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/tools/security/b3sum/update-cargo-lock.sh19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/cfssl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/clamav/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/clevis/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/crackxls/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/creddump/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/doas/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/fido2luks/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/fpm2/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/genpass/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/ghidra/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/gnupg/22.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/gobuster/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/jadx/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/jd-gui/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/keybase/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/keybase/gui.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/keysmith/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/lynis/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock257
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix358
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/tools/security/metasploit/update.sh17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/ncrack/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/nmap/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/nmap/qt.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/notary/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/onioncircuits/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/opensc/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch41
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/update.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/rbw/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/rustscan/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/scrypt/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/secp256k1/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/sequoia/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/snallygaster/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/snow/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix47
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/sshguard/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/sudo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/security/volatility/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/bfs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/bottom/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/ctop/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/facter/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/fio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/hostctl/default.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/hwinfo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/jump/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/memtester/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/mlc/default.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/nvtop/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/rocm-smi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/s6-rc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/s6/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/safe-rm/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/testdisk/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/thermald/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/thinkfan/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/throttled/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/tuptime/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/uefitool/variants.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/system/zenith/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix58
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix45
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix40
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix48
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch43
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix44
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix37
614 files changed, 6369 insertions, 4148 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix
index 91e067e7be71..2254cb4038e9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
- version = "1.196";
+ version = "1.198";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
- sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg";
+ sha256 = "04ahnn8gi24x9kjz6q4nm6gswc4gcav87rvq9sajj4g2hkrxfn0c";
};
buildInputs = [ perl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix
new file mode 100644
index 000000000000..4f39c0a98904
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, libX11 }:
+
+stdenv.mkDerivation rec {
+ pname = "devour";
+ version = "12";
+
+ src = fetchFromGitHub {
+ owner = "salman-abedin";
+ repo = "devour";
+ rev = version;
+ sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp";
+ };
+
+ installPhase = ''
+ install -Dm555 -t $out/bin devour
+ '';
+
+ buildInputs = [ libX11 ];
+
+ meta = with stdenv.lib; {
+ description = "Devour hides your current window when launching an external program";
+ longDescription = "Devour hides your current window before launching an external program and unhides it after quitting";
+ homepage = "https://github.com/salman-abedin/devour";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ mazurel ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix
new file mode 100644
index 000000000000..13f274577887
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, libX11, libXdamage, libXrender, libXcomposite, libXext, installShellFiles, git }:
+
+stdenv.mkDerivation rec {
+ pname = "find-cursor";
+ version = "1.6";
+
+ src = fetchFromGitHub {
+ owner = "arp242";
+ repo = "find-cursor";
+ rev = "v${version}";
+ sha256 = "13lpcxklv9ayqapyk9pmwxkinhxah5hkr6n0jc2m5hm68nh220w1";
+ };
+
+ nativeBuildInputs = [ installShellFiles git ];
+ buildInputs = [ libX11 libXdamage libXrender libXcomposite libXext ];
+ preInstall = "mkdir -p $out/share/man/man1";
+ installFlags = "PREFIX=${placeholder "out"}";
+
+ meta = with stdenv.lib; {
+ description = "Simple XLib program to highlight the cursor position";
+ homepage = "https://github.com/arp242/find-cursor";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.yanganto ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix
index 111d064ad887..9d10dd478818 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }:
buildGoModule rec {
version = "0.6.0";
@@ -13,6 +13,14 @@ buildGoModule rec {
vendorSha256 = "1ibwx5rbxkygfx78j3g364dmbwwa5b34qmzq3sqcbrsnv8rzrwvj";
+ patches = [
+ # fix failing test on go 1.15
+ (fetchpatch {
+ url = "https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
+ sha256 = "0j8y3gns4lm0qxqxzmdn2ll0kq34mmfhf83lvsq13iqhp5bx3y31";
+ })
+ ];
+
meta = with stdenv.lib; {
homepage = "https://github.com/fd0/grobi";
description = "Automatically configure monitors/outputs for Xorg via RANDR";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix
index 3bfe98a7a211..0d42687bf0b0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix
@@ -1,36 +1,40 @@
-{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }:
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+, imlib2
+, libX11
+, libXinerama
+}:
stdenv.mkDerivation rec {
pname = "hsetroot";
- version = "1.0.2";
+ version = "1.0.5";
- # The primary download site seems to no longer exist; use Gentoo's mirror for now.
- src = fetchurl {
- url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-${version}.tar.gz";
- sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7";
+ src = fetchFromGitHub {
+ owner = "himdel";
+ repo = "hsetroot";
+ rev = version;
+ sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722";
};
- # See https://bugs.gentoo.org/show_bug.cgi?id=504056
- underlinkingPatch = fetchurl {
- url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch";
- name = "hsetroot-1.0.2-underlinking.patch";
- sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ autoconf automake imlib2 libtool libX11 xorgproto ];
-
- patches = [ underlinkingPatch ];
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ imlib2
+ libX11
+ libXinerama
+ ];
- patchFlags = [ "-p0" ];
+ makeFlags = [ "PREFIX=$(out)" ];
- preConfigure = "./autogen.sh";
+ preInstall = ''
+ mkdir -p "$out/bin"
+ '';
meta = with stdenv.lib; {
description = "Allows you to compose wallpapers ('root pixmaps') for X";
- homepage = "https://thegraveyard.org/hsetroot.html";
+ homepage = "https://github.com/himdel/hsetroot";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.henrytill ];
+ maintainers = with maintainers; [ henrytill shamilton ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
index c08a2fd21855..807282fae598 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
pname = "nx-libs";
- version = "3.5.99.24";
+ version = "3.5.99.25";
src = fetchFromGitHub {
owner = "ArcticaProject";
repo = "nx-libs";
rev = version;
- sha256 = "0knx4phya90ahjxaflkvnnb7w22vdwjf7r78dhzmbmlccnlvwi7q";
+ sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig which
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
index a2a7e5e6922b..054e061c4ac8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }:
+{ stdenv, fetchurl, cmake
+, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk
+, xorg
+, opencl-headers, opencl-clhpp, ocl-icd
+}:
stdenv.mkDerivation rec {
pname = "virtualgl-lib";
- version = "2.6.2";
+ version = "2.6.5";
src = fetchurl {
url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
- sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr";
+ sha256 = "1giin3jmcs6y616bb44bpz30frsmj9f8pz2vg7jvb9vcfc9456rr";
};
cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];
@@ -15,7 +19,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ];
+ buildInputs = [ libjpeg_turbo libGL libGLU fltk
+ libX11 libXv libXtst xorg.xcbutilkeysyms
+ opencl-headers opencl-clhpp ocl-icd
+ ];
+
+ fixupPhase = ''
+ substituteInPlace $out/bin/vglrun \
+ --replace "LD_PRELOAD=libvglfaker" "LD_PRELOAD=$out/lib/libvglfaker" \
+ --replace "LD_PRELOAD=libdlfaker" "LD_PRELOAD=$out/lib/libdlfaker" \
+ --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker"
+ '';
enableParallelBuilding = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
index 2aa05935991e..84d1f379e8aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
@@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
- version = "6.1.0";
+ version = "6.1.3";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = version;
- sha256 = "06z6qbfd9l3acp3wm28rq4vx3m5cxi4lpxgzc2nxvxmiz8rnnmh1";
+ sha256 = "1jv28ygsd6ifjb096w3pm50za6wi62y45ycbizwhv7x56lr6zx1v";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix
index 23af2ac44ca6..33bc9110848e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix
@@ -24,10 +24,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lpthread";
meta = with stdenv.lib; {
- description = ''
- x11spice will enable a running X11 desktop to be available
- via a Spice server
- '';
+ description = "Enable a running X11 desktop to be available via a Spice server";
homepage = "https://gitlab.freedesktop.org/spice/x11spice";
platforms = platforms.linux;
license = licenses.gpl3;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
index 2f7b0d7697e5..5ed827b5a546 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub,
+{ stdenv, fetchFromGitHub, fetchpatch,
openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
autoreconfHook, pkgconfig }:
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2020-29074.patch";
+ url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch";
+ sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs =
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix
index ccea6a2233cc..85d87d9e36d6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix
@@ -36,17 +36,15 @@ stdenv.mkDerivation rec {
cp ${mimisrc}/xdg-open $out/bin/xdg-open
'' + ''
sed '2s#.#\
- cut() { ${coreutils}/bin/cut "$@"; }\
sed() { ${gnused}/bin/sed "$@"; }\
grep() { ${gnugrep}/bin/grep "$@"; }\
egrep() { ${gnugrep}/bin/egrep "$@"; }\
file() { ${file}/bin/file "$@"; }\
awk() { ${gawk}/bin/awk "$@"; }\
- sort() { ${coreutils}/bin/sort "$@"; }\
xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
- PATH=$PATH:'"$out"'/bin\
+ PATH=$PATH:'$out'/bin:${coreutils}/bin\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \
@@ -58,7 +56,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/xdg-email \
--replace "/bin/echo" "${coreutils}/bin/echo"
- sed 's# which # type -P #g' -i "$out"/bin/*
+ sed 's|\bwhich\b|type -P|g' -i "$out"/bin/*
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix
index 7f46e017c367..3f1bf557ae8e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
-, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
+, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
, ffmpeg, x264, libvpx, libwebp, x265
, libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection
@@ -97,7 +97,7 @@ in buildPythonApplication rec {
--set XPRA_INSTALL_PREFIX "$out"
--set XPRA_COMMAND "$out/bin/xpra"
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
)
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix
index 7b30e5c58155..7bd0c3e6dcd4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }:
+{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
stdenv.mkDerivation rec {
version = "0.4.2";
pname = "xwinmosaic";
- src = fetchgit {
- url = "https://github.com/soulthreads/xwinmosaic/";
- rev = "refs/tags/v0.4.2";
+ src = fetchFromGitHub {
+ owner = "soulthreads";
+ repo = pname;
+ rev = "refs/tags/v${version}";
sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
index 30badb175a96..8fb14ed2ead7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }:
stdenv.mkDerivation rec {
pname = "acme.sh";
- version = "2.8.7";
+ version = "2.8.8";
src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
- sha256 = "0bwzrrm07v2lpsja0r0z7nj3jrf814w57mmk8lbdk9dsb3i07x4w";
+ sha256 = "1iqwzqgg26vsg7lwmgmga9y3ap9q8r5xyx799bj8kawnr8n6s4jd";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix
index d96eadf0eab5..a9a49beda2f3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix
@@ -4,6 +4,7 @@
, beautifulsoup4
, boto3
, configparser
+, filelock
, keyring
, keyrings-alt
, lxml
@@ -19,7 +20,7 @@
buildPythonApplication rec {
pname = "aws-google-auth";
- version = "0.0.34";
+ version = "0.0.36";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
# https://github.com/cevoaustralia/aws-google-auth/issues/120
@@ -27,13 +28,14 @@ buildPythonApplication rec {
owner = "cevoaustralia";
repo = "aws-google-auth";
rev = version;
- sha256 = "12c5ssdy870szrizhs4d7dzcpq3hvszjvl8ba60qf1ak5jsr1ay4";
+ sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7";
};
- propagatedBuildInputs = [
+ propagatedBuildInputs = [
beautifulsoup4
boto3
configparser
+ filelock
keyring
keyrings-alt
lxml
@@ -43,10 +45,10 @@ buildPythonApplication rec {
tabulate
tzlocal
] ++ lib.optional withU2F python-u2flib-host;
-
- checkInputs = [
+
+ checkInputs = [
mock
- nose
+ nose
];
preCheck = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix
index 79d6f42628f3..8bf242561b1c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -1,4 +1,5 @@
{ lib
+, nixosTests
, python3
, groff
, less
@@ -14,16 +15,24 @@ let
sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
};
});
+ # TODO: https://github.com/aws/aws-cli/pull/5712
+ colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+ version = "0.4.3";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
+ };
+ });
};
};
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.18.150"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.18.185"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "0jrxzr4dx2s6ychmrz19yz8i4kqcwj7f8ly82ydwvrr0ff62374g";
+ sha256 = "0yf8dmjgiib5s4dimc1896zxrrj0sl5kzrp7x8spm6xkcvwb02l1";
};
postPatch = ''
@@ -47,14 +56,20 @@ in with py.pkgs; buildPythonApplication rec {
];
postInstall = ''
- mkdir -p $out/etc/bash_completion.d
- echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+ mkdir -p $out/share/bash-completion/completions
+ echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli
+
mkdir -p $out/share/zsh/site-functions
mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+
rm $out/bin/aws.cmd
'';
- passthru.python = py; # for aws_shell
+ passthru = {
+ python = py; # for aws_shell
+
+ tests = { inherit (nixosTests) awscli; };
+ };
meta = with lib; {
homepage = "https://aws.amazon.com/cli/";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix
index e89df04e3bd1..a477beac5a0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix
@@ -8,12 +8,12 @@ let
py = python3.override {
packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
- version = "2.0.0dev58";
+ version = "2.0.0dev75";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
- rev = "2d65a1bdf85d24b40a40bc681b44d167ce1cc8cb";
- hash = "sha256-HPeNWLhNFjRoD4TZ54ZGgJPp8fsnh8Rt6DMJ8Q0nPkY=";
+ rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c";
+ sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri";
};
});
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@@ -29,16 +29,17 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
- version = "2.0.54"; # N.B: if you change this, change botocore to a matching version too
+ version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
- hash = "sha256-RVF9/2s5oy3Re6hdvbhwPf0nXSoizBDwOgtXCc7cwgc=";
+ sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r";
};
postPatch = ''
+ substituteInPlace setup.py --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5"
substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0"
substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10"
substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0"
@@ -67,10 +68,15 @@ with py.pkgs; buildPythonApplication rec {
];
postInstall = ''
- mkdir -p $out/etc/bash_completion.d
- echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+ mkdir -p $out/${python3.sitePackages}/awscli/data
+ ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index
+
+ mkdir -p $out/share/bash-completion/completions
+ echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/aws
+
mkdir -p $out/share/zsh/site-functions
mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+
rm $out/bin/aws.cmd
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awsweeper/default.nix
index 2417854fcad9..f148bd088f4b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awsweeper/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/awsweeper/default.nix
@@ -1,29 +1,25 @@
-{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "awsweeper";
- version = "0.7.0";
-
- # Requires go generate to be run with mockgen, but doesn't check in the results.
- patches = fetchurl {
- url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch";
- sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl";
- };
+ version = "0.10.2";
src = fetchFromGitHub {
- owner = "cloudetc";
+ owner = "jckuester";
repo = pname;
rev = "v${version}";
- sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28";
+ sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5";
};
- vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp";
+ vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ];
doCheck = false;
meta = with lib; {
description = "A tool to clean out your AWS account";
- homepage = "https://github.com/cloudetc/awsweeper/";
+ homepage = "https://github.com/jckuester/awsweeper";
license = licenses.mpl20;
maintainers = [ maintainers.marsam ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
index 8a9101cedd6d..81389f39dd38 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
+{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
- version = "2.12.1";
+ version = "2.15.1";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- sha256 = "14m2zjgaszrki34kva23vdsl0nxxifz8r9i54ld3idi8hj3nx0q3";
+ sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d";
};
# put packages that needs to be overriden in the py package scope
- py = import ./python-packages.nix { inherit stdenv python lib src version; };
+ py = import ./python-packages.nix {
+ inherit stdenv lib src version;
+ python = python3;
+ };
in
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
pname = "azure-cli";
inherit version src;
- disabled = python.isPy27; # namespacing assumes PEP420, which isn't compat with py2
sourceRoot = "source/src/azure-cli";
@@ -23,6 +25,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
substituteInPlace setup.py \
--replace "javaproperties==0.5.1" "javaproperties" \
--replace "pytz==2019.1" "pytz" \
+ --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \
--replace "mock~=4.0" "mock"
# remove namespace hacks
@@ -113,6 +116,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-multiapi-storage
azure-storage-blob
azure-synapse-accesscontrol
+ azure-synapse-artifacts
azure-synapse-spark
colorama
cryptography
@@ -164,9 +168,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
# almost the entire test suite requires an azure account setup and networking
# ensure that the azure namespaces are setup correctly and that azure.cli can be accessed
checkPhase = ''
- cd azure # avoid finding local copy
- ${py.interpreter} -c 'import azure.cli.core; assert "${version}" == azure.cli.core.__version__'
- HOME=$TMPDIR ${py.interpreter} -m azure.cli --help
+ HOME=$TMPDIR $out/bin/az --help > /dev/null
'';
# ensure these namespaces are able to be accessed
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
index f13e37d89e97..29787cfb17a1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -83,6 +83,11 @@ let
++ lib.optionals isPy3k [ antlr4-python3-runtime ]
++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2"
+ '';
+
doCheck = stdenv.isLinux;
# ignore tests that does network call
checkPhase = ''
@@ -128,11 +133,14 @@ let
azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip"
"1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83";
+ azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
+ "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
+
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
"1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
- azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.0.0rc1" "zip"
- "0afg5vmyiwqna9rnal9ir2vyg2mykllsf313gd3kn99jl21bgns1";
+ azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip"
+ "0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65";
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
"0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
@@ -146,11 +154,11 @@ let
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip"
"0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy";
- azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip"
- "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k";
+ azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
+ "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
- azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "13.0.0" "zip"
- "17ik8lfd74ki57rml2piswcanzbladsqy0s2m9jmvwpdrfpincvz";
+ azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "14.0.0" "zip"
+ "0bvqv56plcgmnfyj0apphlbsn2vfm1a22idvy8y5npbfjz4zwja9";
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -188,8 +196,8 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
- azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip"
- "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76";
+ azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip"
+ "1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
@@ -206,8 +214,8 @@ let
azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip"
"0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6";
- azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.47.0" "zip"
- "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq";
+ azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip"
+ "1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys";
azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip"
"1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn";
@@ -218,6 +226,9 @@ let
azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip"
"16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
+ azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip"
+ "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f";
+
azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip"
"08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r";
@@ -242,14 +253,14 @@ let
azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip"
"186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85";
- azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b3" "zip"
- "1w8kp4r8v54cr4sskkgv5mbqx2pisrly2066ma5msg6amy97jnr6";
+ azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip"
+ "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip"
"0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm";
- azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc14" "zip"
- "0w9hnxvk5pcsa21g3xrr089rfwgldghrbj8akzvh0gchqlzfjg6j";
+ azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip"
+ "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip"
"05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6";
@@ -263,17 +274,20 @@ let
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
"0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
- azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip"
- "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw";
+ azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip"
+ "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5";
+
+ azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip"
+ "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj";
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
"0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
- azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip"
- "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a";
+ azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip"
+ "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
- azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip"
- "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3";
+ azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz"
+ "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf";
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
version = "0.60.0";
@@ -304,6 +318,16 @@ let
};
});
+ azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec {
+ version = "0.3.0";
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
+ inherit version;
+ sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a";
+ extension = "zip";
+ };
+ });
+
azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec {
version = "0.2.0";
src = super.fetchPypi {
@@ -411,6 +435,17 @@ let
};
});
+ sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec {
+ name = "sshtunnel-${version}";
+ version = "0.1.5";
+
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
+ inherit version;
+ sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8";
+ };
+ });
+
websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec {
version = "0.56.0";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
index f97a6e5df891..b0a5af35def5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
install -m755 -D -t $out/bin/cfcli bin/cfcli/cf
ln -sv $out/bin/ibmcloud $out/bin/bx
ln -sv $out/bin/ibmcloud $out/bin/bluemix
- install -D -t "$out/etc/bash_completion.d" bx/bash_autocomplete
+ install -D -t "$out/share/bash-completion/completions" bx/bash_autocomplete
install -D -t "$out/share/zsh/site-functions" bx/zsh_autocomplete
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/chamber/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/chamber/default.nix
index fb21bda41505..7a80ed371884 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/chamber/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/chamber/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
meta = with lib; {
description =
- "Chamber is a tool for managing secrets by storing them in AWS SSM Parameter Store.";
+ "A tool for managing secrets by storing them in AWS SSM Parameter Store";
homepage = "https://github.com/segmentio/chamber";
license = licenses.mit;
maintainers = with maintainers; [ kalekseev ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index 74cc3f3f1711..c375b0987dc4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.27.0";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v";
+ sha256 = "1rhiak1264czcww5ayz35am9nsn5xa3kjd90szssg46ngxisd61x";
};
- vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys";
+ vendorSha256 = "1s9xhq1k67gf9saada1dr95n1sd265hndkxz0alqw6dm2vdp3n2q";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
index 41fc026092db..36a1cf97a146 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.17.0";
+ version = "1.21.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "01bll978dis8pqvgrbigzgszkx3kjm6acrw44z6j7algw3an352r";
+ sha256 = "12z5mbw7yzhyhzl6499xlhzpgysarjql4qlrpmwfpb8ij1hk8q6i";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
index e13cb0842dec..29592451734f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "0pvw0mbrx2i3v46lhjnka962gcl4ym0b9hp0xw56hpdd2abc58f6";
+ sha256 = "0kldvy63gba5k6ymybnggw3q3rlav1gcbpxiwnv6670lk5qzqdsw";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "0p5vbg5s3xsi3y7x4s3v3mxcw87x349h6bz6w7xgc141l4g08vh3";
+ sha256 = "1ifl4skwqhkapfwhymyz7v4jpwpd01n4x3956w5ci8c3zvw8l118";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "314.0.0";
+ version = "319.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -74,8 +74,8 @@ in stdenv.mkDerivation rec {
disable_update_check = true" >> $out/google-cloud-sdk/properties
# setup bash completion
- mkdir -p $out/etc/bash_completion.d
- mv $out/google-cloud-sdk/completion.bash.inc $out/etc/bash_completion.d/gcloud.inc
+ mkdir -p $out/share/bash-completion/completions
+ mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud.inc
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/lxd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/lxd/default.nix
index 3d62e39c6ed3..9bff8332c34b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/lxd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
- version = "4.6";
+ version = "4.8";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "011fsyafmpis6j0aq7vwd56m2mcb9v3rn4f246ms5nx6zgmga0ip";
+ sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/oxidized/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/oxidized/default.nix
index 01129c5afb10..022b304a8459 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/oxidized/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/oxidized/default.nix
@@ -11,7 +11,7 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "oxidized";
meta = with lib; {
- description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!";
+ description = "A network device configuration backup tool. It's a RANCID replacement!";
homepage = "https://github.com/ytti/oxidized";
license = licenses.asl20;
maintainers = with maintainers; [ willibutz nicknovitski ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/procs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/procs/default.nix
index 54bdf238e3f2..2c11b6f4523b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/procs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.10.4";
+ version = "0.10.10";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
- sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv";
+ sha256 = "12p95nybsisqpji01qgkp5wfg7fwk814xdsz338q9wac8nvqw9w3";
};
- cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1";
+ cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
description = "A modern replacement for ps written in Rust";
homepage = "https://github.com/dalance/procs";
license = licenses.mit;
- maintainers = with maintainers; [ dalance filalex77 ];
+ maintainers = with maintainers; [ dalance Br1ght0ne ];
platforms = with platforms; linux ++ darwin;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix
index 7d2523b4073d..1bcee96c9fff 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix
@@ -1,178 +1,178 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "2.10.2";
+ version = "2.15.0";
pulumiPkgs = {
x86_64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-linux-x64.tar.gz";
- sha256 = "0pxm90vmha265zc4b1ip2f3iryslkwxznn4kb8l3ma6gibz1zav3";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-linux-x64.tar.gz";
+ sha256 = "0yvzqqcfmgblig5jwdc07phyhnfjzvjd1qm0vgfi9ll9y88l33lc";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-linux-amd64.tar.gz";
- sha256 = "1l4kszzw1w862sfd4jnz66lwnp02p4kl1fwvj5ab81qfwzwg0cfx";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-linux-amd64.tar.gz";
+ sha256 = "1rpmzra42kx2jnhdbnqg120lbnpw86y00vkqbqc3qyagi260f01g";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-linux-amd64.tar.gz";
- sha256 = "1gzjdafx5zsqrb5r3amskak51ajcpqbbfw45939jdsdll8vclw7g";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-linux-amd64.tar.gz";
+ sha256 = "0y0j1aflrfas9sfr4g7jbn2cnhlz9hpz5il6qykz0m01v6sv604w";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-linux-amd64.tar.gz";
- sha256 = "0myvx2glqnx29l4wd5vx4gm773zrcmwcjvs2b1yv63fl10md9sv7";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-linux-amd64.tar.gz";
+ sha256 = "174b6r2vhbf9svknidd05sccjzihp97wcd8jwy6dll83d8f8v2xn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-linux-amd64.tar.gz";
- sha256 = "12cajd8jiqy11s880vsv20gqfm44g160x7fxm93agjl7wng32ad6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz";
+ sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-linux-amd64.tar.gz";
- sha256 = "0k429fh477f84kmnhyl5s9p0yym7d6sdq7hy7wqx6psxp4rf5h9x";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-linux-amd64.tar.gz";
+ sha256 = "0p2i0k0js3js35jcphf64rzxs7zg9wq25yfzd9q6b2kp2vyqbvjs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-linux-amd64.tar.gz";
- sha256 = "045z7qj23bq71nxfjk1vvnfbjcnqfkcbxbpjz72q0hw4xn7dq6jz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-linux-amd64.tar.gz";
+ sha256 = "1hzf4668sljy2g6s9xz6lvn8cbjy8bb2flhdmc4ln69xxcsslj9z";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-linux-amd64.tar.gz";
- sha256 = "16d0jd3429pr4vlrzrv32w2fa53j7gyqq5lc78gw9j4v3mc3scvz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-linux-amd64.tar.gz";
+ sha256 = "0fr8ac7864ph02hhl3f08xjyk626c4zbcf8nr7xhmh2ifz6sj9sl";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-linux-amd64.tar.gz";
- sha256 = "0gz4kpddaf9p25lfnp70p6197wrfgsiys7s4vdy75z8dyd4sbiv0";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-linux-amd64.tar.gz";
+ sha256 = "0zx9yy97n0wk87ylgq67nphagfp1gas5z99mcfmlh9rf4mj8fhpz";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-linux-amd64.tar.gz";
- sha256 = "0n2532gfb5i53raya07rn8wcp15rc07jfg8wsm2lfzj7a4mp2p6c";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-linux-amd64.tar.gz";
+ sha256 = "02c0nmnk27q9ssv7wv8s30ysxnkqbq7sd004gia4wxf97fhlhl5x";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-linux-amd64.tar.gz";
- sha256 = "16l1a30rkg9l6yh68qv61dgm3h3gdgpsdacvnfg1ra0fvvfs9477";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-linux-amd64.tar.gz";
+ sha256 = "01rpv9m6mj8yqz302g15x4yp37pp4ghdc686n4l7xz08xdb209xi";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-linux-amd64.tar.gz";
- sha256 = "1m2w8gsksr36pprxr6v3v4y3n7x5ycbcdfywv67yxmbi4lxyy3ar";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-linux-amd64.tar.gz";
+ sha256 = "1w4cjgccm29ncqb7jfsf9ajlvq0q8h5mnz4v5lxwyx21n80kq34p";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-linux-amd64.tar.gz";
- sha256 = "01vnbgck1ffj4jg8ghmkjp63xq3r9q3459vy03xpzm14l1i6agwv";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-linux-amd64.tar.gz";
+ sha256 = "0imqwx4v6qsk10anxvnaxpxg87mm34x0qcq30c435mcfrly728sp";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-linux-amd64.tar.gz";
- sha256 = "1g05kqymbkrxf48iskn9w12kxy880allhqm9a7p4g7mx0174yfhm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz";
+ sha256 = "0zrza0i73ld16szbbsz3h9p9z09ws2pf380kzb1358g70ayvzga3";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-linux-amd64.tar.gz";
- sha256 = "1fa5i283nisa6cq02fcrsgwkw7bwnh2j3agjbqyvv2xiss34i7hw";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-linux-amd64.tar.gz";
+ sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-linux-amd64.tar.gz";
- sha256 = "0ihiag248c30dz4z2b559689zqwp52p0m7pv7jqpk86xwvimbsn1";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-linux-amd64.tar.gz";
+ sha256 = "1vqzl72q939i381vy6dkn75xv09vjs2mg2prbmx63j3hylgb9m6r";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-linux-amd64.tar.gz";
- sha256 = "0jwvdsb26bhsqcbrsw9ss54xgpccl830hhbwnbz8ql8yndd35srg";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz";
+ sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-linux-amd64.tar.gz";
- sha256 = "1wr4p312xwqi0icn153iv2j88rp37wkf8hc5y4pmdr61vd0kpw7w";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-linux-amd64.tar.gz";
+ sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-linux-amd64.tar.gz";
- sha256 = "0xq3as94i9ah9dv1cabgdqjg68yg7laksfzpf81s6kcv742cnnqi";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-linux-amd64.tar.gz";
+ sha256 = "02xq4mph35fnziz6fb230cvd828yfs030nmi3a4hwh4w1xbr24iw";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-linux-amd64.tar.gz";
- sha256 = "1av7fj1jlhhqplqq60d6hzzidlhsvr41z9p1x3mvz5frwijxr1ab";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-linux-amd64.tar.gz";
+ sha256 = "0avlf8gyh52zc11a87izy2v8iy4zvbfv6zrm8zg1i5ar43xqg3pm";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-linux-amd64.tar.gz";
- sha256 = "1bgw5xw6f01whxlm5358xn6v9wqz9mxg3dvb5vi7rfs9wwxykr4g";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-linux-amd64.tar.gz";
+ sha256 = "1wb953vm990c4dsb757msmz7ws844alad3g68sfy029cgmnf8q5i";
}
];
x86_64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-darwin-x64.tar.gz";
- sha256 = "1fzqylx7pmrpvsxrmhlx56v9i9zkid96zrj9hsc26qhx5w7k600w";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-darwin-x64.tar.gz";
+ sha256 = "08hyk06qwm1aibpyqb07h83gc6nfp0cwf6hikf8mc18b2mrwr27r";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-darwin-amd64.tar.gz";
- sha256 = "05dxpdwdg8cd1a6d3xh8dkns5wkvpr0v11bb4zdzv38x6wxnqx0z";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-darwin-amd64.tar.gz";
+ sha256 = "0ih9l3pkqxfslc11qcgwshxqxbcwy5wfpjczahny6mkgqwmxixnx";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-darwin-amd64.tar.gz";
- sha256 = "1jbnx1wpzh2k127ixh9j0ghlqhj3sc1s17cp3ax3q9gq3cadcl5i";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-darwin-amd64.tar.gz";
+ sha256 = "0yqm66av2yb9qndpkxxisjml66dyg3zhzkb9fr6kywx8xar4gfdp";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-darwin-amd64.tar.gz";
- sha256 = "0lpf3cqi3kss7hmr8a3y6gmwjl854vmva4f9p9q7147rxr8aw5f9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-darwin-amd64.tar.gz";
+ sha256 = "02is7mfbzhv8bkyn4vk1x9b6m1v9c21chihpry6cjdhpq46bfssf";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-darwin-amd64.tar.gz";
- sha256 = "0qwjrhmspibjr17kgswfcgbdhmkicqrjd1md6azingdr5wp7cwwm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz";
+ sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-darwin-amd64.tar.gz";
- sha256 = "0rwgbpif7l3ayh363cz0k2dir36a87x0bszspq3nm3xbwmd190f0";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-darwin-amd64.tar.gz";
+ sha256 = "1r0r6hpchkiq6bg3z6bqnqqz8s96pijsp6rn1dby9f2kaqmar23c";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-darwin-amd64.tar.gz";
- sha256 = "0943r8x70gxxkfn0rhcx2b9zya44k28j5s8z2m8jn2i1fvqvahq5";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-darwin-amd64.tar.gz";
+ sha256 = "1nrj3lh2asw6169pddjp83q6ll3w5fjp854bdrx99zajpv7gd0gm";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-darwin-amd64.tar.gz";
- sha256 = "1nvqjc1zrxfn2r1wdh2sdr2vimar5836bhscqsiaw4i6mjdsggfy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-darwin-amd64.tar.gz";
+ sha256 = "0y76cy3h0n004lfch37gf9vi8glxnxixwmf1zby3izxd34pyri17";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-darwin-amd64.tar.gz";
- sha256 = "05x0qlv3xkkvs71ixzmc21ck85w9f4a4dxrwmgkq6c0nhy3npbnj";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-darwin-amd64.tar.gz";
+ sha256 = "09zc0sg2h07c97bqbh3ma4pgs232nbd0q5l43992nqa4mn5b8w14";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-darwin-amd64.tar.gz";
- sha256 = "1m80l75r2w46m7191igjan4ipfkhc9ld1xlybncd628qlcf2jpqz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-darwin-amd64.tar.gz";
+ sha256 = "08crawyaa26llqc3hj2grba0546ny8zwj8dfg6i46ad3kx1nmycq";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-darwin-amd64.tar.gz";
- sha256 = "0dan0qqvaxfh90db14s7adjjy670lz15bbm6a8fjfyj4fdhsbwyn";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-darwin-amd64.tar.gz";
+ sha256 = "12ny0kmly1blj8hd8dlzqbg1pbfh37259x3k2kxx2zcqvcw9y4z9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-darwin-amd64.tar.gz";
- sha256 = "1gznv5d10pxbkyl4hbd4c9skkgkypfs1xg0jjmszkwxcjzvhc4l3";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-darwin-amd64.tar.gz";
+ sha256 = "0svbnv3axy397w2hi3g1mghcahq88aj4jsnipn3lyxrm29n4wna7";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-darwin-amd64.tar.gz";
- sha256 = "08w8by7h9nlgvyap2in6yy21dk46fxvl93h4ghaw7xxjjs2l3dfi";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-darwin-amd64.tar.gz";
+ sha256 = "1viwi0ji1qqy4ysl4a9dhv8sfpg8sp3w4i9ndvxs2m7zq0hbndbs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-darwin-amd64.tar.gz";
- sha256 = "0qjszd30r3094p5m7v5gynx2kxh9xf9878mxdc2wnswpkpw3v5pb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz";
+ sha256 = "1382c66vfkzr4hinqi45g7w9s7zv8yhj4in5wnd20s3cg5890mr1";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-darwin-amd64.tar.gz";
- sha256 = "1a19lmxi8r8h4yfll0k97kvq0lgkzwvrwf52ny4zl67bc9g4jr5p";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-darwin-amd64.tar.gz";
+ sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-darwin-amd64.tar.gz";
- sha256 = "11vfjkmhrq7q4j6h5d2sdzan3ziyhl5qhc0fhfnsz2pxss549zab";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-darwin-amd64.tar.gz";
+ sha256 = "0dhxhsjb3vbc1bq4pgidadiyfr3gasj0h344prcjzcaxymb3609f";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-darwin-amd64.tar.gz";
- sha256 = "1ny1m6pb44k77gqf97km3gkb7dwhilkmqi2zy4hdl20js1ijsh7p";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz";
+ sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-darwin-amd64.tar.gz";
- sha256 = "1vm2pfj93wi6q7kcrqwy9190mx0jn2p96algcd5gms48a4m8bgpb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-darwin-amd64.tar.gz";
+ sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-darwin-amd64.tar.gz";
- sha256 = "0mnmlvyppfndq1rwy4k40j0syy590v2lg75kg0rnf16qlpffskn9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-darwin-amd64.tar.gz";
+ sha256 = "0f77ja9cvhcl86654a3gmb399c7ybigznmxxd8f6f2m7x44pih4q";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-darwin-amd64.tar.gz";
- sha256 = "0q9qbqalask628cbi3347pjbnm3304c8qhx7h8icqxxh59mjnhr7";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-darwin-amd64.tar.gz";
+ sha256 = "18i81mdws02kfil8zcrnjl3i4gjxqix9n04flz67mqw730mhr3ss";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-darwin-amd64.tar.gz";
- sha256 = "1gxiqq6hk77s1n3q3p92p0yykpihw2k8lv01dra015fjha6pyl19";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-darwin-amd64.tar.gz";
+ sha256 = "1mw70j1iky98k09739mq1b7lsarvlqp2kcm26555520z78ifiibh";
}
];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh
index 5e0c721959c3..80acc33322d0 100755
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh
@@ -3,31 +3,31 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="2.10.2"
+VERSION="2.15.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
- "auth0=1.1.0"
- "aws=3.4.0"
- "cloudflare=2.6.0"
- "consul=2.5.0"
- "datadog=2.8.0"
- "digitalocean=2.8.0"
- "docker=2.3.0"
- "gcp=3.25.0"
- "github=2.0.0"
- "gitlab=2.6.0"
- "hcloud=0.2.0"
- "kubernetes=2.6.1"
- "mailgun=2.2.0"
- "mysql=2.2.1"
- "openstack=2.6.0"
- "packet=3.1.0"
- "postgresql=2.4.0"
- "random=2.3.1"
- "vault=2.4.0"
- "vsphere=2.10.0"
+ "auth0=1.3.0"
+ "aws=3.19.0"
+ "cloudflare=2.8.0"
+ "consul=2.6.2"
+ "datadog=2.11.0"
+ "digitalocean=3.1.1"
+ "docker=2.4.1"
+ "gcp=4.4.0"
+ "github=2.3.0"
+ "gitlab=3.3.0"
+ "hcloud=0.4.0"
+ "kubernetes=2.7.3"
+ "mailgun=2.3.1"
+ "mysql=2.3.2"
+ "openstack=2.9.0"
+ "packet=3.2.2"
+ "postgresql=2.5.2"
+ "random=2.4.2"
+ "vault=3.1.0"
+ "vsphere=2.11.2"
);
function genMainSrc() {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix
index 83b69b12fea1..ad0cae6ecde6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix
@@ -7,11 +7,11 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "salt";
- version = "3001.1";
+ version = "3002.2";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1g2sdcibir0zhldmngv1iyzlhh2adq9dqjc73grap3df5zcv9sz9";
+ sha256 = "vW0pYhzo4JlBJ3fNOWrzVHSqESuwmZtdqAQ4fYcpAHU=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -40,8 +40,9 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
homepage = "https://saltstack.com/";
+ changelog = "https://docs.saltstack.com/en/latest/topics/releases/${version}.html";
description = "Portable, distributed, remote execution and configuration management system";
- maintainers = with maintainers; [ aneeshusa ];
+ maintainers = with maintainers; [ Flakebi ];
license = licenses.asl20;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/ssmsh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/ssmsh/default.nix
new file mode 100644
index 000000000000..1d4275c65cbd
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/ssmsh/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "ssmsh";
+ version = "1.4.4";
+
+ src = fetchFromGitHub {
+ owner = "bwhaley";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1";
+ };
+
+ vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f";
+
+ doCheck = true;
+
+ buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/bwhaley/ssmsh";
+ description = "An interactive shell for AWS Parameter Store";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dbirks ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
index 3ceb0e8509c5..f675e7518f58 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "stripe-cli";
- version = "1.5.3";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
- sha256 = "0anrn7dkxgbzilh45gyqrp2930bkg3g3diarb50qp0rlim302sgy";
+ sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv";
};
vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/trivy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/trivy/default.nix
index 7af02e567c3d..ffe5d25bd9c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/admin/trivy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/trivy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "trivy";
- version = "0.12.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "0vgir7sc14lb0wqwr786sq77pda6rw7svwr6hxklckkn20d9z7z0";
+ sha256 = "1ylk6n062n9w2c8179mj0z5acz98b30w6dkpz8gslachsz9sb5ij";
};
- vendorSha256 = "0k6n73im14gaayl8rday2fhhizsv3klza146gx0dqm0694rqph0r";
+ vendorSha256 = "0kljvy61n72dg99jyc47fzhc8ihyfjk30a1a031gczk3q3z2l7kj";
subPackages = [ "cmd/trivy" ];
@@ -32,6 +32,7 @@ buildGoModule rec {
application dependencies (Bundler, Composer, npm, yarn, etc.).
'';
homepage = src.meta.homepage;
+ changelog = "${src.meta.homepage}/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix
new file mode 100644
index 000000000000..76eb9a7fccbc
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib
+, openssl, libwebp, catch }:
+
+stdenv.mkDerivation rec {
+ pname = "arc_unpacker-unstable";
+ version = "2019-01-28";
+
+ src = fetchFromGitHub {
+ owner = "vn-tools";
+ repo = "arc_unpacker";
+ # Since the latest release (0.11) doesn't build, we've opened an upstream
+ # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
+ # a new release is upcoming
+ rev = "b9843a13e2b67a618020fc12918aa8d7697ddfd5";
+ sha256 = "0wpl30569cip3im40p3n22s11x0172a3axnzwmax62aqlf8kdy14";
+ };
+
+ nativeBuildInputs = [ cmake makeWrapper catch ];
+ buildInputs = [ boost libpng libjpeg zlib openssl libwebp ];
+
+ postPatch = ''
+ cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h
+ '';
+
+ checkPhase = ''
+ pushd ..
+ ./build/run_tests
+ popd
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker
+ cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker
+ cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker
+ cp -r ../etc $out/libexec/arc_unpacker
+ makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker
+ '';
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "A tool to extract files from visual novel archives";
+ homepage = "https://github.com/vn-tools/arc_unpacker";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ midchildan ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix
index 97abeadffc09..4b8eb4dfab2e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix
@@ -2,22 +2,23 @@
stdenv.mkDerivation rec {
pname = "ctrtool";
- version = "0.16";
+ version = "0.7";
src = fetchFromGitHub {
owner = "jakcron";
repo = "Project_CTR";
- rev = "v${version}";
- sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap";
+ rev = "ctrtool-v${version}";
+ sha256 = "07aayck82w5xcp3si35d7ghybmrbqw91fqqvmbpjrjcixc6m42z7";
};
sourceRoot = "source/ctrtool";
+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++"];
enableParallelBuilding = true;
installPhase = "
mkdir $out/bin -p
- cp ctrtool $out/bin/ctrtool
+ cp ctrtool${stdenv.hostPlatform.extensions.executable} $out/bin/
";
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
index 621e3f718e02..721accd93f03 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, zlib, bzip2, lzma, lzo, lz4, zstd, xz
-, libgcrypt, e2fsprogs, utillinux, libgpgerror }:
+, libgcrypt, e2fsprogs, util-linux, libgpgerror }:
let
version = "0.8.5";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
buildInputs = [
zlib bzip2 lzma lzo lz4 zstd xz
- libgcrypt e2fsprogs utillinux libgpgerror
+ libgcrypt e2fsprogs util-linux libgpgerror
];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/pax/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/pax/default.nix
new file mode 100644
index 000000000000..aa457b976d0d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/pax/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "pax";
+ version = "20201030";
+
+ src = fetchurl {
+ url = "http://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.tgz";
+ sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w";
+ };
+
+ buildPhase = ''
+ sh Build.sh -r -tpax
+ '';
+
+ installPhase = ''
+ install -Dm555 pax $out/bin/pax
+ ln -s $out/bin/pax $out/bin/paxcpio
+ ln -s $out/bin/pax $out/bin/paxtar
+ install -Dm444 mans/pax{,cpio,tar}.1 -t $out/share/man/man1/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "POSIX standard archive tool from MirBSD";
+ homepage = "https://www.mirbsd.org/pax.htm";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ gebner ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/unarj/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/unarj/default.nix
deleted file mode 100644
index 61e60996e759..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/archivers/unarj/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
- pname = "unarj";
- version = "2.65";
-
- src = fetchurl {
- sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
- url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz";
- };
-
- preInstall = ''
- mkdir -p $out/bin
- sed -i -e s,/usr/local/bin,$out/bin, Makefile
- '';
-
- meta = with stdenv.lib; {
- description = "Unarchiver of ARJ files";
- license = licenses.free;
- # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782:
- broken = true;
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
index 099ccc6f4cb8..5088cdeb9609 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "abcm2ps";
- version = "8.14.9";
+ version = "8.14.10";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
- sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7";
+ sha256 = "0x20vmf94n9s4r2q45543yi39fkc0jg9wd1imihjcqmb2sz3x3vm";
};
configureFlags = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index 4ab394516a84..e33ff98587bf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2020.08.09";
+ version = "2020.11.07";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- sha256 = "1j7jkv2fdrhyyjavffb5nrs8p9mfp8zqqravcad1ayv1z2wxr8vl";
+ sha256 = "0zwzgqy1wa7yd2cm6spq11lw21mdn92lx8qzrxpk9kxcl03mv5jd";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
index 79387d9ad1f9..c66a12dadd3a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mpd-mpris";
- version = "0.2.4";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "natsukagami";
repo = pname;
rev = "v${version}";
- sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm";
+ sha256 = "1kzjbv04b2garb99l64wdq8yksnm4pbhkgyzh89j5j3gb9k55zal";
};
- vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp";
+ vendorSha256 = "1ggrqwd3h602rav1dc3amsf4wxsq8mdq4ijkdsg759sqhpzl6rqs";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/pasystray/default.nix
index 8b0580ba98c4..d80f1af4182a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/audio/pasystray/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/pasystray/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
-, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
+{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
+, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
, xlibsWrapper, gsettings-desktop-schemas
}:
@@ -17,12 +17,18 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701
./fix-wayland.patch
+
+ # https://github.com/christophgysin/pasystray/issues/98
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch";
+ sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw";
+ })
];
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [
gnome3.adwaita-icon-theme
- avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
+ avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper
gsettings-desktop-schemas
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/playerctl/default.nix
index c1cddf12b650..7ef9557b42aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/audio/playerctl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/playerctl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "playerctl";
- version = "2.2.1";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "acrisci";
repo = "playerctl";
rev = "v${version}";
- sha256 = "17hi33sw3663qz5v54bqqil31sgkrlxkb2l5bgqk87pac6x2wnbz";
+ sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn";
};
nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/tts/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/tts/default.nix
new file mode 100644
index 000000000000..770e898f2eec
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/tts/default.nix
@@ -0,0 +1,123 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+, fetchpatch
+, python3
+}:
+
+#
+# Tested in the following setup:
+#
+# TTS model:
+# Tacotron2 DDC
+# https://drive.google.com/drive/folders/1Y_0PcB7W6apQChXtbt6v3fAiNwVf4ER5
+# Vocoder model:
+# Multi-Band MelGAN
+# https://drive.google.com/drive/folders/1XeRT0q4zm5gjERJqwmX5w84pMrD00cKD
+#
+# Arrange /tmp/tts like this:
+# scale_stats.npy
+# tts
+# tts/checkpoint_130000.pth.tar
+# tts/checkpoint_130000_tf.pkl
+# tts/checkpoint_130000_tf_2.3rc0.tflite
+# tts/config.json
+# tts/scale_stats.npy
+# vocoder
+# vocoder/checkpoint_1450000.pth.tar
+# vocoder/checkpoint_2750000_tf.pkl
+# vocoder/checkpoint_2750000_tf_v2.3rc.tflite
+# vocoder/config.json
+# vocoder/scale_stats.npy
+#
+# Start like this:
+# cd /tmp/tts
+# tts-server \
+# --vocoder_config ./tts/vocoder/config.json \
+# --vocoder_checkpoint ./tts/vocoder/checkpoint_1450000.pth.tar \
+# --tts_config ./tts/config.json \
+# --tts_checkpoint ./tts/checkpoint_130000.pth.tar
+#
+# For now, for deployment check the systemd unit in the pull request:
+# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
+#
+
+python3Packages.buildPythonApplication rec {
+ pname = "tts";
+ # until https://github.com/mozilla/TTS/issues/424 is resolved
+ # we treat released models as released versions:
+ # https://github.com/mozilla/TTS/wiki/Released-Models
+ version = "unstable-2020-06-17";
+
+ src = fetchFromGitHub {
+ owner = "mozilla";
+ repo = "TTS";
+ rev = "72a6ac54c8cfaa407fc64b660248c6a788bdd381";
+ sha256 = "1wvs264if9n5xzwi7ryxvwj1j513szp6sfj6n587xk1fphi0921f";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/mozilla/TTS/commit/36fee428b9f3f4ec1914b090a2ec9d785314d9aa.patch";
+ sha256 = "sha256-pP0NxiyrsvQ0A7GEleTdT87XO08o7WxPEpb6Bmj66dc=";
+ })
+ ];
+
+ preBuild = ''
+ # numba jit tries to write to its cache directory
+ export HOME=$TMPDIR
+ sed -i -e 's!tensorflow==.*!tensorflow!' requirements.txt
+ sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py
+ sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py
+ sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py
+ sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py
+ # Not required for building/installation but for their development/ci workflow
+ sed -i -e '/pylint/d' requirements.txt setup.py
+ sed -i -e '/cardboardlint/d' requirements.txt setup.py
+ '';
+
+
+ propagatedBuildInputs = with python3Packages; [
+ matplotlib
+ scipy
+ pytorch
+ flask
+ attrdict
+ bokeh
+ soundfile
+ tqdm
+ librosa
+ unidecode
+ phonemizer
+ tensorboardx
+ fuzzywuzzy
+ tensorflow_2
+ inflect
+ gdown
+ pysbd
+ ];
+
+ postInstall = ''
+ cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server
+ '';
+
+ checkInputs = with python3Packages; [ pytestCheckHook ];
+
+ disabledTests = [
+ # RuntimeError: fft: ATen not compiled with MKL support
+ "test_torch_stft"
+ "test_stft_loss"
+ "test_multiscale_stft_loss"
+ # AssertionErrors that I feel incapable of debugging
+ "test_phoneme_to_sequence"
+ "test_text2phone"
+ "test_parametrized_gan_dataset"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mozilla/TTS";
+ description = "Deep learning for Text to Speech";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ hexa mic92 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/volctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/volctl/default.nix
index dd58671824db..2a55015be105 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/audio/volctl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/volctl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, python3, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
-pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "volctl";
version = "0.6.3";
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
libpulseaudio
];
- pythonPath = with pythonPackages; [
+ pythonPath = with python3.pkgs; [
pygobject3
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
deleted file mode 100644
index a872060ce212..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
- pname = "amazon-glacier-cmd-interface";
- version = "2016-09-01";
-
- src = fetchFromGitHub {
- owner = "uskudnik";
- repo = "amazon-glacier-cmd-interface";
- rev = "9f28132f9872e1aad9e956e5613b976504e930c8";
- sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc";
- };
-
- # argparse is part of the standardlib
- prePatch = ''
- substituteInPlace setup.py --replace "'argparse'," ""
- '';
-
- propagatedBuildInputs = with python2Packages; [
- boto
- dateutil
- prettytable
- pytz
- ];
-
- meta = {
- description = "Command line interface for Amazon Glacier";
- homepage = "https://github.com/uskudnik/amazon-glacier-cmd-interface";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.lovek323 ];
- };
-
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix
index 8bf253a7b121..823fd000aee3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
+{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline
+, CoreFoundation, IOKit
+}:
stdenv.mkDerivation rec {
- name = "bacula-9.6.5";
+ name = "bacula-9.6.6";
src = fetchurl {
url = "mirror://sourceforge/bacula/${name}.tar.gz";
- sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si";
+ sha256 = "10c25igfvff09nz5ll8rxc46f659rnwimj1v9cdhr67lwdswk1k2";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
+ ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+ CoreFoundation
+ IOKit
+ ]
# acl relies on attr, which I can't get to build on darwin
++ stdenv.lib.optional (!stdenv.isDarwin) acl;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/bdsync/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/bdsync/default.nix
index 53704ce39d42..be2e9d0e6f21 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/bdsync/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/bdsync/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "bdsync";
- version = "0.11.1";
+ version = "0.11.2";
src = fetchFromGitHub {
- owner = "TargetHolding";
+ owner = "rolffokkens";
repo = pname;
rev = "v${version}";
- sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac";
+ sha256 = "0kx422cp1bxr62i1mi7dzrpwmys1kdp865rcymdp4knb5rr5864k";
};
nativeBuildInputs = [ pandoc which ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix
index 0c528bcea1ec..6e450b11aa2b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
-, utillinux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
+, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
stdenv.mkDerivation rec {
pname = "btrbk";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# Fix SSH filter script
sed -i '/^export PATH/d' ssh_filter_btrbk.sh
- substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger
+ substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger
'';
preFixup = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/bup/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/bup/default.nix
index ee6ae0a29342..0765d8a08cd9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/bup/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/bup/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper
-, perl, pandoc, python2Packages, git
+, perl, pandoc, python3Packages, git
, par2cmdline ? null, par2Support ? true
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
buildInputs = [
git
- (python2Packages.python.withPackages
+ (python3Packages.python.withPackages
(p: with p; [ setuptools tornado ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/dar/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/dar/default.nix
index 1f379feece49..593e9b34da9f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/dar/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/dar/default.nix
@@ -8,12 +8,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.6.10";
+ version = "2.6.13";
pname = "dar";
src = fetchurl {
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
- sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n";
+ sha256 = "15yhpzyzw7h7d74xxh104cnbh19639yxx0502xz85fazwpwrzsiz";
};
outputs = [ "out" "dev" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/dirvish/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/dirvish/default.nix
index 9b138d48f213..c762da1a5fcb 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/dirvish/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/dirvish/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Dirvish is a fast, disk based, rotating network backup system";
+ description = "Fast, disk based, rotating network backup system";
homepage = "http://dirvish.org/";
license = stdenv.lib.licenses.osl2;
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicity/default.nix
index c12cc1198c9c..1f62834e4d19 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicity/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicity/default.nix
@@ -7,7 +7,7 @@
, gnupg
, gnutar
, par2cmdline
-, utillinux
+, util-linux
, rsync
, backblaze-b2
, makeWrapper
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
librsync # Add 'rdiff' to PATH.
par2cmdline # Add 'par2' to PATH.
] ++ stdenv.lib.optionals stdenv.isLinux [
- utillinux # Add 'setsid' to PATH.
+ util-linux # Add 'setsid' to PATH.
] ++ (with pythonPackages; [
lockfile
mock
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/kopia/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/kopia/default.nix
index 056f523a2ca8..bcf51372f6c5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/kopia/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/kopia/default.nix
@@ -24,11 +24,6 @@ buildGoModule rec {
'';
postConfigure = ''
- # make 'vendor' writable
- cp -L -r vendor tmp-vendor
- rm -rf vendor
- mv tmp-vendor vendor
-
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
--replace "/bin/stty" "${coreutils}/bin/stty"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/monolith/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/monolith/default.nix
index 9d33ce1f3f85..4d17209be893 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/monolith/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/monolith/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
description = "Bundle any web page into a single HTML file";
homepage = "https://github.com/Y2Z/monolith";
license = licenses.unlicense;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/ori/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/ori/default.nix
index e3b4a0fb537e..9f00a7f2133a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/ori/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/ori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
+{ stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
stdenv.mkDerivation {
version = "0.8.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs = [
- boost pkgconfig scons utillinux fuse libevent openssl zlib
+ boost pkgconfig scons util-linux fuse libevent openssl zlib
];
buildPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix
index 33cac4ad229b..3317ada541a5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper
+{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper
, nixosTests, rclone }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "restic";
- version = "0.9.6";
-
- goPackagePath = "github.com/restic/restic";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "restic";
repo = "restic";
rev = "v${version}";
- sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7";
+ sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf";
};
+ vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh";
+
subPackages = [ "cmd/restic" ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
passthru.tests.restic = nixosTests.restic;
+ postPatch = ''
+ rm cmd/restic/integration_fuse_test.go
+ '';
+
postInstall = ''
wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin'
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
index 45a4df74b15d..9f2a52d64dcd 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
@@ -1,25 +1,20 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "restic-rest-server";
- version = "0.9.7";
-
- goPackagePath = "github.com/restic/rest-server";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "restic";
repo = "rest-server";
rev = "v${version}";
- sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj";
+ sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7";
};
- buildPhase = ''
- cd go/src/${goPackagePath}
- go run build.go
- '';
+ vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg";
- installPhase = ''
- install -Dt $out/bin rest-server
+ preCheck = ''
+ substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin"
'';
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/stenc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/stenc/default.nix
index 11859c4f8be4..af5a33c2a6ee 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/stenc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/stenc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "scsitape";
repo = "stenc";
- rev = "${version}";
+ rev = version;
sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/tarsnap/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/tarsnap/default.nix
index 8d23e955095a..34955a979a41 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/tarsnap/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/tarsnap/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
- configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
+ configureFlags="--with-bash-completion-dir=$out/share/bash-completion/completions"
'';
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-e/default.nix
index af1506bff6e9..a6d5b6b48010 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-e/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-e/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
+{ stdenv, fetchurl, python3Packages, lzop, postgresql, pv }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "wal-e";
- version = "0.6.10";
+ version = "1.1.1";
namePrefix = "";
src = fetchurl {
url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz";
- sha256 = "1hms24xz7wx3b91vv56fhcc3j0cszwqwnmwhka4yl90202hvdir2";
+ sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow=";
};
# needs tox
doCheck = false;
- propagatedBuildInputs = [
- pythonPackages.boto
- pythonPackages.gevent
+ propagatedBuildInputs = (with python3Packages; [
+ boto
+ gevent
+ google_cloud_storage
+ ]) ++ [
postgresql
lzop
pv
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix
index 85a6b169f745..a2702f993a69 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wal-g";
- version = "0.2.17";
+ version = "0.2.19";
src = fetchFromGitHub {
owner = "wal-g";
repo = "wal-g";
rev = "v${version}";
- sha256 = "0r6vy2b3xqwa22286srwngk63sq4aza6aj7brwc130vypcps7svp";
+ sha256 = "030c949cs13x4gnby6apy1adis8d4dlg3gzhhhs991117dxb0i3v";
};
- vendorSha256 = "0r73l4kxzldca1vg5mshq6iqsxcrndcbmbp3d7i9pxyb2kig8gv5";
+ vendorSha256 = "186cqn10fljzjc876byaj1affd8xmi8zvmkfxp9dbzsfxdir4nf7";
buildInputs = [ brotli ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
index ff2f6062554f..782133fd8d7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "zfs-replicate";
- version = "1.1.14";
+ version = "1.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0iqyk6q112ylcqrhrgvgbgqqvaikhwk0sb5kc7kg2wwqdc9rfwys";
+ sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
index 7b3cbdeaa103..5cdb39c3ecb0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
@@ -2,8 +2,8 @@
buildGoPackage rec {
pname = "zfsbackup";
- version = "unstable-2019-03-05";
- rev = "78fea6e99f0a5a4c8513d3a3d1d45fb6750cfddf";
+ version = "unstable-2020-09-30";
+ rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053";
goPackagePath = "github.com/someone1/zfsbackup-go";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "someone1";
repo = "zfsbackup-go";
inherit rev;
- sha256 = "0yalsfvzmcnc8yfzm3r5dikqrp57spwa16l7gbzvgqqcz4vlnw3n";
+ sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi";
};
goDeps = ./deps.nix;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix
index f1fa23755bc7..28be9fa141cf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix
@@ -1,12 +1,21 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
- url = "https://code.googlesource.com/gocloud";
- rev = "b9197a057a6cb1129f29cd21ca11d1bb043666d1";
- sha256 = "0f1p361apzj30i9vcza60ldhhjxff8581gr5xqim7x4d5rgmpwil";
+ url = "https://github.com/googleapis/google-cloud-go";
+ rev = "v0.57.0";
+ sha256 = "0lcq68h0x56qb14yx2df584ad0g9s1s19py813dy9nzqp0bmjig8";
+ };
+ }
+ {
+ goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
+ fetch = {
+ type = "git";
+ url = "https://dmitri.shuralyov.com/gpu/mtl";
+ rev = "666a987793e9";
+ sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
};
}
{
@@ -14,26 +23,98 @@
fetch = {
type = "git";
url = "https://github.com/Azure/azure-pipeline-go";
- rev = "232aee85e8e3a6223a11c0943f7df2ae0fac00e4";
+ rev = "v0.2.2";
sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
};
}
{
+ goPackagePath = "github.com/Azure/azure-sdk-for-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-sdk-for-go";
+ rev = "v42.3.0";
+ sha256 = "1nqxpifrr8n17irkfzhx253b17cwd15x4vfqxx80l5y7dn0jqavq";
+ };
+ }
+ {
goPackagePath = "github.com/Azure/azure-storage-blob-go";
fetch = {
type = "git";
url = "https://github.com/Azure/azure-storage-blob-go";
- rev = "fc700035fe4a7020f50d49f420b3c088aed57e03";
+ rev = "v0.8.0";
sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752";
};
}
{
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/xgb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/xgb";
+ rev = "27f122750802";
+ sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
+ };
+ }
+ {
+ goPackagePath = "github.com/OneOfOne/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/OneOfOne/xxhash";
+ rev = "v1.2.2";
+ sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cf";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/consul-api";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/consul-api";
+ rev = "eb2c6b5be1b6";
+ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
+ };
+ }
+ {
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
- rev = "3576772d916b5db1cb5516b772bcdc362349a177";
- sha256 = "04clzbyg5cmqz98i5hxbik6sd7aclas1707rhaixmmckgisqxb8i";
+ rev = "v1.31.4";
+ sha256 = "07ia78j6j2y139iq9x5gin0fwc77wv8x0zhg47kibykxn4iyx85y";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "v1.0.0";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
};
}
{
@@ -41,8 +122,161 @@
fetch = {
type = "git";
url = "https://github.com/cenkalti/backoff";
- rev = "4b4cebaf850ec58f1bb1fec5bdebdf8501c2bc3f";
- sha256 = "0vwd6nbadrqgaljb5grmw2iljvv963qd15axr5cvvgpd465q3kzc";
+ rev = "v2.2.1";
+ sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
+ };
+ }
+ {
+ goPackagePath = "github.com/census-instrumentation/opencensus-proto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-instrumentation/opencensus-proto";
+ rev = "v0.2.1";
+ sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj";
+ };
+ }
+ {
+ goPackagePath = "github.com/cespare/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cespare/xxhash";
+ rev = "v1.1.0";
+ sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
+ };
+ }
+ {
+ goPackagePath = "github.com/chzyer/logex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chzyer/logex";
+ rev = "v1.1.10";
+ sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4";
+ };
+ }
+ {
+ goPackagePath = "github.com/chzyer/readline";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chzyer/readline";
+ rev = "2972be24d48e";
+ sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
+ };
+ }
+ {
+ goPackagePath = "github.com/chzyer/test";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chzyer/test";
+ rev = "a1ea475d72b1";
+ sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k";
+ };
+ }
+ {
+ goPackagePath = "github.com/client9/misspell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/client9/misspell";
+ rev = "v0.3.4";
+ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+ };
+ }
+ {
+ goPackagePath = "github.com/cncf/udpa";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cncf/udpa";
+ rev = "269d4d468f6f";
+ sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/bbolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/bbolt";
+ rev = "v1.3.2";
+ sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/etcd";
+ rev = "v3.3.10";
+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-semver";
+ rev = "v0.2.0";
+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-systemd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-systemd";
+ rev = "95778dfbb74e";
+ sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/pkg";
+ rev = "399ea9e2e55f";
+ sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y";
+ };
+ }
+ {
+ goPackagePath = "github.com/cpuguy83/go-md2man";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cpuguy83/go-md2man";
+ rev = "v2.0.0";
+ sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "v3.2.0";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgryski/go-sip13";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgryski/go-sip13";
+ rev = "e10d5fee7954";
+ sha256 = "15fyibfas209ljz3f7g07kdmfbl3hhyd9n5n7aq5n5p9m5mn41d6";
+ };
+ }
+ {
+ goPackagePath = "github.com/dnaeon/go-vcr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dnaeon/go-vcr";
+ rev = "v1.0.1";
+ sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d";
};
}
{
@@ -50,17 +284,125 @@
fetch = {
type = "git";
url = "https://github.com/dustin/go-humanize";
- rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
+ rev = "v1.0.0";
sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
};
}
{
+ goPackagePath = "github.com/envoyproxy/go-control-plane";
+ fetch = {
+ type = "git";
+ url = "https://github.com/envoyproxy/go-control-plane";
+ rev = "v0.9.4";
+ sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj";
+ };
+ }
+ {
+ goPackagePath = "github.com/envoyproxy/protoc-gen-validate";
+ fetch = {
+ type = "git";
+ url = "https://github.com/envoyproxy/protoc-gen-validate";
+ rev = "v0.1.0";
+ sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "v1.0.0";
+ sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-gl/glfw";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-gl/glfw";
+ rev = "6f7a984d4dc4";
+ sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.4.0";
+ sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "v1.5.0";
+ sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "v1.8.0";
+ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "v1.2.1";
+ sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
goPackagePath = "github.com/golang/groupcache";
fetch = {
type = "git";
url = "https://github.com/golang/groupcache";
- rev = "404acd9df4cc9859d64fb9eed42e5c026187287a";
- sha256 = "1zmhdr758wn0kfh5xr4hg026f9qvy00s3midb5iqnpx1kh647j2g";
+ rev = "8c9f03a8e57e";
+ sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "v1.4.3";
+ sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx";
};
}
{
@@ -68,8 +410,53 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "1680a479a2cfb3fa22b972af7e36d0a0fde47bf8";
- sha256 = "1w0aivn2rqf7bcpz84nbn0alh1q3nglqgp7il835fmvvc94rrkqn";
+ rev = "v1.4.1";
+ sha256 = "0w7ks4vffnnkp0miwgc3chrsnmya45lzvpahb2wmw0jwhdp5kdx7";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/btree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/btree";
+ rev = "v1.0.0";
+ sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.4.0";
+ sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/martian";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/martian";
+ rev = "v2.1.0";
+ sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/pprof";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/pprof";
+ rev = "fc25d7d30c6d";
+ sha256 = "0ba28qx2i1bi6n6x5g670v8hmqavwj8lwl8psnc6vzagmdhjw0vg";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/renameio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/renameio";
+ rev = "v0.1.0";
+ sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx";
};
}
{
@@ -77,8 +464,107 @@
fetch = {
type = "git";
url = "https://github.com/googleapis/gax-go";
- rev = "a170e83f27ee4e20c66e51b66a99a4a349a1b75a";
- sha256 = "0a5ir1v5cd6m40hscqy0qpc3ibd703kiw419m66ddxnkvzykvp0i";
+ rev = "v2.0.5";
+ sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "v1.4.0";
+ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+ rev = "v1.0.0";
+ sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+ rev = "v1.2.0";
+ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/grpc-gateway";
+ rev = "v1.9.0";
+ sha256 = "1r4y48c76yxc2hpqszfjirvh7zxjb6z72qmk95li12ar79dhv3dy";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "v0.5.1";
+ sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "v1.0.0";
+ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+ };
+ }
+ {
+ goPackagePath = "github.com/ianlancetaylor/demangle";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ianlancetaylor/demangle";
+ rev = "5e5cf60278f6";
+ sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "v1.0.0";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmespath/go-jmespath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jmespath/go-jmespath";
+ rev = "v0.3.0";
+ sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp";
+ };
+ }
+ {
+ goPackagePath = "github.com/jonboulle/clockwork";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jonboulle/clockwork";
+ rev = "v0.1.0";
+ sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+ };
+ }
+ {
+ goPackagePath = "github.com/jstemmer/go-junit-report";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jstemmer/go-junit-report";
+ rev = "v0.9.1";
+ sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw";
};
}
{
@@ -86,8 +572,35 @@
fetch = {
type = "git";
url = "https://github.com/juju/ratelimit";
- rev = "f60b32039441cd828005f82f3a54aafd00bc9882";
- sha256 = "1qbjcm4y53awkqmpxb1nm9c1xdylc44vph4mn30qjb5wrcqy7c1r";
+ rev = "v1.0.1";
+ sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/kisielk/errcheck";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/errcheck";
+ rev = "v1.1.0";
+ sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y";
+ };
+ }
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
};
}
{
@@ -95,8 +608,8 @@
fetch = {
type = "git";
url = "https://github.com/klauspost/compress";
- rev = "30993c63e1b02b47dd3878e74c8db50833706ecc";
- sha256 = "07d0r56ic91rdd0xvfr7zpn015kl6g9jwlgq5avczbz4fnyx5x8m";
+ rev = "v1.10.6";
+ sha256 = "0jnm5mjazxkjwzb7z6sjlqm2l68z4h4xjhir2lgfkf04rj4l290s";
};
}
{
@@ -104,8 +617,53 @@
fetch = {
type = "git";
url = "https://github.com/klauspost/pgzip";
- rev = "083b1c3f84dd6486588802e5ce295de3a7f41a8b";
- sha256 = "0ddigh096fz3lixbdm679hjvnfivbpkijrclk5sn9091hyj38pb3";
+ rev = "v1.2.4";
+ sha256 = "0mnhfdn0isbkra455jynqjbmrwymx09shlbzbyvgfycih3nbrif0";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
{
@@ -113,8 +671,17 @@
fetch = {
type = "git";
url = "https://github.com/kurin/blazer";
- rev = "cf2f27cc0be3dac3c1a94c3c8b76834ce741439e";
- sha256 = "02nwxrczg8c9zj3hdmbyg458qvhfwl60ci1pjl7f0y07kgiv1rg3";
+ rev = "v0.5.3";
+ sha256 = "18jsq7n31ycvaivpvyksbddj82spw4g29w6dx92x2wab2hzbc7ik";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "v1.8.0";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
{
@@ -122,8 +689,17 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-ieproxy";
- rev = "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13";
- sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz";
+ rev = "v0.0.1";
+ sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
@@ -131,8 +707,35 @@
fetch = {
type = "git";
url = "https://github.com/miolini/datacounter";
- rev = "aa48df3a02c1fbcd3040271f631887991c3071fb";
- sha256 = "12ldh5jhafjhh3jvh979mldwygkkcnm97axs7dhlai6gqwlhls87";
+ rev = "v1.0.2";
+ sha256 = "0lqhdb9glx65ycjjrqqqpd28zi95qnr2sdz93y6fma0khss46c5f";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "v1.1.0";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "v1.1.2";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
};
}
{
@@ -140,8 +743,17 @@
fetch = {
type = "git";
url = "https://github.com/nightlyone/lockfile";
- rev = "0ad87eef1443f64d3d8c50da647e2b1552851124";
- sha256 = "19vfswcvdy937da7w6hap3wp83drj5a084sqszy8r2ph4fbkln41";
+ rev = "v1.0.0";
+ sha256 = "0jzlngank7yaq5pl5mipsfglmalv9x2b9yhqr78w5dmx4hikh7kr";
+ };
+ }
+ {
+ goPackagePath = "github.com/oklog/ulid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/oklog/ulid";
+ rev = "v1.3.1";
+ sha256 = "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq";
};
}
{
@@ -149,17 +761,170 @@
fetch = {
type = "git";
url = "https://github.com/op/go-logging";
- rev = "970db520ece77730c7e4724c61121037378659d9";
+ rev = "970db520ece7";
sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
};
}
{
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "v1.2.0";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+ };
+ }
+ {
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
- sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
+ rev = "v0.9.1";
+ sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "v0.9.3";
+ sha256 = "1608rm1y2p3iv8k2x7wyc6hshvpbfkv2k77hy0x870syms1g3g1p";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "14fe0d1b01d4";
+ sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "v0.4.0";
+ sha256 = "00008pczafy982m59n1j31pnp41f4grbc2c40jccp52xg3m5klmr";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "5867b95ac084";
+ sha256 = "1rahdk62ajj4zpfb3mgzjqip773la9fb0m87m7s9a0b39l3fmzvr";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/tsdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/tsdb";
+ rev = "v0.7.1";
+ sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04";
+ };
+ }
+ {
+ goPackagePath = "github.com/rogpeppe/fastuuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rogpeppe/fastuuid";
+ rev = "6724a57986af";
+ sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz";
+ };
+ }
+ {
+ goPackagePath = "github.com/rogpeppe/go-internal";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rogpeppe/go-internal";
+ rev = "v1.3.0";
+ sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "v2.0.1";
+ sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
+ };
+ }
+ {
+ goPackagePath = "github.com/satori/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "v1.2.0";
+ sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "v1.0.0";
+ sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.2.0";
+ sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+ };
+ }
+ {
+ goPackagePath = "github.com/soheilhy/cmux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/soheilhy/cmux";
+ rev = "v0.1.4";
+ sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spaolacci/murmur3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spaolacci/murmur3";
+ rev = "f09979ecbc72";
+ sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "v1.1.2";
+ sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "v1.3.0";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
{
@@ -167,8 +932,17 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
- rev = "8a4b46fadf756f30eff047abf2f8edba4eac6fef";
- sha256 = "0f9pxni3lghl205wrnssw58iliqifrxcdabrbww20887zwn3ki7q";
+ rev = "v1.0.0";
+ sha256 = "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "v1.0.0";
+ sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
};
}
{
@@ -176,17 +950,125 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab";
+ rev = "v1.0.5";
sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31";
};
}
{
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "v1.4.0";
+ sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.5.1";
+ sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
+ };
+ }
+ {
+ goPackagePath = "github.com/tmc/grpc-websocket-proxy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tmc/grpc-websocket-proxy";
+ rev = "0ad062ec5ee5";
+ sha256 = "1anw4v9wspnw9xf2z5r9w0sszwjklyanl0l85wgg6nxak9gnrqp4";
+ };
+ }
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "v1.1.4";
+ sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+ };
+ }
+ {
+ goPackagePath = "github.com/xiang90/probing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xiang90/probing";
+ rev = "43a291ad63a2";
+ sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i";
+ };
+ }
+ {
+ goPackagePath = "github.com/xordataexchange/crypt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xordataexchange/crypt";
+ rev = "b2862e3d0a77";
+ sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+ };
+ }
+ {
+ goPackagePath = "github.com/yuin/goldmark";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yuin/goldmark";
+ rev = "v1.1.27";
+ sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/bbolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/bbolt";
+ rev = "v1.3.2";
+ sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+ };
+ }
+ {
goPackagePath = "go.opencensus.io";
fetch = {
type = "git";
url = "https://github.com/census-instrumentation/opencensus-go";
- rev = "3b5a343282fe4b4fccdb0f24cbd1d7169d20858a";
- sha256 = "0qzx8p019r4qzm0knvs3kcx5vc9qg6ksgf1amk5djr1h00w460aw";
+ rev = "v0.22.3";
+ sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "v1.4.0";
+ sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/multierr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/multierr";
+ rev = "v1.1.0";
+ sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/zap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/zap";
+ rev = "v1.10.0";
+ sha256 = "10hdzr1rghwbsl6bbd30779dx44fh9mg9pq8d2cgqlknqxxpvpvr";
};
}
{
@@ -194,8 +1076,53 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "87dc89f01550277dc22b74ffcf4cd89fa2f40f4c";
- sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+ rev = "06a226fb4e37";
+ sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "6cc2880d07d6";
+ sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/image";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/image";
+ rev = "cff245a6509b";
+ sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "738671d3881b";
+ sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/mobile";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/mobile";
+ rev = "d2bd2a29d028";
+ sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/mod";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/mod";
+ rev = "v0.2.0";
+ sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl";
};
}
{
@@ -203,8 +1130,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "da9a3fd4c5820e74b24a6cb7fb438dc9b0dd377c";
- sha256 = "0iavs400534jn7drmdphx0f18vgg060p2r59xw5d85ji1l5rin1l";
+ rev = "7e3656a0809f";
+ sha256 = "1rmj59bd0hvf8cbp42c0y8y38prs5ill1zszhqp9i8m86cvkfqk9";
};
}
{
@@ -212,8 +1139,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
- rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
- sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
+ rev = "bf48bf16ab8d";
+ sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg";
};
}
{
@@ -221,8 +1148,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
- rev = "cd5d95a43a6e21273425c7ae415d3df9ea832eeb";
- sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
+ rev = "43a5402ce75a";
+ sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm";
};
}
{
@@ -230,8 +1157,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "b09406accb4736d857a32bf9444cd7edae2ffa79";
- sha256 = "00lbhsr2p3mi2n35mv3yy6lmgzjjav45yv9bmrxgyahbac5qnz5m";
+ rev = "7e40ca221e25";
+ sha256 = "1fkhs1sn6prfsqaj70kya2gn1sqqa85lmgff6j6s7027zc1yjvqa";
};
}
{
@@ -239,26 +1166,62 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "3d0f7978add91030e5e8976ff65ccdd828286cba";
- sha256 = "0iagl5icarfrbiv6m3dhqy51r30cnl07r66im5c88dz7lrvpy5z3";
+ rev = "v0.3.2";
+ sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "555d28b269f0";
+ sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "2bc93b1c0c88";
+ sha256 = "10sg7nvw40f2d6hxmsy4nvhmawbidk022v3arbh8acsjxglw84zs";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/xerrors";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/xerrors";
+ rev = "9bdfabe68543";
+ sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
};
}
{
goPackagePath = "google.golang.org/api";
fetch = {
type = "git";
- url = "https://code.googlesource.com/google-api-go-client";
- rev = "e6ade80c6e2a122a6588f9f827207dcb99da433e";
- sha256 = "1mk0ab6f2dyx1lack436zdhspq1hgip2s5m3pqjrqk18s8vvn4bd";
+ url = "https://github.com/googleapis/google-api-go-client";
+ rev = "v0.25.0";
+ sha256 = "0bfpii160ns1pl3iqc38h5db258mv58igf2ifglds3dajgsj2qrr";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.6.6";
+ sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
- url = "https://github.com/google/go-genproto";
- rev = "548a555dbc03994223efbaba0090152849259498";
- sha256 = "15sbfwrh6m18fn3n369cb5c8qsmw17wibwmjssblgp64gvmx5b18";
+ url = "https://github.com/googleapis/go-genproto";
+ rev = "f5ebc3bea380";
+ sha256 = "1v5dyp6g35rwjwx1ixjy7yh1hay4n7ya5aq5h4ckvd9h0j7rw5sz";
};
}
{
@@ -266,8 +1229,98 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
- rev = "7c8e60372e19da88fb3fe8ac6a8de781eef7f547";
- sha256 = "03fb7j1gfglzp77hkhlm8dgg3if1j1pvry0nhx915ww0hmz6sr00";
+ rev = "v1.29.1";
+ sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/protobuf";
+ rev = "v1.22.0";
+ sha256 = "0n7lc4m7kfvj01glc0gnjy0zsnsic7cxnbvlajy0h14cxbab87pj";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/errgo.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/errgo.v2";
+ rev = "v2.1.0";
+ sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/resty.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/resty.v1";
+ rev = "v1.12.0";
+ sha256 = "062mn735rqzhha5ag07z4gz08hxzrfm2yx067jfmaaxmb6797lmp";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "v0.0.1-2020.1.3";
+ sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
+ };
+ }
+ {
+ goPackagePath = "rsc.io/binaryregexp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rsc/binaryregexp";
+ rev = "v0.2.0";
+ sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b";
+ };
+ }
+ {
+ goPackagePath = "rsc.io/quote";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rsc/quote";
+ rev = "v3.1.0";
+ sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i";
+ };
+ }
+ {
+ goPackagePath = "rsc.io/sampler";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rsc/sampler";
+ rev = "v1.3.0";
+ sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh";
};
}
]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
index 16563c380998..25e72c1b880d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
@@ -8,7 +8,7 @@
, intltool
, pavucontrol
, python3Packages
-, utillinux
+, util-linux
, wrapGAppsHook
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
cinnamon.xapps
gnome3.gnome-bluetooth
python3Packages.python
- utillinux
+ util-linux
];
pythonPath = with python3Packages; [
@@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
--replace /usr/lib/blueberry $out/lib/blueberry \
--replace /usr/share $out/share
substituteInPlace $out/lib/blueberry/rfkillMagic.py \
- --replace /usr/bin/rfkill ${utillinux}/bin/rfkill \
- --replace /usr/sbin/rfkill ${utillinux}/bin/rfkill \
+ --replace /usr/bin/rfkill ${util-linux}/bin/rfkill \
+ --replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \
--replace /usr/lib/blueberry $out/lib/blueberry
substituteInPlace $out/share/applications/blueberry.desktop \
--replace Exec=blueberry Exec=$out/bin/blueberry
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
index aa8693b365a0..ac50f3667c4e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "blueman";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchurl {
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "1pngqbwapbvywhkmflapqvs0wa0af7d1a87wy56l5hg2r462xl1v";
+ sha256 = "1nk46s1s8yrlqv37sc7la05nnn7sdgqhkrcdm98qin34llwkv70x";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 09f5471de483..588049cb976b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "bluez-alsa";
- version = "2.1.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${version}";
- sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci";
+ sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix
index 9b232be8ce00..0acf55da7fe2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, utillinux
+{ stdenv, fetchurl, util-linux
, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
, vorbis-tools, xorriso }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}.tar.gz";
};
- nativeBuildInputs = [ utillinux ];
+ nativeBuildInputs = [ util-linux ];
postPatch = ''
for path in \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
BB_OGGENC=${vorbis-tools}/bin/oggenc \
BB_OGGDEC=${vorbis-tools}/bin/oggdec \
BB_FLACCMD=${flac.bin}/bin/flac \
- BB_EJECT=${utillinux}/bin/eject \
+ BB_EJECT=${util-linux}/bin/eject \
BB_NORMCMD=${normalize}/bin/normalize \
; do
echo $path
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix
index ae9e6724facc..b935bc02d150 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook
, p7zip, mtools, syslinux }:
stdenv.mkDerivation rec {
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace unetbootin.cpp \
--replace /bin/df ${coreutils}/bin/df \
- --replace /sbin/blkid ${utillinux}/sbin/blkid \
- --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
- --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
+ --replace /sbin/blkid ${util-linux}/sbin/blkid \
+ --replace /sbin/fdisk ${util-linux}/sbin/fdisk \
+ --replace /sbin/sfdisk ${util-linux}/sbin/sfdisk \
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
--replace /usr/share/syslinux ${syslinux}/share/syslinux
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
index bf20e0119ec6..f4f0ac41563a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
@@ -4,21 +4,22 @@
stdenv.mkDerivation rec {
pname = "brotli";
- version = "1.0.7";
+ version = "1.0.9";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "v" + version;
- sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
+ sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
};
nativeBuildInputs = [ cmake ];
patches = stdenv.lib.optional staticOnly (fetchpatch {
- # from https://github.com/google/brotli/pull/655
- url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
- sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
+ # context from https://github.com/google/brotli/pull/655
+ # updated patch from https://github.com/google/brotli/pull/655
+ url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch";
+ sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0=";
});
cmakeFlags = []
@@ -32,7 +33,14 @@ stdenv.mkDerivation rec {
# This breaks on Darwin because our cmake hook tries to make a build folder
# and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
- prePatch = "rm BUILD";
+ prePatch = ''
+ rm BUILD
+
+ # Upstream fixed this reference to runtime-path after the release
+ # and with this references g++ complains about invalid option -R
+ sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in
+ cat scripts/libbrotli*.pc.in
+ '';
# Don't bother with "man" output for now,
# it currently only makes the manpages hard to use.
@@ -61,7 +69,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
- maintainers = [ maintainers.vcunat ];
+ maintainers = with maintainers; [ freezeboy ];
platforms = platforms.all;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix
index 6bc365b8e1e1..0124a0b3d63b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
pname = "lz4";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchFromGitHub {
- sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61";
+ sha256 = "1w02kazh1fps3sji2sn89fz862j1199c5ajrqcgl1bnlxj09kcbz";
rev = "v${version}";
repo = pname;
owner = pname;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix
index 1953b793657e..07c7bf95607d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, utillinux }:
+{ stdenv, fetchurl, zlib, util-linux }:
let name = "pigz";
version = "2.4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
+ buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux;
makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix
index 5cf88288d813..0b6082bb5780 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://tukaani.org/xz/";
- description = "XZ, general-purpose data compression software, successor of LZMA";
+ description = "A general-purpose data compression software, successor of LZMA";
longDescription =
'' XZ Utils is free general-purpose data compression software with high
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix
index 8ce434741a55..c26ca507525f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
- buildInputs = [ bash ];
+ buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash;
patches = [
./playtests-darwin.patch
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
--replace "zstdcat" "$bin/bin/zstdcat"
'';
- outputs = [ "bin" "dev" "man" "out" ];
+ outputs = [ "bin" "dev" ]
+ ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man"
+ ++ [ "out" ];
meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
index 48e964bf687d..cd6c4302188a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }:
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }:
mkDerivation rec {
pname = "android-file-transfer";
- version = "3.9";
+ version = "4.0";
src = fetchFromGitHub {
owner = "whoozle";
repo = "android-file-transfer-linux";
rev = "v${version}";
- sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3";
+ sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf";
};
nativeBuildInputs = [ cmake readline pkgconfig ];
- buildInputs = [ fuse qtbase ];
+ buildInputs = [ fuse qtbase qttools ];
meta = with stdenv.lib; {
description = "Reliable MTP client with minimalistic UI";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
index c3b1759bcdd5..6e39ff174588 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
+{ stdenv, fetchurl, pkgconfig, util-linux, bash }:
stdenv.mkDerivation rec {
pname = "bcache-tools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ utillinux ];
+ buildInputs = [ util-linux ];
# * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
# anyway (it's distro specific stuff).
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix
index e87cecbf8fd3..bdca893a136c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
+{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
let
- version = "0.6.2";
- sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib";
-
- bees = stdenv.mkDerivation {
+ bees = stdenv.mkDerivation rec {
pname = "bees";
- inherit version;
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "Zygo";
repo = "bees";
rev = "v${version}";
- inherit sha256;
+ sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
};
buildInputs = [
btrfs-progs # for btrfs/ioctl.h
- utillinux # for uuid.h
+ util-linux # for uuid.h
];
nativeBuildInputs = [
@@ -58,8 +55,9 @@ let
in
-runCommand "bees-service-${version}" {
- inherit bash bees coreutils utillinux;
+runCommand "bees-service" {
+ inherit bash bees coreutils;
+ utillinux = util-linux; # needs to be a valid shell variable name
btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
} ''
mkdir -p -- "$out/bin"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
index f8968260ce79..e69f76e16304 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, fuse, pkgconfig }:
stdenv.mkDerivation rec {
- version = "1.14.7";
+ version = "1.14.8";
pname = "bindfs";
src = fetchurl {
url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
- sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8";
+ sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5";
};
dontStrip = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
index 8ff72421a598..03db1d913e2b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "5.7";
+ version = "5.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "0p6ycbr8sw5bq3mj84gh9rvh5sk8sjr2l9hb9dhm4j41ij5h8bsw";
+ sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq";
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postPatch = "sed -i s/-O1/-O2/ configure";
postInstall = ''
- install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
+ install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
'';
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch
new file mode 100644
index 000000000000..f78c7af9e35a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch
@@ -0,0 +1,63 @@
+From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001
+From: David Disseldorp <ddiss@suse.de>
+Date: Tue, 1 Sep 2020 13:49:21 +0200
+Subject: [PATCH] cmake: detect and use sigdescr_np() if available
+
+sys_siglist is deprecated with glibc 2.32. A new thread-safe and
+async-signal safe sigdescr_np() function is provided, so use it if
+available.
+
+Fixes: https://tracker.ceph.com/issues/47187
+Signed-off-by: David Disseldorp <ddiss@suse.de>
+---
+ cmake/modules/CephChecks.cmake | 1 +
+ src/global/signal_handler.h | 8 +++++---
+ src/include/config-h.in.cmake | 3 +++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake
+index 23687283a7c6..ca86dcbc73de 100644
+--- a/cmake/modules/CephChecks.cmake
++++ b/cmake/modules/CephChecks.cmake
+@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R)
+ check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT)
+ check_function_exists(pipe2 HAVE_PIPE2)
+ check_function_exists(accept4 HAVE_ACCEPT4)
++check_function_exists(sigdescr_np HAVE_SIGDESCR_NP)
+
+ include(CMakePushCheckState)
+ cmake_push_check_state(RESET)
+diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h
+index 476724201aa9..c101b2e28733 100644
+--- a/src/global/signal_handler.h
++++ b/src/global/signal_handler.h
+@@ -20,10 +20,12 @@
+
+ typedef void (*signal_handler_t)(int);
+
+-#ifndef HAVE_REENTRANT_STRSIGNAL
+-# define sig_str(signum) sys_siglist[signum]
+-#else
++#ifdef HAVE_SIGDESCR_NP
++# define sig_str(signum) sigdescr_np(signum)
++#elif HAVE_REENTRANT_STRSIGNAL
+ # define sig_str(signum) strsignal(signum)
++#else
++# define sig_str(signum) sys_siglist[signum]
+ #endif
+
+ void install_sighandler(int signum, signal_handler_t handler, int flags);
+diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
+index 1ea3703f620c..59bd4273511a 100644
+--- a/src/include/config-h.in.cmake
++++ b/src/include/config-h.in.cmake
+@@ -220,6 +220,9 @@
+ /* Define to 1 if you have sched.h. */
+ #cmakedefine HAVE_SCHED 1
+
++/* Define to 1 if you have sigdescr_np. */
++#cmakedefine HAVE_SIGDESCR_NP 1
++
+ /* Support SSE (Streaming SIMD Extensions) instructions */
+ #cmakedefine HAVE_SSE
+
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
index 9b9fe9a5aaf0..b75a902681e5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
@@ -1,4 +1,5 @@
{ stdenv, runCommand, fetchurl
+, fetchpatch
, ensureNewerSourcesHook
, cmake, pkgconfig
, which, git
@@ -27,7 +28,7 @@
, nss ? null, nspr ? null
# Linux Only Dependencies
-, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
+, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null
, ...
}:
@@ -121,10 +122,10 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;
- version = "15.2.5";
+ version = "15.2.6";
src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
- sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d";
+ sha256 = "093pphgqrkrbv3484ayl0vac6a6s53zxa01yad0cbvnx0kyj55hh";
};
in rec {
ceph = stdenv.mkDerivation {
@@ -133,6 +134,7 @@ in rec {
patches = [
./0000-fix-SPDK-build-env.patch
+ ./ceph-glibc-2-32-sigdescr_np.patch
];
nativeBuildInputs = [
@@ -147,7 +149,7 @@ in rec {
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
] ++ optionals stdenv.isLinux [
- linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
+ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14
rdma-core rabbitmq-c
] ++ optionals hasRadosgw [
@@ -207,12 +209,12 @@ in rec {
ceph-client = runCommand "ceph-client-${version}" {
meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices";
} ''
- mkdir -p $out/{bin,etc,${sitePackages}}
+ mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions}
cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
cp -r ${ceph}/bin/rbd-replay* $out/bin
cp -r ${ceph}/${sitePackages} $out/${sitePackages}
- cp -r ${ceph}/etc/bash_completion.d $out/etc
+ cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions
# wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
substituteInPlace $out/bin/ceph --replace ${ceph} $out
substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
index 46635aa67412..1c639dfc29ec 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "cpcfs";
version = "0.85.4";
-
+
src = fetchFromGitHub {
owner = "derikz";
repo = "cpcfs";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Manipulating CPC dsk images and files";
homepage = "https://github.com/derikz/cpcfs/" ;
license = licenses.bsd2;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
index 43823e5b51a3..42853eb8ff97 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }:
stdenv.mkDerivation rec {
pname = "darling-dmg";
- version = "1.0.4+git20180914";
+ version = "1.0.4+git20200427";
src = fetchFromGitHub {
owner = "darlinghq";
repo = "darling-dmg";
- rev = "97a92a6930e43cdbc9dedaee62716e3223deb027";
- sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj";
+ rev = "71cc76c792db30328663272788c0b64aca27fdb0";
+ sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
+ buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ];
- # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
- CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
+ CXXFLAGS = [
+ "-DCOMPILE_WITH_LZFSE=1"
+ "-llzfse"
+ ];
- meta = {
+ meta = with stdenv.lib; {
homepage = "https://www.darlinghq.org/";
description = "Darling lets you open macOS dmgs on Linux";
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.gpl3;
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ Luflosi ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
new file mode 100644
index 000000000000..0e31725936fa
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
@@ -0,0 +1,42 @@
+From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Wed, 11 Nov 2020 11:58:25 +0100
+Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked
+
+---
+ src/dav_fuse.c | 2 +-
+ src/umount_davfs.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/dav_fuse.c b/src/dav_fuse.c
+index 734bc1f..4501433 100644
+--- a/src/dav_fuse.c
++++ b/src/dav_fuse.c
+@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time,
+ unmounting = 1;
+ pid_t pid = fork();
+ if (pid == 0) {
+- execl("/bin/umount", "umount", "-il", mountpoint, NULL);
++ execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL);
+ _exit(EXIT_FAILURE);
+ }
+ }
+diff --git a/src/umount_davfs.c b/src/umount_davfs.c
+index b7019c3..75e3b4b 100644
+--- a/src/umount_davfs.c
++++ b/src/umount_davfs.c
+@@ -122,9 +122,9 @@ main(int argc, char *argv[])
+
+ char *umount_command = NULL;
+ if (mpoint) {
+- umount_command = ne_concat("umount -i '", mpoint, "'", NULL);
++ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL);
+ } else {
+- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL);
++ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL);
+ error(0, 0,
+ _("\n"
+ " can't evaluate PID file name;\n"
+--
+2.28.0
+
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
index 4f818ed213b7..02536a13d15b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
@@ -1,42 +1,32 @@
{ stdenv
, fetchurl
, fetchpatch
-, autoreconfHook
, neon
, procps
, substituteAll
, zlib
+, wrapperDir ? "/run/wrappers/bin"
}:
stdenv.mkDerivation rec {
- name = "davfs2-1.5.6";
+ name = "davfs2-1.6.0";
src = fetchurl {
url = "mirror://savannah/davfs2/${name}.tar.gz";
- sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21";
+ sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A=";
};
- nativeBuildInputs = [
- autoreconfHook # neon-0.31.patch requires reconfiguration
- ];
-
buildInputs = [ neon zlib ];
patches = [
- ./isdir.patch
./fix-sysconfdir.patch
(substituteAll {
src = ./0001-umount_davfs-substitute-ps-command.patch;
ps = "${procps}/bin/ps";
})
-
- # Fix build with neon 0.31
- # http://savannah.nongnu.org/bugs/?58101
- (fetchpatch {
- name = "neon-0.31.patch";
- url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737";
- sha256 = "117x9rql6wk230pl1nram3pp8svll9wzfs5nf407z4jnrdr1zm0j";
- extraPrefix = ""; # empty means add 'a/' and 'b/'
+ (substituteAll {
+ src = ./0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch;
+ inherit wrapperDir;
})
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
index 10e6e2f9c801..e1f28a0f2792 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dislocker";
- version = "0.7.1";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "aorimn";
repo = "dislocker";
rev = "v${version}";
- sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
+ sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
index 53ebbb2f8d44..3d70f2f73c7f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "duperemove";
- version = "0.11.1";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "markfasheh";
repo = "duperemove";
rev = "v${version}";
- sha256 = "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z";
+ sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix
index e8d60f835bf0..b9817ecb05c0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/f3/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "f3";
- version = "7.2";
+ version = "8.0";
src = fetchFromGitHub {
owner = "AltraMayor";
repo = pname;
rev = "v${version}";
- sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy";
+ sha256 = "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
index c1d048889c70..c8366a96f075 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
@@ -1,38 +1,26 @@
-{ stdenv, fetchurl, parted, utillinux }:
+{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }:
stdenv.mkDerivation rec {
- version = "1.0.2";
+ version = "1.1.0";
pname = "fatresize";
- src = fetchurl {
- url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
- sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm";
+ src = fetchFromGitHub {
+ owner = "ya-mouse";
+ repo = "fatresize";
+ rev = "v${version}";
+ sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2";
};
- buildInputs = [ parted utillinux ];
+ buildInputs = [ parted util-linux ];
+ nativeBuildInputs = [ pkg-config ];
- # This patch helps this unmantained piece of software to be built against recent parted
- # It basically modifies the detection scheme for parted version (the current one has no micro version defined)
- # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted
- # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params
- patches = [ ./fatresize_parted_nix.patch ];
-
- preConfigure = ''
- echo "Replacing calls to ped_free with free ..."
- substituteInPlace ./fatresize.c --replace ped_free free
- '';
-
- # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives
- # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG
- makeFlags = [ "LDFLAGS=-lparted-fs-resize" ];
-
- propagatedBuildInputs = [ parted utillinux ];
+ propagatedBuildInputs = [ parted util-linux ];
meta = with stdenv.lib; {
description = "The FAT16/FAT32 non-destructive resizer";
- homepage = "https://sourceforge.net/projects/fatresize";
+ homepage = "https://github.com/ya-mouse/fatresize";
platforms = platforms.linux;
- license = licenses.gpl2;
+ license = licenses.gpl3;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
deleted file mode 100644
index e9aa87a2d564..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/aclocal.m4 b/aclocal.m4
-index 18e8176..2e75592 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -88,8 +88,15 @@ int main ()
- if ( !(version = ped_get_version ()) )
- exit(1);
- if (sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-- printf("%s, bad version string\n", version);
-- exit(1);
-+ if (sscanf(version, "%d.%d", &major, &minor) != 2)
-+ {
-+ printf("%s, bad version string\n", version);
-+ exit(1);
-+ }
-+ else
-+ {
-+ micro = 0;
-+ }
- }
-
- if ((major > $parted_config_major_version) ||
-diff --git a/configure b/configure
-index ed31457..e5f1705 100755
---- a/configure
-+++ b/configure
-@@ -4793,8 +4793,15 @@ int main ()
- if ( !(version = ped_get_version ()) )
- exit(1);
- if (sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-- printf("%s, bad version string\n", version);
-- exit(1);
-+ if (sscanf(version, "%d.%d", &major, &minor) != 2)
-+ {
-+ printf("%s, bad version string\n", version);
-+ exit(1);
-+ }
-+ else
-+ {
-+ micro = 0;
-+ }
- }
-
- if ((major > $parted_config_major_version) ||
-diff --git a/fatresize.c b/fatresize.c
-index 424d5d2..e439102 100644
---- a/fatresize.c
-+++ b/fatresize.c
-@@ -30,6 +30,7 @@
- #include <inttypes.h>
- #include <parted/parted.h>
- #include <parted/debug.h>
-+#include <parted/filesys.h>
- #include <parted/unit.h>
-
- #include "config.h"
-@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex)
- static int
- snap(PedSector* sector, PedSector new_sector, PedGeometry* range)
- {
-- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0);
-+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector));
- if (!ped_geometry_test_sector_inside(range, new_sector))
- return 0;
-
-@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom,
- end_part->geom.end, end_part->geom.start - 1, -1);
- }
-
-- PED_ASSERT (start <= end, return);
-+ PED_ASSERT (start <= end);
- ped_geometry_set (new_geom, start, end - start + 1);
- }
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 7e6bd7440b30..4aafe8d6d628 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "1ihibhj48fk1c89yh7vyb44mkywxphxqqgz7xks9caw05qw5ac1y";
+ sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
index 89fa3ebe33b6..d820e5e68e2a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
- version = "0.30.0";
+ version = "0.32.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
- sha256 = "1ai1dgf07g2c08rp87kygrl67hyj7x793093wmnwaxfpylx5flv0";
+ sha256 = "09k7479gd9rlzmxhcvc1b3ajy8frzd6881vnlvk3z9818n4aq7qc";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
index e7028ec12494..f495b56e3252 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
- openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
+ openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
rsync, glibc, rpcsvc-proto, libtirpc
}:
let
@@ -24,7 +24,7 @@ let
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
- acl sqlite liburcu attr makeWrapper utillinux libtirpc
+ acl sqlite liburcu attr makeWrapper util-linux libtirpc
(python3.withPackages (pkgs: [
pkgs.flask
pkgs.prettytable
@@ -56,7 +56,7 @@ let
openssh # ssh
rsync # rsync, e.g. for geo-replication
systemd # systemctl
- utillinux # mount umount
+ util-linux # mount umount
which # which
xfsprogs # xfs_info
];
@@ -76,9 +76,9 @@ stdenv.mkDerivation
substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \
--replace '/sbin/' '${lvm2}/bin/'
substituteInPlace libglusterfs/src/glusterfs/compat.h \
- --replace '/bin/umount' '${utillinux}/bin/umount'
+ --replace '/bin/umount' '${util-linux}/bin/umount'
substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \
- --replace '/bin/mount' '${utillinux}/bin/mount'
+ --replace '/bin/mount' '${util-linux}/bin/mount'
'';
# Note that the VERSION file is something that is present in release tarballs
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
index d97b05abb6c7..23edb8175799 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "HTTPFS2, a FUSE-based HTTP file system for Linux";
+ description = "FUSE-based HTTP filesystem for Linux";
homepage = "http://httpfs.sourceforge.net/";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
index 6de0d586ad94..a8e2cc3f0974 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Manipulating CPC dsk images and files";
homepage = "https://github.com/cpcsdk/idsk" ;
license = licenses.mit;
- maintainers = [ maintainers.genesis ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix
index fb90c3b0aebb..dfa7530ac64f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/irods/common.nix
@@ -51,6 +51,6 @@ with stdenv;
homepage = "https://irods.org";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.bzizou ];
- platforms = stdenv.lib.platforms.all;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
index a7c9421f46ad..60670708f4bc 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,25 +2,28 @@
stdenv.mkDerivation rec {
pname = "mergerfs";
- version = "2.28.3";
+ version = "2.32.0";
src = fetchFromGitHub {
owner = "trapexit";
repo = pname;
rev = version;
- sha256 = "1w6p3svc2yknp6swqg8lax6n9b31lyplb3j7r8nv14hbq4hymylx";
+ sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad";
};
nativeBuildInputs = [
automake autoconf pkgconfig gettext libtool pandoc which
];
+ prePatch = ''
+ sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile
+ '';
buildInputs = [ attr libiconv ];
preConfigure = ''
echo "${version}" > VERSION
'';
- makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ];
+ makeFlags = [ "DESTDIR=${placeholder "out"}" "XATTR_AVAILABLE=1" "PREFIX=/" "SBINDIR=/bin" ];
enableParallelBuilding = true;
postFixup = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
index df3dd661d75e..48c005e1caaf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
@@ -10,24 +10,22 @@
stdenv.mkDerivation rec {
pname = "moosefs";
- version = "3.0.114";
+ version = "3.0.115";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0bilrzzlg599xy21cm7r0xb2sanngr74j3z03xgybcm10kl97i7j";
+ sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs =
- [ fuse libpcap zlib ];
+ [ fuse libpcap zlib python ];
postInstall = ''
substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\""
- wrapProgram $out/sbin/mfscgiserv \
- --prefix PATH ":" "${python}/bin"
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
index 58bd9340c5b0..5f78b3c379d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mtools-4.0.24";
+ pname = "mtools";
+ version = "4.0.26";
src = fetchurl {
- url = "mirror://gnu/mtools/${name}.tar.bz2";
- sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14";
+ url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
+ sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk";
};
patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
index f7732cd76fd7..6abad445517b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python
, db, libgcrypt, avahi, libiconv, pam, openssl, acl
-, ed, glibc, libevent
+, ed, libtirpc, libevent
}:
stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
/^afpd_LDADD
/am__append_2
a
- ${glibc.static}/lib/librpcsvc.a \\
+ ${libtirpc}/lib/libtirpc.so \\
.
w
EOF
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 6ba29cb98d40..15d6686fbc33 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -1,7 +1,7 @@
# FIXME: Unify with pkgs/development/python-modules/blivet/default.nix.
{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
-, libselinux, cryptsetup, multipath_tools, lsof, utillinux
+, libselinux, cryptsetup, multipath_tools, lsof, util-linux
, useNixUdev ? true, systemd ? null
# useNixUdev is here for bw compatibility
}:
@@ -24,11 +24,11 @@ buildPythonApplication rec {
sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
blivet/devicelibs/mpath.py blivet/devices.py
sed -i -e '/"wipefs"/ {
- s|wipefs|${utillinux.bin}/sbin/wipefs|
+ s|wipefs|${util-linux.bin}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
- sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
+ sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py
sed -i -e '/find_library/,/find_library/ {
c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1"
}' blivet/pyudev.py
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 1f672701d382..703d918f92a9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -13,7 +13,7 @@ let
inherit stdenv fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
inherit useNixUdev;
- inherit (pkgs) lsof utillinux systemd;
+ inherit (pkgs) lsof util-linux systemd;
};
cryptsetup = import ./cryptsetup.nix {
@@ -27,7 +27,7 @@ let
lvm2 = import ./lvm2.nix {
inherit stdenv fetchurl;
- inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils;
+ inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils;
};
multipath_tools = import ./multipath-tools.nix {
@@ -37,7 +37,7 @@ let
parted = import ./parted.nix {
inherit stdenv fetchurl;
- inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2;
+ inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2;
};
pyblock = import ./pyblock.nix {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index fc0005a14d45..4369d659034e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
let
v = "2.02.106";
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
postInstall =
''
substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
- --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid
+ --replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid
# Systemd stuff
mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index 16f3a57ea147..7fe1b7454668 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
-, utillinux, check, enableStatic ? false }:
+, util-linux, check, enableStatic ? false }:
stdenv.mkDerivation rec {
name = "parted-3.1";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableStatic "--enable-static";
doCheck = true;
- checkInputs = [ check utillinux ];
+ checkInputs = [ check util-linux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
index abe171170d41..2065e31e97a0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, utillinux, libuuid
+{stdenv, fetchurl, util-linux, libuuid
, crypto ? false, libgcrypt, gnutls, pkgconfig}:
stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace libfuse-lite/mount_util.c \
- --replace /bin/mount ${utillinux}/bin/mount \
- --replace /bin/umount ${utillinux}/bin/umount
+ --replace /bin/mount ${util-linux}/bin/mount \
+ --replace /bin/umount ${util-linux}/bin/umount
'';
configureFlags = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix
index 816aa1498cc6..889f075645a3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rar2fs";
- version = "1.29.1";
+ version = "1.29.2";
src = fetchFromGitHub {
owner = "hasse69";
repo = pname;
rev = "v${version}";
- sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx";
+ sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
index 96389214c7e0..040889903480 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mlafeldt/romdirfs";
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ genesis ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix
new file mode 100644
index 000000000000..e89012b76f63
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix
@@ -0,0 +1,25 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "sftpman";
+ version = "1.1.3";
+
+ src = fetchFromGitHub {
+ owner = "spantaleev";
+ repo = pname;
+ rev = version;
+ sha256 = "04awwwfw51fi1q18xdysp54jyhr0rhb4kfyrgv0vhhrlpwwyhnqy";
+ };
+
+ checkPhase = ''
+ $out/bin/sftpman help
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/spantaleev/sftpman";
+ description = "Application that handles sshfs/sftp file systems mounting";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ contrun ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
index 27335a9cf5da..9f9c4a605c6a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
@@ -8,14 +8,6 @@ stdenv.mkDerivation rec {
pname = "squashfuse";
version = "0.1.103";
- meta = {
- description = "FUSE filesystem to mount squashfs archives";
- homepage = "https://github.com/vasi/squashfuse";
- maintainers = [ maintainers.genesis ];
- platforms = platforms.linux;
- license = "BSD-2-Clause";
- };
-
# platforms.darwin should be supported : see PLATFORMS file in src.
# we could use a nix fuseProvider, and let the derivation choose the OS
# specific implementation.
@@ -29,4 +21,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
buildInputs = [ lz4 xz zlib lzo zstd fuse ];
+
+ meta = {
+ description = "FUSE filesystem to mount squashfs archives";
+ homepage = "https://github.com/vasi/squashfuse";
+ maintainers = [ ];
+ platforms = platforms.linux;
+ license = "BSD-2-Clause";
+ };
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 018dfe7858e3..3922851af331 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub
-, meson, pkgconfig, ninja, docutils, makeWrapper
+, meson, pkg-config, ninja, docutils, makeWrapper
, fuse3, glib
, which, python3Packages
, openssh
}:
stdenv.mkDerivation rec {
- version = "3.7.0";
+ version = "3.7.1";
pname = "sshfs-fuse";
src = fetchFromGitHub {
owner = "libfuse";
repo = "sshfs";
rev = "sshfs-${version}";
- sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv";
+ sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17";
};
- nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ];
+ nativeBuildInputs = [ meson pkg-config ninja docutils makeWrapper ];
buildInputs = [ fuse3 glib ];
checkInputs = [ which python3Packages.pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
index 334aa6ad9c60..152fd1d7a71e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -32,12 +32,13 @@ stdenv.mkDerivation rec {
cd unpacked
${rpmextract}/bin/rpmextract $src
+ mkdir -p $out/share/bash-completion/completions
cp -r -t $out/bin usr/bin/*
cp -r -t $out/share usr/share/*
- cp -r -t $out/etc etc/*
+ cp -r -t $out/share/bash-completion/completions etc/bash_completion.d/*
sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \
- $out/etc/bash_completion.d/yandex-disk-completion.bash
+ $out/share/bash-completion/completions/yandex-disk-completion.bash
${patchelf}/bin/patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix
index 67afac2cdccd..6b8c6870a668 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix
@@ -1,24 +1,32 @@
-{ stdenv, fetchFromGitHub, fetchurl
+{ stdenv, fetchFromGitHub, fetchurl, fetchpatch
, autoreconfHook, bison, glm, yacc, flex
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
, python3Packages
-, zlib, perl
+, zlib, perl, curl
, texLive, texinfo
, darwin
}:
stdenv.mkDerivation rec {
- version = "2.66";
+ version = "2.67";
pname = "asymptote";
src = fetchFromGitHub {
owner = "vectorgraphics";
repo = pname;
rev = version;
- sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd";
+ sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l";
};
+ patches =
+ (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68")
+ (fetchpatch {
+ url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
+ sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm";
+ }))
+ ;
+
nativeBuildInputs = [
autoreconfHook
bison
@@ -30,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ghostscriptX imagemagick fftw
boehmgc ncurses readline gsl libsigsegv
- zlib perl
+ zlib perl curl
texLive
] ++ (with python3Packages; [
python
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream
deleted file mode 100644
index e86d81ba4435..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url https://sourceforge.net/projects/asymptote/files/
-SF_version_dir
-version_link 'src[.]tgz/download$'
-SF_redirect
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix
index a12e5dbb8bb3..24e43044697d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix
@@ -2,7 +2,7 @@
If user need access to more haskell package for building his
diagrams, he simply has to pass these package through the
extra packages function as follow in `config.nix`:
-
+
~~~
diagrams-builder.override {
extraPackages = self : [myHaskellPackage];
@@ -15,7 +15,7 @@
let
# Used same technique as for the yiCustom package.
- wrappedGhc = ghcWithPackages
+ wrappedGhc = ghcWithPackages
(self: [ diagrams-builder ] ++ extraPackages self);
ghcVersion = wrappedGhc.version;
@@ -25,7 +25,7 @@ let
--set NIX_GHC ${wrappedGhc}/bin/ghc \
--set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
'';
-
+
backends = ["svg" "cairo" "ps"];
in
@@ -35,10 +35,10 @@ stdenv.mkDerivation {
buildInputs = [ makeWrapper ];
- buildCommand = with stdenv.lib;
+ buildCommand = with stdenv.lib;
concatStrings (intersperse "\n" (map exeWrapper backends));
# Will be faster to build the wrapper locally then to fetch it from a binary cache.
preferLocalBuild = true;
meta = diagrams-builder.meta;
-} \ No newline at end of file
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix
index 7b7eea3d5095..ea65f3dbb55c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dpic";
- version = "2020.06.01";
+ version = "2020.09.15";
src = fetchurl {
url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
- sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88";
+ sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83";
};
# The prefix passed to configure is not used.
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix
new file mode 100644
index 000000000000..93a9be58b72a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "exifprobe";
+ version = "unstable-2018-06-19";
+
+ src = fetchFromGitHub {
+ owner = "hfiguiere";
+ repo = "exifprobe";
+ rev = "ce1ea2bc3dbbe8092b26f41cd89831cafe633d69";
+ sha256 = "1c1fhc0v1m452lgnfcijnvrc0by06qfbhn3zkliqi60kv8l2isbp";
+ };
+
+ CFLAGS = [ "-O2" ];
+
+ installFlags = [ "DESTDIR=$(out)" ];
+
+ postInstall = ''
+ mv $out/usr/bin $out/bin
+ mv $out/usr/share $out/share
+ rm -r $out/usr
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tool for reading EXIF data from image files produced by digital cameras";
+ homepage = "https://github.com/hfiguiere/exifprobe";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ siraben ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix
index 4758dece42f4..aa247a4c9177 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gifski";
- version = "1.2.0";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
- sha256 = "0yziqgvjjb5bblmm060li7dv1i23gpn0f75jb72z8cdf2wg1qmxb";
+ sha256 = "0mr4ni75klmzfjivfv5xmcdw03y1gjvkz1d297gwh46zq1q7blf3";
};
- cargoSha256 = "1y4q6p6hbmpwdpahmspgngm842qrq1srl7319wslq9ydl09m1x3x";
+ cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01";
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix
index ccc4a23cb558..e8e9472cabdf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix
@@ -3,7 +3,7 @@
, cmake
, ninja
, pkg-config
-, opencv3
+, opencv
, openexr
, graphicsmagick
, fftw
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
- version = "2.9.2";
+ version = "2.9.4";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q";
+ sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr";
};
nativeBuildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libjpeg
libtiff
libpng
- opencv3
+ opencv
openexr
graphicsmagick
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix
index c7f0beba8fb8..b8c344258bb9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "gromit-mpx";
- version = "1.3.1";
+ version = "1.4";
src = fetchFromGitHub {
owner = "bk138";
repo = "gromit-mpx";
rev = version;
- sha256 = "1dvn7vwg4fg1a3lfj5f7nij1vcxm27gyf2wr817f3qb4sx5xmjwy";
+ sha256 = "1xn14r7lhay720y78j1fs4amp5lia39kpq7vzv02x4nnwhgbsd9r";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix
index 4eee8acb9798..3061a5cebaf9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper";
+ description = "OPTical ARchiver - it's a codec for encoding data on paper";
homepage = "http://ronja.twibright.com/optar/";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix
index 965c799a217f..1c89a1574c54 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix
@@ -1,20 +1,15 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
- version = "3.0.1";
+ version = "4.0.2";
pname = "oxipng";
- src = fetchFromGitHub {
- owner = "shssoichiro";
- repo = pname;
- rev = "v${version}";
- sha256 = "11lncwxksm7aqczy9ay1qnba2wmgfsirhgrl6vv1jlgj41b7mzi5";
+ src = fetchCrate {
+ inherit version pname;
+ sha256 = "0m36af9w1l6pc71fjbgyzcsszizwayvcv5d750zz2bnj23c77m69";
};
- cargoSha256 = "0lalb981qzlnmqfg170mh6lnc0qlzb94wc39mf859g2jvxk3pkrl";
-
- # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust
- cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ];
+ cargoSha256 = "16fby8ncdq0dyg9r0glrqwi04sja34br306c5sj22cq1dm3bb64q";
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix
index 1c437a3f05cd..f570251374cf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, cmake, pkgconfig, darwin
+{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat
-, fftw, gsl, libexif, perl, opencv2, qt5, netpbm
+, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "pfstools";
version = "2.1.0";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
openexr zlib imagemagick fftwFloat
- fftw gsl libexif perl opencv2 qt5.qtbase netpbm
+ fftw gsl libexif perl opencv2 qtbase netpbm
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT
]) else [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix
new file mode 100644
index 000000000000..e2c2b6e6e972
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix
@@ -0,0 +1,77 @@
+{ stdenv
+, fetchFromGitLab
+, lib
+, cmake
+, freeglut
+, libGL
+, libGLU
+, libglvnd
+, makeWrapper
+, ninja
+, pkg-config
+, python3
+, waffle
+, wayland
+, libX11
+, libXrender
+, libxcb
+, libxkbcommon
+}:
+
+stdenv.mkDerivation rec {
+ pname = "piglit";
+ version = "unstable-2020-10-23";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "mesa";
+ repo = "piglit";
+ rev = "59e695c16fdcdd4ea4f16365f0e397a93cef7b80";
+ sha256 = "kx0+2Sdvdc3SbpAIl2OuGCWCpaLJC/7cXG+ZLvf92g8=";
+ };
+
+ buildInputs = [
+ freeglut
+ libGL
+ libGLU
+ libglvnd
+ libX11
+ libXrender
+ libxcb
+ libxkbcommon
+ (python3.withPackages (ps: with ps; [
+ Mako
+ numpy
+ ]))
+ waffle
+ wayland
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ ninja
+ pkg-config
+ ];
+
+ # Find data dir: piglit searches for the data directory in some places, however as it is wrapped,
+ # it search in ../lib/.piglit-wrapped, we just replace the script name with "piglit" again.
+ prePatch = ''
+ substituteInPlace piglit \
+ --replace 'script_basename_noext = os.path.splitext(os.path.basename(__file__))[0]' 'script_basename_noext = "piglit"'
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/piglit \
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \
+ --prefix PATH : "${waffle}/bin"
+ '';
+
+ meta = with lib; {
+ description = "An OpenGL test suite, and test-suite runner";
+ homepage = "https://gitlab.freedesktop.org/mesa/piglit";
+ license = licenses.free; # custom license. See COPYING in the source repo.
+ platforms = platforms.mesaPlatforms;
+ maintainers = with maintainers; [ Flakebi ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix
index eb5afebaa675..2e745fc1a7c9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix
@@ -13,6 +13,7 @@
, libgsf
, libexif
, libheif
+, librsvg
, ApplicationServices
, python27
, libpng
@@ -26,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "vips";
- version = "8.10.1";
+ version = "8.10.2";
outputs = [ "bin" "out" "man" "dev" ];
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
- sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx";
+ sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
libexif
libheif
libpng
+ librsvg
python27
libpng
expat
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix
index a434b38453eb..39b12326e806 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "viu";
- version = "1.1";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "atanunq";
repo = "viu";
rev = "v${version}";
- sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph";
+ sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv";
};
# tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40
doCheck = false;
- cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga";
+ cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr";
meta = with lib; {
description = "A command-line application to view images from the terminal written in Rust";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix
new file mode 100644
index 000000000000..3a7473530d60
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, writeText, vulkan-headers, jq }:
+
+stdenv.mkDerivation rec {
+ pname = "vulkan-extension-layer";
+ version = "2020-11-20";
+
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "Vulkan-ExtensionLayer";
+ rev = "7474cb8e1f70e9f4a8bf382708a7f15465453af5";
+ sha256 = "1lxkgcnv32wqk4hlckv13xy84g38jzgc4qxp9vsbkrgz87hkdvwj";
+ };
+
+ nativeBuildInputs = [ cmake jq ];
+
+ buildInputs = [ vulkan-headers ];
+
+ # Help vulkan-loader find the validation layers
+ setupHook = writeText "setup-hook" ''
+ export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
+ '';
+
+ # Include absolute paths to layer libraries in their associated
+ # layer definition json files.
+ preFixup = ''
+ for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
+ jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+ mv tmp.json "$f"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Layers providing Vulkan features when native support is unavailable";
+ homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/";
+ platforms = platforms.linux;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ expipiplus1 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
new file mode 100644
index 000000000000..9ce87b4cb671
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
@@ -0,0 +1,86 @@
+{ stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi
+, libxcb, pkgconfig, python3, symlinkJoin, vulkan-headers, vulkan-loader
+, vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm
+, xlibsWrapper }:
+
+stdenv.mkDerivation rec {
+ pname = "vulkan-tools-lunarg";
+ # The version must match that in vulkan-headers
+ version = "1.2.141.0";
+
+ src = (assert version == vulkan-headers.version; fetchFromGitHub {
+ owner = "LunarG";
+ repo = "VulkanTools";
+ rev = "sdk-${version}";
+ sha256 = "1zsgc1hdmivdahzrarx7a5byhgnmm5ahz366l92fmdb8pffgq42g";
+ fetchSubmodules = true;
+ });
+
+ nativeBuildInputs = [ cmake pkgconfig python3 jq ];
+
+ buildInputs = [
+ expat
+ libXdmcp
+ libXrandr
+ libffi
+ libxcb
+ wayland
+ xcbutilkeysyms
+ xcbutilwm
+ xlibsWrapper
+ ];
+
+ cmakeFlags = [
+ "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
+ "-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}"
+ "-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${
+ symlinkJoin {
+ name = "vulkan-validation-layers-merged";
+ paths = [ vulkan-validation-layers.headers vulkan-validation-layers ];
+ }
+ }"
+ ];
+
+ preConfigure = ''
+ # We need to run this update script which generates some source files,
+ # Remove the line in it which calls 'git submodule update' though.
+ # Also patch the scripts in ./scripts
+ update=update_external_sources.sh
+ patchShebangs $update
+ patchShebangs scripts/*
+ sed -i '/^git /d' $update
+ ./$update
+ '';
+
+ # Include absolute paths to layer libraries in their associated
+ # layer definition json files.
+ preFixup = ''
+ for f in "$out"/etc/vulkan/explicit_layer.d/*.json "$out"/etc/vulkan/implicit_layer.d/*.json; do
+ jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+ mv tmp.json "$f"
+ done
+ '';
+
+ enableParallelBuilding = true;
+
+ # Same as vulkan-validation-layers
+ libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
+ dontPatchELF = true;
+
+ # Help vulkan-loader find the validation layers
+ setupHook = writeText "setup-hook" ''
+ export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "LunarG Vulkan Tools and Utilities";
+ longDescription = ''
+ Tools to aid in Vulkan development including useful layers, trace and
+ replay, and tests.
+ '';
+ homepage = "https://github.com/LunarG/VulkanTools";
+ platforms = platforms.linux;
+ license = licenses.asl20;
+ maintainers = [ maintainers.expipiplus1 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix
index e320e4e6ef3b..ff620ef8287b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -30,8 +30,13 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "LunarG Vulkan loader";
- homepage = "https://www.lunarg.com";
+ description = "Khronos official Vulkan Tools and Utilities";
+ longDescription = ''
+ This project provides Vulkan tools and utilities that can assist
+ development by enabling developers to verify their applications correct
+ use of the Vulkan API.
+ '';
+ homepage = "https://github.com/KhronosGroup/Vulkan-Tools";
platforms = platforms.linux;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index 66c8b1d5cc74..fa2088ca297b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
@@ -1,16 +1,16 @@
-{ cmake, fetchFromGitHub, opencv3, stdenv, opencl-headers
+{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers
, cudaSupport ? false, cudatoolkit ? null
}:
stdenv.mkDerivation rec {
pname = "waifu2x-converter-cpp";
- version = "5.2.4";
+ version = "5.3.3";
src = fetchFromGitHub {
owner = "DeadSix27";
repo = pname;
rev = "v${version}";
- sha256 = "0r7xcjqbyaa20gsgmjj7645640g3nb2bn1pc1nlfplwlzjxmz213";
+ sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w";
};
patchPhase = ''
@@ -19,10 +19,14 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
- opencv3 opencl-headers
+ ocl-icd opencv3 opencl-headers
] ++ stdenv.lib.optional cudaSupport cudatoolkit;
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake makeWrapper ];
+
+ preFixup = ''
+ wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib"
+ '';
meta = {
description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix
index 3ca9a7b5e8d6..9a52d4531854 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "yafaray-core";
- version = "3.5.0";
+ version = "3.5.1";
src = fetchFromGitHub {
owner = "YafaRay";
repo = "Core";
rev = "v${version}";
- sha256 = "05r08ynm6p9jq9l3v1v3lqkrfx3bm6zlqcxm1yk7mdv1zv2yxikd";
+ sha256 = "043ixf3h4ay2fahsw9lh0pha82f7ri04mlfhvn2pg251012jvhrx";
};
preConfigure = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix
index a8901dfb0e43..dc6d3a09bfa4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix
@@ -18,7 +18,7 @@ bundlerApp {
description = "Multitouch gestures with libinput driver on X11, Linux";
homepage = "https://github.com/iberianpig/fusuma";
license = licenses.mit;
- maintainers = with maintainers; [ jfrankenau nicknovitski filalex77 ];
+ maintainers = with maintainers; [ jfrankenau nicknovitski Br1ght0ne ];
platforms = platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index b34206e6cf6d..18e878b47b5c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ibus-bamboo";
- version = "0.6.6";
+ version = "0.6.8";
src = fetchFromGitHub {
owner = "BambooEngine";
repo = pname;
rev = "v${version}";
- sha256 = "0bjcc2dm6c6s0v271nyslmwf5z0xxpcbvmk4lyirs48hc1bzv3n6";
+ sha256 = "17zgxqlsjkqyjywynqzmymw310aypcsjdrwnc7hx7v7xwal8iwjk";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 978ac675581f..f6ceece34e19 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "ibus-hangul";
- version = "1.5.3";
+ version = "1.5.4";
src = fetchurl {
url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy";
+ sha256 = "1q6g2pnrn5gqn9jqnm3975v9hh60hc5gn9x3zbrdjgy0n3wpxwm9";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
new file mode 100644
index 000000000000..9c5f2cefb517
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
+
+stdenv.mkDerivation rec {
+ pname = "ibus-libthai";
+ version = "0.1.4";
+
+ src = fetchurl {
+ url = "https://linux.thai.net/pub/ThaiLinux/software/libthai/ibus-libthai-${version}.tar.xz";
+ sha256 = "0iam7308rxkx2xwaabc5wyj7vrxgd4cr95pvwrkm8fr9gh2xnwgv";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ gtk3 ibus libthai ];
+
+ meta = with stdenv.lib; {
+ isIbusEngine = true;
+ homepage = "https://linux.thai.net/projects/ibus-libthai";
+ description = "Thai input method engine for IBus";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 41a04d018355..695a45d81ffc 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,5 +1,5 @@
-{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig
-, protobuf, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }:
+{ stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
+, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
let
japanese_usage_dictionary = fetchFromGitHub {
@@ -8,11 +8,11 @@ let
rev = "e5b3425575734c323e1d947009dd74709437b684";
sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
};
-in clangStdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
name = "ibus-mozc-${version}";
- version = "2.23.2815.102";
+ version = "2.23.4206.102";
- meta = with clangStdenv.lib; {
+ meta = with stdenv.lib; {
isIbusEngine = true;
description = "Japanese input method from Google";
homepage = "https://github.com/google/mozc";
@@ -21,37 +21,28 @@ in clangStdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ];
};
- nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ];
+ nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six
+ python3Packages.gyp pkgconfig qt5.wrapQtAppsHook ];
buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
- rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
- sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
+ rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d";
+ sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2";
+ fetchSubmodules = true;
};
- patches = [
- # https://github.com/google/mozc/pull/444 - fix for gcc8 STL
- (fetchpatch {
- url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
- sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
- })
- # Support dates after 2019
- (fetchpatch {
- url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch";
- sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2";
- })
- ];
-
postUnpack = ''
- rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
+ rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/
ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
+ sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi
'';
configurePhase = ''
export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model"
- cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
+ cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc
'';
buildPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
new file mode 100644
index 000000000000..03a801abbeb0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify
+, librime, brise }:
+
+stdenv.mkDerivation rec {
+ pname = "ibus-rime";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "rime";
+ repo = "ibus-rime";
+ rev = version;
+ sha256 = "0zbajz7i18vrqwdyclzywvsjg6qzaih64jhi3pkxp7mbw8jc5vhy";
+ };
+
+ buildInputs = [ gdk-pixbuf glib ibus libnotify librime brise ];
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+ dontUseCmakeConfigure = true;
+
+ prePatch = ''
+ substituteInPlace Makefile \
+ --replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data'
+
+ substituteInPlace rime_config.h \
+ --replace '/usr' $out
+
+ substituteInPlace rime_config.h \
+ --replace 'IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX' \
+ 'IBUS_RIME_SHARED_DATA_DIR "${brise}"'
+
+ substituteInPlace rime.xml \
+ --replace '/usr' $out
+ '';
+
+ meta = with stdenv.lib; {
+ isIbusEngine = true;
+ description = "Rime input method engine for IBus";
+ homepage = "https://rime.im/";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pengmeiyu ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix
index 238e133495c9..32db48503919 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix
@@ -60,13 +60,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus";
- version = "1.5.22";
+ version = "1.5.23";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus";
rev = version;
- sha256 = "09ynn7gq84q18hhbg6wq2yrliwil42qbzxbwbpggry1s955jg5xb";
+ sha256 = "0qnblqhz8wyhchnm36zrxhbvi9g4fcwcgmw7p60yjybdlhq4asc7";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/3mux/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/3mux/default.nix
index 04335d3f33a9..945ebea0cb89 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/3mux/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/3mux/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
'';
homepage = "https://github.com/aaronjanse/3mux";
license = licenses.mit;
- maintainers = with maintainers; [ aaronjanse filalex77 ];
+ maintainers = with maintainers; [ aaronjanse Br1ght0ne ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/aptly/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/aptly/default.nix
index 3c97c1684290..6af3238dbd77 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/aptly/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/aptly/default.nix
@@ -2,14 +2,14 @@
let
- version = "1.3.0";
+ version = "1.4.0";
rev = "v${version}";
aptlySrc = fetchFromGitHub {
inherit rev;
owner = "aptly-dev";
repo = "aptly";
- sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l";
+ sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy";
};
aptlyCompletionSrc = fetchFromGitHub {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/archi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/archi/default.nix
new file mode 100644
index 000000000000..41562ccbf711
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/archi/default.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, fetchurl
+, fetchzip
+, autoPatchelfHook
+, libsecret
+}:
+
+stdenv.mkDerivation rec {
+ pname = "Archi";
+ version = "4.7.1";
+
+ src =
+ if stdenv.hostPlatform.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz";
+ sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw";
+ }
+ else if stdenv.hostPlatform.system == "x86_64-darwin" then
+ fetchzip {
+ url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip";
+ sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc";
+ }
+ else
+ throw "Unsupported system";
+
+ buildInputs = [
+ libsecret
+ ];
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ installPhase =
+ if stdenv.hostPlatform.system == "x86_64-linux" then
+ ''
+ mkdir -p $out/bin
+ for f in configuration features p2 plugins Archi.ini Archi; do
+ cp $f $out/bin/
+ done
+
+ install -D -m755 Archi $out/bin/Archi
+ ''
+ else
+ ''
+ mkdir -p "$out/Applications"
+ mv Archi.app "$out/Applications/"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "ArchiMate modelling toolkit";
+ longDescription = ''
+ Archi is an open source modelling toolkit to create ArchiMate
+ models and sketches.
+ '';
+ homepage = "https://www.archimatetool.com/";
+ license = licenses.mit;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ earldouglas SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch
new file mode 100644
index 000000000000..f7a06c050d2d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 991ecd8..9e94574 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -11,7 +11,7 @@ dependencies = [
+
+ [[package]]
+ name = "as-tree"
+-version = "0.11.1"
++version = "0.12.0"
+ dependencies = [
+ "ansi_term",
+ "atty",
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/default.nix
new file mode 100644
index 000000000000..7cc97fd79e46
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/as-tree/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "as-tree";
+ version = "0.12.0";
+
+ src = fetchFromGitHub {
+ owner = "jez";
+ repo = pname;
+ rev = version;
+ sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5";
+ };
+
+ cargoSha256 = "0yhd9svdxg7akv61msn7rf3rfblb7kxnyn955dfdwyxbxq48qwpr";
+ # the upstream 0.12.0 release didn't update the Cargo.lock file properly
+ # they have updated their release script, so this patch can be removed
+ # when the next version is released.
+ cargoPatches = [ ./cargo-lock.patch ];
+
+ meta = with lib; {
+ description = "Print a list of paths as a tree of paths";
+ homepage = "https://github.com/jez/as-tree";
+ license = with licenses; [ blueOak100 ];
+ maintainers = with maintainers; [ jshholland ];
+ platforms = platforms.all;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/autojump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/autojump/default.nix
index 85e500388341..c1a55256b35a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/autojump/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/autojump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, bash }:
+{ stdenv, fetchFromGitHub, python3, bash }:
stdenv.mkDerivation rec {
pname = "autojump";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws";
};
- buildInputs = [ python bash ];
+ buildInputs = [ python3 bash ];
dontBuild = true;
installPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/autorandr/default.nix
index b2bbb161f289..376b66181669 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/autorandr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/autorandr/default.nix
@@ -6,7 +6,7 @@
let
python = python3Packages.python;
- version = "1.10.1";
+ version = "1.11";
in
stdenv.mkDerivation {
pname = "autorandr";
@@ -21,6 +21,8 @@ in
--replace '["xrandr"]' '["${xrandr}/bin/xrandr"]'
'';
+ outputs = [ "out" "man" ];
+
installPhase = ''
runHook preInstall
make install TARGETS='autorandr' PREFIX=$out
@@ -29,6 +31,8 @@ in
make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out
+ make install TARGETS='manpage' PREFIX=$man
+
${if systemd != null then ''
make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \
SYSTEMD_UNIT_DIR=/lib/systemd/system \
@@ -49,7 +53,7 @@ in
owner = "phillipberndt";
repo = "autorandr";
rev = version;
- sha256 = "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg";
+ sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bandwidth/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
index 5de77aea0e04..024454a3472d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
@@ -1,38 +1,37 @@
{ stdenv, fetchurl, nasm }:
let
- arch =
- if stdenv.hostPlatform.system == "x86_64-linux" then "bandwidth64"
- else if stdenv.hostPlatform.system == "i686-linux" then "bandwidth32"
- else if stdenv.hostPlatform.system == "x86_64-darwin" then "bandwidth-mac64"
- else if stdenv.hostPlatform.system == "i686-darwin" then "bandwidth-mac32"
- else if stdenv.hostPlatform.system == "i686-cygwin" then "bandwidth-win32"
- else throw "Unknown architecture";
+ inherit (stdenv.hostPlatform.parsed.cpu) bits;
+ arch = "bandwidth${toString bits}";
in
stdenv.mkDerivation rec {
pname = "bandwidth";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchurl {
url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
- sha256 = "0zpv2qgkbak0llw47qcakhyh2z3zv4d69kasldmpdlpqryd9za84";
+ sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4";
};
- buildInputs = [ nasm ];
+ postPatch = ''
+ sed -i 's,^CC=gcc .*,,' OOC/Makefile Makefile*
+ sed -i 's,ar ,$(AR) ,g' OOC/Makefile
+ '';
+
+ nativeBuildInputs = [ nasm ];
- buildFlags = [ arch ]
- ++ stdenv.lib.optionals stdenv.cc.isClang [ "CC=clang" "LD=clang" ];
+ buildFlags = [ arch ];
installPhase = ''
mkdir -p $out/bin
- cp ${arch} $out/bin
- ln -s ${arch} $out/bin/bandwidth
+ cp ${arch} $out/bin/bandwidth
'';
meta = with stdenv.lib; {
homepage = "https://zsmith.co/bandwidth.html";
description = "Artificial benchmark for identifying weaknesses in the memory subsystem";
- license = licenses.mit;
- platforms = platforms.unix;
+ license = licenses.gpl2Plus;
+ platforms = platforms.x86;
+ maintainers = with maintainers; [ r-burns ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix
index e5b06521d72b..5c60305a2e74 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, nixosTests
, rustPlatform
, fetchFromGitHub
, pkg-config
@@ -11,26 +12,21 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
- version = "0.16.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "161pfix42j767ziyp4mslffdd20v9i0ncplvjw2pmpccwdm106kg";
+ sha256 = "1kbziqm00skj65gpjq6m83hmfk9g3xyx88gai1r80pzsx8g239w1";
};
- cargoSha256 = "19vhhxfyx3nrngcs6dvwldnk9h4lvs7xjkb31aj1y0pyawz882h9";
+ cargoSha256 = "1pdja5jhk036hpgv77xc3fcvra1sw0z5jc1ry53i0r7362lnwapz";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
- # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master
- preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- unset SDKROOT
- '';
-
postInstall = ''
installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh}
@@ -43,6 +39,8 @@ rustPlatform.buildRustPackage rec {
--prefix PATH : "${stdenv.lib.makeBinPath [ less ]}"
'';
+ passthru.tests = { inherit (nixosTests) bat; };
+
meta = with stdenv.lib; {
description = "A cat(1) clone with syntax highlighting and Git integration";
homepage = "https://github.com/sharkdp/bat";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix
index 966e71bb6d3b..676467c9b67d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
- version = "1.196";
+ version = "1.199";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "042ly91525q2qj7985qih4njhjk5ndz8jiz01v860jc38bvw595p";
+ sha256 = "0qs0qrdagvnh4z20wp4v3v4ry6j5jihlpv3iqzzhdzzxjfrw9m9y";
};
nativeBuildInputs = [ dpkg ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
index e7a9d98aaf23..728967ec3da8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bdf2sfd";
- version = "1.1.3";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "fcambus";
repo = pname;
rev = version;
- sha256 = "0v1kkds35qfyv1h5kxc2m7f2gsprg9c7jzpsm3p4f71qn982wry6";
+ sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/default.nix
index 7cec0cab996e..c3361739f0bb 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/default.nix
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
- version = "2.29.0";
+ version = "2.29.1";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
- sha256 = "18z3qbrsbfpn00c4xq3ck1mnmvrnqgl9g1s7m4dgc1871fi6sv8w";
+ sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi";
};
nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix
index eddcba1c9c89..2d0d43871e83 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "xmlbird";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchurl {
url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz";
- sha256 = "1ycbgjvywnlc0garw8qjqd18s0xnrwjvssdrb410yschv3wjq1i0";
+ sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04";
};
nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix
index c40ccad5e396..96b13c060e4b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, python2Packages, fetchFromGitHub }:
+{ stdenv, python3Packages, fetchFromGitHub }:
-python2Packages.buildPythonApplication {
+python3Packages.buildPythonApplication {
pname = "broadlink-cli";
- inherit (python2Packages.broadlink) version;
+ inherit (python3Packages.broadlink) version;
# the tools are available as part of the source distribution from GH but
# not pypi, so we have to fetch them here.
src = fetchFromGitHub {
owner = "mjg59";
repo = "python-broadlink";
- # this rev is version 0.9
- rev = "766b7b00fb1cec868e3d5fca66f1aada208959ce";
- sha256 = "0j0idzxmpwkb1lbgvi9df2hbxafm5hxjc6mgg5481lq7z4z1r4nb";
+ # this rev is version 0.15.0
+ rev = "99add9e6feea6e47be4f3a58783556d7838b759c";
+ sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b";
};
format = "other";
- propagatedBuildInputs = with python2Packages; [
+ propagatedBuildInputs = with python3Packages; [
broadlink
];
@@ -32,6 +32,6 @@ python2Packages.buildPythonApplication {
meta = with stdenv.lib; {
description = "Tools for interfacing with Broadlink RM2/3 (Pro) remote controls, A1 sensor platforms and SP2/3 smartplugs";
maintainers = with maintainers; [ peterhoeg ];
- inherit (python2Packages.broadlink.meta) homepage license;
+ inherit (python3Packages.broadlink.meta) homepage license;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/broot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/broot/default.nix
index fb0868016d7e..fb8e2508294a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/broot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/broot/default.nix
@@ -5,26 +5,24 @@
, makeWrapper
, coreutils
, libiconv
-, xcbuild
, zlib
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "1.0.3";
+ version = "1.0.8";
src = fetchCrate {
inherit pname version;
- sha256 = "046yg270hnwzhap2rraihywpqjq5s3qxmyfcvfgfayz25216jmvc";
+ sha256 = "06881c8qnh917y2mn5q5qlf86idz17xi2dapsad3m1zbdr53c25j";
};
- cargoSha256 = "02l6cdfx2sglygsdgnm474vmpbmpm2a1s6srd9cy66k6hjm1m0bn";
+ cargoSha256 = "1k5qm4h028172r7i2pz5l8886qviy7ni83qxn10a8d5hsgalarvx";
nativeBuildInputs = [
makeWrapper
installShellFiles
- xcbuild # The cc crate attempts to run xcbuild.
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix
index 150371f82b6e..d3d3651c2b05 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix
@@ -1,20 +1,18 @@
{ stdenv, fetchurl }:
-let version = "0.8"; in
-
stdenv.mkDerivation rec {
pname = "buildtorrent";
- inherit version;
+ version = "0.8";
src = fetchurl {
url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
- sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
+ sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA=";
};
- meta = {
+ meta = with stdenv.lib; {
description = "A simple commandline torrent creator";
- homepage = "http://mathr.co.uk/blog/torrent.html";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.all;
+ homepage = "https://mathr.co.uk/blog/torrent.html";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix
index ad17c5edd6ee..695ae54d876e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, python3, perl, textual-window-manager }:
+{ stdenv, fetchurl, makeWrapper
+, ncurses, python3, perl, textual-window-manager
+, gettext, vim, bc, screen }:
+let
+ inherit (stdenv) lib;
+ pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
+in
stdenv.mkDerivation rec {
version = "5.133";
name = "byobu-" + version;
@@ -11,26 +17,59 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ python3 perl ];
- propagatedBuildInputs = [ textual-window-manager ];
+ buildInputs = [ perl makeWrapper gettext ];
+ propagatedBuildInputs = [ textual-window-manager screen ];
- meta = {
+ postPatch = ''
+ substituteInPlace usr/bin/byobu-export.in \
+ --replace "gettext" "${gettext}/bin/gettext"
+ substituteInPlace usr/lib/byobu/menu \
+ --replace "gettext" "${gettext}/bin/gettext"
+ '';
+
+ postInstall = ''
+ # Byobu does not compile its po files for some reason
+ for po in po/*.po; do
+ lang=''${po#po/}
+ lang=''${lang%.po}
+ # Path where byobu looks for translations as observed in the source code and strace
+ mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/
+ msgfmt $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo
+ done
+
+ # Override the symlinks otherwise they mess with the wrapping
+ cp --remove-destination $out/bin/byobu $out/bin/byobu-screen
+ cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux
+
+ for i in $out/bin/byobu*; do
+ # We don't use the usual ".$package-wrapped" because arg0 within the shebang scripts
+ # points to the filename and byobu matches against this to know which backend
+ # to start with
+ file=".$(basename $i)"
+ mv $i $out/bin/$file
+ makeWrapper "$out/bin/$file" "$out/bin/$(basename $i)" --argv0 $(basename $i) \
+ --set BYOBU_PATH ${lib.escapeShellArg (lib.makeBinPath [ vim bc ])} \
+ --set BYOBU_PYTHON "${pythonEnv}/bin/python"
+ done
+ '';
+
+ meta = with stdenv.lib; {
homepage = "https://launchpad.net/byobu/";
description = "Text-based window manager and terminal multiplexer";
longDescription =
- ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
- It was originally designed to provide elegant enhancements to the otherwise functional,
- plain, practical GNU Screen, for the Ubuntu server distribution.
- Byobu now includes an enhanced profiles, convenient keybindings,
- configuration utilities, and toggle-able system status notifications for both
- the GNU Screen window manager and the more modern Tmux terminal multiplexer,
+ ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
+ It was originally designed to provide elegant enhancements to the otherwise functional,
+ plain, practical GNU Screen, for the Ubuntu server distribution.
+ Byobu now includes an enhanced profiles, convenient keybindings,
+ configuration utilities, and toggle-able system status notifications for both
+ the GNU Screen window manager and the more modern Tmux terminal multiplexer,
and works on most Linux, BSD, and Mac distributions.
'';
- license = stdenv.lib.licenses.gpl3;
+ license = licenses.gpl3;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.qknight ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ qknight berbiche ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix
index 8f365d023d2c..815129f7f0f7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
-, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata
+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata
, ckbcomp, xkeyboard_config, mkDerivation
}:
@@ -17,7 +17,7 @@ mkDerivation rec {
buildInputs = [
boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev
libatasmart libxcb libyamlcpp parted polkit-qt python qtbase
- qtquickcontrols qtsvg qttools qtwebengine.dev utillinux
+ qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
];
enableParallelBuilding = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index d7b7646afec3..0722fca4370b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "1.8.5";
+ version = "1.8.9";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "16sv1kbd66rllnnl851y3x54wkl0p7g0qsblprvfr9715svk1835";
+ sha256 = "07jsakihci98ww1hgppilq942raz05c5xi2pzq632vq5i11fi0nj";
};
- vendorSha256 = "1i9d672mzmb97s26n0v01m70g4viyl9pdk25haxr6ny4rab2wbi7";
+ vendorSha256 = "0adva7crl6dachbf76920aniki3zcq9chdjjrzssasm89zqgwicf";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
index 1c38e7c3b8f5..ceef26b577d6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, unstableGitUpdater
, makeWrapper
, curl
, ncurses
@@ -35,6 +36,8 @@ stdenv.mkDerivation {
--prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
'';
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with stdenv.lib; {
description = "CLI client for cheat.sh, a community driven cheat sheet";
license = licenses.mit;
@@ -42,4 +45,3 @@ stdenv.mkDerivation {
homepage = "https://github.com/chubin/cheat.sh";
};
}
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/clex/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/clex/default.nix
index 7a6a78af59a9..af21e971fe07 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/clex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/clex/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "clex";
- version = "4.6.patch9";
+ version = "4.6.patch10";
src = fetchurl {
- sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc";
+ sha256 = "03niihqk57px7rm2c84qira5jm5vw8lj5s58dximk0w5gsis4fhw";
url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix
index afae939ef38a..1bd3def87c41 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
-, gawk, gnused, utillinux, file
+, gawk, gnused, util-linux, file
, wget, python3, qemu-utils, euca2ools
, e2fsprogs, cdrkit
, gptfdisk }:
@@ -7,7 +7,7 @@
let
# according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
guestDeps = [
- e2fsprogs gptfdisk gawk gnused utillinux
+ e2fsprogs gptfdisk gawk gnused util-linux
];
binDeps = guestDeps ++ [
wget file qemu-utils cdrkit
@@ -17,10 +17,10 @@ in stdenv.mkDerivation rec {
# $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
# growpart is needed in initrd in nixos/system/boot/grow-partition.nix
pname = "cloud-utils";
- version = "0.31";
+ version = "0.32";
src = fetchurl {
url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz";
- sha256 = "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r";
+ sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/codebraid/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/codebraid/default.nix
index eea5260a989c..79ed7dd01fca 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/codebraid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/codebraid/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "codebraid";
- version = "0.5.0-unstable-2020-07-01";
+ version = "0.5.0-unstable-2020-08-14";
src = fetchFromGitHub {
owner = "gpoore";
repo = pname;
- rev = "c7962587e7f1e619b5dcf9a5e901eb7042520b00";
- sha256 = "1f31yaiwc33ivjbipym7sggsqwqxn70kgf9dixi8392pk70jzq6p";
+ rev = "526a223c4fc32c37d6c5c9133524dfa0e1811ca4";
+ sha256 = "0qkqaj49k584qzgx9jlsf5vlv4lq7x403s1kig8v87i0kgh55p56";
};
propagatedBuildInputs = with python3Packages; [ bespon ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/colord/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/colord/default.nix
index 79d27129173a..1db776c8ff0d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/colord/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/colord/default.nix
@@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "colord";
- version = "1.4.4";
+ version = "1.4.5";
outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
- sha256 = "19f0938fr7nvvm3jr263dlknaq7md40zrac2npfyz25zc00yh3ws";
+ sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix
new file mode 100644
index 000000000000..0abf10710caa
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "convbin";
+ version = "3.0";
+
+ src = fetchFromGitHub {
+ owner = "mateoconlechuga";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9";
+ };
+
+ makeFlags = [ "CC=cc" ];
+
+ checkPhase = ''
+ pushd test
+ patchShebangs test.sh
+ ./test.sh
+ popd
+ '';
+
+ doCheck = true;
+
+ installPhase = ''
+ install -Dm755 bin/convbin $out/bin/convbin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Converts files to other formats";
+ longDescription = ''
+ This program is used to convert files to other formats,
+ specifically for the TI84+CE and related calculators.
+ '';
+ homepage = "https://github.com/mateoconlechuga/convbin";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.all;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix
new file mode 100644
index 000000000000..0cc181082a4f
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "convfont";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "drdnar";
+ repo = pname;
+ rev = "v20190438";
+ sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f";
+ };
+
+ makeFlags = [ "CC=cc" ];
+
+ installPhase = ''
+ install -Dm755 convfont $out/bin/convfont
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Converts font for use with FontLibC";
+ homepage = "https://github.com/drdnar/convfont";
+ license = licenses.wtfpl;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.all;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix
new file mode 100644
index 000000000000..f9de88cb01e5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "convimg";
+ version = "8.3";
+
+ src = fetchFromGitHub {
+ owner = "mateoconlechuga";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1k2fkzfg08y2gcm8jabmb2plgqmgw6y30m73ys4mmbskxgy7hc3s";
+ fetchSubmodules = true;
+ };
+
+ makeFlags = [ "CC=cc" ];
+
+ checkPhase = ''
+ pushd test
+ patchShebangs test.sh
+ ./test.sh
+ popd
+ '';
+
+ doCheck = true;
+
+ installPhase = ''
+ install -Dm755 bin/convimg $out/bin/convimg
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Image palette quantization";
+ longDescription = ''
+ This program is used to convert images to other formats,
+ specifically for the TI84+CE and related calculators.
+ '';
+ homepage = "https://github.com/mateoconlechuga/convimg";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
deleted file mode 100644
index ae1a02d4d202..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <assafgordon@gmail.com>
-Date: Mon, 13 May 2019 16:37:40 -0600
-Subject: [PATCH] tests: avoid false-positive in date-debug test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When debugging an invalid date due to DST switching, the intermediate
-'normalized time' should not be checked - its value can differ between
-systems (e.g. glibc vs musl).
-
-Reported by Niklas Hambüchen in
-https://lists.gnu.org/r/coreutils/2019-05/msg00031.html
-Analyzed by Rich Felker in
-https://lists.gnu.org/r/coreutils/2019-05/msg00039.html
-
-* tests/misc/date-debug.sh: Replace the exact normalized time
-with 'XX:XX:XX' so different values would not trigger test failure.
----
- tests/misc/date-debug.sh | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh
-index aa47f1abb..2ce6f4ce8 100755
---- a/tests/misc/date-debug.sh
-+++ b/tests/misc/date-debug.sh
-@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string
- date: using specified time as starting value: '02:30:00'
- date: error: invalid date/time value:
- date: user provided time: '(Y-M-D) 2006-04-02 02:30:00'
--date: normalized time: '(Y-M-D) 2006-04-02 03:30:00'
-+date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX'
- date: --
- date: possible reasons:
- date: non-existing due to daylight-saving time;
-@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00'
- EOF
-
- # date should return 1 (error) for invalid date
--returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1
-+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1
-+
-+# The output line of "normalized time" can differ between systems
-+# (e.g. glibc vs musl) and should not be checked.
-+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html
-+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \
-+ out2-t > out2 || framework_failure_
-+
- compare exp2 out2 || fail=1
-
- ##
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
deleted file mode 100644
index 97d95d1c5b19..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 11 Mar 2019 16:40:29 -0700
-Subject: [PATCH 1/1] strtod: fix clash with strtold
-
-Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817).
-* lib/strtod.c (compute_minus_zero, minus_zero):
-Simplify by remving the macro / external variable,
-and having just a function. User changed. This avoids
-the need for an external variable that might clash.
----
- ChangeLog | 9 +++++++++
- lib/strtod.c | 11 +++++------
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/lib/strtod.c b/lib/strtod.c
-index b9eaa51..69b1564 100644
---- a/lib/strtod.c
-+++ b/lib/strtod.c
-@@ -294,16 +294,15 @@ parse_number (const char *nptr,
- ICC 10.0 has a bug when optimizing the expression -zero.
- The expression -MIN * MIN does not work when cross-compiling
- to PowerPC on Mac OS X 10.5. */
--#if defined __hpux || defined __sgi || defined __ICC
- static DOUBLE
--compute_minus_zero (void)
-+minus_zero (void)
- {
-+#if defined __hpux || defined __sgi || defined __ICC
- return -MIN * MIN;
--}
--# define minus_zero compute_minus_zero ()
- #else
--DOUBLE minus_zero = -0.0;
-+ return -0.0;
- #endif
-+}
-
- /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the
- character after the last one used in the number is put in *ENDPTR. */
-@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr)
- /* Special case -0.0, since at least ICC miscompiles negation. We
- can't use copysign(), as that drags in -lm on some platforms. */
- if (!num && negative)
-- return minus_zero;
-+ return minus_zero ();
- return negative ? -num : num;
- }
---
-1.9.1
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
deleted file mode 100644
index 02b0b85db312..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
+++ /dev/null
@@ -1,1153 +0,0 @@
-From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sat, 23 Mar 2019 23:00:52 +0100
-Subject: [PATCH 1/1] Support cross-compilation to musl libc.
-
-Reported by Necktwi Ozfguah <necktwi@ferryfair.com>.
-
-* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for
-musl libc.
-* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise.
-* m4/chown.m4 (gl_FUNC_CHOWN): Likewise.
-* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise.
-* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise.
-* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise.
-* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise.
-* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise.
-* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise.
-* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise.
-* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise.
-* m4/getline.m4 (gl_FUNC_GETLINE): Likewise.
-* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise.
-* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise. // removed
-* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise. // removed
-* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise. // removed
-* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise. // removed
-* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise.
-* m4/log.m4 (gl_FUNC_LOG): Likewise. // removed
-* m4/logf.m4 (gl_FUNC_LOGF): Likewise. // removed
-* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise. // removed
-* m4/log10.m4 (gl_FUNC_LOG10): Likewise. // removed
-* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise. // removed
-* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise. // removed
-* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise. // removed
-* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise. // removed
-* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise. // removed
-* m4/log2.m4 (gl_FUNC_LOG2): Likewise. // removed
-* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise. // removed
-* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise.
-* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise.
-* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise.
-* m4/modf.m4 (gl_FUNC_MODF): Likewise. // removed
-* m4/modff.m4 (gl_FUNC_MODFF): Likewise. // removed
-* m4/modfl.m4 (gl_FUNC_MODFL): Likewise. // removed
-* m4/perror.m4 (gl_FUNC_PERROR): Likewise.
-* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE,
-gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A,
-gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99,
-gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N,
-gl_VSNPRINTF_ZEROSIZE_C99): Likewise.
-* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise. // removed
-* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise.
-* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise.
-* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise. // removed
-* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise. // removed
-* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise. // removed
-* m4/rintl.m4 (gl_FUNC_RINTL): Likewise. // removed
-* m4/round.m4 (gl_FUNC_ROUND): Likewise. // removed
-* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. // removed
-* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. // removed
-* m4/setenv.m4 (gl_FUNC_SETENV): Likewise.
-* m4/signbit.m4 (gl_SIGNBIT): Likewise.
-* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise.
-* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise.
-* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise.
-* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise.
-* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise.
-* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. // removed
-* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. // removed
-* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. // removed
-* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise.
-* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise.
-* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise.
-* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise.
-* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise.
----
- m4/calloc.m4 | 4 ++-
- m4/canonicalize.m4 | 4 ++-
- m4/chown.m4 | 22 +++++++------
- m4/d-ino.m4 | 16 +++++-----
- m4/fdopendir.m4 | 12 ++++---
- m4/fnmatch.m4 | 18 ++++++++---
- m4/fpurge.m4 | 24 +++++++++-----
- m4/getcwd-abort-bug.m4 | 11 +++++--
- m4/getcwd.m4 | 4 ++-
- m4/getdelim.m4 | 40 ++++++++++++++----------
- m4/getgroups.m4 | 6 +++-
- m4/getline.m4 | 38 +++++++++++++---------
- m4/gettimeofday.m4 | 4 ++-
- m4/link-follow.m4 | 4 ++-
- m4/malloc.m4 | 4 +--
- m4/mkdir.m4 | 4 ++-
- m4/mkstemp.m4 | 4 ++-
- m4/perror.m4 | 12 ++++---
- m4/printf.m4 | 22 ++++++++++++-
- m4/putenv.m4 | 4 ++-
- m4/realloc.m4 | 4 +--
- m4/setenv.m4 | 4 ++-
- m4/signbit.m4 | 6 +++-
- m4/sleep.m4 | 4 ++-
- m4/stpncpy.m4 | 14 +++++++--
- m4/strerror.m4 | 6 +++-
- m4/strtod.m4 | 10 +++---
- m4/strtold.m4 | 9 ++++--
- m4/tzset.m4 | 4 ++-
- m4/ungetc.m4 | 18 ++++++-----
- m4/usleep.m4 | 4 ++-
- m4/utimes.m4 | 10 +++---
- m4/wcwidth.m4 | 12 ++++---
- 76 files changed, 461 insertions(+), 157 deletions(-)
-
-diff --git a/m4/calloc.m4 b/m4/calloc.m4
-index 012a5bf..d76535d 100644
---- a/m4/calloc.m4
-+++ b/m4/calloc.m4
-@@ -1,4 +1,4 @@
--# calloc.m4 serial 18
-+# calloc.m4 serial 19
-
- # Copyright (C) 2004-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
-index 5b6e25d..b61747b 100644
---- a/m4/canonicalize.m4
-+++ b/m4/canonicalize.m4
-@@ -1,4 +1,4 @@
--# canonicalize.m4 serial 29
-+# canonicalize.m4 serial 30
-
- dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
-
-@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_realpath_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_realpath_works="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/chown.m4 b/m4/chown.m4
-index ecfc0c0..b798325 100644
---- a/m4/chown.m4
-+++ b/m4/chown.m4
-@@ -1,4 +1,4 @@
--# serial 30
-+# serial 32
- # Determine whether we need the chown wrapper.
-
- dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software
-@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
- [gl_cv_func_chown_slash_works=yes],
- [gl_cv_func_chown_slash_works=no],
- [case "$host_os" in
-- # Guess yes on glibc systems.
-- *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_func_chown_slash_works="guessing no" ;;
-+ # Guess yes on glibc systems.
-+ *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_func_chown_slash_works="guessing no" ;;
- esac
- ])
- rm -f conftest.link conftest.file])
-@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
- [gl_cv_func_chown_ctime_works=yes],
- [gl_cv_func_chown_ctime_works=no],
- [case "$host_os" in
-- # Guess yes on glibc systems.
-- *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_func_chown_ctime_works="guessing no" ;;
-+ # Guess yes on glibc systems.
-+ *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_func_chown_ctime_works="guessing no" ;;
- esac
- ])
- rm -f conftest.file])
-diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
-index f1420cc..87dcacc 100644
---- a/m4/d-ino.m4
-+++ b/m4/d-ino.m4
-@@ -1,4 +1,4 @@
--# serial 18
-+# serial 19
-
- dnl From Jim Meyering.
- dnl
-@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
- [gl_cv_struct_dirent_d_ino=yes],
- [gl_cv_struct_dirent_d_ino=no],
- [case "$host_os" in
-- # Guess yes on glibc systems with Linux kernel.
-- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-- # Guess no on native Windows.
-- mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_struct_dirent_d_ino="guessing no" ;;
-+ # Guess yes on glibc systems with Linux kernel.
-+ linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+ # Guess yes on musl systems with Linux kernel.
-+ linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+ # Guess no on native Windows.
-+ mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_struct_dirent_d_ino="guessing no" ;;
- esac
- ])])
- case "$gl_cv_struct_dirent_d_ino" in
-diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
-index 0490551..b2b3b03 100644
---- a/m4/fdopendir.m4
-+++ b/m4/fdopendir.m4
-@@ -1,4 +1,4 @@
--# serial 10
-+# serial 11
- # See if we need to provide fdopendir.
-
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
-@@ -45,10 +45,12 @@ DIR *fdopendir (int);
- [gl_cv_func_fdopendir_works=yes],
- [gl_cv_func_fdopendir_works=no],
- [case "$host_os" in
-- # Guess yes on glibc systems.
-- *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_func_fdopendir_works="guessing no" ;;
-+ # Guess yes on glibc systems.
-+ *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_func_fdopendir_works="guessing no" ;;
- esac
- ])])
- case "$gl_cv_func_fdopendir_works" in
-diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
-index c264ca7..75ba55b 100644
---- a/m4/fnmatch.m4
-+++ b/m4/fnmatch.m4
-@@ -1,4 +1,4 @@
--# Check for fnmatch - serial 13. -*- coding: utf-8 -*-
-+# Check for fnmatch - serial 14. -*- coding: utf-8 -*-
-
- # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
- m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
-
- AC_REQUIRE([gl_FNMATCH_H])
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
- gl_fnmatch_required_lowercase=`
- echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
- `
-@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
- ]])],
- [eval "$gl_fnmatch_cache_var=yes"],
- [eval "$gl_fnmatch_cache_var=no"],
-- [eval "$gl_fnmatch_cache_var=\"guessing no\""])
-+ [case "$host_os" in
-+ # Guess yes on musl systems.
-+ *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;;
-+ # Guess no otherwise, even on glibc systems.
-+ *) eval "$gl_fnmatch_cache_var=\"guessing no\"" ;;
-+ esac
-+ ])
- ])
- eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
-- if test "$gl_fnmatch_result" != yes; then
-- REPLACE_FNMATCH=1
-- fi
-+ case "$gl_fnmatch_result" in
-+ *yes) ;;
-+ *) REPLACE_FNMATCH=1 ;;
-+ esac
- fi
- if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
- gl_REPLACE_FNMATCH_H
-diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
-index cb21f56..6c5b3e9 100644
---- a/m4/fpurge.m4
-+++ b/m4/fpurge.m4
-@@ -1,4 +1,4 @@
--# fpurge.m4 serial 8
-+# fpurge.m4 serial 9
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
- AC_DEFUN([gl_FUNC_FPURGE],
- [
- AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
- AC_CHECK_FUNCS_ONCE([fpurge])
- AC_CHECK_FUNCS_ONCE([__fpurge])
- AC_CHECK_DECLS([fpurge], , , [[#include <stdio.h>]])
- if test "x$ac_cv_func_fpurge" = xyes; then
- HAVE_FPURGE=1
-- # Detect BSD bug. Only cygwin 1.7 is known to be immune.
-+ # Detect BSD bug. Only cygwin 1.7 and musl are known to be immune.
- AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works],
- [AC_RUN_IFELSE(
- [AC_LANG_PROGRAM(
-@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE],
- return 13;
- return 0;
- ])],
-- [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no],
-- [gl_cv_func_fpurge_works='guessing no'])])
-- if test "x$gl_cv_func_fpurge_works" != xyes; then
-- REPLACE_FPURGE=1
-- fi
-+ [gl_cv_func_fpurge_works=yes],
-+ [gl_cv_func_fpurge_works=no],
-+ [case "$host_os" in
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_fpurge_works="guessing yes" ;;
-+ # Guess no otherwise.
-+ *) gl_cv_func_fpurge_works="guessing no" ;;
-+ esac
-+ ])
-+ ])
-+ case "$gl_cv_func_fpurge_works" in
-+ *yes) ;;
-+ *) REPLACE_FPURGE=1 ;;
-+ esac
- else
- HAVE_FPURGE=0
- fi
-diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
-index f0f24a5..7227f08 100644
---- a/m4/getcwd-abort-bug.m4
-+++ b/m4/getcwd-abort-bug.m4
-@@ -1,4 +1,4 @@
--# serial 9
-+# serial 11
- # Determine whether getcwd aborts when the length of the working directory
- # name is unusually large. Any length between 4k and 16k trigger the bug
- # when using glibc-2.4.90-9 or older.
-@@ -13,6 +13,7 @@
- # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
- AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
- [
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
- AC_CHECK_DECLS_ONCE([getcwd])
- AC_CHECK_HEADERS_ONCE([unistd.h])
- AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ])
-@@ -142,7 +143,13 @@ main ()
- else
- gl_cv_func_getcwd_abort_bug=no
- fi],
-- [gl_cv_func_getcwd_abort_bug=yes])
-+ [case "$host_os" in
-+ # Guess no on musl systems.
-+ *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;;
-+ # Guess yes otherwise, even on glibc systems.
-+ *) gl_cv_func_getcwd_abort_bug="guessing yes"
-+ esac
-+ ])
- ])
- AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2])
- ])
-diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
-index 4929b51..625171a 100644
---- a/m4/getcwd.m4
-+++ b/m4/getcwd.m4
-@@ -6,7 +6,7 @@
- # with or without modifications, as long as this notice is preserved.
-
- # Written by Paul Eggert.
--# serial 16
-+# serial 17
-
- AC_DEFUN([gl_FUNC_GETCWD_NULL],
- [
-@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
- [[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_getcwd_null="guessing yes";;
- # Guess yes on Cygwin.
- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
- # If we don't know, assume the worst.
-diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
-index bf17c57..e77c379 100644
---- a/m4/getdelim.m4
-+++ b/m4/getdelim.m4
-@@ -1,4 +1,4 @@
--# getdelim.m4 serial 12
-+# getdelim.m4 serial 13
-
- dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
- dnl
-@@ -11,6 +11,7 @@ AC_PREREQ([2.59])
- AC_DEFUN([gl_FUNC_GETDELIM],
- [
- AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- dnl Persuade glibc <stdio.h> to declare getdelim().
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM],
- if test $ac_cv_func_getdelim = yes; then
- HAVE_GETDELIM=1
- dnl Found it in some library. Verify that it works.
-- AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim],
-- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ AC_CACHE_CHECK([for working getdelim function],
-+ [gl_cv_func_working_getdelim],
-+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- # include <stdio.h>
- # include <stdlib.h>
- # include <string.h>
-@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM],
- fclose (in);
- return 0;
- }
-- ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works.
-- , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work.
-- , dnl We're cross compiling. Assume it works on glibc2 systems.
-- [AC_EGREP_CPP([Lucky GNU user],
-- [
-+ ]])],
-+ [gl_cv_func_working_getdelim=yes],
-+ [gl_cv_func_working_getdelim=no],
-+ [dnl We're cross compiling.
-+ dnl Guess it works on glibc2 systems and musl systems.
-+ AC_EGREP_CPP([Lucky GNU user],
-+ [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
- Lucky GNU user
- #endif
- #endif
-- ],
-- [gl_cv_func_working_getdelim="guessing yes"],
-- [gl_cv_func_working_getdelim="guessing no"])]
-- )])
-+ ],
-+ [gl_cv_func_working_getdelim="guessing yes"],
-+ [case "$host_os" in
-+ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
-+ *) gl_cv_func_working_getdelim="guessing no" ;;
-+ esac
-+ ])
-+ ])
-+ ])
- case "$gl_cv_func_working_getdelim" in
-- *no)
-- REPLACE_GETDELIM=1
-- ;;
-+ *yes) ;;
-+ *) REPLACE_GETDELIM=1 ;;
- esac
- else
- HAVE_GETDELIM=0
-diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
-index 2ce986e..c93447b 100644
---- a/m4/getgroups.m4
-+++ b/m4/getgroups.m4
-@@ -1,4 +1,4 @@
--# serial 21
-+# serial 22
-
- dnl From Jim Meyering.
- dnl A wrapper around AC_FUNC_GETGROUPS.
-@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS],
- [case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) ac_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_getgroups_works="guessing no" ;;
- esac
-@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_getgroups_works="guessing no" ;;
- esac
-diff --git a/m4/getline.m4 b/m4/getline.m4
-index 5b2ead2..32f771c 100644
---- a/m4/getline.m4
-+++ b/m4/getline.m4
-@@ -1,4 +1,4 @@
--# getline.m4 serial 28
-+# getline.m4 serial 29
-
- dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation,
- dnl Inc.
-@@ -16,6 +16,7 @@ dnl to do with the function we need.
- AC_DEFUN([gl_FUNC_GETLINE],
- [
- AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- dnl Persuade glibc <stdio.h> to declare getline().
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE],
- gl_getline_needs_run_time_check=yes],
- [am_cv_func_working_getline=no])
- if test $gl_getline_needs_run_time_check = yes; then
-- AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline],
-- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ AC_CACHE_CHECK([for working getline function],
-+ [am_cv_func_working_getline],
-+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- # include <stdio.h>
- # include <stdlib.h>
- # include <string.h>
-@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE],
- fclose (in);
- return 0;
- }
-- ]])], [am_cv_func_working_getline=yes] dnl The library version works.
-- , [am_cv_func_working_getline=no] dnl The library version does NOT work.
-- , dnl We're cross compiling. Assume it works on glibc2 systems.
-- [AC_EGREP_CPP([Lucky GNU user],
-- [
-+ ]])],
-+ [am_cv_func_working_getline=yes],
-+ [am_cv_func_working_getline=no],
-+ [dnl We're cross compiling.
-+ dnl Guess it works on glibc2 systems and musl systems.
-+ AC_EGREP_CPP([Lucky GNU user],
-+ [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
- Lucky GNU user
- #endif
- #endif
-- ],
-- [am_cv_func_working_getline="guessing yes"],
-- [am_cv_func_working_getline="guessing no"])]
-- )])
-+ ],
-+ [am_cv_func_working_getline="guessing yes"],
-+ [case "$host_os" in
-+ *-musl*) am_cv_func_working_getline="guessing yes" ;;
-+ *) am_cv_func_working_getline="guessing no" ;;
-+ esac
-+ ])
-+ ])
-+ ])
- fi
-
- if test $ac_cv_have_decl_getline = no; then
-@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE],
- fi
-
- case "$am_cv_func_working_getline" in
-- *no)
-+ *yes) ;;
-+ *)
- dnl Set REPLACE_GETLINE always: Even if we have not found the broken
- dnl getline function among $LIBS, it may exist in libinet and the
- dnl executable may be linked with -linet.
-diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
-index d29b4bf..5e2ef6f 100644
---- a/m4/gettimeofday.m4
-+++ b/m4/gettimeofday.m4
-@@ -1,4 +1,4 @@
--# serial 25
-+# serial 26
-
- # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
- case "$host_os" in
- # Guess all is fine on glibc systems.
- *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-+ # Guess all is fine on musl systems.
-+ *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
-index cbd2dca..8ac7301 100644
---- a/m4/link-follow.m4
-+++ b/m4/link-follow.m4
-@@ -1,4 +1,4 @@
--# serial 20
-+# serial 21
- dnl Run a program to determine whether link(2) follows symlinks.
- dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
-
-@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
- case "$host_os" in
- # On glibc/Linux we know the result.
- linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
-+ # On musl/Linux we know the result.
-+ linux*-musl*) gl_cv_func_link_follows_symlink="guessing no" ;;
- # Otherwise, we don't know.
- *) gl_cv_func_link_follows_symlink=unknown ;;
- esac
-diff --git a/m4/malloc.m4 b/m4/malloc.m4
-index b9b8d4b..c469c45 100644
---- a/m4/malloc.m4
-+++ b/m4/malloc.m4
-@@ -1,4 +1,4 @@
--# malloc.m4 serial 17
-+# malloc.m4 serial 19
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
- [ac_cv_func_malloc_0_nonnull=no],
- [case "$host_os" in
- # Guess yes on platforms where we know the result.
-- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
-+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
- ac_cv_func_malloc_0_nonnull="guessing yes" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
-index 4cd9590..366a3cd 100644
---- a/m4/mkdir.m4
-+++ b/m4/mkdir.m4
-@@ -1,4 +1,4 @@
--# serial 14
-+# serial 15
-
- # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
-index ae24c3b..1b15c2e 100644
---- a/m4/mkstemp.m4
-+++ b/m4/mkstemp.m4
-@@ -1,4 +1,4 @@
--#serial 25
-+#serial 26
-
- # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_working_mkstemp="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/perror.m4 b/m4/perror.m4
-index 335be72..08e2db1 100644
---- a/m4/perror.m4
-+++ b/m4/perror.m4
-@@ -1,4 +1,4 @@
--# perror.m4 serial 7
-+# perror.m4 serial 8
- dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR],
- rm -rf conftest.txt1 conftest.txt2],
- [gl_cv_func_perror_works=no],
- [case "$host_os" in
-- # Guess yes on native Windows.
-- mingw*) gl_cv_func_perror_works="guessing yes" ;;
-- # Otherwise guess no.
-- *) gl_cv_func_perror_works="guessing no" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_perror_works="guessing yes" ;;
-+ # Guess yes on native Windows.
-+ mingw*) gl_cv_func_perror_works="guessing yes" ;;
-+ # Otherwise guess no.
-+ *) gl_cv_func_perror_works="guessing no" ;;
- esac
- ])
- ])
-diff --git a/m4/printf.m4 b/m4/printf.m4
-index cbf6ae4..6d2280e 100644
---- a/m4/printf.m4
-+++ b/m4/printf.m4
-@@ -1,4 +1,4 @@
--# printf.m4 serial 60
-+# printf.m4 serial 61
- dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -62,6 +62,8 @@ int main ()
- changequote(,)dnl
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";;
- # Guess yes on FreeBSD >= 5.
- freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
-@@ -240,6 +242,8 @@ int main ()
- changequote(,)dnl
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_printf_infinite="guessing yes";;
- # Guess yes on FreeBSD >= 6.
- freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
-@@ -457,6 +461,8 @@ int main ()
- changequote(,)dnl
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";;
- # Guess yes on FreeBSD >= 6.
- freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
-@@ -575,6 +581,8 @@ int main ()
- [gl_cv_func_printf_directive_a="guessing yes"],
- [gl_cv_func_printf_directive_a="guessing no"])
- ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_printf_directive_a="guessing yes";;
- # Guess no on Android.
- linux*-android*) gl_cv_func_printf_directive_a="guessing no";;
- # Guess no on native Windows.
-@@ -625,6 +633,8 @@ int main ()
- changequote(,)dnl
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_printf_directive_f="guessing yes";;
- # Guess yes on FreeBSD >= 6.
- freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
-@@ -960,6 +970,8 @@ changequote(,)dnl
- case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess no on Android.
-@@ -1206,6 +1218,8 @@ changequote(,)dnl
- case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
- # Guess yes on FreeBSD >= 5.
- freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
-@@ -1308,6 +1322,8 @@ int main ()
- changequote(,)dnl
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";;
- # Guess yes on FreeBSD >= 5.
- freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
-@@ -1400,6 +1416,8 @@ changequote(,)dnl
- case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";;
- # Guess yes on FreeBSD >= 5.
- freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
-@@ -1554,6 +1572,8 @@ changequote(,)dnl
- case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
- # Guess yes on FreeBSD >= 5.
- freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-diff --git a/m4/putenv.m4 b/m4/putenv.m4
-index f8960f6..342ba26 100644
---- a/m4/putenv.m4
-+++ b/m4/putenv.m4
-@@ -1,4 +1,4 @@
--# putenv.m4 serial 22
-+# putenv.m4 serial 23
- dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_svid_putenv="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_svid_putenv="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/realloc.m4 b/m4/realloc.m4
-index f9f15ad..93066e8 100644
---- a/m4/realloc.m4
-+++ b/m4/realloc.m4
-@@ -1,4 +1,4 @@
--# realloc.m4 serial 15
-+# realloc.m4 serial 17
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
- [ac_cv_func_realloc_0_nonnull=no],
- [case "$host_os" in
- # Guess yes on platforms where we know the result.
-- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
-+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
- ac_cv_func_realloc_0_nonnull="guessing yes" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/setenv.m4 b/m4/setenv.m4
-index 6101274..a8f83d6 100644
---- a/m4/setenv.m4
-+++ b/m4/setenv.m4
-@@ -1,4 +1,4 @@
--# setenv.m4 serial 27
-+# setenv.m4 serial 28
- dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_setenv_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_setenv_works="guessing no" ;;
- esac
-diff --git a/m4/signbit.m4 b/m4/signbit.m4
-index bf5bce5..f7f2f3d 100644
---- a/m4/signbit.m4
-+++ b/m4/signbit.m4
-@@ -1,4 +1,4 @@
--# signbit.m4 serial 16
-+# signbit.m4 serial 17
- dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_signbit="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_signbit="guessing yes" ;;
- # If we don't know, assume the worst.
-@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_signbit_gcc="guessing yes" ;;
- # Guess yes on mingw, no on MSVC.
- mingw*) if test -n "$GCC"; then
- gl_cv_func_signbit_gcc="guessing yes"
-diff --git a/m4/sleep.m4 b/m4/sleep.m4
-index 5f71cc7..7bab467 100644
---- a/m4/sleep.m4
-+++ b/m4/sleep.m4
-@@ -1,4 +1,4 @@
--# sleep.m4 serial 9
-+# sleep.m4 serial 10
- dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -48,6 +48,8 @@ handle_alarm (int sig)
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_sleep_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_sleep_works="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
-index 83425dd..f8e1a7c 100644
---- a/m4/stpncpy.m4
-+++ b/m4/stpncpy.m4
-@@ -1,4 +1,4 @@
--# stpncpy.m4 serial 16
-+# stpncpy.m4 serial 17
- dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
- dnl Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
-
- AC_DEFUN([gl_FUNC_STPNCPY],
- [
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+
- dnl Persuade glibc <string.h> to declare stpncpy().
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-@@ -69,12 +71,18 @@ int main ()
- ]])],
- [gl_cv_func_stpncpy=yes],
- [gl_cv_func_stpncpy=no],
-- [AC_EGREP_CPP([Thanks for using GNU], [
-+ [dnl Guess yes on glibc systems and musl systems.
-+ AC_EGREP_CPP([Thanks for using GNU], [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
- Thanks for using GNU
- #endif
--], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"])
-+], [gl_cv_func_stpncpy="guessing yes"],
-+ [case "$host_os" in
-+ *-musl*) gl_cv_func_stpncpy="guessing yes" ;;
-+ *) gl_cv_func_stpncpy="guessing no" ;;
-+ esac
-+ ])
- ])
- ])
- case "$gl_cv_func_stpncpy" in
-diff --git a/m4/strerror.m4 b/m4/strerror.m4
-index b452f7f..2c90f31 100644
---- a/m4/strerror.m4
-+++ b/m4/strerror.m4
-@@ -1,4 +1,4 @@
--# strerror.m4 serial 19
-+# strerror.m4 serial 20
- dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_working_strerror="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_working_strerror="guessing no" ;;
- esac
-@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/strtod.m4 b/m4/strtod.m4
-index 9912217..d68ab75 100644
---- a/m4/strtod.m4
-+++ b/m4/strtod.m4
-@@ -1,4 +1,4 @@
--# strtod.m4 serial 24
-+# strtod.m4 serial 25
- dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -115,9 +115,11 @@ numeric_equal (double x, double y)
- ],
- [gl_cv_func_strtod_works="guessing yes"],
- [case "$host_os" in
-- # Guess yes on native Windows.
-- mingw*) gl_cv_func_strtod_works="guessing yes" ;;
-- *) gl_cv_func_strtod_works="guessing no" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_strtod_works="guessing yes" ;;
-+ # Guess yes on native Windows.
-+ mingw*) gl_cv_func_strtod_works="guessing yes" ;;
-+ *) gl_cv_func_strtod_works="guessing no" ;;
- esac
- ])
- ])
-diff --git a/m4/strtold.m4 b/m4/strtold.m4
-index 16b4eda..17125fe 100644
---- a/m4/strtold.m4
-+++ b/m4/strtold.m4
-@@ -1,4 +1,4 @@
--# strtold.m4 serial 2
-+# strtold.m4 serial 4
- dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y)
- #endif
- ],
- [gl_cv_func_strtold_works="guessing yes"],
-- [gl_cv_func_strtod_works="guessing no"])
-+ [case "$host_os" in
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_strtold_works="guessing yes" ;;
-+ *) gl_cv_func_strtold_works="guessing no" ;;
-+ esac
-+ ])
- ])
- ])
- case "$gl_cv_func_strtold_works" in
-diff --git a/m4/tzset.m4 b/m4/tzset.m4
-index 1278801..afdfa8e 100644
---- a/m4/tzset.m4
-+++ b/m4/tzset.m4
-@@ -1,4 +1,4 @@
--# serial 11
-+# serial 12
-
- # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -70,6 +70,8 @@ main ()
- [case "$host_os" in
- # Guess all is fine on glibc systems.
- *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
-+ # Guess all is fine on musl systems.
-+ *-musl*) gl_cv_func_tzset_clobber="guessing no" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_tzset_clobber="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
-index ab8757b..08baf33 100644
---- a/m4/ungetc.m4
-+++ b/m4/ungetc.m4
-@@ -1,4 +1,4 @@
--# ungetc.m4 serial 6
-+# ungetc.m4 serial 7
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
- remove ("conftest.tmp");])],
- [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
- [case "$host_os" in
-- # Guess yes on glibc and bionic systems.
-- *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;;
-- # Guess yes on native Windows.
-- mingw*) gl_cv_func_ungetc_works="guessing yes" ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_func_ungetc_works="guessing no" ;;
-+ # Guess yes on glibc systems.
-+ *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_ungetc_works="guessing yes" ;;
-+ # Guess yes on bionic systems.
-+ *-android*) gl_cv_func_ungetc_works="guessing yes" ;;
-+ # Guess yes on native Windows.
-+ mingw*) gl_cv_func_ungetc_works="guessing yes" ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_func_ungetc_works="guessing no" ;;
- esac
- ])
- ])
-diff --git a/m4/usleep.m4 b/m4/usleep.m4
-index 59605a8..4a6bff0 100644
---- a/m4/usleep.m4
-+++ b/m4/usleep.m4
-@@ -1,4 +1,4 @@
--# usleep.m4 serial 5
-+# usleep.m4 serial 6
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_usleep_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_usleep_works="guessing no" ;;
- # If we don't know, assume the worst.
-diff --git a/m4/utimes.m4 b/m4/utimes.m4
-index 7209b6d..5806d8f 100644
---- a/m4/utimes.m4
-+++ b/m4/utimes.m4
-@@ -1,5 +1,5 @@
- # Detect some bugs in glibc's implementation of utimes.
--# serial 5
-+# serial 6
-
- dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -143,9 +143,11 @@ main ()
- [gl_cv_func_working_utimes=yes],
- [gl_cv_func_working_utimes=no],
- [case "$host_os" in
-- # Guess no on native Windows.
-- mingw*) gl_cv_func_working_utimes="guessing no" ;;
-- *) gl_cv_func_working_utimes="guessing no" ;;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_working_utimes="guessing yes" ;;
-+ # Guess no on native Windows.
-+ mingw*) gl_cv_func_working_utimes="guessing no" ;;
-+ *) gl_cv_func_working_utimes="guessing no" ;;
- esac
- ])
- ])
-diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
-index baa2002..3952fd2 100644
---- a/m4/wcwidth.m4
-+++ b/m4/wcwidth.m4
-@@ -1,4 +1,4 @@
--# wcwidth.m4 serial 27
-+# wcwidth.m4 serial 28
- dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -98,9 +98,13 @@ int main ()
- [
- changequote(,)dnl
- case "$host_os" in
-- # Guess yes on glibc and AIX 7 systems.
-- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-- *) gl_cv_func_wcwidth_works="guessing no";;
-+ # Guess yes on glibc systems.
-+ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";;
-+ # Guess yes on musl systems.
-+ *-musl*) gl_cv_func_wcwidth_works="guessing yes";;
-+ # Guess yes on AIX 7 systems.
-+ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-+ *) gl_cv_func_wcwidth_works="guessing no";;
- esac
- changequote([,])dnl
- ])
---
-1.9.1
-
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/default.nix
index 50d3a2437d70..e3e2e167e33a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/default.nix
@@ -22,21 +22,16 @@ with lib;
stdenv.mkDerivation (rec {
pname = "coreutils";
- version = "8.31";
+ version = "8.32";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
+ sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";
};
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
- # Fix failing test with musl. See https://lists.gnu.org/r/coreutils/2019-05/msg00031.html
- # To be removed in coreutils-8.32.
- ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch
- # Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
- ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch
- # Fix compilation in android-cross environments. To be removed in coreutils-8.32.
- ++ [ ./coreutils-8.31-android-cross.patch ];
+ # included on coreutils master; TODO: apply unconditionally, I guess
+ ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch;
postPatch = ''
# The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch
new file mode 100644
index 000000000000..0af5de68415a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch
@@ -0,0 +1,100 @@
+From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 5 Mar 2020 17:25:29 -0800
+Subject: ls: restore 8.31 behavior on removed directories
+
+* NEWS: Mention this.
+* src/ls.c: Do not include <sys/sycall.h>
+(print_dir): Don't worry about whether the directory is removed.
+* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
+behavior.
+---
+ NEWS (removed diff in nixpkgs)| 6 ++++++
+ src/ls.c | 22 ----------------------
+ tests/ls/removed-directory.sh | 10 ++--------
+ 3 files changed, 8 insertions(+), 30 deletions(-)
+
+diff --git a/src/ls.c b/src/ls.c
+index 24b983287..4acf5f44d 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -49,10 +49,6 @@
+ # include <sys/ptem.h>
+ #endif
+
+-#ifdef __linux__
+-# include <sys/syscall.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <assert.h>
+ #include <setjmp.h>
+@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+ struct dirent *next;
+ uintmax_t total_blocks = 0;
+ static bool first = true;
+- bool found_any_entries = false;
+
+ errno = 0;
+ dirp = opendir (name);
+@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+ next = readdir (dirp);
+ if (next)
+ {
+- found_any_entries = true;
+ if (! file_ignored (next->d_name))
+ {
+ enum filetype type = unknown;
+@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+ if (errno != EOVERFLOW)
+ break;
+ }
+-#ifdef __linux__
+- else if (! found_any_entries)
+- {
+- /* If readdir finds no directory entries at all, not even "." or
+- "..", then double check that the directory exists. */
+- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
+- && errno != EINVAL)
+- {
+- /* We exclude EINVAL as that pertains to buffer handling,
+- and we've passed NULL as the buffer for simplicity.
+- ENOENT is returned if appropriate before buffer handling. */
+- file_failure (command_line_arg, _("reading directory %s"), name);
+- }
+- break;
+- }
+-#endif
+ else
+ break;
+
+diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
+index e8c835dab..fe8f929a1 100755
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -26,20 +26,14 @@ case $host_triplet in
+ *) skip_ 'non linux kernel' ;;
+ esac
+
+-LS_FAILURE=2
+-
+-cat <<\EOF >exp-err || framework_failure_
+-ls: reading directory '.': No such file or directory
+-EOF
+-
+ cwd=$(pwd)
+ mkdir d || framework_failure_
+ cd d || framework_failure_
+ rmdir ../d || framework_failure_
+
+-returns_ $LS_FAILURE ls >../out 2>../err || fail=1
++ls >../out 2>../err || fail=1
+ cd "$cwd" || framework_failure_
+ compare /dev/null out || fail=1
+-compare exp-err err || fail=1
++compare /dev/null err || fail=1
+
+ Exit $fail
+--
+cgit v1.2.1
+
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cp437/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cp437/default.nix
new file mode 100644
index 000000000000..70ca44bd06a2
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cp437/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+let version = "0.6";
+in
+stdenv.mkDerivation {
+ pname = "cp437";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "keaston";
+ repo = "cp437";
+ rev = "v${version}";
+ sha256 = "18f4mnfnyviqclbhmbhix80k823481ypkwbp26qfvhnxdgzbggcc";
+ };
+
+ installPhase = ''
+ install -Dm755 cp437 -t $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = ''
+ Emulates an old-style "code page 437" / "IBM-PC" character
+ set terminal on a modern UTF-8 terminal emulator
+ '';
+ homepage = "https://github.com/keaston/cp437";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ jb55 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix
index dba42e4bfea8..2856bc2f1e0c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, curl, jansson, autoconf, automake
+{ stdenv, fetchFromGitHub, curl, jansson, autoconf, automake
, aesni ? stdenv.hostPlatform.aesSupport }:
let
@@ -8,9 +8,10 @@ in
stdenv.mkDerivation {
name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
- src = fetchgit {
+ src = fetchFromGitHub {
+ owner = "hyc";
+ repo = "cpuminer-multi";
inherit rev;
- url = "https://github.com/wolf9466/cpuminer-multi.git";
sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cutecom/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cutecom/default.nix
index d825b555e195..e109b12f2879 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/cutecom/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cutecom/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "cutecom";
- version = "0.51.0";
+ version = "0.51.0+patch";
src = fetchFromGitLab {
owner = "cutecom";
repo = "cutecom";
- rev = "v${version}";
- sha256 = "1zprabjs4z26hsb64fc3k790aiiqiz9d88j666xrzi4983m1bfv8";
+ rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca";
+ sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
};
preConfigure = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ddate/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ddate/default.nix
index 0987fb6d286f..04a89ec3dd0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ddate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ddate/default.nix
@@ -1,10 +1,13 @@
-{stdenv, fetchgit, cmake} :
+{stdenv, fetchFromGitHub, cmake} :
-stdenv.mkDerivation {
- name = "ddate-0.2.2";
- src = fetchgit {
- url = "https://github.com/bo0ts/ddate";
- rev = "refs/tags/v0.2.2";
+stdenv.mkDerivation rec {
+ pname = "ddate";
+ version = "0.2.2";
+
+ src = fetchFromGitHub {
+ owner = "bo0ts";
+ repo = pname;
+ rev = "refs/tags/v${version}";
sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f";
};
@@ -14,7 +17,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/bo0ts/ddate";
description = "Discordian version of the date program";
license = stdenv.lib.licenses.publicDomain;
- maintainers = with stdenv.lib.maintainers; [kovirobi];
+ maintainers = with stdenv.lib.maintainers; [ kovirobi ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/debianutils/default.nix
index 141df3332227..42deec9dc5d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/debianutils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/debianutils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
- version = "4.11.1";
+ version = "4.11.2";
src = fetchurl {
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
- sha256 = "0g4qmzb2ff0rqszzpsal465hcslnpdl4nhghv59qvhamkkqnks4b";
+ sha256 = "1pjh2s5f8qp8jaky2x08yvf125np0s48zb2z6f3h6x4vf20hws1v";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/debootstrap/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/debootstrap/default.nix
index 2940ff0a5738..4d4afb0b995f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/debootstrap/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/debootstrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, utillinux
+{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux
, gnugrep, gnutar, gnused, gzip, makeWrapper }:
# USAGE like this: debootstrap sid /tmp/target-chroot-directory
# There is also cdebootstrap now. Is that easier to maintain?
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
substituteInPlace debootstrap \
--replace 'CHROOT_CMD="chroot ' 'CHROOT_CMD="${coreutils}/bin/chroot ' \
- --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${utillinux}/bin/unshare ' \
+ --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${util-linux}/bin/unshare ' \
--replace /usr/bin/dpkg ${dpkg}/bin/dpkg \
--replace '#!/bin/sh' '#!/bin/bash' \
--subst-var-by VERSION ${version}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
index 011c5432089d..76c868f9b583 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "160";
+ version = "161";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc";
+ sha256 = "sha256-Frk+aVUQhWn/TvlG4zy5+R2z92rFIwO4NPRXYkS0rN4=";
};
outputs = [ "out" "man" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix
index e24d8611a433..050dcf2955f3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "direnv";
- version = "2.23.0";
+ version = "2.25.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
- sha256 = "0m42mg4z04880dwl3iyppq2nda9v883jaxl8221d0xcpkjfm8hjm";
+ sha256 = "00bvznswmz08s2jqpz5xxmkqggd06h6g8cwk242aaih6qajxfpsn";
};
# we have no bash at the moment for windows
@@ -18,6 +18,11 @@ buildGoModule rec {
stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
"${bash}/bin/bash";
+ # fix hardcoded GOFLAGS in makefile. remove once https://github.com/direnv/direnv/issues/718 is closed.
+ postPatch = ''
+ substituteInPlace GNUmakefile --replace "export GOFLAGS=-mod=vendor" ""
+ '';
+
# replace the build phase to use the GNUMakefile instead
buildPhase = ''
make BASH_PATH=$BASH_PATH
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix
index b4cdde95b800..a2f3938adec1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
- version = "2.10.2";
+ version = "2.10.5";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
- sha256 = "0qsk4pa7xywd6fdwd5v4qwj334hyp3xjlayjzgyhks7a87hdwjgs";
+ sha256 = "0imf9ngmyhyj5jdr99g1xc3vqzr61fnz32bxhmy63n1szylig5zq";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "02wd4cw9hd8d96szwx8yxz6bll60f7w1z0xiz7k1h8h12mriaz4w";
+ cargoSha256 = "1czc0jma5k6idv463kn5qrirq8apgfrcxwv2yjk0pxy6vkji6154";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/duf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/duf/default.nix
index 831d66c73c72..29456f54cd16 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/duf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/duf/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "duf";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "muesli";
repo = "duf";
rev = "v${version}";
- sha256 = "093kir1zwpkl0jic4p1f032ir5k7kra94di2indzn0fa4j4r7a0i";
+ sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f";
};
dontStrip = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/envchain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/envchain/default.nix
new file mode 100644
index 000000000000..1bafa4688ae8
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/envchain/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }:
+
+stdenv.mkDerivation rec {
+ pname = "envchain";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "sorah";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0qxwiqhb8cg0zbn5p0mvnbyxx1xwvgiricrkjlvxz13sf2ngq87p";
+ };
+
+ postPatch = ''
+ sed -i -e "s|-ltermcap|-lncurses|" Makefile
+ '';
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ libsecret readline ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
+
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Set environment variables with macOS keychain or D-Bus secret service";
+ homepage = "https://github.com/sorah/envchain";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ bbigras ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/etcher/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/etcher/default.nix
index fec78db979c0..6634d2d23ca2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/etcher/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/etcher/default.nix
@@ -3,7 +3,7 @@
, gcc-unwrapped
, dpkg
, polkit
-, utillinux
+, util-linux
, bash
, nodePackages
, makeWrapper
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
# use Nix(OS) paths
sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js
sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js
- sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
+ sed -i "s|'lsblk'|'${util-linux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js
${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar
rm -rf tmp
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/eva/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/eva/default.nix
index e59c2387a3ce..a40913343308 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/eva/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/eva/default.nix
@@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "NerdyPepper";
- repo = "${pname}";
+ repo = pname;
rev = "6ce0fc0212a34ffb647b24d9d903029ac4518165";
sha256 = "10242vnq2ph0g3p2hdacs4lmx3f474xm04nadplxbpv9xh4nbag3";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/execline/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/execline/default.nix
index ecedd2b0b417..bf7853c11736 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/execline/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/execline/default.nix
@@ -1,14 +1,11 @@
-{ lib, skawarePackages
-# for execlineb-with-builtins
-, coreutils, gnugrep, writeScriptBin, runCommand, runCommandCC
-}:
+{ skawarePackages }:
with skawarePackages;
buildPackage {
pname = "execline";
- version = "2.6.1.0";
- sha256 = "0mj565xml3hvw27finydms0s9abbbpgbr29vnr8gwi7zjzq7ck52";
+ version = "2.6.1.1";
+ sha256 = "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr";
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fd/default.nix
index 31b47a31ca8f..56b3e770e825 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
- version = "8.1.1";
+ version = "8.2.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
- sha256 = "0qzqnsjkq8i4gzn9273algx33kr1hzgxid8lnqp4awy2zxm4ksiq";
+ sha256 = "1g9jnf9h2s33l5q9z892vmvj78phwd4hfvspvnraxj4lvjp707ia";
};
- cargoSha256 = "1d7hfgl9l4b9bnq2qcpvdq5rh7lpz33r19hw3wwgnqh142q67m7r";
+ cargoSha256 = "0yavp67fb4vqygww9kjzdi7gr7dj4aw47s03dkwlz526rhkhappw";
nativeBuildInputs = [ installShellFiles ];
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
installManPage doc/fd.1
installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish}
- installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd
+ installShellCompletion --zsh contrib/completion/_fd
'';
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix
new file mode 100644
index 000000000000..8813ec5a14e7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "fend";
+ version = "0.1.11";
+
+ src = fetchFromGitHub {
+ owner = "printfn";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0g9zr2afi103cwv6ikpmmyh5v055dh47l3wj9a1kbxgms0953iwh";
+ };
+
+ cargoSha256 = "0hydlaibanw2vjyxymfbzgwwk2qjv7jsz15gn66ga5vknsqihcrx";
+
+ meta = with lib; {
+ description = "Arbitrary-precision unit-aware calculator";
+ homepage = "https://github.com/printfn/fend";
+ license = licenses.mit;
+ maintainers = with maintainers; [ djanatyn ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fet-sh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fet-sh/default.nix
index 4041a9abdbad..e53c51c33e94 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fet-sh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fet-sh/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "fet-sh";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "6gk";
repo = "fet.sh";
rev = "v${version}";
- sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn";
+ sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky";
};
dontBuild = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ffsend/default.nix
index 8b9f79aaa7fd..a8c7fce68cc8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ffsend/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
- version = "0.2.65";
+ version = "0.2.68";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
- sha256 = "02yw129rw072jlf36k60jbhfdv9ayx2wb5il61fc0v07h1nd7i0d";
+ sha256 = "0ga1v4s8ks2v632mim8ljya0gi2j8bbwj98yfm3g00p0z1i526qk";
};
- cargoSha256 = "04waki61b5pjlgznbhbrjpi9rxgdwg9mjbx2apfh9swvfip602r6";
+ cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w";
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs =
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix
index afca2e3007ed..988849fbbbf6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix
@@ -1,44 +1,26 @@
-{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }:
-# To use `flameshot gui`, you will also need to put flameshot in `services.dbus.packages`
-# in configuration.nix so that the daemon gets launched properly:
-#
-# services.dbus.packages = [ pkgs.flameshot ];
-# environment.systemPackages = [ pkgs.flameshot ];
mkDerivation rec {
pname = "flameshot";
- version = "0.6.0";
+ version = "0.8.5";
src = fetchFromGitHub {
- owner = "lupoDharkael";
+ owner = "flameshot-org";
repo = "flameshot";
rev = "v${version}";
- sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm";
+ sha256 = "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191";
};
- nativeBuildInputs = [ qmake qttools qtsvg ];
+ nativeBuildInputs = [ cmake qttools qtsvg ];
buildInputs = [ qtbase ];
- qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
-
- preConfigure = ''
- # flameshot.pro assumes qmake is being run in a git checkout.
- git() { echo ${version}; }
- export -f git
- '';
-
- postFixup = ''
- substituteInPlace $out/share/dbus-1/services/org.dharkael.Flameshot.service \
- --replace "/usr/local" "$out"
- '';
-
enableParallelBuilding = true;
meta = with lib; {
description = "Powerful yet simple to use screenshot software";
- homepage = "https://github.com/lupoDharkael/flameshot";
+ homepage = "https://github.com/flameshot-org/flameshot";
maintainers = [ maintainers.scode ];
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/flashrom/default.nix
index 2f92dc6d9bf2..47d4fd127575 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/flashrom/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/flashrom/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ funfunctor fpletz ];
platforms = platforms.all;
+ broken = stdenv.isDarwin; # requires DirectHW
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
index 174c0f42684f..ec1a0072a559 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,17 +2,19 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
- version = "1.6.0";
+ version = "1.6.7";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
- sha256 = "1m8ly2h52mw67kqc7qqpf7sxxnyk4fnw2qavjpj6zgw3i6dhj0p1";
+ sha256 = "1rybz69yhjm1g8m6wmn6v143a65y69w2fvs62yr8n1r92cadzbia";
};
nativeBuildInputs = [ cmake flex bison ];
+ patches = [ ./fix-luajit-darwin.patch ];
+
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace /lib/systemd $out/lib/systemd
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
new file mode 100644
index 000000000000..21d9c21f5b9b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
@@ -0,0 +1,14 @@
+diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake
+--- fluent-bit.old/cmake/luajit.cmake
++++ fluent-bit.new/cmake/luajit.cmake
+@@ -11,10 +11,6 @@
+ set(LUAJIT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${FLB_PATH_LIB_LUAJIT})
+ set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR})
+
+-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
+-endif()
+-
+ # luajit (UNIX)
+ # =============
+ ExternalProject_Add(luajit
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fortune/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fortune/default.nix
index 74c21d21fcc3..bc23d9dd8462 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fortune/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fortune/default.nix
@@ -2,11 +2,13 @@
stdenv.mkDerivation rec {
pname = "fortune-mod";
- version = "2.10.0";
+ version = "3.4.1";
+ # We use fetchurl instead of fetchFromGitHub because the release pack has some
+ # special files.
src = fetchurl {
- url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz";
- sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7";
+ url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
+ sha256 = "02hjf432mq5qpbf1hywid7b356jys5n9brrrmm6z6r05jpzybbg3";
};
nativeBuildInputs = [ cmake perl ];
@@ -31,12 +33,13 @@ stdenv.mkDerivation rec {
)
my_exe(
- --
+ --
'') ];
meta = with stdenv.lib; {
description = "A program that displays a pseudorandom message from a database of quotations";
license = licenses.bsdOriginal;
platforms = platforms.unix;
+ maintainers = with maintainers; [ vonfry ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix
index 312c7bbe3e97..587483f4ac41 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fselect";
- version = "0.6.10";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "jhspetersson";
repo = "fselect";
rev = version;
- sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra";
+ sha256 = "1cqa52n5y6g087w4yzc273jpxhzpinwkqd32azg03dkczbgx5b2v";
};
- cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626";
+ cargoSha256 = "00yhp2b74plrbi944apbxpkw2y6nbgf81sinfchw44ww1i58mfhj";
nativeBuildInputs = [ installShellFiles ];
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
description = "Find files with SQL-like queries";
homepage = "https://github.com/jhspetersson/fselect";
license = with licenses; [ asl20 mit ];
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fsmon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fsmon/default.nix
index 668fa463adb3..a3e3eddcda9e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fsmon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fsmon/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fsmon";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "nowsecure";
repo = "fsmon";
rev = version;
- sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03";
+ sha256 = "0y0gqb07girhz3r7gn9yrrysvhj5fapdafim0q8n7krk5y23hmh0";
};
installPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix
index 88000c0ba2c6..b114ee2373c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fzf";
- version = "0.23.1";
+ version = "0.24.4";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
- sha256 = "1x55y96i4b3gk9l2zlwb6ifsk8nxzfny3b73ly89g7kifwkb543k";
+ sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj";
};
- vendorSha256 = "0bd4fk15i292377mv5w57gzxjp21f0rcf1py9gd6v99rx1pviq66";
+ vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
outputs = [ "out" "man" ];
@@ -19,6 +19,10 @@ buildGoModule rec {
buildInputs = [ ncurses ];
+ buildFlagsArray = [
+ "-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}"
+ ];
+
# The vim plugin expects a relative path to the binary; patch it to abspath.
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim
@@ -65,7 +69,7 @@ buildGoModule rec {
homepage = "https://github.com/junegunn/fzf";
description = "A command-line fuzzy finder written in Go";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ma27 zowoq ];
+ maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix
index a5da79950210..2fd99fd4a3ab 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix
@@ -2,7 +2,7 @@
let
pname = "gammy";
- version = "0.9.58a";
+ version = "0.9.59";
in
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "Fushko";
repo = pname;
rev = "v${version}";
- sha256 = "02kwfzh7h2dbsfb6b3qlsc7zga1hq21qvg45wf22vm03mahc28za";
+ sha256 = "1iz41larqr6ss5kar1pds6zgcrch6ch34cr0ngd71gcaxal0rb72";
};
nativeBuildInputs = [ qmake wrapQtAppsHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/geekbench/default.nix
index 4d9434e9fb50..a33ae0ed3305 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/geekbench/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
- version = "5.2.3";
+ version = "5.3.1";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
- sha256 = "03hasbibw79vbcrpdf2fnm42i2mxc0ia7k96xv012wn6d4dfvr4w";
+ sha256 = "0hil3mvrwpwy60x9s16bf8vgvfv11sdarcbk45zjlgjzfhh8h2qr";
};
dontConfigure = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/gibo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/gibo/default.nix
index abee4950d879..1357ab5196d7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/gibo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/gibo/default.nix
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
- mkdir -p $out/bin $out/etc/bash_completion.d
+ mkdir -p $out/bin $out/share/bash-completion/completions
cp gibo $out/bin
- cp gibo-completion.bash $out/etc/bash_completion.d
+ cp gibo-completion.bash $out/share/bash-completion/completions
sed -e 's|\<git |${git}/bin/git |g' \
-e 's|\<basename |${coreutils}/bin/basename |g' \
-i "$out/bin/gibo"
sed -e 's|\<find |${findutils}/bin/find |g' \
- -i "$out/etc/bash_completion.d/gibo-completion.bash"
+ -i "$out/share/bash-completion/completions/gibo-completion.bash"
'';
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix
index fed22e518937..52d3e043ce9c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, zlib, libjpeg }:
+{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
python3Packages.buildPythonApplication {
pname = "gif-for-cli";
- version = "unstable-2018-08-14";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "google";
repo = "gif-for-cli";
- rev = "9696f25fea2e38499b7c248a3151030c3c68bb00";
- sha256 = "1rj8wjfsabn27k1ds7a5fdqgf2r28zpz4lvhbzssjfj1yf0mfh7s";
+ rev = "31f8aa2d617d6d6e941154f60e287c38dd9a74d5";
+ sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M=";
};
checkInputs = [ python3Packages.coverage ];
- buildInputs = [ ffmpeg_3 zlib libjpeg ];
- propagatedBuildInputs = with python3Packages; [ pillow requests x256 ];
+ buildInputs = [ zlib libjpeg ];
+ propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ];
meta = with stdenv.lib; {
description = "Render gifs as ASCII art in your cli";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/goaccess/default.nix
index 1906c9d56656..d14ef9d526ad 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/goaccess/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/goaccess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }:
+{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.4";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch";
+ sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6";
+ })
+ ];
+
configureFlags = [
"--enable-geoip=mmdb"
"--enable-utf8"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
new file mode 100644
index 000000000000..58a7ce619c5a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "goreleaser";
+ version = "0.149.0";
+
+ src = fetchFromGitHub {
+ owner = "goreleaser";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "14yvxnl2ap1hizpk3pfzlh36399df1z2zgsc63qdh1h4ixyav6cy";
+ };
+
+ vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d";
+
+ buildFlagsArray = [
+ "-ldflags="
+ "-s"
+ "-w"
+ "-X main.version=${version}"
+ "-X main.builtBy=nixpkgs"
+ ];
+
+ # tests expect the source files to be a build repo
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Deliver Go binaries as fast and easily as possible";
+ homepage = "https://goreleaser.com";
+ maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin ];
+ license = licenses.mit;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/gparted/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/gparted/default.nix
index 6292fb4a7227..7d610416da47 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/gparted/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/gparted/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2
-, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll
+, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
}:
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
- --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux procps coreutils gnused gnugrep ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
)
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix
index 503b9bcd411a..f6a48364bfda 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
- version = "3.3.8";
+ version = "3.3.9";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
- sha256 = "0y5c7sgdswh2p50plv78vkva0wwlyh2vh3qy3mymq48nqpzrbirp";
+ sha256 = "1wl9j2jgjg5gwcsh92qr5f68wx12nvwadc9xkaa9wwd7x3z825jq";
};
dontBuild = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
index 0499011cd111..5a9b692b1b8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
@@ -64,10 +64,10 @@ in {
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
- version = "3.3.8";
+ version = "3.3.9";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
- sha256 = "1567q2pwgcwxvaa0qmbhgvnr9f9v3w7vgvnv8kvfvjhxlvm78g1q";
+ sha256 = "0yr2lmf50w8qw5amimmym6y4jxga4d7s7cbiqs5sqzvipgsknbwj";
};
installPhase = ''
mkdir -p $out/bin
@@ -96,10 +96,10 @@ in {
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
- version = "3.3.8";
+ version = "3.3.9";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
- sha256 = "00ax3r24inzicak0dd77737qpfas455w5vmj980yfsz40vwnqlr2";
+ sha256 = "0q858ffmkinngyqqsaszcrx93zc4fg43ny0xb7vm0p4wd48hjyqc";
};
installPhase = ''
mkdir -p $out/bin
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix
new file mode 100644
index 000000000000..96e81fe8bd4c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, fetchFromGitHub
+, upx
+}:
+
+let
+ version = "20202807";
+ pname = "hdl-dump";
+in stdenv.mkDerivation {
+ inherit pname version;
+
+ # Using AkuHAK's repo because playstation2's repo is outdated
+ src = fetchFromGitHub {
+ owner = "AKuHAK";
+ repo = pname;
+ rev = "be37e112a44772a1341c867dc3dfee7381ce9e59";
+ sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41";
+ };
+
+ buildInputs = [ upx ];
+
+ makeFlags = [ "RELEASE=yes" ];
+
+ installPhase = ''
+ install -Dm755 hdl_dump -t $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/AKuHAK/hdl-dump";
+ description = "PlayStation 2 HDLoader image dump/install utility";
+ platforms = platforms.linux;
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ makefu ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hebcal/default.nix
index 96c958484403..049a79fa7574 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/hebcal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/hebcal/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- version = "4.21";
+ version = "4.22";
pname = "hebcal";
src = fetchFromGitHub {
owner = "hebcal";
repo = "hebcal";
rev = "v${version}";
- sha256 = "0gqjhl5i0hvnpvsg6cfc2z5ckrs66h3jlrdgim62azn3hh5bday2";
+ sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
index 489fa555c5de..9c42a2c0a9f3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
- html-proofer (3.16.0)
+ html-proofer (3.17.4)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
@@ -18,9 +18,9 @@ GEM
mini_portile2 (2.4.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
- nokogumbo (2.0.2)
+ nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4)
- parallel (1.19.2)
+ parallel (1.20.1)
public_suffix (4.0.6)
rainbow (3.0.0)
typhoeus (1.4.0)
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
index bdd0bbc20c9f..d4c9a5367db8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m";
+ sha256 = "1wjwr7c19dr7rai44ypqghbakgav91h9swg88cddn7rxf7a6vl3b";
type = "gem";
};
- version = "3.16.0";
+ version = "3.17.4";
};
mercenary = {
groups = ["default"];
@@ -79,20 +79,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s";
+ sha256 = "0pxm7hx2lhmanm8kljd39f1j1742kl0a31zx98jsjiwrkfb5hhc6";
type = "gem";
};
- version = "2.0.2";
+ version = "2.0.4";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
+ sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
type = "gem";
};
- version = "1.19.2";
+ version = "1.20.1";
};
public_suffix = {
groups = ["default"];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
index ff9250a2bf66..cd581045cc59 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles
+{ stdenv, fetchCrate, rustPlatform, installShellFiles
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "hyperfine";
- version = "1.10.0";
+ version = "1.11.0";
- src = fetchFromGitHub {
- owner = "sharkdp";
- repo = pname;
- rev = "refs/tags/v${version}";
- sha256 = "0389lmyipmm4irrl39zw2748f2sdddfzwms4i4763xdykdvi8b57";
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "0dla2jzwcxkdx3n4fqkkh6wirqs2f31lvqsw2pjf1jbnnif54mzh";
};
- cargoSha256 = "06scvp7x1yixdadarsm461hbc256spx4aqhmjjn72x7hxn22h9cg";
+ cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw";
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix
index 5a6064114419..ab22e413b003 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix
@@ -4,6 +4,7 @@
, libirecovery
, libzip
, libusbmuxd
+, IOKit
}:
stdenv.mkDerivation rec {
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
# Not listing other dependencies specified in
# https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
# because they are inherited `libimobiledevice`.
- ];
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; {
homepage = "https://github.com/libimobiledevice/idevicerestore";
@@ -51,8 +52,8 @@ stdenv.mkDerivation rec {
This will download and restore a device to the latest firmware available.
'';
license = licenses.lgpl21Plus;
- # configure.ac suggests it should work for darwin and mingw as well but not tried yet
- platforms = platforms.linux;
+ # configure.ac suggests it should work for mingw as well but not tried yet
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ nh2 ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/intermodal/default.nix
index fe5d724e696b..c96aa90cb233 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/intermodal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/intermodal/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "intermodal";
- version = "0.1.11";
+ version = "0.1.12";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
- sha256 = "1wqf227ljfys16jfbxi6mlkgdczgqrh15ixl9vi6higlxfi2wsj2";
+ sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68";
};
- cargoSha256 = "0lx8y1y5mf8ga7iz74dnfyf2b9jx15wishw0khfxknmh96h2y99h";
+ cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn";
# include_hidden test tries to use `chflags` on darwin
checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
description = "User-friendly and featureful command-line BitTorrent metainfo utility";
homepage = "https://github.com/casey/intermodal";
license = licenses.cc0;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
index 5e6c0bdd5968..ae70e0f3e613 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jre, makeDesktopItem }:
+{ stdenv, fetchurl, unzip, jre, makeDesktopItem, copyDesktopItems }:
let
desktopItem = makeDesktopItem {
@@ -18,11 +18,12 @@ stdenv.mkDerivation {
sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
};
+ nativeBuildInputs = [ copyDesktopItems ];
buildInputs = [ unzip ];
inherit jre;
installPhase = ''
- source $stdenv/setup
+ runHook preInstall
unzip $src
@@ -38,9 +39,11 @@ stdenv.mkDerivation {
EOF
chmod +x $out/bin/jdiskreport
- ${desktopItem.buildCommand}
+ runHook postInstall
'';
+ desktopItems = [ desktopItem ];
+
meta = with stdenv.lib; {
homepage = "http://www.jgoodies.com/freeware/jdiskreport/";
description = "A graphical utility to visualize disk usage";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/jdupes/default.nix
index 7d559a1468e3..a22fcc77dd96 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/jdupes/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jdupes";
- version = "1.18.2";
+ version = "1.19.0";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
- sha256 = "1gaqdcz0s31qncar9dzlr8izv50zlk4y6dgdm9xjk6as2g8b0fkk";
+ sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix
index 32c45b31a17d..1b5f11440fa0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ wnklmnn ];
platforms = platforms.all;
};
-} \ No newline at end of file
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/kepubify/default.nix
index 7446b061e0d6..546dcb112a86 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/kepubify/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/kepubify/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kepubify";
- version = "3.1.5";
+ version = "3.1.6";
src = fetchFromGitHub {
owner = "pgaskin";
repo = pname;
rev = "v${version}";
- sha256 = "047pwn7yzm456cs175vgqk2pd6i3iqn8zxp38px3ah15vym2yjnp";
+ sha256 = "129izxgvhcybipfgcwzzwsir9zhi7axxadnw822zy5rk2ky4zjpk";
};
- vendorSha256 = "0jzx5midawvzims9ghh8fbslvwcdczvlpf0k6a9q0bdf4wlp2z5n";
+ vendorSha256 = "0vwzm1c4kada7mqdkr444gj8c2vkvz7av9wkpgdpjrq0v2h0hpcc";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
index d0c4d71c58a6..5c70c7fba7d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "lazydocker";
- version = "0.9";
+ version = "0.10";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
- sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy";
+ sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8";
};
goPackagePath = "github.com/jesseduffield/lazydocker";
@@ -19,6 +19,6 @@ buildGoPackage rec {
description = "A simple terminal UI for both docker and docker-compose";
homepage = "https://github.com/jesseduffield/lazydocker";
license = licenses.mit;
- maintainers = with maintainers; [ das-g filalex77 ];
+ maintainers = with maintainers; [ das-g Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/licensor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/licensor/default.nix
index 3a87e0a1bb89..b7ea30f8d3f8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/licensor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/licensor/default.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
description = "Write licenses to stdout";
homepage = "https://github.com/raftario/licensor";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix
index ec8106e922ae..b8008864bccf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/6.x.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
];
installPhase = ''
+ runHook preInstall
mkdir -p $out
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
@@ -41,10 +42,11 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/logstash-plugin \
--set JAVA_HOME "${jre}"
+ runHook postInstall
'';
meta = with stdenv.lib; {
- description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
+ description = "A data pipeline that helps you process logs and other event data from a variety of systems";
homepage = "https://www.elastic.co/products/logstash";
license = if enableUnfree then licenses.elastic else licenses.asl20;
platforms = platforms.unix;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix
index e7872b0c4061..cd554167dda8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/7.x.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
];
installPhase = ''
+ runHook preInstall
mkdir -p $out
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/logstash-plugin \
--set JAVA_HOME "${jre}"
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
index d03e031b7aee..d4fb6532ef59 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchzip }:
# Note that plugins are supposed to be installed as:
-# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
+# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
stdenv.mkDerivation rec {
version = "1.4.2";
pname = "logstash-contrib";
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
installPhase = ''
+ runHook preInstall
mkdir -p $out/logstash
cp -r lib/* $out
+ runHook postInstall
'';
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix
index 19dafb4cef12..ccf7a05907d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lokalise2-cli";
- version = "2.6.0";
+ version = "2.6.2";
src = fetchFromGitHub {
owner = "lokalise";
repo = "lokalise-cli-2-go";
rev = "v${version}";
- sha256 = "15lwy2rrb5d5r0asa51bgjr42pcknk6znx6qirw9s924i8dbzp6s";
+ sha256 = "1iizyr6bv17dpv05whcx34498wbrs0q3gn8s50srvdqrdk9hs4gj";
};
- vendorSha256 = "06y1v0v1kkbd5vxa8h0qvasm9ibwwhz0v4x03k3nb5xlwn0x9jx8";
+ vendorSha256 = "17nykcx47h1q55msh43mmf092y5cigarz5486yp6sqp79p6lbjk3";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lsd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lsd/default.nix
index db8c40b6ffeb..2acd5a789ab7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lsd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lsd/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, nixosTests
, fetchFromGitHub
, rustPlatform
, installShellFiles
@@ -22,10 +23,16 @@ rustPlatform.buildRustPackage rec {
installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}}
'';
+ checkFlags = stdenv.lib.optionals stdenv.isDarwin [
+ "--skip meta::filetype::test::test_socket_type"
+ ];
+
+ passthru.tests = { inherit (nixosTests) lsd; };
+
meta = with stdenv.lib; {
homepage = "https://github.com/Peltoche/lsd";
description = "The next gen ls command";
license = licenses.asl20;
- maintainers = with maintainers; [ filalex77 marsam zowoq ];
+ maintainers = with maintainers; [ Br1ght0ne marsam zowoq ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
index d86f824b87fa..4007a3f77388 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
@@ -3,12 +3,12 @@
} :
stdenv.mkDerivation rec {
- version = "20200505";
+ version = "20200929";
pname = "mbuffer";
src = fetchurl {
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
- sha256 = "02qzy3appah0llg6aa71isl2a5nc93bkzy5r4d682lcy2j1n216c";
+ sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk";
};
buildInputs = [ openssl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
index c33aa074404f..dc29aad2a549 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchzip
-, utillinux
+, util-linux
, jq
, mtools
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- utillinux
+ util-linux
jq
mtools
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix
index 71d20c015d0e..3e3c62fd0930 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix
@@ -8,27 +8,20 @@
rustPlatform.buildRustPackage rec {
pname = "miniserve";
- version = "0.10.0";
+ version = "0.10.3";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
- sha256 = "01nsviw5nc5lb6z3j2yiymiwhiq719nwqpvqbyb5p65s98sph7yh";
+ sha256 = "17m0h0ib7fl0kijagcwdcnvrdcb6z3knix9dl17abg5ivbvkwz8q";
};
- cargoSha256 = "098p4645air5402shqignc57zdm6755shahhby17nqv1s27gfinc";
-
- RUSTC_BOOTSTRAP = 1;
+ cargoSha256 = "0ddc8b9wph4r1qcy24p8yiaq9s2knii0d7dh0w0qnzrn6cmm17dg";
nativeBuildInputs = [ pkg-config zlib ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
- # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master
- preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- unset SDKROOT
- '';
-
meta = with stdenv.lib; {
description = "For when you really just want to serve some files over HTTP right now!";
homepage = "https://github.com/svenstaro/miniserve";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mmv-go/default.nix
new file mode 100644
index 000000000000..d05614d579ab
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mmv-go/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "mmv-go";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "itchyny";
+ repo = "mmv";
+ rev = "v${version}";
+ sha256 = "0kpf6abzhsikm7vyk5735p8sfjhsh7klla9qnmc43mgh0560f020";
+ };
+
+ vendorSha256 = "1nnfi5zad7nlp44mj0fdg09q8pm093di7rr7pknl9whqghv36dfi";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/itchyny/mmv";
+ description = "Rename multiple files using your $EDITOR";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zowoq ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
index ec6be6eba28b..28a1339e9a37 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, dpkg
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
+, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
let
- version = "1.22.1";
+ version = "1.23.0";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -19,9 +19,9 @@ let
freetype
glib
gnome2.GConf
- gnome2.gdk_pixbuf
- gnome3.gtk
- gnome2.pango
+ gdk-pixbuf
+ gtk3
+ pango
libnotify
libsecret
libuuid
@@ -49,7 +49,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
- sha256 = "1wbjj2w4dii644lprvmwnlval53yqh4y0f58cad657jjw8101rd9";
+ sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
inherit src;
- buildInputs = [ dpkg wrapGAppsHook gnome3.gtk ];
+ buildInputs = [ dpkg wrapGAppsHook gtk3 ];
dontUnpack = true;
buildCommand = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix
index c1dbfa0aa49a..71a12c887968 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix
@@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
pname = "mons";
- version = "20200107";
+ version = "20200320";
src = fetchFromGitHub {
owner = "Ventto";
repo = pname;
- rev = "0c9e1a1dddff23a0525ed8e4ec9af8f9dd8cad4c";
- sha256 = "02c41mw3g1mgl91hhpz1n45iaqk9s7mdk1ixm8yv6sv17hy8rr4w";
+ rev = "375bbba3aa700c8b3b33645a7fb70605c8b0ff0c";
+ sha256 = "19r5y721yrxhd9jp99s29jjvm0p87vl6xfjlcj38bljq903f21cl";
fetchSubmodules = true;
};
- # PR: https://github.com/Ventto/mons/pull/36
- preConfigure = ''sed -i 's/usr\///' Makefile'';
-
nativeBuildInputs = [ help2man ];
- makeFlags = [ "DESTDIR=$(out)" ];
+ makeFlags = [
+ "DESTDIR=$(out)"
+ "PREFIX="
+ ];
meta = with lib; {
description = "POSIX Shell script to quickly manage 2-monitors display";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mstflint/default.nix
index 20d7110944d8..be3993d81ecf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mstflint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mstflint/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
dontDisableStatic = true; # the build fails without this. should probably be reported upstream
meta = with stdenv.lib; {
+ description = "Open source version of Mellanox Firmware Tools (MFT)";
homepage = "https://github.com/Mellanox/mstflint";
license = with licenses; [ gpl2 bsd2 ];
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mutagen/default.nix
index ca75bf34dd13..8d71f75622c7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mutagen/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mutagen/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mutagen";
- version = "0.11.7";
+ version = "0.11.8";
src = fetchFromGitHub {
owner = "mutagen-io";
repo = pname;
rev = "v${version}";
- sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy";
+ sha256 = "17ycd2y7hgwa2yxbin86i6aj67x7xaajwz3mqgdyfvkja5hgbjyr";
};
vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix
index 4473f869a380..4ed1bd51696c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
description = "Cowsay reborn, written in Go";
homepage = "https://github.com/Code-Hex/Neo-cowsay";
license = with licenses; [artistic1 /* or */ gpl3];
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix
index d92f2346563c..11cb0dcf554b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-direnv";
- rev = "${version}";
+ rev = version;
sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M=";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/onefetch/default.nix
index 518ce223ed04..165a49fad038 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/onefetch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/onefetch/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
- version = "2.4.0";
+ version = "2.7.3";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3bERQ480SuvrjyqlBd9wnE4iIJAbN8HODUj0X+Uxrvs=";
+ sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9";
};
- cargoSha256 = "sha256-Bq2ytwbdhYeXIUM4tYSfUamhckraH5w34sAQ96ayJxI=";
+ cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060";
buildInputs = with stdenv;
lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
description = "Git repository summary on your terminal";
homepage = "https://github.com/o2sh/onefetch";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne kloenk ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ostree/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ostree/default.nix
index fd1bfc7f8c79..e2cda521f08f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ostree/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ostree/default.nix
@@ -19,7 +19,7 @@
, automake
, libtool
, fuse
-, utillinuxMinimal
+, util-linuxMinimal
, libselinux
, libsodium
, libarchive
@@ -39,13 +39,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
- version = "2020.5";
+ version = "2020.8";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
- sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb";
+ sha256 = "16v73v63h16ika73kgh2cvgm0v27r2d48m932mbj3xm6s295kapx";
};
patches = [
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
libarchive
bzip2
xz
- utillinuxMinimal # for libmount
+ util-linuxMinimal # for libmount
# for installed tests
testPython
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/page/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/page/default.nix
index c93084a16d7e..b1042d3ae550 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/page/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/page/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "page";
- version = "2.3.4";
+ version = "2.3.5";
src = fetchFromGitHub {
owner = "I60R";
repo = pname;
rev = "v${version}";
- sha256 = "0xcbnl8fbdfdmcbv5d7v830aa3vfhg7nlf768rbrfd5a0970pllh";
+ sha256 = "1pk3iclmwbkg4nvsgarq4qjpzapjhsl7b7z6zw6havp1zmx9h806";
};
nativeBuildInputs = [ installShellFiles ];
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh $completions_dir/_page
'';
- cargoSha256 = "0ckfmqi6jvbvj99vbdp798mmy6gc54254n32br0ri842b04i26qf";
+ cargoSha256 = "0s1iwli5h6qkibi24v80izr38z84zfx1dv71fv06lzq38b6s4nd5";
meta = with lib; {
description = "Use neovim as pager";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix
index e99f2aa12d5f..45439afe3d11 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix
@@ -1,13 +1,21 @@
-{ fetchurl, stdenv, perl, makeWrapper, procps }:
+{ fetchurl, stdenv, perl, makeWrapper, procps, coreutils }:
stdenv.mkDerivation rec {
- name = "parallel-20200822";
+ name = "parallel-20200922";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n";
+ sha256 = "0wj19kwjk0hwm8bk9yfcf3rpr0314lmjy5xxlvvdqnbbc4ml2418";
};
+ patches = [
+ ./fix-max-line-length-allowed.diff
+ ];
+
+ postPatch = ''
+ substituteInPlace src/parallel --subst-var-by coreutils ${coreutils}
+ '';
+
outputs = [ "out" "man" ];
nativeBuildInputs = [ makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff
new file mode 100644
index 000000000000..c6d501ecb22a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff
@@ -0,0 +1,17 @@
+Correct path to coreutils echo to fix parallel --max-line-length-allowed.
+
+Author: Bjørn Forsman
+
+diff --git a/src/parallel b/src/parallel
+index a047fd94..9fc5f671 100755
+--- a/src/parallel
++++ b/src/parallel
+@@ -11580,7 +11580,7 @@ sub is_acceptable_command_line_length($$) {
+ $len += length $Global::parallel_env;
+ }
+ # Force using non-built-in command
+- ::qqx("/bin/echo ".${string}x(($len-length "/bin/echo ")/length $string));
++ ::qqx("@coreutils@/bin/echo ".${string}x(($len-length "@coreutils@/bin/echo ")/length $string));
+ ::debug("init", "$len=$? ");
+ return not $?;
+ }
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix
index 808b0382f321..b00a0836021f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix
@@ -8,8 +8,8 @@
, dosfstools
, e2fsprogs
, perl
-, python2
-, utillinux
+, python3
+, util-linux
, check
, enableStatic ? false
}:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
# Tests were previously failing due to Hydra running builds as uid 0.
# That should hopefully be fixed now.
doCheck = !stdenv.hostPlatform.isMusl; /* translation test */
- checkInputs = [ check dosfstools e2fsprogs perl python2 utillinux ];
+ checkInputs = [ check dosfstools e2fsprogs perl python3 util-linux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/partition-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
index 1b5f7dbdbece..1a779616ab83 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
@@ -1,7 +1,7 @@
{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
, kconfig, kcrash, kinit, kpmcore
-, eject, libatasmart , utillinux, qtbase
+, eject, libatasmart , util-linux, qtbase
}:
let
@@ -20,7 +20,7 @@ in mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ];
# refer to kpmcore for the use of eject
- buildInputs = [ eject libatasmart utillinux ];
+ buildInputs = [ eject libatasmart util-linux ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pastebinit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pastebinit/default.nix
index a3134f57397c..9b4202504a0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pastebinit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pastebinit/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, python3 }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, python3
+}:
stdenv.mkDerivation rec {
version = "1.5";
@@ -9,7 +13,26 @@ stdenv.mkDerivation rec {
sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
};
- buildInputs = [ python3 ];
+ buildInputs = [
+ (python3.withPackages (p: [ p.distro ]))
+ ];
+
+ patchFlags = [ "-p0" ];
+
+ patches = [
+ # Required to allow pastebinit 1.5 to run on Python 3.8
+ (fetchpatch {
+ name = "use-distro-module.patch";
+ url = "https://bazaar.launchpad.net/~arnouten/pastebinit/python38/diff/264?context=3";
+ sha256 = "1gp5inp4xald65xbb7fc5aqq5s2fhw464niwjjja9anqyp3zhawj";
+ })
+ # Required because pastebin.com now redirects http requests to https
+ (fetchpatch {
+ name = "pastebin-com-https.patch";
+ url = "https://bazaar.launchpad.net/~arnouten/pastebinit/pastebin-com-https/diff/264?context=3";
+ sha256 = "0hxhhfcai0mll8qfyhdl3slmbf34ynb759b648x63274m9nd2kji";
+ })
+ ];
installPhase = ''
mkdir -p $out/bin
@@ -22,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://launchpad.net/pastebinit";
description = "A software that lets you send anything you want directly to a pastebin from the command line";
- maintainers = with maintainers; [ lethalman ];
+ maintainers = with maintainers; [ lethalman raboof ];
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pdd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pdd/default.nix
index f94d2cc27379..37f9e2f4ce5b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pdd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pdd/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "pdd";
- version = "1.4";
+ version = "1.5";
src = fetchFromGitHub {
owner = "jarun";
repo = "pdd";
rev = "v${version}";
- sha256 = "1cirb8mmxxadks7az6a3a4sp8djv45cwa9dx0zrarzfmw0x7xb9g";
+ sha256 = "1ivzcbm888aibiihw03idp38qbl8mywj1lc1x0q787v0pzqfb4ss";
};
format = "other";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pg_flame/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pg_flame/default.nix
index b8345210e599..7625e67e0010 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pg_flame/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pg_flame/default.nix
@@ -19,6 +19,6 @@ buildGoModule rec {
description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output";
homepage = "https://github.com/mgartner/pg_flame";
license = licenses.asl20;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
index a84ad1fadb08..601694ebc37d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgcenter";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchFromGitHub {
owner = "lesovsky";
repo = "pgcenter";
rev = "v${version}";
- sha256 = "03n1gn944z6rz5g643y68hvfxpxp65mip32w1zx43xr60x1vpf2v";
+ sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr";
};
vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
index 600aa3d07d27..ff1b6c01f4f1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgmetrics";
- version = "1.10.0";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "rapidloop";
repo = pname;
rev = "v${version}";
- sha256 = "1256mcac75nlr1c7pzsgqmjq026m6qxh9dlldndvl1s08bk7pxr9";
+ sha256 = "0mhdw985gs9gh44iz78a588nnnapirpnd7s0zh35jyripx8pgw47";
};
vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
index bea73610ddad..520794c56569 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "phoronix-test-suite";
- version = "9.8.0";
+ version = "10.0.1";
src = fetchurl {
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
- sha256 = "05q01cr4a2mmyski50pqna9sgw2jy93fgfpjwkhbkc09na6400sq";
+ sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz";
};
buildInputs = [ php ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix
index 8e1787f29a89..b99aadf9337f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "phraseapp-client";
- version = "1.11.0";
+ version = "1.17.1";
goPackagePath = "github.com/phrase/phraseapp-client";
subPackages = [ "." ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "phrase";
repo = "phraseapp-client";
rev = version;
- sha256 = "0lfx0wv95hgczi74qnkw2cripwgvl53z2gi5i6nyflisy4r7vvkr";
+ sha256 = "0j8fygp9bw68p1736hq7n7qv86rghchxbdm1xibvk5jpgph1nzl7";
};
postInstall = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pipreqs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pipreqs/default.nix
index bbd4125c4b0e..3f27be2c9f94 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pipreqs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pipreqs/default.nix
@@ -1,16 +1,17 @@
-{ lib, python2Packages }:
+{ lib, python3 }:
-# Using python 2 because when packaging with python 3 pipreqs fails to parse python 2 code.
-python2Packages.buildPythonApplication rec {
+with python3.pkgs;
+
+buildPythonApplication rec {
pname = "pipreqs";
version = "0.4.10";
- src = python2Packages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
sha256 = "0fdr3mbxjpmrxr7yfc1sn9kbpcyb0qwafimhhrrqvf989dj1sdcy";
};
- propagatedBuildInputs = with python2Packages; [ yarg docopt ];
+ propagatedBuildInputs = [ yarg docopt ];
# Tests requires network access. Works fine without sandboxing
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pistol/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pistol/default.nix
index dfbe5536bccc..fa3a9d01f312 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pistol/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pistol/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pistol";
- version = "0.1.4";
+ version = "0.1.8";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
- sha256 = "1x9wb0gj5l71xz15ia0i2hrnhcpf457i21w41jzw2ink2fbdxp3b";
+ sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj";
};
- vendorSha256 = "0dg4f9g6895nv3c6d74ijl6hzsyn620ndspbcq7ynvb1z0hsg6iz";
+ vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/plantuml/default.nix
index 8689e6467fb4..b5eba51a5d8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/plantuml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2020.16";
+ version = "1.2020.21";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "0k9dligb0b2kc8rl9k5wp9sh8z1kb8g97v5pfiiwa321lp8y6wpp";
+ sha256 = "0hf2s3k6v57d51k72jjciakdmlgdrdg4aa7z5hchy74gchsp3x17";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
index df0d344afaa9..6df48f0effba 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
COMPLETION_OUT = "out";
postInstall = ''
- install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}"
+ install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/share/bash-completion/completions/${pname}"
install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix
index 7d68ada2c1bc..b4497c4d7c87 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, utillinux, coreutils}:
+{ stdenv, fetchurl, util-linux, coreutils}:
stdenv.mkDerivation rec {
- version = "6.40";
+ version = "6.42";
pname = "profile-sync-daemon";
src = fetchurl {
url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
- sha256 = "1z1n7dqbkk0x9w2pq71nf93wp4hrzin4a0hcvfynj1khf12z369h";
+ sha256 = "1x47ydrwawkic5cgzp0ikd99g1hbpzc2aalq9z630vm13yw2adnp";
};
installPhase = ''
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
# $HOME detection fails (and is unnecessary)
sed -i '/^HOME/d' $out/bin/profile-sync-daemon
substituteInPlace $out/bin/psd-overlay-helper \
- --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \
- --replace "sudo " "/run/wrappers/bin/sudo "
+ --replace "PATH=/usr/bin:/bin" "PATH=${util-linux.bin}/bin:${coreutils}/bin" \
+ --replace "sudo " "/run/wrappers/bin/sudo "
'';
preferLocalBuild = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix
index 4af7a0009af5..a2048132e078 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "3.1.3";
+ version = "3.1.5";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
- sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf";
+ sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix
index 852c46b6d005..acadda5c549b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix
@@ -5,7 +5,7 @@
mkDerivation rec {
pname = "radeon-profile";
- version = "20190903";
+ version = "20200824";
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtcharts libXrandr libdrm ];
@@ -14,7 +14,7 @@ mkDerivation rec {
owner = "marazmista";
repo = "radeon-profile";
rev = version;
- sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5";
+ sha256 = "0z6a9w79s5wiy8cvwcdp5wmgf6702d0wzw95f6176yhp4cwy4cq2";
}) + "/radeon-profile";
preConfigure = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/rmlint/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/rmlint/default.nix
index 936c78b695d1..36da8d0a463b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/rmlint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/rmlint/default.nix
@@ -14,7 +14,7 @@
, python3
, scons
, sphinx
-, utillinux
+, util-linux
, wrapGAppsHook
, withGui ? false }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
};
- CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
+ CFLAGS="-I${stdenv.lib.getDev util-linux}/include";
nativeBuildInputs = [
pkgconfig
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
glib
json-glib
libelf
- utillinux
+ util-linux
] ++ stdenv.lib.optionals withGui [
cairo
gobject-introspection
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/rmtrash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/rmtrash/default.nix
index 073871b0f438..d50079f82c26 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/rmtrash/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/rmtrash/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "rmtrash";
- version = "1.13";
+ version = "1.14";
src = fetchFromGitHub {
owner = "PhrozenByte";
repo = pname;
rev = "v${version}";
- sha256 = "04a9c65wnkq1fj8qhdsdbps88xjbp7rn6p27y25v47kaysvrw01j";
+ sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694";
};
dontConfigure = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix
index 6406b6b20e2c..925dfde13a36 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, buildPackages }:
stdenv.mkDerivation rec {
pname = "rpcsvc-proto";
@@ -6,15 +6,21 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "thkukuk";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9";
};
outputs = [ "out" "man" ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook ];
+ postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ substituteInPlace rpcsvc/Makefile.am \
+ --replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen'
+ '';
+
meta = with stdenv.lib; {
homepage = "https://github.com/thkukuk/rpcsvc-proto";
description = "This package contains rpcsvc proto.x files from glibc, which are missing in libtirpc";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix
index 456798d816f1..abca71febb93 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix
@@ -33,20 +33,20 @@
, json_c
, zchunk
, libmodulemd
-, utillinux
+, util-linux
, sqlite
, cppunit
}:
stdenv.mkDerivation rec {
pname = "rpm-ostree";
- version = "2020.5";
+ version = "2020.8";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
- sha256 = "MLLCmnStvGuSbVBdfOm2Sdzzz7LvPQkgDt9G0CDqCkA=";
+ sha256 = "1iyl6bjkj3drlwds579bh25xcmlwj9lkkbdmcdanq5b3shbmpyhi";
};
nativeBuildInputs = [
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
json_c
zchunk
libmodulemd
- utillinux # for smartcols.pc
+ util-linux # for smartcols.pc
sqlite
cppunit
];
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
- homepage = "https://rpm-ostree.readthedocs.io/en/latest/";
+ homepage = "https://coreos.github.io/rpm-ostree/";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
index bc32489c588e..fee6ae14bbde 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -7,8 +7,8 @@ let
in buildPackage {
pname = pname;
- version = "2.2.2.2";
- sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3";
+ version = "2.2.3.0";
+ sha256 = "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9";
description = "A set of tiny general Unix utilities optimized for simplicity and small size";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/shallot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/shallot/default.nix
index e8ab6168541c..84e241b7a2c9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/shallot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/shallot/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "Shallot allows you to create customized .onion addresses for your hidden service";
+ description = "Allows you to create customized .onion addresses for your hidden service";
license = stdenv.lib.licenses.mit;
homepage = "https://github.com/katmagic/Shallot";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/silicon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/silicon/default.nix
index 7c3d6a4f70a2..56c9541c2e03 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/silicon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/silicon/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "silicon";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "Aloxaf";
repo = "silicon";
rev = "v${version}";
- sha256 = "1ga632c86l30n6wjj8rc3gz43v93mb7kcl9f8vhig16ycgiw8v09";
+ sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908";
};
- cargoSha256 = "0bgm29v9vmd1xcdazg1psrx6hb1z3zfzr1c4iy8j1r28csbmm6kq";
+ cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb";
buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix
index e89cf366136a..996e6b4490e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "skim";
- version = "0.8.2";
+ version = "0.9.3";
- src = fetchFromGitHub {
- owner = "lotabout";
- repo = pname;
- rev = "v${version}";
- sha256 = "0paxrf03rqzahbpr4gnsj62vl09vcxvw248n9wzhjq14dqlwcr9w";
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7";
};
outputs = [ "out" "vim" ];
- cargoSha256 = "0rxxdad60fpwkb4wx5407ihd89wqpf2ldcnp7nsx17xh4brp1l9r";
+ cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys";
postPatch = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix
index dbec2324674b..32263bad4a1d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, cairo, wayland, wayland-protocols
+{ stdenv, fetchFromGitHub, meson, ninja, pkg-config
+, cairo, libxkbcommon, wayland, wayland-protocols
, buildDocs ? true, scdoc
}:
stdenv.mkDerivation rec {
pname = "slurp";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "emersion";
repo = "slurp";
rev = "v${version}";
- sha256 = "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1";
+ sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv";
};
nativeBuildInputs = [
meson
ninja
- pkgconfig
+ pkg-config
] ++ stdenv.lib.optional buildDocs scdoc;
buildInputs = [
cairo
+ libxkbcommon
wayland
wayland-protocols
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/snapper/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/snapper/default.nix
index 576e1d780744..177580c099b6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/snapper/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/snapper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, utillinux, fetchpatch, json_c, nixosTests }:
+, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests }:
stdenv.mkDerivation rec {
pname = "snapper";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
- lvm2 pam python utillinux json_c
+ lvm2 pam python util-linux json_c
];
passthru.tests.snapper = nixosTests.snapper;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix
index 312b402ae66d..3ce3f62a9e2b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
description = "Listen to SomaFM in your terminal via pure bash";
homepage = "https://github.com/rockymadden/somafm-cli";
license = licenses.mit;
+ platforms = platforms.all;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/spigot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/spigot/default.nix
index fbed27a24478..8321d03a48f4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/spigot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/spigot/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "spigot";
- version = "20200101";
+ version = "20200901";
src = fetchgit {
url = "https://git.tartarus.org/simon/spigot.git";
- rev = "b1b0b202b3523b72f0638fb31fd49c47f4abb39c";
- sha256 = "0lh5v42aia1hvhsqzs515q0anrjc6c2s9bjklfaap5gz0cg59wbv";
+ rev = "9910e5bdc203bae6b7bbe1ed4a93f13755c1cae";
+ sha256 = "1az6v9gk0g2k197lr288nmr9jv20bvgc508vn9ic3v7mav7hf5bf";
};
nativeBuildInputs = [ autoreconfHook halibut perl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/starship/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/starship/default.nix
index 3cc56d87c62c..7e318b45a1f2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/starship/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/starship/default.nix
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.45.2";
+ version = "0.47.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "0kxmgx4pnayp3jf6cgmka05x3aymxr79rim5nff6k3cg5zaqrz59";
+ sha256 = "0vdfdwsaqrah0hgvr62qsww7s5znb1rg5kk068qpf06lmyc4gd8w";
};
nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
@@ -31,20 +31,23 @@ rustPlatform.buildRustPackage rec {
done
'';
- cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy";
+ cargoSha256 = "01brsckfa2zy1aqs9vjwrn4w416i8b621bvkhicanz9q56xlnd77";
checkFlags = [
"--skip=directory_in_home"
- "--skip=fish_directory_in_home"
"--skip=home_directory"
- "--skip=truncated_directory_in_home"
"--skip=directory_in_root"
+ "--skip=truncation_symbol_not_truncated_home"
+ "--skip=truncation_symbol_truncated_home"
+ "--skip=folder_with_glide_yaml"
+ "--skip=shows_multiple_tfms"
+ "--skip=shows_pinned_in_project_below_root_with_global_json"
];
meta = with stdenv.lib; {
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
homepage = "https://starship.rs";
license = licenses.isc;
- maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman marsam ];
+ maintainers = with maintainers; [ bbigras davidtwco Br1ght0ne Frostman marsam ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/staruml/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/staruml/default.nix
index 90c3c696526d..d0266cf30e28 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/staruml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/staruml/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A sophisticated software modeler";
- homepage = "http://staruml.io/";
+ homepage = "https://staruml.io/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
index 0c7e0141f932..d06bb8b134db 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip
-, gitMinimal }:
+, gitMinimal, ffmpeg }:
let
@@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
- version = "2.6";
+ version = "2.8";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
- sha256 = "1d969ig4w6irx5822crhpab2f53svpiyf1vfx87irapy309dqy2y";
+ sha256 = "1977xyxi9jfj7qra1sz7c9lk885cadpci66jvbzvnwm6d60m05lb";
};
pythonPaths = [ pycrypto pyyaml requests ];
@@ -33,6 +33,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/svtplay-dl" \
+ --prefix PATH : "${ffmpeg}" \
--prefix PYTHONPATH : "$PYTHONPATH"
'';
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
homepage = "https://github.com/spaam/svtplay-dl";
description = "Command-line tool to download videos from svtplay.se and other sites";
license = licenses.mit;
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.rycee ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix
index 21e6f49df1f5..fdd3c5f628d0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, makeWrapper, fetchurl,
alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
- gnome2, gtk2-x11, nspr, nss,
+ gnome2, pango, gtk2-x11, nspr, nss,
libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
libudev0-shim
@@ -33,7 +33,7 @@
preFixup = let
libPath = lib.makeLibraryPath [
alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
- gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
+ gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXScrnSaver libXtst
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tagref/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tagref/default.nix
new file mode 100644
index 000000000000..64870e07a3d3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tagref/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform }:
+rustPlatform.buildRustPackage rec {
+ pname = "tagref";
+ version = "1.3.3";
+
+ src = fetchFromGitHub {
+ owner = "stepchowfun";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-3R6vhevSld9IjJMsGl5Rwv0ADMjm94NeZxvl8eYHR2Y=";
+ };
+
+ cargoSha256 = "sha256-pLugAT8QlgxawkR2y+LIacRh4nB59qpKLJjxc81CNDY=";
+
+ meta = with lib; {
+ description = "Tagref helps you refer to other locations in your codebase.";
+ homepage = "https://github.com/stepchowfun/tagref";
+ license = licenses.mit;
+ maintainers = [ maintainers.yusdacra ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 8df030eafadb..3eccb4883618 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }:
+{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }:
stdenv.mkDerivation rec {
pname = "thin-provisioning-tools";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tlp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tlp/default.nix
index 5a467dd626da..b39f631f95bf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tlp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tlp/default.nix
@@ -16,7 +16,7 @@
, shellcheck
, smartmontools
, systemd
-, utillinux
+, util-linux
, x86_energy_perf_policy
# RDW only works with NetworkManager, and thus is optional with default off
, enableRDW ? false
@@ -86,9 +86,9 @@
perl
smartmontools
systemd
- utillinux
- x86_energy_perf_policy
+ util-linux
] ++ lib.optional enableRDW networkmanager
+ ++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy
);
in
''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux/default.nix
index 12ea456b9f7e..7fa33ed82f21 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux/default.nix
@@ -13,15 +13,15 @@ let
bashCompletion = fetchFromGitHub {
owner = "imomaliev";
repo = "tmux-bash-completion";
- rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d";
- sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8";
+ rev = "f5d53239f7658f8e8fbaf02535cc369009c436d6";
+ sha256 = "0sq2g3w0h3mkfa6qwqdw93chb5f1hgkz5vdl8yw8mxwdqwhsdprr";
};
in
stdenv.mkDerivation rec {
pname = "tmux";
- version = "3.1b";
+ version = "3.1c";
outputs = [ "out" "man" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
- sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y";
+ sha256 = "1fqgpzfas85dn0sxlvvg6rj488jwgnxs8d3gqcm8lgs211m9qhcf";
};
nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://tmux.github.io/";
+ homepage = "https://tmux.github.io/";
description = "Terminal multiplexer";
longDescription =
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix
index e631aa9d342b..5ed63d799793 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "tmuxinator";
- version = "2.0.1";
- source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2";
+ version = "2.0.2";
+ source.sha256 = "0wwrgx1syi3zrwn52pblh7qivyxp3cvq0rywp6n0s2bkk0xz903z";
erubis = buildRubyGem rec {
inherit ruby;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxp/default.nix
index a118195d4706..cc910c8b41c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
buildPythonApplication rec {
pname = "tmuxp";
- version = "1.5.6";
+ version = "1.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "c305fc45bbf1093561e03cdcd37b2ab1f2efb9e208e74b2dc294cf414859bd8a";
+ sha256 = "4bc52d6683235307c92ddbb164c84e3e892ee2d00afa16ed89eca0fa7f85029e";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix
index b7b38766db38..04a11a922041 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "5.7.0";
+ version = "6.0.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "0nxqi2rykfxhvn8jzprklsc47iilxp1pmm2f17ikfyf5dgi69whb";
+ sha256 = "1bpq4zki98vw793rvrk9qwgh62f1qwzh0cm4a3h0bif43kg836n0";
};
- cargoSha256 = "05afmz2n006331hc8yi2mq9kj574xi1iq6gr983jj75ix7n40rgg";
+ cargoSha256 = "1486pfiv4lfzdz3hj5z6s7q8lhzrldffji3fsf10z50sm4fhq73q";
buildInputs = lib.optional stdenv.isDarwin Foundation;
- # TODO: add manpage (topgrade.8) to postInstall on next update
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installManPage topgrade.8
+ '';
meta = with lib; {
description = "Upgrade all the things";
homepage = "https://github.com/r-darwish/topgrade";
license = licenses.gpl3;
- maintainers = with maintainers; [ filalex77 hugoreeves ];
+ maintainers = with maintainers; [ Br1ght0ne hugoreeves ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/toybox/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/toybox/default.nix
index 23fdc2f7135c..9b38db5a7273 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/toybox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/toybox/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "toybox";
- version = "0.8.3";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "landley";
repo = pname;
rev = version;
- sha256 = "0cb1n0skanwwkwgzlswwhvfb4iji1bw9iqskmczlhakpw3j1yaqa";
+ sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv";
};
buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ];
@@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
homepage = "https://landley.net/toybox/";
license = licenses.bsd0;
platforms = with platforms; linux ++ darwin ++ freebsd;
+ # https://github.com/NixOS/nixpkgs/issues/101229
+ broken = stdenv.isDarwin;
maintainers = with maintainers; [ hhm ];
priority = 10;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
index 141cceff24d3..fce992acd31d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
@@ -1,37 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3Packages, substituteAll }:
+{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
- version = "0.17.1.14";
+ version = "0.20.11.23";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
- sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
+ sha256 = "1fjkmpnbpzxniypql68cpwc2rrnih8b34p8pzabrf55f49wcmcph";
};
- patches = [
- (substituteAll {
- src = ./nix-paths.patch;
- df = "${coreutils}/bin/df";
- libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";
- in "${stdenv.cc.libc}/lib/libc${ext}";
- })
-
- # Fix build on Python 3.6.
- (fetchpatch {
- url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
- sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp";
- })
-
- # Fix listing trashed files over mount points, see https://github.com/andreafrancia/trash-cli/issues/95
- (fetchpatch {
- url = "https://github.com/andreafrancia/trash-cli/commit/436dfddb4c2932ba3ff696e4732750b7bdc58461.patch";
- sha256 = "02pkcz7nj67jbnqpw1943nrv95m8xyjvab4j62fa64r73fagm8m4";
- })
- ];
+ propagatedBuildInputs = [ python3Packages.psutil ];
checkInputs = with python3Packages; [
nose
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tydra/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tydra/default.nix
index c6d7c86c7efd..c19f808397af 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tydra/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tydra/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
description = "Shortcut menu-based task runner, inspired by Emacs Hydra";
homepage = "https://github.com/Mange/tydra";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ugtrain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ugtrain/default.nix
new file mode 100644
index 000000000000..0645645ae2bf
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ugtrain/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, scanmem
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.4.1";
+ pname = "ugtrain";
+
+ src = fetchFromGitHub {
+ owner = "ugtrain";
+ repo = "ugtrain";
+ rev = "v${version}";
+ sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config scanmem ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/ugtrain/ugtrain";
+ description = "The Universal Elite Game Trainer for CLI (Linux game trainer research project)";
+ maintainers = with maintainers; [ mtrsk ];
+ platforms = platforms.linux;
+ license = licenses.gpl3Only;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/up/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/up/default.nix
index b3d275d3081d..47c504cd1a71 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/up/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/up/default.nix
@@ -2,18 +2,16 @@
buildGoModule rec {
pname = "up";
- version = "0.3.2";
-
- patches = [ ./gomod.patch ];
+ version = "0.4";
src = fetchFromGitHub {
owner = "akavel";
repo = "up";
rev = "v${version}";
- sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if";
+ sha256 = "1j8fi14fiwjscfzdfjqxgavjadwvcm5mqr8fb7hx3jmxs4kl58bp";
};
- vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx";
+ vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/up/gomod.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/up/gomod.patch
deleted file mode 100644
index f894f14d21f1..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/up/gomod.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/go.mod b/go.mod
-index ecbfe90..56a1409 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,11 +1,14 @@
- module github.com/akavel/up
-
-+go 1.14
-+
- require (
-- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635
-+ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect
- github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2
-- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856
-+ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect
- github.com/mattn/go-isatty v0.0.3
-- github.com/mattn/go-runewidth v0.0.2
-+ github.com/mattn/go-runewidth v0.0.2 // indirect
- github.com/spf13/pflag v1.0.3
-- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38
-+ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
-+ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect
- )
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/urjtag/default.nix
index 2056fb9d0a5a..f058f2cb8dde 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/urjtag/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/urjtag/default.nix
@@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
-, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline
+, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline
, python3
, svfSupport ? true
, bsdlSupport ? true
@@ -7,19 +7,18 @@
, jedecSupport ? true
}:
-stdenv.mkDerivation {
- version = "0.10";
+stdenv.mkDerivation rec {
+ version = "2019.12";
pname = "urjtag";
- src = fetchsvn {
- url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
- rev = "2051";
- sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f";
+ src = fetchurl {
+ url = "https://downloads.sourceforge.net/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz";
+ sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext autoconf automake libtool bison flex which
- subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ];
+ subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ];
configureFlags = [
(stdenv.lib.enableFeature svfSupport "svf")
@@ -28,8 +27,6 @@ stdenv.mkDerivation {
(stdenv.lib.enableFeature jedecSupport "jedec-exp")
];
- preConfigure = "./autogen.sh";
-
meta = {
description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
homepage = "http://urjtag.org/";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/vector/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/vector/default.nix
index 37595702b686..d7b141153f46 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/vector/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/vector/default.nix
@@ -4,9 +4,13 @@
, tzdata
, features ?
- (if stdenv.isAarch64
+ ((if stdenv.isAarch64
then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
+ ++
+ (lib.optional stdenv.targetPlatform.isUnix "unix")
+ ++
+ [ "sinks" "sources" "transforms" ])
, coreutils
, CoreServices
}:
@@ -38,15 +42,26 @@ rustPlatform.buildRustPackage rec {
# vector.dev during the checkPhase, which obviously isn't going to work.
# these tests in the DNS module are trivial though, so stubbing them out is
# fine IMO.
+ #
+ # the geoip transform yields maxmindb.so which contains references to rustc.
+ # neither figured out why the shared object is included in the output
+ # (it doesn't seem to be a runtime dependencies of the geoip transform),
+ # nor do I know why it depends on rustc.
+ # However, in order for the closure size to stay at a reasonable level,
+ # transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.
patchPhase = ''
substituteInPlace ./src/dns.rs \
--replace "#[test]" ""
+
+ ${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
+ substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
+ ''}
'';
meta = with stdenv.lib; {
description = "A high-performance logs, metrics, and events router";
homepage = "https://github.com/timberio/vector";
license = with licenses; [ asl20 ];
- maintainers = with maintainers; [ thoughtpolice ];
+ maintainers = with maintainers; [ thoughtpolice happysalada ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/vimv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/vimv/default.nix
new file mode 100644
index 000000000000..023d3384ed68
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/vimv/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, bash, fetchFromGitHub }:
+stdenv.mkDerivation {
+ pname = "vimv";
+ version = "unstable-2019-10-31";
+ src = fetchFromGitHub {
+ owner = "thameera";
+ repo = "vimv";
+ rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8";
+ sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd";
+ };
+ phases = [ "installPhase" ];
+ installPhase = ''
+ install -d $out/bin
+ install $src/vimv $out/bin/vimv
+ patchShebangs $out/bin/vimv
+ '';
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/thameera/vimv";
+ description = "Batch-rename files using Vim";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.kmein ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix
index 58fc991beb3e..7c8a723f41f0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix
@@ -6,12 +6,12 @@
}:
buildPythonApplication rec {
- version = "0.3.1";
+ version = "0.3.3";
pname = "vimwiki-markdown";
src = fetchPypi {
inherit version pname;
- sha256 = "50032c62947422c8afbc1733e50526818df7d885d1cc41a27ff65fc26cd3c1c5";
+ sha256 = "ee4ef08f7e4df27f67ffebb5fa413a7cf4fad967a248c1c75d48b00122a5b945";
};
propagatedBuildInputs= [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/vivid/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/vivid/default.nix
index 707462879863..35a1d5d2d12a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/vivid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/vivid/default.nix
@@ -13,11 +13,6 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "10xddr5cccc5cmhn4kwi27h3krmgapd7bqcp4rhjlbhdhsw7qxkx";
- # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master
- preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- unset SDKROOT
- '';
-
meta = with stdenv.lib; {
description = "A generator for LS_COLORS with support for multiple color themes";
homepage = "https://github.com/sharkdp/vivid";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/vix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/vix/default.nix
new file mode 100644
index 000000000000..7e93cd5d67ec
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/vix/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, SDL }:
+
+stdenv.mkDerivation {
+ pname = "vix";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "BatchDrake";
+ repo = "vix";
+ rev = "824b6755157a0f7430a0be0af454487d1492204d";
+ sha256 = "1y0a2sajkrsg36px21b8lgx1irf0pyj7hccyd6k806bm4zhgxw1z";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ buildInputs = [ SDL ];
+
+ meta = with stdenv.lib; {
+ description = "Visual Interface heXadecimal dump ";
+ homepage = "http://actinid.org/vix/";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix
index aa631d441148..5ff2800496a7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchurl, extra-cmake-modules, qtx11extras,
+{ lib, mkDerivation, fetchurl, fetchpatch, extra-cmake-modules, qtx11extras,
plasma-workspace, libwacom, xf86_input_wacom
}:
@@ -9,6 +9,12 @@ mkDerivation rec {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368";
};
+ patches = [
+ (fetchpatch {
+ url = "https://invent.kde.org/system/wacomtablet/commit/4f73ff02b3efd5e8728b18fcf1067eca166704ee.patch";
+ sha256 = "0185gbh1vywfz8a3wnvncmzdk0dd189my4bzimkbh85rlrqq2nf8";
+ })
+ ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
@@ -22,7 +28,7 @@ mkDerivation rec {
This module implements a GUI for the Wacom Linux Drivers and extends it
with profile support to handle different button / pen layouts per profile.
'';
- homepage = "https://cgit.kde.org/wacomtablet.git/about/";
+ homepage = "https://invent.kde.org/system/wacomtablet";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.Thra11 ];
platforms = lib.platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/websocat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/websocat/default.nix
index c936b1599638..f2bcfd8b7813 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/websocat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/websocat/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
description = "Command-line client for WebSockets (like netcat/socat)";
homepage = "https://github.com/vi/websocat";
license = licenses.mit;
- maintainers = with maintainers; [ thoughtpolice filalex77 ];
+ maintainers = with maintainers; [ thoughtpolice Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/woeusb/default.nix
index 4c235b4866f2..fddb98d8dc38 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/woeusb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/woeusb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
-, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget
+, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wget
, wxGTK30 }:
stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# should be patched with a less useless default PATH, but for now
# we add everything we need manually.
wrapProgram "$out/bin/woeusb" \
- --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}'
+ --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}'
'';
doInstallCheck = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/woof/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/woof/default.nix
index e00634dd53e1..e89ef8dab0e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/woof/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/woof/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Web Offer One File - Command-line utility to easily exchange files over a local network";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ lschuermann ];
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wootility/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/wootility/default.nix
index cc192951ca84..a79f414a3591 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/wootility/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/wootility/default.nix
@@ -35,7 +35,7 @@ appimageTools.wrapType2 rec {
meta = with lib; {
homepage = "https://wooting.io/wootility";
- description = "Wootility is customization and management software for Wooting keyboards";
+ description = "A customization and management software for Wooting keyboards";
platforms = [ "x86_64-linux" ];
license = "unknown";
maintainers = with maintainers; [ davidtwco ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wsl-open/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/wsl-open/default.nix
new file mode 100644
index 000000000000..ddd3904a1057
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/wsl-open/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, installShellFiles }:
+
+stdenv.mkDerivation rec {
+ pname = "wsl-open";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ owner = "4U6U57";
+ repo = "wsl-open";
+ rev = "v${version}";
+ sha256 = "1mwak846zh47p3pp4q5f54cw8d9qk61zn43q81j2pkcm35mv9lzg";
+ };
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ installPhase = ''
+ install -m0755 -D wsl-open.sh $out/bin/wsl-open
+ installManPage wsl-open.1
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Open files with xdg-open from Windows Subsystem for Linux (WSL) in Windows applications";
+ homepage = "https://gitlab.com/4U6U57/wsl-open";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/xfstests/default.nix
index 5f6d2bb1278d..3bc01048c1ed 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/xfstests/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/xfstests/default.nix
@@ -1,7 +1,7 @@
{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
, fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
, libuuid, libxfs, lvm2, openssl, perl, procps, quota
-, time, utillinux, which, writeScript, xfsprogs, runtimeShell }:
+, time, util-linux, which, writeScript, xfsprogs, runtimeShell }:
stdenv.mkDerivation {
name = "xfstests-2019-09-08";
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils
libcap lvm2 perl procps killall quota
- utillinux which xfsprogs]}:$PATH
+ util-linux which xfsprogs]}:$PATH
exec ./check "$@"
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix
index 04c1902f3a0b..02a2d67de53d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, xorgserver, getopt
-, xauth, utillinux, which, fontsConf, gawk, coreutils }:
+, xauth, util-linux, which, fontsConf, gawk, coreutils }:
let
xvfb_run = fetchurl {
name = "xvfb-run";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin/xvfb-run
wrapProgram $out/bin/xvfb-run \
--set FONTCONFIG_FILE "${fontsConf}" \
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
index 00624a482c8e..40bf214f4630 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
@@ -1,29 +1,29 @@
-{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg_3 }:
+{ stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "yle-dl";
- version = "2.31";
+ version = "20201022";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
- sha256 = "0k93p9csyjm0w33diwl5s22kzs3g78jl3n9k8nxxpqrybfjl912f";
+ sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp";
};
- propagatedBuildInputs = with pythonPackages; [
- lxml pyamf pycrypto requests future ffmpeg_3 setuptools
+ propagatedBuildInputs = with python3Packages; [
+ attrs ConfigArgParse ffmpeg_3 future lxml requests
];
- pythonPath = [ rtmpdump php ];
+ pythonPath = [ rtmpdump php wget ];
doCheck = false; # tests require network access
- checkInputs = with pythonPackages; [ pytest pytestrunner ];
+ checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ];
meta = with stdenv.lib; {
description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
homepage = "https://aajanki.github.io/yle-dl/";
- license = licenses.gpl3;
- maintainers = [ maintainers.dezgeg ];
- platforms = platforms.linux;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
+ platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/you-get/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/you-get/default.nix
index 8314dc2c9a35..053d2ae59d2a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/you-get/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
- version = "0.4.1456";
+ version = "0.4.1488";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "14miw5gmj571584rmdzjxf88icmb1psrsfbwpabn8blz8l5aq6bv";
+ sha256 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
index e3b64939a0a4..b037a982edcf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.09.20";
+ version = "2020.12.05";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc";
+ sha256 = "065s45l8qz7wlkaxw9bj20gq9647zpwdj9vc6chhqjscl63z1aqm";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/zoxide/default.nix
index 3e4cbfd84334..c5ca2965e9dd 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/zoxide/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/zoxide/default.nix
@@ -1,11 +1,20 @@
{ lib
+, stdenv
, fetchFromGitHub
, rustPlatform
, withFzf ? true
, fzf
+
+ # checkInputs
+, fish
+, powershell
+, shellcheck
+, shfmt
+, xonsh
+, zsh
}:
let
- version = "0.4.3";
+ version = "0.5.0";
in
rustPlatform.buildRustPackage {
pname = "zoxide";
@@ -15,15 +24,32 @@ rustPlatform.buildRustPackage {
owner = "ajeetdsouza";
repo = "zoxide";
rev = "v${version}";
- sha256 = "1ghdal6pqkp56rqawhj26ch1x4cvnjj032xz3626aiddqgn134zj";
+ sha256 = "143lh94mw31pm9q7ib63h2k842g3h222mdabhf25hpb19lka2w5y";
};
+ # tests are broken on darwin
+ doCheck = !stdenv.isDarwin;
+
+ # fish needs a writable HOME for whatever reason
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ checkInputs = [
+ fish
+ powershell
+ shellcheck
+ shfmt
+ xonsh
+ zsh
+ ];
+
postPatch = lib.optionalString withFzf ''
substituteInPlace src/fzf.rs \
--replace '"fzf"' '"${fzf}/bin/fzf"'
'';
- cargoSha256 = "0klnjmda77bq9i9f0rz48jzaw4rcf7hafcjjpb0i570d7hlxnwsr";
+ cargoSha256 = "05mp101yk1zkjj1gwbkldizq6f9f8089gqgvq42c4ngq88pc7v9a";
meta = with lib; {
description = "A fast cd command that learns your habits";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix
index c44837b877d1..f4295443f69e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
cat <<SCRIPT > $out/bin/zsh-autoenv-share
#!${runtimeShell}
- # Run this script to find the fzf shared folder where all the shell
+ # Run this script to find the zsh-autoenv shared folder where all the shell
# integration scripts are living.
echo $out/share/zsh-autoenv
SCRIPT
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix
index bf0e8ba33162..fbdd23f754ef 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Tunnelling for application that don't speak IPv6";
homepage = "https://github.com/wojtekka/6tunnel";
license = licenses.gpl2;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix
index e306e49c8498..055fc5267c37 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix
index 61746ebfcc5f..6277c158f249 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
- version = "3.10.3";
+ version = "3.10.5";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
- sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc";
+ sha256 = "0zxjgg9z45cs116wa643dfh12skz8zydb85vn03ss150hdlgspda";
};
- vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w";
+ vendorSha256 = "1l7y2h7kpvj6lh3dki5sw0ziyzwihfy0scdk8jqf108ca23g8zv8";
outputs = [ "out" "wordlists" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix
index 5ede0db598c9..614584a5f565 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
description = "A lightweight, multi-protocol, multi-source, command-line download utility";
license = licenses.gpl2Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ filalex77 koral ];
+ maintainers = with maintainers; [ Br1ght0ne koral ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix
index 5cd8e41f70c8..baa498042f94 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "axel";
- version = "2.17.9";
+ version = "2.17.10";
src = fetchFromGitHub {
owner = "axel-download-accelerator";
repo = pname;
rev = "v${version}";
- sha256 = "1bhzgvvqcwa5bd487400hg1nycvw8qqxzbzvq5ywyz5d9j12hdrd";
+ sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp";
};
nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix
new file mode 100644
index 000000000000..596b30d03e89
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "bacnet-stack";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "bacnet-stack";
+ repo = "bacnet-stack";
+ rev = "bacnet-stack-${version}";
+ sha256 = "078p7qsy9v6fl7pzwgcr72pgjqxfxmfxyqajih2zqlb5g5sf88vh";
+ };
+
+ hardeningDisable = [ "all" ];
+
+ buildPhase = ''
+ make BUILD=debug BACNET_PORT=linux BACDL_DEFINE=-DBACDL_BIP=1 BACNET_DEFINES=" -DPRINT_ENABLED=1 -DBACFILE -DBACAPP_ALL -DBACNET_PROPERTY_LISTS"
+ '';
+
+ installPhase = ''
+ mkdir $out
+ cp -r bin $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "BACnet open source protocol stack for embedded systems, Linux, and Windows";
+ platforms = platforms.linux;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ WhittlesJr ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix
index 58bb1e3e3904..46739742bd44 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bandwhich";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "imsnif";
repo = pname;
rev = version;
- sha256 = "0963yfbf88hb5fvyckhs1vfvib5skkj9n17qibpv5vsdlynbaa96";
+ sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n";
};
- cargoSha256 = "0xp45kb0z7wiq6vnws4q7khbzslywh24sb43ssr39l1rajf7w64r";
+ cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://github.com/imsnif/bandwhich";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ma27 ];
+ maintainers = with maintainers; [ Br1ght0ne ma27 ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix
index a79cbdc8bbd8..724d25d49f93 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, python, gyp, utillinux }:
+{ stdenv, lib, fetchgit, python, gyp, util-linux }:
stdenv.mkDerivation {
pname = "bud";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [
python gyp
- ] ++ lib.optional stdenv.isLinux utillinux;
+ ] ++ lib.optional stdenv.isLinux util-linux;
buildPhase = ''
python ./gyp_bud -f make
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
index b8f2d70848d5..ed8a6088db07 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
@@ -39,7 +39,7 @@ in rustPlatform.buildRustPackage rec {
'';
meta = with stdenv.lib; {
- description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager";
+ description = "A WebExtension for Buku, a command-line bookmark manager";
homepage = "https://github.com/SamHH/bukubrow-host";
license = licenses.gpl3;
maintainers = with maintainers; [ infinisil ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
deleted file mode 100644
index 2fa3baca7221..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0cf506c92967c84f9ed83ba9e1be946a7fda6425 Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Mon, 2 Dec 2019 12:47:13 +0100
-Subject: sys_linux: allow clock_adjtime in seccomp filter
-
-The adjtimex() function in glibc was switched to the clock_adjtime
-system call.
-
-diff --git a/sys_linux.c b/sys_linux.c
-index 63eb8f1..fcf89c2 100644
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -478,8 +478,8 @@ SYS_Linux_EnableSystemCallFilter(int level)
- {
- const int syscalls[] = {
- /* Clock */
-- SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday),
-- SCMP_SYS(settimeofday), SCMP_SYS(time),
-+ SCMP_SYS(adjtimex), SCMP_SYS(clock_adjtime), SCMP_SYS(clock_gettime),
-+ SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), SCMP_SYS(time),
- /* Process */
- SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid),
- SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
---
-cgit v0.10.2
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix
index 6c8254c797b7..374036d11a44 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix
@@ -1,27 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr
-, libseccomp, pps-tools }:
+, libseccomp, pps-tools, gnutls }:
assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
pname = "chrony";
- version = "3.5.1";
+ version = "4.0";
src = fetchurl {
url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
- sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v";
+ sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy";
};
- patches = [
- ./allow-clock_adjtime.patch
- ./fix-seccomp-build.patch
- ];
-
postPatch = ''
patchShebangs test
'';
- buildInputs = [ readline texinfo nss nspr ]
+ buildInputs = [ readline texinfo nss nspr gnutls ]
++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch
deleted file mode 100644
index 6888e7efeb72..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys_linux.c b/sys_linux.c
-index 898dc7a7f75..fcd334ecf03 100644
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -503,7 +503,7 @@ SYS_Linux_EnableSystemCallFilter(int level)
- SCMP_SYS(socketcall),
- /* General I/O */
- SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe),
-- SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read),
-+ SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(pselect6), SCMP_SYS(read),
- SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write),
- /* Miscellaneous */
- SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname),
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix
index 13388d337791..28a418c27f28 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }:
+{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }:
stdenv.mkDerivation rec {
pname = "cjdns";
- version = "20.7";
+ version = "21";
src = fetchFromGitHub {
owner = "cjdelisle";
repo = "cjdns";
rev = "cjdns-v${version}";
- sha256 = "09gpqpzc00pp3cj7lyq9876p7is4bcndpdi5knqbv824vk4bj3k0";
+ sha256 = "1s9d8yrdrj2gviig05jhr0fnzazb88lih0amxfk0av786rvh7ymj";
};
buildInputs = [ which python27 nodejs ] ++
# for flock
- stdenv.lib.optional stdenv.isLinux utillinux;
+ stdenv.lib.optional stdenv.isLinux util-linux;
CFLAGS = "-O2 -Wno-error=stringop-truncation";
buildPhase =
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix
index c777f487b3d4..00073686238d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "cksfv-1.3.14";
+ name = "cksfv-1.3.15";
src = fetchurl {
url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2";
- sha256 = "0lnz0z57phl6s52hjvlryn96xrlph9b0h89ahhv027sa79pj8g4g";
+ sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix
index 4447ab0f048e..502a4b4bbd42 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clash";
- version = "1.1.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "Dreamacro";
repo = pname;
rev = "v${version}";
- sha256 = "0cbbih035h40hhl7ykmyh9q9nzdqq1p8hmvzd4358cigz1gjc3j2";
+ sha256 = "1y0im2xs6pibbfri2k7g9jqbzm90jd9a5lghrzasxmkzjfcimrnf";
};
- vendorSha256 = "0s7mhbjfpfmzqf48d7k0d416m39x6fh5ds4q3xnvhcfx5kmdymq6";
+ vendorSha256 = "0lljm594xgcv7ylz7qn170r9526k9d1lh77m9f9zcnhdd2qw4rw1";
doCheck = false;
@@ -24,6 +24,6 @@ buildGoModule rec {
description = "A rule-based tunnel in Go";
homepage = "https://github.com/Dreamacro/clash";
license = licenses.gpl3;
- maintainers = with maintainers; [ contrun filalex77 ];
+ maintainers = with maintainers; [ contrun Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix
index 4ab266e54959..38331163c122 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
meta = with stdenv.lib; {
homepage = "https://github.com/mdlayher/corerad";
- description = "CoreRAD extensible and observable IPv6 NDP RA daemon";
+ description = "Extensible and observable IPv6 NDP RA daemon";
license = licenses.asl20;
maintainers = with maintainers; [ mdlayher ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix
index 97da6497c6b6..08eb3d69128b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, callPackage}:
buildGoModule rec {
pname = "croc";
- version = "8.5.0";
+ version = "8.6.6";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "0c8gj4fv5q8zl48lfvw06rxng2scgivb6zls136kxq5f2fb2dyk5";
+ sha256 = "0bd7q3j2i0r3v4liv2xpqlvx4nrixpdhr1yy1c579bls7y4myv61";
};
- vendorSha256 = "0cgvbwxscmqjzva0bp5sqb4hnvk2ww50yqw34iya5lk2db9vn3ha";
+ vendorSha256 = "06hqb5r9p67zh0v5whdsb3rvax6461y2n6jkhjwmn6zzswpgkg7y";
doCheck = false;
subPackages = [ "." ];
+ passthru = {
+ tests = {
+ local-relay = callPackage ./test-local-relay.nix {};
+ };
+ };
meta = with stdenv.lib; {
description =
"Easily and securely send things from one computer to another";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix
new file mode 100644
index 000000000000..bde05d6deb0a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix
@@ -0,0 +1,20 @@
+{ stdenv, croc }:
+
+stdenv.mkDerivation {
+ name = "croc-test-local-relay";
+ meta.timeout = 300;
+ buildCommand = ''
+ HOME=$(mktemp -d)
+ # start a local relay
+ ${croc}/bin/croc relay --ports 11111,11112 &
+ # start sender in background
+ MSG="See you later, alligator!"
+ ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
+ # wait for things to settle
+ sleep 1
+ # receive
+ MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
+ # compare
+ [ "$MSG" = "$MSG2" ] && touch $out
+ '';
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix
index 8e151bc2ead0..c466a48434f2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix
@@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
pname = "curl";
- version = "7.72.0";
+ version = "7.73.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
];
- sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd";
+ sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE=";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix
index f8147cb16115..9ae9644eb940 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix
@@ -2,21 +2,21 @@
buildGoModule rec {
pname = "curlie";
- version = "1.5.4";
+ version = "1.6.0";
src= fetchFromGitHub {
owner = "rs";
repo = pname;
rev = "v${version}";
- sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx";
+ sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8=";
};
- vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm";
+ vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";
doCheck = false;
meta = with lib; {
- description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance";
+ description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance";
homepage = "https://curlie.io/";
maintainers = with maintainers; [ ma27 ];
license = licenses.mit;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix
index 797791e1c0b9..ca9e7b033c51 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl libxml2 boost libuuid ];
- # using the url below since the 0.7.6 release did carry a broken CMake file,
- # supposedly fixed in the next release
- # https://github.com/cern-fts/davix/issues/40
+ # using the url below since the github release page states
+ # "please ignore the GitHub-generated tarballs, as they are incomplete"
+ # https://github.com/cern-fts/davix/releases/tag/R_0_7_6
src = fetchurl {
- url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
+ url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
index 8f279ff688af..b2c19e2acf93 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
- version = "0.32.0";
+ version = "0.33.2";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
- sha256 = "14iwwg1iqfxjhpw9p3ddq53l901v9l9n2r60q9q6jls8hfqcgsnj";
+ sha256 = "0x005lgncaf1fzs27fpcpf6dcncb7wia6fka64pmjxdsq7nmh1hh";
};
vendorSha256 = null;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
index b0369ec80bd4..558e0dca9034 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv";
meta = with stdenv.lib; {
- description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
+ description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
homepage = "http://www.mavetju.org/unix/general.php";
license = licenses.bsd2;
maintainers = with maintainers; [ andir ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix
new file mode 100644
index 000000000000..71e065e5d14c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+, Security
+, installShellFiles
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dogdns";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "ogham";
+ repo = "dog";
+ rev = "v${version}";
+ sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
+ };
+
+ nativeBuildInputs = [ installShellFiles ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";
+
+ postInstall = ''
+ installShellCompletion completions/dog.{bash,fish,zsh}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Command-line DNS client";
+ homepage = "https://dns.lookup.dog";
+ license = licenses.eupl12;
+ maintainers = with maintainers; [ bbigras ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix
index 441019103716..7a5ceda96694 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
};
meta = {
- description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display";
+ description = "Watches network traffic, and picks out and displays JPEG and GIF images for display";
homepage = "https://github.com/deiv/driftnet";
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix
index 572dc0d83848..176062ed314b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "drill";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "fcsonline";
repo = pname;
rev = version;
- sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw";
+ sha256 = "07zz0dj0wjwrc1rmayz7s8kpcv03i0ygl4vfwsam72qd4nf6v538";
};
- cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m";
+ cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = [ ]
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
description = "HTTP load testing application inspired by Ansible syntax";
homepage = "https://github.com/fcsonline/drill";
license = licenses.gpl3;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix
index b80eba3f6cac..88217302915e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "dropbear-2020.80";
+ name = "dropbear-2020.81";
src = fetchurl {
url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
- sha256 = "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr";
+ sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8";
};
dontDisableStatic = enableStatic;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix
index 7d8cf97f46d8..db9c608e931b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix
@@ -38,7 +38,7 @@ let
inherit (openssl) name;
paths = with openssl.override { static = true; }; [ out dev ];
};
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
pname = "dsniff";
version = "2.4b1";
# upstream is so old that nearly every distribution packages the beta version.
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
domain = "salsa.debian.org";
owner = "pkg-security-team";
repo = "dsniff";
- rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/")
+ rev = "debian/${version}+debian-29";
sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g";
name = "dsniff.tar.gz";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix
index 90e05e5310bd..4568aec9c5d9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl, runtimeShell }:
let
- version = "3.0.0";
+ version = "3.0.8";
in stdenv.mkDerivation {
pname = "easyrsa";
inherit version;
@@ -10,14 +10,15 @@ in stdenv.mkDerivation {
owner = "OpenVPN";
repo = "easy-rsa";
rev = "v${version}";
- sha256 = "0wbdv3wmqwm5680rpb971l56xiw49adpicqshk3vhfmpvqzl4dbs";
+ sha256 = "05q60s343ydh9j6hzj0840qdcq8fkyz06q68yw4pqgqg4w68rbgs";
};
patches = [ ./fix-paths.patch ];
installPhase = ''
mkdir -p $out/share/easyrsa
- cp -r easyrsa3/{openssl*.cnf,x509-types,vars.example} $out/share/easyrsa
+ cp -r easyrsa3/{*.cnf,x509-types,vars.example} $out/share/easyrsa
+ cp easyrsa3/openssl-easyrsa.cnf $out/share/easyrsa/safessl-easyrsa.cnf
install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa
substituteInPlace $out/bin/easyrsa \
--subst-var out \
@@ -35,7 +36,7 @@ in stdenv.mkDerivation {
description = "Simple shell based CA utility";
homepage = "https://openvpn.net/";
license = licenses.gpl2;
- maintainers = [ maintainers.offline ];
+ maintainers = [ maintainers.offline maintainers.numinit ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch
index 82688fa79460..7891adcb20c7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch
@@ -1,33 +1,49 @@
diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
-index 6fec288..210648a 100755
+index 261336f..7b9a79b 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
-@@ -1003,7 +1003,7 @@ Note: using Easy-RSA configuration from: $vars"
+@@ -1661,7 +1661,7 @@ Note: using Easy-RSA configuration from: $vars"
# Set defaults, preferring existing env-vars if present
- set_var EASYRSA "$PWD"
+ set_var EASYRSA "$prog_dir"
- set_var EASYRSA_OPENSSL openssl
+ set_var EASYRSA_OPENSSL "@openssl@"
- set_var EASYRSA_PKI "$EASYRSA/pki"
+ set_var EASYRSA_PKI "$PWD/pki"
set_var EASYRSA_DN cn_only
set_var EASYRSA_REQ_COUNTRY "US"
-@@ -1030,13 +1030,17 @@ Note: using Easy-RSA configuration from: $vars"
- # Detect openssl config, preferring EASYRSA_PKI over EASYRSA
- if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then
- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-1.0.cnf"
-- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf"
-+ elif [ -f "$EASYRSA/openssl-1.0.cnf" ]; then
-+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf"
-+ else set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-1.0.cnf"
- fi
+@@ -1683,16 +1683,31 @@ Note: using Easy-RSA configuration from: $vars"
+ set_var EASYRSA_TEMP_DIR "$EASYRSA_PKI"
+ set_var EASYRSA_REQ_CN ChangeMe
+ set_var EASYRSA_DIGEST sha256
+- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf"
+- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf"
+ set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM"
++ if [ -f "$EASYRSA_PKI/safessl-easyrsa.conf" ]; then
++ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf"
++ elif [ -f "$EASYRSA/safessl-easyrsa.conf" ]; then
++ set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf"
++ elif [ -f "@out@/share/easyrsa/safessl-easyrsa.cnf" ]; then
++ set_var EASYRSA_SAFE_CONF "@out@/share/easyrsa/safessl-easyrsa.cnf"
++ fi
++
++ if [ -f "$EASYRSA_PKI/openssl-easyrsa.conf" ]; then
++ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf"
++ elif [ -f "$EASYRSA/openssl-easyrsa.conf" ]; then
++ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf"
++ elif [ -f "@out@/share/easyrsa/openssl-easyrsa.cnf" ]; then
++ set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-easyrsa.cnf"
++ fi
++
# Same as above for the x509-types extensions dir
if [ -d "$EASYRSA_PKI/x509-types" ]; then
set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types"
-- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
+- else
+- #TODO: This should be removed. Not really suitable for packaging.
+ elif [ -d "$EASYRSA/x509-types" ]; then
-+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
-+ else set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types"
+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
++ else
++ set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types"
fi
# EASYRSA_ALGO_PARAMS must be set depending on selected algo
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
index 452a9873bece..fdad966c81b6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "eternal-terminal";
- version = "6.0.11";
+ version = "6.0.13";
src = fetchFromGitHub {
owner = "MisterTea";
repo = "EternalTerminal";
rev = "et-v${version}";
- sha256 = "0yjf639ldfaxrw4pbg9avdkhhmcpnx58j3x70zskvgkajny8yqqr";
+ sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix
index 8c9a877b8f1e..864b57a0c383 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix
@@ -1,29 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, bison, pkgconfig
+{ stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig
, libuecc, libsodium, libcap, json_c, openssl }:
stdenv.mkDerivation rec {
pname = "fastd";
- version = "19";
+ version = "21";
src = fetchFromGitHub {
owner = "Neoraider";
repo = "fastd";
rev = "v${version}";
- sha256 = "1h3whjvy2n2cyvbkbg4y1z9vlrn790spzbdhj4glwp93xcykhz5i";
+ sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw";
};
- postPatch = ''
- substituteInPlace src/crypto/cipher/CMakeLists.txt \
- --replace 'add_subdirectory(aes128_ctr)' ""
- '';
-
- nativeBuildInputs = [ pkgconfig bison cmake ];
+ nativeBuildInputs = [ pkgconfig bison meson ninja ];
buildInputs = [ libuecc libsodium libcap json_c openssl ];
- cmakeFlags = [
- "-DENABLE_OPENSSL=true"
- ];
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix
index 2caf18d9a4b0..761e9eb4619b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
- sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx";
+ sha256 = "0g0kw1b18kk9jhvw88hcxc04ccj8k22fdzky7l2dv3r37vndd91w";
};
- cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk";
+ cargoSha256 = "0cmp4w86qnzd2b2w4s3w019857pxysgikkl1g7ldkiylrsm5vlpn";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
description = "The fastest and cross-platform subdomain enumerator";
homepage = "https://github.com/Edu4rdSHL/findomain";
license = licenses.gpl3;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix
index 7ecfb559dcc7..86010f4adb91 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "flannel";
- version = "0.12.0";
+ version = "0.13.0";
rev = "v${version}";
goPackagePath = "github.com/coreos/flannel";
@@ -13,7 +13,7 @@ buildGoPackage rec {
inherit rev;
owner = "coreos";
repo = "flannel";
- sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd";
+ sha256 = "0mmswnaybwpf18h832haapcs5b63wn5w2hax0smm3inldiggsbw8";
};
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix
index 6bc05139f8b2..7ba943e338d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "frp";
- version = "0.34.0";
+ version = "0.34.3";
src = fetchFromGitHub {
owner = "fatedier";
repo = pname;
rev = "v${version}";
- sha256 = "1f0cr7211wkam1204x6gsflhw7gc995lia3jq4v6n3ijfwy5vyvm";
+ sha256 = "1c5337yv7m4ad1mr73a38lbxg6b7sk8pxqkzws01jxrry2jahb35";
};
- vendorSha256 = "1ym4qcqgbbj6pa4cgmxmny7krxwjfl8l02hb3r5jh9qj886fwhdr";
+ vendorSha256 = "0srkvd1kvjabf3r391n6spv5n77r7dw4y982ynqsv5grp5f4zmm1";
doCheck = false;
@@ -27,6 +27,6 @@ buildGoModule rec {
'';
homepage = "https://github.com/fatedier/frp";
license = licenses.asl20;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix
index f739e80be1fe..8d7d2392dfb7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix
@@ -1,12 +1,12 @@
-{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
+{ stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, makeWrapper }:
let
-version = "2.4";
+version = "2.5";
apk = stdenv.mkDerivation {
pname = "gnirehtet.apk";
inherit version;
src = fetchzip {
url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
- sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g";
+ sha256 = "1db0gkg5z8lighhkyqfsr9jiacrck89zmfnmp74vj865hhxgjzgq";
};
installPhase = ''
mkdir $out
@@ -22,19 +22,18 @@ rustPlatform.buildRustPackage {
owner = "Genymobile";
repo = "gnirehtet";
rev = "v${version}";
- sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl";
+ sha256 = "0wk6n082gnj9xk46n542h1012h8gyhldca23bs7vl73g0534g878";
};
sourceRoot = "source/relay-rust";
- cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad";
+ cargoSha256 = "0i7f52r697gjw30m8k60hd3y6wsn5lpz419r083a1rhpbinzd26q";
- patchFlags = [ "-p2" ];
- patches = [
- (substituteAll {
- src = ./paths.patch;
- adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb";
- inherit apk;
- })
- ];
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram $out/bin/gnirehtet \
+ --set GNIREHTET_APK ${apk}/gnirehtet.apk \
+ --set ADB ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb
+ '';
meta = with stdenv.lib; {
description = "Reverse tethering over adb for Android";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch
deleted file mode 100644
index e5df4b8e4fe7..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: gnirehtet/relay-rust/src/main.rs
-===================================================================
---- gnirehtet.orig/relay-rust/src/main.rs
-+++ gnirehtet/relay-rust/src/main.rs
-@@ -299,7 +299,7 @@ impl Command for RelayCommand {
-
- fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
- info!(target: TAG, "Installing gnirehtet client...");
-- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"])
-+ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"])
- }
-
- fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
-@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>(
- args: Vec<S>,
- ) -> Result<(), CommandExecutionError> {
- let adb_args = create_adb_args(serial, args);
-- debug!(target: TAG, "Execute: adb {:?}", adb_args);
-- match process::Command::new("adb").args(&adb_args[..]).status() {
-+ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args);
-+ match process::Command::new("@adb@").args(&adb_args[..]).status() {
- Ok(exit_status) => {
- if exit_status.success() {
- Ok(())
-@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S
- serial,
- vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
- );
-- debug!(target: TAG, "Execute: adb {:?}", args);
-- match process::Command::new("adb").args(&args[..]).output() {
-+ debug!(target: TAG, "Execute: @adb@ {:?}", args);
-+ match process::Command::new("@adb@").args(&args[..]).output() {
- Ok(output) => {
- if output.status.success() {
- // the "regex" crate makes the binary far bigger, so just parse the versionCode
-Index: gnirehtet/relay-rust/src/adb_monitor.rs
-===================================================================
---- gnirehtet.orig/relay-rust/src/adb_monitor.rs
-+++ gnirehtet/relay-rust/src/adb_monitor.rs
-@@ -206,7 +206,7 @@ impl AdbMonitor {
-
- fn start_adb_daemon() -> bool {
- info!(target: TAG, "Restarting adb daemon");
-- match process::Command::new("adb")
-+ match process::Command::new("@adb@")
- .args(&["start-server"])
- .status() {
- Ok(exit_status) => {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix
index fb64ff65cc15..4232a5a4fedd 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
src = fetchFromGitLab {
owner = "shackra";
repo = "goimapnotify";
- rev = "${version}";
+ rev = version;
sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix
index 86548bf99597..0859472a446f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
meta = {
homepage = "https://github.com/buger/goreplay";
license = stdenv.lib.licenses.lgpl3Only;
- description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic";
+ description = "Open-source tool for capturing and replaying live HTTP traffic";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix
index 092f3611abb7..fdf5c9ad704b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix
@@ -1,32 +1,25 @@
{ lib
-, iputils
-, python3
-, python3Packages
+, rustPlatform
+, fetchFromGitHub
}:
-python3Packages.buildPythonApplication rec {
+rustPlatform.buildRustPackage rec {
pname = "gping";
- version = "1.1";
+ version = "1.1.0";
- propagatedBuildInputs = with python3Packages; [ colorama ];
-
- src = python3Packages.fetchPypi {
- inherit version;
- pname = "pinggraph";
- sha256 = "0q5ma98457zb6vxsnhmrr3p38j1vg0gl155y0adzfg67wlniac92";
+ src = fetchFromGitHub {
+ owner = "orf";
+ repo = "gping";
+ rev = "v${version}";
+ sha256 = "10hvzgn98qbzs7mmql9wlbll814mkki29lvg71lbvr81wlbdn6mr";
};
- # Make path to ping explicit
- postFixup = ''
- substituteInPlace $out/${python3.sitePackages}/gping/pinger.py \
- --replace 'subprocess.getoutput("ping ' 'subprocess.getoutput("${iputils}/bin/ping ' \
- --replace 'args = ["ping"]' 'args = ["${iputils}/bin/ping"]'
- '';
+ cargoSha256 = "0kkfrdzyy5068k8nz08pfc4cl1dvn0vd6i01gax5dblk122ybbag";
meta = with lib; {
description = "Ping, but with a graph";
homepage = "https://github.com/orf/gping";
- license = licenses.gpl2;
+ license = licenses.mit;
maintainers = with maintainers; [ andrew-d ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix
index be3ed2ea2c65..a9fb7c823f9e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpcui";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "fullstorydev";
repo = pname;
rev = "v${version}";
- sha256 = "0b6rc294v8jagk79hcjbaldfi7y7idx8bknsbdi3djym5rspdg6s";
+ sha256 = "1l8ldx7nx2pa2ac5znss0j0dhapn3syj02xqys4jz22hr5gvfj6m";
};
- vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9";
+ vendorSha256 = "15qgpbsl41swifw8w1lx0pbniwv3rf35127ald7h1r157vfa0r8b";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix
index 91112a2628e2..9f01962250dc 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix
@@ -1,7 +1,7 @@
{ useLua ? !stdenv.isDarwin
, usePcre ? true
, withPrometheusExporter ? true
-, stdenv, lib, fetchurl
+, stdenv, lib, fetchurl, nixosTests
, openssl, zlib
, lua5_3 ? null, pcre ? null, systemd ? null
}:
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
- version = "2.2.2";
+ version = "2.3.2";
src = fetchurl {
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
- sha256 = "1mjld865p4f7i465fcc5c4jclih1c3345a3ylriql8668rd7071r";
+ sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr";
};
buildInputs = [ openssl zlib ]
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.tests.haproxy = nixosTests.haproxy;
+
meta = with lib; {
description = "Reliable, high performance TCP/HTTP load balancer";
longDescription = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix
index 22f933a4b654..edf91dd311d9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hey";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "rakyll";
repo = pname;
rev = "v${version}";
- sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv";
+ sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb";
};
vendorSha256 = null;
@@ -19,6 +19,6 @@ buildGoModule rec {
description = "HTTP load generator, ApacheBench (ab) replacement";
homepage = "https://github.com/rakyll/hey";
license = licenses.asl20;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix
index 29bd4c331eb8..e9987a51eaec 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix
@@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
pname = "httpstat";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "reorx";
repo = pname;
rev = version;
- sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6";
+ sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1";
};
doCheck = false; # No tests
buildInputs = [ glibcLocales ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix
index 4371d37391be..5c209393978f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix
@@ -2,11 +2,11 @@
let wrapper = stdenv.mkDerivation rec {
pname = "wrapper";
- version = "3.5.43";
+ version = "3.5.44";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
- sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b";
+ sha256 = "1iq4j7srzy5p8q3nci9316bnwx4g71jyvzd1i5hp3s8v1k61910g";
};
buildInputs = [ jdk ];
@@ -32,11 +32,11 @@ in
stdenv.mkDerivation rec {
pname = "i2p";
- version = "0.9.47";
+ version = "0.9.48";
src = fetchurl {
url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
- sha256 = "0krcdm73qing7z918wpml9sk6dn0284wps2ghkmlrdaklfkavk6v";
+ sha256 = "0cnm4bwl1gqcx89i96j2qlq6adphy4l72h5whamqwv86n8bmpig8";
};
buildInputs = [ jdk ant gettext which ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix
index 08c40a4ac827..8bf90293a8ec 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix
@@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
stdenv.mkDerivation rec {
pname = "i2pd";
- version = "2.33.0";
+ version = "2.35.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
- sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk";
+ sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc";
};
buildInputs = with stdenv.lib; [ boost zlib openssl ]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix
new file mode 100644
index 000000000000..83b35c098669
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ pname = "igmpproxy";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "pali";
+ repo = "igmpproxy";
+ rev = version;
+ sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ meta = with stdenv.lib; {
+ description = "A daemon that routes multicast using IGMP forwarding";
+ homepage = "https://github.com/pali/igmpproxy/";
+ changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.sdier ];
+ # The maintainer is using this on linux, but if you test it on other platforms
+ # please add them here!
+ platforms = platforms.linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix
index 2a551c56768c..f01bffa76da5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = "http://troglobit.com/project/inadyn/";
+ homepage = "https://troglobit.com/project/inadyn/";
description = "Free dynamic DNS client";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix
index 4910ff21da62..2ca924731466 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iperf";
- version = "3.8.1";
+ version = "3.9";
src = fetchurl {
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
- sha256 = "15pdgnan9krf3dijan9in73ir8rcmhk3iw8085d732is4zrq1c75";
+ sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4";
};
buildInputs = [ openssl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix
index 11ebe228be88..b773e116d8be 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "keepalived";
- version = "2.1.3";
+ version = "2.1.5";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
- sha256 = "1zdfvicpll7a5iw6p12pmdcg8y30mr0j5miycn0nhjp8yzi9hdc5";
+ sha256 = "0zdh3g491mlc0x4g8q09vq62a7pb8n13a39jnfdgrm9k29khn0sj";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix
index 8462d907a1f6..229f261c8c3e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "lldpd";
- version = "1.0.5";
+ version = "1.0.7";
src = fetchurl {
url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
- sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd";
+ sha256 = "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx";
};
configureFlags = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix
index adcd2f1dc131..ff7d4176bd2e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix
@@ -3,13 +3,12 @@
, python3, gss, libmysqlclient, system-sendmail }:
stdenv.mkDerivation rec {
- name = "${project}-${version}";
- project = "mailutils";
- version = "3.9";
+ pname = "mailutils";
+ version = "3.10";
src = fetchurl {
- url = "mirror://gnu/${project}/${name}.tar.xz";
- sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz";
+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9";
};
postPatch = ''
@@ -32,6 +31,18 @@ stdenv.mkDerivation rec {
patches = [
./fix-build-mb-len-max.patch
./path-to-cat.patch
+ # mailquota.c:277: undefined reference to `get_size'
+ # https://lists.gnu.org/archive/html/bug-mailutils/2020-08/msg00002.html
+ (fetchpatch {
+ url = "http://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=37713b42a501892469234b90454731d8d8b7a3e6";
+ sha256 = "1mwj77nxvf4xvqf26yjs59jyksnizj0lmbymbzg4kmqynzq3zjny";
+ })
+ # Fix cross-compilation
+ # https://lists.gnu.org/archive/html/bug-mailutils/2020-11/msg00038.html
+ (fetchpatch {
+ url = "https://lists.gnu.org/archive/html/bug-mailutils/2020-11/txtiNjqcNpqOk.txt";
+ sha256 = "0ghzqb8qx2q8cffbvqzw19mivv7r5f16whplzhm7hdj0j2i6xf6s";
+ })
];
enableParallelBuilding = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix
index 48590a9e3059..9036e07e7f3f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = ''MaxScale database proxy extends MariaDB Server's high availability'';
+ description = "MaxScale database proxy extends MariaDB Server's high availability";
homepage = "https://mariadb.com/products/technology/maxscale";
license = licenses.bsl11;
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix
index 6a14b5f1c82d..d425e16782b3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
-let version = "1.2.1"; in
+let version = "1.3.0"; in
stdenv.mkDerivation {
pname = "minidlna";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
- sha256 = "1v1ffhmaqxpvf2vv4yyvjsks4skr9y088853awsh7ixh7ai8nf37";
+ sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7";
};
preConfigure = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix
index 505ecc4c2224..e452719a494a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
- version = "2020-08-08T02-33-58Z";
+ version = "2020-11-25T23-04-07Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "15bkl3q0jidrwy04l0cdmha43r9wlxmlqkhmwz98b57rjrq6grql";
+ sha256 = "0r4za7jnwmh2wna5l4iv5pz6s5c62f7v4hmbv7misff9qbk4p4k7";
};
- vendorSha256 = "1fsx8zl2qkyf1gx3s6giccd86xawx9d1h4jdnyn1m36clsq9jkpc";
+ vendorSha256 = "0zracgqwhqs3gabrqqm8fm3hyicaadcinsjp5qgprjwd9a3c1zfv";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix
index c3981b902f2b..7bad593e4dfa 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "modem-manager";
- version = "1.12.10";
+ version = "1.14.8";
package = "ModemManager";
src = fetchurl {
url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
- sha256 = "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj";
+ sha256 = "15cjy7zzsxagx649vz0990avin47vpgdmm4ss2msggdla6x2c6py";
};
nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix
index 26c9035cd79b..dba75400f6fa 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix
@@ -3,10 +3,11 @@
, libutempter ? null, withUtempter ? stdenv.isLinux }:
stdenv.mkDerivation rec {
- name = "mosh-1.3.2";
+ pname = "mosh";
+ version = "1.3.2";
src = fetchurl {
- url = "https://mosh.org/${name}.tar.gz";
+ url = "https://mosh.org/mosh-${version}.tar.gz";
sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix
index 3f50ed41f49c..58afc833ea0e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "MozWire";
- version = "0.5.2";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "NilsIrl";
repo = pname;
rev = "v${version}";
- sha256 = "0r3x8y1qxxkkac9lqgd0s339zbrm9zmir1f6qs0r5f0bw3ngzqc4";
+ sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "0hyps2wi4wmpllfams3p59jpccwa0ylgzxq7qdn6g6zvf0cajpc0";
+ cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg";
meta = with stdenv.lib; {
description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix
index b3cd0d830245..61f0a00a9b81 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
'';
homepage = "https://github.com/slackhq/nebula";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix
index f5b12a6cf373..c02275ef5b81 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix
@@ -62,6 +62,13 @@ in stdenv.mkDerivation rec {
# Meson does not support using different directories during build and
# for installation like Autotools did with flags passed to make install.
./fix-install-paths.patch
+
+ # Fix build
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch";
+ sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk=";
+ })
];
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix
index 4b46d63ced5b..e17d4ebc0719 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "firecat53";
repo = "networkmanager-dmenu";
- rev = "${version}";
+ rev = version;
sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix
index 7d7889f9a5bc..d50ccc6517b4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix
@@ -19,6 +19,7 @@
, gcr
, glib
, substituteAll
+, lib
}:
stdenv.mkDerivation rec {
@@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "-Dgcr=${if withGnome then "true" else "false"}"
+ "-Dgcr=${lib.boolToString withGnome}"
];
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix
new file mode 100644
index 000000000000..d5195cba3453
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, autoreconfHook
+, fetchFromGitHub
+, fetchpatch
+, file
+, glib
+, gnome3
+, gtk3
+, intltool
+, libnma
+, libsecret
+, networkmanager
+, pkgconfig
+, ppp
+, sstp
+, substituteAll
+, withGnome ? true }:
+
+let
+ pname = "NetworkManager-sstp";
+ version = "unstable-2020-04-20";
+in stdenv.mkDerivation {
+ name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "enaess";
+ repo = "network-manager-sstp";
+ rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8";
+ sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3";
+ };
+
+ buildInputs = [ sstp networkmanager glib ppp ]
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
+
+ nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ];
+
+ postPatch = ''
+ sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c
+ sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c
+ '';
+
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
+
+ preConfigure = "intltoolize";
+ configureFlags = [
+ "--without-libnm-glib"
+ "--with-gnome=${if withGnome then "yes" else "no"}"
+ "--enable-absolute-paths"
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "networkmanager-sstp";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "NetworkManager's sstp plugin";
+ inherit (networkmanager.meta) maintainers platforms;
+ license = licenses.gpl2Plus;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix
index 11ba442393dd..0c9bc41099f2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix
@@ -2,7 +2,7 @@
, autoconf, automake, libtool, pkg-config
, bzip2, libpcap, flex, yacc }:
-let version = "1.6.21"; in
+let version = "1.6.22"; in
stdenv.mkDerivation {
pname = "nfdump";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "phaag";
repo = "nfdump";
rev = "v${version}";
- sha256 = "1ifxnpyzyn8nd6n44pjcw0rwck392nzj1gwa4zzqvvgzj477m6ha";
+ sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj";
};
nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix
index 2cb819caee98..6377f276af3f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "epam";
repo = "nfstrace";
- rev = "${version}";
+ rev = version;
sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix
index d9c1acc374c0..3c1e0f498fba 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix
@@ -35,10 +35,7 @@ stdenv.mkDerivation {
passthru.updateScript = ./update.sh;
meta = {
- description = "ngrok";
- longDescription = ''
- Allows you to expose a web server running on your local machine to the internet.
- '';
+ description = "Allows you to expose a web server running on your local machine to the internet";
homepage = "https://ngrok.com/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix
new file mode 100644
index 000000000000..073ac48b8d34
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonApplication, fetchPypi, dnspython, pytestCheckHook }:
+
+buildPythonApplication rec {
+ pname = "nxdomain";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn";
+ };
+
+ propagatedBuildInputs = [ dnspython ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ postCheck = ''
+ echo example.org > simple.list
+ python -m nxdomain --format dnsmasq --out dnsmasq.conf --simple ./simple.list
+ grep -q 'address=/example.org/' dnsmasq.conf
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/zopieux/nxdomain";
+ description = "A domain (ad) block list creator";
+ platforms = platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ zopieux ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix
index f02370ab69d5..0f886fda03c9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oneshot";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "raphaelreyna";
repo = "oneshot";
rev = "v${version}";
- sha256 = "11xmvqj7md970rjhkg1zj2w6yqpw6cj83aw37a82sfdn90kyhg9d";
+ sha256 = "047mncv9abs4xj7bh9lhc3wan37cldjjyrpkis7pvx6zhzml74kf";
};
vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix
index 2b09fe901d07..4630342cf8ae 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- version = "4.2.2";
+ version = "4.3.1";
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
- sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif";
+ sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l";
};
phases = [ "installPhase" ];
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.shou ];
};
}
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix
index 0a1680bfdb56..a8ce80f98382 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix
@@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
pname = "openfortivpn";
- version = "1.14.1";
+ version = "1.15.0";
src = fetchFromGitHub {
owner = "adrienverge";
repo = pname;
rev = "v${version}";
- sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds";
+ sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2";
};
# we cannot write the config file to /etc and as we don't need the file, so drop it
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix
index 64e6757891e3..f8a518ca4dce 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix
@@ -19,13 +19,13 @@
let
- version = "8.3p1";
+ version = "8.4p1";
# **please** update this patch when you update to a new openssh release.
gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch";
- url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch";
- sha256 = "0j22ccg6msyi88mpsb6x0il5cg8v2b7qdah57ninbwx5isyld80l";
+ url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
+ sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2";
};
in
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
src = if hpnSupport then
fetchurl {
url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
- sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k";
+ sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540";
}
else
fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
- sha256 = "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj";
+ sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as";
};
patches =
@@ -53,6 +53,9 @@ stdenv.mkDerivation rec {
./dont_create_privsep_path.patch
./ssh-keysign.patch
+
+ # See https://github.com/openssh/openssh-portable/pull/206
+ ./ssh-copy-id-fix-eof.patch
]
++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch
new file mode 100644
index 000000000000..4ba2b562f556
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch
@@ -0,0 +1,21 @@
+diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
+index 392f64f..a769077 100644
+--- a/contrib/ssh-copy-id
++++ b/contrib/ssh-copy-id
+@@ -247,7 +247,7 @@ installkeys_sh() {
+ # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing
+ # the cat adds the keys we're getting via STDIN
+ # and if available restorecon is used to restore the SELinux context
+- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF)
++ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
+ cd;
+ umask 077;
+ mkdir -p $(dirname "${AUTH_KEY_FILE}") &&
+@@ -258,6 +258,7 @@ installkeys_sh() {
+ restorecon -F .ssh ${AUTH_KEY_FILE};
+ fi
+ EOF
++ )
+
+ # to defend against quirky remote shells: use 'exec sh -c' to get POSIX;
+ printf "exec sh -c '%s'" "${INSTALLKEYS_SH}"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix
index c5a15c2f87a8..04ac97003102 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix
@@ -1,14 +1,23 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper
-, iproute, lzo, openssl, pam
-, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null
-, pkcs11Support ? false, pkcs11helper ? null,
+{ stdenv
+, fetchurl
+, pkg-config
+, makeWrapper
+, runtimeShell
+, iproute ? null
+, lzo
+, openssl
+, pam
+, useSystemd ? stdenv.isLinux
+, systemd ? null
+, util-linux ? null
+, pkcs11Support ? false
+, pkcs11helper ? null
}:
assert useSystemd -> (systemd != null);
assert pkcs11Support -> (pkcs11helper != null);
with stdenv.lib;
-
let
# Check if the script needs to have other binaries wrapped when changing this.
update-resolved = fetchurl {
@@ -16,49 +25,68 @@ let
sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc";
};
-in stdenv.mkDerivation rec {
- pname = "openvpn";
- version = "2.4.9";
+ generic = { version, sha256 }:
+ let
+ withIpRoute = stdenv.isLinux && (versionOlder version "2.5");
+ in
+ stdenv.mkDerivation
+ rec {
+ pname = "openvpn";
+ inherit version;
- src = fetchurl {
- url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
- sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4";
- };
+ src = fetchurl {
+ url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ makeWrapper pkg-config ];
- nativeBuildInputs = [ makeWrapper pkgconfig ];
+ buildInputs = [ lzo openssl ]
+ ++ optional stdenv.isLinux pam
+ ++ optional withIpRoute iproute
+ ++ optional useSystemd systemd
+ ++ optional pkcs11Support pkcs11helper;
- buildInputs = [ lzo openssl ]
- ++ optionals stdenv.isLinux [ pam iproute ]
- ++ optional useSystemd systemd
- ++ optional pkcs11Support pkcs11helper;
+ configureFlags = optionals withIpRoute [
+ "--enable-iproute2"
+ "IPROUTE=${iproute}/sbin/ip"
+ ]
+ ++ optional useSystemd "--enable-systemd"
+ ++ optional pkcs11Support "--enable-pkcs11"
+ ++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
- configureFlags = optionals stdenv.isLinux [
- "--enable-iproute2"
- "IPROUTE=${iproute}/sbin/ip" ]
- ++ optional useSystemd "--enable-systemd"
- ++ optional pkcs11Support "--enable-pkcs11"
- ++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
+ postInstall = ''
+ mkdir -p $out/share/doc/openvpn/examples
+ cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
+ cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
+ cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
+ '' + optionalString useSystemd ''
+ install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
+ wrapProgram $out/libexec/update-systemd-resolved \
+ --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]}
+ '';
- postInstall = ''
- mkdir -p $out/share/doc/openvpn/examples
- cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
- cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
- cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
- '' + optionalString useSystemd ''
- install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
- wrapProgram $out/libexec/update-systemd-resolved \
- --prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]}
- '';
+ enableParallelBuilding = true;
- enableParallelBuilding = true;
+ meta = with stdenv.lib; {
+ description = "A robust and highly flexible tunneling application";
+ downloadPage = "https://openvpn.net/community-downloads/";
+ homepage = "https://openvpn.net/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ viric peterhoeg ];
+ platforms = platforms.unix;
+ };
+ };
+
+in
+{
+ openvpn_24 = generic {
+ version = "2.4.9";
+ sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4";
+ };
- meta = with stdenv.lib; {
- description = "A robust and highly flexible tunneling application";
- downloadPage = "https://openvpn.net/community-downloads/";
- homepage = "https://openvpn.net/";
- license = licenses.gpl2;
- maintainers = with maintainers; [ viric ];
- platforms = platforms.unix;
- updateWalker = true;
+ openvpn = generic {
+ version = "2.5.0";
+ sha256 = "sha256-AppCbkTWVstOEYkxnJX+b8mGQkdyT1WZ2Z35xMNHj70=";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
index d73b8e911b9d..f50d17eaf7de 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }:
+{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42";
};
- buildInputs = [ makeWrapper coreutils gawk utillinux ];
+ buildInputs = [ makeWrapper coreutils gawk util-linux ];
installPhase = ''
install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
- --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]}
'';
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
index 4d18372363b6..1a192ce6688a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, makeWrapper
-, iproute, systemd, coreutils, utillinux }:
+, iproute, systemd, coreutils, util-linux }:
stdenv.mkDerivation rec {
pname = "update-systemd-resolved";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
wrapProgram $out/libexec/openvpn/update-systemd-resolved \
- --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]}
+ --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]}
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix
index 9dd1a5581c55..3f00964bfd35 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, readline, rsh, ssh }:
+{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }:
stdenv.mkDerivation rec {
name = "pdsh-2.34";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl";
};
- buildInputs = [ perl readline ssh ];
+ buildInputs = [ perl readline ssh ]
+ ++ (stdenv.lib.optional slurmSupport slurm);
preConfigure = ''
configureFlagsArray=(
@@ -18,6 +19,7 @@ stdenv.mkDerivation rec {
${if readline == null then "--without-readline" else "--with-readline"}
${if ssh == null then "--without-ssh" else "--with-ssh"}
${if rsh == false then "--without-rsh" else "--with-rsh"}
+ ${if slurmSupport then "--with-slurm" else "--without-slurm"}
"--with-dshgroups"
"--with-xcpu"
"--disable-debug"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix
index 22da1320803e..db6917ef0b76 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
installPhase = ''
mkdir -p "$out"/{bin,share/photon}
cp -R photon.py core plugins $out/share/photon
-
+
makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
--set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
--add-flags "-O $out/share/photon/photon.py"
@@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec {
description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target";
homepage = "https://github.com/s0md3v/Photon";
license = licenses.gpl3;
- maintainers = with maintainers; [ genesis ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix
index 2bb6f373727d..4ef3cd6345e5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
++ optional withMysql "--enable-mysql";
meta = with stdenv.lib; {
- description = "pmacct is a small set of multi-purpose passive network monitoring tools";
+ description = "A small set of multi-purpose passive network monitoring tools";
longDescription = ''
pmacct is a small set of multi-purpose passive network monitoring tools
[NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix
index 10a25d5bf8b2..8346c862fc6e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "privoxy";
- version = "3.0.28";
+ version = "3.0.29";
src = fetchurl {
url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
- sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm";
+ sha256 = "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5";
};
hardeningEnable = [ "pie" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix
index 6f00c7fc8b74..6ace8e139e13 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
# Temporary work-around; most likely fixed by next upstream release
sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl'
'';
+ postInstall = ''
+ cp src/proxychains.conf $out/etc
+ '';
meta = {
description = "Proxifier for SOCKS proxies";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix
new file mode 100644
index 000000000000..f7cd08e197e8
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libbsd, check, pcre }:
+
+stdenv.mkDerivation rec {
+ pname = "rcon";
+ version = "0.5";
+
+ src = fetchFromGitHub {
+ owner = "n0la";
+ repo = "rcon";
+ rev = version;
+ sha256 = "1jsnmsm2qkiv8dan1yncx0qp6zfkcbyvf81c7xwpv6r499ijw1nb";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ glib
+ libbsd
+ check
+ pcre
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/n0la/rcon";
+ description = "Source RCON client for command line";
+ maintainers = with maintainers; [ f4814n ];
+ platforms = with platforms; linux ++ darwin;
+ license = licenses.bsd2;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
index 9726cde61e54..ed793a50cb8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
- version = "1.8.18";
+ version = "1.8.23";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
- sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6";
+ sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3";
};
- cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif";
+ cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p";
SODIUM_USE_PKG_CONFIG = 1;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix
index 67f81b821053..c56f0eac7ff8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix
@@ -10,7 +10,7 @@
, perlPackages
, stdenv
, tree
-, utillinux
+, util-linux
}:
let
PATH = stdenv.lib.concatStringsSep ":"
@@ -19,7 +19,7 @@ let
"${iptables}/bin"
"${ipset}/bin"
"${ebtables}/bin"
- "${utillinux}/bin"
+ "${util-linux}/bin"
"${gnugrep}/bin"
"${gnused}/bin"
];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
ipset
iptables
ebtables
- utillinux
+ util-linux
gnugrep
gnused
perl
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix
index 60cb34132537..c0c64405c0d4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "slirp4netns";
- version = "1.1.4";
+ version = "1.1.8";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
- sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl";
+ sha256 = "06813k8a1gpakgykz5h75qpdlhrci9r39309n3qqh34ynbjil468";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix
index b492b5a226ba..d7578c4adda8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
"--with-openssl-lib=${openssl}/lib"
"--with-openssl-inc=${openssl}/include" ];
meta = {
- description = "ssldump is an SSLv3/TLS network protocol analyzer";
+ description = "An SSLv3/TLS network protocol analyzer";
homepage = "http://ssldump.sourceforge.net";
license = "BSD-style";
maintainers = with stdenv.lib.maintainers; [ aycanirican ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix
index 4d05b478ab40..22ef9102ef85 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sstp-client";
- version = "1.0.12";
+ version = "1.0.13";
src = fetchurl {
- url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";
- sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8";
+ url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";
+ sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln";
};
patchPhase =
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix
index 70820ea03208..f812f7ffa91f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix
@@ -24,6 +24,6 @@ buildGoPackage rec {
'';
homepage = "https://github.com/projectdiscovery/subfinder";
license = licenses.mit;
- maintainers = with maintainers; [ fpletz filalex77 ];
+ maintainers = with maintainers; [ fpletz Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix
index b40df721c83e..fdf7965311d0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpcap, tcpdump }:
+{ stdenv, fetchurl, libpcap, tcpdump, Carbon, CoreServices }:
stdenv.mkDerivation rec {
pname = "tcpreplay";
@@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d";
};
- buildInputs = [ libpcap ];
+ buildInputs = [ libpcap ]
+ ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+ Carbon CoreServices
+ ];
+
configureFlags = [
"--disable-local-libopts"
@@ -26,6 +30,6 @@ stdenv.mkDerivation rec {
homepage = "http://tcpreplay.appneta.com/";
license = with licenses; [ bsd3 gpl3 ];
maintainers = with maintainers; [ eleanor ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix
index 285a3764e038..a077ddb3de46 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix
@@ -3,7 +3,7 @@
, iptables, bash }:
let
- sshuttle-telepresence =
+ sshuttle-telepresence =
let
sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
in
@@ -22,13 +22,13 @@ let
});
in pythonPackages.buildPythonPackage rec {
pname = "telepresence";
- version = "0.105";
+ version = "0.108";
src = fetchFromGitHub {
owner = "telepresenceio";
repo = "telepresence";
rev = version;
- sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg";
+ sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g=";
};
buildInputs = [ makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix
index 4ca5529bdc60..2fedae4b7a79 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tendermint";
- version = "0.33.8";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
- sha256 = "1dcr60gmbkb6833n49mjmlr082ahlv7alaqycl8g3d4f93kdm5c3";
+ sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6";
};
- vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw";
+ vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix
index 478c1ed35f29..d9d8478e9856 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages
-, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, utillinux
+, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux
}:
stdenv.mkDerivation rec {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix
index f0d2cd9a0df6..1ebd8d8be6a2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
pname = "tridactyl-native";
# this is actually the version of tridactyl itself; the native messenger will
# probably not change with every tridactyl version
- version = "1.20.1";
+ version = "1.20.3";
src = fetchFromGitHub {
owner = "tridactyl";
repo = "tridactyl";
rev = version;
- sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32";
+ sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps";
};
sourceRoot = "source/native";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix
index c0dce98c4447..4bf251be81fc 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
description = "Expose your local web server to the internet with a public URL";
homepage = "https://tunnelto.dev";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix
index 9b33d53e54f1..b6d9eb3448f5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix
@@ -1,17 +1,37 @@
-{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
+{ stdenv
+, lib
+, fetchurl
+, openssl
+, nettle
+, expat
+, libevent
+, dns-root-data
+, pkg-config
+ #
+ # By default unbound will not be built with systemd support. Unbound is a very
+ # commmon dependency. The transitive dependency closure of systemd also
+ # contains unbound.
+ # Since most (all?) (lib)unbound users outside of the unbound daemon usage do
+ # not need the systemd integration it is likely best to just default to no
+ # systemd integration.
+ # For the daemon use-case, that needs to notify systemd, use `unbound-with-systemd`.
+ #
+, withSystemd ? false
+, systemd ? null
+}:
stdenv.mkDerivation rec {
pname = "unbound";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchurl {
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
- sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz";
+ sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
- buildInputs = [ openssl nettle expat libevent ];
+ buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ];
configureFlags = [
"--with-ssl=${openssl.dev}"
@@ -25,6 +45,8 @@ stdenv.mkDerivation rec {
"--enable-relro-now"
] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [
"--disable-flto"
+ ] ++ lib.optionals withSystemd [
+ "--enable-systemd"
];
installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
@@ -33,7 +55,7 @@ stdenv.mkDerivation rec {
make unbound-event-install
'';
- preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit
+ preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit
# Build libunbound again, but only against nettle instead of openssl.
# This avoids gnutls.out -> unbound.lib -> openssl.out.
# There was some problem with this on Darwin; let's not complicate non-Linux.
@@ -43,17 +65,17 @@ stdenv.mkDerivation rec {
buildPhase
installPhase
''
- # get rid of runtime dependencies on $dev outputs
+ # get rid of runtime dependencies on $dev outputs
+ ''substituteInPlace "$lib/lib/libunbound.la" ''
- + stdenv.lib.concatMapStrings
- (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
- buildInputs;
+ + lib.concatMapStrings
+ (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
+ (builtins.filter (p: p != null) buildInputs);
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Validating, recursive, and caching DNS resolver";
license = licenses.bsd3;
homepage = "https://www.unbound.net";
maintainers = with maintainers; [ ehmry fpletz globin ];
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
index f23aed3707be..e4b821be1f46 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "urlwatch-${version}";
- version = "2.19";
+ version = "2.21";
src = fetchFromGitHub {
owner = "thp";
repo = "urlwatch";
rev = version;
- sha256 = "05vxs0x8gnsv2r9cy0brqny1y5jnj2mw11lqc8lqahx84xcs2m00";
+ sha256 = "1s6bigkwymxdp9bkgvwg3lbf465i6k8kmak2w7czf4mhwavcfq63";
};
propagatedBuildInputs = with python3Packages; [
@@ -20,12 +20,13 @@ python3Packages.buildPythonApplication rec {
pycodestyle
pyyaml
requests
+ pyppeteer
];
meta = with stdenv.lib; {
description = "A tool for monitoring webpages for updates";
homepage = "https://thp.io/2008/urlwatch/";
license = licenses.bsd3;
- maintainers = with maintainers; [ tv ];
+ maintainers = with maintainers; [ kmein tv ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix
index 1165f0bd7e0b..ecc2c2438414 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix
@@ -3,33 +3,33 @@
}:
let
- version = "4.31.0";
+ version = "4.32.1";
src = fetchFromGitHub {
- owner = "v2ray";
+ owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
- sha256 = "0s0blc05nrqm78qslv5xb42pjlx5v8qqwg0pwbzhxn9s71x2669m";
+ sha256 = "1mlrl5fz1v3bcb83pczqp859d8w9mi7jj600a2yw7xm372w2irk8";
};
- vendorSha256 = "0n2mf19fvgk5x0j2wwm4zk9xikzvl6cdvw26qar91wzcsraf5z2d";
+ vendorSha256 = "1mz1acdj8ailgyqrr1v47n36qc24ggzw5rmj4p2awfwz3gp2yz6z";
assets = {
# MIT licensed
"geoip.dat" = let
- geoipRev = "202009300006";
- geoipSha256 = "1ss2izqlmrp5b5kpw804jk6c1nyimwlccbkikix3bwfaz4vlv1nc";
+ geoipRev = "202011050012";
+ geoipSha256 = "1d2n3hskgdmcfk1nl7a8lxxz325p84i7gz44cs77z1m9r7c2vsjy";
in fetchurl {
- url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
+ url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
};
# MIT licensed
"geosite.dat" = let
- geositeRev = "20201010021828";
- geositeSha256 = "0gpfhcf4iyx7ip7rlkb0l1q64w84zvmcah52qyjwljs6l4p3hrj9";
+ geositeRev = "20201102141726";
+ geositeSha256 = "0sn2f5vd6w94ryh845mnbfyjzycg7cvb66rkzh37pg9l7fvgs4jh";
in fetchurl {
- url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
+ url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
};
@@ -59,20 +59,23 @@ let
installPhase = ''
install -Dm755 v2ray v2ctl -t $out/bin
'';
+
+ meta = {
+ homepage = "https://www.v2ray.com/en/index.html";
+ description = "A platform for building proxies to bypass network restrictions";
+ # The license of the dependency `https://github.com/XTLS/Go` doesn't allowed user to modify its source code,
+ # which made it unfree.
+ license = with lib.licenses; [ mit unfree ];
+ maintainers = with lib.maintainers; [ servalcatty ];
+ };
};
in runCommand "v2ray-${version}" {
inherit version;
+ inherit (core) meta;
nativeBuildInputs = [ makeWrapper ];
- meta = {
- homepage = "https://www.v2ray.com/en/index.html";
- description = "A platform for building proxies to bypass network restrictions";
- license = with lib.licenses; [ mit ];
- maintainers = with lib.maintainers; [ servalcatty ];
- };
-
passthru = {
updateScript = ./update.sh;
tests = {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh
index 56a148444c71..08062b1e9969 100755
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh
@@ -14,7 +14,7 @@ echo "Current version:" >&2
echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2
function fetch_latest_rev {
- curl "https://api.github.com/repos/v2ray/$1/releases" |
+ curl "https://api.github.com/repos/v2fly/$1/releases" |
jq '.[0].tag_name' --raw-output
}
@@ -28,7 +28,7 @@ echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2
if [[ $core_rev != $old_core_rev ]]; then
echo "Prefetching core..." >&2
{ read hash; read store_path; } < <(
- nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/v$core_rev.zip"
+ nix-prefetch-url --unpack --print-path "https://github.com/v2fly/v2ray-core/archive/v$core_rev.zip"
)
sed --in-place \
@@ -40,7 +40,7 @@ fi
if [[ $geoip_rev != $old_geoip_rev ]]; then
echo "Prefetching geoip..." >&2
- hash=$(nix-prefetch-url "https://github.com/v2ray/geoip/releases/download/$geoip_rev/geoip.dat")
+ hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat")
sed --in-place \
-e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \
-e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \
@@ -49,7 +49,7 @@ fi
if [[ $geosite_rev != $old_geosite_rev ]]; then
echo "Prefetching geosite..." >&2
- hash=$(nix-prefetch-url "https://github.com/v2ray/domain-list-community/releases/download/$geosite_rev/dlc.dat")
+ hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat")
sed --in-place \
-e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \
-e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix
index cb7cbd677431..16abe8c60335 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vegeta";
- version = "12.7.0";
+ version = "12.8.4";
src = fetchFromGitHub {
- owner = "tsenart";
- repo = pname;
- rev = "v${version}";
- sha256 = "1wzx9588hjzxq65fxi1zz9xpsw33qq41hpl0j2f077g4m8yxahv5";
+ owner = "tsenart";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0sw10k4g370c544dgw2c1sqdnxryld8lf6c1wnyknrm3zsfzn1hl";
};
goPackagePath = "github.com/tsenart/${pname}";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix
index d0637dbeaef8..1a06ad178ec4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix
@@ -243,4 +243,13 @@
sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj";
};
}
+ {
+ goPackagePath = "pgregory.net/rapid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flyingmutant/rapid";
+ rev = "v0.3.3";
+ sha256 = "04w4dmx753b2xp5z5br5wxalgkkgag8qpbxics2gdcksqgi85vg3";
+ };
+ }
]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix
new file mode 100644
index 000000000000..cc28455d06a5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix
@@ -0,0 +1,30 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+ name = "waitron-unstable-${version}";
+ version = "2020-01-24";
+ rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
+
+ goPackagePath = "github.com/ns1/waitron";
+
+ src = fetchgit {
+ inherit rev;
+ url = "https://github.com/ns1/waitron";
+ sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6";
+ };
+
+ patches = [
+ ./staticfiles-directory.patch
+ ];
+
+ goDeps = ./deps.nix;
+
+ meta = {
+ description = "A tool to manage network booting of machines";
+ homepage = "https://github.com/ns1/waitron";
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ guibert ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix
new file mode 100644
index 000000000000..46369c783184
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix
@@ -0,0 +1,57 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+ {
+ goPackagePath = "github.com/flosch/pongo2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flosch/pongo2";
+ rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00";
+ sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/handlers";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/handlers";
+ rev = "f08afc1876ad882db8074bcb8a4cc96107d3a5f4";
+ sha256 = "1ysm6sw3jqa3h8pb5qpqgh44g91c23n3as277sh0vyp7282290jq";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/errors";
+ rev = "d42613fe1ab9e303fc850e7a19fda2e8eeb6516e";
+ sha256 = "0qggzzvh9lzlfk8ixlyw8bw645rh0lrjrd367505hhl6cg18v8yf";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "8c9f31f047a304abedb5614d4a18a843cd5f4a40";
+ sha256 = "00f5ja1yslrjclx3sf29mzpcsrpfd15kkw5ygv7n4jsyb4v3xgj6";
+ };
+ }
+ {
+ goPackagePath = "github.com/satori/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b";
+ sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "53403b58ad1b561927d19068c655246f2db79d48";
+ sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
+ };
+ }
+]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch
new file mode 100644
index 000000000000..b1096487fac1
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch
@@ -0,0 +1,13 @@
+diff --git a/main.go b/main.go
+index 4046911..a126bae 100644
+--- a/main.go
++++ b/main.go
+@@ -411,7 +411,7 @@ func main() {
+
+ if configuration.StaticFilesPath != "" {
+ fs := http.FileServer(http.Dir(configuration.StaticFilesPath))
+- r.Handler("GET", "/files/:filename", http.StripPrefix("/files/", fs))
++ r.Handler("GET", "/files/*filepath", http.StripPrefix("/files/", fs))
+ log.Println("Serving static files from " + configuration.StaticFilesPath)
+ }
+
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix
index dab52720a029..8549495e8f82 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:
stdenv.mkDerivation rec {
- version = "0.9.1";
+ version = "0.9.2";
baseName = "wavemon";
name = "${baseName}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "uoaerg";
repo = "wavemon";
rev = "v${version}";
- sha256 = "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg";
+ sha256 = "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix
index dc38648c369c..2d474159359f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix
@@ -19,11 +19,11 @@ python3Packages.buildPythonApplication rec {
# Disable tests that touch network or shell out to commands
checkPhase = ''
- pytest . -k 'not get_channels \
+ pytest . -k "not get_channels \
and not play_video \
and not download_videos \
and not update_all \
- and not add_channel_duplicate'
+ and not add_channel_duplicate"
'';
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix
index 666b30d2c8e7..1413ca72a105 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix
@@ -2,22 +2,16 @@
stdenv.mkDerivation rec {
pname = "zerotierone";
- version = "1.4.6";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
- sha256 = "1f8hh05wx59dc0fbzdzwq05x0gmrdfl4v103wbcyjmzsbazaw6p3";
+ sha256 = "0lky68fjrqjsd62g97jkn5a9hzj53g8wb6d2ncx8s21rknpncdar";
};
preConfigure = ''
- substituteInPlace ./osdep/ManagedRoute.cpp \
- --replace '/usr/sbin/ip' '${iproute}/bin/ip'
-
- substituteInPlace ./osdep/ManagedRoute.cpp \
- --replace '/sbin/ip' '${iproute}/bin/ip'
-
patchShebangs ./doc/build.sh
substituteInPlace ./doc/build.sh \
--replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix
index 2db9ee6d9b3f..0b40e2b71435 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix
@@ -10,16 +10,16 @@ let
in rustPlatform.buildRustPackage rec {
pname = "cached-nix-shell";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "xzfc";
repo = pname;
rev = "v${version}";
- sha256 = "1ni671wr2lrvyz6myaz3v4llrjvq4jc1ygw1m7rvnadzyf3va3lw";
+ sha256 = "0w6khry1ncyqy5h6996xw1f6viw4wdrfji5m8lz9gm487xlq5v0b";
};
- cargoSha256 = "19i39b1yqdf81ql4psr3nfah6ci2mw3ljkv740clqmz088j2av8g";
+ cargoSha256 = "0d4fz0rhqy1n30wfl2pmf76zpp21agr3h0hswp3r5bfnxqp6i54h";
# The BLAKE3 C library is intended to be built by the project depending on it
# rather than as a standalone library.
@@ -29,14 +29,11 @@ in rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ ronn ];
postBuild = ''
- ronn -r cached-nix-shell.1.md
+ make -f nix/Makefile post-build
'';
postInstall = ''
- mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty
- cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib
- cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh
- cp cached-nix-shell.1 $out/share/man/man1
+ make -f nix/Makefile post-install
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/dnadd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/dnadd/default.nix
new file mode 100644
index 000000000000..eff99743f1e1
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/dnadd/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "dnadd";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "JoeLancaster";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/joelancaster/dnadd";
+ description = "Adds packages declaratively on the command line";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ joelancaster ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/nar-serve/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/nar-serve/default.nix
new file mode 100644
index 000000000000..89a38b40a199
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/nar-serve/default.nix
@@ -0,0 +1,31 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, stdenv
+}:
+let
+ pname = "nar-serve";
+ version = "0.3.0";
+
+in
+buildGoModule rec {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "numtide";
+ repo = "nar-serve";
+ rev = "v${version}";
+ sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz";
+ };
+
+ vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs";
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Serve NAR file contents via HTTP";
+ homepage = "https://github.com/numtide/nar-serve";
+ license = licenses.mit;
+ maintainers = with maintainers; [ rizary ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix
index b01f1a41429f..1c35e0ccd51c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix
@@ -4,12 +4,12 @@
}:
mkDerivation {
pname = "nix-output-monitor";
- version = "0.1.0.0";
+ version = "0.1.0.2";
src = fetchFromGitHub {
owner = "maralorn";
repo = "nix-output-monitor";
- sha256 = "1k9fni02y7xb97mkif1k7s0y1xv06hnqbkds35k4gg8mnf5z911i";
- rev = "a0e0b09";
+ sha256 = "0r4348cbmnpawbfa20qw3wnywiqp0jkl5svzl27jrm2yk2g51509";
+ rev = "5bf7534";
};
isLibrary = true;
isExecutable = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix
index c1e844946094..74bbcbd0ae6b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "nixos-generators";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixos-generators";
rev = version;
- sha256 = "04cfhj42c2m7lafir9ksh36n3nhx3x20lhamyk4zc5p3pm1xdbs6";
+ sha256 = "1iwc39hzvzzyndxwbnl3fck7phxnjpnhy8zn4nyp8is1fiw0648v";
};
nativeBuildInputs = [ makeWrapper ];
installFlags = [ "PREFIX=$(out)" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix
index c4d9aae267e7..c2cda02ca255 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix
@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-about";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-about";
- rev = "${version}";
- sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd";
+ rev = version;
+ sha256 = "1jdp5ksxm4rsqhirgl5zwpiahrz2lx046pkvf6xvr6ms70l2xiwj";
};
- cargoSha256 = "1wmw7knkx79fbwizaj9qkcnw0ld1lsfhca8mfpn5f0daxa5v5y97";
+ cargoSha256 = "07bjxsg5kgx8dg3wf6mvi5460db206l68irqc21hz10plz5llmnr";
meta = with lib; {
description = "Cargo plugin to generate list of all licenses for a crate";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
index acd088177803..df492863a142 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
@@ -1,16 +1,16 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "RustSec";
repo = "cargo-audit";
rev = "v${version}";
- sha256 = "0zby9bd64bmrkb229ic7ckn2ycf9bpwsisx2a7z0id0j4mjaca4k";
+ sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1";
};
- cargoSha256 = "1w4618w5yj1205d7s2hq273fb35qfcd7cnxdwxn4pq8x3ahgy4kx";
+ cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh";
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix
index 43a2fccd8789..668a623ee2a5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
description = "Generate Debian packages from information in Cargo.toml";
homepage = "https://github.com/mmstick/cargo-deb";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix
index ef286ae64494..78e428b5c7e9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix
@@ -3,7 +3,6 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
-, xcbuild
, openssl
, libiconv
, Security
@@ -23,13 +22,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1h1sy54p7zxijydnhzvkxli90d72biv1inni17licb0vb9dihmnf";
- nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [
- # The cc crate runs xcbuild. This dependency can be removed once
- # the following PR is merged from staging into master:
- #
- # https://github.com/NixOS/nixpkgs/pull/97000
- xcbuild
- ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [
libiconv
@@ -42,6 +35,6 @@ rustPlatform.buildRustPackage rec {
description = "A utility for managing cargo dependencies from the command line";
homepage = "https://github.com/killercup/cargo-edit";
license = with licenses; [ asl20 /* or */ mit ];
- maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ];
+ maintainers = with maintainers; [ gerschtli jb55 Br1ght0ne killercup ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix
index 5d4eef2fbe5a..185cba66e311 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-outdated";
- version = "0.9.11";
+ version = "0.9.13";
src = fetchFromGitHub {
owner = "kbknapp";
repo = pname;
rev = "v${version}";
- sha256 = "11fdh24366czb3vv2szf5bl0mhsilwvpfc1h4qxq18z2dpb0y18m";
+ sha256 = "1dbhaaw1c3ww0s33r7z8kxks00f9gxv1ppcbmk2fbflhp7caf7fy";
};
- cargoSha256 = "0sr3ijq6vh2269xav03d117kzmg68xiwqsq48xjdrsnn4dx5lizy";
+ cargoSha256 = "0nlfn9g7hrzz72lya2p5qb8wwj66300d33hjhnw2ambpj4347rh4";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix
index b68a8208de1c..d24eb6950f36 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
- version = "0.13.5";
+ version = "0.13.8";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = "v${version}";
- sha256 = "098p6yfq8nlfckr61j3pkimwzrg5xb2i34nxvk2hiv1njl1vrqng";
+ sha256 = "16v93k8d1aq0as4ab1i972bjw410k07gb3s6xdzb1r019gxg2i2h";
};
- cargoSha256 = "07rmp4j4jpzd1rz59wsjmzmj2qkc2x4wrs9pafqrym58ypm8i4gx";
+ cargoSha256 = "1jbp8jbpxnchzinjzv36crszdipxp1myknmrxn7r0ijfjdpigk9r";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix
index 9a3cc23c05ac..1158d10ed296 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
description = "A cargo subcommand for checking and applying updates to installed executables";
homepage = "https://github.com/nabijaczleweli/cargo-update";
license = licenses.mit;
- maintainers = with maintainers; [ gerschtli filalex77 johntitor ];
+ maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cde/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cde/default.nix
index ec6ad6eb55ab..957919e26001 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cde/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cde/default.nix
@@ -5,10 +5,10 @@ stdenv.mkDerivation rec {
version = "0.1";
src = fetchFromGitHub {
- owner = "pgbovine";
- repo = "CDE";
- sha256 = "0raiz7pczkbnzxpg7g59v7gdp1ipkwgms2vh3431snw1va1gjzmk";
+ owner = "usnistgov";
+ repo = "corr-CDE";
rev = "v${version}";
+ sha256 = "sha256-s375gtqBWx0GGXALXR+fN4bb3tmpvPNu/3bNz+75UWU=";
};
# The build is small, so there should be no problem
@@ -18,19 +18,22 @@ stdenv.mkDerivation rec {
preferLocalBuild = true;
patchBuild = ''
- sed '/install/d' $src/Makefile > $src/Makefile
+ sed -i -e '/install/d' $src/Makefile
'';
-
+
+ preBuild = ''
+ patchShebangs .
+ '';
+
installPhase = ''
- mkdir -p $out/bin
- cp cde $out/bin
- cp cde-exec $out/bin
+ install -d $out/bin
+ install -t $out/bin cde cde-exec
'';
meta = with stdenv.lib; {
- homepage = "https://github.com/pgbovine/CDE";
+ homepage = "https://pg.ucsd.edu/cde/manual/";
description = "A packaging tool for building portable packages";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = [ maintainers.rlupton20 ];
platforms = platforms.linux;
# error: architecture aarch64 is not supported by strace
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 5ede7af10bf0..b4cb6d030411 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
stdenv.mkDerivation {
- name = "DisnixWebService-0.9";
+ name = "DisnixWebService-0.10";
src = fetchurl {
- url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz";
- sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl";
+ url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz";
+ sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = ''''${env.out}'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix
index cc6072eb6dc8..f63c7dd737cd 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix
@@ -1,24 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }:
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }:
stdenv.mkDerivation {
- name = "disnix-0.9.1";
+ name = "disnix-0.10";
src = fetchurl {
- url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz";
- sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf";
+ url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz";
+ sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg";
};
- configureFlags = [
- " --with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
- ];
-
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ];
meta = {
description = "A Nix-based distributed service deployment tool";
license = stdenv.lib.licenses.lgpl21Plus;
- maintainers = [ stdenv.lib.maintainers.sander ];
+ maintainers = with stdenv.lib.maintainers; [ sander tomberek ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
index 709c5454e104..2fa7d3ed9d76 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
stdenv.mkDerivation {
- name = "disnixos-0.8";
-
+ name = "disnixos-0.9";
+
src = fetchurl {
- url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz";
- sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91";
+ url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz";
+ sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix
new file mode 100644
index 000000000000..552d2a106fba
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }:
+
+stdenv.mkDerivation rec {
+ version="2020-07-04";
+ name = "dydisnix-${version}";
+
+ src = fetchFromGitHub {
+ owner = "svanderburg";
+ repo = "dydisnix";
+ rev = "e99091f1c2329d562097e35faedee80622d387f0";
+ sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0=";
+ };
+
+ nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
+ buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ];
+ preConfigure = ''
+ ./bootstrap
+ '';
+
+ meta = {
+ description = "A toolset enabling self-adaptive redeployment on top of Disnix";
+ longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems.";
+ license = stdenv.lib.licenses.lgpl21Plus;
+ maintainers = [ stdenv.lib.maintainers.tomberek ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 2485becc9e57..031e926e78a6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl
-, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null
+{ stdenv, fetchurl, netcat
+, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null
, enableApacheWebApplication ? false
, enableAxis2WebService ? false
, enableEjabberdDump ? false
@@ -9,6 +9,9 @@
, enableTomcatWebApplication ? false
, enableMongoDatabase ? false
, enableInfluxDatabase ? false
+, enableSupervisordProgram ? false
+, enableDockerContainer ? true
+, enableLegacy ? false
, catalinaBaseDir ? "/var/tomcat"
, jobTemplate ? "systemd"
, getopt
@@ -20,12 +23,14 @@ assert enableSubversionRepository -> subversion != null;
assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
assert enableInfluxDatabase -> influxdb != null;
+assert enableSupervisordProgram -> supervisor != null;
+assert enableDockerContainer -> docker != null;
stdenv.mkDerivation {
- name = "dysnomia-0.9.1";
+ name = "dysnomia-0.10";
src = fetchurl {
- url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz";
- sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks";
+ url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz";
+ sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
@@ -40,17 +45,22 @@ stdenv.mkDerivation {
(if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat")
(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb")
(if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb")
+ (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord")
+ (if enableDockerContainer then "--with-docker" else "--without-docker")
"--with-job-template=${jobTemplate}"
- ];
+ ] ++ stdenv.lib.optional enableLegacy "--enable-legacy";
- buildInputs = [ getopt ]
+ buildInputs = [ getopt netcat ]
+ ++ stdenv.lib.optional stdenv.isLinux systemd
++ stdenv.lib.optional enableEjabberdDump ejabberd
++ stdenv.lib.optional enableMySQLDatabase mysql.out
++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
++ stdenv.lib.optional enableSubversionRepository subversion
++ stdenv.lib.optional enableMongoDatabase mongodb
++ stdenv.lib.optional enableMongoDatabase mongodb-tools
- ++ stdenv.lib.optional enableInfluxDatabase influxdb;
+ ++ stdenv.lib.optional enableInfluxDatabase influxdb
+ ++ stdenv.lib.optional enableSupervisordProgram supervisor
+ ++ stdenv.lib.optional enableDockerContainer docker;
meta = {
description = "Automated deployment of mutable components and services for Disnix";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix
index c794566e19f1..b00155028651 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix
@@ -2,21 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "0.3.7";
+ version = "0.3.9";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "0ihx6hrzs7wkdz9wzgarmm73dz1fb2bhssmxrgv5nzmkhygn4xfy";
+ sha256 = "173nj6fx2l15shy7s4dngnfqsa10m7qwhi2ia2rr421l7b24ixqq";
};
- cargoSha256 = "0yqg2hagsjaxvrj96qg6k1llkmqdqp792c2844h7fhnhlx6v2wd2";
+ cargoSha256 = "0bjw3fvc430b1jxla25clr75c94p2ms7d94j72d8mirxsiklgsp9";
meta = with lib; {
description = "Mirror installed software on multiple machines";
homepage = "https://github.com/tversteeg/emplace";
license = licenses.agpl3;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/default.nix
index 791dfe755ee4..f9b996b27761 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/default.nix
@@ -1,16 +1,16 @@
# This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gx";
version = "0.14.1";
- rev = "refs/tags/v${version}";
goPackagePath = "github.com/whyrusleeping/gx";
- src = fetchgit {
- inherit rev;
- url = "https://github.com/whyrusleeping/gx";
+ src = fetchFromGitHub {
+ owner = "whyrusleeping";
+ repo = pname;
+ rev = "refs/tags/v${version}";
sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/go/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/go/default.nix
index 652edf95e550..8579ef574d55 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/go/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/gx/go/default.nix
@@ -1,18 +1,18 @@
# This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit
+{ stdenv, buildGoPackage, fetchFromGitHub
, gx
}:
buildGoPackage rec {
pname = "gx-go";
version = "1.9.0";
- rev = "refs/tags/v${version}";
goPackagePath = "github.com/whyrusleeping/gx-go";
- src = fetchgit {
- inherit rev;
- url = "https://github.com/whyrusleeping/gx-go";
+ src = fetchFromGitHub {
+ owner = "whyrusleeping";
+ repo = pname;
+ rev = "refs/tags/v${version}";
sha256 = "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/morph/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/morph/default.nix
index 1a75fa43d4e8..61e4a897f48d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/morph/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/morph/default.nix
@@ -35,7 +35,7 @@ buildGoPackage rec {
outputs = [ "out" "lib" ];
meta = with lib; {
- description = "Morph is a NixOS host manager written in Golang";
+ description = "A NixOS host manager written in Golang";
license = licenses.mit;
homepage = "https://github.com/dbcdk/morph";
maintainers = with maintainers; [adamt johanot];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
index 2ecc64a09b13..f10b90d0173a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
- version = "1.8.0";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "0hg15k9bz5iw7mv4m31rg4f5anfiirr3vjvy16z532vwfh05ixw3";
+ sha256 = "08qz9zfk19iwf8qfv7vmzvbl8w1vpjrry25w3pxsg93gyjw8v7mi";
};
- vendorSha256 = "032l0xrf4ny4ildinxlfjy8sslhcl2krmgnm07dnx999jxlswxym";
+ vendorSha256 = "0qnfd47ykb6g28d3mnfncgmkvqd1myx47x563sxx4lcsq542q83n";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix
index a2add8f8a78e..ebfd730544e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix
@@ -1,15 +1,20 @@
-{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts
-, runtimeShell }:
+{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts, runtimeShell }:
+
python3Packages.buildPythonApplication rec {
+ pname = "nix-update-source";
version = "0.6.3";
- name = "nix-update-source-${version}";
+
src = fetchFromGitHub {
owner = "timbertson";
repo = "nix-update-source";
- rev = "version-0.6.3";
+ rev = "version-${version}";
sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz";
};
+
propagatedBuildInputs = [ nix-prefetch-scripts ];
+
+ doCheck = false;
+
passthru = {
# NOTE: `fetch` should not be used within nixpkgs because it
# uses a non-idiomatic structure. It is provided for use by
@@ -28,6 +33,7 @@ python3Packages.buildPythonApplication rec {
inherit src;
overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; });
};
+
updateScript = ''
#!${runtimeShell}
set -e
@@ -43,6 +49,7 @@ python3Packages.buildPythonApplication rec {
--modify-nix default.nix
'';
};
+
meta = {
description = "Utility to automate updating of nix derivation sources";
maintainers = with lib.maintainers; [ timbertson ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update/default.nix
index bd4ff86c9949..54492d173e82 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-update/default.nix
@@ -1,27 +1,27 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
-, nix
+, nixFlakes
, nix-prefetch
}:
buildPythonApplication rec {
pname = "nix-update";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
- sha256 = "0mw31n7kqfr7fskkxp58b0wprxj1pj6n1zs6ymvvl548gs5rgn2s";
+ sha256 = "12fsxy2rv2dgk8l10ymp10j01jkcbn9w0fv5iyb5db85q4xsrsm5";
};
makeWrapperArgs = [
- "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch ])
+ "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ])
];
checkPhase = ''
- $out/bin/nix-update --help
+ $out/bin/nix-update --help >/dev/null
'';
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix
index e843e655300a..c17a1a82d9f3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -11,8 +11,9 @@ common =
{ lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, bash, coreutils, gzip, gnutar
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
- , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
+ , autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive
+ , lowdown, mdbook
# Used by tests
, gmock
, busybox-sandbox-shell
@@ -32,7 +33,7 @@ common =
version = lib.getVersion name;
is24 = lib.versionAtLeast version "2.4pre";
- isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4";
+ isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4";
VERSION_SUFFIX = suffix;
@@ -40,8 +41,13 @@ common =
nativeBuildInputs =
[ pkgconfig ]
- ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt
- docbook5 docbook_xsl_ns jq ];
+ ++ lib.optionals is24
+ [ autoreconfHook
+ autoconf-archive
+ bison flex
+ lowdown mdbook
+ jq
+ ];
buildInputs =
[ curl openssl sqlite xz bzip2 nlohmann_json
@@ -87,9 +93,9 @@ common =
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
''}
'' +
- # For Nix-2.3, patch around an issue where the Nix configure step pulls in the
+ # For Nix 2.4, patch around an issue where the Nix configure step pulls in the
# build system's bash and other utilities when cross-compiling
- lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) ''
+ lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) ''
mkdir tmp/
substitute corepkgs/config.nix.in tmp/config.nix.in \
--subst-var-by bash ${bash}/bin/bash \
@@ -162,7 +168,7 @@ common =
# This is not cross-compile safe, don't have time to fix right now
# but noting for future travellers.
nativeBuildInputs =
- [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ];
+ [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ];
configureFlags =
[ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
@@ -182,24 +188,24 @@ in rec {
nix = nixStable;
nixStable = callPackage common (rec {
- name = "nix-2.3.7";
+ name = "nix-2.3.9";
src = fetchurl {
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596";
+ sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa";
};
inherit storeDir stateDir confDir boehmgc;
});
nixUnstable = lib.lowPrio (callPackage common rec {
- name = "nix-3.0${suffix}";
- suffix = "pre20200829_f156513";
+ name = "nix-2.4${suffix}";
+ suffix = "pre20201201_5a6ddb3";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87";
- hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro=";
+ rev = "5a6ddb3de14a1684af6c793d663764d093fa7846";
+ sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix
index c761a3a47793..96e6ec3f55a0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl }:
+{ callPackage, fetchurl, fetchpatch }:
callPackage ./generic.nix (rec {
version = "1.7";
@@ -6,4 +6,11 @@ callPackage ./generic.nix (rec {
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
};
+ patches = [
+ # follow redirect in nixos-infect. Remove with the next release.
+ (fetchpatch {
+ url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch";
+ sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0";
+ })
+ ];
})
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/generic.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/generic.nix
index 59d139d28847..564256de35d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/generic.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/generic.nix
@@ -2,11 +2,12 @@
# version args
, src, version
, meta ? {}
+, patches ? null
}:
python2Packages.buildPythonApplication {
name = "nixops-${version}";
- inherit version src;
+ inherit version src patches;
buildInputs = [ libxslt ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
index 89be8b5842ab..c093b2fab0ee 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -1,24 +1,24 @@
{ stdenv
, python3
, fetchFromGitHub
-, nix
+, nixFlakes
, git
, lib
}:
python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
- version = "2.4.2";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
- sha256 = "0qc2m2nr7w7sgpg3yzwfxxpqi9acnw46kj2hlalg5ldjffiqdjxa";
+ sha256 = "1k4i54j5if86qf9dmwm8ybfc4j7ap40y82f03hxfxb7lzq5cqmcv";
};
makeWrapperArgs = [
- "--prefix" "PATH" ":" (lib.makeBinPath [ nix git ])
+ "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
index e306e49c8498..055fc5267c37 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
index 987c834f505d..2a1ebada0020 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "packagekit-qt";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "hughsie";
repo = "PackageKit-Qt";
rev = "v${version}";
- sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk";
+ sha256 = "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6";
};
buildInputs = [ packagekit ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix
index 3def4bfd21fe..777e7292fde0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix
@@ -2,22 +2,17 @@
, fetchurl
, appimageTools
, makeWrapper
-, electron_9
+, electron_11
, openssl
}:
-let
- electron = electron_9;
-
-in
-
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.8.10";
+ version = "0.9.6";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- sha256 = "0jxq7gc1m2flv3wr055bkwhfh73c2cdpspg437dv4yvfvjqsk7mm";
+ sha256 = "0464a5d39g20hif3dz3qr78dqb0cmxbazy0q48j9gkawhxm30c1h";
};
nativeBuildInputs = [ makeWrapper ];
@@ -51,7 +46,7 @@ stdenv.mkDerivation rec {
cp -a ${appimageContents}/usr/share/icons $out/share
# Wrap the application with Electron.
- makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \
+ makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \
--add-flags "$out/share/${pname}/resources/app.asar" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}"
'';
@@ -69,7 +64,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://1password.com/";
license = licenses.unfree;
- maintainers = with maintainers; [ danieldk ];
+ maintainers = with maintainers; [ danieldk timstott ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/acsccid/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/acsccid/default.nix
index 3e61b124fef3..53842cbb1fc4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/acsccid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/acsccid/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers";
+ description = "A PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers";
longDescription = ''
acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card
readers. This library provides a PC/SC IFD handler implementation and
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/aflplusplus/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/aflplusplus/default.nix
index a0ef58ae8b61..8e5db3cd22c9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/aflplusplus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/aflplusplus/default.nix
@@ -124,8 +124,8 @@ let
meta = {
description = ''
- AFL++ is a heavily enhanced version of AFL, incorporating many features and
- improvements from the community.
+ A heavily enhanced version of AFL, incorporating many features
+ and improvements from the community
'';
homepage = "https://aflplus.plus";
license = stdenv.lib.licenses.asl20;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix
index 116ada633c6f..59b723207583 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://aide.sourceforge.net/";
+ homepage = "https://aide.github.io/";
description = "A file and directory integrity checker";
- license = licenses.free;
+ license = licenses.gpl2Plus;
maintainers = [ maintainers.tstrobel ];
platforms = platforms.linux;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/aws-okta/default.nix
index b540be3928a8..340c2cd971c6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/aws-okta/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/aws-okta/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "aws-okta";
- version = "1.0.4";
+ version = "1.0.8";
goPackagePath = "github.com/segmentio/aws-okta";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "segmentio";
repo = "aws-okta";
rev = "v${version}";
- sha256 = "0a7xccnv0x0a6sydif0rvkdbw4jy9gjijajip1ac6m70l20dhl1v";
+ sha256 = "14bg9rdfxkpw00phc8faz4ghiyb0j7a9qai74lidrzplzl139bzf";
};
buildFlags = [ "--tags" "release" ];
@@ -24,7 +24,7 @@ buildGoPackage rec {
inherit version;
description = "aws-vault like tool for Okta authentication";
license = licenses.mit;
- maintainers = [maintainers.imalsogreg];
+ maintainers = with maintainers; [imalsogreg Chili-Man];
homepage = "https://github.com/segmentio/aws-okta";
downloadPage = "https://github.com/segmentio/aws-okta";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch b/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/cargo-lock.patch
index ecbb2b0bab9c..1f8494089477 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/cargo-lock.patch
@@ -1,9 +1,9 @@
-diff --git a/b3sum/Cargo.lock b/b3sum/Cargo.lock
+diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 0000000..1ce7abc
+index 0000000..1dff162
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,495 @@
+@@ -0,0 +1,507 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
@@ -17,9 +17,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "anyhow"
-+version = "1.0.31"
++version = "1.0.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
++checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
+
+[[package]]
+name = "arrayref"
@@ -29,9 +29,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "arrayvec"
-+version = "0.5.1"
++version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "atty"
@@ -46,13 +46,13 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "autocfg"
-+version = "1.0.0"
++version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "b3sum"
-+version = "0.3.4"
++version = "0.3.7"
+dependencies = [
+ "anyhow",
+ "blake3",
@@ -73,12 +73,12 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "blake3"
-+version = "0.3.4"
++version = "0.3.7"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
-+ "cfg-if",
++ "cfg-if 0.1.10",
+ "constant_time_eq",
+ "crypto-mac",
+ "digest",
@@ -87,9 +87,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "cc"
-+version = "1.0.57"
++version = "1.0.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
++checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
+
+[[package]]
+name = "cfg-if"
@@ -98,10 +98,16 @@ index 0000000..1ce7abc
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
+name = "clap"
-+version = "2.33.1"
++version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
@@ -113,64 +119,69 @@ index 0000000..1ce7abc
+]
+
+[[package]]
++name = "const_fn"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
++
++[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
-+name = "crossbeam-deque"
-+version = "0.7.3"
++name = "crossbeam-channel"
++version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
-+ "crossbeam-epoch",
++ "cfg-if 1.0.0",
+ "crossbeam-utils",
-+ "maybe-uninit",
+]
+
+[[package]]
-+name = "crossbeam-epoch"
-+version = "0.8.2"
++name = "crossbeam-deque"
++version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
-+ "autocfg",
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "crossbeam-epoch",
+ "crossbeam-utils",
-+ "lazy_static",
-+ "maybe-uninit",
-+ "memoffset",
-+ "scopeguard",
+]
+
+[[package]]
-+name = "crossbeam-queue"
-+version = "0.2.3"
++name = "crossbeam-epoch"
++version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
++checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+dependencies = [
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "const_fn",
+ "crossbeam-utils",
-+ "maybe-uninit",
++ "lazy_static",
++ "memoffset",
++ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
-+version = "0.7.2"
++version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+dependencies = [
+ "autocfg",
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "const_fn",
+ "lazy_static",
+]
+
+[[package]]
+name = "crypto-mac"
-+version = "0.7.0"
++version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
++checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
+dependencies = [
+ "generic-array",
+ "subtle",
@@ -178,9 +189,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "digest"
-+version = "0.8.1"
++version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
@@ -199,26 +210,27 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "either"
-+version = "1.5.3"
++version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "generic-array"
-+version = "0.12.3"
++version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
++ "version_check",
+]
+
+[[package]]
+name = "getrandom"
-+version = "0.1.14"
++version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+dependencies = [
-+ "cfg-if",
++ "cfg-if 0.1.10",
+ "libc",
+ "wasi",
+]
@@ -231,9 +243,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.15"
++version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
@@ -252,15 +264,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "libc"
-+version = "0.2.71"
++version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-+
-+[[package]]
-+name = "maybe-uninit"
-+version = "2.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+
+[[package]]
+name = "memmap"
@@ -274,9 +280,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "memoffset"
-+version = "0.5.5"
++version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
++checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+dependencies = [
+ "autocfg",
+]
@@ -293,9 +299,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "once_cell"
-+version = "1.4.0"
++version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
+[[package]]
+name = "os_pipe"
@@ -309,9 +315,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "ppv-lite86"
-+version = "0.2.8"
++version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "rand"
@@ -356,9 +362,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "rayon"
-+version = "1.3.1"
++version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
@@ -368,12 +374,12 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "rayon-core"
-+version = "1.7.1"
++version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+dependencies = [
++ "crossbeam-channel",
+ "crossbeam-deque",
-+ "crossbeam-queue",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
@@ -381,9 +387,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "redox_syscall"
-+version = "0.1.56"
++version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "remove_dir_all"
@@ -418,9 +424,9 @@ index 0000000..1ce7abc
+
+[[package]]
+name = "subtle"
-+version = "1.0.0"
++version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
++checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
+
+[[package]]
+name = "tempfile"
@@ -428,7 +434,7 @@ index 0000000..1ce7abc
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+dependencies = [
-+ "cfg-if",
++ "cfg-if 0.1.10",
+ "libc",
+ "rand",
+ "redox_syscall",
@@ -464,6 +470,12 @@ index 0000000..1ce7abc
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
++name = "version_check"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
++
++[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/default.nix
index dd6a538d11d0..d36dfc8e18cb 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/default.nix
@@ -2,25 +2,25 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
- version = "0.3.4";
+ version = "0.3.7";
src = fetchFromGitHub {
owner = "BLAKE3-team";
repo = "BLAKE3";
rev = version;
- sha256 = "02yyv91wvy5w7i05z6f3kzxm5x34a4xgkgmcqxnb0ivsxnnld73h";
+ sha256 = "0r3nj7jbrpb2gkkfa9h6nv6blrbv6dlrhxg131qnh340q1ysh0x7";
};
sourceRoot = "source/b3sum";
- cargoSha256 = "0ycn5788dc925wx28sgfs121w4x7yggm4mnmwij829ka8859bymk";
+ cargoSha256 = "0n8hp83hw7g260vmf4qcicpca75faam7k0zmb0k4cdzsar96gdrr";
- cargoPatches = [ ./add-cargo-lock.patch ];
+ cargoPatches = [ ./cargo-lock.patch ];
meta = {
description = "BLAKE3 cryptographic hash function";
homepage = "https://github.com/BLAKE3-team/BLAKE3/";
- maintainers = with lib.maintainers; [ fpletz ];
+ maintainers = with lib.maintainers; [ fpletz ivan ];
license = with lib.licenses; [ cc0 asl20 ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/update-cargo-lock.sh b/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/update-cargo-lock.sh
new file mode 100755
index 000000000000..8c52ad5cf6c0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/b3sum/update-cargo-lock.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# This updates cargo-lock.patch for the b3sum version listed in default.nix.
+
+set -eu -o verbose
+
+here=$PWD
+version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
+checkout=$(mktemp -d)
+git clone -b "$version" --depth=1 https://github.com/BLAKE3-team/BLAKE3 "$checkout"
+cd "$checkout"
+
+(cd b3sum && cargo generate-lockfile)
+mv b3sum/Cargo.lock ./
+git add -f Cargo.lock
+git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
+
+cd "$here"
+rm -rf "$checkout"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix
index f72c916acf99..53bc45acf8f7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix
@@ -1,8 +1,14 @@
-{ stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }:
+{ stdenv
+, fetchFromGitHub
+, unstableGitUpdater
+, makeWrapper
+, openssl
+, coreutils
+, gnugrep }:
stdenv.mkDerivation {
- pname = "bash-supergenpass-unstable";
- version = "2018-04-18";
+ pname = "bash-supergenpass";
+ version = "unstable-2018-04-18";
nativeBuildInputs = [ makeWrapper ];
@@ -18,6 +24,8 @@ stdenv.mkDerivation {
wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}"
'';
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with stdenv.lib; {
description = "Bash shell-script implementation of SuperGenPass password generation";
longDescription = ''
@@ -36,4 +44,3 @@ stdenv.mkDerivation {
homepage = "https://github.com/lanzz/bash-supergenpass";
};
}
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden/default.nix
index d10a938ea023..c35a4d60e9e7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden/default.nix
@@ -17,11 +17,11 @@ let
pname = "bitwarden";
version = {
- x86_64-linux = "1.22.1";
+ x86_64-linux = "1.23.0";
}.${system} or "";
sha256 = {
- x86_64-linux = "1pbcrkafyjjcsd27s99g511llkz05d9qkny7g15wp6piyyv89k3n";
+ x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg";
}.${system} or "";
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
index c2bb83241861..57e865ef596a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
@@ -8,13 +8,13 @@ let
in rustPlatform.buildRustPackage rec {
pname = "bitwarden_rs";
- version = "1.16.3";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
- sha256 = "1scy8abzy6j1jsms84cg2nqkn1zsxr5mjikp2xh0yl0ckkk13ffn";
+ sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p";
};
nativeBuildInputs = [ pkgconfig ];
@@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
- cargoSha256 = "112mvgq581cms0war5dbni7f7yryjr5agryzn5qx835qkznzar8s";
+ cargoSha256 = "0hv3k5l85nz4syzamranhi237fiwkjnda8v5ssnm2nsmcm7ih9k8";
cargoBuildFlags = [ featuresFlag ];
checkPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
index 8efa1e4bfd3b..786ff5784557 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
- version = "2.16.0b";
+ version = "2.16.1";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
- sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1";
+ sha256 = "1c4fcf8jzgd6636wv903r5msc9z5l56l2i4k93kvb2zvg7qj014w";
};
buildCommand = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/cfssl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/cfssl/default.nix
index 1aef7b5bd567..d926aaca68fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/cfssl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/cfssl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cfssl";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cfssl";
rev = "v${version}";
- sha256 = "07qacg95mbh94fv64y577zyr4vk986syf8h5l8lbcmpr0zcfk0pd";
+ sha256 = "1yzxz2l7h2d3f8j6l9xlm7g9659gsa17zf4q0883s0jh3l3xgs5n";
};
subPackages = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix
index 19dd9e9819af..0065758e1c3f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "chrome-token-signing";
- version = "1.1.2";
+ version = "1.1.2-1";
src = fetchFromGitHub {
owner = "open-eid";
repo = "chrome-token-signing";
rev = "v${version}";
- sha256 = "0fqgci4336fbnd944zx9w37d5ky7i27n6wvlp5zv3hj955ldbh7g";
+ sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln";
};
buildInputs = [ qmake pcsclite pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/clamav/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/clamav/default.nix
index fb523c5299ce..3c09951f24f8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/clamav/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "clamav";
- version = "0.102.4";
+ version = "0.103.0";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
- sha256 = "06rrzyrhnr0rswryijpbbzywr6387rv8qjq8sb8cl3h2d1m45ggf";
+ sha256 = "0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j";
};
# don't install sample config files into the absolute sysconfdir folder
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/clevis/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/clevis/default.nix
index 878e4fc9febf..0b8f50c11901 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/clevis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/clevis/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "clevis";
- version = "14";
+ version = "15";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
- sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd";
+ sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz";
};
nativeBuildInputs = [ meson ninja pkgconfig asciidoc ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/crackxls/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/crackxls/default.nix
index e861d70f7252..aff6bbd028ad 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/crackxls/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/crackxls/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
stdenv.mkDerivation rec {
pname = "crackxls";
version = "0.4";
- src = fetchgit {
- url = "https://github.com/GavinSmith0123/crackxls2003.git";
- rev = "refs/tags/v${version}";
+ src = fetchFromGitHub {
+ owner = "GavinSmith0123";
+ repo = "crackxls2003";
+ rev = "v${version}";
sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/creddump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/creddump/default.nix
index d37c58a51591..ffa2fd2311c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/creddump/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/creddump/default.nix
@@ -7,8 +7,7 @@ python2Packages.buildPythonApplication rec {
src = fetchFromGitLab {
owner = "kalilinux";
repo = "packages/creddump";
- # url-encoding workaround: https://github.com/NixOS/nixpkgs/issues/65796#issuecomment-517829019
- rev = "debian%2F${version}-1kali2"; # %2F = urlquote("/")
+ rev = "debian/${version}-1kali2";
sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/doas/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/doas/default.nix
index 6aa9759affd3..6867256ea90c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/doas/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/doas/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "doas";
- version = "6.6.1";
+ version = "6.8";
src = fetchFromGitHub {
owner = "Duncaen";
repo = "OpenDoas";
rev = "v${version}";
- sha256 = "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn";
+ sha256 = "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb";
};
# otherwise confuses ./configure
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- sed -i '/\(chown\|chmod\)/d' bsd.prog.mk
+ sed -i '/\(chown\|chmod\)/d' GNUmakefile
'';
buildInputs = [ bison pam ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix
index 847d5d0cafb3..0822828eb90b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "doppler";
- version = "3.10.3";
+ version = "3.19.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4";
+ sha256 = "049x8y7zjvpd1gvkrld69dffnf4pawjwm7by71r6z408hwvfqjpa";
};
- vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6";
+ vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";
buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix
index e4caa9c4e18d..1a8329885ba2 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam, enablePython ? false
+{ stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
for file in $FILES; do
substituteInPlace "$file" \
- --replace /bin/mount ${utillinux}/bin/mount \
- --replace /bin/umount ${utillinux}/bin/umount \
+ --replace /bin/mount ${util-linux}/bin/mount \
+ --replace /bin/umount ${util-linux}/bin/umount \
--replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
--replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
--replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/fido2luks/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/fido2luks/default.nix
index 729a3f7297cb..d2a5d91467a8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/fido2luks/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/fido2luks/default.nix
@@ -3,23 +3,29 @@
, fetchFromGitHub
, cryptsetup
, pkg-config
+, clang
+, llvmPackages
}:
rustPlatform.buildRustPackage rec {
pname = "fido2luks";
- version = "0.2.3";
+ version = "0.2.15";
src = fetchFromGitHub {
owner = "shimunn";
repo = pname;
rev = version;
- sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x";
+ sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9";
};
buildInputs = [ cryptsetup ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config clang ];
- cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f";
+ configurePhase = ''
+ export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
+ '';
+
+ cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k";
meta = with stdenv.lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/fpm2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/fpm2/default.nix
index aff4e1ee1ec4..2f297ffd6b79 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/fpm2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/fpm2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnupg gtk2 libxml2 intltool ];
meta = {
- description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements";
+ description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements";
homepage = "https://als.regnet.cz/fpm2/";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/genpass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/genpass/default.nix
index 4310d3a8919f..6818af194b3a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/genpass/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/genpass/default.nix
@@ -1,5 +1,5 @@
{ stdenv
-, fetchFromGitHub
+, fetchgit
, rustPlatform
, CoreFoundation
, libiconv
@@ -7,22 +7,21 @@
}:
rustPlatform.buildRustPackage rec {
pname = "genpass";
- version = "0.4.1";
+ version = "0.4.9";
- src = fetchFromGitHub {
- owner = "cyplo";
- repo = pname;
+ src = fetchgit {
+ url = "https://git.sr.ht/~cyplo/genpass";
rev = "v${version}";
- sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini";
+ sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9";
};
- cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
+ cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
meta = with stdenv.lib; {
description = "A simple yet robust commandline random password generator";
- homepage = "https://github.com/cyplo/genpass";
+ homepage = "https://sr.ht/~cyplo/genpass/";
license = licenses.agpl3;
maintainers = with maintainers; [ cyplo ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ghidra/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ghidra/default.nix
index d31e1f2c2758..e11d028f1f8b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/ghidra/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ghidra/default.nix
@@ -14,13 +14,15 @@
};
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
- name = "ghidra-9.1.2";
+ pname = "ghidra";
+ version = "9.2";
+ versiondate = "20201113";
src = fetchzip {
- url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip";
- sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm";
+ url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
+ sha256 = "0lcvmbq04qkdsf0bz509frgw79bhyxyixkqg1k712p3576ng3nby";
};
nativeBuildInputs = [
@@ -62,7 +64,7 @@ in stdenv.mkDerivation {
homepage = "https://ghidra-sre.org/";
platforms = [ "x86_64-linux" ];
license = licenses.asl20;
- maintainers = [ maintainers.ck3d ];
+ maintainers = with maintainers; [ ck3d govanify ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
index de5234961d25..af6893b26e86 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "gnu-pw-mgr";
- version = "2.4.2";
+ version = "2.7.4";
src = fetchurl {
url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz";
- sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
+ sha256 = "0fhwvsmsqpw0vnivarfg63l8pgwqfv7d5wi6l80jpb41dj6qpjz8";
};
buildInputs = [ gnulib ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
index e173f66f7483..04af88e33352 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://gnupg-pkcs11.sourceforge.net/";
license = licenses.bsd3;
- maintainers = with maintainers; [ lschuermann philandstuff ];
+ maintainers = with maintainers; [ matthiasbeyer philandstuff ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg/22.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg/22.nix
index 48271a2f5bcb..9acd64a2c86e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg/22.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gnupg/22.nix
@@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false;
stdenv.mkDerivation rec {
pname = "gnupg";
- version = "2.2.23";
+ version = "2.2.24";
src = fetchurl {
url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
- sha256 = "0p6ss4f3vlkf91pmp27bmvfr5bdxxi0pb3dmxpqljglbsx4mxd8h";
+ sha256 = "0ilcp7m1dvwnri3i7q9wanf5pvhwxk7h106pd62g0d5fz80b944h";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -71,6 +71,9 @@ stdenv.mkDerivation rec {
# add gpg2 symlink to make sure git does not break when signing commits
ln -s $out/bin/gpg $out/bin/gpg2
+
+ # Make libexec tools available in PATH
+ ln -s -t $out/bin $out/libexec/*
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gobuster/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gobuster/default.nix
index 6e049917de2c..cc436a16b587 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/gobuster/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gobuster/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gobuster";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "OJ";
repo = "gobuster";
rev = "v${version}";
- sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym";
+ sha256 = "0nal2g5c6z46x6337yh0s6mqgnsigp91i7mp1l3sa91p5ihk71wr";
};
- vendorSha256 = "0kr9i2nm5csf3070hwaiss137pfa3088xbw2zigp7aqb2naky036";
+ vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix
index 63752b5f1235..afc08d88a590 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxdumptool";
- version = "6.1.2";
+ version = "6.1.4";
src = fetchFromGitHub {
owner = "ZerBea";
repo = "hcxdumptool";
rev = version;
- sha256 = "0y73a5p23rg4zx6vkgpq1p3j2dzqcvzwn1ymswfkqm5zihbi17d7";
+ sha256 = "14rwcchqpsxyzvk086d7wbi5qlcxj4jcmafzgvkwzrpbspqh8p24";
};
buildInputs = [ openssl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix
index 71146b15ea3d..a46acef81d75 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix
@@ -10,7 +10,7 @@ let
src = fetchFromGitHub {
owner = "google";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix
index 80634b7d1a1c..4963f5774875 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ipscan";
- version = "3.7.1";
+ version = "3.7.3";
src = fetchurl {
url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb";
- sha256 = "1l6l3nb1yq0f09ia3k9k1dcpzp9g1hxnf547pqmiyiqvd27n7shs";
+ sha256 = "18vvjqsxkz9g503k983cxdzzz6sdkv6qg3nwf8af9k34ynhhh0m7";
};
sourceRoot = ".";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/jadx/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/jadx/default.nix
index 961f1e6954a1..770062736bf1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/jadx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/jadx/default.nix
@@ -2,13 +2,13 @@
let
pname = "jadx";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "skylot";
repo = pname;
rev = "v${version}";
- sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg";
+ sha256 = "1w1wc81mkjcsgjbrihbsphxkcmwnfnf555pmlsd2vs2a04nki01y";
};
deps = stdenv.mkDerivation {
@@ -33,7 +33,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps";
+ outputHash = "05fsycpd90dbak2vgdpd9cz08liq5j78ag9ry9y1s62ld776g0hz";
};
in stdenv.mkDerivation {
inherit pname version src;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/jd-gui/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/jd-gui/default.nix
index c4b7706c266b..91c092922f04 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/jd-gui/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/jd-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }:
+{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }:
let
pname = "jd-gui";
@@ -55,9 +55,9 @@ let
}
'';
- desktopItem = launcher: makeDesktopItem {
+ desktopItem = makeDesktopItem {
name = "jd-gui";
- exec = "${launcher} %F";
+ exec = "jd-gui %F";
icon = "jd-gui";
comment = "Java Decompiler JD-GUI";
desktopName = "JD-GUI";
@@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
inherit pname version src;
name = "${pname}-${version}";
- nativeBuildInputs = [ jdk gradle_5 ];
+ nativeBuildInputs = [ jdk gradle_5 copyDesktopItems ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -81,6 +81,8 @@ in stdenv.mkDerivation rec {
installPhase = let
jar = "$out/share/jd-gui/${name}.jar";
in ''
+ runHook preInstall
+
mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps}
cp build/libs/${name}.jar ${jar}
cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png
@@ -92,9 +94,11 @@ in stdenv.mkDerivation rec {
EOF
chmod +x $out/bin/jd-gui
- ${(desktopItem "$out/bin/jd-gui").buildCommand}
+ runHook postInstall
'';
+ desktopItems = [ desktopItem ];
+
meta = with stdenv.lib; {
description = "Fast Java Decompiler with powerful GUI";
homepage = "https://java-decompiler.github.io/";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix
index b61a39d603b0..78935040fe14 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
- sha256 = "1zyggdsnxzdbfyxk5jcx9r4ra049ddb51krc81s6nik27d5nivmf";
+ sha256 = "0n83d4zvy74rn38fqq84lm58l24c3r87m2di2sw4cdr1hkjg3nbl";
};
- cargoSha256 = "0yxqn8jhcj4rxp0g77jsdp02g5qbc0axaaz1j4gp1bkcww6a9k7v";
+ cargoSha256 = "0kafyljn3b87k5m0wdii0gfa4wj1yfys8jqx79inj82m0w1khprk";
nativeBuildInputs = [ installShellFiles ]
++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/default.nix
index bd1ee471b7a2..ddc83ce0ce62 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "keybase";
- version = "5.5.1";
+ version = "5.5.2";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
- sha256 = "03y69zmzbnfay173xkbzvnhh8zjjd2rfnqmpgr0wvh1psn7mgpsh";
+ sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj";
};
patches = [
@@ -35,7 +35,7 @@ buildGoPackage rec {
homepage = "https://www.keybase.io/";
description = "The Keybase official command-line utility and service";
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ];
+ maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ];
license = licenses.bsd3;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/gui.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/gui.nix
index 20c1bb8f7f16..13a1fed2e308 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/gui.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/keybase/gui.nix
@@ -4,17 +4,17 @@
, runtimeShell, gsettings-desktop-schemas }:
let
- versionSuffix = "20200527202541.39ca0071e5";
+ versionSuffix = "20201016183637.d4ebf7d999";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
- version = "5.5.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+ version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
- sha256 = "1n54a86491aqazqa4rgljbji638nj83ciibqxq46sa2m1php9dfd";
+ sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1";
};
nativeBuildInputs = [
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.keybase.io/";
description = "The Keybase official GUI";
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ];
+ maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ];
license = licenses.bsd3;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/keysmith/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/keysmith/default.nix
index b9ab7bb0b4aa..142e9c1e4a04 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/keysmith/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/keysmith/default.nix
@@ -10,30 +10,25 @@
, qtgraphicaleffects
, kirigami2
, oathToolkit
+, ki18n
+, libsodium
}:
mkDerivation rec {
pname = "keysmith";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "KDE";
repo = "keysmith";
rev = "v${version}";
- sha256 = "15fzf0bvarivm32zqa5w71mscpxdac64ykiawc5hx6kplz93bsgx";
+ sha256 = "1gvzw23mly8cp7ag3xpbngpid9gqrfj8cyv9dar6i9j660bh03km";
};
nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
- buildInputs = [ oathToolkit kirigami2 qtquickcontrols2 qtbase ];
-
- postInstall = ''
- mv $out/bin/org.kde.keysmith $out/bin/.org.kde.keysmith-wrapped
- makeWrapper $out/bin/.org.kde.keysmith-wrapped $out/bin/org.kde.keysmith \
- --set QML2_IMPORT_PATH "${lib.getLib kirigami2}/lib/qt-5.12.7/qml:${lib.getBin qtquickcontrols2}/lib/qt-5.12.7/qml:${lib.getBin qtdeclarative}/lib/qt-5.12.7/qml:${qtgraphicaleffects}/lib/qt-5.12.7/qml" \
- --set QT_PLUGIN_PATH "${lib.getBin qtbase}/lib/qt-5.12.7/plugins"
- ln -s $out/bin/org.kde.keysmith $out/bin/keysmith
- '';
+ buildInputs = [ libsodium ki18n oathToolkit kirigami2 qtquickcontrols2 qtbase ];
+ propagatedBuildInput = [ oathToolkit ];
meta = with lib; {
description = "OTP client for Plasma Mobile and Desktop";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix
index 09916f85f9e6..12e2bb03d38d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
- version = "3.4";
+ version = "3.6";
pname = "kpcli";
src = fetchurl {
url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
- sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0";
+ sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1";
};
buildInputs = [ makeWrapper perl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/lynis/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/lynis/default.nix
index d7f42479d0b4..9bbbc455b9b3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/lynis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/lynis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
- sha256 = "05p8h2ww4jcc6lgxrm796cbvlfmw26rxq5fmw0xxavbpadiw752j";
+ sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index 457c6249ca00..4df0d2235a05 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.90"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index 7142983f98cc..8ef6d3b3148a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,16 +1,16 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: 592eedc5584953fb94b01a9aae48ec04d2cf153a
- ref: refs/tags/5.0.90
+ revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58
+ ref: refs/tags/6.0.12
specs:
- metasploit-framework (5.0.90)
- actionpack (~> 4.2.6)
- activerecord (~> 4.2.6)
- activesupport (~> 4.2.6)
+ metasploit-framework (6.0.12)
+ actionpack (~> 5.2.2)
+ activerecord (~> 5.2.2)
+ activesupport (~> 5.2.2)
aws-sdk-ec2
aws-sdk-iam
aws-sdk-s3
- bcrypt (= 3.1.12)
+ bcrypt
bcrypt_pbkdf
bit-struct
bson
@@ -24,15 +24,16 @@ GIT
faye-websocket
filesize
hrr_rb_ssh (= 0.3.0.pre2)
+ irb
jsobfu
json
metasm
- metasploit-concern (~> 2.0.0)
- metasploit-credential (~> 3.0.0)
- metasploit-model (~> 2.0.4)
- metasploit-payloads (= 1.4.2)
- metasploit_data_models (~> 3.0.10)
- metasploit_payloads-mettle (= 0.5.21)
+ metasploit-concern
+ metasploit-credential
+ metasploit-model
+ metasploit-payloads (= 2.0.22)
+ metasploit_data_models
+ metasploit_payloads-mettle (= 1.0.2)
mqtt
msgpack
nessus_rest
@@ -48,7 +49,7 @@ GIT
patch_finder
pcaprub
pdf-reader
- pg (~> 0.20)
+ pg
railties
rb-readline
recog
@@ -72,7 +73,7 @@ GIT
rex-text
rex-zip
ruby-macho
- ruby_smb
+ ruby_smb (~> 2.0)
rubyntlm
rubyzip
sinatra
@@ -90,73 +91,72 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.3)
- actionpack (4.2.11.3)
- actionview (= 4.2.11.3)
- activesupport (= 4.2.11.3)
- rack (~> 1.6)
- rack-test (~> 0.6.2)
- rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (5.2.4.4)
+ actionview (= 5.2.4.4)
+ activesupport (= 5.2.4.4)
+ rack (~> 2.0, >= 2.0.8)
+ rack-test (>= 0.6.3)
+ rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.11.3)
- activesupport (= 4.2.11.3)
+ actionview (5.2.4.4)
+ activesupport (= 5.2.4.4)
builder (~> 3.1)
- erubis (~> 2.7.0)
- rails-dom-testing (~> 1.0, >= 1.0.5)
+ erubi (~> 1.4)
+ rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activemodel (4.2.11.3)
- activesupport (= 4.2.11.3)
- builder (~> 3.1)
- activerecord (4.2.11.3)
- activemodel (= 4.2.11.3)
- activesupport (= 4.2.11.3)
- arel (~> 6.0)
- activesupport (4.2.11.3)
- i18n (~> 0.7)
+ activemodel (5.2.4.4)
+ activesupport (= 5.2.4.4)
+ activerecord (5.2.4.4)
+ activemodel (= 5.2.4.4)
+ activesupport (= 5.2.4.4)
+ arel (>= 9.0)
+ activesupport (5.2.4.4)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
- arel (6.0.4)
+ arel (9.0.0)
arel-helpers (2.11.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.0)
- aws-partitions (1.319.0)
- aws-sdk-core (3.96.1)
+ aws-partitions (1.385.0)
+ aws-sdk-core (3.109.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.162.0)
- aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sdk-ec2 (1.202.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.37.0)
- aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sdk-iam (1.46.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kms (1.31.0)
- aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sdk-kms (1.39.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.66.0)
- aws-sdk-core (~> 3, >= 3.96.1)
+ aws-sdk-s3 (1.83.1)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.1.3)
- aws-eventstream (~> 1.0, >= 1.0.2)
- bcrypt (3.1.12)
+ aws-sigv4 (1.2.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ bcrypt (3.1.16)
bcrypt_pbkdf (1.0.1)
- bindata (2.4.7)
+ bindata (2.4.8)
bit-struct (0.16)
- bson (4.8.2)
+ bson (4.11.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
crass (1.0.6)
daemons (1.3.1)
- dnsruby (1.61.3)
- addressable (~> 2.5)
+ dnsruby (1.61.4)
+ simpleidn (~> 0.1)
ed25519 (1.2.4)
- em-http-request (1.1.5)
+ em-http-request (1.1.7)
addressable (>= 2.3.4)
cookiejar (!= 0.3.1)
em-socksify (>= 0.3)
@@ -164,13 +164,14 @@ GEM
http_parser.rb (>= 0.6.0)
em-socksify (0.3.2)
eventmachine (>= 1.0.0.beta.4)
- erubis (2.7.0)
+ erubi (1.9.0)
eventmachine (1.2.7)
- faker (2.2.1)
- i18n (>= 0.8)
- faraday (1.0.1)
+ faker (2.14.0)
+ i18n (>= 1.6, < 2)
+ faraday (1.1.0)
multipart-post (>= 1.2, < 3)
- faye-websocket (0.10.9)
+ ruby2_keywords
+ faye-websocket (0.11.0)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
filesize (0.2.0)
@@ -178,21 +179,24 @@ GEM
hrr_rb_ssh (0.3.0.pre2)
ed25519 (~> 1.2)
http_parser.rb (0.6.0)
- i18n (0.9.5)
+ i18n (1.8.5)
concurrent-ruby (~> 1.0)
+ io-console (0.5.6)
+ irb (1.2.7)
+ reline (>= 0.1.5)
jmespath (1.4.0)
jsobfu (0.4.2)
rkelly-remix
- json (2.3.0)
- loofah (2.5.0)
+ json (2.3.1)
+ loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
- metasploit-concern (2.0.5)
- activemodel (~> 4.2.6)
- activesupport (~> 4.2.6)
- railties (~> 4.2.6)
- metasploit-credential (3.0.4)
+ metasploit-concern (3.0.0)
+ activemodel (~> 5.2.2)
+ activesupport (~> 5.2.2)
+ railties (~> 5.2.2)
+ metasploit-credential (4.0.2)
metasploit-concern
metasploit-model
metasploit_data_models (>= 3.0.0)
@@ -202,79 +206,77 @@ GEM
rex-socket
rubyntlm
rubyzip
- metasploit-model (2.0.4)
- activemodel (~> 4.2.6)
- activesupport (~> 4.2.6)
- railties (~> 4.2.6)
- metasploit-payloads (1.4.2)
- metasploit_data_models (3.0.10)
- activerecord (~> 4.2.6)
- activesupport (~> 4.2.6)
+ metasploit-model (3.1.2)
+ activemodel (~> 5.2.2)
+ activesupport (~> 5.2.2)
+ railties (~> 5.2.2)
+ metasploit-payloads (2.0.22)
+ metasploit_data_models (4.1.0)
+ activerecord (~> 5.2.2)
+ activesupport (~> 5.2.2)
arel-helpers
metasploit-concern
- metasploit-model
+ metasploit-model (>= 3.1)
pg
- postgres_ext
- railties (~> 4.2.6)
+ railties (~> 5.2.2)
recog (~> 2.0)
- metasploit_payloads-mettle (0.5.21)
+ metasploit_payloads-mettle (1.0.2)
+ method_source (1.0.0)
mini_portile2 (2.4.0)
- minitest (5.14.1)
+ minitest (5.14.2)
mqtt (0.5.0)
msgpack (1.3.3)
multipart-post (2.1.1)
+ mustermann (1.1.1)
+ ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6)
- net-ldap (0.16.2)
- net-ssh (6.0.2)
+ net-ldap (0.16.3)
+ net-ssh (6.1.0)
network_interface (0.0.2)
nexpose (7.2.1)
- nokogiri (1.10.9)
+ nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
- octokit (4.18.0)
+ octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.2)
+ openssl-cmac (2.0.1)
openvas-omp (0.0.4)
packetfu (1.1.13)
pcaprub
patch_finder (1.0.2)
pcaprub (0.13.0)
- pdf-reader (2.4.0)
+ pdf-reader (2.4.1)
Ascii85 (~> 1.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
- pg (0.21.0)
- pg_array_parser (0.0.9)
- postgres_ext (3.0.1)
- activerecord (~> 4.0)
- arel (>= 4.0.1)
- pg_array_parser (~> 0.0.9)
- public_suffix (4.0.5)
- rack (1.6.13)
- rack-protection (1.5.5)
+ pg (1.2.3)
+ public_suffix (4.0.6)
+ rack (2.2.3)
+ rack-protection (2.1.0)
rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rails-deprecated_sanitizer (1.0.3)
- activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.9)
- activesupport (>= 4.2.0, < 5.0)
- nokogiri (~> 1.6)
- rails-deprecated_sanitizer (>= 1.0.1)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails-dom-testing (2.0.3)
+ activesupport (>= 4.2.0)
+ nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
- railties (4.2.11.3)
- actionpack (= 4.2.11.3)
- activesupport (= 4.2.11.3)
+ railties (5.2.4.4)
+ actionpack (= 5.2.4.4)
+ activesupport (= 5.2.4.4)
+ method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
+ thor (>= 0.19.0, < 2.0)
rake (13.0.1)
rb-readline (0.5.5)
- recog (2.3.7)
+ recog (2.3.15)
nokogiri
redcarpet (3.5.0)
+ reline (0.1.6)
+ io-console (~> 0.5)
rex-arch (0.1.13)
rex-text
rex-bin_tools (0.1.6)
@@ -312,21 +314,24 @@ GEM
metasm
rex-core
rex-text
- rex-socket (0.1.23)
+ rex-socket (0.1.24)
rex-core
rex-sslscan (0.1.5)
rex-core
rex-socket
rex-text
rex-struct2 (0.1.2)
- rex-text (0.2.26)
+ rex-text (0.2.28)
rex-zip (0.1.3)
rex-text
rkelly-remix (0.0.7)
- ruby-macho (2.2.0)
+ ruby-macho (2.3.0)
ruby-rc4 (0.1.5)
- ruby_smb (1.1.0)
+ ruby2_keywords (0.0.2)
+ ruby_smb (2.0.6)
bindata
+ openssl-ccm
+ openssl-cmac
rubyntlm
windows_error
rubyntlm (0.6.2)
@@ -334,10 +339,13 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
- sinatra (1.4.8)
- rack (~> 1.5)
- rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
+ simpleidn (0.1.1)
+ unf (~> 0.1.4)
+ sinatra (2.1.0)
+ mustermann (~> 1.0)
+ rack (~> 2.2)
+ rack-protection (= 2.1.0)
+ tilt (~> 2.0)
sqlite3 (1.4.2)
sshkey (2.0.0)
thin (1.7.2)
@@ -350,17 +358,20 @@ GEM
ttfunk (1.6.2.1)
tzinfo (1.2.7)
thread_safe (~> 0.1)
- tzinfo-data (1.2020.1)
+ tzinfo-data (1.2020.4)
tzinfo (>= 1.0.0)
- warden (1.2.7)
- rack (>= 1.0)
- websocket-driver (0.7.1)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.7)
+ warden (1.2.9)
+ rack (>= 2.0.9)
+ websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.4)
+ websocket-extensions (0.1.5)
windows_error (0.1.2)
- xdr (2.0.0)
- activemodel (>= 4.2.7)
- activesupport (>= 4.2.7)
+ xdr (3.0.2)
+ activemodel (>= 4.2, < 7.0)
+ activesupport (>= 4.2, < 7.0)
xmlrpc (0.3.0)
PLATFORMS
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix
index cc3d26fbee0b..a2a0a28bbff6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix
@@ -1,14 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }:
-# Maintainer notes for updating:
-# 1. increment version number in expression and in Gemfile
-# 2. run $ nix-shell --command "bundler install && bundix"
-# in metasploit in nixpkgs
-# 3. run $ sed -i '/[ ]*dependencies =/d' gemset.nix
-# 4. run $ nix-build -A metasploit ../../../../
-# 5. update sha256sum in expression
-# 6. run step 3 again
-
let
env = bundlerEnv {
inherit ruby;
@@ -17,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "5.0.90";
+ version = "6.0.12";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss";
+ sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
};
buildInputs = [ makeWrapper ];
@@ -45,6 +36,9 @@ in stdenv.mkDerivation rec {
'';
+ # run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit
+ passthru.updateScript = ./update.sh;
+
meta = with stdenv.lib; {
description = "Metasploit Framework - a collection of exploits";
homepage = "https://github.com/rapid7/metasploit-framework/wiki";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
index cd3b2a336bda..4879eb922846 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
@@ -4,50 +4,50 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1955wx9m2g776sinamanzlk1jx2dzd34ci3sk22xicp0rmglps37";
+ sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0";
type = "gem";
};
- version = "4.2.11.3";
+ version = "5.2.4.4";
};
actionview = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0glnaq3jx4m9q6vn55xqlsg8dbflqzm99fgsl9fl267mc2mz3qrv";
+ sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6";
type = "gem";
};
- version = "4.2.11.3";
+ version = "5.2.4.4";
};
activemodel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z3777xsm82i7ggkg74mg21sqz8m5dfl8ykjm7xcrhd2nj843fcp";
+ sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m";
type = "gem";
};
- version = "4.2.11.3";
+ version = "5.2.4.4";
};
activerecord = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fpw9vyf2frkxkc6jbq9g78lhhflwz04j89qxj4krvmlq12q8v6d";
+ sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03";
type = "gem";
};
- version = "4.2.11.3";
+ version = "5.2.4.4";
};
activesupport = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i";
+ sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
type = "gem";
};
- version = "4.2.11.3";
+ version = "5.2.4.4";
};
addressable = {
groups = ["default"];
@@ -74,10 +74,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+ sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
type = "gem";
};
- version = "6.0.4";
+ version = "9.0.0";
};
arel-helpers = {
groups = ["default"];
@@ -114,80 +114,80 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11gr3pkd0cq034jdmvmi32sb99hkh91qjrpvc6jchi4lsaiaiqgc";
+ sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb";
type = "gem";
};
- version = "1.319.0";
+ version = "1.385.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6";
+ sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx";
type = "gem";
};
- version = "3.96.1";
+ version = "3.109.1";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xp9kp90ixk1ywd0d8ssbk8dl5kxqnz942yr2qq00m7fd60pihh7";
+ sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08";
type = "gem";
};
- version = "1.162.0";
+ version = "1.202.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09l3g5a2r7gnc6pwln409b9ahwcs6xpnjx2qaj70cbllanyxbw0c";
+ sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7";
type = "gem";
};
- version = "1.37.0";
+ version = "1.46.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm";
+ sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a";
type = "gem";
};
- version = "1.31.0";
+ version = "1.39.0";
};
aws-sdk-s3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13";
+ sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv";
type = "gem";
};
- version = "1.66.0";
+ version = "1.83.1";
};
aws-sigv4 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd";
+ sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
type = "gem";
};
- version = "1.1.3";
+ version = "1.2.2";
};
bcrypt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
+ sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb";
type = "gem";
};
- version = "3.1.12";
+ version = "3.1.16";
};
bcrypt_pbkdf = {
groups = ["default"];
@@ -204,10 +204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "033vd169q751qn3zrsv8j5f80k6wg5yhsy8z3clds6py4vqm6xl8";
+ sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
type = "gem";
};
- version = "2.4.7";
+ version = "2.4.8";
};
bit-struct = {
groups = ["default"];
@@ -224,10 +224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06h8sk2wl7pgrwl15xb1bd6l9ws8sz006rf9cy6n6q7g0iwdalkh";
+ sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm";
type = "gem";
};
- version = "4.8.2";
+ version = "4.11.0";
};
builder = {
groups = ["default"];
@@ -284,10 +284,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "139cbl2k934q7d50g7hi8r4im69ca3iv16y9plq9yc6mgjq1cgfk";
+ sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x";
type = "gem";
};
- version = "1.61.3";
+ version = "1.61.4";
};
ed25519 = {
groups = ["default"];
@@ -304,10 +304,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
+ sha256 = "1azx5rgm1zvx7391sfwcxzyccs46x495vb34ql2ch83f58mwgyqn";
type = "gem";
};
- version = "1.1.5";
+ version = "1.1.7";
};
em-socksify = {
groups = ["default"];
@@ -319,15 +319,15 @@
};
version = "0.3.2";
};
- erubis = {
+ erubi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+ sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
type = "gem";
};
- version = "2.7.0";
+ version = "1.9.0";
};
eventmachine = {
groups = ["default"];
@@ -344,30 +344,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpzpqzpqd9jjzm3ap8182sfbnhdahcxpbg0dssbwq13qdf1s5xs";
+ sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6";
type = "gem";
};
- version = "2.2.1";
+ version = "2.14.0";
};
faraday = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
+ sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
type = "gem";
};
- version = "1.0.1";
+ version = "1.1.0";
};
faye-websocket = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kbp3rjwm74zdj0wy2n1cyyvd7ak4k8i8zva6ib4vqfcv8d2j11a";
+ sha256 = "1cwngdb41zh842y3nzz3cr7z2100pjsl7m3i05yjc1wlyrdk2sm3";
type = "gem";
};
- version = "0.10.9";
+ version = "0.11.0";
};
filesize = {
groups = ["default"];
@@ -414,10 +414,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
type = "gem";
};
- version = "0.9.5";
+ version = "1.8.5";
+ };
+ io-console = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp";
+ type = "gem";
+ };
+ version = "0.5.6";
+ };
+ irb = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g";
+ type = "gem";
+ };
+ version = "1.2.7";
};
jmespath = {
groups = ["default"];
@@ -444,20 +464,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
+ sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
};
loofah = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
+ sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
type = "gem";
};
- version = "2.5.0";
+ version = "2.7.0";
};
metasm = {
groups = ["default"];
@@ -474,72 +494,82 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297";
+ sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2";
type = "gem";
};
- version = "2.0.5";
+ version = "3.0.0";
};
metasploit-credential = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jh1mzvjpsmqamhwjqs6x2bx550mxkqjvl0f1gl1g87w5qvg3w69";
+ sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx";
type = "gem";
};
- version = "3.0.4";
+ version = "4.0.2";
};
metasploit-framework = {
groups = ["default"];
platforms = [];
source = {
fetchSubmodules = false;
- rev = "592eedc5584953fb94b01a9aae48ec04d2cf153a";
- sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss";
+ rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58";
+ sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "5.0.90";
+ version = "6.0.12";
};
metasploit-model = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw";
+ sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig";
type = "gem";
};
- version = "2.0.4";
+ version = "3.1.2";
};
metasploit-payloads = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kddir54jnzl64nsawnvkzdabnmqncq9vav49i1cfschnf4cxc4g";
+ sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb";
type = "gem";
};
- version = "1.4.2";
+ version = "2.0.22";
};
metasploit_data_models = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h59lblfrx8gsnqr10wk958zp6rsjy3qib3hb87s3nm6m1zhm2bc";
+ sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl";
type = "gem";
};
- version = "3.0.10";
+ version = "4.1.0";
};
metasploit_payloads-mettle = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1419z6z0j69zdlkfx3kqgqygsm0ysigwccgn82z5lz82i16krhca";
+ sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk";
type = "gem";
};
- version = "0.5.21";
+ version = "1.0.2";
+ };
+ method_source = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
+ type = "gem";
+ };
+ version = "1.0.0";
};
mini_portile2 = {
groups = ["default"];
@@ -556,10 +586,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+ sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
type = "gem";
};
- version = "5.14.1";
+ version = "5.14.2";
};
mqtt = {
groups = ["default"];
@@ -591,6 +621,16 @@
};
version = "2.1.1";
};
+ mustermann = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
+ type = "gem";
+ };
+ version = "1.1.1";
+ };
nessus_rest = {
groups = ["default"];
platforms = [];
@@ -606,20 +646,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";
+ sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
type = "gem";
};
- version = "0.16.2";
+ version = "0.16.3";
};
net-ssh = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kf4am0mz8mwqhif4iqh5yz9pcbbmja5w707j00sfsgrq19nxqld";
+ sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9";
type = "gem";
};
- version = "6.0.2";
+ version = "6.1.0";
};
network_interface = {
groups = ["default"];
@@ -646,20 +686,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+ sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
type = "gem";
};
- version = "1.10.9";
+ version = "1.10.10";
};
octokit = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6";
+ sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
type = "gem";
};
- version = "4.18.0";
+ version = "4.19.0";
};
openssl-ccm = {
groups = ["default"];
@@ -671,6 +711,16 @@
};
version = "1.2.2";
};
+ openssl-cmac = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k69p0p0ilvqnwskhc0bfax8rwvyk6n4wzarg8qsjdvm13xwx508";
+ type = "gem";
+ };
+ version = "2.0.1";
+ };
openvas-omp = {
groups = ["default"];
platforms = [];
@@ -716,100 +766,70 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy";
+ sha256 = "0987glcd02mqglplmp1camivqx61jsyik21n99vrmi8s2p7h4mbh";
type = "gem";
};
- version = "2.4.0";
+ version = "2.4.1";
};
pg = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh";
- type = "gem";
- };
- version = "0.21.0";
- };
- pg_array_parser = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1034dhg8h53j48sfm373js54skg4vpndjga6hzn2zylflikrrf3s";
- type = "gem";
- };
- version = "0.0.9";
- };
- postgres_ext = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ni1ajzxvc17ba4rgl27cd3645ddbpqpfckv7m08sfgk015hh7dq";
+ sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
type = "gem";
};
- version = "3.0.1";
+ version = "1.2.3";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
- version = "4.0.5";
+ version = "4.0.6";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
+ sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
type = "gem";
};
- version = "1.6.13";
+ version = "2.2.3";
};
rack-protection = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
+ sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
type = "gem";
};
- version = "1.5.5";
+ version = "2.1.0";
};
rack-test = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+ sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
type = "gem";
};
- version = "0.6.3";
- };
- rails-deprecated_sanitizer = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
- type = "gem";
- };
- version = "1.0.3";
+ version = "1.1.0";
};
rails-dom-testing = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
+ sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
type = "gem";
};
- version = "1.0.9";
+ version = "2.0.3";
};
rails-html-sanitizer = {
groups = ["default"];
@@ -826,10 +846,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12f7g5iw1gqjwl2rvfmbgxipds5c475ggalw6qskzzrx9vyc2fpk";
+ sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9";
type = "gem";
};
- version = "4.2.11.3";
+ version = "5.2.4.4";
};
rake = {
groups = ["default"];
@@ -856,10 +876,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j65iary8qkgyrjc3vnjd7dbyjs2bsz2hcg7ndibjk623faxb1wk";
+ sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7";
type = "gem";
};
- version = "2.3.7";
+ version = "2.3.15";
};
redcarpet = {
groups = ["default"];
@@ -871,6 +891,16 @@
};
version = "3.5.0";
};
+ reline = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk";
+ type = "gem";
+ };
+ version = "0.1.6";
+ };
rex-arch = {
groups = ["default"];
platforms = [];
@@ -1006,10 +1036,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07vm17w791vdpr23aqp45kqsjbqgwpqj92a535h6n4fckxgzhg94";
+ sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y";
type = "gem";
};
- version = "0.1.23";
+ version = "0.1.24";
};
rex-sslscan = {
groups = ["default"];
@@ -1036,10 +1066,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17m5zwca15qsd7mqqhi2q530iwsrb7wkqh8qff7pxjxwlxbvsrxx";
+ sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44";
type = "gem";
};
- version = "0.2.26";
+ version = "0.2.28";
};
rex-zip = {
groups = ["default"];
@@ -1066,10 +1096,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k5vvk9d13pixhbram6fs74ibgmr2dngv7bks13npcjb42q275if";
+ sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8";
type = "gem";
};
- version = "2.2.0";
+ version = "2.3.0";
};
ruby-rc4 = {
groups = ["default"];
@@ -1081,15 +1111,25 @@
};
version = "0.1.5";
};
+ ruby2_keywords = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+ type = "gem";
+ };
+ version = "0.0.2";
+ };
ruby_smb = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4";
+ sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66";
type = "gem";
};
- version = "1.1.0";
+ version = "2.0.6";
};
rubyntlm = {
groups = ["default"];
@@ -1121,15 +1161,25 @@
};
version = "0.8.2";
};
+ simpleidn = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w";
+ type = "gem";
+ };
+ version = "0.1.1";
+ };
sinatra = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+ sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
type = "gem";
};
- version = "1.4.8";
+ version = "2.1.0";
};
sqlite3 = {
groups = ["default"];
@@ -1216,40 +1266,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kjywciambyhlkc8ijp3kkx4r24pi9zs7plmxw003mxr6mrhah1w";
+ sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a";
+ type = "gem";
+ };
+ version = "1.2020.4";
+ };
+ unf = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+ unf_ext = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
type = "gem";
};
- version = "1.2020.1";
+ version = "0.0.7.7";
};
warden = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
+ sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26";
type = "gem";
};
- version = "1.2.7";
+ version = "1.2.9";
};
websocket-driver = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
+ sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
type = "gem";
};
- version = "0.7.1";
+ version = "0.7.3";
};
websocket-extensions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
+ sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";
type = "gem";
};
- version = "0.1.4";
+ version = "0.1.5";
};
windows_error = {
groups = ["default"];
@@ -1266,10 +1336,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m";
+ sha256 = "019yzxddyndc7m7basars0m380m27sfcq99vr5hk1ag4ymayqkwr";
type = "gem";
};
- version = "2.0.0";
+ version = "3.0.2";
};
xmlrpc = {
groups = ["default"];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/update.sh b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/update.sh
new file mode 100755
index 000000000000..e4da457c6f57
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/update.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl bundix git libiconv libpcap libxml2 libxslt pkg-config postgresql ruby.devEnv sqlite xmlstarlet nix-update
+
+set -eu -o pipefail
+cd "$(dirname "$(readlink -f "$0")")"
+
+latest=$(curl https://github.com/rapid7/metasploit-framework/releases.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
+echo "Updating metasploit to $latest"
+
+sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile
+
+bundler install
+bundix
+sed -i '/[ ]*dependencies =/d' gemset.nix
+
+cd "../../../../"
+nix-update metasploit --version "$latest"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ncrack/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ncrack/default.nix
new file mode 100644
index 000000000000..e377d9748645
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ncrack/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "ncrack";
+ version = "0.7";
+
+ src = fetchFromGitHub {
+ owner = "nmap";
+ repo = "ncrack";
+ rev = version;
+ sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g";
+ };
+
+ buildInputs = [ openssl zlib ];
+
+ meta = with stdenv.lib; {
+ description = "Network authentication tool";
+ homepage = "https://nmap.org/ncrack/";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ siraben ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/default.nix
index f03a794b6800..bd543154494c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
- version = "7.90";
+ version = "7.80";
src = fetchurl {
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
- sha256 = "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm";
+ sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw";
};
patches = [ ./zenmap.patch ]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/qt.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/qt.nix
index 2dcd7fed0c4b..216186daa5be 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/qt.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/nmap/qt.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
-, dnsutils, nmap
-, qtbase, qtscript, qtwebengine }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, wrapQtAppsHook
+, dnsutils
+, nmap
+, qtbase
+, qtscript
+, qtwebengine
+}:
stdenv.mkDerivation rec {
pname = "nmapsi4";
- version = "0.4.80-20180430";
+ version = "0.5-alpha2";
src = fetchFromGitHub {
owner = "nmapsi4";
repo = "nmapsi4";
- rev = "d7f18e4c1e38dcf9c29cb4496fe14f9ff172861a";
- sha256 = "10wqyrjzmad1g7lqa65rymbkna028xbp4xcpj442skw8gyrs3994";
+ rev = "v${version}";
+ sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
};
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
@@ -47,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Qt frontend for nmap";
- license = licenses.gpl2;
+ license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
inherit (src.meta) homepage;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/notary/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/notary/default.nix
index 15797fc86650..020f37c836ba 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/notary/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/notary/default.nix
@@ -36,7 +36,7 @@ buildGoPackage rec {
'';
meta = with stdenv.lib; {
- description = "Notary is a project that allows anyone to have trust over arbitrary collections of data";
+ description = "A project that allows anyone to have trust over arbitrary collections of data";
longDescription = ''
The Notary project comprises a server and a client for running and
interacting with trusted collections. See the service architecture
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/onioncircuits/default.nix
index 0eb0f7b401ee..92888a8de2a1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/onioncircuits/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/onioncircuits/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
+{ stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }:
-pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "onioncircuits";
version = "0.5";
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ intltool ];
buildInputs = [ intltool gtk3 gobject-introspection ];
- propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ];
+ propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ];
postFixup = ''
wrapProgram "$out/bin/onioncircuits" \
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/opensc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/opensc/default.nix
index 103345abf61b..735f7558e7a8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/opensc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/opensc/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
-, libiconv, pcsclite, libassuan, libXt, fetchpatch
+, libiconv, pcsclite, libassuan, libXt
, docbook_xsl, libxslt, docbook_xml_dtd_412
, Carbon, PCSC, buildPackages
, withApplePCSC ? stdenv.isDarwin
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "opensc";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "OpenSC";
rev = version;
- sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv";
+ sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o=";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/default.nix
index 76b90d5b8858..354437a9bd56 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/default.nix
@@ -1,9 +1,9 @@
{ stdenv, lib, pkgs, fetchurl, buildEnv
-, coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps
-, qrencode , makeWrapper, pass, symlinkJoin
+, coreutils, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl
+, which, procps , qrencode , makeWrapper, pass, symlinkJoin
, xclip ? null, xdotool ? null, dmenu ? null
-, x11Support ? !stdenv.isDarwin
+, x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support
, waylandSupport ? false, wl-clipboard ? null
# For backwards-compatibility
@@ -12,9 +12,11 @@
with lib;
-assert x11Support -> xclip != null
- && xdotool != null
- && dmenu != null;
+assert x11Support -> xclip != null;
+
+assert dmenuSupport -> dmenu != null
+ && xdotool != null
+ && x11Support;
assert waylandSupport -> wl-clipboard != null;
@@ -32,11 +34,15 @@ let
postBuild = ''
files=$(find $out/bin/ -type f -exec readlink -f {} \;)
- rm $out/bin
- mkdir $out/bin
+ if [ -L $out/bin ]; then
+ rm $out/bin
+ mkdir $out/bin
+ fi
for i in $files; do
- ln -sf $i $out/bin/$(basename $i)
+ if ! [ "$(readlink -f "$out/bin/$(basename $i)")" = "$i" ]; then
+ ln -sf $i $out/bin/$(basename $i)
+ fi
done
wrapProgram $out/bin/pass \
@@ -72,14 +78,16 @@ stdenv.mkDerivation rec {
# himself.
mkdir -p "$out/share/emacs/site-lisp"
cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
- '' + optionalString x11Support ''
+ '' + optionalString dmenuSupport ''
cp "contrib/dmenu/passmenu" "$out/bin/"
'';
wrapperPath = with stdenv.lib; makeBinPath ([
coreutils
+ findutils
getopt
git
+ gnugrep
gnupg
gnused
tree
@@ -87,7 +95,8 @@ stdenv.mkDerivation rec {
qrencode
procps
] ++ optional stdenv.isDarwin openssl
- ++ ifEnable x11Support [ dmenu xclip xdotool ]
+ ++ optional x11Support xclip
+ ++ optionals dmenuSupport [ xdotool dmenu ]
++ optional waylandSupport wl-clipboard);
postFixup = ''
@@ -98,7 +107,7 @@ stdenv.mkDerivation rec {
# Ensure all dependencies are in PATH
wrapProgram $out/bin/pass \
--prefix PATH : "${wrapperPath}"
- '' + stdenv.lib.optionalString x11Support ''
+ '' + stdenv.lib.optionalString dmenuSupport ''
# We just wrap passmenu with the same PATH as pass. It doesn't
# need all the tools in there but it doesn't hurt either.
wrapProgram $out/bin/passmenu \
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch
new file mode 100644
index 000000000000..55822f170d14
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch
@@ -0,0 +1,41 @@
+From 611cb2de31a460789c44615d3a52b8d24dbd6fdd Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Fri, 4 Dec 2020 21:53:52 +0100
+Subject: [PATCH] Fix installation with Nix
+
+---
+ Makefile | 2 +-
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2febf4e..8feab91 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@ all:
+ @echo
+
+ install:
+- @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build
++ @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build --prefix=
+ @echo
+ @echo "pass-import is installed succesfully"
+ @echo
+diff --git a/setup.py b/setup.py
+index b30870c..d9fedbc 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,8 +15,8 @@ with Path('pass_import', '__about__.py').open() as file:
+ with open('README.md') as file:
+ long_description = file.read()
+
+-share = Path(sys.prefix, 'share')
+-lib = Path('/usr', 'lib', 'password-store', 'extensions')
++share = Path('/share')
++lib = Path('/lib', 'password-store', 'extensions')
+ if '--user' in sys.argv:
+ lib = Path.home() / '.password-store' / 'extensions'
+ if 'XDG_DATA_HOME' in os.environ:
+--
+2.28.0
+
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix
index 144d13238f26..ec0f23ddc383 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix
@@ -30,7 +30,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ pythonEnv ];
nativeBuildInputs = [ makeWrapper ];
- doCheck = true;
+ # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError
+ doCheck = !stdenv.isDarwin;
checkInputs = [ pythonPackages.green pass gnupg ];
checkPhase = ''
${pythonEnv}/bin/python3 setup.py green -q
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix
index 48db0094db94..d45e35d9bbc0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pass-genphrase";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "congma";
repo = "pass-genphrase";
rev = version;
- sha256 = "1sdkmz5s6wdx4vdlgqf5kmyrm17zwzy3n52s13qpx32bnnajap1h";
+ sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
};
dontBuild = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
index cc5f0c94e119..885dd05110f3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
@@ -5,48 +5,38 @@ let
p.defusedxml
p.setuptools
p.pyaml
+ p.pykeepass
+ p.filemagic
+ p.cryptography
+ p.secretstorage
]);
in stdenv.mkDerivation rec {
pname = "pass-import";
- version = "2.6";
+ version = "3.1";
src = fetchFromGitHub {
owner = "roddhjav";
repo = "pass-import";
rev = "v${version}";
- sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac";
+ sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
};
+ patches = [ ./0001-Fix-installation-with-Nix.patch ];
+
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ];
- patches = [
- # https://github.com/roddhjav/pass-import/pull/91
- (fetchpatch {
- url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch";
- sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h";
- })
- ];
-
- postPatch = ''
- sed -i -e 's|$0|${pass}/bin/pass|' import.bash
- '';
-
- dontBuild = true;
-
- installFlags = [
- "PREFIX=$(out)"
- "BASHCOMPDIR=$(out)/etc/bash_completion.d"
- ];
+ makeFlags = [ "DESTDIR=${placeholder "out"}" ];
- postFixup = ''
- install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py
+ postInstall = ''
+ wrapProgram $out/bin/pimport \
+ --prefix PATH : "${pythonEnv}/bin" \
+ --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}"
wrapProgram $out/lib/password-store/extensions/import.bash \
--prefix PATH : "${pythonEnv}/bin" \
- --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \
- --run "export PREFIX"
+ --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}"
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/update.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/update.nix
index b2f331f13757..c364c341bda5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/update.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/update.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace Makefile \
- --replace "BASHCOMPDIR ?= /etc/bash_completion.d" "BASHCOMPDIR ?= $out/etc/bash_completion.d"
+ --replace "BASHCOMPDIR ?= /etc/bash_completion.d" "BASHCOMPDIR ?= $out/share/bash-completion/completions"
'';
dontBuild = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
index b3c086488629..d46aac93e86b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pass, rofi, coreutils, utillinux, xdotool, gnugrep
+{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep
, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
(pass.withExtensions (ext: [ ext.pass-otp ]))
pwgen
rofi
- utillinux
+ util-linux
xclip
xdotool
];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix
index 26ae27dff6b2..69ea8c0f9c2c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }:
+{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles
+, Foundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "rage";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
- sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq";
+ sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc=";
};
- cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6";
+ cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs=";
nativeBuildInputs = [ installShellFiles ];
- buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+ Foundation
+ Security
+ ];
postBuild = ''
cargo run --example generate-docs
@@ -31,7 +35,7 @@ rustPlatform.buildRustPackage rec {
description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
homepage = "https://github.com/str4d/rage";
changelog = "https://github.com/str4d/rage/releases/tag/v${version}";
- license = licenses.asl20;
- maintainers = [ maintainers.marsam ];
+ license = with licenses; [ asl20 mit ]; # either at your option
+ maintainers = with maintainers; [ marsam ryantm ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/rbw/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/rbw/default.nix
index dd7d96c361a9..e8c4b1f541bd 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/rbw/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/rbw/default.nix
@@ -20,15 +20,15 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
- version = "0.4.6";
+ version = "0.5.0";
src = fetchCrate {
inherit version;
- crateName = "${pname}";
- sha256 = "0vq7cwk3i57fvn54q2rgln74j4p9vqm5zyhap94s73swjywicwk0";
+ crateName = pname;
+ sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw";
};
- cargoSha256 = "1h253ncick2v9aki5rf1bdrg5rj3h4nrvx5q01gw03cgwnqvyiiy";
+ cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063";
nativeBuildInputs = [
pkgconfig
@@ -73,7 +73,6 @@ rustPlatform.buildRustPackage rec {
description = "Unofficial command line client for Bitwarden";
homepage = "https://crates.io/crates/rbw";
license = licenses.mit;
- maintainers = with maintainers; [ albakham luc65r ];
- platforms = platforms.all;
+ maintainers = with maintainers; [ albakham luc65r marsam ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/rustscan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/rustscan/default.nix
index 2a2e8c7ec6c5..43b6a3a0afd7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/rustscan/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/rustscan/default.nix
@@ -1,34 +1,35 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, nmap
-}:
+{ stdenv, fetchFromGitHub, rustPlatform, nmap, Security }:
rustPlatform.buildRustPackage rec {
pname = "rustscan";
- version = "1.8.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "RustScan";
repo = pname;
- rev = "${version}";
- sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay";
+ rev = version;
+ sha256 = "0fdbsz1v7bb5dm3zqjs1qf73lb1m4qzkqyb3h3hbyrp9vklgxsgw";
};
- cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8";
+ cargoSha256 = "039xarscwqndpyrr3sgzkhqna3c908zh06id8x2qaykm8l248zs9";
postPatch = ''
substituteInPlace src/main.rs \
--replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")'
'';
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
checkFlags = [
"--skip=infer_ulimit_lowering_no_panic"
"--skip=google_dns_runs"
- "--skip=parse_correct_ips_or_hosts"
+ "--skip=parse_correct_host_addresses"
+ "--skip=parse_hosts_file_and_incorrect_hosts"
+ "--skip=run_perl_script"
+ "--skip=run_python_script"
];
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "Faster Nmap Scanning with Rust";
homepage = "https://github.com/RustScan/RustScan";
license = licenses.gpl3Only;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix
index fc52662e536f..68721bbdebc1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "saml2aws";
- version = "2.27.0";
+ version = "2.27.1";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
- sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc";
+ sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2";
};
runVend = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/scrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/scrypt/default.nix
index 66b5afc9a9b7..e230b2ee4574 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/scrypt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/scrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, utillinux, getconf }:
+{ stdenv, fetchurl, openssl, util-linux, getconf }:
stdenv.mkDerivation rec {
pname = "scrypt";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "test";
- checkInputs = [ utillinux ];
+ checkInputs = [ util-linux ];
meta = with stdenv.lib; {
description = "Encryption utility";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/secp256k1/default.nix
index b5e92a354541..d3b43d6adf69 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/secp256k1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/secp256k1/default.nix
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
# I can't find any version numbers, so we're just using the date of the
# last commit.
- version = "2017-12-18";
+ version = "2020-08-16";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "secp256k1";
- rev = "f54c6c5083307b18224c953cf5870ea7ffce070b";
- sha256 = "0bxqmimm627g9klalg1vdbspmn52588v4a6cli3p8bn84ibsnzbm";
+ rev = "670cdd3f8be25f81472b2d16dcd228b0d24a5c45";
+ sha256 = "0ak2hrr0wznl5d9s905qwn5yds7k22i28d2jp957l4a8yf8cqv3s";
};
buildInputs = optionals enableJNI [ jdk ];
@@ -34,11 +34,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook ];
configureFlags =
- [ "--enable-benchmark=no" "--enable-tests=no" "--enable-exhaustive-tests=no" ] ++
+ [ "--enable-benchmark=no" "--enable-tests=yes" "--enable-exhaustive-tests=no" ] ++
optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++
optionals enableRecovery [ "--enable-module-recovery" ] ++
optionals enableJNI [ "--enable-jni" ];
+ doCheck = true;
+ checkPhase = "./tests";
+
meta = with stdenv.lib; {
description = "Optimized C library for EC operations on curve secp256k1";
longDescription = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/sequoia/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/sequoia/default.nix
index a54433b92c93..aa2a12fc351e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/sequoia/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/sequoia/default.nix
@@ -23,16 +23,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = "sequoia";
rev = "v${version}";
- sha256 = "1870wd03c3x0da9p3jmkvfx8am87ak0dcsvp2qkjvglbl396kd8y";
+ sha256 = "sha256-br5GRzWprQTixNrE0WpNIB7Ayj5oEfyCg5JY4MnX5rA=";
};
- cargoSha256 = "0bb51vdppdjhsxbfy3lyqvw5r5j58r3wi0qb68m2a45k3za7liss";
+ cargoSha256 = "sha256-SpCdoLCtvU9jpG/ivB/+4KhRdKZxN3/+7P/RlR6n9/c=";
nativeBuildInputs = [
pkg-config
@@ -62,6 +62,8 @@ rustPlatform.buildRustPackage rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
+ # Defaults to "ginstall" from some reason, although upstream's Makefiles check uname
+ "INSTALL=install"
];
buildFlags = [
@@ -100,6 +102,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://sequoia-pgp.org/";
license = licenses.gpl3;
maintainers = with maintainers; [ minijackson doronbehar ];
- broken = stdenv.targetPlatform.isDarwin;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/snallygaster/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/snallygaster/default.nix
new file mode 100644
index 000000000000..36ea37edbb9a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/snallygaster/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "snallygaster";
+ version = "0.0.9";
+
+ src = fetchFromGitHub {
+ owner = "hannob";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1gan5asgrxdgfi9lalhxzj3vs7nkazi8nqia36bpz1qb5fz7jrx3";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ urllib3
+ beautifulsoup4
+ dnspython
+ ];
+
+ checkInputs = with python3Packages; [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ # we are not interested in linting the project
+ "--ignore=tests/test_codingstyle.py"
+ ];
+
+ meta = with lib; {
+ description = "Tool to scan for secret files on HTTP servers";
+ homepage = "https://github.com/hannob/snallygaster";
+ license = licenses.cc0;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/snow/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/snow/default.nix
new file mode 100644
index 000000000000..db52d853b7a3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/snow/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "snow";
+ version = "20130616";
+
+ src = fetchurl {
+ url = "https://web.archive.org/web/20200304125913if_/http://darkside.com.au/snow/snow-${version}.tar.gz";
+ sha256 = "0r9q45y55z4i0askkxmxrx0jr1620ypd870vz0hx2a6n9skimdy0";
+ };
+
+ makeFlags = [ "CFLAGS=-O2" ];
+
+ installPhase = ''
+ install -Dm755 snow -t $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Conceal messages in ASCII text by appending whitespace to the end of lines";
+ homepage = "http://www.darkside.com.au/snow/";
+ license = licenses.apsl20;
+ maintainers = with maintainers; [ siraben ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix
new file mode 100644
index 000000000000..f5ae475a45b0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, lib, fetchurl, unzip, jre }:
+
+let
+
+ version = "4.5.0.2216";
+
+ sonarScannerArchPackage = {
+ "x86_64-linux" = {
+ url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-linux.zip";
+ sha256 = "sha256-rmvDb5l2BGV8j94Uhu2kJXwoDAHA3VncAahqGvLY3I0=";
+ };
+ "x86_64-darwin" = {
+ url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-macosx.zip";
+ sha256 = "1g3lldpkrjlvwld9h82hlwclyplxpbk4q3nq59ylw4dhp26kb993";
+ };
+ };
+
+in stdenv.mkDerivation rec {
+ inherit version;
+ pname = "sonar-scanner-cli";
+
+ src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system};
+
+ buildInputs = [ unzip ];
+
+ installPhase = ''
+ mkdir -p $out/lib
+ cp -r lib/* $out/lib/
+ mkdir -p $out/bin
+ cp bin/* $out/bin/
+ mkdir -p $out/conf
+ cp conf/* $out/conf/
+ '';
+
+ fixupPhase = ''
+ substituteInPlace $out/bin/sonar-scanner \
+ --replace "\$sonar_scanner_home/jre" "${lib.getBin jre}"
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/SonarSource/sonar-scanner-cli";
+ description = "SonarQube Scanner used to start code analysis";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ peterromfeldhk ];
+ platforms = builtins.attrNames sonarScannerArchPackage;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 4d58095c43b1..b8f4eeea338f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spectre-meltdown-checker";
- version = "0.43";
+ version = "0.44";
src = fetchFromGitHub {
owner = "speed47";
repo = "spectre-meltdown-checker";
rev = "v${version}";
- sha256 = "1ys5m1yvm26qjlsjpqqd33lwpb880p0ay289hmifxjjawkqddjgg";
+ sha256 = "1b47wlc52jnp2d5c7kbqnxmlm4g3cfbv25q30llv5mlmzs6d7bam";
};
prePatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
index 884a3d90c4f6..2fdc42e52803 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
@@ -2,43 +2,24 @@
python3Packages.buildPythonApplication rec {
pname = "ssh-audit";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "jtesta";
repo = pname;
rev = "v${version}";
- sha256 = "1z1h9nsgfaxdnkr9dvc0yzc23b3wz436rg2fycg2glwjhhal8az7";
+ sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm";
};
- postPatch = ''
- cp ./README.md pypi/sshaudit/
- cp ./ssh-audit.py pypi/sshaudit/sshaudit.py
- mv pypi/* .
- ls -lah
- '';
-
checkInputs = with python3Packages; [
pytestCheckHook
];
- disabledTests = [
- "test_resolve_error"
- "test_resolve_hostname_without_records"
- "test_resolve_ipv4"
- "test_resolve_ipv6"
- "test_resolve_ipv46_both"
- "test_resolve_ipv46_order"
- "test_invalid_host"
- "test_invalid_port"
- "test_not_connected_socket"
- "test_ssh2_server_simple"
- ];
-
meta = with lib; {
description = "Tool for ssh server auditing";
homepage = "https://github.com/jtesta/ssh-audit";
license = licenses.mit;
- maintainers = with maintainers; [ tv ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ tv SuperSandro2000 ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/sshguard/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/sshguard/default.nix
index 6c2298f6729f..6bae0fddc23d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/sshguard/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/sshguard/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--sysconfdir=/etc" ];
meta = with stdenv.lib; {
- description = "SSHGuard protects hosts from brute-force attacks";
+ description = "Protects hosts from brute-force attacks";
longDescription = ''
SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns.
If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked.
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/sudo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/sudo/default.nix
index 8ba10f66396d..ae29eeafd006 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/sudo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/sudo/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
- version = "1.9.3p1";
+ version = "1.9.4";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
- sha256 = "17mldsg5d08s23cskmjxfa81ibnqw3slgf3l4023j72ywi9xxffw";
+ sha256 = "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb";
};
prePatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix
index 97db4a28c458..639926578c7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix
@@ -1,5 +1,5 @@
# This file was generated by go2nix, then modified by hand for Darwin support.
-{ stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }:
+{ stdenv, buildGoPackage, fetchFromGitHub, darwin }:
buildGoPackage rec {
pname = "sudolikeaboss-unstable";
@@ -17,9 +17,8 @@ buildGoPackage rec {
goDeps = ./deps.nix;
- propagatedBuildInputs = with darwin.apple_sdk.frameworks; [
+ buildInputs = with darwin.apple_sdk.frameworks; [
Cocoa
- fixDarwinDylibNames
];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix
index 1bc7bc4ce6b7..b8175ef6dbac 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, libpcap, openssl, libnetfilter_queue, libnfnetlink }:
stdenv.mkDerivation rec {
pname = "thc-ipv6";
- version = "3.6";
+ version = "3.8";
src = fetchFromGitHub {
owner = "vanhauser-thc";
repo = pname;
rev = "v${version}";
- sha256 = "1xjg30z0wzm3xvccv9cgh000i1m79p3m8f0b3s741k0mzyrk8lln";
+ sha256 = "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix
index a3a76dd7b836..04bf598d132a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "tor";
- version = "0.4.4.5";
+ version = "0.4.4.6";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
- sha256 = "09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54";
+ sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az";
};
outputs = [ "out" "geoip" ];
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers;
- [ phreedom doublec thoughtpolice joachifm ];
+ [ phreedom thoughtpolice joachifm prusnak ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix
index 6fe116d7015a..a3352c5abfdc 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "tpm2-abrmd";
- version = "2.3.2";
+ version = "2.3.3";
src = fetchFromGitHub {
owner = "tpm2-software";
repo = pname;
rev = version;
- sha256 = "0jzglnlb700clcq6mjhhgvcq29a6893h888wsn9fbrh4f255sw8q";
+ sha256 = "17nv50w1yh6fg7393vfvys9y13lp0gvxx9vcw2pb87ky551d7xkf";
};
nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ];
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tpm2-software/tpm2-tools";
license = licenses.bsd3;
platforms = platforms.linux;
- maintainers = with maintainers; [ lschuermann ];
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix
index 9e5f48c46f10..4b460e74024b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }:
+{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }:
buildGoPackage rec {
pname = "vault";
- version = "1.5.4";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "0bin0r0qmyz8xal910csbclzc6ng2xv69jszyi69gd6n6f43vqw8";
+ sha256 = "13fasdiijxy87m33wfyd8gylyz556i0bdd7xp706ip2fcckrmz7a";
};
goPackagePath = "github.com/hashicorp/vault";
@@ -24,9 +24,12 @@ buildGoPackage rec {
installShellCompletion vault.bash
'';
+ passthru.tests.vault = nixosTests.vault;
+
meta = with stdenv.lib; {
homepage = "https://www.vaultproject.io/";
description = "A tool for managing secrets";
+ changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
index 457d45111a07..805afe89d31a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
@@ -1,30 +1,26 @@
{ stdenv, fetchurl, unzip }:
let
- version = "1.5.4";
+ version = "1.6.0";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
- sha256 = "1cyk9v70w0px2sxg8dichqgk38br9hc4kdl37jk57ci5gdl6w5ah";
+ sha256 = "0fay6bw31x9kxmc52sh5qp63nfkwji74fbnlx8pj3smz3qnqw143";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
- sha256 = "1n6hmhd4g2c6zzbimslxpghma5dyqwb96w60srbf9gn2vrimg4l4";
+ sha256 = "0bjks9lpgl39cq55c9cyc0glhmyxzs37a2an8ynzza94gv5mgcxa";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
- sha256 = "05d5m8kdwl6mcx3swkasm5zcmddlyl6m9lwj26vbg9pllx9zxvqm";
- };
- i686-darwin = fetchurl {
- url = "${base}/vault_${version}_darwin_386.zip";
- sha256 = "109hisdwd58za541qhw61bscfrh3szzfn8vdmr4c7nh5praiqznb";
+ sha256 = "0hl1k35x78y0hi3y5xjnzby1ygisqjyvdak7s61m9f363nsr1shh";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
- sha256 = "0q8icl5ncvixrdmsd2ilzvpa6c1pswa6zgh3vccsj7sg8mxprjmr";
+ sha256 = "018a5i14x6phhx1axvx0bvqn4ggsimfizs48xbmykgiyfmzkrwgz";
};
};
@@ -47,7 +43,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://www.vaultproject.io";
description = "A tool for managing secrets, this binary includes the UI";
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
license = licenses.mpl20;
maintainers = with maintainers; [ offline psyanticy mkaito ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/volatility/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/volatility/default.nix
index 8cf904c39c5f..4f1e90eb9100 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/security/volatility/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/security/volatility/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- version = "2.6";
pname = "volatility";
+ version = "2.6.1";
- src = fetchurl {
- url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip";
- sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
+ src = fetchFromGitHub {
+ owner = "volatilityfoundation";
+ repo = pname;
+ rev = version;
+ sha256 = "1v92allp3cv3akk71kljcwxr27h1k067dsq7j9h8jnlwk9jxh6rf";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/bfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/bfs/default.nix
index 78e92e01c6ea..c0755fafc06a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/bfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "1.7";
+ version = "2.1";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287";
+ sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb";
};
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/bottom/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/bottom/default.nix
index 498ab1136fa4..8c5e2833212c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/bottom/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/bottom/default.nix
@@ -1,22 +1,28 @@
-{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
+{ stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "bottom";
- version = "0.4.7";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
- sha256 = "rDcJ5XF7L13MKZ8/J4sYD+UqC+HkZvxRtDkY9IVLH50=";
+ sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk=";
};
+ nativeBuildInputs = [ installShellFiles ];
+
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
- cargoSha256 = "XeX6QM0a628mcaptNZkKAvDnGfW5tx+aWNBpMyjz44M=";
+ cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0=";
doCheck = false;
+ postInstall = ''
+ installShellCompletion $releaseDir/build/bottom-*/out/btm.{bash,fish} --zsh $releaseDir/build/bottom-*/out/_btm
+ '';
+
meta = with stdenv.lib; {
description = "A cross-platform graphical process/system monitor with a customizable interface";
homepage = "https://github.com/ClementTsang/bottom";
@@ -25,4 +31,3 @@ rustPlatform.buildRustPackage rec {
platforms = platforms.unix;
};
}
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix
index 677a24599451..feaebc14e0ad 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bpytop";
- version = "1.0.42";
+ version = "1.0.50";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
- sha256 = "04xbzczrd85icld7azvwzw785kmb2c2q22ly21pbi7d89wkys9kh";
+ sha256 = "10j2g19sh2hl5lzbcllr862hkzr0mc1z8n24afzaycn1sphri8fc";
};
buildInputs = [ makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix
index c50bfe4a0d04..9e9b4df80880 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "clinfo";
- version = "2.2.18.04.06";
+ version = "3.0.20.11.20";
src = fetchFromGitHub {
owner = "Oblomov";
repo = "clinfo";
rev = version;
- sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx";
+ sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422";
};
buildInputs = [ ocl-icd opencl-headers ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/ctop/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/ctop/default.nix
index 6cb8e4821608..2b538d66322f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/ctop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/ctop/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ctop";
- version = "0.7.3";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "bcicen";
repo = pname;
rev = "v${version}";
- sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8";
+ sha256 = "0mm1gapnz67mwc346jr530xwpiajq1b2f295s8gz5nrb2a23mqln";
};
- vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw";
+ vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix
index fb06247f9843..29f976998d53 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix
@@ -1,16 +1,19 @@
-{stdenv, fetchurl, perl}:
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+ pname = "daemon";
+ version = "0.7";
-stdenv.mkDerivation {
- name = "daemon-0.6.4";
src = fetchurl {
- url = "http://libslack.org/daemon/download/daemon-0.6.4.tar.gz";
- sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4";
+ url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz";
+ sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn";
};
+
makeFlags = [ "PREFIX=$(out)" ];
buildInputs = [ perl ];
- meta = {
- description = "Daemon turns other process into daemons";
+ meta = with stdenv.lib; {
+ description = "Turns other processes into daemons";
longDescription = ''
Daemon turns other process into daemons. There are many tasks that need
to be performed to correctly set up a daemon process. This can be tedious.
@@ -18,8 +21,8 @@ stdenv.mkDerivation {
writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh,
Java).
'';
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.sander ];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.sander ];
+ platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/facter/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/facter/default.nix
index 170f3109a0a6..2a101bba8865 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/facter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/facter/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
+{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }:
stdenv.mkDerivation rec {
pname = "facter";
- version = "3.14.13";
+ version = "3.14.14";
src = fetchFromGitHub {
- sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39";
+ sha256 = "07pfa11i3nn2dk5g3c1qj3g7d2s8gd2fr0lmfijndaqxm7gjrn1a";
rev = version;
repo = pname;
owner = "puppetlabs";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
+ buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ];
enableParallelBuilding = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/fio/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/fio/default.nix
index 77a85e014734..e0dc69de0e43 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/fio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
- version = "3.22";
+ version = "3.25";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
- sha256 = "16p17l1xbqqkgppvwmfaywknhk4ybafnx8hm56ffd8bls9vaqw5m";
+ sha256 = "1f20ihynwnz8jqqlr73i5glr8ziplz4mmcjgk340mj2yqqcnsqag";
};
buildInputs = [ python zlib ]
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/hostctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/hostctl/default.nix
new file mode 100644
index 000000000000..6f557e05cd12
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/hostctl/default.nix
@@ -0,0 +1,36 @@
+{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
+
+buildGoModule rec {
+ pname = "hostctl";
+ version = "1.0.14";
+
+ src = fetchFromGitHub {
+ owner = "guumaster";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9";
+ };
+
+ vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ];
+
+ nativeBuildInputs = [ installShellFiles ];
+ postInstall = ''
+ installShellCompletion --cmd hostctl \
+ --bash <($out/bin/hostctl completion bash) \
+ --zsh <($out/bin/hostctl completion zsh)
+ '';
+
+ meta = with lib; {
+ description = "Your dev tool to manage /etc/hosts like a pro!";
+ longDescription = ''
+ This tool gives you more control over the use of your hosts file.
+ You can have multiple profiles and switch them on/off as you need.
+ '';
+ homepage = "https://guumaster.github.io/hostctl/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ blaggacao ];
+ };
+}
+
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/hwinfo/default.nix
index 6b6aa40a0f73..7a212f5bbeeb 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/hwinfo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hwinfo";
- version = "21.70";
+ version = "21.71";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = version;
- sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z";
+ sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix
index 2ede543cd39f..e5747a09f9c5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper
, ps, dnsutils # dig is recommended for multiple categories
, withRecommends ? false # Install (almost) all recommended tools (see --recommends)
-, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode
+, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools
, binutils, tree, upower
, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
@@ -11,7 +11,7 @@ let
prefixPath = programs:
"--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'";
recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
- utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
+ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
lm_sensors smartmontools binutils tree upower
];
recommendedDisplayInformationPrograms = lib.optionals
@@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
- version = "3.1.08-1";
+ version = "3.1.09-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
- sha256 = "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a";
+ sha256 = "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5";
};
buildInputs = [ perl makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/jump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/jump/default.nix
index d8e838dd3607..d91df3232c8a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/jump/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/jump/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
'';
meta = with lib; {
- description = "Jump helps you navigate faster by learning your habits";
+ description = "Navigate directories faster by learning your habits";
longDescription = ''
Jump integrates with the shell and learns about your
navigational habits by keeping track of the directories you visit. It
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/memtester/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/memtester/default.nix
index 7b065c6cfa88..870d7e0dd1db 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/memtester/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/memtester/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "memtester";
- version = "4.3.0";
+ version = "4.5.0";
preConfigure = ''
echo "$CC" > conf-cc
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
- sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr";
+ sha256 = "0dxfwayns3hjjplkxkpkm1409lmjlpi4chcrahcvdbnl0q6jpmcf";
};
installFlags = [ "INSTALLPATH=$(out)" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/mlc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/mlc/default.nix
new file mode 100644
index 000000000000..d055c98e04cb
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/mlc/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, patchelf }:
+stdenv.mkDerivation rec {
+ pname = "mlc";
+ version = "3.9";
+
+ src = fetchurl {
+ url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz";
+ sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb";
+ };
+
+ sourceRoot = "Linux";
+
+ installPhase = ''
+ install -Dm755 mlc $out/bin/mlc
+ '';
+
+ nativeBuildInputs = [ patchelf ];
+
+ fixupPhase = ''
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html";
+ description = "Intel Memory Latency Checker";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ basvandijk ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix
index 8be921b385e0..3349749d62e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "monit-5.27.0";
+ name = "monit-5.27.1";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
- sha256 = "197w59wkg6izlj6p7xbx0n6ksvm6pym9pzh24nakl6agcbpxxh6q";
+ sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m";
};
nativeBuildInputs = [ bison flex ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix
index f1bb1f9d62d0..8192dfe6c14d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix
@@ -15,14 +15,14 @@ with stdenv.lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
- version = "1.25.0";
+ version = "1.26.0";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
- sha256 = "0wsgs0slqmj9q5prwlx7d4692lc4c42g0sv35r33vlxnfdwimfh5";
+ sha256 = "0pvl1y1qscwp1chrbmk43xf9ddjxgfm0hcslbdbljjis7ng4gacg";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix
index e2392df495f0..3cf3a1b116bf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "netdata-go.d.plugin";
- version = "0.20.0";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "netdata";
repo = "go.d.plugin";
rev = "v${version}";
- sha256 = "0wd1wg56q955jm5ksq2zqzlms1nlxx7n7vv43l096k1578fv93jv";
+ sha256 = "0cp1asw10a8ndndzq8r57mncrm8521aw3x081vrlfqvhp6qahr3j";
};
- vendorSha256 = "1k84l97fw4s9jdwbka4p168m7l7wil0c4cpijis8ypj3g1xfrw90";
+ vendorSha256 = "16b6i9cpk8j7292qgjvida70rg7nixi6g94wayzikx01vmdbis5r";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/nvtop/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/nvtop/default.nix
index 59636fb5dc80..1b826e6fab4f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/nvtop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/nvtop/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nvtop";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "Syllo";
repo = "nvtop";
rev = version;
- sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4";
+ sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb";
};
cmakeFlags = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
index 69f523773107..1ed1d9135165 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "rocm-smi";
- version = "3.8.0";
+ version = "3.10.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROC-smi";
rev = "rocm-${version}";
- sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz";
+ hash = "sha256-0QqaBMkqRVEl89x3hvWQGAgt7LbtMZPhuf7KenQYHaQ=";
};
format = "other";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix
index 92c13527c6fe..5078adbf3b7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper
+{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq
}:
stdenv.mkDerivation rec {
pname = "rofi-systemd";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "rofi-systemd";
rev = "v${version}";
- sha256 = "1dbygq3qaj1f73hh3njdnmibq7vi6zbyzdc6c0j989c0r1ksv0zi";
+ sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm";
};
buildInputs = [ makeWrapper ];
@@ -22,11 +22,12 @@ stdenv.mkDerivation rec {
'';
wrapperPath = with stdenv.lib; makeBinPath [
- rofi
coreutils
- utillinux
gawk
+ jq
+ rofi
systemd
+ util-linux
];
fixupPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/s6-rc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/s6-rc/default.nix
index 4ddc7fbecc01..328dd3242d84 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/s6-rc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/s6-rc/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-rc";
- version = "0.5.1.2";
- sha256 = "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp";
+ version = "0.5.2.0";
+ sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs";
description = "A service manager for s6-based systems";
platforms = stdenv.lib.platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/s6/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/s6/default.nix
index 3ce97a9d97bd..a0419c2d2ad4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/s6/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6";
- version = "2.9.1.0";
- sha256 = "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5";
+ version = "2.9.2.0";
+ sha256 = "1pfxx50shncg2s47ic4kp02jh1cxfjq75j3mnxjagyzzz0mbfg9n";
description = "skarnet.org's small & secure supervision software suite";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/safe-rm/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/safe-rm/default.nix
index a9fc44e8b40d..c188f066d180 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/safe-rm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/safe-rm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.12";
src = fetchgit {
- url = "https://gitorious.org/safe-rm/mainline.git";
+ url = "https://git.launchpad.net/safe-rm";
rev = "refs/tags/${pname}-${version}";
sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix
index a82db1dbd423..fb1ceaf897b8 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
meta = with stdenv.lib; {
- description =
- "Tool for waiting until a particular time and then running a command.";
+ description = "Tool for waiting until a particular time and then running a command";
maintainers = with maintainers; [ kaction ];
license = licenses.cc0;
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/testdisk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/testdisk/default.nix
index 223d1102e0d4..bbece24bf655 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/testdisk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/testdisk/default.nix
@@ -46,7 +46,7 @@ assert enableQt -> qwt != null;
meta = with stdenv.lib; {
homepage = "https://www.cgsecurity.org/wiki/Main_Page";
downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download";
- description = "Testdisk / Photorec - Data recovery utilities";
+ description = "Data recovery utilities";
longDescription = ''
TestDisk is a powerful free data recovery software. It was primarily
designed to help recover lost partitions and/or make non-booting disks
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/thermald/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/thermald/default.nix
index ae9e29b6f1dc..4c076db7b8c0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/thermald/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/thermald/default.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "thermald";
- version = "2.3";
+ version = "2.4.1";
outputs = [ "out" "devdoc" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "thermal_daemon";
rev = "v${version}";
- sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl";
+ sha256 = "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/thinkfan/default.nix
index 4edcfb63fe56..62c299cce7a3 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/thinkfan/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/thinkfan/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A minimalist fan control program. Originally designed
+ description = "A minimalist fan control program";
+ longDescription = "A minimalist fan control program. Originally designed
specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via
the sysfs hwmon interface (/sys/class/hwmon).";
license = licenses.gpl3;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/throttled/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/throttled/default.nix
index 71bb6dfb357d..b19e4c471c00 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/throttled/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/throttled/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "throttled";
- version = "0.7";
+ version = "0.8";
src = fetchFromGitHub {
owner = "erpalma";
repo = pname;
rev = "v${version}";
- sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4";
+ sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x";
};
nativeBuildInputs = [ python3Packages.wrapPython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix
index d0f814147414..c3241a04587b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tre-command";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "dduan";
repo = "tre";
rev = "v${version}";
- sha256 = "1kb8jwmjhlp9bk08rb6gq3j810cv9bidm28sa417vyykp9a8p2ky";
+ sha256 = "10c8mpqzpw7m3vrm2vl2rx678z3c37hxpqyh3fn83dlh9f4f0j87";
};
- cargoSha256 = "0cqkpvq8b2vnqpkd819cdgh4fqr9yns337fgzah4m40ygs25n9iv";
+ cargoSha256 = "0jd6cfs2zi2n34kirpsy12l76whaqwm1pkqa57w1ms5z658z07wj";
nativeBuildInputs = [ installShellFiles ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/tuptime/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/tuptime/default.nix
index abfc8ae5ac87..213a79fe2700 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/tuptime/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/tuptime/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tuptime";
- version = "5.0.0";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "rfrail3";
repo = "tuptime";
rev = version;
- sha256 = "0izps85p8pxidfrzp7l4hp221fx3dcgapapsix1zavq6jrsl2qyh";
+ sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Total uptime & downtime statistics utility";
homepage = "https://github.com/rfrail3/tuptime";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = [ maintainers.evils ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/uefitool/variants.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/uefitool/variants.nix
index 470c8a0ca4d5..0e8d7285aab6 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/uefitool/variants.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/uefitool/variants.nix
@@ -3,8 +3,8 @@ let
common = opts: libsForQt5.callPackage (import ./common.nix opts) {};
in rec {
new-engine = common rec {
- version = "A57";
- sha256 = "0algfdlxfjs582hsqmagbcmw06p8qlh0k5xczfkscs3prdn2vm7n";
+ version = "A58";
+ sha256 = "131hkyr07fg7rnr938yyj0gk528x3402dhisav221c27v84zb7pn";
installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ];
};
old-engine = common rec {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/zenith/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/zenith/default.nix
index 084dd044feba..35498c4cb563 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/system/zenith/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/system/zenith/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zenith";
- version = "0.10.1";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
- sha256 = "0jz0pjibjiyg0rjmpihxxjhg9cbccvqfr5si5rji585l0zrpdwsg";
+ sha256 = "1cxmgpq07q6vfasnkx3grpx1y0f0dg6irb9kdn17nwrypy44l92d";
};
- cargoSha256 = "1zkx6sr5xlj7pb91bxvqjib5awscy1rmv4g89xb76dahac8fan6z";
+ cargoSha256 = "1kgjj11fwvlk700yp9046b3kiq9ay47fiwqpqfhmlbxw3lsh8qvq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix
index 22a18b1cffb2..205efc414d59 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix
@@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec {
pname = "amber";
- version = "0.5.4";
+ version = "0.5.8";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
- sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn";
+ sha256 = "0j9h9zzg6n4mhq2bqj71k5db595ilbgd9dn6ygmzsm74619q4454";
};
- cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6";
+ cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix
new file mode 100644
index 000000000000..a8702553c4b3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "angle-grinder";
+ version = "0.15.0";
+
+ src = fetchFromGitHub {
+ owner = "rcoh";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091";
+ };
+
+ cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8";
+
+ meta = with stdenv.lib; {
+ description = "Slice and dice logs on the command line";
+ homepage = "https://github.com/rcoh/angle-grinder";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bbigras ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix
new file mode 100644
index 000000000000..79d8c9079c79
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "asciigraph";
+ version = "0.5.1";
+
+ goPackagePath = "github.com/guptarohit/asciigraph";
+
+ src = fetchFromGitHub {
+ owner = "guptarohit";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0aqf64b5d5lf9scvxdx5f3p0vvx5s59mrvr6hcjljg1prksah9ns";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/guptarohit/asciigraph";
+ description = "Lightweight ASCII line graph ╭┈╯ command line app";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.mmahut ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix
new file mode 100644
index 000000000000..fa58d110550e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "chars";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "antifuchs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1pyda3b6svxzc98d7ggl7v9xd0xhilmpjrnajzh77zcwzq42s17l";
+ };
+
+ cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5";
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ meta = with stdenv.lib; {
+ description = "Commandline tool to display information about unicode characters";
+ homepage = "https://github.com/antifuchs/chars";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bbigras ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix
index b7efe02f4cdb..b85d33d887aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dos2unix";
- version = "7.4.1";
+ version = "7.4.2";
src = fetchurl {
url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
- sha256 = "08w6yywzirsxq8bh87jycvvw922ybhc2l426j2iqzliyn1h8mm8w";
+ sha256 = "00dfsf4rfyjb5j12gan8xjiirm0asshdz6dmd3l34a7ays6wadb0";
};
nativeBuildInputs = [ perl gettext ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix
index d15683894a2f..023cc58f4a6b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "fastmod";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = pname;
rev = "v${version}";
- sha256 = "0089a17h0wgan3fs6x1la35lzjs1pib7p81wqkh3zcwvx8ffa8z8";
+ sha256 = "0nrh6h5imbpl7i0sqqm16x9ggazww5739vng1ay1v6sgbbs0a095";
};
- cargoSha256 = "02nkxjwfiljndmi0pv98chfsw9vmjzgmp5r14mchpayp4943qk9m";
+ cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix
index 19ef3aacc6b2..08b588691e50 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix
@@ -5,7 +5,7 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
-let version = "3.5"; in
+let version = "3.6"; in
stdenv.mkDerivation {
pname = "gnugrep";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.xz";
- sha256 = "0jm4hynsqf32rw1j3kv239wzg47qm6glqh6841ar9ay20xvwfamq";
+ sha256 = "0gipv6bzkm1aihj0ncqpyh164xrzgcxcv9r1kwzyk2g1mzl1azk6";
};
# Perl is needed for testing
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix
index 8c98a4aba465..20052f6c4cef 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix
@@ -82,10 +82,6 @@ stdenv.mkDerivation rec {
moveToOutput bin/afmtodit $perl
moveToOutput bin/gperl $perl
moveToOutput bin/chem $perl
- moveToOutput share/groff/${version}/font/devpdf $perl
-
- # idk if this is needed, but Fedora does it
- moveToOutput share/groff/${version}/tmac/pdf.tmac $perl
moveToOutput bin/gpinyin $perl
moveToOutput lib/groff/gpinyin $perl
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac
index 8ef1040ca4a0..776a7abb1da7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac
@@ -14,3 +14,6 @@
. if '\V[GROFF_SGR]'' \
. output x X tty: sgr 0
.\}
+.
+.ds doc-default-operating-system Nixpkgs
+.ds doc-volume-operating-system Nixpkgs
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix
index 5f217e69ea56..f091d867503b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gtranslator";
- version = "3.36.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1lxd2nkji4jk8g2xmyc1a1r3ww710ddk91zh9psmx8xlb4xivaid";
+ sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU=";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix
index a918770aa7b9..e4e80e694fe1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
let
self = stdenv.mkDerivation rec {
pname = "highlight";
- version = "3.57";
+ version = "3.59";
src = fetchFromGitLab {
owner = "saalen";
repo = "highlight";
rev = "v${version}";
- sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf";
+ sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb";
};
enableParallelBuilding = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix
index 51075c2ce174..a9b9e7884021 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
meta = {
- description = "Jsawk is like awk, but for JSON";
+ description = "Like awk, but for JSON";
homepage = "https://github.com/micha/jsawk";
license = stdenv.lib.licenses.publicDomain;
maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix
index 9921862b798e..862faadea3f1 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ];
meta = with lib; {
- homepage = "http://kdiff3.sourceforge.net/";
+ homepage = "https://invent.kde.org/sdk/kdiff3";
license = licenses.gpl2Plus;
description = "Compares and merges 2 or 3 files or directories";
maintainers = with maintainers; [ peterhoeg ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix
index 0dd01d382ed0..fc0ec487ad50 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
- version = "5.0";
+ version = "5.1";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
- sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7";
+ sha256 = "07a2cxsa04lzifphlf5mv88xpnixalmryd0blawblxsmdyhmvg3y";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix
new file mode 100644
index 000000000000..8a521b751d4d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }:
+
+with stdenv.lib;
+
+let
+ perlDeps = with perlPackages; [
+ ConfigOnion DateCalc
+ FileBaseDir YAMLLibYAML
+ GetoptLongDescriptive DateTimeFormatStrptime
+ StringInterpolate
+ ];
+
+in stdenv.mkDerivation rec {
+ pname = "ledger2beancount";
+ version = "2.1";
+
+ src = fetchFromGitHub {
+ owner = "zacchiro";
+ repo = "ledger2beancount";
+ rev = version;
+ sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j";
+ };
+
+ phases = [
+ "unpackPhase"
+ "installPhase"
+ "fixupPhase"
+ ];
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perlPackages.perl beancount ] ++ perlDeps;
+
+ makeFlags = [ "prefix=$(out)" ];
+ installFlags = [ "INSTALL=install" ];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r $src/bin $out/bin
+ '';
+
+ postFixup = ''
+ wrapProgram "$out/bin/ledger2beancount" \
+ --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}"
+ '';
+
+ meta = {
+ description = "Ledger to Beancount text-based converter";
+ longDescription = ''
+ A script to automatically convert Ledger-based textual ledgers to Beancount ones.
+
+ Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved.
+ '';
+ homepage = "https://github.com/zacchiro/ledger2beancount";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ pablovsky ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix
index 0a5eae904736..8e0350177425 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
- sha256 = "1566jabmvafv6aiw5nvb6y2zcnxc7pbb9dl3s4vi6mx21kqp68ag";
+ sha256 = "0nqr5a27i91m71fhpycf60q54qplc920y1fmk9hav3pbb9wcc5dl";
};
- cargoSha256 = "0sa1h3qzdhgk2h3wrc0kg0ajq6zbkvn1ry4672gfn3j9gpgvy2bb";
+ cargoSha256 = "1p72iwl9ca7a92nf6wyjjbn0qns0xxb4xrbz2r2nmd83cxs0fplg";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix
index 277c7417ce96..c89d1526257f 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix
@@ -1,32 +1,47 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }:
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkgconfig
+, asciidoctor
+, openssl
+, Security
+, ansi2html
+, installShellFiles
+}:
rustPlatform.buildRustPackage rec {
pname = "mdcat";
- version = "0.21.1";
+ version = "0.22.1";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "mdcat-${version}";
- hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4=";
+ hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4=";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
- cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs=";
+ cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI=";
checkInputs = [ ansi2html ];
- checkPhase = ''
- # Skip tests that use the network and that include files.
- cargo test -- \
- --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \
- --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \
- --skip magic::tests::detect_mimetype_of_png_image \
- --skip magic::tests::detect_mimetype_of_svg_image \
- --skip resources::tests::read_url_with_http_url_fails_when_status_404 \
- --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \
- --skip iterm2_tests_render_md_samples_images_md
+ # Skip tests that use the network and that include files.
+ checkFlags = [
+ "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length"
+ "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length"
+ "--skip magic::tests::detect_mimetype_of_png_image"
+ "--skip magic::tests::detect_mimetype_of_svg_image"
+ "--skip resources::tests::read_url_with_http_url_fails_when_status_404"
+ "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200"
+ "--skip iterm2_tests_render_md_samples_images_md"
+ ];
+
+ postInstall = ''
+ installManPage $releaseDir/build/mdcat-*/out/mdcat.1
+ installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash
+ installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish
+ installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix
index bf082abadbce..ca71c3a1b3d4 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix
@@ -3,19 +3,19 @@
stdenv.mkDerivation rec {
pname = "miller";
- version = "5.9.1";
+ version = "5.10.0";
src = fetchFromGitHub {
owner = "johnkerl";
repo = "miller";
rev = "v${version}";
- sha256 = "1i9bcpfjnl2yjnfmf0ar1l62zwq01ph0yylz0dby8k2l7cvq5ci6";
+ sha256 = "02jqbxnchljyqnmlbxjaf5zpdi03gxapfy38dfikl5j4f7yyxvjs";
};
nativeBuildInputs = [ autoreconfHook flex libtool ];
meta = with stdenv.lib; {
- description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON";
+ description = "Like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON";
homepage = "http://johnkerl.org/miller/";
license = licenses.bsd2;
maintainers = with maintainers; [ mstarzyk ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
index bfa22a4fd182..1e2b76c008e0 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
in
buildPythonApplication rec {
pname = "ocrmypdf";
- version = "11.0.1";
+ version = "11.3.3";
disabled = ! python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
- sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn";
+ sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak";
};
nativeBuildInputs = with python3Packages; [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix
new file mode 100644
index 000000000000..3972d3dc9bd4
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "pbgopy";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "nakabonne";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "17rk15hs7kg9m1vphh1gjny7sqnk80qw61jn8qyxcmw2n55rkmfp";
+ };
+
+ vendorSha256 = "1ak3hd979395grbns9p5sw5f45plcqq6vg7j7v8n7xqc20s2l8m9";
+
+ meta = with stdenv.lib; {
+ description = "Copy and paste between devices";
+ homepage = "https://github.com/nakabonne/pbgopy";
+ license = licenses.mit;
+ maintainers = [ maintainers.ivar ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix
index 05241033c6af..1c82d8d365e7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix
@@ -4,20 +4,20 @@
stdenv.mkDerivation rec {
pname = "poedit";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchurl {
url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
- sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w";
+ sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk";
};
- nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
+ nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkgconfig ];
buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ];
-
+
preConfigure = "
patchShebangs bootstrap
./bootstrap
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib"
"CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
];
-
+
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
'';
-
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.poedit.net/";
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ domenkozar genesis ];
+ maintainers = with maintainers; [ domenkozar ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix
index b6503f888483..e8dd5c8bbf77 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "recode";
- version = "3.7.7";
+ version = "3.7.8";
# Use official tarball, avoid need to bootstrap/generate build system
src = fetchurl {
url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1yrqgw74qrdmy82lxd1cxlfclrf2fqi0qp7afjmfc6b7f0xzcih9";
+ sha256 = "19yg20z1smj9kag1axgvc4s4kd6jmw75h0pa8xqxl3xqqyn5rdsg";
};
nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix
index d20ce99dd74e..6f484bed8bcf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ lib, python3Packages }:
-pythonPackages.buildPythonPackage rec {
+let
pname = "rst2html5";
- version = "1.9.4";
+ version = "1.10.6";
+in python3Packages.buildPythonPackage {
+ inherit pname version;
+ format = "wheel";
- src = fetchurl {
- url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
- sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73";
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg=";
};
- propagatedBuildInputs = with pythonPackages;
+ propagatedBuildInputs = with python3Packages;
[ docutils genshi pygments beautifulsoup4 ];
- meta = with stdenv.lib;{
- homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5";
+ meta = with lib;{
+ homepage = "https://pypi.org/project/rst2html5/";
description = "Converts ReSTructuredText to (X)HTML5";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix
index 7ebf739414a2..f4b3ed3dca4c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
description = "Find and replace text in source files";
homepage = "https://github.com/TankerHQ/ruplacer";
license = [ licenses.bsd3 ];
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix
index 1fa508b1ef60..66529514ec7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
description = "Intuitive find & replace CLI (sed alternative)";
homepage = "https://github.com/chmln/sd";
license = licenses.mit;
- maintainers = with maintainers; [ amar1729 filalex77 ];
+ maintainers = with maintainers; [ amar1729 Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix
index ec58cbdd1a94..705999639053 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix
@@ -1,29 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, scdoc }:
buildGoModule rec {
pname = "shfmt";
- version = "3.1.2";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${version}";
- sha256 = "03zgi0rlra3gz8cbqwmhpjxsg5048anfc6ccd2w50fjhx6farsnv";
+ sha256 = "1kp4ib0a64cc9qylny48ff5q9ciklzx93yhv7fgqhl1v2c7fm1jp";
};
- vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8";
+ vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29";
subPackages = [ "cmd/shfmt" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
- patches = [
- # fix failing test on go 1.15, remove with > 3.1.2
- (fetchpatch {
- url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch";
- sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv";
- })
- ];
+ nativeBuildInputs = [ installShellFiles scdoc ];
+
+ postBuild = ''
+ scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
+ installManPage shfmt.1
+ '';
meta = with lib; {
homepage = "https://github.com/mvdan/sh";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix
index 5a36de5f7202..dc025f17a78b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
meta = with lib; {
- description = "sift is a fast and powerful alternative to grep";
+ description = "A fast and powerful alternative to grep";
homepage = "https://sift-tool.org";
maintainers = [ maintainers.carlsverre ];
license = licenses.gpl3;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix
index 5c6025b245e0..ed35a9109a07 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "snippetpixie";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "bytepixie";
repo = pname;
rev = version;
- sha256 = "1db3fbawh4qwdqby5ji4g26pksi4q253r5zvd3kv1m2ljmwrrwj0";
+ sha256 = "1cb76kzw34yr1r135lyd75ddm9v99m7i3lyirm353cdch8qspfmv";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix
new file mode 100644
index 000000000000..db8984536804
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+, autoreconfHook
+, pcre
+, nixosTests
+}:
+
+let
+ pname = "ucg";
+ version = "20190225";
+in stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "gvansickle";
+ repo = pname;
+ rev = "c3a67632f1e3f332bfb102f0db167f34a2e42da7";
+ sha256 = "sha256-/wU1PmI4ejlv7gZzZNasgROYXFiDiIxE9BFoCo6+G5Y=";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [ pcre ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/gvansickle/ucg/";
+ description = "Grep-like tool for searching large bodies of source code";
+ longDescription = ''
+ UniversalCodeGrep (ucg) is an extremely fast grep-like tool specialized
+ for searching large bodies of source code. It is intended to be largely
+ command-line compatible with Ack, to some extent with ag, and where
+ appropriate with grep. Search patterns are specified as PCRE regexes.
+ '';
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; unix;
+ };
+
+ passthru.tests = { inherit (nixosTests) ucg; };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix
index 6f44c360267f..06c8b0d3d6a9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
- version = "2.5.5";
+ version = "3.0.5";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
- sha256 = "0ba9h0m9c28rllym1djij3b97k4rj06nsgajmbxg5mpxfzplgxy2";
+ sha256 = "17yrlgn18kkx7m03dr0hamv0jny6z4x6sk6an41l807i1xaqjyg6";
};
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix
new file mode 100644
index 000000000000..cf8e5658f764
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix
@@ -0,0 +1,24 @@
+{ rustPlatform, lib, fetchFromGitLab }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "uwc";
+ version = "1.0.4";
+
+ src = fetchFromGitLab {
+ owner = "dead10ck";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50";
+ };
+
+ cargoSha256 = "0ra62cf75b1c4knxxpbdg8m0sy2k02r52j606fp5l9crp0fml8l0";
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Like wc, but unicode-aware, and with per-line mode";
+ homepage = "https://gitlab.com/dead10ck/uwc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ShamrockLee ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix
index 8a63d82eacb2..893f54eedc6e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
- version = "2.3.4";
+ version = "2.6.4";
subPackages = [ "." ];
outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "0vk7kk2a2891vm46lss8q2893n2zdirlicac2f3xfkrbb5lhkicd";
+ sha256 = "192w98ghfldxamkx717wqa4v3lsr2imlf8xd6ygjpgx78b5zvvcx";
};
vendorSha256 = null;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix
index 12880b2e4eca..a2ac4b51001a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix
@@ -1,20 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, go-md2man, installShellFiles }:
buildGoModule rec {
pname = "vgrep";
- version = "2.4.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "vrothberg";
repo = pname;
rev = "v${version}";
- sha256 = "109j04my2xib8m52a0337996a27nvfgzackpg20zs3nzn66dmvb7";
+ sha256 = "06rnmg6ljj4f1g602wdp2wy9v0m1m0sj6jl6wywyjl8grjqc3vac";
};
vendorSha256 = null;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ nativeBuildInputs = [ go-md2man installShellFiles ];
+
+ postBuild = ''
+ sed -i '/SHELL= /d' Makefile
+ make docs
+ installManPage docs/*.[1-9]
+ '';
+
meta = with lib; {
description = "User-friendly pager for grep/git-grep/ripgrep";
homepage = "https://github.com/vrothberg/vgrep";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix
index 52991bb3924b..45c9eb4866ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# Remove Windows batch files (unclutter $out/bin)
rm ./bin/*.bat
- mkdir -p $out/share/basex" "$out/share/applications"
+ mkdir -p "$out/share/basex" "$out/share/applications"
cp -R bin etc lib webapp src BaseX.jar "$out"
cp -R readme.txt webapp "$out/share/basex"
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix
index c518ddeaf39d..391c78814e77 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "asciidoctorj";
- version = "2.4.0";
+ version = "2.4.2";
src = fetchzip {
url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
- sha256 = "1bp26x5mhbl25s9djlq6yani1vaqrgbi5mjljhwhj97iapwsd0yb";
+ sha256 = "1b4ivyzpg9p3idk48nfvgpz18qlxyycswkaab31j3dp1mniwvjla";
};
nativeBuildInputs = [ makeWrapper ];
@@ -19,13 +19,11 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = ''
- AsciidoctorJ is the official library for running Asciidoctor on the JVM.
- '';
+ description = "Official library for running Asciidoctor on the JVM";
longDescription = ''
- AsciidoctorJ is the official library for running Asciidoctor on the JVM.
- Using AsciidoctorJ, you can convert AsciiDoc content or analyze the
- structure of a parsed AsciiDoc document from Java and other JVM
+ AsciidoctorJ is the official library for running Asciidoctor on the JVM.
+ Using AsciidoctorJ, you can convert AsciiDoc content or analyze the
+ structure of a parsed AsciiDoc document from Java and other JVM
languages.
'';
homepage = "https://asciidoctor.org/docs/asciidoctorj/";
@@ -33,4 +31,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ moaxcp ];
};
-}
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix
index 709e94005346..1067386c2f8d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix
@@ -42,6 +42,7 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
+ broken = true; # download links got removed
description = "Convert documents to .mobi for use with Amazon Kindle";
homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211";
license = licenses.unfree;
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
deleted file mode 100644
index 8e1d9dfc1914..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fdabb0..378621a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS})
- link_directories(${FONTFORGE_LIBRARY_DIRS})
- set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES})
-
-+# add glib dependency
-+pkg_check_modules(GLIB REQUIRED glib-2.0)
-+include_directories(${GLIB_INCLUDE_DIRS})
-+link_directories(${GLIB_INCLUDE_DIRS})
-+set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES})
-+
- # debug build flags (overwrite default cmake debug flags)
- set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg")
- set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg")
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix
deleted file mode 100644
index dee6ec3c6fff..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8
-
-}:
-
-stdenv.mkDerivation {
- name = "pdf2htmlEX-0.14.6";
-
- src = fetchFromGitHub {
- repo = "pdf2htmlEX";
- owner = "coolwanglu";
- rev = "v0.14.6";
- sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78";
- };
-
- patches = [ ./add-glib-cmake.patch ];
-
- cmakeFlags = [ "-DENABLE_SVG=ON" ];
-
- enableParallelBuilding = true;
-
- nativeBuildInputs = [
- cmake
- pkgconfig
- ];
-
- buildInputs = [
- xorg.libpthreadstubs
- xorg.libXdmcp
- pcre
- python
- glib
- cairo
- pango
- poppler
- fontforge
- openjdk8
- ];
-
- meta = with stdenv.lib; {
- description = "Render PDF files to beautiful HTML";
- homepage = "https://github.com/coolwanglu/pdf2htmlEX";
- license = licenses.gpl3Plus;
- maintainers = [ maintainers.taktoa ];
- platforms = with platforms; linux;
- broken = true; # 2018-09-08
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix
index b30d6269c347..25fc794b0558 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitLab, gradle_5, jre, perl, writeText, runtimeShell }:
+{ stdenv, fetchFromGitLab, gradle, jre, perl, writeText, runtimeShell }:
let
pname = "pdftk";
- version = "3.0.8";
+ version = "3.2.1";
src = fetchFromGitLab {
owner = "pdftk-java";
repo = "pdftk";
rev = "v${version}";
- sha256 = "1bj4a9g5mbxd859mmawzs0mpm0jw7ap4n1imcwkwz142r9x1g6rk";
+ sha256 = "056db8rjczdfkq7fm3bv5g15y042rc9hb4zh5qccjrdw630vk9y4";
};
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit src version;
- nativeBuildInputs = [ gradle_5 perl ];
+ nativeBuildInputs = [ gradle perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -32,7 +32,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "12b7lw1zpj69pv4bpbrm6pi0ip02ay3dfj3vcy2jyikfbwdb3qcz";
+ outputHash = "0p59myc5m3ds7fh0zdz3n7l7hx6dj8bpyqxzlhdrqybsyxwpw4w3";
};
# Point to our local deps repo
@@ -65,7 +65,7 @@ let
in stdenv.mkDerivation rec {
inherit pname version src;
- nativeBuildInputs = [ gradle_5 ];
+ nativeBuildInputs = [ gradle ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -74,22 +74,23 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,share/pdftk,share/man/man1}
- cp build/libs/pdftk.jar $out/share/pdftk
+ cp build/libs/pdftk-all.jar $out/share/pdftk
cat << EOF > $out/bin/pdftk
#!${runtimeShell}
- exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk.jar" "\$@"
+ exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk-all.jar" "\$@"
EOF
chmod a+x "$out/bin/pdftk"
cp ${src}/pdftk.1 $out/share/man/man1
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Command-line tool for working with PDFs";
homepage = "https://gitlab.com/pdftk-java/pdftk";
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ raskin averelld ];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ raskin averelld ];
+ platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix
index b3edd7d54507..5caafa054cf9 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [raskin];
platforms = with stdenv.lib.platforms; linux;
+ broken = true; # Broken on Hydra since 2020-08-24
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
index a9ac2690b66d..f3f036ce50eb 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
@@ -9,18 +9,18 @@ python3Packages.buildPythonApplication rec {
sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p";
};
- nativeBuildInputs = [ texinfo ];
-
- # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we
- # use sed to change the default
- preBuild = ''
- sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py
+ # I'm sure there is a better way to pass these parameters to the build script...
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'pdf = True' 'pdf = False' \
+ --replace '$base/man' 'share/man' \
+ --replace '$base/info' 'share/info' \
+ --replace '$base/share' 'share'
'';
- # the check scripts forces python2. If we need to use python3 at some point, we should use
- # the correct python
+ nativeBuildInputs = [ texinfo ];
+
checkPhase = ''
- sed -i 's|python=python3|python=${python3Packages.python.interpreter}|' tests/run.sh
cd tests && ${stdenv.shell} run.sh
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix
index 5b6cf5e22f21..ddff50ea0e83 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "scdoc";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchurl {
url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
- sha256 = "17cjh3lcfppyl2mzpanylla93gdgdv5spc8jldshvayzizhfghwa";
+ sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix
index 813a464b7703..0e90e1cf614c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, gettext
-, guile, guile-reader, guile-lib
-, ploticus, imagemagick
-, ghostscript, transfig
+{ stdenv
+, fetchurl
+, pkgconfig
+, gettext
+, guile
+, guile-reader
+, guile-lib
+, ploticus
+, imagemagick
+, ghostscript
+, transfig
, enableEmacs ? false, emacs ? null
, enableLout ? true, lout ? null
, enableTex ? true, tex ? null
-, makeWrapper }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
+, makeWrapper
+}:
+let
pname = "skribilo";
- version = "0.9.4";
+ version = "0.9.5";
+ inherit (stdenv.lib) optional;
+in stdenv.mkDerivation {
+ inherit pname version;
src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
- sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf";
+ sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk=";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
@@ -33,7 +42,7 @@ stdenv.mkDerivation rec {
--prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
'';
- meta = {
+ meta = with stdenv.lib;{
description = "The Ultimate Document Programming Framework";
longDescription = ''
Skribilo is a free document production tool that takes a
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
index db976e90225a..965624a50987 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,22 +3,27 @@
rustPlatform.buildRustPackage rec {
pname = "tectonic";
- version = "0.1.17";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "tectonic-typesetting";
repo = "tectonic";
rev = "tectonic@${version}";
- sha256 = "VHhvdIBFPE5CkWVQ4tzMionUnAkZTucVXl5zp5prgok=";
+ sha256 = "yJzfymA4elyyeVR8FzTJe8wgs+vm3RWwcOh7IlmBYPE=";
};
- cargoSha256 = "/f/suiI5XzI0+lCscsqLZTWU6slHdXgR+5epYpxyU1w=";
+ cargoSha256 = "7zqr54H6GemiM/xuHOH6+s669IG2orj1neoqAH+wnV4=";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontconfig harfbuzz openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
+ postInstall = stdenv.lib.optionalString stdenv.isLinux ''
+ install -D dist/appimage/tectonic.desktop -t $out/share/applications/
+ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/
+ '';
+
doCheck = true;
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix
index 25e9dce242f3..6d7ef3348613 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ];
meta = with stdenv.lib; {
- description = "Ted, an easy rich text processor";
+ description = "An easy rich text processor";
longDescription = ''
Ted is a text processor running under X Windows on Unix/Linux systems.
Ted was developed as a standard easy light weight word processor, having
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix
index ccb5dcc51907..38a333132492 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, emacs, texlive, ghostscript }:
let auctex = stdenv.mkDerivation ( rec {
- version = "12.2";
+ version = "12.3";
# Make this a valid tex(live-new) package;
# the pkgs attribute is provided with a hack below.
@@ -13,7 +13,7 @@ let auctex = stdenv.mkDerivation ( rec {
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "14vqs08mkfzc91jg7kabs9sdn74vywj8a29gyrfa3ivnm9c7jrsr";
+ sha256 = "1pd99hbhci3l1n0lmzn803svqwl47kld6172gwkwjmwlnqqgxm1g";
};
buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh
index 7a5767f9c063..3f8a16580ea5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh
@@ -41,7 +41,11 @@ showError() {
exit 1
}
+pass=0
+
runLaTeX() {
+ ((pass=pass+1))
+ echo "PASS $pass..."
if ! $latex $latexFlags $rootName >$tmpFile 2>&1; then showError; fi
runNeeded=
if fgrep -q \
@@ -51,6 +55,7 @@ runLaTeX() {
"$tmpFile"; then
runNeeded=1
fi
+ echo
}
echo
@@ -61,10 +66,7 @@ if test -n "$copySources"; then
fi
-echo "PASS 1..."
runLaTeX
-echo
-
for auxFile in $(find . -name "*.aux"); do
# Run bibtex to process all bibliographies. There may be several
@@ -89,11 +91,8 @@ for auxFile in $(find . -name "*.aux"); do
fi
done
-
if test "$runNeeded"; then
- echo "PASS 2..."
runLaTeX
- echo
fi
@@ -105,20 +104,18 @@ if test -f $rootNameBase.idx; then
makeindex $makeindexFlags $rootNameBase.idx
runNeeded=1
echo
-fi
-
+fi
-if test "$runNeeded"; then
- echo "PASS 3..."
+# We check that pass is less than 2 to catch situations where the document is
+# simple enough (no bibtex, etc.) so that it would otherwise require only one
+# pass but also contains a ToC.
+# In essence this check ensures that we do at least two passes on all documents.
+if test "$runNeeded" = 1 -o "$pass" -lt 2 ; then
runLaTeX
- echo
fi
-
if test "$runNeeded"; then
- echo "PASS 4..."
runLaTeX
- echo
fi
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
index c0d797dbeaa8..030ac1b43aae 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -2,9 +2,9 @@
, texlive
, zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
-, perl, perlPackages, python2Packages, pkgconfig, autoreconfHook
+, perl, perlPackages, python2Packages, pkgconfig
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
-, cairo, pixman, xorg, clisp, biber, xxHash
+, brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash
, makeWrapper, shortenPerlShebang
}:
@@ -34,10 +34,6 @@ let
cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
'';
- # remove when removing synctex-missing-header.patch
- preAutoreconf = "pushd texk/web2c";
- postAutoreconf = "popd";
-
configureFlags = [
"--with-banner-add=/NixOS.org"
"--disable-missing" "--disable-native-texlive-build"
@@ -71,11 +67,11 @@ core = stdenv.mkDerivation rec {
pname = "texlive-bin";
inherit version;
- inherit (common) src prePatch preAutoreconf postAutoreconf;
+ inherit (common) src prePatch;
outputs = [ "out" "doc" ];
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
/*teckit*/ zziplib poppler mpfr gmp
pixman gd freetype libpng libpaper zlib
@@ -161,7 +157,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
pname = "texlive-core-big.bin";
inherit version;
- inherit (common) src prePatch preAutoreconf postAutoreconf;
+ inherit (common) src prePatch;
hardeningDisable = [ "format" ];
@@ -249,20 +245,20 @@ chktex = stdenv.mkDerivation {
};
-dvisvgm = stdenv.mkDerivation {
+dvisvgm = stdenv.mkDerivation rec {
pname = "texlive-dvisvgm.bin";
- inherit version;
-
- inherit (common) src;
+ version = "2.11";
+ # TODO: dvisvgm was switched to build from upstream sources
+ # to address https://github.com/NixOS/nixpkgs/issues/104847
+ # We might want to consider reverting that change in the future.
+
+ src = fetchurl {
+ url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz";
+ sha256 = "12b6h0h8rc487yjh3sq9zsdabm9cs2vqcrb0znnfi8277f87zf3j";
+ };
nativeBuildInputs = [ pkgconfig ];
- # TODO: dvisvgm still uses vendored dependencies
- buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ];
-
- preConfigure = "cd texk/dvisvgm";
-
- configureFlags = common.configureFlags
- ++ [ "--with-system-kpathsea" ];
+ buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ];
enableParallelBuilding = true;
};
@@ -429,7 +425,7 @@ xdvi = stdenv.mkDerivation {
} # un-indented
-// stdenv.lib.optionalAttrs (!stdenv.isDarwin) # see #20062
+// stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062)
{
xindy = stdenv.mkDerivation {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
index fb3e6668a47c..891495c46cac 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -31,13 +31,7 @@ let
++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby;
};
- # TODO: replace by buitin once it exists
- fastUnique = comparator: list: with lib;
- let un_adj = l: if length l < 2 then l
- else optional (head l != elemAt l 1) (head l) ++ un_adj (tail l);
- in un_adj (lib.sort comparator list);
-
- uniqueStrings = fastUnique (a: b: a < b);
+ uniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list);
mkUniqueOutPaths = pkgs: uniqueStrings
(map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch
deleted file mode 100644
index 0e927e24fd0e..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
---- a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
-+++ b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
-@@ -107,8 +107,7 @@ const char *PSInterpreter::PSDEFS =
- "dmode sysexec<</Normal 0/Compatible 0/Multiply 1/Screen 2/Overlay 3/SoftLight "
- "4/HardLight 5/ColorDodge 6/ColorBurn 7/Darken 8/Lighten 9/Difference 10/Exclus"
- "ion 11/Hue 12/Saturation 13/Color 14/Luminosity 15/CompatibleOverprint 16>>exc"
--"h get 1(setblendmode)prcmd}def/@pdfpagecount{GS_PDF_ProcSet begin pdfdict begi"
--"n(r)file pdfopen begin pdfpagecount currentdict pdfclose end end end}def/@pdfp"
--"agebox{GS_PDF_ProcSet begin pdfdict begin(r)file pdfopen begin dup dup 1 lt ex"
--"ch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse curre"
--"ntdict pdfclose end end end}def DELAYBIND{.bindnow}if ";
-+"h get 1(setblendmode)prcmd}def/@pdfpagecount{(r)file runpdfbegin pdfpagecount "
-+"runpdfend}def/@pdfpagebox{(r)file runpdfbegin dup dup 1 lt exch pdfpagecount g"
-+"t or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse runpdfend}def DELAYBIN"
-+"D{.bindnow}if ";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch
deleted file mode 100644
index 02dc9e2413d3..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Tue, 31 Dec 2019 11:29:30 +0300
-Subject: [PATCH] poppler-0.84 compat
-
-Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
-
-Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
----
- texk/web2c/pdftexdir/utils.c | 1 -
- texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
-index c93a8781..6f866e76 100644
---- a/texk/web2c/pdftexdir/utils.c
-+++ b/texk/web2c/pdftexdir/utils.c
-@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
- #include "ptexlib.h"
- #include <png.h>
- #ifdef POPPLER_VERSION
--#include <poppler-config.h>
- #define xpdfVersion POPPLER_VERSION
- #define xpdfString "poppler"
- #else
-diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
-index 4968ee41..0aee4ee3 100644
---- a/texk/web2c/xetexdir/XeTeX_ext.c
-+++ b/texk/web2c/xetexdir/XeTeX_ext.c
-@@ -38,7 +38,10 @@ authorization from the copyright holders.
-
- #include <w2c/config.h>
-
-+#ifndef POPPLER_VERSION
- #include <poppler-config.h>
-+#endif
-+
- #include <png.h>
- #include <zlib.h>
- #include <graphite2/Font.h>
---
-2.24.1
-
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix
index f37bfb7c133b..31b260d846c7 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix
@@ -3,9 +3,10 @@
, bash, getopt, makeWrapper }:
stdenv.mkDerivation rec {
- name = "xmlto-0.0.28";
+ pname = "xmlto";
+ version = "0.0.28";
src = fetchurl {
- url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2";
+ url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix
index 9a19a6789e57..2f7e4d97cbba 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix
@@ -1,39 +1,31 @@
-{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
+{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "atomicparsley";
- version = "0.9.6";
+ version = "20200701.154658.b0d6223";
- src = fetchhg {
- url = "https://bitbucket.org/wez/atomicparsley";
- sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm";
+ src = fetchFromGitHub {
+ owner = "wez";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8=";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
- configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- # AC_FUNC_MALLOC is broken on cross builds.
- "ac_cv_func_malloc_0_nonnull=yes"
- "ac_cv_func_realloc_0_nonnull=yes"
- ];
-
- installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
+ installPhase = ''
+ runHook preInstall
+ install -D AtomicParsley $out/bin/AtomicParsley
+ runHook postInstall
+ '';
meta = with stdenv.lib; {
- description = ''
- A lightweight command line program for reading, parsing and
- setting metadata into MPEG-4 files
- '';
-
- longDescription = ''
- This is a maintained fork of the original AtomicParsley.
- '';
-
- homepage = "https://bitbucket.org/wez/atomicparsley";
- license = licenses.gpl2;
+ description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files";
+ homepage = "https://github.com/wez/atomicparsley";
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ pjones ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix
index 94a1a5d04f32..87585caebfb5 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
pname = "bento4";
- version = "1.5.1-629";
+ version = "1.6.0-637";
src = fetchFromGitHub {
owner = "axiomatic-systems";
repo = "Bento4";
rev = "v${version}";
- sha256 = "1614idy0r7qrkiaq4kz3gh1b1bpx592aqvi574kxnjrxc34kpmb3";
+ sha256 = "0iwqi71nj0iczffvpxmz0prvmmnyiqypfwvzivkh38wl0br82bkp";
};
patches = [ ./libap4.patch ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix
deleted file mode 100644
index 9a1f9f121031..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, buildRubyGem, ruby }:
-
-buildRubyGem rec {
- inherit ruby;
- name = "${gemName}-${version}";
- gemName = "flvtool2";
- version = "1.0.6";
- source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj";
-
- meta = {
- broken = true; # depends on ruby 2.2
- homepage = "https://github.com/unnu/flvtool2";
- description = "A tool to manipulate Macromedia Flash Video files";
- platforms = ruby.meta.platforms;
- license = lib.licenses.bsd3;
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix
index ae7a45b562d9..ae300f47b19e 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix
@@ -1,18 +1,32 @@
-{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }:
+{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }:
rustPlatform.buildRustPackage rec {
pname = "rav1e";
- version = "0.3.4";
+ version = "0.4.0-alpha";
- src = fetchFromGitHub {
- owner = "xiph";
- repo = "rav1e";
- rev = "v${version}";
- sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs";
- };
+ src = stdenv.mkDerivation rec {
+ name = "${pname}-${version}-source";
+
+ src = fetchFromGitHub {
+ owner = "xiph";
+ repo = "rav1e";
+ rev = "v${version}";
+ sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9";
+ };
+
+ cargoLock = fetchurl {
+ url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock";
+ sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl";
+ };
- cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24";
+ installPhase = ''
+ mkdir -p $out
+ cp -r ./* $out/
+ cp ${cargoLock} $out/Cargo.lock
+ '';
+ };
+ cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1";
nativeBuildInputs = [ nasm cargo-c ];
postBuild = ''
@@ -31,7 +45,7 @@ rustPlatform.buildRustPackage rec {
libaom (the reference encoder) is too slow.
Features: https://github.com/xiph/rav1e#features
'';
- inherit (src.meta) homepage;
+ homepage = "https://github.com/xiph/rav1e";
changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = [ maintainers.primeos ];
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
index 08d37a1d53bc..d6dad6433e7a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils
-, utillinux
+, util-linux
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/alpine-make-vm-image --set PATH ${lib.makeBinPath [
apk-tools coreutils e2fsprogs findutils gnugrep gnused kmod qemu-utils
- utillinux
+ util-linux
]}
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index 19766fb5ba9d..4c37054f4a05 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "amazon-ecs-cli";
- version = "1.18.1";
+ version = "1.20.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
- sha256 = "1q0qsvxwz6mgslwzwslddxxv45v9wmlbbkxgyfz3dfkw6n6d1a2s";
+ sha256 = "11cw2hk48x66wlsg5bzay95l2pgncwnawzj4xmqmbchhhvphrvxr";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-darwin-amd64-v${version}";
- sha256 = "0hik88z5xm1pw6a3mxa6zpghdv47s6bg56srxv4azjinzdi59s3b";
+ sha256 = "1f4yq04sgwkj2p0j598a8vc54dzihmqvg9daa6mxnqj403ln0rg1";
}
else throw "Architecture not supported";
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
index aff00519a2dc..00f8ed89a2bf 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
@@ -83,8 +83,8 @@ in with localPython.pkgs; buildPythonApplication rec {
];
postInstall = ''
- mkdir -p $out/etc/bash_completion.d
- mv $out/bin/eb_completion.bash $out/etc/bash_completion.d
+ mkdir -p $out/share/bash-completion/completions
+ mv $out/bin/eb_completion.bash $out/share/bash-completion/completions/
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
index 34f2bc9e1909..be62ace4797b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -4,7 +4,7 @@
, bash
, bashInteractive
, systemd
-, utillinux
+, util-linux
, boto
, setuptools
, distro
@@ -31,14 +31,14 @@ buildPythonApplication rec {
substituteInPlace "$file" \
--replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
- --replace /sbin/hwclock "${utillinux}/bin/hwclock"
+ --replace /sbin/hwclock "${util-linux}/bin/hwclock"
# SELinux tool ??? /sbin/restorecon
done
substituteInPlace google_config/udev/64-gce-disk-removal.rules \
--replace /bin/sh "${bash}/bin/sh" \
- --replace /bin/umount "${utillinux}/bin/umount" \
- --replace /usr/bin/logger "${utillinux}/bin/logger"
+ --replace /bin/umount "${util-linux}/bin/umount" \
+ --replace /usr/bin/logger "${util-linux}/bin/logger"
'';
postInstall = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
index 94a19c5375ea..badd25b4e248 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
@@ -1,4 +1,4 @@
-{ substituteAll, perlPackages, shadow, utillinux }:
+{ substituteAll, perlPackages, shadow, util-linux }:
substituteAll {
name = "nixos-container";
@@ -7,10 +7,10 @@ substituteAll {
src = ./nixos-container.pl;
perl = "${perlPackages.perl}/bin/perl -I${perlPackages.FileSlurp}/${perlPackages.perl.libPrefix}";
su = "${shadow.su}/bin/su";
- inherit utillinux;
+ utillinux = util-linux;
postInstall = ''
- t=$out/etc/bash_completion.d
+ t=$out/share/bash-completion/completions
mkdir -p $t
cp ${./nixos-container-completion.sh} $t/nixos-container
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
index d57a054a8b72..61da0d86e33b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "rootlesskit";
- version = "0.10.0";
+ version = "0.11.1";
goPackagePath = "github.com/rootless-containers/rootlesskit";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "rootlesskit";
rev = "v${version}";
- sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr";
+ sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r";
};
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix
new file mode 100644
index 000000000000..2993f990aad5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, meson, pkg-config, ninja, wayland
+, wayland-protocols
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wlsunset";
+ version = "0.1.0";
+
+ src = fetchurl {
+ url = "https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz";
+ sha256 = "0g7mk14hlbwbhq6nqr84452sbgcja3hdxsqf0vws4njhfjgqiv3q";
+ };
+
+ nativeBuildInputs = [ meson pkg-config ninja wayland ];
+ buildInputs = [ wayland wayland-protocols ];
+
+ meta = with stdenv.lib; {
+ description = "Day/night gamma adjustments for Wayland";
+ longDescription = ''
+ Day/night gamma adjustments for Wayland compositors supporting
+ wlr-gamma-control-unstable-v1.
+ '';
+ homepage = "https://sr.ht/~kennylevinsen/wlsunset/";
+ changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix
new file mode 100644
index 000000000000..0db02990c036
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl
+, meson, pkg-config, wayland, ninja
+, cairo, libinput, pango, wayland-protocols, libxkbcommon
+}:
+
+let
+ version = "2020-03-29";
+ commit = "6388a49e0f431d6d5fcbd152b8ae4fa8e87884ee";
+in stdenv.mkDerivation rec {
+ pname = "wshowkeys-unstable";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://git.sr.ht/~sircmpwn/wshowkeys/archive/${commit}.tar.gz";
+ sha256 = "0iplmw13jmc8d3m307kc047zq8yqwm42kw9fpm270562i3p0qk4d";
+ };
+
+ nativeBuildInputs = [ meson pkg-config wayland ninja ];
+ buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ];
+
+ meta = with stdenv.lib; {
+ description = "Displays keys being pressed on a Wayland session";
+ longDescription = ''
+ Displays keypresses on screen on supported Wayland compositors (requires
+ wlr_layer_shell_v1 support).
+ Note: This tool requires root permissions to read input events, but these
+ permissions are dropped after startup. The NixOS module provides such a
+ setuid binary (use "programs.wshowkeys.enable = true;").
+ '';
+ homepage = "https://git.sr.ht/~sircmpwn/wshowkeys";
+ license = with licenses; [ gpl3Only mit ];
+ # Some portions of the code are taken from Sway which is MIT licensed.
+ # TODO: gpl3Only or gpl3Plus (ask upstream)?
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ primeos berbiche ];
+ };
+}